1
# Copyright (C) 2006 by Szilveszter Farkas (Phanatic) <szilveszter.farkas@gmail.com>
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
28
import bzrlib.errors as errors
30
from __init__ import gladefile
31
from dialog import error_dialog
34
""" Display the Merge dialog and perform the needed actions. """
35
def __init__(self, wt, wtpath):
36
""" Initialize the Merge dialog. """
37
self.glade = gtk.glade.XML(gladefile, 'window_merge', 'olive-gtk')
39
self.window = self.glade.get_widget('window_merge')
41
# Dictionary for signal_autoconnect
42
dic = { "on_button_merge_merge_clicked": self.merge,
43
"on_button_merge_cancel_clicked": self.close,
44
"on_button_merge_open_clicked": self.open }
46
# Connect the signals to the handlers
47
self.glade.signal_autoconnect(dic)
53
""" Display the Add file(s) dialog. """
54
self.window.show_all()
56
def merge(self, widget):
57
print "DEBUG: Merge button pressed."
59
def open(self, widget):
60
print "DEBUG: Open branch button pressed."
62
def close(self, widget=None):
added
removed
olive/merge.py
