Fix popups

2 files changed, 19 insertions, 55 deletions

diff --git a/portato/gui/templates/MainWindow.ui b/portato/gui/templates/MainWindow.ui
index 914207b..39d7d4e 100644
--- a/portato/gui/templates/MainWindow.ui
+++ b/portato/gui/templates/MainWindow.ui
@@ -3,7 +3,7 @@
 <interface>
   <object class="GtkUIManager" id="uimanager">
     <child>
-      <object class="GtkActionGroup" id="actiongroup1">
+      <object class="GtkActionGroup" id="generalActionGroup">
         <child>
           <object class="GtkAction" id="fileMenuAction">
             <property name="name">fileMenuAction</property>
@@ -116,13 +116,6 @@
           <accelerator key="K" modifiers="GDK_CONTROL_MASK"/>
         </child>
         <child>
-          <object class="GtkAction" id="hiddenConsoleMenu">
-            <property name="visible">False</property>
-            <property name="name">hiddenConsoleMenu</property>
-            <property name="label" translatable="yes">Console</property>
-          </object>
-        </child>
-        <child>
           <object class="GtkAction" id="copyAction">
             <property name="stock_id">gtk-copy</property>
             <property name="name">copyAction</property>
@@ -181,19 +174,32 @@
           <menuitem name="pauseMenuItem" action="pauseAction"/>
           <menuitem name="killMenuItem" action="killAction"/>
         </menu>
-        <menu name="hiddenConsoleMenu" action="hiddenConsoleMenu">
-          <menuitem name="copyMenuItem" action="copyAction"/>
-          <menuitem name="killMenuItem" action="killAction"/>
-          <menuitem name="pauseMenuItem" action="pauseAction"/>
-        </menu>
         <menu name="pluginMenu" action="pluginMenuAction"/>
         <menu name="helpMenu" action="helpMenuAction">
           <menuitem name="aboutMenuItem" action="aboutAction"/>
           <menuitem name="pluginsMenuItem" action="pluginsAction"/>
         </menu>
       </menubar>
+      <popup name="systrayPopup">
+        <menuitem action="pauseAction"/>
+        <menuitem action="killAction"/>
+        <menuitem action="closeAction"/>
+      </popup>
+      <popup name="consolePopup">
+        <menuitem name="copyMenuItem" action="copyAction"/>
+        <menuitem name="killMenuItem" action="killAction"/>
+        <menuitem name="pauseMenuItem" action="pauseAction"/>
+      </popup>
     </ui>
   </object>
+  <object class="GtkMenu" constructor="uimanager" id="systrayPopup">
+    <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>
+  </object>
+  <object class="GtkMenu" constructor="uimanager" id="consolePopup">
+    <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>
+  </object>
   <object class="GtkWindow" id="MainWindow">
     <property name="border_width">2</property>
     <property name="window_position">GTK_WIN_POS_CENTER</property>
diff --git a/portato/gui/templates/popups.ui b/portato/gui/templates/popups.ui
deleted file mode 100644
index 52d2450..0000000
--- a/portato/gui/templates/popups.ui
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<!--Generated with glade3 3.4.4 on Mon Jun  9 20:49:26 2008 -->
-<interface>
-  <object class="GtkUIManager" id="uimanager1">
-    <child>
-      <object class="GtkActionGroup" id="actiongroup1">
-        <child>
-          <object class="GtkToggleAction" id="pauseItemTray">
-            <property name="name">pauseItemTray</property>
-            <property name="label" translatable="yes">Emerge _Paused</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="killItemTray">
-            <property name="stock_id">gtk-stop</property>
-            <property name="name">killItemTray</property>
-            <property name="label" translatable="yes">_Kill Emerge</property>
-            <signal handler="cb_kill_clicked" name="activate"/>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="closeItemTray">
-            <property name="stock_id" translatable="yes">gtk-quit</property>
-            <property name="name">closeItemTray</property>
-            <signal handler="cb_close" name="activate"/>
-          </object>
-        </child>
-      </object>
-    </child>
-    <ui>
-      <popup name="systrayPopup">
-        <menuitem action="pauseItemTray"/>
-        <menuitem action="killItemTray"/>
-        <menuitem action="closeItemTray"/>
-      </popup>
-    </ui>
-  </object>
-  <object class="GtkMenu" constructor="uimanager1" id="systrayPopup">
-    <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>
-  </object>
-</interface>