[alacarte] alacarte.ui: Clean up
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [alacarte] alacarte.ui: Clean up
- Date: Fri, 11 Jan 2013 05:41:36 +0000 (UTC)
commit 0e524427139d1118fd15984673148dd60f7f847b
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Thu Jan 10 19:52:42 2013 -0500
alacarte.ui: Clean up
Port to GTK+3-style GtkBuilder, and let glade do its number crunching
data/alacarte.ui | 296 ++++++++++++++++++++++++------------------------------
1 files changed, 131 insertions(+), 165 deletions(-)
---
diff --git a/data/alacarte.ui b/data/alacarte.ui
index 03c66e3..304f61e 100644
--- a/data/alacarte.ui
+++ b/data/alacarte.ui
@@ -1,134 +1,97 @@
-<?xml version="1.0"?>
-<!--*- mode: xml -*-->
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <object class="GtkUIManager" id="uimanager1">
- <child>
- <object class="GtkActionGroup" id="actiongroup1">
- <child>
- <object class="GtkAction" id="edit_properties">
- <property name="stock_id">gtk-properties</property>
- <property name="name">edit_properties</property>
- <signal handler="on_edit_properties_activate" name="activate"/>
- </object>
- </child>
- <child>
- <object class="GtkAction" id="edit_delete">
- <property name="stock_id">gtk-delete</property>
- <property name="name">edit_delete</property>
- <signal handler="on_edit_delete_activate" name="activate"/>
- </object>
- </child>
- </object>
- </child>
- <ui>
- <popup name="edit_menu">
- <menuitem action="edit_properties"/>
- <menuitem action="edit_delete"/>
- </popup>
- </ui>
- </object>
- <object class="GtkMenu" constructor="uimanager1" id="edit_menu">
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkImage" id="move_down_image">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-go-down</property>
</object>
<object class="GtkWindow" id="mainwindow">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">5</property>
+ <property name="title" translatable="yes">Main Menu</property>
+ <property name="window_position">center</property>
<property name="default_width">675</property>
<property name="default_height">530</property>
- <property name="visible">True</property>
- <property name="title" translatable="yes">Main Menu</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_CENTER</property>
- <property name="modal">False</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="focus_on_map">True</property>
- <property name="urgency_hint">False</property>
<child>
<object class="GtkVBox" id="dialog-vbox5">
<property name="visible">True</property>
- <property name="homogeneous">False</property>
+ <property name="can_focus">False</property>
<property name="spacing">2</property>
<child>
<object class="GtkBox" id="dialog-action_area5">
- <property name="orientation">horizontal</property>
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkButton" id="help_button">
+ <property name="label">gtk-help</property>
<property name="visible">True</property>
- <property name="can_default">True</property>
<property name="can_focus">True</property>
- <property name="label">gtk-help</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <signal handler="on_help_button_clicked" name="clicked"/>
+ <signal name="clicked" handler="on_help_button_clicked" swapped="no"/>
</object>
<packing>
- <property name="pack_type">start</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkButton" id="restore_button">
+ <object class="GtkButton" id="close_button">
+ <property name="label">gtk-close</property>
<property name="visible">True</property>
- <property name="tooltip-text" translatable="yes">Restore the default menu layout</property>
- <property name="can_default">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Restore System Configuration</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <signal handler="on_restore_button_clicked" name="clicked"/>
+ <signal name="clicked" handler="on_close_button_clicked" swapped="no"/>
</object>
<packing>
- <property name="position">1</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
<property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkButton" id="close_button">
+ <object class="GtkButton" id="restore_button">
+ <property name="label">Restore System Configuration</property>
<property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
<property name="can_focus">True</property>
- <property name="label">gtk-close</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">Restore the default menu layout</property>
<property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <signal handler="on_close_button_clicked" name="clicked"/>
+ <signal name="clicked" handler="on_restore_button_clicked" swapped="no"/>
</object>
<packing>
- <property name="position">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
<property name="pack_type">end</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
- <property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkAlignment" id="alignment9">
- <property name="border_width">5</property>
<property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">1</property>
- <property name="yscale">1</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">0</property>
- <property name="right_padding">0</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
<child>
<object class="GtkHBox" id="hbox2">
- <property name="homogeneous">False</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkHPaned" id="hpaned1">
@@ -138,206 +101,210 @@
<child>
<object class="GtkVBox" id="vbox4">
<property name="visible">True</property>
- <property name="homogeneous">False</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow3">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+ <property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="menu_tree">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_focus">True</property>
<property name="headers_visible">False</property>
- <property name="rules_hint">False</property>
- <property name="reorderable">False</property>
- <property name="enable_search">True</property>
- <property name="fixed_height_mode">False</property>
- <property name="hover_selection">False</property>
- <property name="hover_expand">False</property>
- <signal handler="on_menu_tree_cursor_changed" name="cursor-changed"/>
+ <signal name="cursor-changed" handler="on_menu_tree_cursor_changed" swapped="no"/>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection1"/>
+ </child>
</object>
</child>
</object>
<packing>
- <property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
<packing>
- <property name="shrink">True</property>
<property name="resize">False</property>
+ <property name="shrink">True</property>
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox5">
<property name="visible">True</property>
- <property name="homogeneous">False</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkHBox" id="hbox16">
<property name="visible">True</property>
- <property name="homogeneous">False</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow2">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+ <property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="item_tree">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="headers_visible">True</property>
<property name="rules_hint">True</property>
- <property name="reorderable">False</property>
- <property name="enable_search">True</property>
- <property name="fixed_height_mode">False</property>
- <property name="hover_selection">False</property>
- <property name="hover_expand">False</property>
- <signal handler="on_item_tree_row_activated" name="row-activated"/>
- <signal handler="on_item_tree_popup_menu" name="popup-menu"/>
- <signal handler="on_item_tree_cursor_changed" name="cursor-changed"/>
- <signal handler="on_item_tree_popup_menu" name="button_press_event"/>
- <signal handler="on_item_tree_cursor_changed" name="cursor_changed"/>
- <signal handler="on_item_tree_key_press_event" name="key_press_event"/>
+ <signal name="cursor-changed" handler="on_item_tree_cursor_changed" swapped="no"/>
+ <signal name="cursor-changed" handler="on_item_tree_cursor_changed" swapped="no"/>
+ <signal name="button-press-event" handler="on_item_tree_popup_menu" swapped="no"/>
+ <signal name="row-activated" handler="on_item_tree_row_activated" swapped="no"/>
+ <signal name="key-press-event" handler="on_item_tree_key_press_event" swapped="no"/>
+ <signal name="popup-menu" handler="on_item_tree_popup_menu" swapped="no"/>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection2"/>
+ </child>
</object>
</child>
</object>
<packing>
- <property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox6">
<property name="visible">True</property>
- <property name="homogeneous">False</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkVButtonBox" id="vbuttonbox1">
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_START</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
+ <property name="layout_style">start</property>
<child>
<object class="GtkButton" id="new_menu_button">
<property name="label" translatable="yes">_New Menu</property>
- <property name="use_underline">True</property>
<property name="visible">True</property>
- <property name="can_default">True</property>
<property name="can_focus">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
<property name="image">new_menu_image</property>
- <signal handler="on_new_menu_button_clicked" name="clicked"/>
+ <property name="use_underline">True</property>
+ <signal name="clicked" handler="on_new_menu_button_clicked" swapped="no"/>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkButton" id="new_item_button">
<property name="label" translatable="yes">Ne_w Item</property>
- <property name="use_underline">True</property>
<property name="visible">True</property>
- <property name="can_default">True</property>
<property name="can_focus">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
<property name="image">new_item_image</property>
- <signal handler="on_new_item_button_clicked" name="clicked"/>
+ <property name="use_underline">True</property>
+ <signal name="clicked" handler="on_new_item_button_clicked" swapped="no"/>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
<child>
<object class="GtkButton" id="new_separator_button">
+ <property name="label" translatable="yes">New _Separator</property>
<property name="visible">True</property>
- <property name="can_default">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">New _Separator</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <signal handler="on_new_separator_button_clicked" name="clicked"/>
+ <signal name="clicked" handler="on_new_separator_button_clicked" swapped="no"/>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
</child>
</object>
<packing>
- <property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkAlignment" id="alignment12">
<property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">1</property>
- <property name="yscale">1</property>
+ <property name="can_focus">False</property>
<property name="top_padding">12</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">0</property>
- <property name="right_padding">0</property>
<child>
<object class="GtkVButtonBox" id="vbuttonbox2">
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_START</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
+ <property name="layout_style">start</property>
<child>
<object class="GtkButton" id="move_up_button">
<property name="label" translatable="yes">Move Up</property>
<property name="visible">True</property>
- <property name="can_default">True</property>
<property name="can_focus">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
<property name="image">move_up_image</property>
- <signal handler="on_move_up_button_clicked" name="clicked"/>
+ <signal name="clicked" handler="on_move_up_button_clicked" swapped="no"/>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkButton" id="move_down_button">
<property name="label" translatable="yes">Move Down</property>
<property name="visible">True</property>
- <property name="can_default">True</property>
<property name="can_focus">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
<property name="image">move_down_image</property>
- <signal handler="on_move_down_button_clicked" name="clicked"/>
+ <signal name="clicked" handler="on_move_down_button_clicked" swapped="no"/>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
<child>
<object class="GtkButton" id="delete_button">
- <property name="label" translatable="no">gtk-delete</property>
+ <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="use_stock">True</property>
- <signal handler="on_delete_button_clicked" name="clicked"/>
+ <signal name="clicked" handler="on_delete_button_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">2</property>
</packing>
- </child>
+ </child>
<child>
<object class="GtkButton" id="properties_button">
- <property name="label" translatable="no">gtk-properties</property>
+ <property name="label">gtk-properties</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
- <signal handler="on_properties_button_clicked" name="clicked"/>
+ <signal name="clicked" handler="on_properties_button_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -349,64 +316,63 @@
</child>
</object>
<packing>
- <property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
- <property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
- <property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
<packing>
- <property name="shrink">True</property>
<property name="resize">True</property>
+ <property name="shrink">True</property>
</packing>
</child>
</object>
<packing>
- <property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
</child>
</object>
<packing>
- <property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
- <object class="GtkImage" id="new_menu_image">
+ <object class="GtkImage" id="move_up_image">
<property name="visible">True</property>
- <property name="stock">gtk-new</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-go-up</property>
</object>
<object class="GtkImage" id="new_item_image">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="stock">gtk-add</property>
</object>
- <object class="GtkImage" id="move_down_image">
- <property name="visible">True</property>
- <property name="stock">gtk-go-down</property>
- </object>
- <object class="GtkImage" id="move_up_image">
+ <object class="GtkImage" id="new_menu_image">
<property name="visible">True</property>
- <property name="stock">gtk-go-up</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-new</property>
</object>
</interface>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
