diff options
author | Vincent Sanders <vince@kyllikki.org> | 2014-08-02 02:19:06 +0100 |
---|---|---|
committer | Vincent Sanders <vince@kyllikki.org> | 2014-08-02 02:20:25 +0100 |
commit | ca077b06386bf86c3f7e8b13ba8a90d59ccf54ec (patch) | |
tree | 43a7ae4e99748c93ba7c3c87454f7eff88c28b4c /gtk | |
parent | c0548fc472ac2c8e8bbc9e6254ee785f69cfadf2 (diff) | |
download | netsurf-ca077b06386bf86c3f7e8b13ba8a90d59ccf54ec.tar.gz netsurf-ca077b06386bf86c3f7e8b13ba8a90d59ccf54ec.tar.bz2 |
fixup preference dialog handling of Developer view options
Diffstat (limited to 'gtk')
-rw-r--r-- | gtk/dialogs/preferences.c | 24 | ||||
-rw-r--r-- | gtk/options.h | 3 | ||||
-rw-r--r-- | gtk/res/options.gtk2.ui | 887 | ||||
-rw-r--r-- | gtk/res/options.gtk3.ui | 75 |
4 files changed, 668 insertions, 321 deletions
diff --git a/gtk/dialogs/preferences.c b/gtk/dialogs/preferences.c index d53d61380..f38c7e9bc 100644 --- a/gtk/dialogs/preferences.c +++ b/gtk/dialogs/preferences.c @@ -170,8 +170,8 @@ G_MODULE_EXPORT void nsgtk_preferences_checkShowSingleTab_toggled(GtkToggleButto G_MODULE_EXPORT void nsgtk_preferences_checkShowSingleTab_realize(GtkWidget *widget, struct ppref *priv); G_MODULE_EXPORT void nsgtk_preferences_comboTabPosition_changed(GtkComboBox *widget, struct ppref *priv); G_MODULE_EXPORT void nsgtk_preferences_comboTabPosition_realize(GtkWidget *widget, struct ppref *priv); -G_MODULE_EXPORT void nsgtk_preferences_sourceButtonWindow_toggled(GtkToggleButton *togglebutton, struct ppref *priv); -G_MODULE_EXPORT void nsgtk_preferences_sourceButtonWindow_realize(GtkWidget *widget, struct ppref *priv); +G_MODULE_EXPORT void nsgtk_preferences_comboDeveloperView_changed(GtkComboBox *widget, struct ppref *priv); +G_MODULE_EXPORT void nsgtk_preferences_comboDeveloperView_realize(GtkWidget *widget, struct ppref *priv); G_MODULE_EXPORT void nsgtk_preferences_comboButtonType_changed(GtkComboBox *widget, struct ppref *priv); G_MODULE_EXPORT void nsgtk_preferences_comboButtonType_realize(GtkWidget *widget, struct ppref *priv); G_MODULE_EXPORT void nsgtk_preferences_setCurrentPage_clicked(GtkButton *button, struct ppref *priv); @@ -822,25 +822,23 @@ nsgtk_preferences_comboTabPosition_realize(GtkWidget *widget, nsoption_int(position_tab)); } -/* Source */ - -/* source view opening */ -TOGGLEBUTTON_SIGNALS(sourceButtonTab, source_tab) +/* Tools */ +/* developer view opening */ G_MODULE_EXPORT void -nsgtk_preferences_sourceButtonWindow_toggled(GtkToggleButton *togglebutton, - struct ppref *priv) +nsgtk_preferences_comboDeveloperView_changed(GtkComboBox *widget, + struct ppref *priv) { - nsoption_set_bool(source_tab, - !gtk_toggle_button_get_active(togglebutton)); + /* set the option */ + nsoption_set_int(developer_view, gtk_combo_box_get_active(widget)); } G_MODULE_EXPORT void -nsgtk_preferences_sourceButtonWindow_realize(GtkWidget *widget, +nsgtk_preferences_comboDeveloperView_realize(GtkWidget *widget, struct ppref *priv) { - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), - !nsoption_bool(source_tab)); + gtk_combo_box_set_active(GTK_COMBO_BOX(widget), + nsoption_int(developer_view)); } diff --git a/gtk/options.h b/gtk/options.h index cdedbc6a7..63f2ad177 100644 --- a/gtk/options.h +++ b/gtk/options.h @@ -65,9 +65,6 @@ NSOPTION_BOOL(new_blank, false) /* path to save hotlist file */ NSOPTION_STRING(hotlist_path, NULL) -/* open source views in a tab */ -NSOPTION_BOOL(source_tab, false) - /* Developer information viewer display method */ NSOPTION_INTEGER(developer_view, 0) diff --git a/gtk/res/options.gtk2.ui b/gtk/res/options.gtk2.ui index b0d45bb2f..9c2f5c6d2 100644 --- a/gtk/res/options.gtk2.ui +++ b/gtk/res/options.gtk2.ui @@ -1,22 +1,63 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <interface> - <!-- interface-requires gtk+ 2.12 --> + <requires lib="gtk+" version="2.16"/> <!-- interface-naming-policy project-wide --> <object class="GtkDialog" id="dialogPreferences"> + <property name="can_focus">False</property> <property name="border_width">5</property> <property name="title" translatable="yes">preferencesTitle</property> <property name="window_position">center-on-parent</property> <property name="destroy_with_parent">True</property> <property name="type_hint">dialog</property> - <property name="has_separator">False</property> - <signal name="destroy" handler="nsgtk_preferences_dialogPreferences_destroy"/> - <signal name="response" handler="nsgtk_preferences_dialogPreferences_response"/> - <signal name="delete_event" handler="nsgtk_preferences_dialogPreferences_deleteevent"/> + <signal name="destroy" handler="nsgtk_preferences_dialogPreferences_destroy" swapped="no"/> + <signal name="delete-event" handler="nsgtk_preferences_dialogPreferences_deleteevent" swapped="no"/> + <signal name="response" handler="nsgtk_preferences_dialogPreferences_response" swapped="no"/> <child internal-child="vbox"> <object class="GtkVBox" id="vbox_dialog"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <property name="spacing">2</property> + <child internal-child="action_area"> + <object class="GtkHButtonBox" id="dialog-action_area1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="layout_style">edge</property> + <child> + <object class="GtkButton" id="help"> + <property name="label">gtk-help</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="close"> + <property name="label">gtk-close</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> <child> <object class="GtkNotebook" id="notebook1"> <property name="visible">True</property> @@ -24,31 +65,35 @@ <child> <object class="GtkVBox" id="vbox_main"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkFrame" id="frame_main_startup"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> <object class="GtkAlignment" id="alignment1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="top_padding">6</property> <property name="left_padding">12</property> <property name="right_padding">12</property> <child> <object class="GtkVBox" id="vbox2"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkHBox" id="hbox1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">12</property> <child> <object class="GtkLabel" id="label_startup_page"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">preferencesStartupPage</property> </object> <packing> @@ -61,59 +106,69 @@ <object class="GtkEntry" id="entryHomePageURL"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="invisible_char">●</property> - <signal name="changed" handler="nsgtk_preferences_entryHomePageURL_changed"/> - <signal name="realize" handler="nsgtk_preferences_entryHomePageURL_realize"/> + <property name="invisible_char">●</property> + <property name="primary_icon_activatable">False</property> + <property name="secondary_icon_activatable">False</property> + <property name="primary_icon_sensitive">True</property> + <property name="secondary_icon_sensitive">True</property> + <signal name="changed" handler="nsgtk_preferences_entryHomePageURL_changed" swapped="no"/> + <signal name="realize" handler="nsgtk_preferences_entryHomePageURL_realize" swapped="no"/> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="pack_type">end</property> <property name="position">1</property> </packing> </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkHBox" id="hbox2"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <placeholder/> </child> <child> - <object class="GtkButton" id="setCurrentPage"> - <property name="label" translatable="yes">preferencesStartupPageCurrent</property> + <object class="GtkButton" id="setDefaultPage"> + <property name="label" translatable="yes">preferencesStartupPageDefault</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <signal name="clicked" handler="nsgtk_preferences_setCurrentPage_clicked"/> + <signal name="clicked" handler="nsgtk_preferences_setDefaultPage_clicked" swapped="no"/> </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="pack_type">end</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> <child> - <object class="GtkButton" id="setDefaultPage"> - <property name="label" translatable="yes">preferencesStartupPageDefault</property> + <object class="GtkButton" id="setCurrentPage"> + <property name="label" translatable="yes">preferencesStartupPageCurrent</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <signal name="clicked" handler="nsgtk_preferences_setDefaultPage_clicked"/> + <signal name="clicked" handler="nsgtk_preferences_setCurrentPage_clicked" swapped="no"/> </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="pack_type">end</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> </object> <packing> + <property name="expand">True</property> <property name="fill">False</property> <property name="position">1</property> </packing> @@ -125,6 +180,7 @@ <child type="label"> <object class="GtkLabel" id="label_main_startup"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">preferencesStartup</property> <property name="use_markup">True</property> </object> @@ -132,6 +188,7 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="padding">6</property> <property name="position">0</property> </packing> @@ -139,18 +196,20 @@ <child> <object class="GtkFrame" id="frame_main_search"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> <object class="GtkAlignment" id="alignment2"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="top_padding">6</property> <property name="left_padding">12</property> <property name="right_padding">12</property> <child> <object class="GtkVBox" id="vbox3"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkCheckButton" id="checkUrlSearch"> @@ -159,20 +218,24 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="draw_indicator">True</property> - <signal name="realize" handler="nsgtk_preferences_checkUrlSearch_realize"/> - <signal name="toggled" handler="nsgtk_preferences_checkUrlSearch_toggled"/> + <signal name="toggled" handler="nsgtk_preferences_checkUrlSearch_toggled" swapped="no"/> + <signal name="realize" handler="nsgtk_preferences_checkUrlSearch_realize" swapped="no"/> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkHBox" id="hbox3"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">12</property> <child> <object class="GtkLabel" id="label5"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">preferencesSearchProvider</property> </object> <packing> @@ -184,9 +247,10 @@ <child> <object class="GtkComboBox" id="comboSearch"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="model">liststore_search_provider</property> - <signal name="changed" handler="nsgtk_preferences_comboSearch_changed"/> - <signal name="realize" handler="nsgtk_preferences_comboSearch_realize"/> + <signal name="changed" handler="nsgtk_preferences_comboSearch_changed" swapped="no"/> + <signal name="realize" handler="nsgtk_preferences_comboSearch_realize" swapped="no"/> <child> <object class="GtkCellRendererText" id="cellrenderertext1"/> <attributes> @@ -195,11 +259,15 @@ </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -210,6 +278,7 @@ <child type="label"> <object class="GtkLabel" id="label4"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">preferencesSearch</property> <property name="use_markup">True</property> </object> @@ -217,6 +286,7 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="padding">6</property> <property name="position">1</property> </packing> @@ -224,18 +294,20 @@ <child> <object class="GtkFrame" id="frame_main_downloads"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> <object class="GtkAlignment" id="alignment3"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="top_padding">6</property> <property name="left_padding">12</property> <property name="right_padding">12</property> <child> <object class="GtkVBox" id="vbox4"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkCheckButton" id="checkClearDownloads"> @@ -244,11 +316,12 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="draw_indicator">True</property> - <signal name="realize" handler="nsgtk_preferences_checkClearDownloads_realize"/> - <signal name="toggled" handler="nsgtk_preferences_checkClearDownloads_toggled"/> + <signal name="toggled" handler="nsgtk_preferences_checkClearDownloads_toggled" swapped="no"/> + <signal name="realize" handler="nsgtk_preferences_checkClearDownloads_realize" swapped="no"/> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> @@ -259,42 +332,50 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="draw_indicator">True</property> - <signal name="realize" handler="nsgtk_preferences_checkRequestOverwrite_realize"/> - <signal name="toggled" handler="nsgtk_preferences_checkRequestOverwrite_toggled"/> + <signal name="toggled" handler="nsgtk_preferences_checkRequestOverwrite_toggled" swapped="no"/> + <signal name="realize" handler="nsgtk_preferences_checkRequestOverwrite_realize" swapped="no"/> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkHBox" id="hbox4"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">12</property> <child> <object class="GtkLabel" id="label8"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">preferencesDownloadsLocation</property> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkFileChooserButton" id="fileChooserDownloads"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="action">select-folder</property> - <signal name="selection_changed" handler="nsgtk_preferences_fileChooserDownloads_selectionchanged"/> - <signal name="realize" handler="nsgtk_preferences_fileChooserDownloads_realize"/> + <signal name="selection-changed" handler="nsgtk_preferences_fileChooserDownloads_selectionchanged" swapped="no"/> + <signal name="realize" handler="nsgtk_preferences_fileChooserDownloads_realize" swapped="no"/> </object> <packing> + <property name="expand">True</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">2</property> </packing> </child> @@ -305,6 +386,7 @@ <child type="label"> <object class="GtkLabel" id="label7"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">preferencesDownloads</property> <property name="use_markup">True</property> </object> @@ -312,6 +394,7 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="padding">6</property> <property name="position">2</property> </packing> @@ -321,6 +404,7 @@ <child type="tab"> <object class="GtkLabel" id="label1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">preferencesMainTabtitle</property> </object> <packing> @@ -330,29 +414,33 @@ <child> <object class="GtkVBox" id="vbox_appearance"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkFrame" id="frame_appearance_theme"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> <object class="GtkAlignment" id="alignment4"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="top_padding">6</property> <property name="left_padding">12</property> <property name="right_padding">12</property> <child> <object class="GtkHBox" id="themehbox"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">12</property> <child> <object class="GtkComboBox" id="comboTheme"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="model">liststore_themes</property> - <signal name="changed" handler="nsgtk_preferences_comboTheme_changed"/> - <signal name="realize" handler="nsgtk_preferences_comboTheme_realize"/> + <signal name="changed" handler="nsgtk_preferences_comboTheme_changed" swapped="no"/> + <signal name="realize" handler="nsgtk_preferences_comboTheme_realize" swapped="no"/> <child> <object class="GtkCellRendererText" id="cellrenderertext9"/> <attributes> @@ -361,6 +449,8 @@ </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> @@ -370,10 +460,11 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <signal name="clicked" handler="nsgtk_preferences_buttonAddTheme_clicked"/> + <signal name="clicked" handler="nsgtk_preferences_buttonAddTheme_clicked" swapped="no"/> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="pack_type">end</property> <property name="position">1</property> </packing> @@ -385,6 +476,7 @@ <child type="label"> <object class="GtkLabel" id="label3"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">preferencesThemes</property> <property name="use_markup">True</property> </object> @@ -392,6 +484,7 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="padding">6</property> <property name="position">0</property> </packing> @@ -399,18 +492,20 @@ <child> <object class="GtkFrame" id="frame_appearance_tabs"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> <object class="GtkAlignment" id="alignment5"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="top_padding">6</property> <property name="left_padding">12</property> <property name="right_padding">12</property> <child> <object class="GtkVBox" id="vbox5"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkCheckButton" id="checkShowSingleTab"> @@ -419,10 +514,12 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="draw_indicator">True</property> - <signal name="realize" handler="nsgtk_preferences_checkShowSingleTab_realize"/> - <signal name="toggled" handler="nsgtk_preferences_checkShowSingleTab_toggled"/> + <signal name="toggled" handler="nsgtk_preferences_checkShowSingleTab_toggled" swapped="no"/> + <signal name="realize" handler="nsgtk_preferences_checkShowSingleTab_realize" swapped="no"/> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> @@ -433,10 +530,12 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="draw_indicator">True</property> - <signal name="realize" handler="nsgtk_preferences_checkFocusNew_realize"/> - <signal name="toggled" handler="nsgtk_preferences_checkFocusNew_toggled"/> + <signal name="toggled" handler="nsgtk_preferences_checkFocusNew_toggled" swapped="no"/> + <signal name="realize" handler="nsgtk_preferences_checkFocusNew_realize" swapped="no"/> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -447,20 +546,24 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="draw_indicator">True</property> - <signal name="realize" handler="nsgtk_preferences_checkNewBlank_realize"/> - <signal name="toggled" handler="nsgtk_preferences_checkNewBlank_toggled"/> + <signal name="toggled" handler="nsgtk_preferences_checkNewBlank_toggled" swapped="no"/> + <signal name="realize" handler="nsgtk_preferences_checkNewBlank_realize" swapped="no"/> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">2</property> </packing> </child> <child> <object class="GtkHBox" id="hbox5"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">12</property> <child> <object class="GtkLabel" id="label9"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">preferencesTabsPosition</property> </object> <packing> @@ -472,9 +575,10 @@ <child> <object class="GtkComboBox" id="comboTabPosition"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="model">liststore_tab_position</property> - <signal name="changed" handler="nsgtk_preferences_comboTabPosition_changed"/> - <signal name="realize" handler="nsgtk_preferences_comboTabPosition_realize"/> + <signal name="changed" handler="nsgtk_preferences_comboTabPosition_changed" swapped="no"/> + <signal name="realize" handler="nsgtk_preferences_comboTabPosition_realize" swapped="no"/> <child> <object class="GtkCellRendererText" id="cellrenderertext2"/> <attributes> @@ -483,11 +587,15 @@ </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">3</property> </packing> </child> @@ -498,6 +606,7 @@ <child type="label"> <object class="GtkLabel" id="label6"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">preferencesTabs</property> <property name="use_markup">True</property> </object> @@ -505,73 +614,71 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="padding">6</property> <property name="position">1</property> </packing> </child> <child> - <object class="GtkFrame" id="frame_appearance_source"> + <object class="GtkFrame" id="frame_appearance_tools"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> <object class="GtkAlignment" id="alignment7"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="top_padding">6</property> <property name="left_padding">12</property> <property name="right_padding">12</property> <child> <object class="GtkVBox" id="vbox1"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> - <object class="GtkLabel" id="label13"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">preferencesSourceOpen</property> - </object> - <packing> - <property name="position">0</property> - </packing> - </child> - <child> <object class="GtkHBox" id="hbox6"> <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">6</property> <child> - <object class="GtkRadioButton" id="sourceButtonWindow"> - <property name="label" translatable="yes">preferencesSourceWindow</property> + <object class="GtkLabel" id="label13"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - <property name="group">sourceButtonTab</property> - <signal name="realize" handler="nsgtk_preferences_sourceButtonWindow_realize"/> - <signal name="toggled" handler="nsgtk_preferences_sourceButtonWindow_toggled"/> + <property name="can_focus">False</property> + <property name="label" translatable="yes">preferencesDeveloperView</property> </object> <packing> + <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkRadioButton" id="sourceButtonTab"> - <property name="label" translatable="yes">preferencesSourceTab</property> + <object class="GtkComboBox" id="comboboxDeveloperView"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - <signal name="realize" handler="nsgtk_preferences_sourceButtonTab_realize"/> - <signal name="toggled" handler="nsgtk_preferences_sourceButtonTab_toggled"/> + <property name="can_focus">False</property> + <property name="model">liststore_developer_view</property> + <signal name="changed" handler="nsgtk_preferences_comboDeveloperView_changed" swapped="no"/> + <signal name="realize" handler="nsgtk_preferences_comboDeveloperView_realize" swapped="no"/> + <child> + <object class="GtkCellRendererText" id="cellrenderertext10"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> - <property name="position">1</property> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> </object> @@ -581,13 +688,15 @@ <child type="label"> <object class="GtkLabel" id="label12"> <property name="visible">True</property> - <property name="label" translatable="yes">preferencesSource</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">preferencesTools</property> <property name="use_markup">True</property> </object> </child> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="padding">6</property> <property name="position">2</property> </packing> @@ -595,18 +704,20 @@ <child> <object class="GtkFrame" id="frame_appearance_url"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> <object class="GtkAlignment" id="alignment8"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="top_padding">6</property> <property name="left_padding">12</property> <property name="right_padding">12</property> <child> <object class="GtkVBox" id="vbox7"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkCheckButton" id="checkDisplayRecentURLs"> @@ -615,10 +726,12 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="draw_indicator">True</property> - <signal name="realize" handler="nsgtk_preferences_checkDisplayRecentURLs_realize"/> - <signal name="toggled" handler="nsgtk_preferences_checkDisplayRecentURLs_toggled"/> + <signal name="toggled" handler="nsgtk_preferences_checkDisplayRecentURLs_toggled" swapped="no"/> + <signal name="realize" handler="nsgtk_preferences_checkDisplayRecentURLs_realize" swapped="no"/> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> @@ -629,6 +742,7 @@ <child type="label"> <object class="GtkLabel" id="label14"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">preferencesURLbar</property> <property name="use_markup">True</property> </object> @@ -636,6 +750,7 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="padding">7</property> <property name="position">3</property> </packing> @@ -643,39 +758,45 @@ <child> <object class="GtkFrame" id="frame_appearance_toolbar"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> <object class="GtkAlignment" id="alignment9"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="top_padding">6</property> <property name="left_padding">12</property> <property name="right_padding">12</property> <child> <object class="GtkVBox" id="vbox8"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkHBox" id="hbox7"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="label16"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">preferencesToolbarButtons</property> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkComboBox" id="comboButtonType"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="model">liststore_toolbar_buttontype</property> - <signal name="changed" handler="nsgtk_preferences_comboButtonType_changed"/> - <signal name="realize" handler="nsgtk_preferences_comboButtonType_realize"/> + <signal name="changed" handler="nsgtk_preferences_comboButtonType_changed" swapped="no"/> + <signal name="realize" handler="nsgtk_preferences_comboButtonType_realize" swapped="no"/> <child> <object class="GtkCellRendererText" id="cellrenderertext3"/> <attributes> @@ -684,11 +805,15 @@ </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> @@ -699,6 +824,7 @@ <child type="label"> <object class="GtkLabel" id="label15"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">preferencesToolbar</property> <property name="use_markup">True</property> </object> @@ -706,6 +832,7 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="padding">6</property> <property name="position">4</property> </packing> @@ -718,6 +845,7 @@ <child type="tab"> <object class="GtkLabel" id="label2"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">preferencesAppearanceTabtitle</property> </object> <packing> @@ -728,23 +856,25 @@ <child> <object class="GtkVBox" id="vbox_content"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkFrame" id="frame_content_control"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> <object class="GtkAlignment" id="alignment6"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="top_padding">6</property> <property name="left_padding">12</property> <property name="right_padding">12</property> <child> <object class="GtkVBox" id="vbox6"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkCheckButton" id="checkDisablePopups"> @@ -753,8 +883,8 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="draw_indicator">True</property> - <signal name="realize" handler="nsgtk_preferences_checkDisablePopups_realize"/> - <signal name="toggled" handler="nsgtk_preferences_checkDisablePopups_toggled"/> + <signal name="toggled" handler="nsgtk_preferences_checkDisablePopups_toggled" swapped="no"/> + <signal name="realize" handler="nsgtk_preferences_checkDisablePopups_realize" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -769,8 +899,8 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="draw_indicator">True</property> - <signal name="realize" handler="nsgtk_preferences_checkHideAdverts_realize"/> - <signal name="toggled" handler="nsgtk_preferences_checkHideAdverts_toggled"/> + <signal name="toggled" handler="nsgtk_preferences_checkHideAdverts_toggled" swapped="no"/> + <signal name="realize" handler="nsgtk_preferences_checkHideAdverts_realize" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -785,8 +915,8 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="draw_indicator">True</property> - <signal name="realize" handler="nsgtk_preferences_checkEnableJavascript_realize"/> - <signal name="toggled" handler="nsgtk_preferences_checkEnableJavascript_toggled"/> + <signal name="toggled" handler="nsgtk_preferences_checkEnableJavascript_toggled" swapped="no"/> + <signal name="realize" handler="nsgtk_preferences_checkEnableJavascript_realize" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -801,8 +931,8 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="draw_indicator">True</property> - <signal name="realize" handler="nsgtk_preferences_checkDisablePlugins_realize"/> - <signal name="toggled" handler="nsgtk_preferences_checkDisablePlugins_toggled"/> + <signal name="toggled" handler="nsgtk_preferences_checkDisablePlugins_toggled" swapped="no"/> + <signal name="realize" handler="nsgtk_preferences_checkDisablePlugins_realize" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -817,33 +947,39 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="draw_indicator">True</property> - <signal name="realize" handler="nsgtk_preferences_checkResampleImages_realize"/> - <signal name="toggled" handler="nsgtk_preferences_checkResampleImages_toggled"/> + <signal name="toggled" handler="nsgtk_preferences_checkResampleImages_toggled" swapped="no"/> + <signal name="realize" handler="nsgtk_preferences_checkResampleImages_realize" swapped="no"/> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">4</property> </packing> </child> <child> <object class="GtkHBox" id="hbox8"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="label17"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">preferencesControlLoad</property> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkComboBox" id="comboboxLoadImages"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="model">liststore_image_loading</property> - <signal name="changed" handler="nsgtk_preferences_comboboxLoadImages_changed"/> - <signal name="realize" handler="nsgtk_preferences_comboboxLoadImages_realize"/> + <signal name="changed" handler="nsgtk_preferences_comboboxLoadImages_changed" swapped="no"/> + <signal name="realize" handler="nsgtk_preferences_comboboxLoadImages_realize" swapped="no"/> <child> <object class="GtkCellRendererText" id="cellrenderertext4"/> <attributes> @@ -852,11 +988,15 @@ </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">5</property> </packing> </child> @@ -867,6 +1007,7 @@ <child type="label"> <object class="GtkLabel" id="label11"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">preferencesControl</property> <property name="use_markup">True</property> </object> @@ -874,6 +1015,7 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="padding">6</property> <property name="position">0</property> </packing> @@ -881,18 +1023,20 @@ <child> <object class="GtkFrame" id="frame_content_animation"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> <object class="GtkAlignment" id="alignment10"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="top_padding">6</property> <property name="left_padding">12</property> <property name="right_padding">12</property> <child> <object class="GtkVBox" id="vbox9"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkCheckButton" id="checkEnableAnimations"> @@ -901,24 +1045,29 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="draw_indicator">True</property> - <signal name="realize" handler="nsgtk_preferences_checkEnableAnimations_realize"/> - <signal name="toggled" handler="nsgtk_preferences_checkEnableAnimations_toggled"/> + <signal name="toggled" handler="nsgtk_preferences_checkEnableAnimations_toggled" swapped="no"/> + <signal name="realize" handler="nsgtk_preferences_checkEnableAnimations_realize" swapped="no"/> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkHBox" id="hbox9"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">12</property> <child> <object class="GtkLabel" id="label19"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">preferencesAnimationMinimum</property> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> @@ -928,22 +1077,29 @@ <property name="can_focus">True</property> <property name="has_tooltip">True</property> <property name="tooltip_text" translatable="yes">preferencesAnimationMinimumTooltip</property> - <property name="invisible_char">●</property> + <property name="invisible_char">●</property> + <property name="primary_icon_activatable">False</property> + <property name="secondary_icon_activatable">False</property> + <property name="primary_icon_sensitive">True</property> + <property name="secondary_icon_sensitive">True</property> <property name="adjustment">adjustment_animation_time</property> <property name="climb_rate">1</property> <property name="digits">1</property> <property name="numeric">True</property> <property name="update_policy">if-valid</property> - <signal name="value_changed" handler="nsgtk_preferences_spinAnimationSpeed_valuechanged"/> - <signal name="realize" handler="nsgtk_preferences_spinAnimationSpeed_realize"/> + <signal name="value-changed" handler="nsgtk_preferences_spinAnimationSpeed_valuechanged" swapped="no"/> + <signal name="realize" handler="nsgtk_preferences_spinAnimationSpeed_realize" swapped="no"/> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -954,6 +1110,7 @@ <child type="label"> <object class="GtkLabel" id="label18"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">preferencesAnimation</property> <property name="use_markup">True</property> </object> @@ -961,6 +1118,7 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="padding">6</property> <property name="position">1</property> </packing> @@ -968,38 +1126,45 @@ <child> <object class="GtkFrame" id="frame_content_fonts"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> <object class="GtkAlignment" id="alignment14"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="top_padding">6</property> <property name="left_padding">12</property> <property name="right_padding">12</property> <child> <object class="GtkHBox" id="hbox11"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">12</property> <child> <object class="GtkHBox" id="hbox12"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="label26"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">preferencesFontsDefault</property> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkComboBox" id="comboDefault"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="model">liststore_defaultfont</property> - <signal name="changed" handler="nsgtk_preferences_comboDefault_changed"/> - <signal name="realize" handler="nsgtk_preferences_comboDefault_realize"/> + <signal name="changed" handler="nsgtk_preferences_comboDefault_changed" swapped="no"/> + <signal name="realize" handler="nsgtk_preferences_comboDefault_realize" swapped="no"/> <child> <object class="GtkCellRendererText" id="cellrenderertext5"/> <attributes> @@ -1008,25 +1173,32 @@ </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkHBox" id="hbox13"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="label27"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">preferencesFontsSize</property> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> @@ -1037,23 +1209,29 @@ <property name="has_tooltip">True</property> <property name="tooltip_text" translatable="yes">preferencesFontsSizeTooltip</property> <property name="max_length">4</property> - <property name="invisible_char">●</property> + <property name="invisible_char">●</property> <property name="width_chars">4</property> + <property name="primary_icon_activatable">False</property> + <property name="secondary_icon_activatable">False</property> + <property name="primary_icon_sensitive">True</property> + <property name="secondary_icon_sensitive">True</property> <property name="adjustment">adjustment_font_default_size</property> <property name="climb_rate">1</property> <property name="digits">1</property> <property name="numeric">True</property> - <signal name="value_changed" handler="nsgtk_preferences_spinDefaultSize_valuechanged"/> - <signal name="realize" handler="nsgtk_preferences_spinDefaultSize_realize"/> + <signal name="value-changed" handler="nsgtk_preferences_spinDefaultSize_valuechanged" swapped="no"/> + <signal name="realize" handler="nsgtk_preferences_spinDefaultSize_realize" swapped="no"/> </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">1</property> </packing> </child> @@ -1065,10 +1243,11 @@ <property name="receives_default">True</property> <property name="image">image1</property> <property name="use_underline">True</property> - <signal name="clicked" handler="nsgtk_preferences_fontPreview_clicked"/> + <signal name="clicked" handler="nsgtk_preferences_fontPreview_clicked" swapped="no"/> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">2</property> </packing> </child> @@ -1079,6 +1258,7 @@ <child type="label"> <object class="GtkLabel" id="label20"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">preferencesFonts</property> <property name="use_markup">True</property> </object> @@ -1086,47 +1266,54 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">2</property> </packing> </child> <child> <object class="GtkFrame" id="frame_content_font"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> <object class="GtkAlignment" id="alignment11"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="top_padding">6</property> <property name="left_padding">12</property> <property name="right_padding">12</property> <child> <object class="GtkVBox" id="vbox10"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkHBox" id="hbox10"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">12</property> <child> <object class="GtkLabel" id="label21"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">preferencesLanguagePreferred</property> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkComboBox" id="comboboxLanguage"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="has_tooltip">True</property> <property name="tooltip_text" translatable="yes">preferencesLanguagePreferredTooltip</property> <property name="model">liststore_content_language</property> - <signal name="changed" handler="nsgtk_preferences_comboboxLanguage_changed"/> - <signal name="realize" handler="nsgtk_preferences_comboboxLanguage_realize"/> + <signal name="changed" handler="nsgtk_preferences_comboboxLanguage_changed" swapped="no"/> + <signal name="realize" handler="nsgtk_preferences_comboboxLanguage_realize" swapped="no"/> <child> <object class="GtkCellRendererText" id="cellrenderertext7"> <property name="xalign">0</property> @@ -1145,11 +1332,15 @@ </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> @@ -1160,6 +1351,7 @@ <child type="label"> <object class="GtkLabel" id="label25"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">preferencesLanguage</property> <property name="use_markup">True</property> </object> @@ -1167,6 +1359,7 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">3</property> </packing> </child> @@ -1178,6 +1371,7 @@ <child type="tab"> <object class="GtkLabel" id="label10"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">preferencesContentTabtitle</property> </object> <packing> @@ -1188,23 +1382,25 @@ <child> <object class="GtkVBox" id="vbox_privacy"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkFrame" id="frame_privacy_general"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> <object class="GtkAlignment" id="alignment20"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="top_padding">6</property> <property name="left_padding">12</property> <property name="right_padding">12</property> <child> <object class="GtkVBox" id="vbox15"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkCheckButton" id="checkSendReferer"> @@ -1213,10 +1409,12 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="draw_indicator">True</property> - <signal name="realize" handler="nsgtk_preferences_checkSendReferer_realize"/> - <signal name="toggled" handler="nsgtk_preferences_checkSendReferer_toggled"/> + <signal name="toggled" handler="nsgtk_preferences_checkSendReferer_toggled" swapped="no"/> + <signal name="realize" handler="nsgtk_preferences_checkSendReferer_realize" swapped="no"/> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> @@ -1227,10 +1425,12 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="draw_indicator">True</property> - <signal name="realize" handler="nsgtk_preferences_checkSendDNT_realize"/> - <signal name="toggled" handler="nsgtk_preferences_checkSendDNT_toggled"/> + <signal name="toggled" handler="nsgtk_preferences_checkSendDNT_toggled" swapped="no"/> + <signal name="realize" handler="nsgtk_preferences_checkSendDNT_realize" swapped="no"/> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -1241,6 +1441,7 @@ <child type="label"> <object class="GtkLabel" id="label61"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">preferencesGeneral</property> <property name="use_markup">True</property> </object> @@ -1248,6 +1449,7 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="padding">6</property> <property name="position">0</property> </packing> @@ -1255,18 +1457,20 @@ <child> <object class="GtkFrame" id="frame_privacy_history"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> <object class="GtkAlignment" id="alignment12"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="top_padding">6</property> <property name="left_padding">12</property> <property name="right_padding">12</property> <child> <object class="GtkVBox" id="vbox11"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkCheckButton" id="checkHoverURLs"> @@ -1275,24 +1479,29 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="draw_indicator">True</property> - <signal name="realize" handler="nsgtk_preferences_checkHoverURLs_realize"/> - <signal name="toggled" handler="nsgtk_preferences_checkHoverURLs_toggled"/> + <signal name="toggled" handler="nsgtk_preferences_checkHoverURLs_toggled" swapped="no"/> + <signal name="realize" handler="nsgtk_preferences_checkHoverURLs_realize" swapped="no"/> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkHBox" id="hbox14"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="label28"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">preferencesHistoryRemember</property> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> @@ -1301,32 +1510,41 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="max_length">4</property> - <property name="invisible_char">●</property> + <property name="invisible_char">●</property> <property name="width_chars">4</property> + <property name="primary_icon_activatable">False</property> + <property name="secondary_icon_activatable">False</property> + <property name="primary_icon_sensitive">True</property> + <property name="secondary_icon_sensitive">True</property> <property name="adjustment">adjustment_history_age</property> <property name="climb_rate">1</property> <property name="numeric">True</property> <property name="update_policy">if-valid</property> - <signal name="value_changed" handler="nsgtk_preferences_spinHistoryAge_valuechanged"/> - <signal name="realize" handler="nsgtk_preferences_spinHistoryAge_realize"/> + <signal name="value-changed" handler="nsgtk_preferences_spinHistoryAge_valuechanged" swapped="no"/> + <signal name="realize" handler="nsgtk_preferences_spinHistoryAge_realize" swapped="no"/> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkLabel" id="label29"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">preferencesHistoryDays</property> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">2</property> </packing> </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -1337,6 +1555,7 @@ <child type="label"> <object class="GtkLabel" id="label23"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">preferencesHistory</property> <property name="use_markup">True</property> </object> @@ -1344,6 +1563,7 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="padding">6</property> <property name="position">1</property> </packing> @@ -1351,22 +1571,25 @@ <child> <object class="GtkFrame" id="frame_privacy_cache"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> <object class="GtkAlignment" id="alignment13"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="top_padding">6</property> <property name="left_padding">12</property> <property name="right_padding">12</property> <child> <object class="GtkVBox" id="vbox12"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkTable" id="table3"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="n_rows">3</property> <property name="n_columns">3</property> <property name="column_spacing">6</property> @@ -1374,6 +1597,7 @@ <child> <object class="GtkLabel" id="label30"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">preferencesCacheMemory</property> </object> @@ -1384,6 +1608,7 @@ <child> <object class="GtkLabel" id="label31"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">preferencesCacheDisc</property> </object> @@ -1396,6 +1621,7 @@ <child> <object class="GtkLabel" id="label34"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">preferencesCacheExpire</property> </object> @@ -1409,13 +1635,17 @@ <object class="GtkSpinButton" id="spinMemoryCacheSize"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="invisible_char">●</property> + <property name="invisible_char">●</property> <property name="width_chars">5</property> + <property name="primary_icon_activatable">False</property> + <property name="secondary_icon_activatable">False</property> + <property name="primary_icon_sensitive">True</property> + <property name="secondary_icon_sensitive">True</property> <property name="adjustment">adjustment_cache_memory_size</property> <property name="climb_rate">1</property> <property name="numeric">True</property> - <signal name="value_changed" handler="nsgtk_preferences_spinMemoryCacheSize_valuechanged"/> - <signal name="realize" handler="nsgtk_preferences_spinMemoryCacheSize_realize"/> + <signal name="value-changed" handler="nsgtk_preferences_spinMemoryCacheSize_valuechanged" swapped="no"/> + <signal name="realize" handler="nsgtk_preferences_spinMemoryCacheSize_realize" swapped="no"/> </object> <packing> <property name="left_attach">1</property> @@ -1427,13 +1657,17 @@ <object class="GtkSpinButton" id="spinDiscCacheSize"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="invisible_char">●</property> + <property name="invisible_char">●</property> <property name="width_chars">5</property> + <property name="primary_icon_activatable">False</property> + <property name="secondary_icon_activatable">False</property> + <property name="primary_icon_sensitive">True</property> + <property name="secondary_icon_sensitive">True</property> <property name="adjustment">adjustment_cache_disc_size</property> <property name="climb_rate">1</property> <property name="numeric">True</property> - <signal name="value_changed" handler="nsgtk_preferences_spinDiscCacheSize_valuechanged"/> - <signal name="realize" handler="nsgtk_preferences_spinDiscCacheSize_realize"/> + <signal name="value-changed" handler="nsgtk_preferences_spinDiscCacheSize_valuechanged" swapped="no"/> + <signal name="realize" handler="nsgtk_preferences_spinDiscCacheSize_realize" swapped="no"/> </object> <packing> <property name="left_attach">1</property> @@ -1447,13 +1681,17 @@ <object class="GtkSpinButton" id="spinDiscCacheAge"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="invisible_char">●</property> + <property name="invisible_char">●</property> <property name="width_chars">3</property> + <property name="primary_icon_activatable">False</property> + <property name="secondary_icon_activatable">False</property> + <property name="primary_icon_sensitive">True</property> + <property name="secondary_icon_sensitive">True</property> <property name="adjustment">adjustment_disc_cache_age</property> <property name="climb_rate">1</property> <property name="numeric">True</property> - <signal name="value_changed" handler="nsgtk_preferences_spinDiscCacheAge_valuechanged"/> - <signal name="realize" handler="nsgtk_preferences_spinDiscCacheAge_realize"/> + <signal name="value-changed" handler="nsgtk_preferences_spinDiscCacheAge_valuechanged" swapped="no"/> + <signal name="realize" handler="nsgtk_preferences_spinDiscCacheAge_realize" swapped="no"/> </object> <packing> <property name="left_attach">1</property> @@ -1466,8 +1704,9 @@ <child> <object class="GtkLabel" id="label32"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="no">MB</property> + <property name="label">MB</property> </object> <packing> <property name="left_attach">2</property> @@ -1478,8 +1717,9 @@ <child> <object class="GtkLabel" id="label33"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="no">MB</property> + <property name="label">MB</property> </object> <packing> <property name="left_attach">2</property> @@ -1492,6 +1732,7 @@ <child> <object class="GtkLabel" id="label35"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">preferencesHistoryDays</property> </object> @@ -1505,12 +1746,15 @@ </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkHBox" id="hbox17"> <property name="visible">True</property> + <property name="can_focus">False</property> <child> <placeholder/> </child> @@ -1523,11 +1767,14 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -1538,6 +1785,7 @@ <child type="label"> <object class="GtkLabel" id="label24"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">preferencesCache</property> <property name="use_markup">True</property> </object> @@ -1545,6 +1793,7 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="padding">6</property> <property name="position">2</property> </packing> @@ -1557,6 +1806,7 @@ <child type="tab"> <object class="GtkLabel" id="label22"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">preferencesPrivacyTabtitle</property> </object> <packing> @@ -1567,22 +1817,25 @@ <child> <object class="GtkVBox" id="vbox_network"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkFrame" id="frame_network_proxy"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> <object class="GtkAlignment" id="alignment15"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="top_padding">6</property> <property name="left_padding">12</property> <property name="right_padding">12</property> <child> <object class="GtkTable" id="table2"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="n_rows">5</property> <property name="n_columns">2</property> <property name="column_spacing">6</property> @@ -1590,6 +1843,7 @@ <child> <object class="GtkLabel" id="label42"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">preferencesProxyType</property> </object> @@ -1600,6 +1854,7 @@ <child> <object class="GtkLabel" id="label43"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">preferencesProxyHost</property> </object> @@ -1612,6 +1867,7 @@ <child> <object class="GtkLabel" id="label44"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">preferencesProxyUsername</property> </object> @@ -1624,6 +1880,7 @@ <child> <object class="GtkLabel" id="label45"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">preferencesProxyPassword</property> </object> @@ -1636,11 +1893,12 @@ <child> <object class="GtkComboBox" id="comboProxyType"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="has_tooltip">True</property> <property name="tooltip_text" translatable="yes">preferencesProxyTypeTooltip</property> <property name="model">liststore_proxy_type</property> - <signal name="changed" handler="nsgtk_preferences_comboProxyType_changed"/> - <signal name="realize" handler="nsgtk_preferences_comboProxyType_realize"/> + <signal name="changed" handler="nsgtk_preferences_comboProxyType_changed" swapped="no"/> + <signal name="realize" handler="nsgtk_preferences_comboProxyType_realize" swapped="no"/> <child> <object class="GtkCellRendererText" id="cellrenderertext6"/> <attributes> @@ -1656,6 +1914,7 @@ <child> <object class="GtkHBox" id="hbox19"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkEntry" id="entryProxyHost"> @@ -1663,21 +1922,29 @@ <property name="can_focus">True</property> <property name="has_tooltip">True</property> <property name="tooltip_text" translatable="yes">preferencesProxyHostTooltip</property> - <property name="invisible_char">●</property> - <signal name="changed" handler="nsgtk_preferences_entryProxyHost_changed"/> - <signal name="realize" handler="nsgtk_preferences_entryProxyHost_realize"/> + <property name="invisible_char">●</property> + <property name="primary_icon_activatable">False</property> + <property name="secondary_icon_activatable">False</property> + <property name="primary_icon_sensitive">True</property> + <property name="secondary_icon_sensitive">True</property> + <signal name="changed" handler="nsgtk_preferences_entryProxyHost_changed" swapped="no"/> + <signal name="realize" handler="nsgtk_preferences_entryProxyHost_realize" swapped="no"/> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkLabel" id="label46"> <property name="visible">True</property> - <property name="label" translatable="no">:</property> + <property name="can_focus">False</property> + <property name="label">:</property> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -1688,17 +1955,22 @@ <property name="has_tooltip">True</property> <property name="tooltip_text" translatable="yes">preferencesProxyPortTooltip</property> <property name="max_length">5</property> - <property name="invisible_char">●</property> + <property name="invisible_char">●</property> <property name="width_chars">5</property> + <property name="primary_icon_activatable">False</property> + <property name="secondary_icon_activatable">False</property> + <property name="primary_icon_sensitive">True</property> + <property name="secondary_icon_sensitive">True</property> <property name="adjustment">adjustment_proxy_port</property> <property name="climb_rate">1</property> <property name="numeric">True</property> <property name="update_policy">if-valid</property> - <signal name="value_changed" handler="nsgtk_preferences_spinProxyPort_valuechanged"/> - <signal name="realize" handler="nsgtk_preferences_spinProxyPort_realize"/> + <signal name="value-changed" handler="nsgtk_preferences_spinProxyPort_valuechanged" swapped="no"/> + <signal name="realize" handler="nsgtk_preferences_spinProxyPort_realize" swapped="no"/> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">2</property> </packing> </child> @@ -1716,9 +1988,13 @@ <property name="can_focus">True</property> <property name="has_tooltip">True</property> <property name="tooltip_text" translatable="yes">preferencesProxyUsernameTooltip</property> - <property name="invisible_char">●</property> - <signal name="changed" handler="nsgtk_preferences_entryProxyUser_changed"/> - <signal name="realize" handler="nsgtk_preferences_entryProxyUser_realize"/> + <property name="invisible_char">●</property> + <property name="primary_icon_activatable">False</property> + <property name="secondary_icon_activatable">False</property> + <property name="primary_icon_sensitive">True</property> + <property name="secondary_icon_sensitive">True</property> + <signal name="changed" handler="nsgtk_preferences_entryProxyUser_changed" swapped="no"/> + <signal name="realize" handler="nsgtk_preferences_entryProxyUser_realize" swapped="no"/> </object> <packing> <property name="left_attach">1</property> @@ -1734,9 +2010,13 @@ <property name="has_tooltip">True</property> <property name="tooltip_text" translatable="yes">preferencesProxyPasswordTooltip</property> <property name="visibility">False</property> - <property name="invisible_char">●</property> - <signal name="changed" handler="nsgtk_preferences_entryProxyPassword_changed"/> - <signal name="realize" handler="nsgtk_preferences_entryProxyPassword_realize"/> + <property name="invisible_char">●</property> + <property name="primary_icon_activatable">False</property> + <property name="secondary_icon_activatable">False</property> + <property name="primary_icon_sensitive">True</property> + <property name="secondary_icon_sensitive">True</property> + <signal name="changed" handler="nsgtk_preferences_entryProxyPassword_changed" swapped="no"/> + <signal name="realize" handler="nsgtk_preferences_entryProxyPassword_realize" swapped="no"/> </object> <packing> <property name="left_attach">1</property> @@ -1765,6 +2045,10 @@ <property name="has_tooltip">True</property> <property name="tooltip_text" translatable="yes">preferencesProxyNoproxyTooltip</property> <property name="caps_lock_warning">False</property> + <property name="primary_icon_activatable">False</property> + <property name="secondary_icon_activatable">False</property> + <property name="primary_icon_sensitive">True</property> + <property name="secondary_icon_sensitive">True</property> <signal name="changed" handler="nsgtk_preferences_entryProxyNoproxy_changed" swapped="no"/> <signal name="realize" handler="nsgtk_preferences_entryProxyNoproxy_realize" swapped="no"/> </object> @@ -1782,6 +2066,7 @@ <child type="label"> <object class="GtkLabel" id="label37"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">preferencesProxy</property> <property name="use_markup">True</property> </object> @@ -1789,6 +2074,7 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="padding">6</property> <property name="position">0</property> </packing> @@ -1796,17 +2082,20 @@ <child> <object class="GtkFrame" id="frame_network_fetching"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> <object class="GtkAlignment" id="alignment16"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="top_padding">6</property> <property name="left_padding">12</property> <property name="right_padding">12</property> <child> <object class="GtkTable" id="table1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="n_rows">3</property> <property name="n_columns">2</property> <property name="column_spacing">6</property> @@ -1814,6 +2103,7 @@ <child> <object class="GtkLabel" id="label39"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">preferencesFetchingMax</property> </object> @@ -1824,6 +2114,7 @@ <child> <object class="GtkLabel" id="label40"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">preferencesFetchingPerhost</property> </object> @@ -1836,6 +2127,7 @@ <child> <object class="GtkLabel" id="label41"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">preferencesFetchingCached</property> </object> @@ -1851,13 +2143,17 @@ <property name="can_focus">True</property> <property name="has_tooltip">True</property> <property name="tooltip_text" translatable="yes">preferencesFetchingMaxTooltip</property> - <property name="invisible_char">●</property> + <property name="invisible_char">●</property> <property name="width_chars">3</property> + <property name="primary_icon_activatable">False</property> + <property name="secondary_icon_activatable">False</property> + <property name="primary_icon_sensitive">True</property> + <property name="secondary_icon_sensitive">True</property> <property name="adjustment">adjustment_fetching_max</property> <property name="climb_rate">1</property> <property name="numeric">True</property> - <signal name="value_changed" handler="nsgtk_preferences_spinMaxFetchers_valuechanged"/> - <signal name="realize" handler="nsgtk_preferences_spinMaxFetchers_realize"/> + <signal name="value-changed" handler="nsgtk_preferences_spinMaxFetchers_valuechanged" swapped="no"/> + <signal name="realize" handler="nsgtk_preferences_spinMaxFetchers_realize" swapped="no"/> </object> <packing> <property name="left_attach">1</property> @@ -1871,13 +2167,17 @@ <property name="can_focus">True</property> <property name="has_tooltip">True</property> <property name="tooltip_text" translatable="yes">preferencesFetchingPerhostTooltip</property> - <property name="invisible_char">●</property> + <property name="invisible_char">●</property> <property name="width_chars">3</property> + <property name="primary_icon_activatable">False</property> + <property name="secondary_icon_activatable">False</property> + <property name="primary_icon_sensitive">True</property> + <property name="secondary_icon_sensitive">True</property> <property name="adjustment">adjustment_fetching_perhost</property> <property name="climb_rate">1</property> <property name="numeric">True</property> - <signal name="value_changed" handler="nsgtk_preferences_spinFetchesPerHost_valuechanged"/> - <signal name="realize" handler="nsgtk_preferences_spinFetchesPerHost_realize"/> + <signal name="value-changed" handler="nsgtk_preferences_spinFetchesPerHost_valuechanged" swapped="no"/> + <signal name="realize" handler="nsgtk_preferences_spinFetchesPerHost_realize" swapped="no"/> </object> <packing> <property name="left_attach">1</property> @@ -1893,13 +2193,17 @@ <property name="can_focus">True</property> <property name="has_tooltip">True</property> <property name="tooltip_text" translatable="yes">preferencesFetchingCachedTooltip.</property> - <property name="invisible_char">●</property> + <property name="invisible_char">●</property> <property name="width_chars">3</property> + <property name="primary_icon_activatable">False</property> + <property name="secondary_icon_activatable">False</property> + <property name="primary_icon_sensitive">True</property> + <property name="secondary_icon_sensitive">True</property> <property name="adjustment">adjustment_fetching_cached</property> <property name="climb_rate">1</property> <property name="numeric">True</property> - <signal name="value_changed" handler="nsgtk_preferences_spinCachedConnections_valuechanged"/> - <signal name="realize" handler="nsgtk_preferences_spinCachedConnections_realize"/> + <signal name="value-changed" handler="nsgtk_preferences_spinCachedConnections_valuechanged" swapped="no"/> + <signal name="realize" handler="nsgtk_preferences_spinCachedConnections_realize" swapped="no"/> </object> <packing> <property name="left_attach">1</property> @@ -1916,6 +2220,7 @@ <child type="label"> <object class="GtkLabel" id="label38"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">preferencesFetching</property> <property name="use_markup">True</property> </object> @@ -1923,6 +2228,7 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="padding">6</property> <property name="position">1</property> </packing> @@ -1935,6 +2241,7 @@ <child type="tab"> <object class="GtkLabel" id="label36"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">preferencesNetworkTabtitle</property> </object> <packing> @@ -1945,23 +2252,25 @@ <child> <object class="GtkVBox" id="vbox_pdfexport"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkFrame" id="frame_pdfexport_appearance"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> <object class="GtkAlignment" id="alignment17"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="top_padding">6</property> <property name="left_padding">12</property> <property name="right_padding">12</property> <child> <object class="GtkVBox" id="vbox13"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkCheckButton" id="checkSuppressImages"> @@ -1970,10 +2279,12 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="draw_indicator">True</property> - <signal name="realize" handler="nsgtk_preferences_checkSuppressImages_realize"/> - <signal name="toggled" handler="nsgtk_preferences_checkSuppressImages_toggled"/> + <signal name="toggled" handler="nsgtk_preferences_checkSuppressImages_toggled" swapped="no"/> + <signal name="realize" handler="nsgtk_preferences_checkSuppressImages_realize" swapped="no"/> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> @@ -1984,10 +2295,12 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="draw_indicator">True</property> - <signal name="realize" handler="nsgtk_preferences_checkRemoveBackgrounds_realize"/> - <signal name="toggled" handler="nsgtk_preferences_checkRemoveBackgrounds_toggled"/> + <signal name="toggled" handler="nsgtk_preferences_checkRemoveBackgrounds_toggled" swapped="no"/> + <signal name="realize" handler="nsgtk_preferences_checkRemoveBackgrounds_realize" swapped="no"/> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -1998,24 +2311,29 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="draw_indicator">True</property> - <signal name="realize" handler="nsgtk_preferences_checkFitPage_realize"/> - <signal name="toggled" handler="nsgtk_preferences_checkFitPage_toggled"/> + <signal name="toggled" handler="nsgtk_preferences_checkFitPage_toggled" swapped="no"/> + <signal name="realize" handler="nsgtk_preferences_checkFitPage_realize" swapped="no"/> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">2</property> </packing> </child> <child> <object class="GtkHBox" id="hbox15"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="label59"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">preferencesAppearanceScale</property> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> @@ -2024,32 +2342,41 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="max_length">4</property> - <property name="invisible_char">●</property> + <property name="invisible_char">●</property> <property name="width_chars">4</property> <property name="xalign">1</property> + <property name="primary_icon_activatable">False</property> + <property name="secondary_icon_activatable">False</property> + <property name="primary_icon_sensitive">True</property> + <property name="secondary_icon_sensitive">True</property> <property name="adjustment">adjustment_pdf_scale</property> <property name="climb_rate">1</property> <property name="numeric">True</property> - <signal name="value_changed" handler="nsgtk_preferences_spinExportScale_valuechanged"/> - <signal name="realize" handler="nsgtk_preferences_spinExportScale_realize"/> + <signal name="value-changed" handler="nsgtk_preferences_spinExportScale_valuechanged" swapped="no"/> + <signal name="realize" handler="nsgtk_preferences_spinExportScale_realize" swapped="no"/> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkLabel" id="label60"> <property name="visible">True</property> - <property name="label" translatable="no">%</property> + <property name="can_focus">False</property> + <property name="label">%</property> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">2</property> </packing> </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">3</property> </packing> </child> @@ -2060,6 +2387,7 @@ <child type="label"> <object class="GtkLabel" id="label48"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">preferencesAppearance</property> <property name="use_markup">True</property> </object> @@ -2067,6 +2395,7 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="padding">6</property> <property name="position">0</property> </packing> @@ -2074,29 +2403,34 @@ <child> <object class="GtkFrame" id="frame_pdfexport_margins"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> <object class="GtkAlignment" id="alignment18"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="top_padding">6</property> <property name="left_padding">12</property> <property name="right_padding">12</property> <child> <object class="GtkVBox" id="vbox16"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkHBox" id="hbox22"> <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="GtkLabel" id="label62"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">preferencesMarginsMeasurements</property> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> @@ -2105,25 +2439,40 @@ </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkTable" id="table4"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="n_rows">3</property> <property name="n_columns">3</property> <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> <object class="GtkHBox" id="hbox16"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="label51"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">Top</property> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> @@ -2132,17 +2481,22 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="max_length">4</property> - <property name="invisible_char">●</property> + <property name="invisible_char">●</property> <property name="width_chars">5</property> <property name="xalign">1</property> + <property name="primary_icon_activatable">False</property> + <property name="secondary_icon_activatable">False</property> + <property name="primary_icon_sensitive">True</property> + <property name="secondary_icon_sensitive">True</property> <property name="climb_rate">1</property> <property name="digits">1</property> <property name="numeric">True</property> - <signal name="value_changed" handler="nsgtk_preferences_spinMarginTop_valuechanged"/> - <signal name="realize" handler="nsgtk_preferences_spinMarginTop_realize"/> + <signal name="value-changed" handler="nsgtk_preferences_spinMarginTop_valuechanged" swapped="no"/> + <signal name="realize" handler="nsgtk_preferences_spinMarginTop_realize" swapped="no"/> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -2156,14 +2510,17 @@ <child> <object class="GtkHBox" id="hbox18"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="label52"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">Left</property> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> @@ -2172,18 +2529,23 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="max_length">4</property> - <property name="invisible_char">●</property> + <property name="invisible_char">●</property> <property name="width_chars">5</property> <property name="xalign">1</property> + <property name="primary_icon_activatable">False</property> + <property name="secondary_icon_activatable">False</property> + <property name="primary_icon_sensitive">True</property> + <property name="secondary_icon_sensitive">True</property> <property name="adjustment">adjustment_pdf_lmargin</property> <property name="climb_rate">1</property> <property name="digits">1</property> <property name="numeric">True</property> - <signal name="value_changed" handler="nsgtk_preferences_spinMarginLeft_valuechanged"/> - <signal name="realize" handler="nsgtk_preferences_spinMarginLeft_realize"/> + <signal name="value-changed" handler="nsgtk_preferences_spinMarginLeft_valuechanged" swapped="no"/> + <signal name="realize" handler="nsgtk_preferences_spinMarginLeft_realize" swapped="no"/> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -2197,14 +2559,17 @@ <child> <object class="GtkHBox" id="hbox20"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="label53"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">Bottom</property> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> @@ -2213,17 +2578,22 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="max_length">4</property> - <property name="invisible_char">●</property> + <property name="invisible_char">●</property> <property name="width_chars">5</property> <property name="xalign">1</property> + <property name="primary_icon_activatable">False</property> + <property name="secondary_icon_activatable">False</property> + <property name="primary_icon_sensitive">True</property> + <property name="secondary_icon_sensitive">True</property> <property name="climb_rate">1</property> <property name="digits">1</property> <property name="numeric">True</property> - <signal name="value_changed" handler="nsgtk_preferences_spinMarginBottom_valuechanged"/> - <signal name="realize" handler="nsgtk_preferences_spinMarginBottom_realize"/> + <signal name="value-changed" handler="nsgtk_preferences_spinMarginBottom_valuechanged" swapped="no"/> + <signal name="realize" handler="nsgtk_preferences_spinMarginBottom_realize" swapped="no"/> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -2239,14 +2609,17 @@ <child> <object class="GtkHBox" id="hbox21"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="label54"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">Right</property> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> @@ -2255,17 +2628,22 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="max_length">4</property> - <property name="invisible_char">●</property> + <property name="invisible_char">●</property> <property name="width_chars">5</property> <property name="xalign">1</property> + <property name="primary_icon_activatable">False</property> + <property name="secondary_icon_activatable">False</property> + <property name="primary_icon_sensitive">True</property> + <property name="secondary_icon_sensitive">True</property> <property name="climb_rate">1</property> <property name="digits">1</property> <property name="numeric">True</property> - <signal name="value_changed" handler="nsgtk_preferences_spinMarginRight_valuechanged"/> - <signal name="realize" handler="nsgtk_preferences_spinMarginRight_realize"/> + <signal name="value-changed" handler="nsgtk_preferences_spinMarginRight_valuechanged" swapped="no"/> + <signal name="realize" handler="nsgtk_preferences_spinMarginRight_realize" swapped="no"/> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -2278,23 +2656,10 @@ <property name="x_options">GTK_EXPAND</property> </packing> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -2305,6 +2670,7 @@ <child type="label"> <object class="GtkLabel" id="label49"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">preferencesMargins</property> <property name="use_markup">True</property> </object> @@ -2312,6 +2678,7 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="padding">6</property> <property name="position">1</property> </packing> @@ -2319,18 +2686,20 @@ <child> <object class="GtkFrame" id="frame_pdfexport_generation"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> <object class="GtkAlignment" id="alignment19"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="top_padding">6</property> <property name="left_padding">12</property> <property name="right_padding">12</property> <child> <object class="GtkVBox" id="vbox14"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <property name="spacing">7</property> <child> <object class="GtkCheckButton" id="checkCompressPDF"> @@ -2339,10 +2708,12 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="draw_indicator">True</property> - <signal name="realize" handler="nsgtk_preferences_checkCompressPDF_realize"/> - <signal name="toggled" handler="nsgtk_preferences_checkCompressPDF_toggled"/> + <signal name="toggled" handler="nsgtk_preferences_checkCompressPDF_toggled" swapped="no"/> + <signal name="realize" handler="nsgtk_preferences_checkCompressPDF_realize" swapped="no"/> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> @@ -2353,10 +2724,12 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="draw_indicator">True</property> - <signal name="realize" handler="nsgtk_preferences_checkPasswordPDF_realize"/> - <signal name="toggled" handler="nsgtk_preferences_checkPasswordPDF_toggled"/> + <signal name="toggled" handler="nsgtk_preferences_checkPasswordPDF_toggled" swapped="no"/> + <signal name="realize" handler="nsgtk_preferences_checkPasswordPDF_realize" swapped="no"/> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -2367,6 +2740,7 @@ <child type="label"> <object class="GtkLabel" id="label50"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">preferencesGeneration</property> <property name="use_markup">True</property> </object> @@ -2374,6 +2748,7 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="padding">6</property> <property name="position">2</property> </packing> @@ -2386,6 +2761,7 @@ <child type="tab"> <object class="GtkLabel" id="label47"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">preferencesPDFTabtitle</property> </object> <packing> @@ -2395,48 +2771,11 @@ </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> - <child internal-child="action_area"> - <object class="GtkHButtonBox" id="dialog-action_area1"> - <property name="visible">True</property> - <property name="layout_style">edge</property> - <child> - <object class="GtkButton" id="help"> - <property name="label">gtk-help</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="close"> - <property name="label">gtk-close</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="pack_type">end</property> - <property name="position">0</property> - </packing> - </child> </object> </child> <action-widgets> @@ -2451,67 +2790,67 @@ </columns> <data> <row> - <col id="0" translatable="no">Google</col> + <col id="0">Google</col> </row> <row> - <col id="0" translatable="no">Yahoo!</col> + <col id="0">Yahoo!</col> </row> <row> - <col id="0" translatable="no">Microsoft Live</col> + <col id="0">Microsoft Live</col> </row> <row> - <col id="0" translatable="no">Buisiness.com</col> + <col id="0">Buisiness.com</col> </row> <row> - <col id="0" translatable="no">Omgili</col> + <col id="0">Omgili</col> </row> <row> - <col id="0" translatable="no">BBC News</col> + <col id="0">BBC News</col> </row> <row> - <col id="0" translatable="no">Ubuntu Packages</col> + <col id="0">Ubuntu Packages</col> </row> <row> - <col id="0" translatable="no">Creative Commons</col> + <col id="0">Creative Commons</col> </row> <row> - <col id="0" translatable="no">Ask</col> + <col id="0">Ask</col> </row> <row> - <col id="0" translatable="no">Answers</col> + <col id="0">Answers</col> </row> <row> - <col id="0" translatable="no">Dictionary.com</col> + <col id="0">Dictionary.com</col> </row> <row> - <col id="0" translatable="no">YouTube</col> + <col id="0">YouTube</col> </row> <row> - <col id="0" translatable="no">AeroMP3</col> + <col id="0">AeroMP3</col> </row> <row> - <col id="0" translatable="no">AOL</col> + <col id="0">AOL</col> </row> <row> - <col id="0" translatable="no">Baidu</col> + <col id="0">Baidu</col> </row> <row> - <col id="0" translatable="no">Amazon</col> + <col id="0">Amazon</col> </row> <row> - <col id="0" translatable="no">Ebay</col> + <col id="0">Ebay</col> </row> <row> - <col id="0" translatable="no">IMBD</col> + <col id="0">IMBD</col> </row> <row> - <col id="0" translatable="no">ESPN</col> + <col id="0">ESPN</col> </row> <row> - <col id="0" translatable="no">Wikipedia</col> + <col id="0">Wikipedia</col> </row> <row> - <col id="0" translatable="no">DuckDuckGo</col> + <col id="0">DuckDuckGo</col> </row> </data> </object> @@ -2600,6 +2939,7 @@ </object> <object class="GtkImage" id="image1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xpad">3</property> <property name="stock">gtk-apply</property> </object> @@ -2728,4 +3068,21 @@ </row> </data> </object> + <object class="GtkListStore" id="liststore_developer_view"> + <columns> + <!-- column-name Type --> + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">preferencesDeveloperViewWindow</col> + </row> + <row> + <col id="0" translatable="yes">preferencesDeveloperViewTab</col> + </row> + <row> + <col id="0" translatable="yes">preferencesDeveloperViewEditor</col> + </row> + </data> + </object> </interface> diff --git a/gtk/res/options.gtk3.ui b/gtk/res/options.gtk3.ui index 02e4df47c..ac435834a 100644 --- a/gtk/res/options.gtk3.ui +++ b/gtk/res/options.gtk3.ui @@ -736,7 +736,7 @@ </packing> </child> <child> - <object class="GtkFrame" id="frame_appearance_source"> + <object class="GtkFrame" id="frame_appearance_tools"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label_xalign">0</property> @@ -754,58 +754,36 @@ <property name="can_focus">False</property> <property name="spacing">6</property> <child> - <object class="GtkLabel" id="label13"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">preferencesSourceOpen</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> <object class="GtkHBox" id="hbox6"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="spacing">12</property> <child> - <object class="GtkRadioButton" id="sourceButtonWindow"> - <property name="label" translatable="yes">preferencesSourceWindow</property> - <property name="use_action_appearance">False</property> + <object class="GtkLabel" id="label13"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="halign">start</property> - <property name="use_action_appearance">False</property> - <property name="xalign">0.5</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - <property name="group">sourceButtonTab</property> - <signal name="toggled" handler="nsgtk_preferences_sourceButtonWindow_toggled" swapped="no"/> - <signal name="realize" handler="nsgtk_preferences_sourceButtonWindow_realize" swapped="no"/> + <property name="can_focus">False</property> + <property name="label" translatable="yes">preferencesDeveloperView</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkRadioButton" id="sourceButtonTab"> - <property name="label" translatable="yes">preferencesSourceTab</property> - <property name="use_action_appearance">False</property> + <object class="GtkComboBox" id="comboboxDeveloperView"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> + <property name="can_focus">False</property> <property name="halign">start</property> - <property name="use_action_appearance">False</property> - <property name="xalign">0.5</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="nsgtk_preferences_sourceButtonTab_toggled" swapped="no"/> - <signal name="realize" handler="nsgtk_preferences_sourceButtonTab_realize" swapped="no"/> + <property name="model">liststore_developer_view</property> + <signal name="changed" handler="nsgtk_preferences_comboDeveloperView_changed" swapped="no"/> + <signal name="realize" handler="nsgtk_preferences_comboDeveloperView_realize" swapped="no"/> + <child> + <object class="GtkCellRendererText" id="cellrenderertext10"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> </object> <packing> <property name="expand">True</property> @@ -828,7 +806,7 @@ <object class="GtkLabel" id="label12"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">preferencesSource</property> + <property name="label" translatable="yes">preferencesTools</property> <property name="use_markup">True</property> </object> </child> @@ -2982,6 +2960,23 @@ </row> </data> </object> + <object class="GtkListStore" id="liststore_developer_view"> + <columns> + <!-- column-name Type --> + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">preferencesDeveloperViewWindow</col> + </row> + <row> + <col id="0" translatable="yes">preferencesDeveloperViewTab</col> + </row> + <row> + <col id="0" translatable="yes">preferencesDeveloperViewEditor</col> + </row> + </data> + </object> <object class="GtkListStore" id="liststore_image_loading"> <columns> <!-- column-name Type --> |