Revision: 1827 http://geany.svn.sourceforge.net/geany/?rev=1827&view=rev Author: ntrel Date: 2007-08-27 09:10:19 -0700 (Mon, 27 Aug 2007)
Log Message: ----------- Add Prefs dialog 'Editor tabs' frame in Interface tab and group related preferences. Change some table spacing to multiples of 3. Rename Misc., Behaviour -> Miscellaneous.
Modified Paths: -------------- trunk/ChangeLog trunk/geany.glade trunk/src/interface.c
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-08-25 14:16:52 UTC (rev 1826) +++ trunk/ChangeLog 2007-08-27 16:10:19 UTC (rev 1827) @@ -1,3 +1,12 @@ +2007-08-27 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/interface.c, geany.glade: + Add Prefs dialog 'Editor tabs' frame in Interface tab and group + related preferences. + Change some table spacing to multiples of 3. + Rename Misc., Behaviour -> Miscellaneous. + + 2007-08-25 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* geany.glade, plugins/classbuilder.c, plugins/demoplugin.c,
Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2007-08-25 14:16:52 UTC (rev 1826) +++ trunk/geany.glade 2007-08-27 16:10:19 UTC (rev 1827) @@ -3335,9 +3335,9 @@ </child>
<child> - <widget class="GtkLabel" id="label178"> + <widget class="GtkLabel" id="label199"> <property name="visible">True</property> - <property name="label" translatable="yes"><b>Behaviour</b></property> + <property name="label" translatable="yes"><b>Miscellaneous</b></property> <property name="use_underline">False</property> <property name="use_markup">True</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -3744,7 +3744,7 @@ <property name="n_columns">2</property> <property name="homogeneous">False</property> <property name="row_spacing">3</property> - <property name="column_spacing">25</property> + <property name="column_spacing">24</property>
<child> <widget class="GtkLabel" id="label100"> @@ -3927,14 +3927,14 @@ </child>
<child> - <widget class="GtkFrame" id="frame9"> + <widget class="GtkFrame" id="frame29"> <property name="visible">True</property> <property name="label_xalign">0</property> <property name="label_yalign">0.5</property> <property name="shadow_type">GTK_SHADOW_NONE</property>
<child> - <widget class="GtkAlignment" id="alignment12"> + <widget class="GtkAlignment" id="alignment32"> <property name="visible">True</property> <property name="xalign">0.5</property> <property name="yalign">0.5</property> @@ -3946,13 +3946,10 @@ <property name="right_padding">0</property>
<child> - <widget class="GtkTable" id="table8"> + <widget class="GtkVBox" id="vbox26"> <property name="visible">True</property> - <property name="n_rows">5</property> - <property name="n_columns">2</property> <property name="homogeneous">False</property> - <property name="row_spacing">3</property> - <property name="column_spacing">25</property> + <property name="spacing">0</property>
<child> <widget class="GtkCheckButton" id="check_show_notebook_tabs"> @@ -3967,16 +3964,173 @@ <property name="draw_indicator">True</property> </widget> <packing> - <property name="left_attach">0</property> - <property name="right_attach">2</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options">fill</property> - <property name="y_options"></property> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> </packing> </child>
<child> + <widget class="GtkCheckButton" id="check_show_tab_cross"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Shows a small cross button in the file tabs to easily close files when clicking on it (requires restart of Geany).</property> + <property name="label" translatable="yes">Show close buttons</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">False</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkHBox" id="hbox7"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">12</property> + + <child> + <widget class="GtkLabel" id="label150"> + <property name="visible">True</property> + <property name="label" translatable="yes">Placement of new file tabs:</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkRadioButton" id="radio_tab_left"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">File tabs will be placed on the left of the notebook</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Left</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">True</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkRadioButton" id="radio_tab_right"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">File tabs will be placed on the right of the notebook</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Right</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + <property name="group">radio_tab_left</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + </child> + </widget> + </child> + + <child> + <widget class="GtkLabel" id="label197"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b>Editor tabs</b></property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="type">label_item</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkFrame" id="frame9"> + <property name="visible">True</property> + <property name="label_xalign">0</property> + <property name="label_yalign">0.5</property> + <property name="shadow_type">GTK_SHADOW_NONE</property> + + <child> + <widget class="GtkAlignment" id="alignment12"> + <property name="visible">True</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xscale">1</property> + <property name="yscale">1</property> + <property name="top_padding">0</property> + <property name="bottom_padding">0</property> + <property name="left_padding">12</property> + <property name="right_padding">0</property> + + <child> + <widget class="GtkTable" id="table8"> + <property name="visible">True</property> + <property name="n_rows">3</property> + <property name="n_columns">2</property> + <property name="homogeneous">False</property> + <property name="row_spacing">3</property> + <property name="column_spacing">24</property> + + <child> <widget class="GtkLabel" id="label160"> <property name="visible">True</property> <property name="label" translatable="yes">Message window:</property> @@ -3997,8 +4151,8 @@ <packing> <property name="left_attach">0</property> <property name="right_attach">1</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> @@ -4018,8 +4172,8 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="x_options">fill</property> <property name="y_options">fill</property> </packing> @@ -4046,8 +4200,8 @@ <packing> <property name="left_attach">0</property> <property name="right_attach">1</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> @@ -4067,8 +4221,8 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="x_options">fill</property> <property name="y_options">fill</property> </packing> @@ -4095,8 +4249,8 @@ <packing> <property name="left_attach">0</property> <property name="right_attach">1</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> @@ -4116,34 +4270,12 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> <property name="x_options">fill</property> <property name="y_options">fill</property> </packing> </child> - - <child> - <widget class="GtkCheckButton" id="check_show_tab_cross"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">Shows a small cross symbol in the file tabs to easily close files by clicking on it (requires restart of Geany).</property> - <property name="label" translatable="yes">Show small cross symbol in the file tabs</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">False</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> </widget> </child> </widget> @@ -4152,7 +4284,7 @@ <child> <widget class="GtkLabel" id="label158"> <property name="visible">True</property> - <property name="label" translatable="yes"><b>Tab placement</b></property> + <property name="label" translatable="yes"><b>Tab positions</b></property> <property name="use_underline">False</property> <property name="use_markup">True</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -4209,7 +4341,7 @@ <property name="visible">True</property> <property name="tooltip" translatable="yes">Whether to show the status bar at the bottom of the main window.</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Show statusbar</property> + <property name="label" translatable="yes">Show status bar</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> @@ -4223,14 +4355,6 @@ <property name="fill">False</property> </packing> </child> - - <child> - <placeholder/> - </child> - - <child> - <placeholder/> - </child> </widget> </child> </widget> @@ -4261,7 +4385,7 @@ </widget> <packing> <property name="padding">0</property> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> </packing> </child> @@ -5025,7 +5149,7 @@ <property name="n_columns">2</property> <property name="homogeneous">False</property> <property name="row_spacing">3</property> - <property name="column_spacing">25</property> + <property name="column_spacing">24</property>
<child> <widget class="GtkLabel" id="label133"> @@ -5157,7 +5281,7 @@ <widget class="GtkHBox" id="hbox5"> <property name="visible">True</property> <property name="homogeneous">False</property> - <property name="spacing">10</property> + <property name="spacing">12</property>
<child> <widget class="GtkRadioButton" id="radio_long_line_line"> @@ -5351,7 +5475,7 @@ <property name="n_columns">2</property> <property name="homogeneous">False</property> <property name="row_spacing">3</property> - <property name="column_spacing">25</property> + <property name="column_spacing">24</property>
<child> <widget class="GtkLabel" id="label116"> @@ -6224,98 +6348,13 @@ <child> <widget class="GtkTable" id="table10"> <property name="visible">True</property> - <property name="n_rows">3</property> + <property name="n_rows">2</property> <property name="n_columns">2</property> <property name="homogeneous">False</property> <property name="row_spacing">3</property> - <property name="column_spacing">25</property> + <property name="column_spacing">24</property>
<child> - <widget class="GtkLabel" id="label150"> - <property name="visible">True</property> - <property name="label" translatable="yes">Placement of new file tabs:</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkHBox" id="hbox3"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">12</property> - - <child> - <widget class="GtkRadioButton" id="radio_tab_left"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">File tabs will be placed on the left of the notebook</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Left</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">True</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkRadioButton" id="radio_tab_right"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">File tabs will be placed on the right of the notebook</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Right</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - <property name="group">radio_tab_left</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options">fill</property> - <property name="y_options">fill</property> - </packing> - </child> - - <child> <widget class="GtkLabel" id="label147"> <property name="visible">True</property> <property name="label" translatable="yes">Recent files list length:</property> @@ -6336,8 +6375,8 @@ <packing> <property name="left_attach">0</property> <property name="right_attach">1</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> @@ -6359,8 +6398,8 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> @@ -6371,9 +6410,9 @@ </child>
<child> - <widget class="GtkLabel" id="label176"> + <widget class="GtkLabel" id="label198"> <property name="visible">True</property> - <property name="label" translatable="yes"><b>Misc.</b></property> + <property name="label" translatable="yes"><b>Miscellaneous</b></property> <property name="use_underline">False</property> <property name="use_markup">True</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -6492,7 +6531,7 @@ <property name="n_columns">3</property> <property name="homogeneous">False</property> <property name="row_spacing">3</property> - <property name="column_spacing">5</property> + <property name="column_spacing">6</property>
<child> <widget class="GtkLabel" id="label11"> @@ -6876,7 +6915,7 @@ <property name="n_columns">3</property> <property name="homogeneous">False</property> <property name="row_spacing">3</property> - <property name="column_spacing">5</property> + <property name="column_spacing">6</property>
<child> <widget class="GtkEntry" id="entry_print">
Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2007-08-25 14:16:52 UTC (rev 1826) +++ trunk/src/interface.c 2007-08-27 16:10:19 UTC (rev 1827) @@ -2414,7 +2414,7 @@ GtkWidget *check_suppress_status_msgs; GtkWidget *check_auto_focus; GtkWidget *check_ask_suppress_search_dialogs; - GtkWidget *label178; + GtkWidget *label199; GtkWidget *frame25; GtkWidget *alignment28; GtkWidget *table11; @@ -2445,17 +2445,26 @@ GtkWidget *tagbar_font; GtkWidget *editor_font; GtkWidget *label99; + GtkWidget *frame29; + GtkWidget *alignment32; + GtkWidget *vbox26; + GtkWidget *check_show_notebook_tabs; + GtkWidget *check_show_tab_cross; + GtkWidget *hbox7; + GtkWidget *label150; + GtkWidget *radio_tab_left; + GSList *radio_tab_left_group = NULL; + GtkWidget *radio_tab_right; + GtkWidget *label197; GtkWidget *frame9; GtkWidget *alignment12; GtkWidget *table8; - GtkWidget *check_show_notebook_tabs; GtkWidget *label160; GtkWidget *combo_tab_msgwin; GtkWidget *label161; GtkWidget *combo_tab_sidebar; GtkWidget *label159; GtkWidget *combo_tab_editor; - GtkWidget *check_show_tab_cross; GtkWidget *label158; GtkWidget *frame23; GtkWidget *alignment26; @@ -2577,15 +2586,10 @@ GtkWidget *frame17; GtkWidget *alignment20; GtkWidget *table10; - GtkWidget *label150; - GtkWidget *hbox3; - GtkWidget *radio_tab_left; - GSList *radio_tab_left_group = NULL; - GtkWidget *radio_tab_right; GtkWidget *label147; GtkObject *spin_mru_adj; GtkWidget *spin_mru; - GtkWidget *label176; + GtkWidget *label198; GtkWidget *label174; GtkWidget *vbox23; GtkWidget *frame20; @@ -2773,10 +2777,10 @@ gtk_tooltips_set_tip (tooltips, check_ask_suppress_search_dialogs, _("Always wrap search around the document and hide the Find dialog after clicking Find Next/Previous"), NULL); gtk_button_set_focus_on_click (GTK_BUTTON (check_ask_suppress_search_dialogs), FALSE);
- label178 = gtk_label_new (_("<b>Behaviour</b>")); - gtk_widget_show (label178); - gtk_frame_set_label_widget (GTK_FRAME (frame19), label178); - gtk_label_set_use_markup (GTK_LABEL (label178), TRUE); + label199 = gtk_label_new (_("<b>Miscellaneous</b>")); + gtk_widget_show (label199); + gtk_frame_set_label_widget (GTK_FRAME (frame19), label199); + gtk_label_set_use_markup (GTK_LABEL (label199), TRUE);
frame25 = gtk_frame_new (NULL); gtk_widget_show (frame25); @@ -2902,7 +2906,7 @@ gtk_widget_show (table2); gtk_container_add (GTK_CONTAINER (alignment5), table2); gtk_table_set_row_spacings (GTK_TABLE (table2), 3); - gtk_table_set_col_spacings (GTK_TABLE (table2), 25); + gtk_table_set_col_spacings (GTK_TABLE (table2), 24);
label100 = gtk_label_new (_("Symbol list:")); gtk_widget_show (label100); @@ -2953,6 +2957,60 @@ gtk_frame_set_label_widget (GTK_FRAME (frame4), label99); gtk_label_set_use_markup (GTK_LABEL (label99), TRUE);
+ frame29 = gtk_frame_new (NULL); + gtk_widget_show (frame29); + gtk_box_pack_start (GTK_BOX (vbox14), frame29, FALSE, TRUE, 0); + gtk_frame_set_shadow_type (GTK_FRAME (frame29), GTK_SHADOW_NONE); + + alignment32 = gtk_alignment_new (0.5, 0.5, 1, 1); + gtk_widget_show (alignment32); + gtk_container_add (GTK_CONTAINER (frame29), alignment32); + gtk_alignment_set_padding (GTK_ALIGNMENT (alignment32), 0, 0, 12, 0); + + vbox26 = gtk_vbox_new (FALSE, 0); + gtk_widget_show (vbox26); + gtk_container_add (GTK_CONTAINER (alignment32), vbox26); + + check_show_notebook_tabs = gtk_check_button_new_with_mnemonic (_("Show editor tabs")); + gtk_widget_show (check_show_notebook_tabs); + gtk_box_pack_start (GTK_BOX (vbox26), check_show_notebook_tabs, FALSE, FALSE, 0); + + check_show_tab_cross = gtk_check_button_new_with_mnemonic (_("Show close buttons")); + gtk_widget_show (check_show_tab_cross); + gtk_box_pack_start (GTK_BOX (vbox26), check_show_tab_cross, FALSE, FALSE, 0); + GTK_WIDGET_UNSET_FLAGS (check_show_tab_cross, GTK_CAN_FOCUS); + gtk_tooltips_set_tip (tooltips, check_show_tab_cross, _("Shows a small cross button in the file tabs to easily close files when clicking on it (requires restart of Geany)."), NULL); + gtk_button_set_focus_on_click (GTK_BUTTON (check_show_tab_cross), FALSE); + + hbox7 = gtk_hbox_new (FALSE, 12); + gtk_widget_show (hbox7); + gtk_box_pack_start (GTK_BOX (vbox26), hbox7, FALSE, TRUE, 0); + + label150 = gtk_label_new (_("Placement of new file tabs:")); + gtk_widget_show (label150); + gtk_box_pack_start (GTK_BOX (hbox7), label150, FALSE, FALSE, 0); + gtk_misc_set_alignment (GTK_MISC (label150), 0, 0.5); + + radio_tab_left = gtk_radio_button_new_with_mnemonic (NULL, _("Left")); + gtk_widget_show (radio_tab_left); + gtk_box_pack_start (GTK_BOX (hbox7), radio_tab_left, FALSE, FALSE, 0); + gtk_tooltips_set_tip (tooltips, radio_tab_left, _("File tabs will be placed on the left of the notebook"), NULL); + gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_tab_left), radio_tab_left_group); + radio_tab_left_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_tab_left)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio_tab_left), TRUE); + + radio_tab_right = gtk_radio_button_new_with_mnemonic (NULL, _("Right")); + gtk_widget_show (radio_tab_right); + gtk_box_pack_start (GTK_BOX (hbox7), radio_tab_right, FALSE, FALSE, 0); + gtk_tooltips_set_tip (tooltips, radio_tab_right, _("File tabs will be placed on the right of the notebook"), NULL); + gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_tab_right), radio_tab_left_group); + radio_tab_left_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_tab_right)); + + label197 = gtk_label_new (_("<b>Editor tabs</b>")); + gtk_widget_show (label197); + gtk_frame_set_label_widget (GTK_FRAME (frame29), label197); + gtk_label_set_use_markup (GTK_LABEL (label197), TRUE); + frame9 = gtk_frame_new (NULL); gtk_widget_show (frame9); gtk_box_pack_start (GTK_BOX (vbox14), frame9, FALSE, TRUE, 0); @@ -2963,28 +3021,22 @@ gtk_container_add (GTK_CONTAINER (frame9), alignment12); gtk_alignment_set_padding (GTK_ALIGNMENT (alignment12), 0, 0, 12, 0);
- table8 = gtk_table_new (5, 2, FALSE); + table8 = gtk_table_new (3, 2, FALSE); gtk_widget_show (table8); gtk_container_add (GTK_CONTAINER (alignment12), table8); gtk_table_set_row_spacings (GTK_TABLE (table8), 3); - gtk_table_set_col_spacings (GTK_TABLE (table8), 25); + gtk_table_set_col_spacings (GTK_TABLE (table8), 24);
- check_show_notebook_tabs = gtk_check_button_new_with_mnemonic (_("Show editor tabs")); - gtk_widget_show (check_show_notebook_tabs); - gtk_table_attach (GTK_TABLE (table8), check_show_notebook_tabs, 0, 2, 0, 1, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - label160 = gtk_label_new (_("Message window:")); gtk_widget_show (label160); - gtk_table_attach (GTK_TABLE (table8), label160, 0, 1, 4, 5, + gtk_table_attach (GTK_TABLE (table8), label160, 0, 1, 2, 3, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_misc_set_alignment (GTK_MISC (label160), 0, 0.5);
combo_tab_msgwin = gtk_combo_box_new_text (); gtk_widget_show (combo_tab_msgwin); - gtk_table_attach (GTK_TABLE (table8), combo_tab_msgwin, 1, 2, 4, 5, + gtk_table_attach (GTK_TABLE (table8), combo_tab_msgwin, 1, 2, 2, 3, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); gtk_combo_box_append_text (GTK_COMBO_BOX (combo_tab_msgwin), _("Left")); @@ -2994,14 +3046,14 @@
label161 = gtk_label_new (_("Sidebar:")); gtk_widget_show (label161); - gtk_table_attach (GTK_TABLE (table8), label161, 0, 1, 3, 4, + gtk_table_attach (GTK_TABLE (table8), label161, 0, 1, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_misc_set_alignment (GTK_MISC (label161), 0, 0.5);
combo_tab_sidebar = gtk_combo_box_new_text (); gtk_widget_show (combo_tab_sidebar); - gtk_table_attach (GTK_TABLE (table8), combo_tab_sidebar, 1, 2, 3, 4, + gtk_table_attach (GTK_TABLE (table8), combo_tab_sidebar, 1, 2, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); gtk_combo_box_append_text (GTK_COMBO_BOX (combo_tab_sidebar), _("Left")); @@ -3011,14 +3063,14 @@
label159 = gtk_label_new (_("Editor:")); gtk_widget_show (label159); - gtk_table_attach (GTK_TABLE (table8), label159, 0, 1, 2, 3, + gtk_table_attach (GTK_TABLE (table8), label159, 0, 1, 0, 1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_misc_set_alignment (GTK_MISC (label159), 0, 0.5);
combo_tab_editor = gtk_combo_box_new_text (); gtk_widget_show (combo_tab_editor); - gtk_table_attach (GTK_TABLE (table8), combo_tab_editor, 1, 2, 2, 3, + gtk_table_attach (GTK_TABLE (table8), combo_tab_editor, 1, 2, 0, 1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); gtk_combo_box_append_text (GTK_COMBO_BOX (combo_tab_editor), _("Left")); @@ -3026,23 +3078,14 @@ gtk_combo_box_append_text (GTK_COMBO_BOX (combo_tab_editor), _("Top")); gtk_combo_box_append_text (GTK_COMBO_BOX (combo_tab_editor), _("Bottom"));
- check_show_tab_cross = gtk_check_button_new_with_mnemonic (_("Show small cross symbol in the file tabs")); - gtk_widget_show (check_show_tab_cross); - gtk_table_attach (GTK_TABLE (table8), check_show_tab_cross, 0, 2, 1, 2, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - GTK_WIDGET_UNSET_FLAGS (check_show_tab_cross, GTK_CAN_FOCUS); - gtk_tooltips_set_tip (tooltips, check_show_tab_cross, _("Shows a small cross symbol in the file tabs to easily close files by clicking on it (requires restart of Geany)."), NULL); - gtk_button_set_focus_on_click (GTK_BUTTON (check_show_tab_cross), FALSE); - - label158 = gtk_label_new (_("<b>Tab placement</b>")); + label158 = gtk_label_new (_("<b>Tab positions</b>")); gtk_widget_show (label158); gtk_frame_set_label_widget (GTK_FRAME (frame9), label158); gtk_label_set_use_markup (GTK_LABEL (label158), TRUE);
frame23 = gtk_frame_new (NULL); gtk_widget_show (frame23); - gtk_box_pack_start (GTK_BOX (vbox14), frame23, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (vbox14), frame23, FALSE, TRUE, 0); gtk_frame_set_shadow_type (GTK_FRAME (frame23), GTK_SHADOW_NONE);
alignment26 = gtk_alignment_new (0.5, 0.5, 1, 1); @@ -3054,7 +3097,7 @@ gtk_widget_show (vbox22); gtk_container_add (GTK_CONTAINER (alignment26), vbox22);
- check_statusbar_visible = gtk_check_button_new_with_mnemonic (_("Show statusbar")); + check_statusbar_visible = gtk_check_button_new_with_mnemonic (_("Show status bar")); gtk_widget_show (check_statusbar_visible); gtk_box_pack_start (GTK_BOX (vbox22), check_statusbar_visible, FALSE, FALSE, 0); gtk_tooltips_set_tip (tooltips, check_statusbar_visible, _("Whether to show the status bar at the bottom of the main window."), NULL); @@ -3313,7 +3356,7 @@ gtk_widget_show (table7); gtk_container_add (GTK_CONTAINER (alignment11), table7); gtk_table_set_row_spacings (GTK_TABLE (table7), 3); - gtk_table_set_col_spacings (GTK_TABLE (table7), 25); + gtk_table_set_col_spacings (GTK_TABLE (table7), 24);
label133 = gtk_label_new (_("Long line marker:")); gtk_widget_show (label133); @@ -3354,7 +3397,7 @@ gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin_long_line), TRUE); gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spin_long_line), TRUE);
- hbox5 = gtk_hbox_new (FALSE, 10); + hbox5 = gtk_hbox_new (FALSE, 12); gtk_widget_show (hbox5); gtk_table_attach (GTK_TABLE (table7), hbox5, 1, 2, 0, 1, (GtkAttachOptions) (GTK_FILL), @@ -3417,7 +3460,7 @@ gtk_widget_show (table13); gtk_box_pack_start (GTK_BOX (vbox25), table13, FALSE, TRUE, 0); gtk_table_set_row_spacings (GTK_TABLE (table13), 3); - gtk_table_set_col_spacings (GTK_TABLE (table13), 25); + gtk_table_set_col_spacings (GTK_TABLE (table13), 24);
label116 = gtk_label_new (_("Tab Width:")); gtk_widget_show (label116); @@ -3691,43 +3734,15 @@ gtk_container_add (GTK_CONTAINER (frame17), alignment20); gtk_alignment_set_padding (GTK_ALIGNMENT (alignment20), 0, 0, 12, 0);
- table10 = gtk_table_new (3, 2, FALSE); + table10 = gtk_table_new (2, 2, FALSE); gtk_widget_show (table10); gtk_container_add (GTK_CONTAINER (alignment20), table10); gtk_table_set_row_spacings (GTK_TABLE (table10), 3); - gtk_table_set_col_spacings (GTK_TABLE (table10), 25); + gtk_table_set_col_spacings (GTK_TABLE (table10), 24);
- label150 = gtk_label_new (_("Placement of new file tabs:")); - gtk_widget_show (label150); - gtk_table_attach (GTK_TABLE (table10), label150, 0, 1, 0, 1, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment (GTK_MISC (label150), 0, 0.5); - - hbox3 = gtk_hbox_new (FALSE, 12); - gtk_widget_show (hbox3); - gtk_table_attach (GTK_TABLE (table10), hbox3, 1, 2, 0, 1, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (GTK_FILL), 0, 0); - - radio_tab_left = gtk_radio_button_new_with_mnemonic (NULL, _("Left")); - gtk_widget_show (radio_tab_left); - gtk_box_pack_start (GTK_BOX (hbox3), radio_tab_left, FALSE, FALSE, 0); - gtk_tooltips_set_tip (tooltips, radio_tab_left, _("File tabs will be placed on the left of the notebook"), NULL); - gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_tab_left), radio_tab_left_group); - radio_tab_left_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_tab_left)); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio_tab_left), TRUE); - - radio_tab_right = gtk_radio_button_new_with_mnemonic (NULL, _("Right")); - gtk_widget_show (radio_tab_right); - gtk_box_pack_start (GTK_BOX (hbox3), radio_tab_right, FALSE, FALSE, 0); - gtk_tooltips_set_tip (tooltips, radio_tab_right, _("File tabs will be placed on the right of the notebook"), NULL); - gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_tab_right), radio_tab_left_group); - radio_tab_left_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_tab_right)); - label147 = gtk_label_new (_("Recent files list length:")); gtk_widget_show (label147); - gtk_table_attach (GTK_TABLE (table10), label147, 0, 1, 1, 2, + gtk_table_attach (GTK_TABLE (table10), label147, 0, 1, 0, 1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_misc_set_alignment (GTK_MISC (label147), 0, 0.5); @@ -3736,17 +3751,17 @@ spin_mru_adj = gtk_adjustment_new (4, 1, 50, 1, 10, 10); spin_mru = gtk_spin_button_new (GTK_ADJUSTMENT (spin_mru_adj), 1, 0); gtk_widget_show (spin_mru); - gtk_table_attach (GTK_TABLE (table10), spin_mru, 1, 2, 1, 2, + gtk_table_attach (GTK_TABLE (table10), spin_mru, 1, 2, 0, 1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_tooltips_set_tip (tooltips, spin_mru, _("Specifies the number of files which are stored in the Recent files list."), NULL); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin_mru), TRUE); gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spin_mru), TRUE);
- label176 = gtk_label_new (_("<b>Misc.</b>")); - gtk_widget_show (label176); - gtk_frame_set_label_widget (GTK_FRAME (frame17), label176); - gtk_label_set_use_markup (GTK_LABEL (label176), TRUE); + label198 = gtk_label_new (_("<b>Miscellaneous</b>")); + gtk_widget_show (label198); + gtk_frame_set_label_widget (GTK_FRAME (frame17), label198); + gtk_label_set_use_markup (GTK_LABEL (label198), TRUE);
label174 = gtk_label_new (_("Files")); gtk_widget_show (label174); @@ -3780,7 +3795,7 @@ gtk_widget_show (table1); gtk_box_pack_start (GTK_BOX (vbox2), table1, FALSE, TRUE, 0); gtk_table_set_row_spacings (GTK_TABLE (table1), 3); - gtk_table_set_col_spacings (GTK_TABLE (table1), 5); + gtk_table_set_col_spacings (GTK_TABLE (table1), 6);
label11 = gtk_label_new (_("Make:")); gtk_widget_show (label11); @@ -3896,7 +3911,7 @@ gtk_widget_show (table12); gtk_container_add (GTK_CONTAINER (alignment29), table12); gtk_table_set_row_spacings (GTK_TABLE (table12), 3); - gtk_table_set_col_spacings (GTK_TABLE (table12), 5); + gtk_table_set_col_spacings (GTK_TABLE (table12), 6);
entry_print = gtk_entry_new (); gtk_widget_show (entry_print); @@ -4159,7 +4174,7 @@ GLADE_HOOKUP_OBJECT (prefs_dialog, check_suppress_status_msgs, "check_suppress_status_msgs"); GLADE_HOOKUP_OBJECT (prefs_dialog, check_auto_focus, "check_auto_focus"); GLADE_HOOKUP_OBJECT (prefs_dialog, check_ask_suppress_search_dialogs, "check_ask_suppress_search_dialogs"); - GLADE_HOOKUP_OBJECT (prefs_dialog, label178, "label178"); + GLADE_HOOKUP_OBJECT (prefs_dialog, label199, "label199"); GLADE_HOOKUP_OBJECT (prefs_dialog, frame25, "frame25"); GLADE_HOOKUP_OBJECT (prefs_dialog, alignment28, "alignment28"); GLADE_HOOKUP_OBJECT (prefs_dialog, table11, "table11"); @@ -4190,17 +4205,25 @@ GLADE_HOOKUP_OBJECT (prefs_dialog, tagbar_font, "tagbar_font"); GLADE_HOOKUP_OBJECT (prefs_dialog, editor_font, "editor_font"); GLADE_HOOKUP_OBJECT (prefs_dialog, label99, "label99"); + GLADE_HOOKUP_OBJECT (prefs_dialog, frame29, "frame29"); + GLADE_HOOKUP_OBJECT (prefs_dialog, alignment32, "alignment32"); + GLADE_HOOKUP_OBJECT (prefs_dialog, vbox26, "vbox26"); + GLADE_HOOKUP_OBJECT (prefs_dialog, check_show_notebook_tabs, "check_show_notebook_tabs"); + GLADE_HOOKUP_OBJECT (prefs_dialog, check_show_tab_cross, "check_show_tab_cross"); + GLADE_HOOKUP_OBJECT (prefs_dialog, hbox7, "hbox7"); + GLADE_HOOKUP_OBJECT (prefs_dialog, label150, "label150"); + GLADE_HOOKUP_OBJECT (prefs_dialog, radio_tab_left, "radio_tab_left"); + GLADE_HOOKUP_OBJECT (prefs_dialog, radio_tab_right, "radio_tab_right"); + GLADE_HOOKUP_OBJECT (prefs_dialog, label197, "label197"); GLADE_HOOKUP_OBJECT (prefs_dialog, frame9, "frame9"); GLADE_HOOKUP_OBJECT (prefs_dialog, alignment12, "alignment12"); GLADE_HOOKUP_OBJECT (prefs_dialog, table8, "table8"); - GLADE_HOOKUP_OBJECT (prefs_dialog, check_show_notebook_tabs, "check_show_notebook_tabs"); GLADE_HOOKUP_OBJECT (prefs_dialog, label160, "label160"); GLADE_HOOKUP_OBJECT (prefs_dialog, combo_tab_msgwin, "combo_tab_msgwin"); GLADE_HOOKUP_OBJECT (prefs_dialog, label161, "label161"); GLADE_HOOKUP_OBJECT (prefs_dialog, combo_tab_sidebar, "combo_tab_sidebar"); GLADE_HOOKUP_OBJECT (prefs_dialog, label159, "label159"); GLADE_HOOKUP_OBJECT (prefs_dialog, combo_tab_editor, "combo_tab_editor"); - GLADE_HOOKUP_OBJECT (prefs_dialog, check_show_tab_cross, "check_show_tab_cross"); GLADE_HOOKUP_OBJECT (prefs_dialog, label158, "label158"); GLADE_HOOKUP_OBJECT (prefs_dialog, frame23, "frame23"); GLADE_HOOKUP_OBJECT (prefs_dialog, alignment26, "alignment26"); @@ -4316,13 +4339,9 @@ GLADE_HOOKUP_OBJECT (prefs_dialog, frame17, "frame17"); GLADE_HOOKUP_OBJECT (prefs_dialog, alignment20, "alignment20"); GLADE_HOOKUP_OBJECT (prefs_dialog, table10, "table10"); - GLADE_HOOKUP_OBJECT (prefs_dialog, label150, "label150"); - GLADE_HOOKUP_OBJECT (prefs_dialog, hbox3, "hbox3"); - GLADE_HOOKUP_OBJECT (prefs_dialog, radio_tab_left, "radio_tab_left"); - GLADE_HOOKUP_OBJECT (prefs_dialog, radio_tab_right, "radio_tab_right"); GLADE_HOOKUP_OBJECT (prefs_dialog, label147, "label147"); GLADE_HOOKUP_OBJECT (prefs_dialog, spin_mru, "spin_mru"); - GLADE_HOOKUP_OBJECT (prefs_dialog, label176, "label176"); + GLADE_HOOKUP_OBJECT (prefs_dialog, label198, "label198"); GLADE_HOOKUP_OBJECT (prefs_dialog, label174, "label174"); GLADE_HOOKUP_OBJECT (prefs_dialog, vbox23, "vbox23"); GLADE_HOOKUP_OBJECT (prefs_dialog, frame20, "frame20");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.