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

Fixed loading cancelation of custom configuration #80

Merged
asmeron merged 5 commits from YanTheKaller/ubl-settings-services:master into master 10 months ago
Conversation 0 Commits 5 Files Changed 5
5 changed files with 35 additions and 32 deletions
Show Stats Download Patch File Download Diff File

9
source/ubl-settings-services.c
Unescape View File

@ -30,7 +30,9 @@ void on_save_done(main_window *widgets, config_str output, int size){
} }
void yon_load_proceed(YON_CONFIG_TYPE type){ void yon_load_proceed(YON_CONFIG_TYPE type){
if (type!=YON_CONFIG_CUSTOM){
yon_config_clean(); yon_config_clean();
}
if (!yon_char_is_empty(config_get_default_command)) if (!yon_char_is_empty(config_get_default_command))
yon_config_load_config(YON_CONFIG_DEFAULT,config_get_default_command,NULL); yon_config_load_config(YON_CONFIG_DEFAULT,config_get_default_command,NULL);
if (type==YON_CONFIG_GLOBAL){ if (type==YON_CONFIG_GLOBAL){
@ -59,6 +61,7 @@ void yon_load_proceed(YON_CONFIG_TYPE type){
} else { } else {
gtk_widget_destroy(dialog); gtk_widget_destroy(dialog);
} }
yon_config_clean();
char *command = yon_config_get_custom_command(path); char *command = yon_config_get_custom_command(path);
yon_config_load_config(type,command,NULL); yon_config_load_config(type,command,NULL);
} }
@ -425,7 +428,7 @@ gboolean yon_filter(GtkTreeModel* model, GtkTreeIter *iter, main_window *widgets
int filter_active = gtk_combo_box_get_active(GTK_COMBO_BOX(combo)); int filter_active = gtk_combo_box_get_active(GTK_COMBO_BOX(combo));
if (filter_active>0){ if (filter_active>0){
if (filter_active>3){ if (filter_active>3){
char *text = (char*)gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(combo)); char *text = (char*)gtk_combo_box_get_active_id(GTK_COMBO_BOX(combo));
if (yon_get_unit_type(text)!=(enum YON_UNIT_TYPE)type) type_filter = 0; if (yon_get_unit_type(text)!=(enum YON_UNIT_TYPE)type) type_filter = 0;
} else { } else {
switch (filter_active){ switch (filter_active){
@ -964,9 +967,9 @@ void on_config_log_save(GtkWidget *self, log_window *window){
char *text = gtk_text_buffer_get_text(buffer,&start,&end,1); char *text = gtk_text_buffer_get_text(buffer,&start,&end,1);
if (text){ if (text){
if (yon_file_save(window->target,text)){ if (yon_file_save(window->target,text)){
yon_ubl_status_box_render(SAVED_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE); yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),SAVED_LABEL,5,BACKGROUND_IMAGE_SUCCESS_TYPE);
} else { } else {
yon_ubl_status_box_render(ERROR_LABEL,BACKGROUND_IMAGE_FAIL_TYPE); yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),ERROR_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
} }
} }
} }

2
source/ubl-strings.h
Unescape View File

@ -138,7 +138,7 @@
#define STATE_ABANDONED_LABEL _("abandoned") #define STATE_ABANDONED_LABEL _("abandoned")
#define SERVICE_STATE_TITLE_LABEL(target) yon_char_append(_("State of "),target) #define SERVICE_STATE_TITLE_LABEL(target) yon_char_append(_("State of "),target)
#define SERVICE_LOG_TITLE_LABEL(target) yon_char_unite(_("View")," ",target," ",_("log"),NULL) #define SERVICE_LOG_TITLE_LABEL(target) yon_char_unite(_("View log")," ",target,NULL)
#define SERVICE_UNIT_EDIT_TITLE_LABEL _("Edit unit file") #define SERVICE_UNIT_EDIT_TITLE_LABEL _("Edit unit file")
#define SYSTEMD_REEXEC_ERROR_LABEL _("Failed to re-execute systemd") #define SYSTEMD_REEXEC_ERROR_LABEL _("Failed to re-execute systemd")

44
ubl-settings-services.glade
Unescape View File

@ -574,22 +574,22 @@
<object class="GtkComboBoxText" id="SystemFiltersCombo"> <object class="GtkComboBoxText" id="SystemFiltersCombo">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="active">0</property> <property name="active">7</property>
<items> <items>
<item translatable="yes">All</item> <item translatable="yes">All</item>
<item translatable="yes">Autolaunch in configuration</item> <item translatable="yes">Autolaunch in configuration</item>
<item translatable="yes">Stopped in configuration</item> <item translatable="yes">Stopped in configuration</item>
<item translatable="yes">Blocked in configuration</item> <item translatable="yes">Blocked in configuration</item>
<item translatable="yes">service</item> <item id="automount">Automount</item>
<item translatable="yes">swap</item> <item id="device">Device</item>
<item translatable="yes">socket</item> <item id="path">Path</item>
<item translatable="yes">target</item> <item id="service">Service</item>
<item translatable="yes">device</item> <item id="scope" translatable="yes">Scope</item>
<item translatable="yes">automount</item> <item id="slice">Slice</item>
<item translatable="yes">timer</item> <item id="socket">Socket</item>
<item translatable="yes">slice</item> <item id="swap">Swap</item>
<item translatable="yes">path</item> <item id="target">Target</item>
<item translatable="yes">scope</item> <item id="timer">Timer</item>
</items> </items>
</object> </object>
<packing> <packing>
@ -1179,22 +1179,22 @@
<object class="GtkComboBoxText" id="UserFiltersCombo"> <object class="GtkComboBoxText" id="UserFiltersCombo">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="active">0</property> <property name="active">7</property>
<items> <items>
<item translatable="yes">All</item> <item translatable="yes">All</item>
<item translatable="yes">Autolaunch in configuration</item> <item translatable="yes">Autolaunch in configuration</item>
<item translatable="yes">Stopped in configuration</item> <item translatable="yes">Stopped in configuration</item>
<item translatable="yes">Blocked in configuration</item> <item translatable="yes">Blocked in configuration</item>
<item translatable="yes">service</item> <item id="service">Service</item>
<item translatable="yes">swap</item> <item id="automount">Automount</item>
<item translatable="yes">socket</item> <item id="device">Device</item>
<item translatable="yes">target</item> <item id="path">Path</item>
<item translatable="yes">device</item> <item id="scope">Scope</item>
<item translatable="yes">automount</item> <item id="slice">Slice</item>
<item translatable="yes">timer</item> <item id="socket">Socket</item>
<item translatable="yes">path</item> <item id="swap">Swap</item>
<item translatable="yes">slice</item> <item id="target">Target</item>
<item translatable="yes">scope</item> <item id="timer">Timer</item>
</items> </items>
</object> </object>
<packing> <packing>

2
ubl-settings-services.pot
Unescape View File

@ -459,7 +459,7 @@ msgid "State of "
msgstr "" msgstr ""
#: source/ubl-strings.h:141 #: source/ubl-strings.h:141
msgid "View" msgid "View log"
msgstr "" msgstr ""
#: source/ubl-strings.h:141 #: source/ubl-strings.h:141

8
ubl-settings-services_ru.po
Unescape View File

@ -143,7 +143,7 @@ msgstr "Описание:"
#: source/ubl-strings.h:41 #: source/ubl-strings.h:41
msgid "Service" msgid "Service"
msgstr "Сервис" msgstr "Служба"
#: source/ubl-strings.h:47 #: source/ubl-strings.h:47
msgid "Service list is loading" msgid "Service list is loading"
@ -459,11 +459,11 @@ msgstr "заброшен"
#: source/ubl-strings.h:140 #: source/ubl-strings.h:140
msgid "State of " msgid "State of "
msgstr "Состояние сервиса " msgstr "Состояние "
#: source/ubl-strings.h:141 #: source/ubl-strings.h:141
msgid "View" msgid "View log"
msgstr "Просмотр" msgstr "Просмотр лога"
#: source/ubl-strings.h:141 #: source/ubl-strings.h:141
msgid "log" msgid "log"

Write Preview
Loading…
Cancel
Save