[Pkg-bazaar-commits] ./bzr-gtk/unstable r256: Merge icon location fixes from Gary van der Merwe.
Jelmer Vernooij
jelmer at samba.org
Fri Apr 10 07:49:48 UTC 2009
------------------------------------------------------------
revno: 256
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Fri 2007-08-10 19:26:38 +0200
message:
Merge icon location fixes from Gary van der Merwe.
added:
mergedirective.py
olive.gladep
renamed:
oliveicon2.png => icons/oliveicon2.png
modified:
.bzrignore
olive.glade
revisionmenu.py
setup.py
------------------------------------------------------------
revno: 254.1.1
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Sun 2007-08-05 03:03:35 +0200
message:
Add Merge Directive option to revision menu.
added:
mergedirective.py
modified:
revisionmenu.py
------------------------------------------------------------
revno: 254.2.1
committer: Gary van der Merwe <garyvdm at gmail.com>
branch nick: iconfix
timestamp: Fri 2007-08-10 12:45:06 +0200
message:
Make icon locations consistant between source and installed version. Let glade nkow where to find the icons with a project file.
added:
olive.gladep
renamed:
oliveicon2.png => icons/oliveicon2.png
modified:
.bzrignore
olive.glade
setup.py
-------------- next part --------------
=== modified file '.bzrignore'
--- a/.bzrignore 2007-07-13 21:42:45 +0000
+++ b/.bzrignore 2007-08-10 10:45:06 +0000
@@ -3,6 +3,6 @@
MANIFEST
*.pyc
*.bak
-*.gladep
+*.kpf
dist
tags
=== renamed file 'oliveicon2.png' => 'icons/oliveicon2.png'
=== added file 'mergedirective.py'
--- a/mergedirective.py 1970-01-01 00:00:00 +0000
+++ b/mergedirective.py 2007-08-05 01:03:35 +0000
@@ -0,0 +1,52 @@
+# Copyright (C) 2007 by Jelmer Vernooij <jelmer at samba.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+try:
+ import pygtk
+ pygtk.require("2.0")
+except:
+ pass
+
+import bzrlib
+import gtk
+import os
+
+class CreateMergeDirectiveDialog(gtk.Dialog):
+ def __init__(self, branch, stop_revid=None):
+ super(CreateMergeDirectiveDialog, self).__init__()
+ self.branch = branch
+ self.stop_revid = stop_revid
+ self._create()
+
+ def _create(self):
+ # TODO: Create a frame with information about the revision that will be
+ # submittted
+
+ # TODO: Create a frame with a the ability to select a branch
+
+ # TODO: Create a frame with a button for selecting a file name
+ # for the bundle
+ pass
+
+
+class SendMergeDirectiveDialog(gtk.Dialog):
+ def __init__(self):
+ super(SendMergeDirectiveDialog, self).__init__()
+
+
+class ApplyMergeDirectiveDialog(gtk.Dialog):
+ def __init__(self):
+ super(ApplyMergeDirectiveDialog, self).__init__()
=== modified file 'olive.glade'
--- a/olive.glade 2007-05-18 16:01:10 +0000
+++ b/olive.glade 2007-08-10 10:45:06 +0000
@@ -6,7 +6,7 @@
<property name="width_request">700</property>
<property name="height_request">400</property>
<property name="title" translatable="yes">Olive - Bazaar GUI</property>
- <property name="icon">oliveicon2.png</property>
+ <property name="icon">icons/oliveicon2.png</property>
<signal name="destroy" handler="on_window_main_destroy"/>
<signal name="delete_event" handler="on_window_main_delete_event"/>
<child>
@@ -367,7 +367,7 @@
<property name="visible">True</property>
<property name="label">Refresh</property>
<property name="use_underline">True</property>
- <property name="icon">refresh.png</property>
+ <property name="icon">icons/refresh.png</property>
<signal name="clicked" handler="on_toolbutton_refresh_clicked"/>
</widget>
<packing>
@@ -379,7 +379,7 @@
<property name="visible">True</property>
<property name="label">Diff</property>
<property name="use_underline">True</property>
- <property name="icon">diff.png</property>
+ <property name="icon">icons/diff.png</property>
<signal name="clicked" handler="on_toolbutton_diff_clicked"/>
</widget>
<packing>
@@ -391,7 +391,7 @@
<property name="visible">True</property>
<property name="label">Log</property>
<property name="use_underline">True</property>
- <property name="icon">log.png</property>
+ <property name="icon">icons/log.png</property>
<signal name="clicked" handler="on_toolbutton_log_clicked"/>
</widget>
<packing>
@@ -412,7 +412,7 @@
<property name="visible">True</property>
<property name="label">Commit</property>
<property name="use_underline">True</property>
- <property name="icon">commit.png</property>
+ <property name="icon">icons/commit.png</property>
<signal name="clicked" handler="on_toolbutton_commit_clicked"/>
</widget>
<packing>
@@ -433,7 +433,7 @@
<property name="visible">True</property>
<property name="label">Pull</property>
<property name="use_underline">True</property>
- <property name="icon">pull.png</property>
+ <property name="icon">icons/pull.png</property>
<signal name="clicked" handler="on_toolbutton_pull_clicked"/>
</widget>
<packing>
@@ -445,7 +445,7 @@
<property name="visible">True</property>
<property name="label">Push</property>
<property name="use_underline">True</property>
- <property name="icon">push.png</property>
+ <property name="icon">icons/push.png</property>
<signal name="clicked" handler="on_toolbutton_push_clicked"/>
</widget>
<packing>
@@ -675,7 +675,7 @@
<property name="website_label" translatable="yes">https://launchpad.net/products/olive</property>
<property name="authors">Szilveszter Farkas (Phanatic) <szilveszter.farkas at gmail.com></property>
<property name="translator_credits" translatable="yes" comments="TRANSLATORS: Replace this string with your names, one name per line.">translator-credits</property>
- <property name="logo">oliveicon2.png</property>
+ <property name="logo">icons/oliveicon2.png</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="dialog-vbox1">
<child internal-child="action_area">
@@ -693,7 +693,7 @@
<property name="visible">True</property>
<property name="title" translatable="yes">Olive - Add file(s)</property>
<property name="resizable">False</property>
- <property name="icon">oliveicon2.png</property>
+ <property name="icon">icons/oliveicon2.png</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="vbox_add">
@@ -813,7 +813,7 @@
<property name="visible">True</property>
<property name="title" translatable="yes">Olive - Remove file(s)</property>
<property name="resizable">False</property>
- <property name="icon">oliveicon2.png</property>
+ <property name="icon">icons/oliveicon2.png</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="vbox_remove">
@@ -932,7 +932,7 @@
<widget class="GtkDialog" id="window_mkdir">
<property name="visible">True</property>
<property name="title" translatable="yes">Olive - Make directory</property>
- <property name="icon">oliveicon2.png</property>
+ <property name="icon">icons/oliveicon2.png</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="vbox_mkdir">
@@ -1039,7 +1039,7 @@
<widget class="GtkDialog" id="window_move">
<property name="width_request">250</property>
<property name="title" translatable="yes">Olive - Move</property>
- <property name="icon">oliveicon2.png</property>
+ <property name="icon">icons/oliveicon2.png</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="vbox_move">
@@ -1146,7 +1146,7 @@
</widget>
<widget class="GtkDialog" id="window_rename">
<property name="title" translatable="yes">Olive - Rename</property>
- <property name="icon">oliveicon2.png</property>
+ <property name="icon">icons/oliveicon2.png</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="vbox_rename">
@@ -1253,7 +1253,7 @@
</widget>
<widget class="GtkDialog" id="window_info">
<property name="title" translatable="yes">Olive - Information</property>
- <property name="icon">oliveicon2.png</property>
+ <property name="icon">icons/oliveicon2.png</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="vbox_info">
@@ -2354,7 +2354,7 @@
<widget class="GtkDialog" id="window_merge">
<property name="visible">True</property>
<property name="title" translatable="yes">Merge - Olive</property>
- <property name="icon">oliveicon2.png</property>
+ <property name="icon">icons/oliveicon2.png</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="vbox_merge">
=== added file 'olive.gladep'
--- a/olive.gladep 1970-01-01 00:00:00 +0000
+++ b/olive.gladep 2007-08-10 10:45:06 +0000
@@ -0,0 +1,8 @@
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">
+
+<glade-project>
+ <name>olive</name>
+ <program_name>olive</program_name>
+ <pixmaps_directory>.</pixmaps_directory>
+</glade-project>
=== modified file 'revisionmenu.py'
--- a/revisionmenu.py 2007-07-15 18:39:52 +0000
+++ b/revisionmenu.py 2007-08-05 01:03:35 +0000
@@ -49,6 +49,16 @@
self.append(item)
self.show_all()
+ item = gtk.MenuItem("_Merge Directive")
+ item.connect('activate', self.store_merge_directive)
+ self.append(item)
+ self.show_all()
+
+ def store_merge_directive(self, item):
+ from bzrlib.plugins.gtk.mergedirective import CreateMergeDirectiveDialog
+ window = CreateMergeDirectiveDialog(self.branch, self.revids[0])
+ window.show()
+
def show_diff(self, item):
from bzrlib.plugins.gtk.diff import DiffWindow
window = DiffWindow()
=== modified file 'setup.py'
--- a/setup.py 2007-08-10 14:16:09 +0000
+++ b/setup.py 2007-08-10 17:26:38 +0000
@@ -85,10 +85,9 @@
"bzrlib.plugins.gtk.tests"
],
data_files=[('share/olive', ['olive.glade',
- 'oliveicon2.png',
'cmenu.ui',
]),
- ('share/olive', ['icons/commit.png',
+ ('share/olive/icons', ['icons/commit.png',
'icons/commit16.png',
'icons/diff.png',
'icons/diff16.png',
@@ -98,7 +97,8 @@
'icons/pull16.png',
'icons/push.png',
'icons/push16.png',
- 'icons/refresh.png']),
+ 'icons/refresh.png',
+ 'icons/oliveicon2.png']),
('share/applications', ['olive-gtk.desktop',
'bazaar-properties.desktop',
'bzr-notify.desktop']),
More information about the Pkg-bazaar-commits
mailing list