Merge lp://staging/~ingolemo/bzr-gtk/fix-for-LP333876 into lp://staging/bzr-gtk/gtk2

Proposed by Ingolemo
Status: Merged
Merged at revision: not available
Proposed branch: lp://staging/~ingolemo/bzr-gtk/fix-for-LP333876
Merge into: lp://staging/bzr-gtk/gtk2
Diff against target: 57 lines (+9/-0)
1 file modified
olive/window.py (+9/-0)
To merge this branch: bzr merge lp://staging/~ingolemo/bzr-gtk/fix-for-LP333876
Reviewer Review Type Date Requested Status
Jasper Groenewegen (community) Approve
Review via email: mp+16528@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Jasper Groenewegen (colbrac) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'olive/window.py'
2--- olive/window.py 2008-08-04 20:36:27 +0000
3+++ olive/window.py 2009-12-23 10:17:13 +0000
4@@ -281,18 +281,22 @@
5 self.tb_refresh_icon.set_from_file(icon_path("refresh.png"))
6 self.tb_refresh = gtk.ToolButton(self.tb_refresh_icon, _i18n("Refresh"))
7 self.tb_refresh.connect('clicked', self.signal.on_menuitem_view_refresh_activate)
8+ self.tb_refresh.set_tooltip_text(_i18n("Refresh the file list"))
9+ self.tb_refresh.set_is_important(True)
10 self.tb.add(self.tb_refresh)
11
12 self.tb_diff_icon = gtk.Image()
13 self.tb_diff_icon.set_from_file(icon_path("diff.png"))
14 self.tb_diff = gtk.ToolButton(self.tb_diff_icon, _i18n("Diff"))
15 self.tb_diff.connect('clicked', self.signal.on_menuitem_stats_diff_activate)
16+ self.tb_diff.set_tooltip_text(_i18n("View changes since last commit"))
17 self.tb.add(self.tb_diff)
18
19 self.tb_log_icon = gtk.Image()
20 self.tb_log_icon.set_from_file(icon_path("log.png"))
21 self.tb_log = gtk.ToolButton(self.tb_log_icon, _i18n("Log"))
22 self.tb_log.connect('clicked', self.signal.on_menuitem_stats_log_activate)
23+ self.tb_log.set_tooltip_text(_i18n("View the revision history"))
24 self.tb.add(self.tb_log)
25
26 self.tb.add(gtk.SeparatorToolItem())
27@@ -301,6 +305,8 @@
28 self.tb_commit_icon.set_from_file(icon_path("commit.png"))
29 self.tb_commit = gtk.ToolButton(self.tb_commit_icon, _i18n("Commit"))
30 self.tb_commit.connect('clicked', self.signal.on_menuitem_branch_commit_activate)
31+ self.tb_commit.set_tooltip_text(_i18n("Commit changes to the current branch"))
32+ self.tb_commit.set_is_important(True)
33 self.tb.add(self.tb_commit)
34
35 self.tb.add(gtk.SeparatorToolItem())
36@@ -309,18 +315,21 @@
37 self.tb_pull_icon.set_from_file(icon_path("pull.png"))
38 self.tb_pull = gtk.ToolButton(self.tb_pull_icon, _i18n("Pull"))
39 self.tb_pull.connect('clicked', self.signal.on_menuitem_branch_pull_activate)
40+ self.tb_pull.set_tooltip_text(_i18n("Pull changes from the parent branch"))
41 self.tb.add(self.tb_pull)
42
43 self.tb_push_icon = gtk.Image()
44 self.tb_push_icon.set_from_file(icon_path("push.png"))
45 self.tb_push = gtk.ToolButton(self.tb_push_icon, _i18n("Push"))
46 self.tb_push.connect('clicked', self.signal.on_menuitem_branch_push_activate)
47+ self.tb_push.set_tooltip_text(_i18n("Push the branch to a remote location"))
48 self.tb.add(self.tb_push)
49
50 self.tb_update_icon = gtk.Image()
51 self.tb_update_icon.set_from_file(icon_path("pull.png"))
52 self.tb_update = gtk.ToolButton(self.tb_update_icon, _i18n("Update"))
53 self.tb_update.connect('clicked', self.signal.on_menuitem_branch_update_activate)
54+ self.tb_update.set_tooltip_text(_i18n("Update the working tree"))
55 self.tb.add(self.tb_update)
56
57 def _create_locationbar(self):

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: