gtk: improve dialog layouts, make spinbuttons show 2 decimal places where appropriate...

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9358 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/gtk/ChangeLog b/src/frontends/gtk/ChangeLog
index 3fbfbb12872128301f8b24d4c4a8341e8790e85f..27a58aab0210f85c0b8f9618dd1a8c0fefeca782 100644 (file)
--- a/src/frontends/gtk/ChangeLog
+++ b/src/frontends/gtk/ChangeLog
@@ -1,5 +1,10 @@
 2004-12-07  John Spray  <spray_john@users.sourceforge.net>
 
+       * glade/: improve layouts, set spinbuttons to display 2 
+               decimal places where apropriate
+       * GSearch.C: focus 'find' entry on update()
+       * GParagraph.C: don't require that 'ControlBox' widget 
+               be an HBox.
        * The Include Dialog:
          Dialogs.C, Makefile.am, GInclude.[Ch], glade/include.glade
 

diff --git a/src/frontends/gtk/GParagraph.C b/src/frontends/gtk/GParagraph.C
index 38a85646810bce4e782c5011e9207297b7a6c79f..18cbd44774920391ad3b6e197c7a59d326525784 100644 (file)
--- a/src/frontends/gtk/GParagraph.C
+++ b/src/frontends/gtk/GParagraph.C
@@ -61,7 +61,7 @@ void GParagraph::doBuild()
        setCancel(button);
 
        // Make the main hbox sensitive to readonly
-       Gtk::HBox * controlbox;
+       Gtk::Widget * controlbox;
        xml_->get_widget("ControlBox", controlbox);
        bcview().addReadOnly(controlbox);
 

diff --git a/src/frontends/gtk/GSearch.C b/src/frontends/gtk/GSearch.C
index c966ede402383d5a2e4cc4818fae41b6f1bc9314..cc76ccbe9224e65fe4d2da4ef114b24474c6ea6c 100644 (file)
--- a/src/frontends/gtk/GSearch.C
+++ b/src/frontends/gtk/GSearch.C
@@ -70,6 +70,7 @@ void GSearch::doBuild()
 void GSearch::update()
 {
        bc().refreshReadOnly();
+       findentry->grab_focus();
        onFindEntryChanged();
 }
 

diff --git a/src/frontends/gtk/glade/ERT.glade b/src/frontends/gtk/glade/ERT.glade
index a9d06524a45e47b3f571add633945e965835785a..8040dbcf664849d177293cc2701c4f2065496d8a 100644 (file)
--- a/src/frontends/gtk/glade/ERT.glade
+++ b/src/frontends/gtk/glade/ERT.glade
@@ -66,7 +66,7 @@
              <property name="yalign">0.5</property>
              <property name="xscale">1</property>
              <property name="yscale">1</property>
-             <property name="top_padding">0</property>
+             <property name="top_padding">6</property>
              <property name="bottom_padding">0</property>
              <property name="left_padding">12</property>
              <property name="right_padding">0</property>

diff --git a/src/frontends/gtk/glade/box.glade b/src/frontends/gtk/glade/box.glade
index ec0304d9c79304dccda53544f4f3ce56f6245907..2551dc89035056f95068540982c3f7c34fc4cc8d 100644 (file)
--- a/src/frontends/gtk/glade/box.glade
+++ b/src/frontends/gtk/glade/box.glade
@@ -310,12 +310,12 @@
                      <property name="visible">True</property>
                      <property name="can_focus">True</property>
                      <property name="climb_rate">1</property>
-                     <property name="digits">0</property>
+                     <property name="digits">2</property>
                      <property name="numeric">False</property>
                      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                      <property name="snap_to_ticks">False</property>
                      <property name="wrap">False</property>
-                     <property name="adjustment">666 0 10000 1 10 10</property>
+                     <property name="adjustment">666 0 65536 1 10 10</property>
                    </widget>
                    <packing>
                      <property name="left_attach">1</property>
@@ -332,12 +332,12 @@
                      <property name="visible">True</property>
                      <property name="can_focus">True</property>
                      <property name="climb_rate">1</property>
-                     <property name="digits">0</property>
+                     <property name="digits">2</property>
                      <property name="numeric">False</property>
                      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                      <property name="snap_to_ticks">False</property>
                      <property name="wrap">False</property>
-                     <property name="adjustment">666 0 10000 1 10 10</property>
+                     <property name="adjustment">666 0 65536 1 10 10</property>
                    </widget>
                    <packing>
                      <property name="left_attach">1</property>

diff --git a/src/frontends/gtk/glade/character.glade b/src/frontends/gtk/glade/character.glade
index 4848209feffa3cfe2c6f907c32c7af2099834abe..a213fc71a82946a7ab8a231a14995672a2118059 100644 (file)
--- a/src/frontends/gtk/glade/character.glade
+++ b/src/frontends/gtk/glade/character.glade
@@ -79,13 +79,13 @@
 
       <child>
        <widget class="GtkHBox" id="hbox1">
+         <property name="border_width">6</property>
          <property name="visible">True</property>
          <property name="homogeneous">False</property>
          <property name="spacing">0</property>
 
          <child>
            <widget class="GtkFrame" id="frame3">
-             <property name="border_width">3</property>
              <property name="visible">True</property>
              <property name="label_xalign">0</property>
              <property name="label_yalign">0.5</property>
@@ -110,7 +110,7 @@
                      <property name="n_columns">2</property>
                      <property name="homogeneous">False</property>
                      <property name="row_spacing">4</property>
-                     <property name="column_spacing">0</property>
+                     <property name="column_spacing">6</property>
 
                      <child>
                        <widget class="GtkLabel" id="label4">
@@ -404,7 +404,7 @@
                        <widget class="GtkHBox" id="hbox2">
                          <property name="visible">True</property>
                          <property name="homogeneous">False</property>
-                         <property name="spacing">0</property>
+                         <property name="spacing">6</property>
 
                          <child>
                            <widget class="GtkLabel" id="label9">
@@ -493,7 +493,7 @@
                        <widget class="GtkHBox" id="hbox3">
                          <property name="visible">True</property>
                          <property name="homogeneous">False</property>
-                         <property name="spacing">0</property>
+                         <property name="spacing">6</property>
 
                          <child>
                            <widget class="GtkLabel" id="label10">

diff --git a/src/frontends/gtk/glade/float.glade b/src/frontends/gtk/glade/float.glade
index f291c081302b42e51204fdc953e82a897e7f441f..73701d7094abe07b1fcfa0190558a3f20f57bab5 100644 (file)
--- a/src/frontends/gtk/glade/float.glade
+++ b/src/frontends/gtk/glade/float.glade
@@ -86,7 +86,7 @@
              <property name="yalign">0.5</property>
              <property name="xscale">1</property>
              <property name="yscale">1</property>
-             <property name="top_padding">0</property>
+             <property name="top_padding">6</property>
              <property name="bottom_padding">0</property>
              <property name="left_padding">12</property>
              <property name="right_padding">0</property>
@@ -320,7 +320,7 @@
              <property name="yalign">0.5</property>
              <property name="xscale">1</property>
              <property name="yscale">1</property>
-             <property name="top_padding">0</property>
+             <property name="top_padding">6</property>
              <property name="bottom_padding">0</property>
              <property name="left_padding">12</property>
              <property name="right_padding">0</property>

diff --git a/src/frontends/gtk/glade/graphics.glade b/src/frontends/gtk/glade/graphics.glade
index 2acc603e6d6f611a3e39d689013235678f2bafb3..679cea91a460b274bb5b309f6f32f2659a0b5320 100644 (file)
--- a/src/frontends/gtk/glade/graphics.glade
+++ b/src/frontends/gtk/glade/graphics.glade
@@ -474,7 +474,7 @@
                              <property name="visible">True</property>
                              <property name="can_focus">True</property>
                              <property name="climb_rate">1</property>
-                             <property name="digits">0</property>
+                             <property name="digits">2</property>
                              <property name="numeric">True</property>
                              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                              <property name="snap_to_ticks">False</property>
@@ -616,7 +616,7 @@ Do not display</property>
                              <property name="sensitive">False</property>
                              <property name="can_focus">True</property>
                              <property name="climb_rate">1</property>
-                             <property name="digits">0</property>
+                             <property name="digits">2</property>
                              <property name="numeric">True</property>
                              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                              <property name="snap_to_ticks">False</property>
@@ -707,7 +707,7 @@ Do not display</property>
                              <property name="visible">True</property>
                              <property name="can_focus">True</property>
                              <property name="climb_rate">1</property>
-                             <property name="digits">0</property>
+                             <property name="digits">2</property>
                              <property name="numeric">True</property>
                              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                              <property name="snap_to_ticks">False</property>
@@ -773,30 +773,6 @@ Do not display</property>
                            </packing>
                          </child>
 
-                         <child>
-                           <widget class="GtkLabel" id="label29">
-                             <property name="visible">True</property>
-                             <property name="label" translatable="yes">%</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>
-                           </widget>
-                           <packing>
-                             <property name="left_attach">3</property>
-                             <property name="right_attach">4</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="GtkComboBox" id="WidthUnits">
                              <property name="visible">True</property>
@@ -869,7 +845,7 @@ Do not display</property>
                              <property name="sensitive">False</property>
                              <property name="can_focus">True</property>
                              <property name="climb_rate">1</property>
-                             <property name="digits">0</property>
+                             <property name="digits">2</property>
                              <property name="numeric">True</property>
                              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                              <property name="snap_to_ticks">False</property>
@@ -884,6 +860,30 @@ Do not display</property>
                              <property name="y_options"></property>
                            </packing>
                          </child>
+
+                         <child>
+                           <widget class="GtkLabel" id="label29">
+                             <property name="visible">True</property>
+                             <property name="label" translatable="yes">%</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>
+                           </widget>
+                           <packing>
+                             <property name="left_attach">3</property>
+                             <property name="right_attach">4</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>
                        </widget>
                      </child>
                    </widget>
@@ -1063,7 +1063,7 @@ Do not display</property>
                          <property name="visible">True</property>
                          <property name="can_focus">True</property>
                          <property name="climb_rate">1</property>
-                         <property name="digits">0</property>
+                         <property name="digits">2</property>
                          <property name="numeric">True</property>
                          <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                          <property name="snap_to_ticks">False</property>
@@ -1084,7 +1084,7 @@ Do not display</property>
                          <property name="visible">True</property>
                          <property name="can_focus">True</property>
                          <property name="climb_rate">1</property>
-                         <property name="digits">0</property>
+                         <property name="digits">2</property>
                          <property name="numeric">True</property>
                          <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                          <property name="snap_to_ticks">False</property>
@@ -1105,7 +1105,7 @@ Do not display</property>
                          <property name="visible">True</property>
                          <property name="can_focus">True</property>
                          <property name="climb_rate">1</property>
-                         <property name="digits">0</property>
+                         <property name="digits">2</property>
                          <property name="numeric">True</property>
                          <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                          <property name="snap_to_ticks">False</property>
@@ -1126,7 +1126,7 @@ Do not display</property>
                          <property name="visible">True</property>
                          <property name="can_focus">True</property>
                          <property name="climb_rate">1</property>
-                         <property name="digits">0</property>
+                         <property name="digits">2</property>
                          <property name="numeric">True</property>
                          <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                          <property name="snap_to_ticks">False</property>
@@ -1411,7 +1411,7 @@ Do not display</property>
                      <property name="visible">True</property>
                      <property name="can_focus">True</property>
                      <property name="climb_rate">1</property>
-                     <property name="digits">0</property>
+                     <property name="digits">2</property>
                      <property name="numeric">True</property>
                      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                      <property name="snap_to_ticks">False</property>

diff --git a/src/frontends/gtk/glade/log.glade b/src/frontends/gtk/glade/log.glade
index dcb952523c63363af4157d19db3f6a46a1aeab8c..5604e1f5b9c5883303c607aaca815be028968eaf 100644 (file)
--- a/src/frontends/gtk/glade/log.glade
+++ b/src/frontends/gtk/glade/log.glade
@@ -4,7 +4,6 @@
 <glade-interface>
 
 <widget class="GtkDialog" id="dialog">
-  <property name="border_width">6</property>
   <property name="title" translatable="yes">You shouldn't see this</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
@@ -67,6 +66,7 @@
 
       <child>
        <widget class="GtkScrolledWindow" id="scrolledwindow1">
+         <property name="border_width">9</property>
          <property name="visible">True</property>
          <property name="can_focus">True</property>
          <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>

diff --git a/src/frontends/gtk/glade/mathDelim.glade b/src/frontends/gtk/glade/mathDelim.glade
index bbf85cf53e104f609b450d220430c6cdeb97e1a1..6eab6701c4297937d99408027e1608c077d126d8 100644 (file)
--- a/src/frontends/gtk/glade/mathDelim.glade
+++ b/src/frontends/gtk/glade/mathDelim.glade
@@ -3,208 +3,210 @@
 
 <glade-interface>
 
-<widget class="GtkWindow" id="dialog">
-  <property name="border_width">5</property>
-  <property name="title" translatable="yes">LyX: Math Delimiters</property>
+<widget class="GtkDialog" id="dialog">
+  <property name="title" translatable="yes">dialog1</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">False</property>
-  <property name="resizable">True</property>
+  <property name="resizable">False</property>
   <property name="destroy_with_parent">False</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="has_separator">False</property>
 
-  <child>
-    <widget class="GtkVBox" id="vbox1">
+  <child internal-child="vbox">
+    <widget class="GtkVBox" id="dialog-vbox1">
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
-      <property name="spacing">5</property>
+      <property name="spacing">0</property>
 
-      <child>
-       <widget class="GtkHBox" id="hbox2">
-         <property name="border_width">5</property>
+      <child internal-child="action_area">
+       <widget class="GtkHButtonBox" id="dialog-action_area1">
          <property name="visible">True</property>
-         <property name="homogeneous">True</property>
-         <property name="spacing">4</property>
+         <property name="layout_style">GTK_BUTTONBOX_END</property>
 
          <child>
-           <widget class="GtkRadioButton" id="Left">
+           <widget class="GtkButton" id="Close">
              <property name="visible">True</property>
+             <property name="can_default">True</property>
              <property name="can_focus">True</property>
-             <property name="label" translatable="yes">(_Left</property>
-             <property name="use_underline">True</property>
+             <property name="label">gtk-close</property>
+             <property name="use_stock">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="response_id">-7</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="Both">
+           <widget class="GtkButton" id="Apply">
              <property name="visible">True</property>
+             <property name="can_default">True</property>
              <property name="can_focus">True</property>
-             <property name="label" translatable="yes">()_Both</property>
-             <property name="use_underline">True</property>
+             <property name="label">gtk-apply</property>
+             <property name="use_stock">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">Left</property>
+             <property name="response_id">-10</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="Right">
+           <widget class="GtkButton" id="OK">
              <property name="visible">True</property>
+             <property name="can_default">True</property>
              <property name="can_focus">True</property>
-             <property name="label" translatable="yes">)_Right</property>
-             <property name="use_underline">True</property>
+             <property name="label">gtk-ok</property>
+             <property name="use_stock">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">Left</property>
+             <property name="response_id">-5</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">False</property>
+         <property name="fill">True</property>
+         <property name="pack_type">GTK_PACK_END</property>
        </packing>
       </child>
 
       <child>
-       <widget class="GtkHBox" id="hbox3">
+       <widget class="GtkVBox" id="vbox2">
+         <property name="border_width">6</property>
          <property name="visible">True</property>
          <property name="homogeneous">False</property>
-         <property name="spacing">0</property>
+         <property name="spacing">5</property>
 
          <child>
-           <widget class="GtkButton" id="Demo">
+           <widget class="GtkHBox" id="hbox4">
+             <property name="border_width">5</property>
              <property name="visible">True</property>
-             <property name="can_focus">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
+             <property name="homogeneous">True</property>
+             <property name="spacing">4</property>
 
              <child>
-               <placeholder/>
+               <widget class="GtkRadioButton" id="Left">
+                 <property name="visible">True</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">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>
-           </widget>
-           <packing>
-             <property name="padding">0</property>
-             <property name="expand">True</property>
-             <property name="fill">False</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="GtkHBox" id="Box">
-         <property name="visible">True</property>
-         <property name="homogeneous">False</property>
-         <property name="spacing">0</property>
 
-         <child>
-           <placeholder/>
-         </child>
-       </widget>
-       <packing>
-         <property name="padding">0</property>
-         <property name="expand">False</property>
-         <property name="fill">False</property>
-       </packing>
-      </child>
-
-      <child>
-       <widget class="GtkHBox" id="hbox1">
-         <property name="border_width">5</property>
-         <property name="visible">True</property>
-         <property name="homogeneous">False</property>
-         <property name="spacing">0</property>
+             <child>
+               <widget class="GtkRadioButton" id="Both">
+                 <property name="visible">True</property>
+                 <property name="can_focus">True</property>
+                 <property name="label" translatable="yes">()_Both</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">Left</property>
+               </widget>
+               <packing>
+                 <property name="padding">0</property>
+                 <property name="expand">False</property>
+                 <property name="fill">False</property>
+               </packing>
+             </child>
 
-         <child>
-           <widget class="GtkButton" id="OK">
-             <property name="visible">True</property>
-             <property name="can_default">True</property>
-             <property name="can_focus">True</property>
-             <property name="has_focus">True</property>
-             <property name="label">gtk-ok</property>
-             <property name="use_stock">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
+             <child>
+               <widget class="GtkRadioButton" id="Right">
+                 <property name="visible">True</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">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="expand">False</property>
              <property name="fill">False</property>
            </packing>
          </child>
 
          <child>
-           <widget class="GtkButton" id="Apply">
+           <widget class="GtkHBox" id="hbox5">
              <property name="visible">True</property>
-             <property name="can_focus">True</property>
-             <property name="label">gtk-apply</property>
-             <property name="use_stock">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
+             <property name="homogeneous">False</property>
+             <property name="spacing">0</property>
+
+             <child>
+               <widget class="GtkButton" id="Demo">
+                 <property name="visible">True</property>
+                 <property name="can_focus">True</property>
+                 <property name="relief">GTK_RELIEF_NORMAL</property>
+                 <property name="focus_on_click">True</property>
+
+                 <child>
+                   <placeholder/>
+                 </child>
+               </widget>
+               <packing>
+                 <property name="padding">0</property>
+                 <property name="expand">True</property>
+                 <property name="fill">False</property>
+               </packing>
+             </child>
            </widget>
            <packing>
              <property name="padding">0</property>
-             <property name="expand">True</property>
+             <property name="expand">False</property>
              <property name="fill">False</property>
            </packing>
          </child>
 
          <child>
-           <widget class="GtkButton" id="Close">
+           <widget class="GtkHBox" id="Box">
              <property name="visible">True</property>
-             <property name="can_focus">True</property>
-             <property name="label">gtk-close</property>
-             <property name="use_stock">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
+             <property name="homogeneous">False</property>
+             <property name="spacing">0</property>
+
+             <child>
+               <placeholder/>
+             </child>
            </widget>
            <packing>
              <property name="padding">0</property>
              <property name="expand">True</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">False</property>
+         <property name="expand">True</property>
+         <property name="fill">True</property>
        </packing>
       </child>
     </widget>

diff --git a/src/frontends/gtk/glade/mathMatrix.glade b/src/frontends/gtk/glade/mathMatrix.glade
index a96fe82e119a025ec333c77192078e11138b78d2..91bc24a836284d0f0cb0c43d2d87e2585aed2f4e 100644 (file)
--- a/src/frontends/gtk/glade/mathMatrix.glade
+++ b/src/frontends/gtk/glade/mathMatrix.glade
@@ -4,7 +4,6 @@
 <glade-interface>
 
 <widget class="GtkDialog" id="dialog">
-  <property name="border_width">6</property>
   <property name="title" translatable="yes">Create Matrix</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
@@ -16,7 +15,7 @@
   <property name="skip_pager_hint">False</property>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="has_separator">True</property>
+  <property name="has_separator">False</property>
 
   <child internal-child="vbox">
     <widget class="GtkVBox" id="dialog-vbox1">
@@ -124,6 +123,7 @@
 
       <child>
        <widget class="GtkVBox" id="vbox2">
+         <property name="border_width">9</property>
          <property name="visible">True</property>
          <property name="homogeneous">False</property>
          <property name="spacing">0</property>
@@ -142,7 +142,7 @@
                  <property name="yalign">0.5</property>
                  <property name="xscale">1</property>
                  <property name="yscale">1</property>
-                 <property name="top_padding">0</property>
+                 <property name="top_padding">6</property>
                  <property name="bottom_padding">0</property>
                  <property name="left_padding">12</property>
                  <property name="right_padding">0</property>
@@ -296,7 +296,7 @@
                  <property name="yalign">0.5</property>
                  <property name="xscale">1</property>
                  <property name="yscale">1</property>
-                 <property name="top_padding">0</property>
+                 <property name="top_padding">6</property>
                  <property name="bottom_padding">0</property>
                  <property name="left_padding">12</property>
                  <property name="right_padding">0</property>
@@ -586,7 +586,7 @@
                  <property name="yalign">0.5</property>
                  <property name="xscale">1</property>
                  <property name="yscale">1</property>
-                 <property name="top_padding">0</property>
+                 <property name="top_padding">6</property>
                  <property name="bottom_padding">0</property>
                  <property name="left_padding">12</property>
                  <property name="right_padding">0</property>

diff --git a/src/frontends/gtk/glade/note.glade b/src/frontends/gtk/glade/note.glade
index bd1cc5d16c17ba6275770320dda9c7de6b278004..72d63828e6c1600f2389405b835a413f3b1275b6 100644 (file)
--- a/src/frontends/gtk/glade/note.glade
+++ b/src/frontends/gtk/glade/note.glade
@@ -66,7 +66,7 @@
              <property name="yalign">0.5</property>
              <property name="xscale">1</property>
              <property name="yscale">1</property>
-             <property name="top_padding">0</property>
+             <property name="top_padding">6</property>
              <property name="bottom_padding">0</property>
              <property name="left_padding">12</property>
              <property name="right_padding">0</property>

diff --git a/src/frontends/gtk/glade/paragraph.glade b/src/frontends/gtk/glade/paragraph.glade
index e5e6585a06559e54da2ed9b9bf9fbe8331be67c2..e28c621000923dc05ae25c47a57ec6ed944023ba 100644 (file)
--- a/src/frontends/gtk/glade/paragraph.glade
+++ b/src/frontends/gtk/glade/paragraph.glade
@@ -52,158 +52,202 @@
       </child>
 
       <child>
-       <widget class="GtkHBox" id="ControlBox">
-         <property name="border_width">8</property>
+       <widget class="GtkVBox" id="ControlBox">
+         <property name="border_width">12</property>
          <property name="visible">True</property>
          <property name="homogeneous">False</property>
          <property name="spacing">0</property>
 
          <child>
-           <widget class="GtkTable" id="table1">
+           <widget class="GtkLabel" id="label11">
              <property name="visible">True</property>
-             <property name="n_rows">4</property>
-             <property name="n_columns">2</property>
-             <property name="homogeneous">False</property>
-             <property name="row_spacing">5</property>
-             <property name="column_spacing">4</property>
+             <property name="label" translatable="yes">&lt;b&gt;Layout&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</property>
+             <property name="yalign">0.5</property>
+             <property name="xpad">0</property>
+             <property name="ypad">0</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="MaxLabelWidthLabel">
-                 <property name="visible">True</property>
-                 <property name="label" translatable="yes">_Max. label width: </property>
-                 <property name="use_underline">True</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="mnemonic_widget">MaxLabelWidth</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="GtkAlignment" id="alignment6">
+             <property name="visible">True</property>
+             <property name="xalign">0.55</property>
+             <property name="yalign">0.5</property>
+             <property name="xscale">1</property>
+             <property name="yscale">1</property>
+             <property name="top_padding">6</property>
+             <property name="bottom_padding">12</property>
+             <property name="left_padding">12</property>
+             <property name="right_padding">0</property>
 
              <child>
-               <widget class="GtkEntry" id="MaxLabelWidth">
+               <widget class="GtkVBox" id="vbox3">
                  <property name="visible">True</property>
-                 <property name="sensitive">False</property>
-                 <property name="can_focus">True</property>
-                 <property name="editable">True</property>
-                 <property name="visibility">True</property>
-                 <property name="max_length">0</property>
-                 <property name="text" translatable="yes"></property>
-                 <property name="has_frame">True</property>
-                 <property name="invisible_char" translatable="yes">*</property>
-                 <property name="activates_default">False</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="y_options"></property>
-               </packing>
-             </child>
+                 <property name="homogeneous">False</property>
+                 <property name="spacing">3</property>
 
-             <child>
-               <widget class="GtkSpinButton" id="LineSpacing">
-                 <property name="visible">True</property>
-                 <property name="sensitive">False</property>
-                 <property name="can_focus">True</property>
-                 <property name="climb_rate">1</property>
-                 <property name="digits">2</property>
-                 <property name="numeric">True</property>
-                 <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-                 <property name="snap_to_ticks">False</property>
-                 <property name="wrap">False</property>
-                 <property name="adjustment">1 0 20 0.1 10 10</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>
+                 <child>
+                   <widget class="GtkTable" id="table1">
+                     <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">6</property>
 
-             <child>
-               <widget class="GtkCheckButton" id="DefaultLineSpacing">
-                 <property name="visible">True</property>
-                 <property name="can_focus">True</property>
-                 <property name="label" translatable="yes">Use _Default Line Spacing</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="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"></property>
-               </packing>
-             </child>
+                     <child>
+                       <widget class="GtkLabel" id="MaxLabelWidthLabel">
+                         <property name="visible">True</property>
+                         <property name="label" translatable="yes">_Max. label width: </property>
+                         <property name="use_underline">True</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="mnemonic_widget">MaxLabelWidth</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="GtkLabel" id="label2">
-                 <property name="visible">True</property>
-                 <property name="label" translatable="yes">Line _spacing:</property>
-                 <property name="use_underline">True</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="mnemonic_widget">LineSpacing</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="GtkEntry" id="MaxLabelWidth">
+                         <property name="visible">True</property>
+                         <property name="sensitive">False</property>
+                         <property name="can_focus">True</property>
+                         <property name="editable">True</property>
+                         <property name="visibility">True</property>
+                         <property name="max_length">0</property>
+                         <property name="text" translatable="yes"></property>
+                         <property name="has_frame">True</property>
+                         <property name="invisible_char" translatable="yes">*</property>
+                         <property name="activates_default">False</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="y_options"></property>
+                       </packing>
+                     </child>
 
-             <child>
-               <widget class="GtkCheckButton" id="Indent">
-                 <property name="visible">True</property>
-                 <property name="can_focus">True</property>
-                 <property name="label" translatable="yes">_Indent Paragraph</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>
+                     <child>
+                       <widget class="GtkSpinButton" id="LineSpacing">
+                         <property name="visible">True</property>
+                         <property name="sensitive">False</property>
+                         <property name="can_focus">True</property>
+                         <property name="climb_rate">1</property>
+                         <property name="digits">2</property>
+                         <property name="numeric">True</property>
+                         <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+                         <property name="snap_to_ticks">False</property>
+                         <property name="wrap">False</property>
+                         <property name="adjustment">1 0 20 0.1 10 10</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>
+
+                     <child>
+                       <widget class="GtkLabel" id="label2">
+                         <property name="visible">True</property>
+                         <property name="label" translatable="yes">Line _spacing:</property>
+                         <property name="use_underline">True</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="mnemonic_widget">LineSpacing</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="GtkCheckButton" id="DefaultLineSpacing">
+                         <property name="visible">True</property>
+                         <property name="can_focus">True</property>
+                         <property name="label" translatable="yes">Use _Default Line Spacing</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="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"></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="GtkCheckButton" id="Indent">
+                     <property name="visible">True</property>
+                     <property name="can_focus">True</property>
+                     <property name="label" translatable="yes">_Indent this paragraph</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>
                </widget>
-               <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="y_padding">4</property>
-                 <property name="x_options">fill</property>
-                 <property name="y_options"></property>
-               </packing>
              </child>
            </widget>
            <packing>
@@ -214,26 +258,36 @@
          </child>
 
          <child>
-           <widget class="GtkVSeparator" id="vseparator1">
+           <widget class="GtkLabel" id="label10">
              <property name="visible">True</property>
+             <property name="label" translatable="yes">&lt;b&gt;Alignment&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</property>
+             <property name="yalign">0.5</property>
+             <property name="xpad">0</property>
+             <property name="ypad">0</property>
            </widget>
            <packing>
-             <property name="padding">8</property>
-             <property name="expand">True</property>
-             <property name="fill">True</property>
+             <property name="padding">0</property>
+             <property name="expand">False</property>
+             <property name="fill">False</property>
            </packing>
          </child>
 
          <child>
-           <widget class="GtkAlignment" id="alignment1">
+           <widget class="GtkAlignment" id="alignment4">
              <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="top_padding">6</property>
              <property name="bottom_padding">0</property>
-             <property name="left_padding">4</property>
+             <property name="left_padding">12</property>
              <property name="right_padding">0</property>
 
              <child>
@@ -242,27 +296,6 @@
                  <property name="homogeneous">False</property>
                  <property name="spacing">0</property>
 
-                 <child>
-                   <widget class="GtkLabel" id="label10">
-                     <property name="visible">True</property>
-                     <property name="label" translatable="yes">&lt;b&gt;Align&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>
-                   </widget>
-                   <packing>
-                     <property name="padding">2</property>
-                     <property name="expand">False</property>
-                     <property name="fill">False</property>
-                   </packing>
-                 </child>
-
                  <child>
                    <widget class="GtkRadioButton" id="AlignBlock">
                      <property name="visible">True</property>

diff --git a/src/frontends/gtk/glade/print.glade b/src/frontends/gtk/glade/print.glade
index 39514f6f9addb492a023058a90efb44f0015c23e..2735cf97d23996da06ee5b14aa1b7ce0697e378d 100644 (file)
--- a/src/frontends/gtk/glade/print.glade
+++ b/src/frontends/gtk/glade/print.glade
@@ -15,7 +15,7 @@
   <property name="skip_pager_hint">False</property>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="has_separator">True</property>
+  <property name="has_separator">False</property>
 
   <child internal-child="vbox">
     <widget class="GtkVBox" id="dialog-vbox2">
@@ -187,10 +187,68 @@
                    <widget class="GtkButton" id="Browse">
                      <property name="visible">True</property>
                      <property name="can_focus">True</property>
-                     <property name="label" translatable="yes">_Browse...</property>
-                     <property name="use_underline">True</property>
                      <property name="relief">GTK_RELIEF_NORMAL</property>
                      <property name="focus_on_click">True</property>
+
+                     <child>
+                       <widget class="GtkAlignment" id="alignment1">
+                         <property name="visible">True</property>
+                         <property name="xalign">0.5</property>
+                         <property name="yalign">0.5</property>
+                         <property name="xscale">0</property>
+                         <property name="yscale">0</property>
+                         <property name="top_padding">0</property>
+                         <property name="bottom_padding">0</property>
+                         <property name="left_padding">0</property>
+                         <property name="right_padding">0</property>
+
+                         <child>
+                           <widget class="GtkHBox" id="hbox5">
+                             <property name="visible">True</property>
+                             <property name="homogeneous">False</property>
+                             <property name="spacing">2</property>
+
+                             <child>
+                               <widget class="GtkImage" id="image1">
+                                 <property name="visible">True</property>
+                                 <property name="stock">gtk-save-as</property>
+                                 <property name="icon_size">4</property>
+                                 <property name="xalign">0.5</property>
+                                 <property name="yalign">0.5</property>
+                                 <property name="xpad">0</property>
+                                 <property name="ypad">0</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="label7">
+                                 <property name="visible">True</property>
+                                 <property name="label" translatable="yes">_Browse...</property>
+                                 <property name="use_underline">True</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>
+                               </widget>
+                               <packing>
+                                 <property name="padding">0</property>
+                                 <property name="expand">False</property>
+                                 <property name="fill">False</property>
+                               </packing>
+                             </child>
+                           </widget>
+                         </child>
+                       </widget>
+                     </child>
                    </widget>
                    <packing>
                      <property name="left_attach">2</property>
@@ -521,7 +579,7 @@
                      <property name="n_columns">2</property>
                      <property name="homogeneous">False</property>
                      <property name="row_spacing">0</property>
-                     <property name="column_spacing">0</property>
+                     <property name="column_spacing">6</property>
 
                      <child>
                        <widget class="GtkSpinButton" id="Number">

diff --git a/src/frontends/gtk/glade/search.glade b/src/frontends/gtk/glade/search.glade
index d051697a9be411ba7675ee562789aee3871d8a47..fdda669971501cce4fab613e97ce896f01368ddf 100644 (file)
--- a/src/frontends/gtk/glade/search.glade
+++ b/src/frontends/gtk/glade/search.glade
@@ -3,13 +3,11 @@
 
 <glade-interface>
 
-<widget class="GtkWindow" id="dialog">
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">Find and Replace</property>
+<widget class="GtkDialog" id="dialog">
+  <property name="title" translatable="yes">dialog1</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">False</property>
-  <property name="default_width">450</property>
   <property name="resizable">False</property>
   <property name="destroy_with_parent">False</property>
   <property name="decorated">True</property>
@@ -17,276 +15,355 @@
   <property name="skip_pager_hint">False</property>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="has_separator">False</property>
 
-  <child>
-    <widget class="GtkTable" id="table1">
-      <property name="border_width">5</property>
+  <child internal-child="vbox">
+    <widget class="GtkVBox" id="dialog-vbox1">
       <property name="visible">True</property>
-      <property name="n_rows">4</property>
-      <property name="n_columns">3</property>
       <property name="homogeneous">False</property>
-      <property name="row_spacing">2</property>
-      <property name="column_spacing">4</property>
+      <property name="spacing">0</property>
 
-      <child>
-       <widget class="GtkLabel" id="label1">
+      <child internal-child="action_area">
+       <widget class="GtkHButtonBox" id="dialog-action_area1">
          <property name="visible">True</property>
-         <property name="label" translatable="yes">Find what:</property>
-         <property name="use_underline">False</property>
-         <property name="use_markup">False</property>
-         <property name="justify">GTK_JUSTIFY_RIGHT</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>
-       </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>
+         <property name="layout_style">GTK_BUTTONBOX_END</property>
 
-      <child>
-       <widget class="GtkLabel" id="label2">
-         <property name="visible">True</property>
-         <property name="label" translatable="yes">Replace with:</property>
-         <property name="use_underline">False</property>
-         <property name="use_markup">False</property>
-         <property name="justify">GTK_JUSTIFY_RIGHT</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>
-       </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="GtkEntry" id="FindEntry">
-         <property name="visible">True</property>
-         <property name="can_focus">True</property>
-         <property name="has_focus">True</property>
-         <property name="editable">True</property>
-         <property name="visibility">True</property>
-         <property name="max_length">0</property>
-         <property name="text" translatable="yes"></property>
-         <property name="has_frame">True</property>
-         <property name="invisible_char" translatable="yes">*</property>
-         <property name="activates_default">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>
-
-      <child>
-       <widget class="GtkEntry" id="ReplaceEntry">
-         <property name="visible">True</property>
-         <property name="can_focus">True</property>
-         <property name="editable">True</property>
-         <property name="visibility">True</property>
-         <property name="max_length">0</property>
-         <property name="text" translatable="yes"></property>
-         <property name="has_frame">True</property>
-         <property name="invisible_char" translatable="yes">*</property>
-         <property name="activates_default">False</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="GtkButton" id="FindNext">
-         <property name="visible">True</property>
-         <property name="sensitive">False</property>
-         <property name="can_default">True</property>
-         <property name="has_default">True</property>
-         <property name="can_focus">True</property>
-         <property name="label">gtk-find</property>
-         <property name="use_stock">True</property>
-         <property name="relief">GTK_RELIEF_NORMAL</property>
-         <property name="focus_on_click">True</property>
-       </widget>
-       <packing>
-         <property name="left_attach">2</property>
-         <property name="right_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>
-      </child>
-
-      <child>
-       <widget class="GtkButton" id="Replace">
-         <property name="visible">True</property>
-         <property name="sensitive">False</property>
-         <property name="can_focus">True</property>
-         <property name="label">gtk-find-and-replace</property>
-         <property name="use_stock">True</property>
-         <property name="relief">GTK_RELIEF_NORMAL</property>
-         <property name="focus_on_click">True</property>
-       </widget>
-       <packing>
-         <property name="left_attach">2</property>
-         <property name="right_attach">3</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="GtkButton" id="Cancel">
-         <property name="visible">True</property>
-         <property name="can_focus">True</property>
-         <property name="label">gtk-close</property>
-         <property name="use_stock">True</property>
-         <property name="relief">GTK_RELIEF_NORMAL</property>
-         <property name="focus_on_click">True</property>
-         <accelerator key="Escape" modifiers="0" signal="clicked"/>
-       </widget>
-       <packing>
-         <property name="left_attach">2</property>
-         <property name="right_attach">3</property>
-         <property name="top_attach">3</property>
-         <property name="bottom_attach">4</property>
-         <property name="x_options">fill</property>
-         <property name="y_options"></property>
-       </packing>
-      </child>
-
-      <child>
-       <widget class="GtkHBox" id="hbox1">
-         <property name="visible">True</property>
-         <property name="homogeneous">False</property>
-         <property name="spacing">0</property>
+         <child>
+           <widget class="GtkButton" id="Cancel">
+             <property name="visible">True</property>
+             <property name="can_default">True</property>
+             <property name="can_focus">True</property>
+             <property name="label">gtk-close</property>
+             <property name="use_stock">True</property>
+             <property name="relief">GTK_RELIEF_NORMAL</property>
+             <property name="focus_on_click">True</property>
+             <property name="response_id">0</property>
+             <accelerator key="Escape" modifiers="0" signal="clicked"/>
+           </widget>
+         </child>
 
          <child>
-           <widget class="GtkCheckButton" id="CaseSensitive">
+           <widget class="GtkButton" id="ReplaceAll">
              <property name="visible">True</property>
+             <property name="can_default">True</property>
              <property name="can_focus">True</property>
-             <property name="label" translatable="yes">Case s_ensitive</property>
+             <property name="label" translatable="yes">Repl_ace All</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="response_id">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="MatchWord">
+           <widget class="GtkButton" id="Replace">
              <property name="visible">True</property>
+             <property name="can_default">True</property>
              <property name="can_focus">True</property>
-             <property name="label" translatable="yes">_Match word</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="response_id">0</property>
+
+             <child>
+               <widget class="GtkAlignment" id="alignment6">
+                 <property name="visible">True</property>
+                 <property name="xalign">0.5</property>
+                 <property name="yalign">0.5</property>
+                 <property name="xscale">0</property>
+                 <property name="yscale">0</property>
+                 <property name="top_padding">0</property>
+                 <property name="bottom_padding">0</property>
+                 <property name="left_padding">0</property>
+                 <property name="right_padding">0</property>
+
+                 <child>
+                   <widget class="GtkHBox" id="hbox7">
+                     <property name="visible">True</property>
+                     <property name="homogeneous">False</property>
+                     <property name="spacing">2</property>
+
+                     <child>
+                       <widget class="GtkImage" id="image4">
+                         <property name="visible">True</property>
+                         <property name="stock">gtk-find-and-replace</property>
+                         <property name="icon_size">4</property>
+                         <property name="xalign">0.5</property>
+                         <property name="yalign">0.5</property>
+                         <property name="xpad">0</property>
+                         <property name="ypad">0</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="label8">
+                         <property name="visible">True</property>
+                         <property name="label" translatable="yes">_Replace</property>
+                         <property name="use_underline">True</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>
+                       </widget>
+                       <packing>
+                         <property name="padding">0</property>
+                         <property name="expand">False</property>
+                         <property name="fill">False</property>
+                       </packing>
+                     </child>
+                   </widget>
+                 </child>
+               </widget>
+             </child>
+           </widget>
+         </child>
+
+         <child>
+           <widget class="GtkButton" id="FindNext">
+             <property name="visible">True</property>
+             <property name="can_default">True</property>
+             <property name="has_default">True</property>
+             <property name="can_focus">True</property>
+             <property name="label">gtk-find</property>
+             <property name="use_stock">True</property>
+             <property name="relief">GTK_RELIEF_NORMAL</property>
+             <property name="focus_on_click">True</property>
+             <property name="response_id">0</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">0</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>
+         <property name="padding">0</property>
+         <property name="expand">False</property>
+         <property name="fill">True</property>
+         <property name="pack_type">GTK_PACK_END</property>
        </packing>
       </child>
 
       <child>
-       <widget class="GtkHBox" id="hbox2">
+       <widget class="GtkHBox" id="hbox5">
+         <property name="border_width">6</property>
          <property name="visible">True</property>
          <property name="homogeneous">False</property>
          <property name="spacing">0</property>
 
          <child>
-           <widget class="GtkCheckButton" id="SearchBackwards">
+           <widget class="GtkVBox" id="vbox3">
+             <property name="border_width">6</property>
              <property name="visible">True</property>
-             <property name="can_focus">True</property>
-             <property name="label" translatable="yes">_Search backwards</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="homogeneous">False</property>
+             <property name="spacing">0</property>
+
+             <child>
+               <widget class="GtkTable" id="table2">
+                 <property name="visible">True</property>
+                 <property name="n_rows">2</property>
+                 <property name="n_columns">2</property>
+                 <property name="homogeneous">False</property>
+                 <property name="row_spacing">6</property>
+                 <property name="column_spacing">6</property>
+
+                 <child>
+                   <widget class="GtkLabel" id="label5">
+                     <property name="visible">True</property>
+                     <property name="label" translatable="yes">Find what:</property>
+                     <property name="use_underline">False</property>
+                     <property name="use_markup">False</property>
+                     <property name="justify">GTK_JUSTIFY_RIGHT</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>
+                   </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="label6">
+                     <property name="visible">True</property>
+                     <property name="label" translatable="yes">Replace with:</property>
+                     <property name="use_underline">False</property>
+                     <property name="use_markup">False</property>
+                     <property name="justify">GTK_JUSTIFY_RIGHT</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>
+                   </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="GtkEntry" id="FindEntry">
+                     <property name="visible">True</property>
+                     <property name="can_focus">True</property>
+                     <property name="has_focus">True</property>
+                     <property name="editable">True</property>
+                     <property name="visibility">True</property>
+                     <property name="max_length">0</property>
+                     <property name="text" translatable="yes"></property>
+                     <property name="has_frame">True</property>
+                     <property name="invisible_char" translatable="yes">*</property>
+                     <property name="activates_default">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>
+
+                 <child>
+                   <widget class="GtkEntry" id="ReplaceEntry">
+                     <property name="visible">True</property>
+                     <property name="can_focus">True</property>
+                     <property name="editable">True</property>
+                     <property name="visibility">True</property>
+                     <property name="max_length">0</property>
+                     <property name="text" translatable="yes"></property>
+                     <property name="has_frame">True</property>
+                     <property name="invisible_char" translatable="yes">*</property>
+                     <property name="activates_default">False</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>
+               </widget>
+               <packing>
+                 <property name="padding">0</property>
+                 <property name="expand">False</property>
+                 <property name="fill">True</property>
+               </packing>
+             </child>
+
+             <child>
+               <widget class="GtkAlignment" id="alignment4">
+                 <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">6</property>
+                 <property name="bottom_padding">0</property>
+                 <property name="left_padding">0</property>
+                 <property name="right_padding">0</property>
+
+                 <child>
+                   <widget class="GtkVBox" id="vbox4">
+                     <property name="visible">True</property>
+                     <property name="homogeneous">False</property>
+                     <property name="spacing">0</property>
+
+                     <child>
+                       <widget class="GtkCheckButton" id="CaseSensitive">
+                         <property name="visible">True</property>
+                         <property name="can_focus">True</property>
+                         <property name="label" translatable="yes">Case s_ensitive</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="GtkCheckButton" id="SearchBackwards">
+                         <property name="visible">True</property>
+                         <property name="can_focus">True</property>
+                         <property name="label" translatable="yes">_Search backwards</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="GtkCheckButton" id="MatchWord">
+                         <property name="visible">True</property>
+                         <property name="can_focus">True</property>
+                         <property name="label" translatable="yes">_Match word</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>
+                   </widget>
+                 </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">False</property>
+             <property name="expand">True</property>
+             <property name="fill">True</property>
            </packing>
          </child>
        </widget>
        <packing>
-         <property name="left_attach">0</property>
-         <property name="right_attach">2</property>
-         <property name="top_attach">3</property>
-         <property name="bottom_attach">4</property>
-         <property name="x_options">fill</property>
-         <property name="y_options">fill</property>
-       </packing>
-      </child>
-
-      <child>
-       <widget class="GtkButton" id="ReplaceAll">
-         <property name="visible">True</property>
-         <property name="sensitive">False</property>
-         <property name="can_focus">True</property>
-         <property name="label" translatable="yes">Repl_ace all</property>
-         <property name="use_underline">True</property>
-         <property name="relief">GTK_RELIEF_NORMAL</property>
-         <property name="focus_on_click">True</property>
-       </widget>
-       <packing>
-         <property name="left_attach">2</property>
-         <property name="right_attach">3</property>
-         <property name="top_attach">2</property>
-         <property name="bottom_attach">3</property>
-         <property name="x_options">fill</property>
-         <property name="y_options"></property>
+         <property name="padding">0</property>
+         <property name="expand">True</property>
+         <property name="fill">True</property>
        </packing>
       </child>
     </widget>

diff --git a/src/frontends/gtk/glade/showfile.glade b/src/frontends/gtk/glade/showfile.glade
index 73c08c1fd5edbe0b2cfee64ec4af3734ebce247f..a6f9ae5be4763d6f8bb30ebc0eb295209afb3992 100644 (file)
--- a/src/frontends/gtk/glade/showfile.glade
+++ b/src/frontends/gtk/glade/showfile.glade
@@ -4,7 +4,6 @@
 <glade-interface>
 
 <widget class="GtkDialog" id="dialog">
-  <property name="border_width">6</property>
   <property name="title" translatable="yes">You shouldn't see this</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
@@ -54,6 +53,7 @@
 
       <child>
        <widget class="GtkScrolledWindow" id="scrolledwindow1">
+         <property name="border_width">9</property>
          <property name="visible">True</property>
          <property name="can_focus">True</property>
          <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>

diff --git a/src/frontends/gtk/glade/tableCreate.glade b/src/frontends/gtk/glade/tableCreate.glade
index 0ba6392946b7910276ff4c27883019a248461d11..70a13e14c3c5e7ea2fb3262d2843c17cfc73fb19 100644 (file)
--- a/src/frontends/gtk/glade/tableCreate.glade
+++ b/src/frontends/gtk/glade/tableCreate.glade
@@ -15,7 +15,7 @@
   <property name="skip_pager_hint">False</property>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="has_separator">True</property>
+  <property name="has_separator">False</property>
 
   <child internal-child="vbox">
     <widget class="GtkVBox" id="dialog-vbox1">
@@ -80,7 +80,7 @@
 
       <child>
        <widget class="GtkTable" id="table1">
-         <property name="border_width">5</property>
+         <property name="border_width">12</property>
          <property name="visible">True</property>
          <property name="n_rows">2</property>
          <property name="n_columns">2</property>

diff --git a/src/frontends/gtk/glade/text.glade b/src/frontends/gtk/glade/text.glade
index ba67e520c60d03abc0af85a7a2c9fda2a4f72541..9f35120b0fc57cf8762ddf01dffd1436fe3809eb 100644 (file)
--- a/src/frontends/gtk/glade/text.glade
+++ b/src/frontends/gtk/glade/text.glade
@@ -15,7 +15,7 @@
   <property name="skip_pager_hint">False</property>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="has_separator">True</property>
+  <property name="has_separator">False</property>
 
   <child internal-child="vbox">
     <widget class="GtkVBox" id="dialog-vbox1">
@@ -150,10 +150,10 @@
 
       <child>
        <widget class="GtkHBox" id="hbox2">
-         <property name="border_width">5</property>
+         <property name="border_width">12</property>
          <property name="visible">True</property>
          <property name="homogeneous">False</property>
-         <property name="spacing">5</property>
+         <property name="spacing">6</property>
 
          <child>
            <widget class="GtkLabel" id="Label">

diff --git a/src/frontends/gtk/glade/toc.glade b/src/frontends/gtk/glade/toc.glade
index c1057c57d8bdbf393cc000dee989c01676abd8a8..b4473c52581b7bc48534763bdfd192b2835ffe8a 100644 (file)
--- a/src/frontends/gtk/glade/toc.glade
+++ b/src/frontends/gtk/glade/toc.glade
@@ -77,7 +77,7 @@
            <widget class="GtkHBox" id="hbox1">
              <property name="visible">True</property>
              <property name="homogeneous">False</property>
-             <property name="spacing">0</property>
+             <property name="spacing">6</property>
 
              <child>
                <widget class="GtkLabel" id="label2">

diff --git a/src/frontends/gtk/glade/url.glade b/src/frontends/gtk/glade/url.glade
index 5d3d543fdb076f3729994d19e037218f2fd4b9ae..bc0c36da93f71dec1e81ddb99db1612aa367e490 100644 (file)
--- a/src/frontends/gtk/glade/url.glade
+++ b/src/frontends/gtk/glade/url.glade
@@ -15,7 +15,7 @@
   <property name="skip_pager_hint">False</property>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="has_separator">True</property>
+  <property name="has_separator">False</property>
 
   <child internal-child="vbox">
     <widget class="GtkVBox" id="dialog-vbox1">
@@ -150,13 +150,13 @@
 
       <child>
        <widget class="GtkTable" id="table1">
-         <property name="border_width">5</property>
+         <property name="border_width">12</property>
          <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">5</property>
-         <property name="column_spacing">5</property>
+         <property name="row_spacing">6</property>
+         <property name="column_spacing">6</property>
 
          <child>
            <widget class="GtkCheckButton" id="Html">

diff --git a/src/frontends/gtk/glade/vspace.glade b/src/frontends/gtk/glade/vspace.glade
index e583b5694987f0a975e3037c874e00bbf4eea0b3..e2bb818b0398851be468a33f9ade9f5c2a648388 100644 (file)
--- a/src/frontends/gtk/glade/vspace.glade
+++ b/src/frontends/gtk/glade/vspace.glade
@@ -202,19 +202,19 @@ Custom</property>
            <widget class="GtkHBox" id="hbox1">
              <property name="visible">True</property>
              <property name="homogeneous">False</property>
-             <property name="spacing">0</property>
+             <property name="spacing">6</property>
 
              <child>
                <widget class="GtkSpinButton" id="Value">
                  <property name="visible">True</property>
                  <property name="can_focus">True</property>
                  <property name="climb_rate">1</property>
-                 <property name="digits">0</property>
+                 <property name="digits">2</property>
                  <property name="numeric">False</property>
                  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                  <property name="snap_to_ticks">False</property>
                  <property name="wrap">False</property>
-                 <property name="adjustment">1 0 10000 1 10 10</property>
+                 <property name="adjustment">1 0 65536 1 10 10</property>
                </widget>
                <packing>
                  <property name="padding">0</property>