Replaced toggle buttons with check buttons

pull/34/head
parent 0e4701baab
commit 707e09096a

@ -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); yon_config_remove_by_key(AUTOUPDATE_repos);
} else { } else {
char *repos = ""; 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); yon_config_remove_by_key(REPOPUBLIC_NET_parameter);
} else { } else {
char *repos = ""; char *repos = "";
@ -1457,7 +1457,7 @@ void yon_main_window_complete(main_window *widgets){
widgets->UpdateIntervalSpin = yon_gtk_builder_get_widget(builder,"UpdateIntervalSpin"); widgets->UpdateIntervalSpin = yon_gtk_builder_get_widget(builder,"UpdateIntervalSpin");
widgets->UpdateToggleCell = GTK_CELL_RENDERER(gtk_builder_get_object(builder,"UpdateToggleCell")); widgets->UpdateToggleCell = GTK_CELL_RENDERER(gtk_builder_get_object(builder,"UpdateToggleCell"));
widgets->UpdateIntervalCombo = yon_gtk_builder_get_widget(builder,"UpdateIntervalCombo"); 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->UpdateRepoTree = yon_gtk_builder_get_widget(builder,"UpdateRepoTree");
widgets->RepositoriesRepoListConfigurationCheck = yon_gtk_builder_get_widget(builder,"RepositoriesRepoListConfigurationCheck"); widgets->RepositoriesRepoListConfigurationCheck = yon_gtk_builder_get_widget(builder,"RepositoriesRepoListConfigurationCheck");
widgets->RepositoriesDisableSystemReposCheck = yon_gtk_builder_get_widget(builder,"RepositoriesDisableSystemReposCheck"); 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->PublicationTree = yon_gtk_builder_get_widget(builder,"PublicationTree");
widgets->PublicationUpdateButton = yon_gtk_builder_get_widget(builder,"PublicationUpdateButton"); widgets->PublicationUpdateButton = yon_gtk_builder_get_widget(builder,"PublicationUpdateButton");
widgets->PublicationToggleCell = GTK_CELL_RENDERER(gtk_builder_get_object(builder,"PublicationToggleCell")); 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->WebPublicationUpdateButton = yon_gtk_builder_get_widget(builder,"WebPublicationUpdateButton");
widgets->WebPublicationAddButton = yon_gtk_builder_get_widget(builder,"WebPublicationAddButton"); widgets->WebPublicationAddButton = yon_gtk_builder_get_widget(builder,"WebPublicationAddButton");
widgets->WebPublicationEditButton = yon_gtk_builder_get_widget(builder,"WebPublicationEditButton"); widgets->WebPublicationEditButton = yon_gtk_builder_get_widget(builder,"WebPublicationEditButton");

@ -97,7 +97,7 @@ typedef struct {
GtkWidget *UpdateIntervalDefaultCheck; GtkWidget *UpdateIntervalDefaultCheck;
GtkWidget *UpdateIntervalSpin; GtkWidget *UpdateIntervalSpin;
GtkWidget *UpdateIntervalCombo; GtkWidget *UpdateIntervalCombo;
GtkWidget *UpdateRepoListCombo; GtkWidget *UpdateRepoListCheck;
GtkWidget *UpdateRepoTree; GtkWidget *UpdateRepoTree;
GtkWidget *BootCheck; GtkWidget *BootCheck;
GtkWidget *DateEntry; GtkWidget *DateEntry;
@ -120,7 +120,7 @@ typedef struct {
GtkWidget *PublicationTree; GtkWidget *PublicationTree;
GtkCellRenderer *PublicationToggleCell; GtkCellRenderer *PublicationToggleCell;
GtkWidget *PublicationUpdateButton; GtkWidget *PublicationUpdateButton;
GtkWidget *PublicationCombo; GtkWidget *PublicationCheck;
GtkListStore *PublicationList; GtkListStore *PublicationList;
GtkWidget *WebPublicationUpdateButton; GtkWidget *WebPublicationUpdateButton;

@ -393,31 +393,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="spacing">5</property> <property name="spacing">5</property>
<child> <child>
<object class="GtkLabel"> <object class="GtkCheckButton" id="UpdateRepoListCheck">
<property name="label" translatable="yes">Repositories list</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">True</property>
<property name="label" translatable="yes">Repositories list:</property> <property name="receives-default">False</property>
<property name="draw-indicator">True</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">0</property> <property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="UpdateRepoListCombo">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="active">0</property>
<items>
<item translatable="yes">Default</item>
<item translatable="yes">Choose</item>
</items>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing> </packing>
</child> </child>
</object> </object>
@ -932,10 +918,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="spacing">5</property> <property name="spacing">5</property>
<child> <child>
<object class="GtkLabel"> <object class="GtkCheckButton" id="PublicationCheck">
<property name="label" translatable="yes">Repositories list</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">True</property>
<property name="label" translatable="yes">Repositories list:</property> <property name="receives-default">False</property>
<property name="draw-indicator">True</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@ -943,22 +931,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<property name="position">0</property> <property name="position">0</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkComboBoxText" id="PublicationCombo">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="active">0</property>
<items>
<item translatable="yes">All repositories</item>
<item translatable="yes">Choose</item>
</items>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>

@ -122,7 +122,7 @@ msgid "Repositories from which the update will occur"
msgstr "" msgstr ""
#: source/ubl-strings.h:32 source/ubl-strings.h:54 #: source/ubl-strings.h:32 source/ubl-strings.h:54
msgid "Repositories list:" msgid "Repositories list"
msgstr "" msgstr ""
#: source/ubl-strings.h:33 #: source/ubl-strings.h:33

@ -123,8 +123,8 @@ msgid "Repositories from which the update will occur"
msgstr "Репозитории с которых будет происходить обновление" msgstr "Репозитории с которых будет происходить обновление"
#: source/ubl-strings.h:32 source/ubl-strings.h:54 #: source/ubl-strings.h:32 source/ubl-strings.h:54
msgid "Repositories list:" msgid "Repositories list"
msgstr "Список репозиториев:" msgstr "Список репозиториев"
#: source/ubl-strings.h:33 #: source/ubl-strings.h:33
msgid "Default" msgid "Default"

Loading…
Cancel
Save