SF.net SVN: geany: [525] trunk

Revision: 525 Author: eht16 Date: 2006-07-02 09:21:35 -0700 (Sun, 02 Jul 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=525&view=rev

Log Message: ----------- Little redesign of the preferences dialog. New options for setting the placement of notebook tabs.

Modified Paths: -------------- trunk/ChangeLog trunk/geany.glade trunk/src/dialogs.c trunk/src/geany.h trunk/src/interface.c trunk/src/keyfile.c trunk/src/main.c trunk/src/prefs.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-07-02 11:32:06 UTC (rev 524) +++ trunk/ChangeLog 2006-07-02 16:21:35 UTC (rev 525) @@ -3,6 +3,10 @@ * src/callbacks.c, src/msgwindow.c, src/utils.c: Improved "Find usage", so it displays not "null" for unsaved files in the results, and unsaved file are also clickable. + * geany.glade, src/interface.c, src/geany.h, src/keyfile.c, + src/prefs.c, src/dialogs.c, src/main.c: + Little redesign of the preferences dialog. + New options for setting the placement of notebook tabs.

2006-07-02 Nick Treleaven nick.treleaven@btinternet.com

Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2006-07-02 11:32:06 UTC (rev 524) +++ trunk/geany.glade 2006-07-02 16:21:35 UTC (rev 525) @@ -2352,105 +2352,194 @@ <property name="enable_popup">False</property>

<child> - <widget class="GtkVBox" id="vbox3"> + <widget class="GtkFrame" id="frame10"> <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</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="GtkFrame" id="frame1"> + <widget class="GtkAlignment" id="alignment13"> <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> + <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="GtkAlignment" id="alignment2"> + <widget class="GtkVBox" id="vbox4"> <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> + <property name="homogeneous">False</property> + <property name="spacing">2</property>

<child> - <widget class="GtkVBox" id="vbox4"> + <widget class="GtkCheckButton" id="check_load_session"> <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> + <property name="tooltip" translatable="yes">Opens at startup the files from the last session</property> + <property name="label" translatable="yes">Load files from the last session</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="hbox2"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">19</property> + <child> + <widget class="GtkCheckButton" id="check_save_win_pos"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Saves the window position and geometry and restores it at the start</property> + <property name="label" translatable="yes">Save window position and geometry</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="GtkLabel" id="label147"> - <property name="visible">True</property> - <property name="label" translatable="yes">Recent files list length:</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.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="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> + <child> + <widget class="GtkCheckButton" id="check_beep"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Whether to beep if an error occured or when the compilation process has finished.</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Beep on errors or when compilation has finished</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="GtkSpinButton" id="spin_mru"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">Specifies the number of files which are stored in the Recent files list.</property> - <property name="can_focus">True</property> - <property name="climb_rate">1</property> - <property name="digits">0</property> - <property name="numeric">True</property> - <property name="update_policy">GTK_UPDATE_ALWAYS</property> - <property name="snap_to_ticks">False</property> - <property name="wrap">True</property> - <property name="adjustment">4 1 50 1 10 10</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> + <child> + <widget class="GtkCheckButton" id="check_switch_pages"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Switch to the status message tab(in the notebook window at the bottom) if a new status message arrive.</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Switch to status message list at new message</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="GtkCheckButton" id="check_vte"> + <property name="tooltip" translatable="yes">Whether the virtual terminal emulation(VTE) should be loaded at startup. Disable it if you do not need it.</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Load virtual terminal emulation at startup</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="GtkCheckButton" id="check_ask_for_quit"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Shows a confirmation dialog on exit.</property> + <property name="label" translatable="yes">Confirm exit</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="GtkLabel" id="label163"> + <property name="visible">True</property> + <property name="label"> </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.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="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkHBox" id="hbox2"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">19</property> + <child> - <widget class="GtkCheckButton" id="check_load_session"> + <widget class="GtkLabel" id="label147"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Opens at startup the files from the last session</property> - <property name="label" translatable="yes">Load files from the last session</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> + <property name="label" translatable="yes">Recent files list length:</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.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="padding">0</property> @@ -2460,36 +2549,55 @@ </child>

<child> - <widget class="GtkCheckButton" id="check_save_win_pos"> + <widget class="GtkSpinButton" id="spin_mru"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Saves the window position and geometry and restores it at the start</property> - <property name="label" translatable="yes">Save window position and geometry</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> + <property name="tooltip" translatable="yes">Specifies the number of files which are stored in the Recent files list.</property> + <property name="can_focus">True</property> + <property name="climb_rate">1</property> + <property name="digits">0</property> + <property name="numeric">True</property> + <property name="update_policy">GTK_UPDATE_ALWAYS</property> + <property name="snap_to_ticks">False</property> + <property name="wrap">True</property> + <property name="adjustment">4 1 50 1 10 10</property> </widget> <packing> <property name="padding">0</property> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</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="GtkHBox" id="hbox3"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">1</property> + <child> - <widget class="GtkCheckButton" id="check_beep"> + <widget class="GtkLabel" id="label150"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Whether to beep if an error occured or when the compilation process has finished.</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Beep on errors or when compilation has finished</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> + <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.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="padding">0</property> @@ -2499,15 +2607,15 @@ </child>

<child> - <widget class="GtkCheckButton" id="check_switch_pages"> + <widget class="GtkRadioButton" id="radio_tab_left"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Switch to the status message tab(in the notebook window at the bottom) if a new status message arrive.</property> + <property name="tooltip" translatable="yes">New file tabs will be placed to the left of the tab list</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Switch to status message list at new message</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">False</property> - <property name="active">False</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> @@ -2519,16 +2627,22 @@ </child>

<child> - <widget class="GtkCheckButton" id="check_vte"> - <property name="tooltip" translatable="yes">Whether the virtual terminal emulation(VTE) should be loaded at startup. Disable it if you do not need it.</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Load virtual terminal emulation at startup</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 class="GtkLabel" id="label149"> + <property name="visible">True</property> + <property name="label"> </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.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="padding">0</property> @@ -2538,16 +2652,18 @@ </child>

<child> - <widget class="GtkCheckButton" id="check_ask_for_quit"> + <widget class="GtkRadioButton" id="radio_tab_right"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Shows a confirmation dialog on exit.</property> - <property name="label" translatable="yes">Confirm exit</property> + <property name="tooltip" translatable="yes">New file tabs will be placed to the right of the tab list</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">False</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> @@ -2555,170 +2671,76 @@ <property name="fill">False</property> </packing> </child> - - <child> - <widget class="GtkHBox" id="hbox3"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</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.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="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">New file tabs will be placed to the left of the tab list</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="GtkLabel" id="label149"> - <property name="visible">True</property> - <property name="label"> </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.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="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">New file tabs will be placed to the right of the tab list</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">True</property> - <property name="fill">True</property> - </packing> - </child> </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + </packing> </child> </widget> </child> - - <child> - <widget class="GtkLabel" id="label18"> - <property name="visible">True</property> - <property name="label" translatable="yes">&lt;b&gt;Miscellaneous&lt;/b&gt;</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">True</property> - <property name="fill">True</property> - </packing> </child>

<child> - <widget class="GtkLabel" id="label106"> + <widget class="GtkLabel" id="label162"> <property name="visible">True</property> - <property name="label"></property> + <property name="label" translatable="yes"></property> <property name="use_underline">False</property> - <property name="use_markup">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">2</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> + <property name="type">label_item</property> </packing> </child> + </widget> + <packing> + <property name="tab_expand">False</property> + <property name="tab_fill">True</property> + </packing> + </child>

+ <child> + <widget class="GtkLabel" id="label94"> + <property name="visible">True</property> + <property name="label" translatable="yes">General</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.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">tab</property> + </packing> + </child> + + <child> + <widget class="GtkVBox" id="vbox14"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">10</property> + <child> <widget class="GtkFrame" id="frame3"> <property name="visible">True</property> @@ -2811,37 +2833,12 @@ </widget> <packing> <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> + <property name="expand">True</property> + <property name="fill">True</property> </packing> </child>

<child> - <widget class="GtkLabel" id="label104"> - <property name="visible">True</property> - <property name="label"></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.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">2</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="GtkFrame" id="frame7"> <property name="visible">True</property> <property name="label_xalign">0</property> @@ -2935,37 +2932,12 @@ </widget> <packing> <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> + <property name="expand">True</property> + <property name="fill">True</property> </packing> </child>

<child> - <widget class="GtkLabel" id="label105"> - <property name="visible">True</property> - <property name="label"></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.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">2</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="GtkFrame" id="frame4"> <property name="visible">True</property> <property name="label_xalign">0</property> @@ -2987,7 +2959,7 @@ <child> <widget class="GtkTable" id="table2"> <property name="visible">True</property> - <property name="n_rows">2</property> + <property name="n_rows">3</property> <property name="n_columns">2</property> <property name="homogeneous">False</property> <property name="row_spacing">3</property> @@ -3089,6 +3061,55 @@ <property name="y_options"></property> </packing> </child> + + <child> + <widget class="GtkLabel" id="label103"> + <property name="visible">True</property> + <property name="label" translatable="yes">Editor font</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">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkFontButton" id="editor_font"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Sets the font for the editors windows</property> + <property name="can_focus">True</property> + <property name="show_style">True</property> + <property name="show_size">True</property> + <property name="use_font">False</property> + <property name="use_size">False</property> + <property name="focus_on_click">True</property> + </widget> + <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="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> </widget> </child> </widget> @@ -3123,6 +3144,479 @@ <property name="fill">True</property> </packing> </child> + + <child> + <widget class="GtkFrame" id="frame8"> + <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="alignment11"> + <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="table7"> + <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">25</property> + + <child> + <widget class="GtkLabel" id="label133"> + <property name="visible">True</property> + <property name="label" translatable="yes">Long line marker</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">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label134"> + <property name="visible">True</property> + <property name="label" translatable="yes">Long line marker color</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">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkSpinButton" id="spin_long_line"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">The long line marker is a thin vertical line in the editor. It helps to mark long lines, or as a hint to break the line. Set this value to a value greater than 0 to specify the column where it should appear.</property> + <property name="can_focus">True</property> + <property name="climb_rate">1</property> + <property name="digits">0</property> + <property name="numeric">True</property> + <property name="update_policy">GTK_UPDATE_ALWAYS</property> + <property name="snap_to_ticks">False</property> + <property name="wrap">True</property> + <property name="adjustment">72 0 1000 1 10 10</property> + </widget> + <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="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label156"> + <property name="visible">True</property> + <property name="label" translatable="yes">Type</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="hbox5"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">10</property> + + <child> + <widget class="GtkRadioButton" id="radio_long_line_line"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Prints a vertical line in the editor window at the given cursor position(see below).</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Line</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> + </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_long_line_background"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">The background colour of characters after the given cursor position(see below) changed to the colour set below. (This is recommended if you use proportional fonts)</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Background</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_long_line_line</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_long_line_disabled"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Disabled</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_long_line_line</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="GtkColorButton" id="long_line_color"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Sets the color of the long line marker</property> + <property name="can_focus">True</property> + <property name="use_alpha">False</property> + <property name="title" translatable="yes">Color Chooser</property> + <property name="focus_on_click">True</property> + </widget> + <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="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + </widget> + </child> + </widget> + </child> + + <child> + <widget class="GtkLabel" id="label155"> + <property name="visible">True</property> + <property name="label" translatable="yes">&lt;b&gt;Long line marker&lt;/b&gt;</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">True</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">25</property> + + <child> + <widget class="GtkLabel" id="label159"> + <property name="visible">True</property> + <property name="label" translatable="yes">Editor</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="GtkLabel" id="label160"> + <property name="visible">True</property> + <property name="label" translatable="yes">Message window</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">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label161"> + <property name="visible">True</property> + <property name="label" translatable="yes">Sidebar</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">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkComboBox" id="combo_tab_msgwin"> + <property name="visible">True</property> + <property name="items" translatable="yes">Left +Right +Top +Bottom +</property> + <property name="add_tearoffs">False</property> + <property name="focus_on_click">True</property> + </widget> + <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="x_options">fill</property> + <property name="y_options">fill</property> + </packing> + </child> + + <child> + <widget class="GtkComboBox" id="combo_tab_sidebar"> + <property name="visible">True</property> + <property name="items" translatable="yes">Left +Right +Top +Bottom +</property> + <property name="add_tearoffs">False</property> + <property name="focus_on_click">True</property> + </widget> + <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="x_options">fill</property> + <property name="y_options">fill</property> + </packing> + </child> + + <child> + <widget class="GtkComboBox" id="combo_tab_editor"> + <property name="visible">True</property> + <property name="items" translatable="yes">Left +Right +Top +Bottom +</property> + <property name="add_tearoffs">False</property> + <property name="focus_on_click">True</property> + </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> + </widget> + </child> + </widget> + </child> + + <child> + <widget class="GtkLabel" id="label158"> + <property name="visible">True</property> + <property name="label" translatable="yes">&lt;b&gt;Tab placement&lt;/b&gt;</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">True</property> + <property name="fill">True</property> + </packing> + </child> </widget> <packing> <property name="tab_expand">False</property> @@ -3131,9 +3625,9 @@ </child>

<child> - <widget class="GtkLabel" id="label94"> + <widget class="GtkLabel" id="label157"> <property name="visible">True</property> - <property name="label" translatable="yes">General</property> + <property name="label" translatable="yes">Interface</property> <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -3185,21 +3679,24 @@ <property name="spacing">3</property>

<child> - <widget class="GtkHBox" id="hbox4"> + <widget class="GtkTable" id="table5"> <property name="visible">True</property> + <property name="n_rows">2</property> + <property name="n_columns">2</property> <property name="homogeneous">False</property> - <property name="spacing">12</property> + <property name="row_spacing">3</property> + <property name="column_spacing">25</property>

<child> - <widget class="GtkLabel" id="label153"> + <widget class="GtkLabel" id="label116"> <property name="visible">True</property> - <property name="label" translatable="yes">Default encoding:</property> + <property name="label" translatable="yes">Tab Width</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.5</property> + <property name="xalign">0</property> <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> @@ -3209,60 +3706,25 @@ <property name="angle">0</property> </widget> <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> + <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="x_options">fill</property> + <property name="y_options"></property> </packing> </child>

<child> - <widget class="GtkEventBox" id="eventbox1"> + <widget class="GtkLabel" id="label153"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Sets the default encoding for newly created files.</property> - <property name="visible_window">True</property> - <property name="above_child">False</property> - - <child> - <widget class="GtkComboBox" id="combo_encoding"> - <property name="visible">True</property> - <property name="add_tearoffs">False</property> - <property name="focus_on_click">True</property> - </widget> - </child> - </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> - - <child> - <widget class="GtkTable" id="table5"> - <property name="visible">True</property> - <property name="n_rows">1</property> - <property name="n_columns">2</property> - <property name="homogeneous">False</property> - <property name="row_spacing">3</property> - <property name="column_spacing">25</property> - - <child> - <widget class="GtkLabel" id="label116"> - <property name="visible">True</property> - <property name="label" translatable="yes">Tab Width</property> + <property name="label" translatable="yes">Default encoding:</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="xalign">0.5</property> <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> @@ -3282,6 +3744,31 @@ </child>

<child> + <widget class="GtkEventBox" id="eventbox1"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Sets the default encoding for newly created files.</property> + <property name="visible_window">True</property> + <property name="above_child">False</property> + + <child> + <widget class="GtkComboBox" id="combo_encoding"> + <property name="visible">True</property> + <property name="add_tearoffs">False</property> + <property name="focus_on_click">True</property> + </widget> + </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="GtkSpinButton" id="spin_tab_width"> <property name="visible">True</property> <property name="tooltip" translatable="yes">The width in chars, which one tab character will take</property> @@ -3297,8 +3784,8 @@ <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="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> @@ -3306,7 +3793,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> @@ -3652,67 +4139,7 @@ </child>

<child> - <widget class="GtkTable" id="table3"> - <property name="visible">True</property> - <property name="n_rows">1</property> - <property name="n_columns">2</property> - <property name="homogeneous">True</property> - <property name="row_spacing">3</property> - <property name="column_spacing">25</property> - - <child> - <widget class="GtkLabel" id="label103"> - <property name="visible">True</property> - <property name="label" translatable="yes">Editor font</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="GtkFontButton" id="editor_font"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">Sets the font for the editors windows</property> - <property name="can_focus">True</property> - <property name="show_style">True</property> - <property name="show_size">True</property> - <property name="use_font">False</property> - <property name="use_size">False</property> - <property name="focus_on_click">True</property> - </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="y_options"></property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> + <placeholder/> </child> </widget> </child> @@ -3750,267 +4177,7 @@ </child>

<child> - <widget class="GtkFrame" id="frame8"> - <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="alignment11"> - <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="table7"> - <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">25</property> - - <child> - <widget class="GtkLabel" id="label133"> - <property name="visible">True</property> - <property name="label" translatable="yes">Long line marker</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">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label134"> - <property name="visible">True</property> - <property name="label" translatable="yes">Long line marker color</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">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkSpinButton" id="spin_long_line"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">The long line marker is a thin vertical line in the editor. It helps to mark long lines, or as a hint to break the line. Set this value to a value greater than 0 to specify the column where it should appear.</property> - <property name="can_focus">True</property> - <property name="climb_rate">1</property> - <property name="digits">0</property> - <property name="numeric">True</property> - <property name="update_policy">GTK_UPDATE_ALWAYS</property> - <property name="snap_to_ticks">False</property> - <property name="wrap">True</property> - <property name="adjustment">72 0 1000 1 10 10</property> - </widget> - <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="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label156"> - <property name="visible">True</property> - <property name="label" translatable="yes">Type</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="hbox5"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">10</property> - - <child> - <widget class="GtkRadioButton" id="radio_long_line_line"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">Prints a vertical line in the editor window at the given cursor position(see below).</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Line</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> - </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_long_line_background"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">The background colour of characters after the given cursor position(see below) changed to the colour set below. (This is recommended if you use proportional fonts)</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Background</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_long_line_line</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_long_line_disabled"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Disabled</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_long_line_line</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="GtkColorButton" id="long_line_color"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">Sets the color of the long line marker</property> - <property name="can_focus">True</property> - <property name="use_alpha">False</property> - <property name="title" translatable="yes">Color Chooser</property> - <property name="focus_on_click">True</property> - </widget> - <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="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - </widget> - </child> - </widget> - </child> - - <child> - <widget class="GtkLabel" id="label155"> - <property name="visible">True</property> - <property name="label" translatable="yes">&lt;b&gt;Long line marker&lt;/b&gt;</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">True</property> - <property name="fill">True</property> - </packing> + <placeholder/> </child> </widget> <packing>

Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2006-07-02 11:32:06 UTC (rev 524) +++ trunk/src/dialogs.c 2006-07-02 16:21:35 UTC (rev 525) @@ -1772,7 +1772,7 @@

label = gtk_label_new(_("Terminal")); gtk_notebook_set_tab_label(GTK_NOTEBOOK(notebook), gtk_notebook_get_nth_page( - GTK_NOTEBOOK(notebook), 5), label); + GTK_NOTEBOOK(notebook), 6), label);

g_object_set_data_full(G_OBJECT(app->prefs_dialog), "font_term", gtk_widget_ref(font_term), (GDestroyNotify) gtk_widget_unref);

Modified: trunk/src/geany.h =================================================================== --- trunk/src/geany.h 2006-07-02 11:32:06 UTC (rev 524) +++ trunk/src/geany.h 2006-07-02 16:21:35 UTC (rev 525) @@ -165,6 +165,9 @@ gboolean pref_main_confirm_exit; gboolean pref_main_show_search; gboolean pref_main_show_goto; + gint tab_pos_editor; + gint tab_pos_msgwin; + gint tab_pos_sidebar; gint cur_idx; // currently only used by the build system (build_spawn_cmd) gint mru_length; gint long_line_type;

Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2006-07-02 11:32:06 UTC (rev 524) +++ trunk/src/interface.c 2006-07-02 16:21:35 UTC (rev 525) @@ -1830,42 +1830,41 @@ GtkWidget *prefs_dialog; GtkWidget *dialog_vbox3; GtkWidget *notebook2; - GtkWidget *vbox3; - GtkWidget *frame1; - GtkWidget *alignment2; + GtkWidget *frame10; + GtkWidget *alignment13; GtkWidget *vbox4; - GtkWidget *hbox2; - GtkWidget *label147; - GtkObject *spin_mru_adj; - GtkWidget *spin_mru; GtkWidget *check_load_session; GtkWidget *check_save_win_pos; GtkWidget *check_beep; GtkWidget *check_switch_pages; GtkWidget *check_vte; GtkWidget *check_ask_for_quit; + GtkWidget *label163; + GtkWidget *hbox2; + GtkWidget *label147; + GtkObject *spin_mru_adj; + GtkWidget *spin_mru; GtkWidget *hbox3; GtkWidget *label150; GtkWidget *radio_tab_left; GSList *radio_tab_left_group = NULL; GtkWidget *label149; GtkWidget *radio_tab_right; - GtkWidget *label18; - GtkWidget *label106; + GtkWidget *label162; + GtkWidget *label94; + GtkWidget *vbox14; GtkWidget *frame3; GtkWidget *alignment4; GtkWidget *vbox7; GtkWidget *check_toolbar_search; GtkWidget *check_toolbar_goto; GtkWidget *label98; - GtkWidget *label104; GtkWidget *frame7; GtkWidget *alignment9; GtkWidget *vbox11; GtkWidget *check_list_symbol; GtkWidget *check_list_openfiles; GtkWidget *label146; - GtkWidget *label105; GtkWidget *frame4; GtkWidget *alignment5; GtkWidget *table2; @@ -1873,18 +1872,44 @@ GtkWidget *label101; GtkWidget *msgwin_font; GtkWidget *tagbar_font; + GtkWidget *label103; + GtkWidget *editor_font; GtkWidget *label99; - GtkWidget *label94; + GtkWidget *frame8; + GtkWidget *alignment11; + GtkWidget *table7; + GtkWidget *label133; + GtkWidget *label134; + GtkObject *spin_long_line_adj; + GtkWidget *spin_long_line; + GtkWidget *label156; + GtkWidget *hbox5; + GtkWidget *radio_long_line_line; + GSList *radio_long_line_line_group = NULL; + GtkWidget *radio_long_line_background; + GtkWidget *radio_long_line_disabled; + GtkWidget *long_line_color; + GtkWidget *label155; + GtkWidget *frame9; + GtkWidget *alignment12; + GtkWidget *table8; + GtkWidget *label159; + GtkWidget *label160; + GtkWidget *label161; + GtkWidget *combo_tab_msgwin; + GtkWidget *combo_tab_sidebar; + GtkWidget *combo_tab_editor; + GtkWidget *label158; + GtkWidget *label157; GtkWidget *vbox5; GtkWidget *frame6; GtkWidget *alignment7; GtkWidget *vbox8; - GtkWidget *hbox4; + GtkWidget *table5; + GtkWidget *label116; GtkWidget *label153; GtkWidget *eventbox1; GtkWidget *combo_encoding; - GtkWidget *table5; - GtkWidget *label116; GtkObject *spin_tab_width_adj; GtkWidget *spin_tab_width; GtkWidget *label109; @@ -1906,25 +1931,7 @@ GtkWidget *check_folding; GtkWidget *check_indicators; GtkWidget *label148; - GtkWidget *table3; - GtkWidget *label103; - GtkWidget *editor_font; GtkWidget *label102; - GtkWidget *frame8; - GtkWidget *alignment11; - GtkWidget *table7; - GtkWidget *label133; - GtkWidget *label134; - GtkObject *spin_long_line_adj; - GtkWidget *spin_long_line; - GtkWidget *label156; - GtkWidget *hbox5; - GtkWidget *radio_long_line_line; - GSList *radio_long_line_line_group = NULL; - GtkWidget *radio_long_line_background; - GtkWidget *radio_long_line_disabled; - GtkWidget *long_line_color; - GtkWidget *label155; GtkWidget *label95; GtkWidget *vbox2; GtkWidget *label17; @@ -1990,40 +1997,20 @@ gtk_box_pack_start (GTK_BOX (dialog_vbox3), notebook2, TRUE, TRUE, 0); GTK_WIDGET_UNSET_FLAGS (notebook2, GTK_CAN_FOCUS);

- vbox3 = gtk_vbox_new (FALSE, 0); - gtk_widget_show (vbox3); - gtk_container_add (GTK_CONTAINER (notebook2), vbox3); + frame10 = gtk_frame_new (NULL); + gtk_widget_show (frame10); + gtk_container_add (GTK_CONTAINER (notebook2), frame10); + gtk_frame_set_shadow_type (GTK_FRAME (frame10), GTK_SHADOW_NONE);

- frame1 = gtk_frame_new (NULL); - gtk_widget_show (frame1); - gtk_box_pack_start (GTK_BOX (vbox3), frame1, TRUE, TRUE, 0); - gtk_frame_set_shadow_type (GTK_FRAME (frame1), GTK_SHADOW_NONE); + alignment13 = gtk_alignment_new (0.5, 0.5, 1, 1); + gtk_widget_show (alignment13); + gtk_container_add (GTK_CONTAINER (frame10), alignment13); + gtk_alignment_set_padding (GTK_ALIGNMENT (alignment13), 0, 0, 12, 0);

- alignment2 = gtk_alignment_new (0.5, 0.5, 1, 1); - gtk_widget_show (alignment2); - gtk_container_add (GTK_CONTAINER (frame1), alignment2); - gtk_alignment_set_padding (GTK_ALIGNMENT (alignment2), 0, 0, 12, 0); - - vbox4 = gtk_vbox_new (FALSE, 0); + vbox4 = gtk_vbox_new (FALSE, 2); gtk_widget_show (vbox4); - gtk_container_add (GTK_CONTAINER (alignment2), vbox4); + gtk_container_add (GTK_CONTAINER (alignment13), vbox4);

- hbox2 = gtk_hbox_new (FALSE, 19); - gtk_widget_show (hbox2); - gtk_box_pack_start (GTK_BOX (vbox4), hbox2, FALSE, FALSE, 0); - - label147 = gtk_label_new (_("Recent files list length:")); - gtk_widget_show (label147); - gtk_box_pack_start (GTK_BOX (hbox2), label147, FALSE, FALSE, 0); - - 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_box_pack_start (GTK_BOX (hbox2), spin_mru, FALSE, TRUE, 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); - check_load_session = gtk_check_button_new_with_mnemonic (_("Load files from the last session")); gtk_widget_show (check_load_session); gtk_box_pack_start (GTK_BOX (vbox4), check_load_session, FALSE, FALSE, 0); @@ -2062,9 +2049,29 @@ gtk_tooltips_set_tip (tooltips, check_ask_for_quit, _("Shows a confirmation dialog on exit."), NULL); gtk_button_set_focus_on_click (GTK_BUTTON (check_ask_for_quit), FALSE);

- hbox3 = gtk_hbox_new (FALSE, 0); + label163 = gtk_label_new (" "); + gtk_widget_show (label163); + gtk_box_pack_start (GTK_BOX (vbox4), label163, FALSE, FALSE, 0); + + hbox2 = gtk_hbox_new (FALSE, 19); + gtk_widget_show (hbox2); + gtk_box_pack_start (GTK_BOX (vbox4), hbox2, FALSE, TRUE, 0); + + label147 = gtk_label_new (_("Recent files list length:")); + gtk_widget_show (label147); + gtk_box_pack_start (GTK_BOX (hbox2), label147, FALSE, FALSE, 0); + + 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_box_pack_start (GTK_BOX (hbox2), spin_mru, FALSE, TRUE, 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); + + hbox3 = gtk_hbox_new (FALSE, 1); gtk_widget_show (hbox3); - gtk_box_pack_start (GTK_BOX (vbox4), hbox3, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (vbox4), hbox3, FALSE, TRUE, 0);

label150 = gtk_label_new (_("Placement of new file tabs: ")); gtk_widget_show (label150); @@ -2089,19 +2096,22 @@ 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));

- label18 = gtk_label_new (_("<b>Miscellaneous</b>")); - gtk_widget_show (label18); - gtk_frame_set_label_widget (GTK_FRAME (frame1), label18); - gtk_label_set_use_markup (GTK_LABEL (label18), TRUE); + label162 = gtk_label_new (""); + gtk_widget_show (label162); + gtk_frame_set_label_widget (GTK_FRAME (frame10), label162); + gtk_label_set_use_markup (GTK_LABEL (label162), TRUE);

- label106 = gtk_label_new (""); - gtk_widget_show (label106); - gtk_box_pack_start (GTK_BOX (vbox3), label106, FALSE, FALSE, 0); - gtk_misc_set_padding (GTK_MISC (label106), 0, 2); + label94 = gtk_label_new (_("General")); + gtk_widget_show (label94); + gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook2), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook2), 0), label94);

+ vbox14 = gtk_vbox_new (FALSE, 10); + gtk_widget_show (vbox14); + gtk_container_add (GTK_CONTAINER (notebook2), vbox14); + frame3 = gtk_frame_new (NULL); gtk_widget_show (frame3); - gtk_box_pack_start (GTK_BOX (vbox3), frame3, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (vbox14), frame3, TRUE, TRUE, 0); gtk_frame_set_shadow_type (GTK_FRAME (frame3), GTK_SHADOW_NONE);

alignment4 = gtk_alignment_new (0.5, 0.5, 1, 1); @@ -2132,14 +2142,9 @@ gtk_frame_set_label_widget (GTK_FRAME (frame3), label98); gtk_label_set_use_markup (GTK_LABEL (label98), TRUE);

- label104 = gtk_label_new (""); - gtk_widget_show (label104); - gtk_box_pack_start (GTK_BOX (vbox3), label104, FALSE, FALSE, 0); - gtk_misc_set_padding (GTK_MISC (label104), 0, 2); - frame7 = gtk_frame_new (NULL); gtk_widget_show (frame7); - gtk_box_pack_start (GTK_BOX (vbox3), frame7, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (vbox14), frame7, TRUE, TRUE, 0); gtk_frame_set_shadow_type (GTK_FRAME (frame7), GTK_SHADOW_NONE);

alignment9 = gtk_alignment_new (0.5, 0.5, 1, 1); @@ -2168,14 +2173,9 @@ gtk_frame_set_label_widget (GTK_FRAME (frame7), label146); gtk_label_set_use_markup (GTK_LABEL (label146), TRUE);

- label105 = gtk_label_new (""); - gtk_widget_show (label105); - gtk_box_pack_start (GTK_BOX (vbox3), label105, FALSE, FALSE, 0); - gtk_misc_set_padding (GTK_MISC (label105), 0, 2); - frame4 = gtk_frame_new (NULL); gtk_widget_show (frame4); - gtk_box_pack_start (GTK_BOX (vbox3), frame4, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (vbox14), frame4, TRUE, TRUE, 0); gtk_frame_set_shadow_type (GTK_FRAME (frame4), GTK_SHADOW_NONE);

alignment5 = gtk_alignment_new (0.5, 0.5, 1, 1); @@ -2183,7 +2183,7 @@ gtk_container_add (GTK_CONTAINER (frame4), alignment5); gtk_alignment_set_padding (GTK_ALIGNMENT (alignment5), 0, 0, 12, 6);

- table2 = gtk_table_new (2, 2, FALSE); + table2 = gtk_table_new (3, 2, FALSE); gtk_widget_show (table2); gtk_container_add (GTK_CONTAINER (alignment5), table2); gtk_table_set_row_spacings (GTK_TABLE (table2), 3); @@ -2219,15 +2219,187 @@ gtk_tooltips_set_tip (tooltips, tagbar_font, _("Sets the font for symbol list window"), NULL); gtk_font_button_set_show_style (GTK_FONT_BUTTON (tagbar_font), FALSE);

+ label103 = gtk_label_new (_("Editor font")); + gtk_widget_show (label103); + gtk_table_attach (GTK_TABLE (table2), label103, 0, 1, 2, 3, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_misc_set_alignment (GTK_MISC (label103), 0, 0.5); + + editor_font = gtk_font_button_new (); + gtk_widget_show (editor_font); + gtk_table_attach (GTK_TABLE (table2), editor_font, 1, 2, 2, 3, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_tooltips_set_tip (tooltips, editor_font, _("Sets the font for the editors windows"), NULL); + label99 = gtk_label_new (_("<b>Fonts</b>")); gtk_widget_show (label99); gtk_frame_set_label_widget (GTK_FRAME (frame4), label99); gtk_label_set_use_markup (GTK_LABEL (label99), TRUE);

- label94 = gtk_label_new (_("General")); - gtk_widget_show (label94); - gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook2), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook2), 0), label94); + frame8 = gtk_frame_new (NULL); + gtk_widget_show (frame8); + gtk_box_pack_start (GTK_BOX (vbox14), frame8, TRUE, TRUE, 0); + gtk_frame_set_shadow_type (GTK_FRAME (frame8), GTK_SHADOW_NONE);

+ alignment11 = gtk_alignment_new (0.5, 0.5, 1, 1); + gtk_widget_show (alignment11); + gtk_container_add (GTK_CONTAINER (frame8), alignment11); + gtk_alignment_set_padding (GTK_ALIGNMENT (alignment11), 0, 0, 12, 0); + + table7 = gtk_table_new (3, 2, FALSE); + 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); + + label133 = gtk_label_new (_("Long line marker")); + gtk_widget_show (label133); + gtk_table_attach (GTK_TABLE (table7), label133, 0, 1, 1, 2, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_misc_set_alignment (GTK_MISC (label133), 0, 0.5); + + label134 = gtk_label_new (_("Long line marker color")); + gtk_widget_show (label134); + gtk_table_attach (GTK_TABLE (table7), label134, 0, 1, 2, 3, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_misc_set_alignment (GTK_MISC (label134), 0, 0.5); + + spin_long_line_adj = gtk_adjustment_new (72, 0, 1000, 1, 10, 10); + spin_long_line = gtk_spin_button_new (GTK_ADJUSTMENT (spin_long_line_adj), 1, 0); + gtk_widget_show (spin_long_line); + gtk_table_attach (GTK_TABLE (table7), spin_long_line, 1, 2, 1, 2, + (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_tooltips_set_tip (tooltips, spin_long_line, _("The long line marker is a thin vertical line in the editor. It helps to mark long lines, or as a hint to break the line. Set this value to a value greater than 0 to specify the column where it should appear."), NULL); + gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin_long_line), TRUE); + gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spin_long_line), TRUE); + + label156 = gtk_label_new (_("Type")); + gtk_widget_show (label156); + gtk_table_attach (GTK_TABLE (table7), label156, 0, 1, 0, 1, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_misc_set_alignment (GTK_MISC (label156), 0, 0.5); + + hbox5 = gtk_hbox_new (FALSE, 10); + gtk_widget_show (hbox5); + gtk_table_attach (GTK_TABLE (table7), hbox5, 1, 2, 0, 1, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (GTK_FILL), 0, 0); + + radio_long_line_line = gtk_radio_button_new_with_mnemonic (NULL, _("Line")); + gtk_widget_show (radio_long_line_line); + gtk_box_pack_start (GTK_BOX (hbox5), radio_long_line_line, FALSE, FALSE, 0); + gtk_tooltips_set_tip (tooltips, radio_long_line_line, _("Prints a vertical line in the editor window at the given cursor position(see below)."), NULL); + gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_long_line_line), radio_long_line_line_group); + radio_long_line_line_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_long_line_line)); + + radio_long_line_background = gtk_radio_button_new_with_mnemonic (NULL, _("Background")); + gtk_widget_show (radio_long_line_background); + gtk_box_pack_start (GTK_BOX (hbox5), radio_long_line_background, FALSE, FALSE, 0); + gtk_tooltips_set_tip (tooltips, radio_long_line_background, _("The background colour of characters after the given cursor position(see below) changed to the colour set below. (This is recommended if you use proportional fonts)"), NULL); + gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_long_line_background), radio_long_line_line_group); + radio_long_line_line_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_long_line_background)); + + radio_long_line_disabled = gtk_radio_button_new_with_mnemonic (NULL, _("Disabled")); + gtk_widget_show (radio_long_line_disabled); + gtk_box_pack_start (GTK_BOX (hbox5), radio_long_line_disabled, FALSE, FALSE, 0); + gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_long_line_disabled), radio_long_line_line_group); + radio_long_line_line_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_long_line_disabled)); + + long_line_color = gtk_color_button_new (); + gtk_widget_show (long_line_color); + gtk_table_attach (GTK_TABLE (table7), long_line_color, 1, 2, 2, 3, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_tooltips_set_tip (tooltips, long_line_color, _("Sets the color of the long line marker"), NULL); + gtk_color_button_set_title (GTK_COLOR_BUTTON (long_line_color), _("Color Chooser")); + + label155 = gtk_label_new (_("<b>Long line marker</b>")); + gtk_widget_show (label155); + gtk_frame_set_label_widget (GTK_FRAME (frame8), label155); + gtk_label_set_use_markup (GTK_LABEL (label155), TRUE); + + frame9 = gtk_frame_new (NULL); + gtk_widget_show (frame9); + gtk_box_pack_start (GTK_BOX (vbox14), frame9, TRUE, TRUE, 0); + gtk_frame_set_shadow_type (GTK_FRAME (frame9), GTK_SHADOW_NONE); + + alignment12 = gtk_alignment_new (0.5, 0.5, 1, 1); + gtk_widget_show (alignment12); + gtk_container_add (GTK_CONTAINER (frame9), alignment12); + gtk_alignment_set_padding (GTK_ALIGNMENT (alignment12), 0, 0, 12, 0); + + 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); + + label159 = gtk_label_new (_("Editor")); + gtk_widget_show (label159); + 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); + + label160 = gtk_label_new (_("Message window")); + gtk_widget_show (label160); + gtk_table_attach (GTK_TABLE (table8), label160, 0, 1, 1, 2, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_misc_set_alignment (GTK_MISC (label160), 0, 0.5); + + label161 = gtk_label_new (_("Sidebar")); + gtk_widget_show (label161); + gtk_table_attach (GTK_TABLE (table8), label161, 0, 1, 2, 3, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_misc_set_alignment (GTK_MISC (label161), 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, 1, 2, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (GTK_FILL), 0, 0); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_tab_msgwin), _("Left")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_tab_msgwin), _("Right")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_tab_msgwin), _("Top")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_tab_msgwin), _("Bottom")); + + 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, 2, 3, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (GTK_FILL), 0, 0); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_tab_sidebar), _("Left")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_tab_sidebar), _("Right")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_tab_sidebar), _("Top")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_tab_sidebar), _("Bottom")); + + 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, 0, 1, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (GTK_FILL), 0, 0); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_tab_editor), _("Left")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_tab_editor), _("Right")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_tab_editor), _("Top")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_tab_editor), _("Bottom")); + + label158 = gtk_label_new (_("<b>Tab placement</b>")); + gtk_widget_show (label158); + gtk_frame_set_label_widget (GTK_FRAME (frame9), label158); + gtk_label_set_use_markup (GTK_LABEL (label158), TRUE); + + label157 = gtk_label_new (_("Interface")); + gtk_widget_show (label157); + gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook2), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook2), 1), label157); + vbox5 = gtk_vbox_new (FALSE, 0); gtk_widget_show (vbox5); gtk_container_add (GTK_CONTAINER (notebook2), vbox5); @@ -2246,40 +2418,40 @@ gtk_widget_show (vbox8); gtk_container_add (GTK_CONTAINER (alignment7), vbox8);

- hbox4 = gtk_hbox_new (FALSE, 12); - gtk_widget_show (hbox4); - gtk_box_pack_start (GTK_BOX (vbox8), hbox4, FALSE, TRUE, 0); + table5 = gtk_table_new (2, 2, FALSE); + gtk_widget_show (table5); + gtk_box_pack_start (GTK_BOX (vbox8), table5, FALSE, TRUE, 0); + gtk_table_set_row_spacings (GTK_TABLE (table5), 3); + gtk_table_set_col_spacings (GTK_TABLE (table5), 25);

+ label116 = gtk_label_new (_("Tab Width")); + gtk_widget_show (label116); + gtk_table_attach (GTK_TABLE (table5), label116, 0, 1, 1, 2, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_misc_set_alignment (GTK_MISC (label116), 0, 0.5); + label153 = gtk_label_new (_("Default encoding:")); gtk_widget_show (label153); - gtk_box_pack_start (GTK_BOX (hbox4), label153, FALSE, FALSE, 0); + gtk_table_attach (GTK_TABLE (table5), label153, 0, 1, 0, 1, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0);

eventbox1 = gtk_event_box_new (); gtk_widget_show (eventbox1); - gtk_box_pack_start (GTK_BOX (hbox4), eventbox1, FALSE, FALSE, 0); + gtk_table_attach (GTK_TABLE (table5), eventbox1, 1, 2, 0, 1, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (GTK_FILL), 0, 0); gtk_tooltips_set_tip (tooltips, eventbox1, _("Sets the default encoding for newly created files."), NULL);

combo_encoding = gtk_combo_box_new_text (); gtk_widget_show (combo_encoding); gtk_container_add (GTK_CONTAINER (eventbox1), combo_encoding);

- table5 = gtk_table_new (1, 2, FALSE); - gtk_widget_show (table5); - gtk_box_pack_start (GTK_BOX (vbox8), table5, TRUE, TRUE, 0); - gtk_table_set_row_spacings (GTK_TABLE (table5), 3); - gtk_table_set_col_spacings (GTK_TABLE (table5), 25); - - label116 = gtk_label_new (_("Tab Width")); - gtk_widget_show (label116); - gtk_table_attach (GTK_TABLE (table5), label116, 0, 1, 0, 1, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment (GTK_MISC (label116), 0, 0.5); - spin_tab_width_adj = gtk_adjustment_new (-1, 1, 99, 1, 10, 10); spin_tab_width = gtk_spin_button_new (GTK_ADJUSTMENT (spin_tab_width_adj), 1, 0); gtk_widget_show (spin_tab_width); - gtk_table_attach (GTK_TABLE (table5), spin_tab_width, 1, 2, 0, 1, + gtk_table_attach (GTK_TABLE (table5), spin_tab_width, 1, 2, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_tooltips_set_tip (tooltips, spin_tab_width, _("The width in chars, which one tab character will take"), NULL); @@ -2392,120 +2564,14 @@ gtk_widget_show (label148); gtk_box_pack_start (GTK_BOX (vbox12), label148, FALSE, FALSE, 0);

- table3 = gtk_table_new (1, 2, TRUE); - gtk_widget_show (table3); - gtk_box_pack_start (GTK_BOX (vbox12), table3, FALSE, TRUE, 0); - gtk_table_set_row_spacings (GTK_TABLE (table3), 3); - gtk_table_set_col_spacings (GTK_TABLE (table3), 25); - - label103 = gtk_label_new (_("Editor font")); - gtk_widget_show (label103); - gtk_table_attach (GTK_TABLE (table3), label103, 0, 1, 0, 1, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment (GTK_MISC (label103), 0, 0.5); - - editor_font = gtk_font_button_new (); - gtk_widget_show (editor_font); - gtk_table_attach (GTK_TABLE (table3), editor_font, 1, 2, 0, 1, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_tooltips_set_tip (tooltips, editor_font, _("Sets the font for the editors windows"), NULL); - label102 = gtk_label_new (_("<b>Miscellaneous</b>")); gtk_widget_show (label102); gtk_frame_set_label_widget (GTK_FRAME (frame5), label102); gtk_label_set_use_markup (GTK_LABEL (label102), TRUE);

- frame8 = gtk_frame_new (NULL);

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.