diff options
author | René 'Necoro' Neumann <necoro@necoro.net> | 2009-09-06 01:46:45 +0200 |
---|---|---|
committer | René 'Necoro' Neumann <necoro@necoro.net> | 2009-09-06 01:46:45 +0200 |
commit | aeffd6bb3e77545ac6de777c4b0c9f3024ae654f (patch) | |
tree | 2ab74d4b3b47fd35ec3a3b3f2f115a7430f9f006 | |
parent | bf86fab5906e1466984d072cc9a0309b38b55a43 (diff) | |
parent | 30b9a89aaf90e5ea0edeadee6d6f1a9f05c40703 (diff) | |
download | portato-aeffd6bb3e77545ac6de777c4b0c9f3024ae654f.tar.gz portato-aeffd6bb3e77545ac6de777c4b0c9f3024ae654f.tar.bz2 portato-aeffd6bb3e77545ac6de777c4b0c9f3024ae654f.zip |
Updated .ui files, so they work with the most up2date glade. Therefore moved action and menu declarations into an extra file and added some white magic to the UIBuilder class.
-rw-r--r-- | portato/gui/templates/AboutWindow.ui | 15 | ||||
-rw-r--r-- | portato/gui/templates/MailInfoWindow.ui | 46 | ||||
-rw-r--r-- | portato/gui/templates/MainWindow.menu | 207 | ||||
-rw-r--r-- | portato/gui/templates/MainWindow.ui | 429 | ||||
-rw-r--r-- | portato/gui/templates/PluginWindow.ui | 72 | ||||
-rw-r--r-- | portato/gui/templates/PreferenceWindow.ui | 17 | ||||
-rw-r--r-- | portato/gui/templates/SearchWindow.ui | 36 | ||||
-rw-r--r-- | portato/gui/templates/SplashScreen.ui | 11 | ||||
-rw-r--r-- | portato/gui/templates/UpdateWindow.ui | 40 | ||||
-rw-r--r-- | portato/gui/windows/basic.py | 16 | ||||
-rw-r--r-- | setup.py | 2 |
11 files changed, 527 insertions, 364 deletions
diff --git a/portato/gui/templates/AboutWindow.ui b/portato/gui/templates/AboutWindow.ui index 56a7ff6..ce612b3 100644 --- a/portato/gui/templates/AboutWindow.ui +++ b/portato/gui/templates/AboutWindow.ui @@ -1,14 +1,15 @@ <?xml version="1.0"?> -<!--*- mode: xml -*--> <interface> + <requires lib="gtk+" version="2.14"/> + <!-- interface-naming-policy toplevel-contextual --> <object class="GtkAboutDialog" id="AboutWindow"> <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">5</property> <property name="title" translatable="yes">About Portato</property> <property name="resizable">False</property> - <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property> + <property name="window_position">center-on-parent</property> <property name="destroy_with_parent">True</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> + <property name="type_hint">dialog</property> <property name="skip_taskbar_hint">True</property> <property name="skip_pager_hint">True</property> <property name="urgency_hint">True</property> @@ -31,11 +32,12 @@ Portugese (Brazilian) - Alberto Federman Neto Spanish - Daniel Halens Turkish - Gürkan 'seqizz' Gür</property> <property name="artists">p4r4d0x (inspired by wolfden)</property> - <signal handler="close" name="response"/> + <signal name="response" handler="close"/> <child internal-child="vbox"> <object class="GtkVBox" id="dialog-vbox1"> <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="orientation">vertical</property> <property name="spacing">2</property> <child> <placeholder/> @@ -44,11 +46,12 @@ Turkish - Gürkan 'seqizz' Gür</property> <object class="GtkHButtonBox" id="dialog-action_area1"> <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="layout_style">GTK_BUTTONBOX_END</property> + <property name="layout_style">end</property> </object> <packing> <property name="expand">False</property> - <property name="pack_type">GTK_PACK_END</property> + <property name="pack_type">end</property> + <property name="position">0</property> </packing> </child> </object> diff --git a/portato/gui/templates/MailInfoWindow.ui b/portato/gui/templates/MailInfoWindow.ui index a469bd3..4551cdb 100644 --- a/portato/gui/templates/MailInfoWindow.ui +++ b/portato/gui/templates/MailInfoWindow.ui @@ -1,20 +1,22 @@ <?xml version="1.0"?> -<!--Generated with glade3 3.4.5 on Mon Sep 15 20:20:19 2008 --> <interface> + <requires lib="gtk+" version="2.14"/> + <!-- interface-naming-policy toplevel-contextual --> <object class="GtkWindow" id="MailInfoWindow"> <property name="title" translatable="yes">Send Bug Mail ...</property> <property name="modal">True</property> - <property name="window_position">GTK_WIN_POS_CENTER</property> + <property name="window_position">center</property> <property name="default_width">450</property> <property name="default_height">230</property> <property name="destroy_with_parent">True</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> + <property name="type_hint">dialog</property> <property name="skip_taskbar_hint">True</property> <property name="skip_pager_hint">True</property> <property name="urgency_hint">True</property> <child> <object class="GtkVBox" id="vbox1"> <property name="visible">True</property> + <property name="orientation">vertical</property> <child> <object class="GtkTable" id="table1"> <property name="visible">True</property> @@ -22,16 +24,13 @@ <property name="n_columns">2</property> <property name="row_spacing">10</property> <child> - <placeholder/> - </child> - <child> <object class="GtkLabel" id="label3"> <property name="visible">True</property> <property name="label" translatable="yes"><b><u>Additional Information</u></b> (all optional)</property> <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_CENTER</property> + <property name="justify">center</property> </object> <packing> <property name="right_attach">2</property> @@ -115,9 +114,9 @@ what did you do to hit the bug?</property> <object class="GtkScrolledWindow" id="scrolledwindow1"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="hscrollbar_policy">GTK_POLICY_NEVER</property> - <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> - <property name="shadow_type">GTK_SHADOW_IN</property> + <property name="hscrollbar_policy">never</property> + <property name="vscrollbar_policy">automatic</property> + <property name="shadow_type">in</property> <child> <object class="GtkTextView" id="commentEntry"> <property name="height_request">50</property> @@ -136,10 +135,11 @@ what did you do to hit the bug?</property> </child> <child> <object class="GtkCheckButton" id="logCheck"> + <property name="label" translatable="yes">Attach _Logfile</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip-text" translatable="yes">Attaches the logfile to the mail. This log only contains debug information.</property> - <property name="label" translatable="yes">Attach _Logfile</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">Attaches the logfile to the mail. This log only contains debug information.</property> <property name="use_underline">True</property> <property name="active">True</property> <property name="draw_indicator">True</property> @@ -150,32 +150,41 @@ what did you do to hit the bug?</property> <property name="x_options">GTK_FILL</property> </packing> </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="padding">5</property> + <property name="position">0</property> </packing> </child> <child> <object class="GtkHButtonBox" id="hbuttonbox1"> <property name="visible">True</property> <property name="homogeneous">True</property> - <property name="layout_style">GTK_BUTTONBOX_SPREAD</property> + <property name="layout_style">spread</property> <child> <object class="GtkButton" id="cancelBtn"> + <property name="label">gtk-cancel</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="label">gtk-cancel</property> <property name="use_stock">True</property> - <signal handler="cb_cancel_clicked" name="clicked"/> + <signal name="clicked" handler="cb_cancel_clicked"/> </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> </child> <child> <object class="GtkButton" id="sendBtn"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <signal handler="cb_send_clicked" name="clicked"/> + <signal name="clicked" handler="cb_send_clicked"/> <child> <object class="GtkHBox" id="hbox1"> <property name="visible">True</property> @@ -186,6 +195,9 @@ what did you do to hit the bug?</property> <property name="xalign">1</property> <property name="stock">gtk-ok</property> </object> + <packing> + <property name="position">0</property> + </packing> </child> <child> <object class="GtkLabel" id="label5"> @@ -203,6 +215,8 @@ what did you do to hit the bug?</property> </child> </object> <packing> + <property name="expand">False</property> + <property name="fill">False</property> <property name="position">1</property> </packing> </child> diff --git a/portato/gui/templates/MainWindow.menu b/portato/gui/templates/MainWindow.menu new file mode 100644 index 0000000..1cce3be --- /dev/null +++ b/portato/gui/templates/MainWindow.menu @@ -0,0 +1,207 @@ +<?xml version="1.0"?> +<interface> + <object class="GtkUIManager" id="uimanager"> + <child> + <object class="GtkActionGroup" id="pluginActionGroup"> + <child> + <object class="GtkAction" id="pluginMenuAction"> + <property name="name">pluginMenuAction</property> + <property name="label" translatable="yes">Plu_gins</property> + </object> + </child> + </object> + </child> + <child> + <object class="GtkActionGroup" id="generalActionGroup"> + <child> + <object class="GtkAction" id="fileMenuAction"> + <property name="name">fileMenuAction</property> + <property name="label" translatable="yes">_File</property> + </object> + </child> + <child> + <object class="GtkAction" id="prefAction"> + <property name="stock_id">gtk-preferences</property> + <property name="name">prefAction</property> + <property name="label" translatable="yes">_Preferences</property> + <signal handler="cb_preferences_clicked" name="activate"/> + </object> + <accelerator key="P" modifiers="GDK_CONTROL_MASK"/> + </child> + <child> + <object class="GtkAction" id="reloadAction"> + <property name="stock_id">gtk-refresh</property> + <property name="name">reloadAction</property> + <property name="label" translatable="yes">Re_load Portage</property> + <signal handler="cb_reload_clicked" name="activate"/> + </object> + <accelerator key="F5" modifiers=""/> + <accelerator key="R" modifiers="GDK_CONTROL_MASK"/> + </child> + <child> + <object class="GtkAction" id="closeAction"> + <property name="stock_id">gtk-quit</property> + <property name="name">closeAction</property> + <signal handler="cb_close" name="activate"/> + </object> + </child> + <child> + <object class="GtkAction" id="emergeMenuAction"> + <property name="name">emergeMenuAction</property> + <property name="label" translatable="yes">_Emerge</property> + </object> + </child> + <child> + <object class="GtkAction" id="emergeAction"> + <property name="stock_id">gtk-add</property> + <property name="name">emergeAction</property> + <property name="label" translatable="yes">_Install</property> + <signal handler="cb_package_emerge_clicked" name="activate"/> + </object> + <accelerator key="plus" modifiers="GDK_CONTROL_MASK"/> + </child> + <child> + <object class="GtkAction" id="unmergeAction"> + <property name="stock_id">gtk-remove</property> + <property name="name">unmergeAction</property> + <property name="label" translatable="yes">_Uninstall</property> + <signal handler="cb_package_unmerge_clicked" name="activate"/> + </object> + <accelerator key="minus" modifiers="GDK_CONTROL_MASK"/> + </child> + <child> + <object class="GtkAction" id="updateAction"> + <property name="name">updateAction</property> + <property name="label" translatable="yes">Update _World</property> + <signal handler="cb_update_clicked" name="activate"/> + </object> + </child> + <child> + <object class="GtkAction" id="showUpdatesAction"> + <property name="name">showUpdatesAction</property> + <property name="label" translatable="yes">Show Updatable P_ackages</property> + <signal handler="cb_show_updates_clicked" name="activate"/> + </object> + </child> + <child> + <object class="GtkToggleAction" id="showInstalledAction"> + <property name="name">showInstalledAction</property> + <property name="label" translatable="yes">Show _Only Installed Packages</property> + <signal handler="cb_show_installed_toggled" name="toggled"/> + </object> + <accelerator key="i" modifiers="GDK_CONTROL_MASK"/> + </child> + <child> + <object class="GtkAction" id="syncAction"> + <property name="stock_id">gtk-refresh</property> + <property name="name">syncAction</property> + <property name="label" translatable="yes">_Sync</property> + <signal handler="cb_sync_clicked" name="activate"/> + </object> + <accelerator key="Y" modifiers="GDK_CONTROL_MASK"/> + </child> + <child> + <object class="GtkAction" id="saveFlagsAction"> + <property name="stock_id">gtk-save</property> + <property name="name">saveFlagsAction</property> + <property name="label" translatable="yes">Save _Flags</property> + <signal handler="cb_save_flags_clicked" name="activate"/> + </object> + </child> + <child> + <object class="GtkToggleAction" id="pauseAction"> + <property name="name">pauseActionMenu</property> + <property name="label" translatable="yes">Emerge _Paused</property> + <signal handler="cb_pause_emerge" name="activate"/> + </object> + <accelerator key="Z" modifiers="GDK_CONTROL_MASK"/> + </child> + <child> + <object class="GtkAction" id="killAction"> + <property name="stock_id">gtk-stop</property> + <property name="name">killAction</property> + <property name="label" translatable="yes">_Kill Emerge</property> + <signal handler="cb_kill_clicked" name="activate"/> + </object> + <accelerator key="K" modifiers="GDK_CONTROL_MASK"/> + </child> + <child> + <object class="GtkAction" id="copyAction"> + <property name="stock_id">gtk-copy</property> + <property name="name">copyAction</property> + <property name="label" translatable="yes">_Copy</property> + <signal handler="cb_copy_clicked" name="activate"/> + </object> + </child> + <child> + <object class="GtkAction" id="helpMenuAction"> + <property name="name">helpMenuAction</property> + <property name="label" translatable="yes">_?</property> + </object> + </child> + <child> + <object class="GtkAction" id="aboutAction"> + <property name="stock_id">gtk-about</property> + <property name="name">aboutAction</property> + <property name="label" translatable="yes">_About</property> + <signal handler="cb_about_clicked" name="activate"/> + </object> + </child> + <child> + <object class="GtkAction" id="pluginsAction"> + <property name="stock_id">gtk-connect</property> + <property name="name">pluginsAction</property> + <property name="label" translatable="yes">_Plugins</property> + <signal handler="cb_plugins_clicked" name="activate"/> + </object> + </child> + </object> + </child> + <ui> + <menubar name="menubar"> + <menu name="fileMenu" action="fileMenuAction"> + <menuitem name="prefMenuItem" action="prefAction"/> + <menuitem name="reloadMenuItem" action="reloadAction"/> + <separator/> + <menuitem name="closeMenuItem" action="closeAction"/> + </menu> + <menu name="emergeMenu" action="emergeMenuAction"> + <menuitem name="emergeMenuItem" action="emergeAction"/> + <menuitem name="unmergeMenuItem" action="unmergeAction"/> + <menuitem name="updateMenuItem" action="updateAction"/> + <menuitem name="showUpdatesMenuItem" action="showUpdatesAction"/> + <menuitem name="showInstalledMenuItem" action="showInstalledAction"/> + <separator/> + <menuitem name="syncMenuItem" action="syncAction"/> + <menuitem name="saveFlagsMenuItem" action="saveFlagsAction"/> + <separator/> + <menuitem name="pauseMenuItem" action="pauseAction"/> + <menuitem name="killMenuItem" action="killAction"/> + </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> +</interface> diff --git a/portato/gui/templates/MainWindow.ui b/portato/gui/templates/MainWindow.ui index e84bfd5..8e8c3b4 100644 --- a/portato/gui/templates/MainWindow.ui +++ b/portato/gui/templates/MainWindow.ui @@ -1,225 +1,28 @@ <?xml version="1.0"?> -<!--Generated with glade3 3.4.5 on Fri Dec 5 12:57:49 2008 --> <interface> - <object class="GtkUIManager" id="uimanager"> - <child> - <object class="GtkActionGroup" id="pluginActionGroup"> - <child> - <object class="GtkAction" id="pluginMenuAction"> - <property name="name">pluginMenuAction</property> - <property name="label" translatable="yes">Plu_gins</property> - </object> - </child> - </object> - </child> - <child> - <object class="GtkActionGroup" id="generalActionGroup"> - <child> - <object class="GtkAction" id="fileMenuAction"> - <property name="name">fileMenuAction</property> - <property name="label" translatable="yes">_File</property> - </object> - </child> - <child> - <object class="GtkAction" id="prefAction"> - <property name="stock_id">gtk-preferences</property> - <property name="name">prefAction</property> - <property name="label" translatable="yes">_Preferences</property> - <signal handler="cb_preferences_clicked" name="activate"/> - </object> - <accelerator key="P" modifiers="GDK_CONTROL_MASK"/> - </child> - <child> - <object class="GtkAction" id="reloadAction"> - <property name="stock_id">gtk-refresh</property> - <property name="name">reloadAction</property> - <property name="label" translatable="yes">Re_load Portage</property> - <signal handler="cb_reload_clicked" name="activate"/> - </object> - <accelerator key="F5" modifiers=""/> - <accelerator key="R" modifiers="GDK_CONTROL_MASK"/> - </child> - <child> - <object class="GtkAction" id="closeAction"> - <property name="stock_id">gtk-quit</property> - <property name="name">closeAction</property> - <signal handler="cb_close" name="activate"/> - </object> - </child> - <child> - <object class="GtkAction" id="emergeMenuAction"> - <property name="name">emergeMenuAction</property> - <property name="label" translatable="yes">_Emerge</property> - </object> - </child> - <child> - <object class="GtkAction" id="emergeAction"> - <property name="stock_id">gtk-add</property> - <property name="name">emergeAction</property> - <property name="label" translatable="yes">_Install</property> - <signal handler="cb_package_emerge_clicked" name="activate"/> - </object> - <accelerator key="plus" modifiers="GDK_CONTROL_MASK"/> - </child> - <child> - <object class="GtkAction" id="unmergeAction"> - <property name="stock_id">gtk-remove</property> - <property name="name">unmergeAction</property> - <property name="label" translatable="yes">_Uninstall</property> - <signal handler="cb_package_unmerge_clicked" name="activate"/> - </object> - <accelerator key="minus" modifiers="GDK_CONTROL_MASK"/> - </child> - <child> - <object class="GtkAction" id="updateAction"> - <property name="name">updateAction</property> - <property name="label" translatable="yes">Update _World</property> - <signal handler="cb_update_clicked" name="activate"/> - </object> - </child> - <child> - <object class="GtkAction" id="showUpdatesAction"> - <property name="name">showUpdatesAction</property> - <property name="label" translatable="yes">Show Updatable P_ackages</property> - <signal handler="cb_show_updates_clicked" name="activate"/> - </object> - </child> - <child> - <object class="GtkToggleAction" id="showInstalledAction"> - <property name="name">showInstalledAction</property> - <property name="label" translatable="yes">Show _Only Installed Packages</property> - <signal handler="cb_show_installed_toggled" name="toggled"/> - </object> - <accelerator key="i" modifiers="GDK_CONTROL_MASK"/> - </child> - <child> - <object class="GtkAction" id="syncAction"> - <property name="stock_id">gtk-refresh</property> - <property name="name">syncAction</property> - <property name="label" translatable="yes">_Sync</property> - <signal handler="cb_sync_clicked" name="activate"/> - </object> - <accelerator key="Y" modifiers="GDK_CONTROL_MASK"/> - </child> - <child> - <object class="GtkAction" id="saveFlagsAction"> - <property name="stock_id">gtk-save</property> - <property name="name">saveFlagsAction</property> - <property name="label" translatable="yes">Save _Flags</property> - <signal handler="cb_save_flags_clicked" name="activate"/> - </object> - </child> - <child> - <object class="GtkToggleAction" id="pauseAction"> - <property name="name">pauseActionMenu</property> - <property name="label" translatable="yes">Emerge _Paused</property> - <signal handler="cb_pause_emerge" name="activate"/> - </object> - <accelerator key="Z" modifiers="GDK_CONTROL_MASK"/> - </child> - <child> - <object class="GtkAction" id="killAction"> - <property name="stock_id">gtk-stop</property> - <property name="name">killAction</property> - <property name="label" translatable="yes">_Kill Emerge</property> - <signal handler="cb_kill_clicked" name="activate"/> - </object> - <accelerator key="K" modifiers="GDK_CONTROL_MASK"/> - </child> - <child> - <object class="GtkAction" id="copyAction"> - <property name="stock_id">gtk-copy</property> - <property name="name">copyAction</property> - <property name="label" translatable="yes">_Copy</property> - <signal handler="cb_copy_clicked" name="activate"/> - </object> - </child> - <child> - <object class="GtkAction" id="helpMenuAction"> - <property name="name">helpMenuAction</property> - <property name="label" translatable="yes">_?</property> - </object> - </child> - <child> - <object class="GtkAction" id="aboutAction"> - <property name="stock_id">gtk-about</property> - <property name="name">aboutAction</property> - <property name="label" translatable="yes">_About</property> - <signal handler="cb_about_clicked" name="activate"/> - </object> - </child> - <child> - <object class="GtkAction" id="pluginsAction"> - <property name="stock_id">gtk-connect</property> - <property name="name">pluginsAction</property> - <property name="label" translatable="yes">_Plugins</property> - <signal handler="cb_plugins_clicked" name="activate"/> - </object> - </child> - </object> - </child> - <ui> - <menubar name="menubar"> - <menu name="fileMenu" action="fileMenuAction"> - <menuitem name="prefMenuItem" action="prefAction"/> - <menuitem name="reloadMenuItem" action="reloadAction"/> - <separator/> - <menuitem name="closeMenuItem" action="closeAction"/> - </menu> - <menu name="emergeMenu" action="emergeMenuAction"> - <menuitem name="emergeMenuItem" action="emergeAction"/> - <menuitem name="unmergeMenuItem" action="unmergeAction"/> - <menuitem name="updateMenuItem" action="updateAction"/> - <menuitem name="showUpdatesMenuItem" action="showUpdatesAction"/> - <menuitem name="showInstalledMenuItem" action="showInstalledAction"/> - <separator/> - <menuitem name="syncMenuItem" action="syncAction"/> - <menuitem name="saveFlagsMenuItem" action="saveFlagsAction"/> - <separator/> - <menuitem name="pauseMenuItem" action="pauseAction"/> - <menuitem name="killMenuItem" action="killAction"/> - </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> + <requires lib="gtk+" version="2.14"/> + <!-- interface-naming-policy toplevel-contextual --> <object class="GtkWindow" id="MainWindow"> <property name="border_width">2</property> - <property name="window_position">GTK_WIN_POS_CENTER</property> - <signal handler="cb_destroy" name="destroy"/> - <signal handler="cb_delete" name="delete_event"/> - <signal handler="cb_minimized" name="window_state_event"/> + <property name="window_position">center</property> + <signal name="destroy" handler="cb_destroy"/> + <signal name="delete_event" handler="cb_delete"/> + <signal name="window_state_event" handler="cb_minimized"/> <child> <object class="GtkVBox" id="mainVB"> <property name="visible">True</property> + <property name="orientation">vertical</property> <child> - <object class="GtkMenuBar" constructor="uimanager" id="menubar"> + <object class="GtkVBox" id="menubar_box"> <property name="visible">True</property> + <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> </object> <packing> <property name="expand">False</property> + <property name="position">0</property> </packing> </child> <child> @@ -229,23 +32,24 @@ <child> <object class="GtkEntry" id="searchEntry"> <property name="visible">True</property> - <signal handler="cb_search_changed" name="changed"/> - <signal handler="cb_search_changed" name="delete_text"/> - <signal handler="cb_search_clicked" name="activate" object="searchEntry"/> + <signal name="changed" handler="cb_search_changed"/> + <signal name="delete_text" handler="cb_search_changed"/> + <signal name="activate" handler="cb_search_clicked" object="searchEntry"/> </object> <packing> <property name="padding">5</property> + <property name="position">0</property> </packing> </child> <child> <object class="GtkButton" id="deleteSearchButton"> + <property name="label">gtk-delete</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">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="label">gtk-delete</property> <property name="use_stock">True</property> - <signal handler="cb_delete_search_clicked" name="clicked"/> + <signal name="clicked" handler="cb_delete_search_clicked"/> </object> <packing> <property name="expand">False</property> @@ -255,10 +59,12 @@ </child> <child> <object class="GtkButton" id="searchButton"> - <property name="visible">True</property> <property name="label">gtk-find</property> + <property name="visible">True</property> + |