/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to merge.py

  • Committer: Jasper Groenewegen
  • Date: 2008-07-27 07:59:23 UTC
  • mto: This revision was merged to the branch mainline in revision 577.
  • Revision ID: colbrac@xs4all.nl-20080727075923-89sjwarwxezojre5
https://launchpad.net/bugs/252208
Add parent setting to dialogs and implement in gcommit

Show diffs side-by-side

added added

removed removed

Lines of Context:
merge.py
23
23
    pass
24
24
 
25
25
import gtk
26
 
import gtk.glade
27
26
 
28
27
from bzrlib.branch import Branch
29
28
import bzrlib.errors as errors
 
29
 
30
30
from bzrlib.plugins.gtk import _i18n
31
 
 
32
 
from dialog import error_dialog, info_dialog, warning_dialog
33
 
from errors import show_bzr_error
34
 
from olive.guifiles import GLADEFILENAME
35
 
 
36
 
 
37
 
class MergeDialog:
 
31
from bzrlib.plugins.gtk.dialog import error_dialog, info_dialog, warning_dialog
 
32
from bzrlib.plugins.gtk.errors import show_bzr_error
 
33
 
 
34
 
 
35
class MergeDialog(gtk.Dialog):
38
36
    """ Display the Merge dialog and perform the needed actions. """
39
 
    def __init__(self, wt, wtpath,default_branch_path=None):
 
37
    
 
38
    def __init__(self, wt, wtpath, default_branch_path=None, parent=None):
40
39
        """ Initialize the Merge dialog. """
41
 
        self.glade = gtk.glade.XML(GLADEFILENAME, 'window_merge', 'olive-gtk')
42
 
        
43
 
        self.window = self.glade.get_widget('window_merge')
44
 
        
45
 
        # Dictionary for signal_autoconnect
46
 
        dic = { "on_button_merge_merge_clicked": self.merge,
47
 
                "on_button_merge_cancel_clicked": self.close,
48
 
                "on_button_merge_open_clicked": self.open }
49
 
        
50
 
        # Connect the signals to the handlers
51
 
        self.glade.signal_autoconnect(dic)
52
 
 
 
40
        gtk.Dialog.__init__(self, title="Olive - Merge",
 
41
                                  parent=parent,
 
42
                                  flags=0,
 
43
                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
 
44
        
 
45
        # Get arguments
53
46
        self.wt = wt
54
47
        self.wtpath = wtpath
55
48
        
56
 
        # Get some widgets
57
 
        self.entry = self.glade.get_widget('entry_merge')
58
 
        if default_branch_path:
59
 
            self.entry.set_text(default_branch_path)
60
 
 
61
 
    def display(self):
62
 
        """ Display the Add file(s) dialog. """
63
 
        self.window.show_all()
 
49
        if default_branch_path and os.path.isdir(default_branch_path.partition('file://')[2]):
 
50
            directory = default_branch_path.partition('file://')[2]
 
51
        else:
 
52
            directory = os.path.dirname(self.wt.abspath(self.wtpath))
 
53
        
 
54
        # Create widgets
 
55
        self._hbox = gtk.HBox()
 
56
        self._label_merge_from = gtk.Label(_i18n("Merge from"))
 
57
        self._filechooser_dialog = gtk.FileChooserDialog(title="Please select a folder",
 
58
                                    parent=self.window,
 
59
                                    action=gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,
 
60
                                    buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
 
61
                                             gtk.STOCK_OPEN, gtk.RESPONSE_OK))
 
62
        self._filechooser_dialog.set_default_response(gtk.RESPONSE_OK)
 
63
        self._filechooser = gtk.FileChooserButton(self._filechooser_dialog)
 
64
        self._button_merge = gtk.Button(_i18n("_Merge"))
 
65
        self._button_merge_icon = gtk.Image()
 
66
        self._button_merge_icon.set_from_stock(gtk.STOCK_APPLY, gtk.ICON_SIZE_BUTTON)
 
67
        self._button_merge.set_image(self._button_merge_icon)
 
68
        
 
69
        self._button_merge.connect('clicked', self._on_merge_clicked)
 
70
        
 
71
        # Set location
 
72
        self._filechooser_dialog.set_current_folder(directory)
 
73
        
 
74
        # Add widgets to dialog
 
75
        self.vbox.add(self._hbox)
 
76
        self._hbox.add(self._label_merge_from)
 
77
        self._hbox.add(self._filechooser)
 
78
        self._hbox.set_spacing(5)
 
79
        self.action_area.pack_end(self._button_merge)
 
80
        
 
81
        self.vbox.show_all()
64
82
 
65
83
    @show_bzr_error
66
 
    def merge(self, widget):
67
 
        branch = self.entry.get_text()
 
84
    def _on_merge_clicked(self, widget):
 
85
        branch = self._filechooser.get_filename()
68
86
        if branch == "":
69
87
            error_dialog(_i18n('Branch not given'),
70
88
                         _i18n('Please specify a branch to merge from.'))
78
96
            error_dialog(_i18n('Bazaar command error'), str(errmsg))
79
97
            return
80
98
        
81
 
        self.close()
82
99
        if conflicts == 0:
83
100
            # No conflicts found.
84
101
            info_dialog(_i18n('Merge successful'),
87
104
            # There are conflicts to be resolved.
88
105
            warning_dialog(_i18n('Conflicts encountered'),
89
106
                           _i18n('Please resolve the conflicts manually before committing.'))
90
 
    
91
 
    def open(self, widget):
92
 
        fcd = gtk.FileChooserDialog(title="Please select a folder",
93
 
                                    parent=self.window,
94
 
                                    action=gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,
95
 
                                    buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
96
 
                                             gtk.STOCK_OPEN, gtk.RESPONSE_OK))
97
 
        fcd.set_default_response(gtk.RESPONSE_OK)
98
 
        
99
 
        if fcd.run() == gtk.RESPONSE_OK:
100
 
            self.entry.set_text(fcd.get_filename())
101
 
        
102
 
        fcd.destroy()
103
 
        
104
 
    def close(self, widget=None):
105
 
        self.window.destroy()
 
107
        
 
108
        self.response(gtk.RESPONSE_OK)