Skip to content

Commit

Permalink
Renamed preferences widgets from options to appearance
Browse files Browse the repository at this point in the history
  • Loading branch information
@muflone
muflone committed Feb 27, 2015
1 parent c867315 commit 9f65ef2
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 27 deletions.
30 changes: 15 additions & 15 deletions remmina/src/remmina_pref_dialog.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,13 +155,13 @@ void remmina_pref_on_dialog_destroy(GtkWidget *widget, gpointer user_data)

remmina_pref.save_view_mode = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(remmina_pref_dialog->checkbutton_options_remember_last_view_mode));
remmina_pref.save_when_connect = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(remmina_pref_dialog->checkbutton_options_save_settings));
remmina_pref.invisible_toolbar = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(remmina_pref_dialog->checkbutton_options_invisible_toolbar));
remmina_pref.always_show_tab = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(remmina_pref_dialog->checkbutton_options_show_tabs));
remmina_pref.hide_connection_toolbar = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(remmina_pref_dialog->checkbutton_options_hide_toolbar));
remmina_pref.invisible_toolbar = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(remmina_pref_dialog->checkbutton_appearance_invisible_toolbar));
remmina_pref.always_show_tab = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(remmina_pref_dialog->checkbutton_appearance_show_tabs));
remmina_pref.hide_connection_toolbar = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(remmina_pref_dialog->checkbutton_appearance_hide_toolbar));

remmina_pref.default_action = gtk_combo_box_get_active(remmina_pref_dialog->comboboxtext_options_double_click);
remmina_pref.default_mode = gtk_combo_box_get_active(remmina_pref_dialog->comboboxtext_options_view_mode);
remmina_pref.tab_mode = gtk_combo_box_get_active(remmina_pref_dialog->comboboxtext_options_tab_interface);
remmina_pref.default_mode = gtk_combo_box_get_active(remmina_pref_dialog->comboboxtext_appearance_view_mode);
remmina_pref.tab_mode = gtk_combo_box_get_active(remmina_pref_dialog->comboboxtext_appearance_tab_interface);
remmina_pref.scale_quality = gtk_combo_box_get_active(remmina_pref_dialog->comboboxtext_options_scale_quality);

remmina_pref.sshtunnel_port = atoi(gtk_entry_get_text(remmina_pref_dialog->entry_options_ssh_port));
Expand Down Expand Up @@ -295,9 +295,9 @@ static void remmina_pref_dialog_init(void)

gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(remmina_pref_dialog->checkbutton_options_remember_last_view_mode), remmina_pref.save_view_mode);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(remmina_pref_dialog->checkbutton_options_save_settings), remmina_pref.save_when_connect);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(remmina_pref_dialog->checkbutton_options_invisible_toolbar), remmina_pref.invisible_toolbar);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(remmina_pref_dialog->checkbutton_options_show_tabs), remmina_pref.always_show_tab);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(remmina_pref_dialog->checkbutton_options_hide_toolbar), remmina_pref.hide_connection_toolbar);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(remmina_pref_dialog->checkbutton_appearance_invisible_toolbar), remmina_pref.invisible_toolbar);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(remmina_pref_dialog->checkbutton_appearance_show_tabs), remmina_pref.always_show_tab);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(remmina_pref_dialog->checkbutton_appearance_hide_toolbar), remmina_pref.hide_connection_toolbar);

g_snprintf(buf, sizeof(buf), "%i", remmina_pref.sshtunnel_port);
gtk_entry_set_text(remmina_pref_dialog->entry_options_ssh_port, buf);
Expand Down Expand Up @@ -361,8 +361,8 @@ static void remmina_pref_dialog_init(void)
gtk_entry_set_text(remmina_pref_dialog->entry_scrollback_lines, buf);

gtk_combo_box_set_active(remmina_pref_dialog->comboboxtext_options_double_click, remmina_pref.default_action);
gtk_combo_box_set_active(remmina_pref_dialog->comboboxtext_options_view_mode, remmina_pref.default_mode);
gtk_combo_box_set_active(remmina_pref_dialog->comboboxtext_options_tab_interface, remmina_pref.tab_mode);
gtk_combo_box_set_active(remmina_pref_dialog->comboboxtext_appearance_view_mode, remmina_pref.default_mode);
gtk_combo_box_set_active(remmina_pref_dialog->comboboxtext_appearance_tab_interface, remmina_pref.tab_mode);
gtk_combo_box_set_active(remmina_pref_dialog->comboboxtext_options_scale_quality, remmina_pref.scale_quality);

gtk_button_set_label(remmina_pref_dialog->button_keyboard_copy, remmina_key_chooser_get_value(remmina_pref.vte_shortcutkey_copy, 0));
Expand All @@ -389,12 +389,12 @@ GtkDialog* remmina_pref_dialog_new(gint default_tab, GtkWindow *parent)

remmina_pref_dialog->checkbutton_options_remember_last_view_mode = GTK_CHECK_BUTTON(GET_OBJECT("checkbutton_options_remember_last_view_mode"));
remmina_pref_dialog->checkbutton_options_save_settings = GTK_CHECK_BUTTON(GET_OBJECT("checkbutton_options_save_settings"));
remmina_pref_dialog->checkbutton_options_invisible_toolbar = GTK_CHECK_BUTTON(GET_OBJECT("checkbutton_options_invisible_toolbar"));
remmina_pref_dialog->checkbutton_options_show_tabs = GTK_CHECK_BUTTON(GET_OBJECT("checkbutton_options_show_tabs"));
remmina_pref_dialog->checkbutton_options_hide_toolbar = GTK_CHECK_BUTTON(GET_OBJECT("checkbutton_options_hide_toolbar"));
remmina_pref_dialog->checkbutton_appearance_invisible_toolbar = GTK_CHECK_BUTTON(GET_OBJECT("checkbutton_appearance_invisible_toolbar"));
remmina_pref_dialog->checkbutton_appearance_show_tabs = GTK_CHECK_BUTTON(GET_OBJECT("checkbutton_appearance_show_tabs"));
remmina_pref_dialog->checkbutton_appearance_hide_toolbar = GTK_CHECK_BUTTON(GET_OBJECT("checkbutton_appearance_hide_toolbar"));
remmina_pref_dialog->comboboxtext_options_double_click = GTK_COMBO_BOX(GET_OBJECT("comboboxtext_options_double_click"));
remmina_pref_dialog->comboboxtext_options_view_mode = GTK_COMBO_BOX(GET_OBJECT("comboboxtext_options_view_mode"));
remmina_pref_dialog->comboboxtext_options_tab_interface = GTK_COMBO_BOX(GET_OBJECT("comboboxtext_options_tab_interface"));
remmina_pref_dialog->comboboxtext_appearance_view_mode = GTK_COMBO_BOX(GET_OBJECT("comboboxtext_appearance_view_mode"));
remmina_pref_dialog->comboboxtext_appearance_tab_interface = GTK_COMBO_BOX(GET_OBJECT("comboboxtext_appearance_tab_interface"));
remmina_pref_dialog->comboboxtext_options_scale_quality = GTK_COMBO_BOX(GET_OBJECT("comboboxtext_options_scale_quality"));
remmina_pref_dialog->entry_options_ssh_port = GTK_ENTRY(GET_OBJECT("entry_options_ssh_port"));
remmina_pref_dialog->entry_options_scroll = GTK_ENTRY(GET_OBJECT("entry_options_scroll"));
Expand Down
10 changes: 5 additions & 5 deletions remmina/src/remmina_pref_dialog.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,12 @@ typedef struct _RemminaPrefDialog

GtkCheckButton *checkbutton_options_remember_last_view_mode;
GtkCheckButton *checkbutton_options_save_settings;
GtkCheckButton *checkbutton_options_invisible_toolbar;
GtkCheckButton *checkbutton_options_show_tabs;
GtkCheckButton *checkbutton_options_hide_toolbar;
GtkCheckButton *checkbutton_appearance_invisible_toolbar;
GtkCheckButton *checkbutton_appearance_show_tabs;
GtkCheckButton *checkbutton_appearance_hide_toolbar;
GtkComboBox *comboboxtext_options_double_click;
GtkComboBox *comboboxtext_options_view_mode;
GtkComboBox *comboboxtext_options_tab_interface;
GtkComboBox *comboboxtext_appearance_view_mode;
GtkComboBox *comboboxtext_appearance_tab_interface;
GtkComboBox *comboboxtext_options_scale_quality;
GtkEntry *entry_options_ssh_port;
GtkEntry *entry_options_scroll;
Expand Down
14 changes: 7 additions & 7 deletions remmina/ui/remmina_preferences.glade
View file
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@
<property name="row_spacing">5</property>
<property name="column_spacing">7</property>
<child>
<object class="GtkCheckButton" id="checkbutton_options_invisible_toolbar">
<object class="GtkCheckButton" id="checkbutton_appearance_invisible_toolbar">
<property name="label" translatable="yes">Invisible toolbar in fullscreen mode</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
Expand All @@ -308,7 +308,7 @@
</packing>
</child>
<child>
<object class="GtkCheckButton" id="checkbutton_options_show_tabs">
<object class="GtkCheckButton" id="checkbutton_appearance_show_tabs">
<property name="label" translatable="yes">Always show tabs</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
Expand All @@ -323,7 +323,7 @@
</packing>
</child>
<child>
<object class="GtkCheckButton" id="checkbutton_options_hide_toolbar">
<object class="GtkCheckButton" id="checkbutton_appearance_hide_toolbar">
<property name="label" translatable="yes">Hide toolbar in tabbed interface</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
Expand All @@ -338,7 +338,7 @@
</packing>
</child>
<child>
<object class="GtkLabel" id="label_options_view_mode">
<object class="GtkLabel" id="label_appearance_view_mode">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
Expand All @@ -350,7 +350,7 @@
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="comboboxtext_options_view_mode">
<object class="GtkComboBoxText" id="comboboxtext_appearance_view_mode">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
Expand All @@ -368,7 +368,7 @@
</packing>
</child>
<child>
<object class="GtkLabel" id="label_options_tab_interface">
<object class="GtkLabel" id="label_appearance_tab_interface">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
Expand All @@ -380,7 +380,7 @@
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="comboboxtext_options_tab_interface">
<object class="GtkComboBoxText" id="comboboxtext_appearance_tab_interface">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
Expand Down

0 comments on commit 9f65ef2

Please sign in to comment.