diff --git a/source/ubl-settings-update.c b/source/ubl-settings-update.c index 5cc1408..7570b33 100644 --- a/source/ubl-settings-update.c +++ b/source/ubl-settings-update.c @@ -65,7 +65,7 @@ void yon_save_interface(main_window *widgets){ } - if (!gtk_combo_box_get_active(GTK_COMBO_BOX(widgets->UpdateRepoListCombo))){ + if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->UpdateRepoListCheck))){ yon_config_remove_by_key(AUTOUPDATE_repos); } else { char *repos = ""; @@ -112,7 +112,7 @@ void yon_save_interface(main_window *widgets){ } } - if (!gtk_combo_box_get_active(GTK_COMBO_BOX(widgets->PublicationCombo))){ + if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->PublicationCheck))){ yon_config_remove_by_key(REPOPUBLIC_NET_parameter); } else { char *repos = ""; @@ -1457,7 +1457,7 @@ void yon_main_window_complete(main_window *widgets){ widgets->UpdateIntervalSpin = yon_gtk_builder_get_widget(builder,"UpdateIntervalSpin"); widgets->UpdateToggleCell = GTK_CELL_RENDERER(gtk_builder_get_object(builder,"UpdateToggleCell")); widgets->UpdateIntervalCombo = yon_gtk_builder_get_widget(builder,"UpdateIntervalCombo"); - widgets->UpdateRepoListCombo = yon_gtk_builder_get_widget(builder,"UpdateRepoListCombo"); + widgets->UpdateRepoListCheck = yon_gtk_builder_get_widget(builder,"UpdateRepoListCheck"); widgets->UpdateRepoTree = yon_gtk_builder_get_widget(builder,"UpdateRepoTree"); widgets->RepositoriesRepoListConfigurationCheck = yon_gtk_builder_get_widget(builder,"RepositoriesRepoListConfigurationCheck"); widgets->RepositoriesDisableSystemReposCheck = yon_gtk_builder_get_widget(builder,"RepositoriesDisableSystemReposCheck"); @@ -1473,7 +1473,7 @@ void yon_main_window_complete(main_window *widgets){ widgets->PublicationTree = yon_gtk_builder_get_widget(builder,"PublicationTree"); widgets->PublicationUpdateButton = yon_gtk_builder_get_widget(builder,"PublicationUpdateButton"); widgets->PublicationToggleCell = GTK_CELL_RENDERER(gtk_builder_get_object(builder,"PublicationToggleCell")); - widgets->PublicationCombo = yon_gtk_builder_get_widget(builder,"PublicationCombo"); + widgets->PublicationCheck = yon_gtk_builder_get_widget(builder,"PublicationCheck"); widgets->WebPublicationUpdateButton = yon_gtk_builder_get_widget(builder,"WebPublicationUpdateButton"); widgets->WebPublicationAddButton = yon_gtk_builder_get_widget(builder,"WebPublicationAddButton"); widgets->WebPublicationEditButton = yon_gtk_builder_get_widget(builder,"WebPublicationEditButton"); diff --git a/source/ubl-settings-update.h b/source/ubl-settings-update.h index 7b41468..ecbed1e 100644 --- a/source/ubl-settings-update.h +++ b/source/ubl-settings-update.h @@ -97,7 +97,7 @@ typedef struct { GtkWidget *UpdateIntervalDefaultCheck; GtkWidget *UpdateIntervalSpin; GtkWidget *UpdateIntervalCombo; - GtkWidget *UpdateRepoListCombo; + GtkWidget *UpdateRepoListCheck; GtkWidget *UpdateRepoTree; GtkWidget *BootCheck; GtkWidget *DateEntry; @@ -120,7 +120,7 @@ typedef struct { GtkWidget *PublicationTree; GtkCellRenderer *PublicationToggleCell; GtkWidget *PublicationUpdateButton; - GtkWidget *PublicationCombo; + GtkWidget *PublicationCheck; GtkListStore *PublicationList; GtkWidget *WebPublicationUpdateButton; diff --git a/ubl-settings-update.glade b/ubl-settings-update.glade index 4fb9faa..5b0b8a0 100644 --- a/ubl-settings-update.glade +++ b/ubl-settings-update.glade @@ -393,31 +393,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. False 5 - + + Repositories list True - False - Repositories list: + True + False + True False True - 0 - - - - - True - False - 0 - - Default - Choose - - - - True - True - 1 + 2 @@ -932,10 +918,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. False 5 - + + Repositories list True - False - Repositories list: + True + False + True False @@ -943,22 +931,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 0 - - - True - False - 0 - - All repositories - Choose - - - - True - True - 1 - - False diff --git a/ubl-settings-update.pot b/ubl-settings-update.pot index 2f5476c..ea2974b 100644 --- a/ubl-settings-update.pot +++ b/ubl-settings-update.pot @@ -122,7 +122,7 @@ msgid "Repositories from which the update will occur" msgstr "" #: source/ubl-strings.h:32 source/ubl-strings.h:54 -msgid "Repositories list:" +msgid "Repositories list" msgstr "" #: source/ubl-strings.h:33 diff --git a/ubl-settings-update_ru.po b/ubl-settings-update_ru.po index 100e8bc..2b2b431 100644 --- a/ubl-settings-update_ru.po +++ b/ubl-settings-update_ru.po @@ -123,8 +123,8 @@ msgid "Repositories from which the update will occur" msgstr "Репозитории с которых будет происходить обновление" #: source/ubl-strings.h:32 source/ubl-strings.h:54 -msgid "Repositories list:" -msgstr "Список репозиториев:" +msgid "Repositories list" +msgstr "Список репозиториев" #: source/ubl-strings.h:33 msgid "Default"