LinGui: reposition the presets frame below toolbar

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1960 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c
index 3223f91cd5f182cef7f953631f3018ed9347b481..c5234e59bb1c23b740e225a14c963a9cd57b50ee 100644 (file)
--- a/gtk/src/callbacks.c
+++ b/gtk/src/callbacks.c
@@ -2041,14 +2041,15 @@ show_queue_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 }
 
 void
-show_presets_toggled_cb(GtkToggleButton *button, signal_user_data_t *ud)
+show_presets_toggled_cb(GtkWidget *action, signal_user_data_t *ud)
 {
        GtkWidget *widget;
        GtkWindow *hb_window;
        
        g_debug("show_presets_clicked_cb ()");
        widget = GHB_WIDGET (ud->builder, "presets_frame");
-       if (gtk_toggle_button_get_active(button))
+       ghb_widget_to_setting(ud->settings, action);
+       if (ghb_settings_get_boolean(ud->settings, "show_presets"))
        {
                gtk_widget_show_now(widget);
        }
@@ -2058,7 +2059,6 @@ show_presets_toggled_cb(GtkToggleButton *button, signal_user_data_t *ud)
                hb_window = GTK_WINDOW(GHB_WIDGET (ud->builder, "hb_window"));
                gtk_window_resize(hb_window, 16, 16);
        }
-       ghb_widget_to_setting(ud->settings, GTK_WIDGET(button));
        ghb_pref_save(ud->settings, "show_presets");
 }
 

diff --git a/gtk/src/ghb.ui b/gtk/src/ghb.ui
index e1abfd492624b8622439f86ee60ab88e3ca63ad7..a88f7d9d6dafe48071ed0b9491c6d259dc8222ff 100644 (file)
--- a/gtk/src/ghb.ui
+++ b/gtk/src/ghb.ui
@@ -263,6 +263,15 @@
             <signal handler="hbfd_toggled_cb" name="toggled"/>
           </object>
         </child>
+        <child>
+          <object class="GtkToggleAction" id="show_presets">
+            <property name="visible">True</property>
+            <property name="active">False</property>
+            <property name="name">show_presets</property>
+            <property name="label" translatable="yes">Show Presets</property>
+            <signal handler="show_presets_toggled_cb" name="toggled"/>
+          </object>
+        </child>
         <child>
           <object class="GtkAction" id="show_activity_menu">
             <property name="icon-name">hb-activity</property>
@@ -326,6 +335,7 @@
         </menu>
         <menu action="menuitem3">
           <menuitem action="hbfd"/>
+          <menuitem action="show_presets"/>
           <menuitem action="show_activity_menu"/>
           <menuitem action="show_preview_menu"/>
           <menuitem action="show_queue_menu"/>
@@ -345,6 +355,111 @@
     <property name="icon_name">hb-icon</property>
     <signal handler="window_destroy_event_cb" name="destroy_event"/>
     <signal handler="window_delete_event_cb" name="delete_event"/>
+    <child>
+      <object class="GtkVBox" id="vbox_j1">
+        <property name="visible">True</property>
+        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+        <child>
+          <object class="GtkMenuBar" constructor="uimanager1" id="menubar1">
+            <property name="visible">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkToolbar" id="toolbar1">
+            <property name="visible">True</property>
+            <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
+            <property name="icon_size">GTK_ICON_SIZE_DND</property>
+            <child>
+              <object class="GtkToolButton" id="toolbutton1">
+                <property name="visible">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="tooltip-text" translatable="yes">Choose Video Source</property>
+                <property name="label" translatable="yes">Source</property>
+                <property name="icon_name">hb-source</property>
+                <signal handler="source_button_clicked_cb" name="clicked"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolButton" id="queue_start1">
+                <property name="visible">True</property>
+                <property name="sensitive">False</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="tooltip-text" translatable="yes">Start Encoding</property>
+                <property name="label" translatable="yes">Start</property>
+                <property name="icon_name">hb-play</property>
+                <signal handler="queue_start_clicked_cb" name="clicked"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolButton" id="queue_pause1">
+                <property name="visible">True</property>
+                <property name="sensitive">False</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="tooltip-text" translatable="yes">Pause Encoding</property>
+                <property name="label" translatable="yes">Pause</property>
+                <property name="icon_name">hb-pause</property>
+                <signal handler="queue_pause_clicked_cb" name="clicked"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolButton" id="queue_add">
+                <property name="visible">True</property>
+                <property name="sensitive">False</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="tooltip-text" translatable="yes">Add to Queue</property>
+                <property name="label" translatable="yes">Add to Queue</property>
+                <property name="icon_name">hb-add-queue</property>
+                <signal handler="queue_add_clicked_cb" name="clicked"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolButton" id="show_queue">
+                <property name="visible">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="tooltip-text" translatable="yes">Show Queue</property>
+                <property name="label" translatable="yes">Show Queue</property>
+                <property name="icon_name">hb-queue</property>
+                <signal handler="show_queue_clicked_cb" name="clicked"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolButton" id="show_activity">
+                <property name="visible">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="tooltip-text" translatable="yes">Show Activity Window</property>
+                <property name="label" translatable="yes">Activity Window</property>
+                <property name="icon_name">hb-activity</property>
+                <signal handler="show_activity_clicked_cb" name="clicked"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+
     <child>
       <object class="GtkHBox" id="hbox1">
         <property name="visible">True</property>
@@ -355,154 +470,6 @@
             <child>
               <object class="GtkVBox" id="vbox2">
                 <property name="visible">True</property>
-                <child>
-                  <object class="GtkMenuBar" constructor="uimanager1" id="menubar1">
-                    <property name="visible">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkHBox" id="hbox3">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <child>
-                      <object class="GtkToolbar" id="toolbar1">
-                        <property name="visible">True</property>
-                        <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
-                        <property name="icon_size">GTK_ICON_SIZE_DND</property>
-                        <child>
-                          <object class="GtkToolButton" id="toolbutton1">
-                            <property name="visible">True</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="tooltip-text" translatable="yes">Choose Video Source</property>
-                            <property name="label" translatable="yes">Source</property>
-                            <property name="icon_name">hb-source</property>
-                            <signal handler="source_button_clicked_cb" name="clicked"/>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkToolButton" id="queue_start1">
-                            <property name="visible">True</property>
-                            <property name="sensitive">False</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="tooltip-text" translatable="yes">Start Encoding</property>
-                            <property name="label" translatable="yes">Start</property>
-                            <property name="icon_name">hb-play</property>
-                            <signal handler="queue_start_clicked_cb" name="clicked"/>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkToolButton" id="queue_pause1">
-                            <property name="visible">True</property>
-                            <property name="sensitive">False</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="tooltip-text" translatable="yes">Pause Encoding</property>
-                            <property name="label" translatable="yes">Pause</property>
-                            <property name="icon_name">hb-pause</property>
-                            <signal handler="queue_pause_clicked_cb" name="clicked"/>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkToolButton" id="queue_add">
-                            <property name="visible">True</property>
-                            <property name="sensitive">False</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="tooltip-text" translatable="yes">Add to Queue</property>
-                            <property name="label" translatable="yes">Add to Queue</property>
-                            <property name="icon_name">hb-add-queue</property>
-                            <signal handler="queue_add_clicked_cb" name="clicked"/>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkToolButton" id="show_queue">
-                            <property name="visible">True</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="tooltip-text" translatable="yes">Show Queue</property>
-                            <property name="label" translatable="yes">Show Queue</property>
-                            <property name="icon_name">hb-queue</property>
-                            <signal handler="show_queue_clicked_cb" name="clicked"/>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkToolButton" id="show_activity">
-                            <property name="visible">True</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="tooltip-text" translatable="yes">Show Activity Window</property>
-                            <property name="label" translatable="yes">Activity Window</property>
-                            <property name="icon_name">hb-activity</property>
-                            <signal handler="show_activity_clicked_cb" name="clicked"/>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkHBox" id="hbox48">
-                        <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <child>
-                          <placeholder/>
-                        </child>
-                        <child>
-                          <placeholder/>
-                        </child>
-                        <child>
-                          <object class="GtkCheckButton" id="show_presets">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="tooltip-text" translatable="yes">Show/Hide the presets list</property>
-                            <property name="relief">GTK_RELIEF_NONE</property>
-                            <property name="active">True</property>
-                            <property name="draw_indicator">True</property>
-                            <signal handler="show_presets_toggled_cb" name="toggled"/>
-                            <child>
-                              <object class="GtkImage" id="drawerimage">
-                                <property name="visible">True</property>
-                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="icon_size">5</property>
-                                <property name="icon_name">hb-drawer</property>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
                 <child>
                   <object class="GtkFrame" id="frame1">
                     <property name="visible">True</property>
@@ -687,7 +654,7 @@
                   </object>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="position">2</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
@@ -696,7 +663,7 @@
                   </object>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="position">3</property>
+                    <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
@@ -859,16 +826,7 @@
                   </object>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="position">4</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkHSeparator" id="hseparator2">
-                    <property name="visible">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="position">5</property>
+                    <property name="position">2</property>
                   </packing>
                 </child>
               </object>
@@ -2994,11 +2952,11 @@ no-fast-pskip=0:no-dct-decimate=0:cabac=1</property>
         </child>
         <child>
           <object class="GtkFrame" id="presets_frame">
-            <property name="visible">True</property>
+            <property name="visible">False</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
             <property name="border_width">3</property>
             <property name="label_xalign">0</property>
-            <property name="shadow_type">GTK_SHADOW_ETCHED_OUT</property>
+            <property name="shadow_type">out</property>
             <signal handler="presets_frame_size_allocate_cb" name="size_allocate"/>
             <child>
               <object class="GtkAlignment" id="alignment21">
@@ -3152,7 +3110,14 @@ no-fast-pskip=0:no-dct-decimate=0:cabac=1</property>
           </packing>
         </child>
       </object>
+      <packing>
+        <property name="position">2</property>
+      </packing>
+    </child>
+
+      </object>
     </child>
+
   </object>
   <object class="GtkDialog" id="prefs_dialog">
     <property name="border_width">5</property>

diff --git a/gtk/src/resource_data.h b/gtk/src/resource_data.h
index 4392d75fc93175caec283665b3a9f5400002d0de..238371ca83f3aa2a042a41aad244daf2fcb9cc93 100644 (file)
--- a/gtk/src/resource_data.h
+++ b/gtk/src/resource_data.h
@@ -369,6 +369,21 @@
 "          </object>\n"
 "        </child>\n"
 "        <child>\n"
+"          <object class="GtkToggleAction" id="show_pr"
+"esets">\n"
+"            <property name="visible">True</property&"
+"gt;\n"
+"            <property name="active">False</property&"
+"gt;\n"
+"            <property name="name">show_presets</prop"
+"erty>\n"
+"            <property name="label" translatable="yes&"
+"quot;>Show Presets</property>\n"
+"            <signal handler="show_presets_toggled_cb" name"
+"="toggled"/>\n"
+"          </object>\n"
+"        </child>\n"
+"        <child>\n"
 "          <object class="GtkAction" id="show_activity"
 "_menu">\n"
 "            <property name="icon-name">hb-activity</"
@@ -456,6 +471,7 @@
 "        </menu>\n"
 "        <menu action="menuitem3">\n"
 "          <menuitem action="hbfd"/>\n"
+"          <menuitem action="show_presets"/>\n"
 "          <menuitem action="show_activity_menu"/>\n"
 "          <menuitem action="show_preview_menu"/>\n"
 "          <menuitem action="show_queue_menu"/>\n"
@@ -482,6 +498,179 @@
 "    <signal handler="window_delete_event_cb" name="de"
 "lete_event"/>\n"
 "    <child>\n"
+"      <object class="GtkVBox" id="vbox_j1">\n"
+"        <property name="visible">True</property>\n"
+"        <property name="events">GDK_POINTER_MOTION_MASK"
+" | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RE"
+"LEASE_MASK</property>\n"
+"        <child>\n"
+"          <object class="GtkMenuBar" constructor="uim"
+"anager1" id="menubar1">\n"
+"            <property name="visible">True</property&"
+"gt;\n"
+"          </object>\n"
+"          <packing>\n"
+"            <property name="expand">False</property&"
+"gt;\n"
+"            <property name="fill">False</property&gt"
+";\n"
+"          </packing>\n"
+"        </child>\n"
+"        <child>\n"
+"          <object class="GtkToolbar" id="toolbar1&quo"
+"t;>\n"
+"            <property name="visible">True</property&"
+"gt;\n"
+"            <property name="toolbar_style">GTK_TOOLBAR_"
+"BOTH</property>\n"
+"            <property name="icon_size">GTK_ICON_SIZE_DN"
+"D</property>\n"
+"            <child>\n"
+"              <object class="GtkToolButton" id="toolb"
+"utton1">\n"
+"                <property name="visible">True</prope"
+"rty>\n"
+"                <property name="events">GDK_POINTER_MOT"
+"ION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_B"
+"UTTON_RELEASE_MASK</property>\n"
+"                <property name="tooltip-text" translatable"
+"="yes">Choose Video Source</property>\n"
+"                <property name="label" translatable=""
+"yes">Source</property>\n"
+"                <property name="icon_name">hb-source&lt"
+";/property>\n"
+"                <signal handler="source_button_clicked_cb""
+" name="clicked"/>\n"
+"              </object>\n"
+"              <packing>\n"
+"                <property name="expand">False</prope"
+"rty>\n"
+"              </packing>\n"
+"            </child>\n"
+"            <child>\n"
+"              <object class="GtkToolButton" id="queue"
+"_start1">\n"
+"                <property name="visible">True</prope"
+"rty>\n"
+"                <property name="sensitive">False</pr"
+"operty>\n"
+"                <property name="events">GDK_POINTER_MOT"
+"ION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_B"
+"UTTON_RELEASE_MASK</property>\n"
+"                <property name="tooltip-text" translatable"
+"="yes">Start Encoding</property>\n"
+"                <property name="label" translatable=""
+"yes">Start</property>\n"
+"                <property name="icon_name">hb-play</"
+"property>\n"
+"                <signal handler="queue_start_clicked_cb" n"
+"ame="clicked"/>\n"
+"              </object>\n"
+"              <packing>\n"
+"                <property name="expand">False</prope"
+"rty>\n"
+"              </packing>\n"
+"            </child>\n"
+"            <child>\n"
+"              <object class="GtkToolButton" id="queue"
+"_pause1">\n"
+"                <property name="visible">True</prope"
+"rty>\n"
+"                <property name="sensitive">False</pr"
+"operty>\n"
+"                <property name="events">GDK_POINTER_MOT"
+"ION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_B"
+"UTTON_RELEASE_MASK</property>\n"
+"                <property name="tooltip-text" translatable"
+"="yes">Pause Encoding</property>\n"
+"                <property name="label" translatable=""
+"yes">Pause</property>\n"
+"                <property name="icon_name">hb-pause<"
+"/property>\n"
+"                <signal handler="queue_pause_clicked_cb" n"
+"ame="clicked"/>\n"
+"              </object>\n"
+"              <packing>\n"
+"                <property name="expand">False</prope"
+"rty>\n"
+"              </packing>\n"
+"            </child>\n"
+"            <child>\n"
+"              <object class="GtkToolButton" id="queue"
+"_add">\n"
+"                <property name="visible">True</prope"
+"rty>\n"
+"                <property name="sensitive">False</pr"
+"operty>\n"
+"                <property name="events">GDK_POINTER_MOT"
+"ION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_B"
+"UTTON_RELEASE_MASK</property>\n"
+"                <property name="tooltip-text" translatable"
+"="yes">Add to Queue</property>\n"
+"                <property name="label" translatable=""
+"yes">Add to Queue</property>\n"
+"                <property name="icon_name">hb-add-queue"
+"</property>\n"
+"                <signal handler="queue_add_clicked_cb" nam"
+"e="clicked"/>\n"
+"              </object>\n"
+"              <packing>\n"
+"                <property name="expand">False</prope"
+"rty>\n"
+"              </packing>\n"
+"            </child>\n"
+"            <child>\n"
+"              <object class="GtkToolButton" id="show_"
+"queue">\n"
+"                <property name="visible">True</prope"
+"rty>\n"
+"                <property name="events">GDK_POINTER_MOT"
+"ION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_B"
+"UTTON_RELEASE_MASK</property>\n"
+"                <property name="tooltip-text" translatable"
+"="yes">Show Queue</property>\n"
+"                <property name="label" translatable=""
+"yes">Show Queue</property>\n"
+"                <property name="icon_name">hb-queue<"
+"/property>\n"
+"                <signal handler="show_queue_clicked_cb" na"
+"me="clicked"/>\n"
+"              </object>\n"
+"              <packing>\n"
+"                <property name="expand">False</prope"
+"rty>\n"
+"              </packing>\n"
+"            </child>\n"
+"            <child>\n"
+"              <object class="GtkToolButton" id="show_"
+"activity">\n"
+"                <property name="visible">True</prope"
+"rty>\n"
+"                <property name="events">GDK_POINTER_MOT"
+"ION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_B"
+"UTTON_RELEASE_MASK</property>\n"
+"                <property name="tooltip-text" translatable"
+"="yes">Show Activity Window</property>\n"
+"                <property name="label" translatable=""
+"yes">Activity Window</property>\n"
+"                <property name="icon_name">hb-activity&"
+"lt;/property>\n"
+"                <signal handler="show_activity_clicked_cb""
+" name="clicked"/>\n"
+"              </object>\n"
+"              <packing>\n"
+"                <property name="expand">False</prope"
+"rty>\n"
+"              </packing>\n"
+"            </child>\n"
+"          </object>\n"
+"          <packing>\n"
+"            <property name="position">1</property&gt"
+";\n"
+"          </packing>\n"
+"        </child>\n"
+"\n"
+"    <child>\n"
 "      <object class="GtkHBox" id="hbox1">\n"
 "        <property name="visible">True</property>\n"
 "        <property name="events">GDK_POINTER_MOTION_MASK"
@@ -498,251 +687,6 @@
 "                <property name="visible">True</prope"
 "rty>\n"
 "                <child>\n"
-"                  <object class="GtkMenuBar" constructor=&"
-"quot;uimanager1" id="menubar1">\n"
-"                    <property name="visible">True</p"
-"roperty>\n"
-"                  </object>\n"
-"                  <packing>\n"
-"                    <property name="expand">False</p"
-"roperty>\n"
-"                    <property name="fill">False</pro"
-"perty>\n"
-"                  </packing>\n"
-"                </child>\n"
-"                <child>\n"
-"                  <object class="GtkHBox" id="hbox3&q"
-"uot;>\n"
-"                    <property name="visible">True</p"
-"roperty>\n"
-"                    <property name="events">GDK_POINTER"
-"_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | G"
-"DK_BUTTON_RELEASE_MASK</property>\n"
-"                    <child>\n"
-"                      <object class="GtkToolbar" id=""
-"toolbar1">\n"
-"                        <property name="visible">True&l"
-"t;/property>\n"
-"                        <property name="toolbar_style">"
-"GTK_TOOLBAR_BOTH</property>\n"
-"                        <property name="icon_size">GTK_"
-"ICON_SIZE_DND</property>\n"
-"                        <child>\n"
-"                          <object class="GtkToolButton" id"
-"="toolbutton1">\n"
-"                            <property name="visible">Tr"
-"ue</property>\n"
-"                            <property name="events">GDK"
-"_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_"
-"MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
-"                            <property name="tooltip-text" "
-"translatable="yes">Choose Video Source</property>\n"
-"                            <property name="label" transla"
-"table="yes">Source</property>\n"
-"                            <property name="icon_name">"
-"hb-source</property>\n"
-"                            <signal handler="source_button_clic"
-"ked_cb" name="clicked"/>\n"
-"                          </object>\n"
-"                          <packing>\n"
-"                            <property name="expand">Fal"
-"se</property>\n"
-"                          </packing>\n"
-"                        </child>\n"
-"                        <child>\n"
-"                          <object class="GtkToolButton" id"
-"="queue_start1">\n"
-"                            <property name="visible">Tr"
-"ue</property>\n"
-"                            <property name="sensitive">"
-"False</property>\n"
-"                            <property name="events">GDK"
-"_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_"
-"MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
-"                            <property name="tooltip-text" "
-"translatable="yes">Start Encoding</property>\n"
-"                            <property name="label" transla"
-"table="yes">Start</property>\n"
-"                            <property name="icon_name">"
-"hb-play</property>\n"
-"                            <signal handler="queue_start_clicke"
-"d_cb" name="clicked"/>\n"
-"                          </object>\n"
-"                          <packing>\n"
-"                            <property name="expand">Fal"
-"se</property>\n"
-"                          </packing>\n"
-"                        </child>\n"
-"                        <child>\n"
-"                          <object class="GtkToolButton" id"
-"="queue_pause1">\n"
-"                            <property name="visible">Tr"
-"ue</property>\n"
-"                            <property name="sensitive">"
-"False</property>\n"
-"                            <property name="events">GDK"
-"_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_"
-"MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
-"                            <property name="tooltip-text" "
-"translatable="yes">Pause Encoding</property>\n"
-"                            <property name="label" transla"
-"table="yes">Pause</property>\n"
-"                            <property name="icon_name">"
-"hb-pause</property>\n"
-"                            <signal handler="queue_pause_clicke"
-"d_cb" name="clicked"/>\n"
-"                          </object>\n"
-"                          <packing>\n"
-"                            <property name="expand">Fal"
-"se</property>\n"
-"                          </packing>\n"
-"                        </child>\n"
-"                        <child>\n"
-"                          <object class="GtkToolButton" id"
-"="queue_add">\n"
-"                            <property name="visible">Tr"
-"ue</property>\n"
-"                            <property name="sensitive">"
-"False</property>\n"
-"                            <property name="events">GDK"
-"_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_"
-"MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
-"                            <property name="tooltip-text" "
-"translatable="yes">Add to Queue</property>\n"
-"                            <property name="label" transla"
-"table="yes">Add to Queue</property>\n"
-"                            <property name="icon_name">"
-"hb-add-queue</property>\n"
-"                            <signal handler="queue_add_clicked_"
-"cb" name="clicked"/>\n"
-"                          </object>\n"
-"                          <packing>\n"
-"                            <property name="expand">Fal"
-"se</property>\n"
-"                          </packing>\n"
-"                        </child>\n"
-"                        <child>\n"
-"                          <object class="GtkToolButton" id"
-"="show_queue">\n"
-"                            <property name="visible">Tr"
-"ue</property>\n"
-"                            <property name="events">GDK"
-"_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_"
-"MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
-"                            <property name="tooltip-text" "
-"translatable="yes">Show Queue</property>\n"
-"                            <property name="label" transla"
-"table="yes">Show Queue</property>\n"
-"                            <property name="icon_name">"
-"hb-queue</property>\n"
-"                            <signal handler="show_queue_clicked"
-"_cb" name="clicked"/>\n"
-"                          </object>\n"
-"                          <packing>\n"
-"                            <property name="expand">Fal"
-"se</property>\n"
-"                          </packing>\n"
-"                        </child>\n"
-"                        <child>\n"
-"                          <object class="GtkToolButton" id"
-"="show_activity">\n"
-"                            <property name="visible">Tr"
-"ue</property>\n"
-"                            <property name="events">GDK"
-"_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_"
-"MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
-"                            <property name="tooltip-text" "
-"translatable="yes">Show Activity Window</property>\n"
-"                            <property name="label" transla"
-"table="yes">Activity Window</property>\n"
-"                            <property name="icon_name">"
-"hb-activity</property>\n"
-"                            <signal handler="show_activity_clic"
-"ked_cb" name="clicked"/>\n"
-"                          </object>\n"
-"                          <packing>\n"
-"                            <property name="expand">Fal"
-"se</property>\n"
-"                          </packing>\n"
-"                        </child>\n"
-"                      </object>\n"
-"                    </child>\n"
-"                    <child>\n"
-"                      <object class="GtkHBox" id="hbo"
-"x48">\n"
-"                        <property name="visible">True&l"
-"t;/property>\n"
-"                        <property name="events">GDK_POI"
-"NTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK"
-" | GDK_BUTTON_RELEASE_MASK</property>\n"
-"                        <child>\n"
-"                          <placeholder/>\n"
-"                        </child>\n"
-"                        <child>\n"
-"                          <placeholder/>\n"
-"                        </child>\n"
-"                        <child>\n"
-"                          <object class="GtkCheckButton" i"
-"d="show_presets">\n"
-"                            <property name="visible">Tr"
-"ue</property>\n"
-"                            <property name="can_focus">"
-"True</property>\n"
-"                            <property name="events">GDK"
-"_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_"
-"MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
-"                            <property name="tooltip-text" "
-"translatable="yes">Show/Hide the presets list</property"
-">\n"
-"                            <property name="relief">GTK"
-"_RELIEF_NONE</property>\n"
-"                            <property name="active">Tru"
-"e</property>\n"
-"                            <property name="draw_indicator&quot"
-";>True</property>\n"
-"                            <signal handler="show_presets_toggl"
-"ed_cb" name="toggled"/>\n"
-"                            <child>\n"
-"                              <object class="GtkImage" id="
-""drawerimage">\n"
-"                                <property name="visible"&g"
-"t;True</property>\n"
-"                                <property name="events"&gt"
-";GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PR"
-"ESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
-"                                <property name="icon_size""
-">5</property>\n"
-"                                <property name="icon_name""
-">hb-drawer</property>\n"
-"                              </object>\n"
-"                            </child>\n"
-"                          </object>\n"
-"                          <packing>\n"
-"                            <property name="expand">Fal"
-"se</property>\n"
-"                            <property name="position">2"
-"</property>\n"
-"                          </packing>\n"
-"                        </child>\n"
-"                      </object>\n"
-"                      <packing>\n"
-"                        <property name="expand">False&l"
-"t;/property>\n"
-"                        <property name="position">1<"
-"/property>\n"
-"                      </packing>\n"
-"                    </child>\n"
-"                  </object>\n"
-"                  <packing>\n"
-"                    <property name="expand">False</p"
-"roperty>\n"
-"                    <property name="fill">False</pro"
-"perty>\n"
-"                    <property name="position">1</pro"
-"perty>\n"
-"                  </packing>\n"
-"                </child>\n"
-"                <child>\n"
 "                  <object class="GtkFrame" id="frame1"
 "">\n"
 "                    <property name="visible">True</p"
@@ -1035,7 +979,7 @@
 "                  <packing>\n"
 "                    <property name="expand">False</p"
 "roperty>\n"
-"                    <property name="position">2</pro"
+"                    <property name="position">0</pro"
 "perty>\n"
 "                  </packing>\n"
 "                </child>\n"
@@ -1048,7 +992,7 @@
 "                  <packing>\n"
 "                    <property name="expand">False</p"
 "roperty>\n"
-"                    <property name="position">3</pro"
+"                    <property name="position">1</pro"
 "perty>\n"
 "                  </packing>\n"
 "                </child>\n"
@@ -1311,20 +1255,7 @@
 "                  <packing>\n"
 "                    <property name="expand">False</p"
 "roperty>\n"
-"                    <property name="position">4</pro"
-"perty>\n"
-"                  </packing>\n"
-"                </child>\n"
-"                <child>\n"
-"                  <object class="GtkHSeparator" id="h"
-"separator2">\n"
-"                    <property name="visible">True</p"
-"roperty>\n"
-"                  </object>\n"
-"                  <packing>\n"
-"                    <property name="expand">False</p"
-"roperty>\n"
-"                    <property name="position">5</pro"
+"                    <property name="position">2</pro"
 "perty>\n"
 "                  </packing>\n"
 "                </child>\n"
@@ -4888,8 +4819,8 @@
 "        <child>\n"
 "          <object class="GtkFrame" id="presets_frame&"
 "quot;>\n"
-"            <property name="visible">True</property&"
-"gt;\n"
+"            <property name="visible">False</property"
+">\n"
 "            <property name="events">GDK_POINTER_MOTION_"
 "MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTO"
 "N_RELEASE_MASK</property>\n"
@@ -4897,8 +4828,8 @@
 "y>\n"
 "            <property name="label_xalign">0</propert"
 "y>\n"
-"            <property name="shadow_type">GTK_SHADOW_ETC"
-"HED_OUT</property>\n"
+"            <property name="shadow_type">out</proper"
+"ty>\n"
 "            <signal handler="presets_frame_size_allocate_cb&quo"
 "t; name="size_allocate"/>\n"
 "            <child>\n"
@@ -5156,7 +5087,14 @@
 "          </packing>\n"
 "        </child>\n"
 "      </object>\n"
+"      <packing>\n"
+"        <property name="position">2</property>\n"
+"      </packing>\n"
 "    </child>\n"
+"\n"
+"      </object>\n"
+"    </child>\n"
+"\n"
 "  </object>\n"
 "  <object class="GtkDialog" id="prefs_dialog"&gt"
 ";\n"

diff --git a/gtk/src/resources.plist b/gtk/src/resources.plist
index 6ad8a9e087d93387bb9e83e5731a5d32797e5538..0ef336a7b91a6f8c5bc7ae24a763c2967b9e8db4 100644 (file)
--- a/gtk/src/resources.plist
+++ b/gtk/src/resources.plist
@@ -268,6 +268,15 @@
             <signal handler="hbfd_toggled_cb" name="toggled"/>
           </object>
         </child>
+        <child>
+          <object class="GtkToggleAction" id="show_presets">
+            <property name="visible">True</property>
+            <property name="active">False</property>
+            <property name="name">show_presets</property>
+            <property name="label" translatable="yes">Show Presets</property>
+            <signal handler="show_presets_toggled_cb" name="toggled"/>
+          </object>
+        </child>
         <child>
           <object class="GtkAction" id="show_activity_menu">
             <property name="icon-name">hb-activity</property>
@@ -331,6 +340,7 @@
         </menu>
         <menu action="menuitem3">
           <menuitem action="hbfd"/>
+          <menuitem action="show_presets"/>
           <menuitem action="show_activity_menu"/>
           <menuitem action="show_preview_menu"/>
           <menuitem action="show_queue_menu"/>
@@ -350,6 +360,111 @@
     <property name="icon_name">hb-icon</property>
     <signal handler="window_destroy_event_cb" name="destroy_event"/>
     <signal handler="window_delete_event_cb" name="delete_event"/>
+    <child>
+      <object class="GtkVBox" id="vbox_j1">
+        <property name="visible">True</property>
+        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+        <child>
+          <object class="GtkMenuBar" constructor="uimanager1" id="menubar1">
+            <property name="visible">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkToolbar" id="toolbar1">
+            <property name="visible">True</property>
+            <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
+            <property name="icon_size">GTK_ICON_SIZE_DND</property>
+            <child>
+              <object class="GtkToolButton" id="toolbutton1">
+                <property name="visible">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="tooltip-text" translatable="yes">Choose Video Source</property>
+                <property name="label" translatable="yes">Source</property>
+                <property name="icon_name">hb-source</property>
+                <signal handler="source_button_clicked_cb" name="clicked"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolButton" id="queue_start1">
+                <property name="visible">True</property>
+                <property name="sensitive">False</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="tooltip-text" translatable="yes">Start Encoding</property>
+                <property name="label" translatable="yes">Start</property>
+                <property name="icon_name">hb-play</property>
+                <signal handler="queue_start_clicked_cb" name="clicked"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolButton" id="queue_pause1">
+                <property name="visible">True</property>
+                <property name="sensitive">False</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="tooltip-text" translatable="yes">Pause Encoding</property>
+                <property name="label" translatable="yes">Pause</property>
+                <property name="icon_name">hb-pause</property>
+                <signal handler="queue_pause_clicked_cb" name="clicked"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolButton" id="queue_add">
+                <property name="visible">True</property>
+                <property name="sensitive">False</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="tooltip-text" translatable="yes">Add to Queue</property>
+                <property name="label" translatable="yes">Add to Queue</property>
+                <property name="icon_name">hb-add-queue</property>
+                <signal handler="queue_add_clicked_cb" name="clicked"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolButton" id="show_queue">
+                <property name="visible">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="tooltip-text" translatable="yes">Show Queue</property>
+                <property name="label" translatable="yes">Show Queue</property>
+                <property name="icon_name">hb-queue</property>
+                <signal handler="show_queue_clicked_cb" name="clicked"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolButton" id="show_activity">
+                <property name="visible">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="tooltip-text" translatable="yes">Show Activity Window</property>
+                <property name="label" translatable="yes">Activity Window</property>
+                <property name="icon_name">hb-activity</property>
+                <signal handler="show_activity_clicked_cb" name="clicked"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+
     <child>
       <object class="GtkHBox" id="hbox1">
         <property name="visible">True</property>
@@ -360,154 +475,6 @@
             <child>
               <object class="GtkVBox" id="vbox2">
                 <property name="visible">True</property>
-                <child>
-                  <object class="GtkMenuBar" constructor="uimanager1" id="menubar1">
-                    <property name="visible">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkHBox" id="hbox3">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <child>
-                      <object class="GtkToolbar" id="toolbar1">
-                        <property name="visible">True</property>
-                        <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
-                        <property name="icon_size">GTK_ICON_SIZE_DND</property>
-                        <child>
-                          <object class="GtkToolButton" id="toolbutton1">
-                            <property name="visible">True</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="tooltip-text" translatable="yes">Choose Video Source</property>
-                            <property name="label" translatable="yes">Source</property>
-                            <property name="icon_name">hb-source</property>
-                            <signal handler="source_button_clicked_cb" name="clicked"/>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkToolButton" id="queue_start1">
-                            <property name="visible">True</property>
-                            <property name="sensitive">False</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="tooltip-text" translatable="yes">Start Encoding</property>
-                            <property name="label" translatable="yes">Start</property>
-                            <property name="icon_name">hb-play</property>
-                            <signal handler="queue_start_clicked_cb" name="clicked"/>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkToolButton" id="queue_pause1">
-                            <property name="visible">True</property>
-                            <property name="sensitive">False</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="tooltip-text" translatable="yes">Pause Encoding</property>
-                            <property name="label" translatable="yes">Pause</property>
-                            <property name="icon_name">hb-pause</property>
-                            <signal handler="queue_pause_clicked_cb" name="clicked"/>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkToolButton" id="queue_add">
-                            <property name="visible">True</property>
-                            <property name="sensitive">False</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="tooltip-text" translatable="yes">Add to Queue</property>
-                            <property name="label" translatable="yes">Add to Queue</property>
-                            <property name="icon_name">hb-add-queue</property>
-                            <signal handler="queue_add_clicked_cb" name="clicked"/>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkToolButton" id="show_queue">
-                            <property name="visible">True</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="tooltip-text" translatable="yes">Show Queue</property>
-                            <property name="label" translatable="yes">Show Queue</property>
-                            <property name="icon_name">hb-queue</property>
-                            <signal handler="show_queue_clicked_cb" name="clicked"/>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkToolButton" id="show_activity">
-                            <property name="visible">True</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="tooltip-text" translatable="yes">Show Activity Window</property>
-                            <property name="label" translatable="yes">Activity Window</property>
-                            <property name="icon_name">hb-activity</property>
-                            <signal handler="show_activity_clicked_cb" name="clicked"/>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkHBox" id="hbox48">
-                        <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <child>
-                          <placeholder/>
-                        </child>
-                        <child>
-                          <placeholder/>
-                        </child>
-                        <child>
-                          <object class="GtkCheckButton" id="show_presets">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="tooltip-text" translatable="yes">Show/Hide the presets list</property>
-                            <property name="relief">GTK_RELIEF_NONE</property>
-                            <property name="active">True</property>
-                            <property name="draw_indicator">True</property>
-                            <signal handler="show_presets_toggled_cb" name="toggled"/>
-                            <child>
-                              <object class="GtkImage" id="drawerimage">
-                                <property name="visible">True</property>
-                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="icon_size">5</property>
-                                <property name="icon_name">hb-drawer</property>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
                 <child>
                   <object class="GtkFrame" id="frame1">
                     <property name="visible">True</property>
@@ -692,7 +659,7 @@
                   </object>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="position">2</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
@@ -701,7 +668,7 @@
                   </object>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="position">3</property>
+                    <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
@@ -864,16 +831,7 @@
                   </object>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="position">4</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkHSeparator" id="hseparator2">
-                    <property name="visible">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="position">5</property>
+                    <property name="position">2</property>
                   </packing>
                 </child>
               </object>
@@ -2999,11 +2957,11 @@ no-fast-pskip=0:no-dct-decimate=0:cabac=1</property>
         </child>
         <child>
           <object class="GtkFrame" id="presets_frame">
-            <property name="visible">True</property>
+            <property name="visible">False</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
             <property name="border_width">3</property>
             <property name="label_xalign">0</property>
-            <property name="shadow_type">GTK_SHADOW_ETCHED_OUT</property>
+            <property name="shadow_type">out</property>
             <signal handler="presets_frame_size_allocate_cb" name="size_allocate"/>
             <child>
               <object class="GtkAlignment" id="alignment21">
@@ -3157,7 +3115,14 @@ no-fast-pskip=0:no-dct-decimate=0:cabac=1</property>
           </packing>
         </child>
       </object>
+      <packing>
+        <property name="position">2</property>
+      </packing>
+    </child>
+
+      </object>
     </child>
+
   </object>
   <object class="GtkDialog" id="prefs_dialog">
     <property name="border_width">5</property>