[meld] vcview.ui: Resave with new Glade
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] vcview.ui: Resave with new Glade
- Date: Fri, 7 Feb 2014 21:56:04 +0000 (UTC)
commit e3de4319a18e41f0f42a40c64de38ce40f704d73
Author: Kai Willadsen <kai willadsen gmail com>
Date: Sat Feb 8 06:27:25 2014 +1000
vcview.ui: Resave with new Glade
data/ui/vcview.ui | 492 +++++++++++++++++++++++----------------------------
meld/ui/catalog.xml | 2 +
2 files changed, 221 insertions(+), 273 deletions(-)
---
diff --git a/data/ui/vcview.ui b/data/ui/vcview.ui
index c9149f3..b443ed4 100644
--- a/data/ui/vcview.ui
+++ b/data/ui/vcview.ui
@@ -1,7 +1,7 @@
-<?xml version="1.0"?>
-<!--*- mode: xml -*-->
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <!-- interface-naming-policy toplevel-contextual -->
+ <!-- interface-requires gtk+ 3.0 -->
+ <!-- interface-requires meld.ui.gladesupport 0.0 -->
<object class="GtkActionGroup" id="VcviewActions">
<child>
<object class="GtkAction" id="VcCompare">
@@ -76,14 +76,12 @@
<signal name="activate" handler="on_button_delete_clicked" swapped="no"/>
</object>
</child>
-
<child>
<object class="GtkToggleAction" id="VcFlatten">
<property name="label" translatable="yes">_Flatten</property>
<property name="tooltip" translatable="yes">Flatten directories</property>
<property name="stock_id">gtk-goto-bottom</property>
<property name="is_important">True</property>
- <property name="active">False</property>
<signal name="toggled" handler="on_button_flatten_toggled" swapped="no"/>
</object>
</child>
@@ -93,7 +91,6 @@
<property name="tooltip" translatable="yes">Show modified files</property>
<property name="icon_name">filter-modified-24</property>
<property name="is_important">True</property>
- <property name="active">False</property>
<signal name="toggled" handler="on_filter_state_toggled" swapped="no"/>
</object>
</child>
@@ -103,7 +100,6 @@
<property name="tooltip" translatable="yes">Show normal files</property>
<property name="icon_name">filter-normal-24</property>
<property name="is_important">True</property>
- <property name="active">False</property>
<signal name="toggled" handler="on_filter_state_toggled" swapped="no"/>
</object>
</child>
@@ -113,7 +109,6 @@
<property name="tooltip" translatable="yes">Show unversioned files</property>
<property name="icon_name">filter-nonvc-24</property>
<property name="is_important">True</property>
- <property name="active">False</property>
<signal name="toggled" handler="on_filter_state_toggled" swapped="no"/>
</object>
</child>
@@ -123,270 +118,24 @@
<property name="tooltip" translatable="yes">Show ignored files</property>
<property name="icon_name">filter-ignored-24</property>
<property name="is_important">True</property>
- <property name="active">False</property>
<signal name="toggled" handler="on_filter_state_toggled" swapped="no"/>
</object>
</child>
</object>
- <object class="GtkWindow" id="container">
- <property name="visible">True</property>
- <property name="title" translatable="yes">window1</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</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="vcview">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
- <child>
- <object class="GtkHBox" id="hbox2">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkFileChooserButton" id="fileentry">
- <property name="visible">True</property>
- <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
- <signal handler="on_fileentry_file_set" name="file-set"/>
- </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="GtkComboBox" id="combobox_vcs">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="model">liststore_vcs</property>
- <signal name="changed" handler="on_vc_change" swapped="no"/>
- </object>
- <packing>
- <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">False</property>
- <property name="fill">False</property>
- <property name="pack_type">GTK_PACK_START</property>
- </packing>
- </child>
- <child>
- <object class="MsgAreaController" id="msgarea_mgr">
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkVPaned" id="vpaned">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="position">250</property>
- <child>
- <object class="GtkScrolledWindow" id="scrolledwindow">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
- <child>
- <object class="GtkTreeView" id="treeview">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="headers_visible">True</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_row_activated" last_modification_time="Sat, 03 Aug 2002 23:32:49
GMT" name="row_activated"/>
- <signal handler="on_button_press_event" last_modification_time="Sat, 30 Aug 2003
12:42:19 GMT" name="button_press_event"/>
- <signal handler="on_treeview_cursor_changed" name="cursor-changed" swapped="no"/>
- <signal handler="on_treeview_popup_menu" name="popup-menu"/>
- </object>
- </child>
- </object>
- <packing>
- <property name="shrink">False</property>
- <property name="resize">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="console_hbox">
- <property name="height_request">70</property>
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
- <child>
- <object class="GtkEventBox" id="console_hide_box">
- <property name="visible">True</property>
- <property name="visible_window">True</property>
- <property name="above_child">False</property>
- <signal handler="on_console_view_toggle" last_modification_time="Sat, 27 Sep 2003
16:10:20 GMT" name="button_press_event"/>
- <child>
- <object class="GtkArrow" id="console_arrow_down">
- <property name="width_request">14</property>
- <property name="height_request">14</property>
- <property name="visible">True</property>
- <property name="arrow_type">GTK_ARROW_DOWN</property>
- <property name="shadow_type">GTK_SHADOW_OUT</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkScrolledWindow" id="console_scrolledwindow">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
- <child>
- <object class="GtkTextView" id="consoleview">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">False</property>
- <property name="overwrite">False</property>
- <property name="accepts_tab">True</property>
- <property name="justification">GTK_JUSTIFY_LEFT</property>
- <property name="wrap_mode">GTK_WRAP_NONE</property>
- <property name="cursor_visible">False</property>
- <property name="pixels_above_lines">0</property>
- <property name="pixels_below_lines">0</property>
- <property name="pixels_inside_wrap">0</property>
- <property name="left_margin">0</property>
- <property name="right_margin">0</property>
- <property name="indent">0</property>
- <signal handler="on_consoleview_populate_popup" last_modification_time="Sat, 27 Sep
2003 17:09:16 GMT" name="populate_popup"/>
- </object>
- </child>
- </object>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="shrink">True</property>
- <property name="resize">True</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
- <child>
- <object class="GtkEventBox" id="console_show_box">
- <property name="visible_window">True</property>
- <property name="above_child">False</property>
- <signal handler="on_console_view_toggle" last_modification_time="Sat, 27 Sep 2003 16:10:28 GMT"
name="button_press_event"/>
- <child>
- <object class="GtkHBox" id="hbox3">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
- <child>
- <object class="GtkArrow" id="console_arrow_right">
- <property name="width_request">14</property>
- <property name="height_request">14</property>
- <property name="visible">True</property>
- <property name="arrow_type">GTK_ARROW_RIGHT</property>
- <property name="shadow_type">GTK_SHADOW_OUT</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </object>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkHSeparator" id="hseparator1">
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- <object class="GtkListStore" id="liststore_vcs">
- <columns>
- <!-- column-name gchararray1 -->
- <column type="gchararray"/>
- <!-- column-name gpointer1 -->
- <column type="PyObject"/>
- <!-- column-name gboolean1 -->
- <column type="gboolean"/>
- </columns>
- </object>
<object class="GtkDialog" id="commitdialog">
- <property name="default_width">450</property>
<property name="visible">True</property>
- <property name="border_width">12</property>
<property name="can_focus">False</property>
+ <property name="border_width">12</property>
<property name="title" translatable="yes">Commit</property>
<property name="modal">True</property>
<property name="window_position">center</property>
+ <property name="default_width">450</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox1">
+ <object class="GtkBox" id="dialog-vbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">18</property>
<child>
<object class="GtkVBox" id="vbox0">
@@ -434,8 +183,6 @@
<object class="GtkScrolledWindow" id="scrolledwindow_changed">
<property name="height_request">150</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkViewport" id="viewport_changed">
@@ -496,7 +243,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox2">
+ <object class="GtkHBox" id="hbox4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -521,8 +268,6 @@
<property name="height_request">200</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
<object class="MeldSourceView" id="textview">
@@ -558,8 +303,9 @@
<child>
<object class="HistoryCombo" id="previousentry">
<property name="visible">True</property>
- <property name="history-id">commit-messages</property>
- <signal handler="on_previousentry_activate" name="changed"/>
+ <property name="can_focus">False</property>
+ <property name="history_id">commit-messages</property>
+ <signal name="changed" handler="on_previousentry_activate" swapped="no"/>
</object>
<packing>
<property name="expand">True</property>
@@ -603,7 +349,7 @@
</packing>
</child>
<child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area1">
+ <object class="GtkButtonBox" id="dialog-action_area1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
@@ -614,7 +360,6 @@
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -630,10 +375,9 @@
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
- <accelerator key="KP_Enter" signal="activate" modifiers="GDK_CONTROL_MASK"/>
<accelerator key="Return" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+ <accelerator key="KP_Enter" signal="activate" modifiers="GDK_CONTROL_MASK"/>
</object>
<packing>
<property name="expand">False</property>
@@ -656,6 +400,209 @@
<action-widget response="-5">okbutton1</action-widget>
</action-widgets>
</object>
+ <object class="GtkWindow" id="container">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="title" translatable="yes">window1</property>
+ <child>
+ <object class="GtkVBox" id="vcview">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkHBox" id="hbox2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkFileChooserButton" id="fileentry">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action">select-folder</property>
+ <signal name="file-set" handler="on_fileentry_file_set" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="combobox_vcs">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="model">liststore_vcs</property>
+ <signal name="changed" handler="on_vc_change" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEventBox" id="console_show_box">
+ <property name="can_focus">False</property>
+ <signal name="button-press-event" handler="on_console_view_toggle" swapped="no"/>
+ <child>
+ <object class="GtkHBox" id="hbox3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkArrow" id="console_arrow_right">
+ <property name="width_request">14</property>
+ <property name="height_request">14</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHSeparator" id="hseparator1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="MsgAreaController" id="msgarea_mgr">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVPaned" id="vpaned">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="position">250</property>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTreeView" id="treeview">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <signal name="button-press-event" handler="on_button_press_event" swapped="no"/>
+ <signal name="cursor-changed" handler="on_treeview_cursor_changed" swapped="no"/>
+ <signal name="row-activated" handler="on_row_activated" swapped="no"/>
+ <signal name="popup-menu" handler="on_treeview_popup_menu" swapped="no"/>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection1"/>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="resize">True</property>
+ <property name="shrink">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="console_hbox">
+ <property name="height_request">70</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkEventBox" id="console_hide_box">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <signal name="button-press-event" handler="on_console_view_toggle" swapped="no"/>
+ <child>
+ <object class="GtkArrow" id="console_arrow_down">
+ <property name="width_request">14</property>
+ <property name="height_request">14</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="yalign">0</property>
+ <property name="arrow_type">down</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="console_scrolledwindow">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTextView" id="consoleview">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">False</property>
+ <property name="cursor_visible">False</property>
+ <signal name="populate-popup" handler="on_consoleview_populate_popup" swapped="no"/>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="resize">True</property>
+ <property name="shrink">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <object class="GtkListStore" id="liststore_vcs">
+ <columns>
+ <!-- column-name gchararray1 -->
+ <column type="gchararray"/>
+ <!-- column-name gpointer1 -->
+ <column type="PyObject"/>
+ <!-- column-name gboolean1 -->
+ <column type="gboolean"/>
+ </columns>
+ </object>
<object class="GtkMessageDialog" id="pushdialog">
<property name="can_focus">False</property>
<property name="border_width">5</property>
@@ -665,12 +612,13 @@
<property name="text" translatable="yes">Push local commits to remote?</property>
<property name="secondary_text" translatable="yes">The commits to be pushed are determined by your
version control system.</property>
<child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox1">
+ <object class="GtkBox" id="dialog-vbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">2</property>
<child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area1">
+ <object class="GtkButtonBox" id="dialog-action_area2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
@@ -680,7 +628,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -695,7 +642,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
</object>
<packing>
diff --git a/meld/ui/catalog.xml b/meld/ui/catalog.xml
index 896fbbc..ddfdf83 100644
--- a/meld/ui/catalog.xml
+++ b/meld/ui/catalog.xml
@@ -7,6 +7,7 @@
<glade-widget-class title="LinkMap" name="LinkMap" generic-name="linkmap"/>
<glade-widget-class title="MeldSourceView" name="MeldSourceView" generic-name="meldsourceview"/>
<glade-widget-class title="MsgAreaController" name="MsgAreaController"
generic-name="msgareacontroller"/>
+ <glade-widget-class title="HistoryCombo" name="HistoryCombo" generic-name="historycombo"/>
</glade-widget-classes>
<glade-widget-group name="meld" title="Meld">
@@ -14,5 +15,6 @@
<glade-widget-class-ref name="LinkMap"/>
<glade-widget-class-ref name="MeldSourceView"/>
<glade-widget-class-ref name="MsgAreaController"/>
+ <glade-widget-class-ref name="HistoryCombo"/>
</glade-widget-group>
</glade-catalog>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
