[Pkg-bazaar-commits] ./bzr-gtk/unstable r265: Merge the Update menu implementation from Mateusz.
Szilveszter Farkas (Phanatic)
Szilveszter.Farkas at gmail.com
Fri Apr 10 07:49:49 UTC 2009
------------------------------------------------------------
revno: 265
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: trunk
timestamp: Fri 2007-08-24 11:54:27 +0200
message:
Merge the Update menu implementation from Mateusz.
modified:
NEWS
TODO
__init__.py
olive.glade
olive/__init__.py
------------------------------------------------------------
revno: 263.2.1
committer: matkor <matkor at laptop-hp>
branch nick: trunk-matkor
timestamp: Thu 2007-08-23 10:17:40 +0000
message:
Code for "branch update" menuitem and toolbox. Typo fix
modified:
NEWS
TODO
__init__.py
olive/__init__.py
------------------------------------------------------------
revno: 263.2.2
committer: matkor <matkor at laptop-hp>
branch nick: trunk-matkor
timestamp: Thu 2007-08-23 11:08:57 +0000
message:
Manual merge of new glade code
modified:
olive.glade
------------------------------------------------------------
revno: 263.2.3
committer: matkor <matkor at laptop-hp>
branch nick: trunk-matkor
timestamp: Thu 2007-08-23 11:10:52 +0000
message:
Fixed push16.png
modified:
olive.glade
------------------------------------------------------------
revno: 263.2.4
committer: matkor <matkor at laptop-hp>
branch nick: trunk-matkor
timestamp: Thu 2007-08-23 11:13:37 +0000
message:
Manulally set icon to update toolbox
modified:
olive.glade
------------------------------------------------------------
revno: 263.2.5
committer: Mateusz Korniak <matkor at laptop-hp>
branch nick: trunk-matkor
timestamp: Fri 2007-08-24 09:55:58 +0200
message:
Cosmetics.
modified:
NEWS
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS 2007-08-23 20:45:00 +0000
+++ b/NEWS 2007-08-24 09:54:27 +0000
@@ -8,10 +8,13 @@
* Handle large files correctly in Olive. (#127392, Mateusz Korniak)
- * Support DBus being present but NetworkManager missing. (#126767, Mateusz
+ * Support DBus being present but NetworkManager missing. (#126767, Mateusz
+ Korniak, Jelmer)
* Add remove and delete menu item in Olive. (#127392, Mateusz Korniak)
+ * Added "update" menu item in Olive. (Mateusz Korniak)
+
* New Olive application icon. (Simon Pascal Klein)
UI
=== modified file 'TODO'
--- a/TODO 2007-07-07 22:02:45 +0000
+++ b/TODO 2007-08-23 10:17:40 +0000
@@ -4,6 +4,7 @@
- List unknown files in commit dialog
- Allow merging revisions from missing dialog
- It should be possible to add unknown files from the commit dialog.
+ Deleting selected unknown files should be also possible ?
- Eliminate radiobuttons in push but rather show the default location and
allow the user to change it
- Remove the status window as it's pointless since the status is already shown
@@ -19,3 +20,9 @@
should keep a read lock open and only release this when the url is changed.
It should also allow the creator of the window to supply an already opened
branch, and a revision id.
+- olive-gtk: Allow diffing with external programs (kdiff3, meld? )
+ Allowing to revert parts of modified using external tools
+- olive-gtk: History of recently opened branches/checkouts
+- olive-gtk: Info about current director in status line (is it branch/checkout , parent branch/ checkout root)
+- olive-gtk: Info about dirs state (including summary of state files and dirs inside directory)
+- olive-gtk: mark modified, deleted files in dir with colors
=== modified file '__init__.py'
--- a/__init__.py 2007-08-10 14:16:09 +0000
+++ b/__init__.py 2007-08-23 10:17:40 +0000
@@ -59,7 +59,7 @@
from bzrlib.errors import BzrError
warning('Installed bzr version %s is too old to be used with bzr-gtk'
' %s.' % (bzrlib.__version__, __version__))
- raise BzrError('Version mismatch: %r' % version_info)
+ raise BzrError('Version mismatch: %r' % (version_info,) )
else:
warning('bzr-gtk is not up to date with installed bzr version %s.'
' \nThere should be a newer version available, e.g. %i.%i.'
=== modified file 'olive.glade'
--- a/olive.glade 2007-08-22 19:30:48 +0000
+++ b/olive.glade 2007-08-23 11:13:37 +0000
@@ -218,6 +218,15 @@
</widget>
</child>
<child>
+ <widget class="GtkMenuItem" id="menuitem_branch_update">
+ <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="label" translatable="yes">Update</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_menuitem_branch_update_activate"/>
+ </widget>
+ </child>
+ <child>
<widget class="GtkSeparatorMenuItem" id="separator_branch2">
<property name="visible">True</property>
</widget>
@@ -460,6 +469,18 @@
<property name="expand">False</property>
</packing>
</child>
+ <child>
+ <widget class="GtkToolButton" id="toolbutton_update">
+ <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="label" translatable="yes">Update</property>
+ <property name="icon">icons/pull.png</property>
+ <signal name="clicked" handler="on_toolbutton_update_clicked"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -490,6 +511,7 @@
</widget>
<packing>
<property name="resize">False</property>
+ <property name="shrink">True</property>
</packing>
</child>
<child>
@@ -508,6 +530,7 @@
<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="relief">GTK_RELIEF_NONE</property>
+ <property name="response_id">0</property>
<signal name="clicked" handler="on_button_location_up_clicked"/>
<child>
<widget class="GtkImage" id="image_location_up">
@@ -556,6 +579,7 @@
<property name="label" translatable="yes">gtk-jump-to</property>
<property name="relief">GTK_RELIEF_NONE</property>
<property name="use_stock">True</property>
+ <property name="response_id">0</property>
<signal name="clicked" handler="on_button_location_jump_clicked"/>
</widget>
<packing>
@@ -582,6 +606,7 @@
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">H_istory Mode</property>
<property name="use_underline">True</property>
+ <property name="response_id">0</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="on_checkbutton_history_toggled"/>
</widget>
@@ -613,6 +638,7 @@
<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="response_id">0</property>
<signal name="clicked" handler="on_button_history_browse_clicked"/>
<child>
<widget class="GtkImage" id="image_history_browse">
@@ -655,6 +681,10 @@
</packing>
</child>
</widget>
+ <packing>
+ <property name="resize">True</property>
+ <property name="shrink">True</property>
+ </packing>
</child>
</widget>
<packing>
@@ -724,6 +754,7 @@
<property name="can_focus">True</property>
<property name="label" translatable="yes">Selected only</property>
<property name="use_underline">True</property>
+ <property name="response_id">0</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
@@ -738,6 +769,7 @@
<property name="can_focus">True</property>
<property name="label" translatable="yes">All unknowns recursively</property>
<property name="use_underline">True</property>
+ <property name="response_id">0</property>
<property name="draw_indicator">True</property>
<property name="group">radiobutton_add_selected</property>
</widget>
@@ -758,6 +790,7 @@
<property name="can_default">True</property>
<property name="label">gtk-cancel</property>
<property name="use_stock">True</property>
+ <property name="response_id">0</property>
<signal name="clicked" handler="on_button_add_cancel_clicked"/>
</widget>
</child>
@@ -767,6 +800,7 @@
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
+ <property name="response_id">0</property>
<signal name="clicked" handler="on_button_add_add_clicked"/>
<child>
<widget class="GtkAlignment" id="alignment3">
@@ -844,6 +878,7 @@
<property name="can_focus">True</property>
<property name="label" translatable="yes">Selected only</property>
<property name="use_underline">True</property>
+ <property name="response_id">0</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
@@ -858,6 +893,7 @@
<property name="can_focus">True</property>
<property name="label" translatable="yes">All files with status 'added'</property>
<property name="use_underline">True</property>
+ <property name="response_id">0</property>
<property name="draw_indicator">True</property>
<property name="group">radiobutton_remove_selected</property>
</widget>
@@ -878,6 +914,7 @@
<property name="can_default">True</property>
<property name="label">gtk-cancel</property>
<property name="use_stock">True</property>
+ <property name="response_id">0</property>
<signal name="clicked" handler="on_button_remove_cancel_clicked"/>
</widget>
</child>
@@ -887,6 +924,7 @@
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
+ <property name="response_id">0</property>
<signal name="clicked" handler="on_button_remove_remove_clicked"/>
<child>
<widget class="GtkAlignment" id="alignment4">
@@ -964,6 +1002,7 @@
<property name="can_focus">True</property>
<property name="label" translatable="yes">_Versioned directory</property>
<property name="use_underline">True</property>
+ <property name="response_id">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</widget>
@@ -984,6 +1023,7 @@
<property name="can_default">True</property>
<property name="label">gtk-cancel</property>
<property name="use_stock">True</property>
+ <property name="response_id">0</property>
<signal name="clicked" handler="on_button_mkdir_cancel_clicked"/>
</widget>
</child>
@@ -993,6 +1033,7 @@
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
+ <property name="response_id">0</property>
<signal name="clicked" handler="on_button_mkdir_mkdir_clicked"/>
<child>
<widget class="GtkAlignment" id="alignment8">
@@ -1093,6 +1134,7 @@
<property name="can_default">True</property>
<property name="label">gtk-cancel</property>
<property name="use_stock">True</property>
+ <property name="response_id">0</property>
<signal name="clicked" handler="on_button_move_cancel_clicked"/>
</widget>
</child>
@@ -1102,6 +1144,7 @@
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
+ <property name="response_id">0</property>
<signal name="clicked" handler="on_button_move_move_clicked"/>
<child>
<widget class="GtkAlignment" id="alignment9">
@@ -1200,6 +1243,7 @@
<property name="can_default">True</property>
<property name="label">gtk-cancel</property>
<property name="use_stock">True</property>
+ <property name="response_id">0</property>
<signal name="clicked" handler="on_button_rename_cancel_clicked"/>
</widget>
</child>
@@ -1209,6 +1253,7 @@
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
+ <property name="response_id">0</property>
<signal name="clicked" handler="on_button_rename_rename_clicked"/>
<child>
<widget class="GtkAlignment" id="alignment10">
@@ -2346,6 +2391,7 @@
<property name="has_default">True</property>
<property name="label">gtk-close</property>
<property name="use_stock">True</property>
+ <property name="response_id">0</property>
<signal name="clicked" handler="on_button_info_close_clicked"/>
</widget>
</child>
@@ -2395,6 +2441,7 @@
<widget class="GtkButton" id="button_merge_open">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="response_id">0</property>
<signal name="clicked" handler="on_button_merge_open_clicked"/>
<child>
<widget class="GtkImage" id="image240">
@@ -2427,6 +2474,7 @@
<property name="can_default">True</property>
<property name="label">gtk-cancel</property>
<property name="use_stock">True</property>
+ <property name="response_id">0</property>
<signal name="clicked" handler="on_button_merge_cancel_clicked"/>
</widget>
</child>
@@ -2436,6 +2484,7 @@
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
+ <property name="response_id">0</property>
<signal name="clicked" handler="on_button_merge_merge_clicked"/>
<child>
<widget class="GtkAlignment" id="alignment19">
=== modified file 'olive/__init__.py'
--- a/olive/__init__.py 2007-08-22 19:30:48 +0000
+++ b/olive/__init__.py 2007-08-23 10:17:40 +0000
@@ -108,6 +108,7 @@
self.menuitem_branch_checkout = self.toplevel.get_widget('menuitem_branch_checkout')
self.menuitem_branch_pull = self.toplevel.get_widget('menuitem_branch_pull')
self.menuitem_branch_push = self.toplevel.get_widget('menuitem_branch_push')
+ self.menuitem_branch_update = self.toplevel.get_widget('menuitem_branch_update')
self.menuitem_branch_revert = self.toplevel.get_widget('menuitem_branch_revert')
self.menuitem_branch_merge = self.toplevel.get_widget('menuitem_branch_merge')
self.menuitem_branch_commit = self.toplevel.get_widget('menuitem_branch_commit')
@@ -125,6 +126,7 @@
self.toolbutton_commit = self.toplevel.get_widget('toolbutton_commit')
self.toolbutton_pull = self.toplevel.get_widget('toolbutton_pull')
self.toolbutton_push = self.toplevel.get_widget('toolbutton_push')
+ self.toolbutton_update = self.toplevel.get_widget('toolbutton_update')
# Get the drive selector
self.combobox_drive = gtk.combo_box_new_text()
self.combobox_drive.connect("changed", self._refresh_drives)
@@ -165,6 +167,7 @@
"on_menuitem_branch_commit_activate": self.on_menuitem_branch_commit_activate,
"on_menuitem_branch_push_activate": self.on_menuitem_branch_push_activate,
"on_menuitem_branch_pull_activate": self.on_menuitem_branch_pull_activate,
+ "on_menuitem_branch_update_activate": self.on_menuitem_branch_update_activate,
"on_menuitem_branch_tags_activate": self.on_menuitem_branch_tags_activate,
"on_menuitem_branch_status_activate": self.on_menuitem_branch_status_activate,
"on_menuitem_branch_missing_revisions_activate": self.on_menuitem_branch_missing_revisions_activate,
@@ -179,6 +182,7 @@
"on_toolbutton_commit_clicked": self.on_menuitem_branch_commit_activate,
"on_toolbutton_pull_clicked": self.on_menuitem_branch_pull_activate,
"on_toolbutton_push_clicked": self.on_menuitem_branch_push_activate,
+ "on_toolbutton_update_clicked": self.on_menuitem_branch_update_activate,
"on_treeview_right_button_press_event": self.on_treeview_right_button_press_event,
"on_treeview_right_row_activated": self.on_treeview_right_row_activated,
"on_treeview_left_button_press_event": self.on_treeview_left_button_press_event,
@@ -563,6 +567,17 @@
ret = branch_to.pull(branch_from)
info_dialog(_('Pull successful'), _('%d revision(s) pulled.') % ret)
+
+ @show_bzr_error
+ def on_menuitem_branch_update_activate(self, widget):
+ """ Brranch/checkout update menu handler. """
+
+ ret = self.wt.update()
+ conflicts = self.wt.conflicts()
+ if conflicts:
+ info_dialog(_('Update successful but conflicts generated'), _('Number of conflicts generated: %d.') % (len(conflicts),) )
+ else:
+ info_dialog(_('Update successful'), _('No conflicts generated.') )
def on_menuitem_branch_push_activate(self, widget):
""" Branch/Push... menu handler. """
@@ -1060,6 +1075,7 @@
self.menuitem_branch_checkout.set_sensitive(self.notbranch)
self.menuitem_branch_pull.set_sensitive(not self.notbranch)
self.menuitem_branch_push.set_sensitive(not self.notbranch)
+ self.menuitem_branch_update.set_sensitive(not self.notbranch)
self.menuitem_branch_revert.set_sensitive(not self.notbranch)
self.menuitem_branch_merge.set_sensitive(not self.notbranch)
self.menuitem_branch_commit.set_sensitive(not self.notbranch)
@@ -1081,6 +1097,7 @@
self.toolbutton_commit.set_sensitive(not self.notbranch)
self.toolbutton_pull.set_sensitive(not self.notbranch)
self.toolbutton_push.set_sensitive(not self.notbranch)
+ self.toolbutton_update.set_sensitive(not self.notbranch)
else:
# We're remote
self.menuitem_branch_init.set_sensitive(False)
@@ -1088,6 +1105,7 @@
self.menuitem_branch_checkout.set_sensitive(True)
self.menuitem_branch_pull.set_sensitive(False)
self.menuitem_branch_push.set_sensitive(False)
+ self.menuitem_branch_update.set_sensitive(False)
self.menuitem_branch_revert.set_sensitive(False)
self.menuitem_branch_merge.set_sensitive(False)
self.menuitem_branch_commit.set_sensitive(False)
@@ -1109,6 +1127,7 @@
self.toolbutton_commit.set_sensitive(False)
self.toolbutton_pull.set_sensitive(False)
self.toolbutton_push.set_sensitive(False)
+ self.toolbutton_update.set_sensitive(False)
def refresh_left(self):
""" Refresh the bookmark list. """
More information about the Pkg-bazaar-commits
mailing list