[meld] Resave DirDiff UI with recent Glade
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] Resave DirDiff UI with recent Glade
- Date: Sat, 5 Feb 2011 22:55:19 +0000 (UTC)
commit 19fad4c5e133278a5bebea284667639edddffa45
Author: Kai Willadsen <kai willadsen gmail com>
Date: Fri Feb 4 18:42:23 2011 +1000
Resave DirDiff UI with recent Glade
data/ui/dirdiff.ui | 255 ++++++++++++++++------------------------------------
1 files changed, 79 insertions(+), 176 deletions(-)
---
diff --git a/data/ui/dirdiff.ui b/data/ui/dirdiff.ui
index 0bb562c..0d29f3e 100644
--- a/data/ui/dirdiff.ui
+++ b/data/ui/dirdiff.ui
@@ -1,60 +1,40 @@
-<?xml version="1.0"?>
-<!--*- mode: xml -*-->
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
+ <!-- interface-requires gtk+ 2.12 -->
+ <!-- interface-requires meld.ui.gladesupport 0.0 -->
+ <!-- interface-naming-policy toplevel-contextual -->
<object class="GtkWindow" id="container">
<property name="visible">True</property>
+ <property name="can_focus">False</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="dirdiff">
<property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkTable" id="table">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_rows">2</property>
<property name="n_columns">7</property>
- <property name="homogeneous">False</property>
- <property name="row_spacing">0</property>
- <property name="column_spacing">0</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow0">
<property name="visible">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
- <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
- <property name="window_placement">GTK_CORNER_TOP_RIGHT</property>
+ <property name="can_focus">False</property>
+ <property name="window_placement">top-right</property>
<property name="window_placement_set">True</property>
<child>
<object class="GtkTreeView" id="treeview0">
<property name="visible">True</property>
<property name="can_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_treeview_row_expanded" last_modification_time="Sun, 03 Nov 2002 16:03:11 GMT" name="row_expanded"/>
- <signal handler="on_treeview_row_collapsed" last_modification_time="Sun, 03 Nov 2002 16:08:46 GMT" name="row_collapsed"/>
- <signal handler="on_treeview_row_activated" last_modification_time="Sun, 03 Nov 2002 17:24:01 GMT" name="row_activated"/>
- <signal handler="on_treeview_button_press_event" last_modification_time="Wed, 19 Mar 2003 10:22:44 GMT" name="button_press_event"/>
- <signal handler="on_treeview_cursor_changed" last_modification_time="Sun, 14 Dec 2003 21:04:29 GMT" name="cursor_changed"/>
- <signal handler="on_treeview_key_press_event" last_modification_time="Sun, 14 Dec 2003 22:09:35 GMT" name="key_press_event"/>
- <signal handler="on_treeview_popup_menu" name="popup-menu"/>
+ <signal name="button-press-event" handler="on_treeview_button_press_event" swapped="no"/>
+ <signal name="row-expanded" handler="on_treeview_row_expanded" swapped="no"/>
+ <signal name="key-press-event" handler="on_treeview_key_press_event" swapped="no"/>
+ <signal name="cursor-changed" handler="on_treeview_cursor_changed" swapped="no"/>
+ <signal name="row-collapsed" handler="on_treeview_row_collapsed" swapped="no"/>
+ <signal name="row-activated" handler="on_treeview_row_activated" swapped="no"/>
+ <signal name="popup-menu" handler="on_treeview_popup_menu" swapped="no"/>
</object>
</child>
</object>
@@ -63,34 +43,25 @@
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="y_options">fill</property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
- <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkTreeView" id="treeview1">
<property name="visible">True</property>
<property name="can_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_treeview_row_expanded" last_modification_time="Sun, 03 Nov 2002 16:03:29 GMT" name="row_expanded"/>
- <signal handler="on_treeview_row_collapsed" last_modification_time="Sun, 03 Nov 2002 16:08:36 GMT" name="row_collapsed"/>
- <signal handler="on_treeview_row_activated" last_modification_time="Sun, 03 Nov 2002 17:24:07 GMT" name="row_activated"/>
- <signal handler="on_treeview_button_press_event" last_modification_time="Wed, 19 Mar 2003 10:22:58 GMT" name="button_press_event"/>
- <signal handler="on_treeview_key_press_event" last_modification_time="Sun, 14 Dec 2003 22:15:38 GMT" name="key_press_event"/>
- <signal handler="on_treeview_cursor_changed" last_modification_time="Sun, 14 Dec 2003 22:22:39 GMT" name="cursor_changed"/>
- <signal handler="on_treeview_popup_menu" name="popup-menu"/>
+ <signal name="button-press-event" handler="on_treeview_button_press_event" swapped="no"/>
+ <signal name="row-expanded" handler="on_treeview_row_expanded" swapped="no"/>
+ <signal name="key-press-event" handler="on_treeview_key_press_event" swapped="no"/>
+ <signal name="cursor-changed" handler="on_treeview_cursor_changed" swapped="no"/>
+ <signal name="row-collapsed" handler="on_treeview_row_collapsed" swapped="no"/>
+ <signal name="row-activated" handler="on_treeview_row_activated" swapped="no"/>
+ <signal name="popup-menu" handler="on_treeview_popup_menu" swapped="no"/>
</object>
</child>
</object>
@@ -99,102 +70,87 @@
<property name="right_attach">4</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="y_options">fill</property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<object class="HistoryFileEntry" id="fileentry0">
<property name="visible">True</property>
- <property name="history-id">direntry</property>
- <property name="directory-entry">True</property>
- <signal handler="on_fileentry_activate" name="activate"/>
+ <property name="can_focus">False</property>
+ <property name="history_id">direntry</property>
+ <property name="directory_entry">True</property>
+ <signal name="activate" handler="on_fileentry_activate" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
<object class="HistoryFileEntry" id="fileentry1">
<property name="visible">True</property>
- <property name="history-id">direntry</property>
- <property name="directory-entry">True</property>
- <signal handler="on_fileentry_activate" name="activate"/>
+ <property name="can_focus">False</property>
+ <property name="history_id">direntry</property>
+ <property name="directory_entry">True</property>
+ <signal name="activate" handler="on_fileentry_activate" swapped="no"/>
</object>
<packing>
<property name="left_attach">3</property>
<property name="right_attach">4</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
<object class="HistoryFileEntry" id="fileentry2">
<property name="visible">True</property>
- <property name="history-id">direntry</property>
- <property name="directory-entry">True</property>
- <signal handler="on_fileentry_activate" name="activate"/>
+ <property name="can_focus">False</property>
+ <property name="history_id">direntry</property>
+ <property name="directory_entry">True</property>
+ <signal name="activate" handler="on_fileentry_activate" swapped="no"/>
</object>
<packing>
<property name="left_attach">5</property>
<property name="right_attach">6</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
- <property name="label" translatable="yes"/>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
</object>
<packing>
<property name="left_attach">6</property>
<property name="right_attach">7</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_options">fill</property>
- <property name="y_options"/>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
<object class="GtkDrawingArea" id="diffmap1">
<property name="width_request">20</property>
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="events">GDK_BUTTON_PRESS_MASK</property>
- <signal handler="on_diffmap_expose_event" last_modification_time="Wed, 21 May 2003 19:30:53 GMT" name="expose_event"/>
- <signal handler="on_diffmap_button_press_event" last_modification_time="Thu, 24 Jul 2003 19:32:10 GMT" name="button_press_event"/>
+ <signal name="expose-event" handler="on_diffmap_expose_event" swapped="no"/>
+ <signal name="button-press-event" handler="on_diffmap_button_press_event" swapped="no"/>
</object>
<packing>
<property name="left_attach">6</property>
<property name="right_attach">7</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_options">fill</property>
- <property name="y_options">fill</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<object class="GtkDrawingArea" id="linkmap1">
<property name="width_request">50</property>
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
</object>
<packing>
@@ -202,51 +158,41 @@
<property name="right_attach">5</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_options">fill</property>
- <property name="y_options">fill</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<object class="GtkDrawingArea" id="diffmap0">
<property name="width_request">20</property>
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="events">GDK_BUTTON_PRESS_MASK</property>
- <signal handler="on_diffmap_expose_event" last_modification_time="Wed, 21 May 2003 19:30:44 GMT" name="expose_event"/>
- <signal handler="on_diffmap_button_press_event" last_modification_time="Thu, 24 Jul 2003 19:32:02 GMT" name="button_press_event"/>
+ <signal name="expose-event" handler="on_diffmap_expose_event" swapped="no"/>
+ <signal name="button-press-event" handler="on_diffmap_button_press_event" swapped="no"/>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_options">fill</property>
+ <property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow2">
<property name="visible">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
- <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkTreeView" id="treeview2">
<property name="visible">True</property>
<property name="can_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_treeview_row_expanded" last_modification_time="Sun, 03 Nov 2002 16:03:29 GMT" name="row_expanded"/>
- <signal handler="on_treeview_row_collapsed" last_modification_time="Sun, 03 Nov 2002 16:08:36 GMT" name="row_collapsed"/>
- <signal handler="on_treeview_row_activated" last_modification_time="Sun, 03 Nov 2002 17:24:07 GMT" name="row_activated"/>
- <signal handler="on_treeview_button_press_event" last_modification_time="Wed, 19 Mar 2003 10:22:58 GMT" name="button_press_event"/>
- <signal handler="on_treeview_key_press_event" last_modification_time="Sun, 14 Dec 2003 22:15:54 GMT" name="key_press_event"/>
- <signal handler="on_treeview_cursor_changed" last_modification_time="Sun, 14 Dec 2003 22:22:48 GMT" name="cursor_changed"/>
- <signal handler="on_treeview_popup_menu" name="popup-menu"/>
+ <signal name="button-press-event" handler="on_treeview_button_press_event" swapped="no"/>
+ <signal name="row-expanded" handler="on_treeview_row_expanded" swapped="no"/>
+ <signal name="key-press-event" handler="on_treeview_key_press_event" swapped="no"/>
+ <signal name="cursor-changed" handler="on_treeview_cursor_changed" swapped="no"/>
+ <signal name="row-collapsed" handler="on_treeview_row_collapsed" swapped="no"/>
+ <signal name="row-activated" handler="on_treeview_row_activated" swapped="no"/>
+ <signal name="popup-menu" handler="on_treeview_popup_menu" swapped="no"/>
</object>
</child>
</object>
@@ -255,13 +201,14 @@
<property name="right_attach">6</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="y_options">fill</property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<object class="GtkDrawingArea" id="linkmap0">
<property name="width_request">50</property>
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
</object>
<packing>
@@ -269,97 +216,53 @@
<property name="right_attach">3</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_options">fill</property>
- <property name="y_options">fill</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
- <property name="label" translatable="yes"/>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_options">fill</property>
- <property name="y_options"/>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
- <property name="label" translatable="yes"/>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_options">fill</property>
- <property name="y_options"/>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label7">
<property name="visible">True</property>
- <property name="label" translatable="yes"/>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
</object>
<packing>
<property name="left_attach">4</property>
<property name="right_attach">5</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_options">fill</property>
- <property name="y_options"/>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
</packing>
</child>
</object>
<packing>
- <property name="padding">0</property>
<property name="expand">True</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>
</object>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
