Revamp GTK citation dialog appearance

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

diff --git a/src/frontends/gtk/glade/citation.glade b/src/frontends/gtk/glade/citation.glade
index 7a6525e1c45806d2124cef5fc4fe6c5351dffd36..ff51d482070d50e39b50effff25ffbd53a9f3cc6 100644 (file)
--- a/src/frontends/gtk/glade/citation.glade
+++ b/src/frontends/gtk/glade/citation.glade
@@ -16,8 +16,6 @@
   <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="focus_on_map">True</property>
-  <property name="urgency_hint">False</property>
   <property name="has_separator">False</property>
 
   <child internal-child="vbox">
@@ -104,345 +102,408 @@
 
          <child>
            <widget class="GtkHBox" id="hbox9">
-             <property name="border_width">6</property>
+             <property name="border_width">12</property>
              <property name="visible">True</property>
              <property name="homogeneous">False</property>
-             <property name="spacing">0</property>
+             <property name="spacing">12</property>
 
              <child>
-               <widget class="GtkFrame" id="frame5">
+               <widget class="GtkVBox" id="vbox14">
                  <property name="visible">True</property>
-                 <property name="label_xalign">0</property>
-                 <property name="label_yalign">0.5</property>
-                 <property name="shadow_type">GTK_SHADOW_NONE</property>
+                 <property name="homogeneous">False</property>
+                 <property name="spacing">6</property>
 
                  <child>
-                   <widget class="GtkAlignment" id="alignment19">
+                   <widget class="GtkLabel" id="label18">
                      <property name="visible">True</property>
-                     <property name="xalign">0.5</property>
+                     <property name="label" translatable="yes">_Selected keys:</property>
+                     <property name="use_underline">True</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="xscale">1</property>
-                     <property name="yscale">1</property>
-                     <property name="top_padding">0</property>
-                     <property name="bottom_padding">0</property>
-                     <property name="left_padding">12</property>
-                     <property name="right_padding">0</property>
+                     <property name="xpad">0</property>
+                     <property name="ypad">0</property>
+                     <property name="mnemonic_widget">CiteKeys</property>
+                   </widget>
+                   <packing>
+                     <property name="padding">0</property>
+                     <property name="expand">False</property>
+                     <property name="fill">False</property>
+                   </packing>
+                 </child>
+
+                 <child>
+                   <widget class="GtkScrolledWindow" id="scrolledwindow5">
+                     <property name="visible">True</property>
+                     <property name="can_focus">True</property>
+                     <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                     <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                     <property name="shadow_type">GTK_SHADOW_IN</property>
+                     <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
                      <child>
-                       <widget class="GtkVBox" id="vbox13">
+                       <widget class="GtkTreeView" id="CiteKeys">
                          <property name="visible">True</property>
-                         <property name="homogeneous">False</property>
-                         <property name="spacing">6</property>
+                         <property name="can_focus">True</property>
+                         <property name="headers_visible">False</property>
+                         <property name="rules_hint">False</property>
+                         <property name="reorderable">True</property>
+                         <property name="enable_search">True</property>
+                       </widget>
+                     </child>
+                   </widget>
+                   <packing>
+                     <property name="padding">0</property>
+                     <property name="expand">True</property>
+                     <property name="fill">True</property>
+                   </packing>
+                 </child>
 
-                         <child>
-                           <widget class="GtkScrolledWindow" id="scrolledwindow5">
-                             <property name="visible">True</property>
-                             <property name="can_focus">True</property>
-                             <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                             <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                             <property name="shadow_type">GTK_SHADOW_IN</property>
-                             <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-                             <child>
-                               <widget class="GtkTreeView" id="CiteKeys">
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">True</property>
-                                 <property name="headers_visible">False</property>
-                                 <property name="rules_hint">False</property>
-                                 <property name="reorderable">True</property>
-                                 <property name="enable_search">True</property>
-                                 <property name="fixed_height_mode">False</property>
-                                 <property name="hover_selection">False</property>
-                                 <property name="hover_expand">False</property>
-                               </widget>
-                             </child>
-                           </widget>
-                           <packing>
-                             <property name="padding">0</property>
-                             <property name="expand">True</property>
-                             <property name="fill">True</property>
-                           </packing>
-                         </child>
+                 <child>
+                   <widget class="GtkHButtonBox" id="hbuttonbox4">
+                     <property name="visible">True</property>
+                     <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
+                     <property name="spacing">6</property>
 
-                         <child>
-                           <widget class="GtkHButtonBox" id="hbuttonbox4">
-                             <property name="visible">True</property>
-                             <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
-                             <property name="spacing">6</property>
-
-                             <child>
-                               <widget class="GtkButton" id="Up">
-                                 <property name="visible">True</property>
-                                 <property name="can_default">True</property>
-                                 <property name="can_focus">True</property>
-                                 <property name="label">gtk-go-up</property>
-                                 <property name="use_stock">True</property>
-                                 <property name="relief">GTK_RELIEF_NORMAL</property>
-                                 <property name="focus_on_click">True</property>
-                               </widget>
-                             </child>
-
-                             <child>
-                               <widget class="GtkButton" id="Down">
-                                 <property name="visible">True</property>
-                                 <property name="can_default">True</property>
-                                 <property name="can_focus">True</property>
-                                 <property name="label">gtk-go-down</property>
-                                 <property name="use_stock">True</property>
-                                 <property name="relief">GTK_RELIEF_NORMAL</property>
-                                 <property name="focus_on_click">True</property>
-                               </widget>
-                             </child>
-                           </widget>
-                           <packing>
-                             <property name="padding">0</property>
-                             <property name="expand">False</property>
-                             <property name="fill">False</property>
-                           </packing>
-                         </child>
+                     <child>
+                       <widget class="GtkButton" id="Up">
+                         <property name="visible">True</property>
+                         <property name="can_default">True</property>
+                         <property name="can_focus">True</property>
+                         <property name="label">gtk-go-up</property>
+                         <property name="use_stock">True</property>
+                         <property name="relief">GTK_RELIEF_NORMAL</property>
+                         <property name="focus_on_click">True</property>
+                       </widget>
+                     </child>
+
+                     <child>
+                       <widget class="GtkButton" id="Down">
+                         <property name="visible">True</property>
+                         <property name="can_default">True</property>
+                         <property name="can_focus">True</property>
+                         <property name="label">gtk-go-down</property>
+                         <property name="use_stock">True</property>
+                         <property name="relief">GTK_RELIEF_NORMAL</property>
+                         <property name="focus_on_click">True</property>
                        </widget>
                      </child>
                    </widget>
+                   <packing>
+                     <property name="padding">0</property>
+                     <property name="expand">False</property>
+                     <property name="fill">True</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="GtkVBox" id="vbox15">
+                 <property name="visible">True</property>
+                 <property name="homogeneous">False</property>
+                 <property name="spacing">6</property>
 
                  <child>
-                   <widget class="GtkLabel" id="label18">
+                   <widget class="GtkLabel" id="label17">
                      <property name="visible">True</property>
-                     <property name="label" translatable="yes">&lt;b&gt;_Selected keys&lt;/b&gt;</property>
+                     <property name="label" translatable="yes">_Available keys:</property>
                      <property name="use_underline">True</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="xalign">0</property>
                      <property name="yalign">0.5</property>
                      <property name="xpad">0</property>
                      <property name="ypad">0</property>
-                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                     <property name="width_chars">-1</property>
-                     <property name="single_line_mode">False</property>
-                     <property name="angle">0</property>
-                     <property name="mnemonic_widget">CiteKeys</property>
+                     <property name="mnemonic_widget">BibKeys</property>
                    </widget>
                    <packing>
-                     <property name="type">label_item</property>
+                     <property name="padding">0</property>
+                     <property name="expand">False</property>
+                     <property name="fill">False</property>
+                   </packing>
+                 </child>
+
+                 <child>
+                   <widget class="GtkScrolledWindow" id="scrolledwindow4">
+                     <property name="visible">True</property>
+                     <property name="can_focus">True</property>
+                     <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                     <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                     <property name="shadow_type">GTK_SHADOW_IN</property>
+                     <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+                     <child>
+                       <widget class="GtkTreeView" id="BibKeys">
+                         <property name="visible">True</property>
+                         <property name="can_focus">True</property>
+                         <property name="headers_visible">False</property>
+                         <property name="rules_hint">False</property>
+                         <property name="reorderable">False</property>
+                         <property name="enable_search">True</property>
+                       </widget>
+                     </child>
+                   </widget>
+                   <packing>
+                     <property name="padding">0</property>
+                     <property name="expand">True</property>
+                     <property name="fill">True</property>
+                   </packing>
+                 </child>
+
+                 <child>
+                   <widget class="GtkHButtonBox" id="hbuttonbox3">
+                     <property name="visible">True</property>
+                     <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
+                     <property name="spacing">6</property>
+
+                     <child>
+                       <widget class="GtkButton" id="Remove">
+                         <property name="visible">True</property>
+                         <property name="can_default">True</property>
+                         <property name="can_focus">True</property>
+                         <property name="label">gtk-remove</property>
+                         <property name="use_stock">True</property>
+                         <property name="relief">GTK_RELIEF_NORMAL</property>
+                         <property name="focus_on_click">True</property>
+                       </widget>
+                     </child>
+
+                     <child>
+                       <widget class="GtkButton" id="Add">
+                         <property name="visible">True</property>
+                         <property name="can_default">True</property>
+                         <property name="can_focus">True</property>
+                         <property name="label">gtk-add</property>
+                         <property name="use_stock">True</property>
+                         <property name="relief">GTK_RELIEF_NORMAL</property>
+                         <property name="focus_on_click">True</property>
+                       </widget>
+                     </child>
+                   </widget>
+                   <packing>
+                     <property name="padding">0</property>
+                     <property name="expand">False</property>
+                     <property name="fill">True</property>
                    </packing>
                  </child>
                </widget>
                <packing>
-                 <property name="padding">3</property>
+                 <property name="padding">0</property>
                  <property name="expand">True</property>
                  <property name="fill">True</property>
                </packing>
              </child>
 
              <child>
-               <widget class="GtkFrame" id="frame4">
+               <widget class="GtkVBox" id="vbox16">
                  <property name="visible">True</property>
-                 <property name="label_xalign">0</property>
-                 <property name="label_yalign">0.5</property>
-                 <property name="shadow_type">GTK_SHADOW_NONE</property>
+                 <property name="homogeneous">False</property>
+                 <property name="spacing">6</property>
 
                  <child>
-                   <widget class="GtkAlignment" id="alignment17">
+                   <widget class="GtkLabel" id="label16">
                      <property name="visible">True</property>
-                     <property name="xalign">0.5</property>
+                     <property name="label" translatable="yes">_Info:</property>
+                     <property name="use_underline">True</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="xscale">1</property>
-                     <property name="yscale">1</property>
-                     <property name="top_padding">0</property>
-                     <property name="bottom_padding">0</property>
-                     <property name="left_padding">12</property>
-                     <property name="right_padding">0</property>
+                     <property name="xpad">0</property>
+                     <property name="ypad">0</property>
+                     <property name="mnemonic_widget">Info</property>
+                   </widget>
+                   <packing>
+                     <property name="padding">0</property>
+                     <property name="expand">False</property>
+                     <property name="fill">False</property>
+                   </packing>
+                 </child>
+
+                 <child>
+                   <widget class="GtkScrolledWindow" id="scrolledwindow3">
+                     <property name="visible">True</property>
+                     <property name="can_focus">True</property>
+                     <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                     <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                     <property name="shadow_type">GTK_SHADOW_IN</property>
+                     <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
                      <child>
-                       <widget class="GtkVBox" id="vbox7">
+                       <widget class="GtkTextView" id="Info">
                          <property name="visible">True</property>
-                         <property name="homogeneous">False</property>
-                         <property name="spacing">6</property>
-
-                         <child>
-                           <widget class="GtkScrolledWindow" id="scrolledwindow4">
-                             <property name="visible">True</property>
-                             <property name="can_focus">True</property>
-                             <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                             <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                             <property name="shadow_type">GTK_SHADOW_IN</property>
-                             <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-                             <child>
-                               <widget class="GtkTreeView" id="BibKeys">
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">True</property>
-                                 <property name="headers_visible">False</property>
-                                 <property name="rules_hint">False</property>
-                                 <property name="reorderable">False</property>
-                                 <property name="enable_search">True</property>
-                                 <property name="fixed_height_mode">False</property>
-                                 <property name="hover_selection">False</property>
-                                 <property name="hover_expand">False</property>
-                               </widget>
-                             </child>
-                           </widget>
-                           <packing>
-                             <property name="padding">0</property>
-                             <property name="expand">True</property>
-                             <property name="fill">True</property>
-                           </packing>
-                         </child>
-
-                         <child>
-                           <widget class="GtkHButtonBox" id="hbuttonbox3">
-                             <property name="visible">True</property>
-                             <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
-                             <property name="spacing">6</property>
-
-                             <child>
-                               <widget class="GtkButton" id="Remove">
-                                 <property name="visible">True</property>
-                                 <property name="can_default">True</property>
-                                 <property name="can_focus">True</property>
-                                 <property name="label">gtk-remove</property>
-                                 <property name="use_stock">True</property>
-                                 <property name="relief">GTK_RELIEF_NORMAL</property>
-                                 <property name="focus_on_click">True</property>
-                               </widget>
-                             </child>
-
-                             <child>
-                               <widget class="GtkButton" id="Add">
-                                 <property name="visible">True</property>
-                                 <property name="can_default">True</property>
-                                 <property name="can_focus">True</property>
-                                 <property name="label">gtk-add</property>
-                                 <property name="use_stock">True</property>
-                                 <property name="relief">GTK_RELIEF_NORMAL</property>
-                                 <property name="focus_on_click">True</property>
-                               </widget>
-                             </child>
-                           </widget>
-                           <packing>
-                             <property name="padding">0</property>
-                             <property name="expand">False</property>
-                             <property name="fill">False</property>
-                           </packing>
-                         </child>
+                         <property name="can_focus">True</property>
+                         <property name="editable">False</property>
+                         <property name="overwrite">False</property>
+                         <property name="accepts_tab">True</property>
+                         <property name="justification">GTK_JUSTIFY_LEFT</property>
+                         <property name="wrap_mode">GTK_WRAP_WORD</property>
+                         <property name="cursor_visible">True</property>
+                         <property name="pixels_above_lines">0</property>
+                         <property name="pixels_below_lines">0</property>
+                         <property name="pixels_inside_wrap">0</property>
+                         <property name="left_margin">0</property>
+                         <property name="right_margin">0</property>
+                         <property name="indent">0</property>
+                         <property name="text" translatable="yes"></property>
                        </widget>
                      </child>
                    </widget>
+                   <packing>
+                     <property name="padding">0</property>
+                     <property name="expand">True</property>
+                     <property name="fill">True</property>
+                   </packing>
                  </child>
 
                  <child>
-                   <widget class="GtkLabel" id="label17">
+                   <widget class="GtkLabel" id="label22">
                      <property name="visible">True</property>
-                     <property name="label" translatable="yes">&lt;b&gt;_Available keys&lt;/b&gt;</property>
+                     <property name="label" translatable="yes">_Find:</property>
                      <property name="use_underline">True</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="xalign">0</property>
                      <property name="yalign">0.5</property>
                      <property name="xpad">0</property>
                      <property name="ypad">0</property>
-                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                     <property name="width_chars">-1</property>
-                     <property name="single_line_mode">False</property>
-                     <property name="angle">0</property>
-                     <property name="mnemonic_widget">BibKeys</property>
                    </widget>
                    <packing>
-                     <property name="type">label_item</property>
+                     <property name="padding">0</property>
+                     <property name="expand">False</property>
+                     <property name="fill">False</property>
                    </packing>
                  </child>
-               </widget>
-               <packing>
-                 <property name="padding">3</property>
-                 <property name="expand">False</property>
-                 <property name="fill">True</property>
-               </packing>
-             </child>
 
-             <child>
-               <widget class="GtkVBox" id="vbox8">
-                 <property name="visible">True</property>
-                 <property name="homogeneous">False</property>
-                 <property name="spacing">0</property>
+                 <child>
+                   <widget class="GtkEntry" id="SearchString">
+                     <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">*</property>
+                     <property name="activates_default">False</property>
+                   </widget>
+                   <packing>
+                     <property name="padding">0</property>
+                     <property name="expand">False</property>
+                     <property name="fill">False</property>
+                   </packing>
+                 </child>
 
                  <child>
-                   <widget class="GtkFrame" id="frame3">
+                   <widget class="GtkAlignment" id="alignment18">
                      <property name="visible">True</property>
-                     <property name="label_xalign">0</property>
-                     <property name="label_yalign">0.5</property>
-                     <property name="shadow_type">GTK_SHADOW_NONE</property>
+                     <property name="xalign">0.5</property>
+                     <property name="yalign">0.5</property>
+                     <property name="xscale">1</property>
+                     <property name="yscale">1</property>
+                     <property name="top_padding">0</property>
+                     <property name="bottom_padding">0</property>
+                     <property name="left_padding">6</property>
+                     <property name="right_padding">0</property>
 
                      <child>
-                       <widget class="GtkAlignment" id="alignment11">
+                       <widget class="GtkVBox" id="vbox17">
                          <property name="visible">True</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xscale">1</property>
-                         <property name="yscale">1</property>
-                         <property name="top_padding">0</property>
-                         <property name="bottom_padding">0</property>
-                         <property name="left_padding">12</property>
-                         <property name="right_padding">0</property>
+                         <property name="homogeneous">False</property>
+                         <property name="spacing">0</property>
 
                          <child>
-                           <widget class="GtkScrolledWindow" id="scrolledwindow3">
+                           <widget class="GtkRadioButton" id="SearchCite">
                              <property name="visible">True</property>
                              <property name="can_focus">True</property>
-                             <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                             <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                             <property name="shadow_type">GTK_SHADOW_IN</property>
-                             <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-                             <child>
-                               <widget class="GtkTextView" id="Info">
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">True</property>
-                                 <property name="editable">False</property>
-                                 <property name="overwrite">False</property>
-                                 <property name="accepts_tab">True</property>
-                                 <property name="justification">GTK_JUSTIFY_LEFT</property>
-                                 <property name="wrap_mode">GTK_WRAP_WORD</property>
-                                 <property name="cursor_visible">True</property>
-                                 <property name="pixels_above_lines">0</property>
-                                 <property name="pixels_below_lines">0</property>
-                                 <property name="pixels_inside_wrap">0</property>
-                                 <property name="left_margin">0</property>
-                                 <property name="right_margin">0</property>
-                                 <property name="indent">0</property>
-                                 <property name="text" translatable="yes"></property>
-                               </widget>
-                             </child>
+                             <property name="label" translatable="yes">S_elected keys</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>
 
-                     <child>
-                       <widget class="GtkLabel" id="label16">
-                         <property name="visible">True</property>
-        <property name="label" translatable="yes">&lt;b&gt;_Info&lt;/b&gt;</property>
-        <property name="use_underline">True</property>
-                         <property name="use_markup">True</property>
-                         <property name="justify">GTK_JUSTIFY_LEFT</property>
-                         <property name="wrap">False</property>
-                         <property name="selectable">False</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                         <property name="width_chars">-1</property>
-                         <property name="single_line_mode">False</property>
-                         <property name="angle">0</property>
-                         <property name="mnemonic_widget">Info</property>
+                         <child>
+                           <widget class="GtkRadioButton" id="SearchBib">
+                             <property name="visible">True</property>
+                             <property name="can_focus">True</property>
+                             <property name="label" translatable="yes">A_vailable keys</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">SearchCite</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="CaseSensitive">
+                             <property name="visible">True</property>
+                             <property name="can_focus">True</property>
+                             <property name="label" translatable="yes">_Case sensitive</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="RegularExpression">
+                             <property name="visible">True</property>
+                             <property name="can_focus">True</property>
+                             <property name="label" translatable="yes">Regular e_xpression</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="type">label_item</property>
-                       </packing>
                      </child>
                    </widget>
                    <packing>
@@ -453,199 +514,44 @@
                  </child>
 
                  <child>
-                   <widget class="GtkFrame" id="frame6">
+                   <widget class="GtkHButtonBox" id="hbuttonbox2">
                      <property name="visible">True</property>
-                     <property name="label_xalign">0</property>
-                     <property name="label_yalign">0.5</property>
-                     <property name="shadow_type">GTK_SHADOW_NONE</property>
+                     <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
+                     <property name="spacing">6</property>
 
                      <child>
-                       <widget class="GtkAlignment" id="alignment18">
+                       <widget class="GtkButton" id="Back">
                          <property name="visible">True</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xscale">1</property>
-                         <property name="yscale">1</property>
-                         <property name="top_padding">0</property>
-                         <property name="bottom_padding">0</property>
-                         <property name="left_padding">12</property>
-                         <property name="right_padding">0</property>
-
-                         <child>
-                           <widget class="GtkVBox" id="vbox12">
-                             <property name="visible">True</property>
-                             <property name="homogeneous">False</property>
-                             <property name="spacing">0</property>
-
-                             <child>
-                               <widget class="GtkEntry" id="SearchString">
-                                 <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">*</property>
-                                 <property name="activates_default">False</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="SearchCite">
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">True</property>
-                                 <property name="label" translatable="yes">S_elected keys</property>
-                                 <property name="use_underline">True</property>
-                                 <property name="relief">GTK_RELIEF_NORMAL</property>
-                                 <property name="focus_on_click">True</property>
-                                 <property name="active">False</property>
-                                 <property name="inconsistent">False</property>
-                                 <property name="draw_indicator">True</property>
-                               </widget>
-                               <packing>
-                                 <property name="padding">0</property>
-                                 <property name="expand">False</property>
-                                 <property name="fill">False</property>
-                               </packing>
-                             </child>
-
-                             <child>
-                               <widget class="GtkRadioButton" id="SearchBib">
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">True</property>
-                                 <property name="label" translatable="yes">A_vailable keys</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">SearchCite</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="CaseSensitive">
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">True</property>
-                                 <property name="label" translatable="yes">_Case sensitive</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="RegularExpression">
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">True</property>
-                                 <property name="label" translatable="yes">Regular e_xpression</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="GtkHButtonBox" id="hbuttonbox2">
-                                 <property name="visible">True</property>
-                                 <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
-                                 <property name="spacing">6</property>
-
-                                 <child>
-                                   <widget class="GtkButton" id="Back">
-                                     <property name="visible">True</property>
-                                     <property name="can_default">True</property>
-                                     <property name="can_focus">True</property>
-                                     <property name="label">gtk-go-back</property>
-                                     <property name="use_stock">True</property>
-                                     <property name="relief">GTK_RELIEF_NORMAL</property>
-                                     <property name="focus_on_click">True</property>
-                                   </widget>
-                                 </child>
-
-                                 <child>
-                                   <widget class="GtkButton" id="Forward">
-                                     <property name="visible">True</property>
-                                     <property name="can_default">True</property>
-                                     <property name="can_focus">True</property>
-                                     <property name="label">gtk-go-forward</property>
-                                     <property name="use_stock">True</property>
-                                     <property name="relief">GTK_RELIEF_NORMAL</property>
-                                     <property name="focus_on_click">True</property>
-                                   </widget>
-                                 </child>
-                               </widget>
-                               <packing>
-                                 <property name="padding">0</property>
-                                 <property name="expand">True</property>
-                                 <property name="fill">True</property>
-                               </packing>
-                             </child>
-                           </widget>
-                         </child>
+                         <property name="can_default">True</property>
+                         <property name="can_focus">True</property>
+                         <property name="label">gtk-go-back</property>
+                         <property name="use_stock">True</property>
+                         <property name="relief">GTK_RELIEF_NORMAL</property>
+                         <property name="focus_on_click">True</property>
                        </widget>
                      </child>
 
                      <child>
-                       <widget class="GtkLabel" id="label22">
+                       <widget class="GtkButton" id="Forward">
                          <property name="visible">True</property>
-                         <property name="label" translatable="yes">&lt;b&gt;_Find&lt;/b&gt;</property>
-                         <property name="use_underline">True</property>
-                         <property name="use_markup">True</property>
-                         <property name="justify">GTK_JUSTIFY_LEFT</property>
-                         <property name="wrap">False</property>
-                         <property name="selectable">False</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                         <property name="width_chars">-1</property>
-                         <property name="single_line_mode">False</property>
-                         <property name="angle">0</property>
+                         <property name="can_default">True</property>
+                         <property name="can_focus">True</property>
+                         <property name="label">gtk-go-forward</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="type">label_item</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>
                    </packing>
                  </child>
                </widget>
                <packing>
-                 <property name="padding">3</property>
+                 <property name="padding">0</property>
                  <property name="expand">True</property>
                  <property name="fill">True</property>
                </packing>
@@ -660,8 +566,8 @@
          <child>
            <widget class="GtkLabel" id="label23">
              <property name="visible">True</property>
-             <property name="label" translatable="yes">_Keys</property>
-             <property name="use_underline">True</property>
+             <property name="label" translatable="yes">Keys</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>
@@ -670,10 +576,6 @@
              <property name="yalign">0.5</property>
              <property name="xpad">0</property>
              <property name="ypad">0</property>
-             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-             <property name="width_chars">-1</property>
-             <property name="single_line_mode">False</property>
-             <property name="angle">0</property>
            </widget>
            <packing>
              <property name="type">tab</property>
@@ -709,10 +611,6 @@
                      <property name="yalign">0.5</property>
                      <property name="xpad">0</property>
                      <property name="ypad">0</property>
-                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                     <property name="width_chars">-1</property>
-                     <property name="single_line_mode">False</property>
-                     <property name="angle">0</property>
                    </widget>
                    <packing>
                      <property name="left_attach">0</property>
@@ -738,10 +636,6 @@
                      <property name="xpad">0</property>
                      <property name="ypad">0</property>
                      <property name="mnemonic_widget">TextBefore</property>
-                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                     <property name="width_chars">-1</property>
-                     <property name="single_line_mode">False</property>
-                     <property name="angle">0</property>
                    </widget>
                    <packing>
                      <property name="left_attach">0</property>
@@ -767,10 +661,6 @@
                      <property name="xpad">0</property>
                      <property name="ypad">0</property>
                      <property name="mnemonic_widget">TextAfter</property>
-                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                     <property name="width_chars">-1</property>
-                     <property name="single_line_mode">False</property>
-                     <property name="angle">0</property>
                    </widget>
                    <packing>
                      <property name="left_attach">0</property>
@@ -832,8 +722,6 @@
                    <widget class="GtkComboBox" id="Style">
                      <property name="visible">True</property>
                      <property name="items" translatable="yes"></property>
-                     <property name="add_tearoffs">False</property>
-                     <property name="focus_on_click">True</property>
                    </widget>
                    <packing>
                      <property name="left_attach">1</property>
@@ -901,8 +789,8 @@
          <child>
            <widget class="GtkLabel" id="label24">
              <property name="visible">True</property>
-             <property name="label" translatable="yes">_Style</property>
-             <property name="use_underline">True</property>
+             <property name="label" translatable="yes">Style</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>
@@ -911,10 +799,6 @@
              <property name="yalign">0.5</property>
              <property name="xpad">0</property>
              <property name="ypad">0</property>
-             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-             <property name="width_chars">-1</property>
-             <property name="single_line_mode">False</property>
-             <property name="angle">0</property>
            </widget>
            <packing>
              <property name="type">tab</property>