Applications
/
ubl-settings-services
10
0
Fork 1
Code Issues 5 Pull Requests Packages Projects Releases Wiki Activity

Application rework 1st stage

Browse Source
pull/28/head
Ivan Dmitrievich Yartsev 2 years ago
parent c54b834d63
commit 4eca521d7d
10 changed files with 2132 additions and 1024 deletions
Show Stats Download Patch File Download Diff File

2
Makefile
Unescape View File

@ -135,6 +135,8 @@ install: check uninstall
@install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "icons/com.ublinux.${PKGNAME}.launch-symbolic.svg"
@install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "icons/com.ublinux.${PKGNAME}.important-symbolic.svg"
@install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "icons/com.ublinux.${PKGNAME}.lookup-symbolic.svg"
@install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "icons/com.ublinux.${PKGNAME}.edit-symbolic.svg"
@install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "icons/com.ublinux.${PKGNAME}.lock-symbolic.svg"
@install -Dm644 -t "${DESTDIR}/usr/share/polkit-1/actions/" "${CMAKE_BUILD_DIR}/com.ublinux.${PKGNAME}${PKGIDENT}.policy"
@if [ -z ${DESTDIR} ]; then \
[ -d "${DESTDIR}/usr/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}/usr/share/icons/hicolor/" &>/dev/null || true; \

4
icons/com.ublinux.ubl-settings-services.edit-symbolic.svg
Unescape View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg">
<path d="m 12.628906 0.664062 c -0.203125 0 -0.402344 0.074219 -0.554687 0.230469 l -1.769531 1.765625 l 3.050781 3.054688 l 1.769531 -1.769532 c 0.308594 -0.308593 0.308594 -0.804687 0 -1.109374 l -1.941406 -1.941407 c -0.15625 -0.15625 -0.355469 -0.230469 -0.554688 -0.230469 z m -3.109375 2.765626 l -8.519531 8.570312 v 3 h 3 l 8.519531 -8.570312 z m 0 0" fill="#2e3436" fill-rule="evenodd"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 535 B

1
icons/com.ublinux.ubl-settings-services.lock-symbolic.svg
Unescape View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g color="#bebebe" fill="#474747"><path d="M3 7h10c.554 0 1 .446 1 1v3c0 .554-.446 1-1 1H3c-.554 0-1-.446-1-1V8c0-.554.446-1 1-1z" style="marker:none" overflow="visible"/><path d="M7 1s-.709-.014-1.447.355C4.814 1.725 4 2.667 4 4v4h2V4c0-.667.186-.725.447-.855C6.71 3.014 7 3 7 3h2s.291.014.553.145c.261.13.447.188.447.855v4h2V4c0-1.333-.814-2.275-1.553-2.645C9.71.986 9 1 9 1z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal;marker:none" font-weight="400" font-family="sans-serif" overflow="visible"/><path d="M2 10h12v4H2z" style="marker:none" overflow="visible"/></g></svg>
Side by Side

After

Width:  |  Height:  |  Size: 998 B

1098
source/ubl-settings-services.c
View File

File diff suppressed because it is too large Load Diff

228
source/ubl-settings-services.h
Unescape View File

@ -48,6 +48,8 @@
#define start_log_command(target) yon_char_append("journalctl --all --no-pager --unit ",target)
#define get_config_files_command "find /etc/systemd -iname *.conf -exec du -sh --time {} \\;"
#define config_get_local_command "ubconfig --source system get system SERVICES_ENABLE SERVICES_DISABLE SERVICES_MASK"
#define config_get_global_command "ubconfig --source global get system SERVICES_ENABLE SERVICES_DISABLE SERVICES_MASK"
#define config_get_default_command ""
@ -60,28 +62,30 @@
#define SERVICES_MASK_get_command "ubconfig --source global get [system] SERVICES_MASK"
#define CONSOLE_FONT_get_command "ubconfig --source global get [locale] CONSOLE_FONT"
#define play_icon_path "com.ublinux.ubl-settings-services.play-symbolic"
#define stop_icon_path "com.ublinux.ubl-settings-services.stop-symbolic"
#define block_icon_path "com.ublinux.ubl-settings-services.cancel-symbolic"
#define start_icon_path "com.ublinux.ubl-settings-services.launch-symbolic"
#define update_icon_path "com.ublinux.ubl-settings-services.sync-symbolic"
#define launch_icon_path "com.ublinux.ubl-settings-services.check-symbolic"
#define log_icon_path "com.ublinux.ubl-settings-services.lookup-symbolic"
#define source_icon_path "com.ublinux.ubl-settings-services.play-symbolic"
#define properties_icon_path "com.ublinux.ubl-settings-services.play-symbolic"
#define status_icon_path "com.ublinux.ubl-settings-services.play-symbolic"
#define reload_systemd_root_command "systemctl daemon-reload"
#define reexec_systemd_root_command "systemctl daemon-reexec"
#define reload_systemd_user_command "systemctl --user daemon-reload"
#define reexec_systemd_user_command "systemctl --user daemon-reexec"
typedef char* string;
string version_application;
char *local;
typedef struct {
// Standard config. DO NOT EDIT - MUST BE SAME AS ublsettings-ui's template_config STRUCT {
int socket_id;
int load_socket_id;
int save_socket_id;
int lock_help;
int lock_save_local;
int lock_save_global;
int lock_load_global;
int lock_load_system;
int load_mode;
int always_open_documentation;
// } Standard config. DO NOT EDIT - MUST BE SAME AS ublsettings-ui's template_config STRUCT
// Type custom parameters below:
template_config_fields
int rmb_clicked;
GtkTreeModel *ServiceFilter;
GtkTreeModel *SocketFilter;
@ -93,69 +97,61 @@ typedef struct {
int update_thread_active;
} config;
typedef struct {
GtkWidget *Menu;
GtkWidget *MenuConfigAutostart;
GtkWidget *MenuConfigAutostop;
GtkWidget *MenuConfigBlock;
GtkWidget *MenuSystemAutostart;
GtkWidget *MenuSystemLaunched;
GtkWidget *MenuReloadConfig;
GtkWidget *MenuStatus;
} menu_obj;
typedef struct {
// Standard widgets. DO NOT EDIT - MUST BE SAME AS ublsettings-ui's template_main_window STRUCT {
GtkWidget *Window;
GtkWidget *HeadLabel;
GtkWidget *PlugBox;
GtkWidget *HeadOverlay;
GtkWidget *HeadImage;
GtkWidget *HeadBox;
GtkWidget *HeadTitleLabel;
GtkWidget *HeadInfoLabel;
GtkWidget *StatusBox;
GtkWidget *StatusIcon;
GtkWidget *StatusLabel;
GtkWidget *SaveMenuItem;
GtkWidget *SaveGlobalMenuItem;
GtkWidget *SaveLocalMenuItem;
GtkWidget *RightBox;
GtkWidget *LoadGlobalMenuItem;
GtkWidget *LoadLocalMenuItem;
GtkWidget *LeftBox;
GtkWidget *DocumentationMenuItem;
GtkWidget *AboutMenuItem;
GtkWidget *InterfaceBox;
// } Standard widgets. DO NOT EDIT - MUST BE SAME AS ublsettings-ui's template_main_window STRUCT
// Type custom parameters below:
GtkListStore *liststore1;
GtkListStore *liststore2;
template_window_fields
GtkListStore *UserList;
GtkListStore *TimersList;
GtkListStore *SessionsList;
GtkListStore *ConfigList;
GtkListStore *SystemList;
GtkWidget *BoxMain;
GtkWidget *ServiceSourceCombo;
GtkWidget *ServiceTypeCombo;
GtkWidget *SearchEntry;
GtkWidget *UpdateButton;
GtkWidget *ConfigAutostartButton;
GtkWidget *ConfigAutostopButton;
GtkWidget *ConfigBlockButton;
GtkWidget *SystemAutostartButton;
GtkWidget *SystemLaunchButton;
GtkWidget *InfoButton;
GtkWidget *LogButton;
GtkWidget *MainUpperTree;
GtkWidget *MainTree;
GtkWidget *RMBMenu;
menu_obj *menu;
GtkWidget *ServiceLabel;
GtkWidget *DescriptionLabel;
GtkWidget *SystemSearchEntry;
GtkWidget *SystemFiltersCombo;
GtkWidget *SystemInactiveShowCheck;
GtkWidget *SystemUnloadedShowCheck;
GtkWidget *SystemUpperTree;
GtkWidget *SystemUnitsTree;
GtkWidget *SystemPrevButton;
GtkWidget *SystemUpdateButton;
GtkWidget *SystemInfoButton;
GtkWidget *SystemLogButton;
GtkWidget *SystemEditButton;
GtkWidget *SystemPropertiesButton;
GtkWidget *SystemStatusButton;
rmb_menu_window *SystemMenu;
GtkWidget *SystemServiceLabel;
GtkWidget *SystemDescriptionLabel;
GtkWidget *UserSearchEntry;
GtkWidget *UserFiltersCombo;
GtkWidget *UserInactiveShowCheck;
GtkWidget *UserUnloadedShowCheck;
GtkWidget *UsersUpperTree;
GtkWidget *UserUnitsTree;
GtkWidget *UserPrevButton;
GtkWidget *UserUpdateButton;
GtkWidget *UserInfoButton;
GtkWidget *UserLogButton;
GtkWidget *UserEditButton;
GtkWidget *UserStatusButton;
rmb_menu_window *UserMenu;
GtkWidget *UserServiceLabel;
GtkWidget *UserDescriptionLabel;
GtkWidget *ConfigEditButton;
GtkWidget *ConfigMainTree;
GtkWidget *SessionMainTree;
GtkWidget *SessionStartButton;
GtkWidget *SessionStopButton;
GtkWidget *SessionBlockButton;
rmb_menu_window *SessionMenu;
GtkWidget *TimersMainTree;
GtkWidget *MainNotebook;
} main_window;
@ -187,18 +183,13 @@ typedef struct{
GtkWidget *MainTree;
} bl_settings_services_window;
typedef struct {
GtkWidget *Window;
GtkWidget *UpdateButton;
GtkWidget *SystemTerminal;
GtkWidget *webHeaderNameLabel;
char *target;
} terminal_window;
typedef struct {
GtkWidget *Window;
GtkWidget *SystemTerminal;
GtkWidget *TextEditor;
GtkWidget *webHeaderNameLabel;
GtkWidget *UpdateButton;
GtkWidget *SaveButton;
char *target;
} log_window;
@ -240,6 +231,69 @@ void on_system_kill_confirmed(GtkWidget *self,char *service_name);
void on_system_launch_clicked();
void on_system_restart_clicked();
void on_source_show();
void on_properties_show();
void on_session_activate();
void on_session_end();
void on_session_block();
void yon_system_systemd_restart(GtkWidget *self, main_window *widgets);
void yon_user_systemd_restart(GtkWidget *self, main_window *widgets);
void on_system_update_hz_clicked(GtkWidget *self, main_window *widgets);
void on_system_update_clicked(GtkWidget *self, main_window *widgets);
void on_system_info_clicked(GtkWidget *self, main_window *widgets);
void on_system_log_clicked(GtkWidget *self, main_window *widgets);
void on_system_edit_clicked(GtkWidget *self, main_window *widgets);
void on_system_status_clicked(GtkWidget *self, main_window *widgets);
void on_system_filter_changed(GtkWidget *self, main_window *widgets);
void on_system_search(GtkWidget *self, main_window *widgets);
void on_system_inactive_toggled(GtkWidget *self, main_window *widgets);
void on_system_unloaded_toggled(GtkWidget *self, main_window *widgets);
void on_user_update_hz_clicked(GtkWidget *self, main_window *widgets);
void on_user_update_clicked(GtkWidget *self, main_window *widgets);
void on_user_info_clicked(GtkWidget *self, main_window *widgets);
void on_user_log_clicked(GtkWidget *self, main_window *widgets);
void on_user_edit_clicked(GtkWidget *self, main_window *widgets);
void on_user_status_clicked(GtkWidget *self, main_window *widgets);
void on_user_filter_changed(GtkWidget *self, main_window *widgets);
void on_user_search(GtkWidget *self, main_window *widgets);
void on_user_inactive_toggled(GtkWidget *self, main_window *widgets);
void on_user_unloaded_toggled(GtkWidget *self, main_window *widgets);
void on_config_edit_clicked(GtkWidget *self, main_window *widgets);
void on_session_start_clicked(GtkWidget *self, main_window *widgets);
void on_session_stop_clicked(GtkWidget *self, main_window *widgets);
void on_session_lock_clicked(GtkWidget *self, main_window *widgets);
gboolean yon_service_source_check(GtkTreeModel *model, GtkTreeIter *iter, void *data);
gboolean yon_service_type_check(GtkTreeModel *model, GtkTreeIter *iter,void *data);
@ -280,8 +334,4 @@ gboolean on_blocked_filter(GtkTreeModel *model, GtkTreeIter *iter,void *data);
gboolean on_source_user_filter(GtkTreeModel *model, GtkTreeIter *iter,void *data);
gboolean on_source_system_filter(GtkTreeModel *model, GtkTreeIter *iter,void *data);
terminal_window *yon_terminal_window_new();
void on_service_update(GtkWidget *self, terminal_window* window);
gboolean on_source_system_filter(GtkTreeModel *model, GtkTreeIter *iter,void *data);

7
source/ubl-strings.h
Unescape View File

@ -44,6 +44,13 @@
#define LAUNCHED_LABEL _("Launched")
#define LIST_LOAD_LABEL _("Service list is loading")
#define STATUS_LABEL _("Status")
#define RESTART_LABEL _("Restart with new configuration")
#define SHOW_LOG_LABEL _("Show log")
#define SHOW_SOURCE_LABEL _("Show source")
#define PROPERTIES_LABEL _("Properties")
#define ACTIVATE_SESSION_LABEL _("Activate session")
#define END_SESSION_LABEL _("End session")
#define BLOCK_SESSION_LABEL _("Block session")
#define SWITCH_OFF_ERROR_LABEL _("Service were not stopped")
#define STOP_SERVICE_WARMING_LABEL(target) yon_char_unite(_("Are you sure want to stop "),target,"?\n",_("The stop will be forced.\nThe system may become unstable."),NULL)

102
ubl-settings-services-log.glade
Unescape View File

@ -23,6 +23,53 @@
<property name="margin-top">5</property>
<property name="margin-bottom">5</property>
<property name="spacing">5</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">5</property>
<child>
<object class="GtkButton" id="UpdateButton">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="tooltip-text" translatable="yes">Update</property>
<property name="image">image1</property>
<style>
<class name="thin"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="SaveButton">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="tooltip-text" translatable="yes">Update</property>
<property name="image">image2</property>
<style>
<class name="thin"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
@ -39,18 +86,40 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
<object class="VteTerminal" id="SystemTerminal">
<object class="GtkBox">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">True</property>
<property name="hscroll-policy">natural</property>
<property name="vadjustment">adjustment1</property>
<property name="vscroll-policy">natural</property>
<property name="encoding">UTF-8</property>
<property name="pointer-autohide">True</property>
<property name="scrollback-lines">0</property>
<property name="scroll-on-keystroke">True</property>
<property name="scroll-on-output">False</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkTextView" id="TextEditor">
<property name="can-focus">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="VteTerminal" id="SystemTerminal">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">True</property>
<property name="hscroll-policy">natural</property>
<property name="vadjustment">adjustment1</property>
<property name="vscroll-policy">natural</property>
<property name="encoding">UTF-8</property>
<property name="pointer-autohide">True</property>
<property name="scrollback-lines">0</property>
<property name="scroll-on-keystroke">True</property>
<property name="scroll-on-output">False</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
@ -89,4 +158,15 @@
</object>
</child>
</object>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="icon-name">com.ublinux.ubl-settings-services.sync-symbolic</property>
</object>
<object class="GtkImage" id="image2">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="icon-name">document-save-symbolic</property>
</object>
<object class="GtkTextBuffer" id="textbuffer1"/>
</interface>

23
ubl-settings-services-terminal.glade
Unescape View File

@ -33,6 +33,7 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">5</property>
<child>
<object class="GtkButton" id="UpdateButton">
<property name="visible">True</property>
@ -50,6 +51,23 @@
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="SaveButton">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="tooltip-text" translatable="yes">Update</property>
<property name="image">image2</property>
<style>
<class name="thin"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
@ -121,4 +139,9 @@
</object>
</child>
</object>
<object class="GtkImage" id="image2">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="icon-name">document-save-symbolic</property>
</object>
</interface>

4
ubl-settings-services.css
Unescape View File

@ -118,10 +118,12 @@ background:transparent;
border-style:solid;
}
.sepat{
.separator_menu_item{
border-color: darker (@theme_bg_color);
border-top-width:1px;
border-style:solid;
margin:0px;
padding:0px;
}
.marginright image{

1687
ubl-settings-services.glade
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save