[Pkg-bazaar-commits] ./bzr-gtk/unstable r115: Reworked Commit dialog to fix bug #73778.
Szilveszter Farkas (Phanatic)
Szilveszter.Farkas at gmail.com
Fri Apr 10 07:49:40 UTC 2009
------------------------------------------------------------
revno: 115
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: bzr-gtk
timestamp: Sun 2006-12-10 20:30:04 +0100
message:
Reworked Commit dialog to fix bug #73778.
modified:
olive.glade
olive/commit.py
-------------- next part --------------
=== modified file 'olive.glade'
--- a/olive.glade 2006-10-19 13:06:30 +0000
+++ b/olive.glade 2006-12-10 19:30:04 +0000
@@ -811,51 +811,58 @@
<property name="spacing">0</property>
<child>
- <widget class="GtkLabel" id="label_commit_select">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Please select the file(s) to commit:</property>
- <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="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>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow_commit_select">
+ <widget class="GtkExpander" id="expander_commit_select">
<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_NONE</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+ <property name="expanded">True</property>
+ <property name="spacing">0</property>
<child>
- <widget class="GtkTreeView" id="treeview_commit_select">
+ <widget class="GtkScrolledWindow" id="scrolledwindow_commit_select">
<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>
- </widget>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+ <child>
+ <widget class="GtkTreeView" id="treeview_commit_select">
+ <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>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label_commit_select">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Please select the file(s) to commit</property>
+ <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="xalign">0.5</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>
+ </widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
</child>
</widget>
<packing>
@@ -866,51 +873,58 @@
</child>
<child>
- <widget class="GtkLabel" id="label_commit_pending">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Pending merges:</property>
- <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="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>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow_commit_pending">
+ <widget class="GtkExpander" id="expander_commit_pending">
<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_NONE</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+ <property name="expanded">True</property>
+ <property name="spacing">0</property>
<child>
- <widget class="GtkTreeView" id="treeview_commit_pending">
+ <widget class="GtkScrolledWindow" id="scrolledwindow_commit_pending">
<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>
- </widget>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+ <child>
+ <widget class="GtkTreeView" id="treeview_commit_pending">
+ <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>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label_commit_pending">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Pending merges</property>
+ <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="xalign">0.5</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>
+ </widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
</child>
</widget>
<packing>
=== modified file 'olive/commit.py'
--- a/olive/commit.py 2006-11-30 13:25:35 +0000
+++ b/olive/commit.py 2006-12-10 19:30:04 +0000
@@ -51,7 +51,9 @@
self.window = self.glade.get_widget('window_commit')
self.checkbutton_local = self.glade.get_widget('checkbutton_commit_local')
self.textview = self.glade.get_widget('textview_commit')
+ self.file_expander = self.glade.get_widget('expander_commit_select')
self.file_view = self.glade.get_widget('treeview_commit_select')
+ self.pending_expander = self.glade.get_widget('expander_commit_pending')
self.pending_label = self.glade.get_widget('label_commit_pending')
self.pending_view = self.glade.get_widget('treeview_commit_pending')
@@ -98,10 +100,11 @@
if self.pending:
# There are pending merges, file selection not supported
+ self.file_expander.set_expanded(False)
self.file_view.set_sensitive(False)
else:
# No pending merges
- self.pending_view.set_sensitive(False)
+ self.pending_expander.hide()
self.textview.modify_font(pango.FontDescription("Monospace"))
self.window.show()
More information about the Pkg-bazaar-commits
mailing list