/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-20 13:23:29 UTC
  • mto: This revision was merged to the branch mainline in revision 560.
  • Revision ID: colbrac@xs4all.nl-20080720132329-srxnl5lf1k3z43jz
Better way to return response

Show diffs side-by-side

added added

removed removed

Lines of Context:
merge.py
27
27
from bzrlib.branch import Branch
28
28
import bzrlib.errors as errors
29
29
 
30
 
from bzrlib.plugins.gtk import _i18n, icon_path
 
30
from bzrlib.plugins.gtk import _i18n
31
31
from bzrlib.plugins.gtk.dialog import error_dialog, info_dialog, warning_dialog
32
32
from bzrlib.plugins.gtk.errors import show_bzr_error
33
33
 
37
37
    
38
38
    def __init__(self, wt, wtpath, default_branch_path=None, parent=None):
39
39
        """ Initialize the Merge dialog. """
40
 
        gtk.Dialog.__init__(self, title="Merge changes",
 
40
        gtk.Dialog.__init__(self, title="Olive - Merge",
41
41
                                  parent=parent,
42
42
                                  flags=0,
43
43
                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
44
 
        self.set_icon_from_file(icon_path("bzr-icon-64.png"))
 
44
        
45
45
        # Get arguments
46
46
        self.wt = wt
47
47
        self.wtpath = wtpath
48
 
        self.default_branch_path = default_branch_path
49
 
        self.parent_window = parent
 
48
        
 
49
        directory = os.path.dirname(self.wt.abspath(self.wtpath))
50
50
        
51
51
        # Create widgets
52
52
        self._hbox = gtk.HBox()
53
 
        self._source = gtk.HBox()
54
53
        self._label_merge_from = gtk.Label(_i18n("Merge from"))
55
 
        self._combo_source = gtk.combo_box_new_text()
56
 
        for entry in [_i18n("Folder"),_i18n("Custom Location")]:
57
 
            self._combo_source.append_text(entry)
58
 
        self._combo_source.connect("changed", self._on_combo_changed)
 
54
        self._filechooser_dialog = gtk.FileChooserDialog(title="Please select a folder",
 
55
                                    parent=self.window,
 
56
                                    action=gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,
 
57
                                    buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
 
58
                                             gtk.STOCK_OPEN, gtk.RESPONSE_OK))
 
59
        self._filechooser_dialog.set_default_response(gtk.RESPONSE_OK)
 
60
        self._filechooser = gtk.FileChooserButton(self._filechooser_dialog)
59
61
        self._button_merge = gtk.Button(_i18n("_Merge"))
60
62
        self._button_merge_icon = gtk.Image()
61
63
        self._button_merge_icon.set_from_stock(gtk.STOCK_APPLY, gtk.ICON_SIZE_BUTTON)
62
64
        self._button_merge.set_image(self._button_merge_icon)
 
65
        
63
66
        self._button_merge.connect('clicked', self._on_merge_clicked)
64
67
        
 
68
        # Set location
 
69
        self._filechooser_dialog.set_current_folder(directory)
 
70
        
65
71
        # Add widgets to dialog
66
 
        self.vbox.pack_start(self._hbox, False, False, 0)
 
72
        self.vbox.add(self._hbox)
67
73
        self._hbox.add(self._label_merge_from)
68
 
        self._hbox.add(self._combo_source)
 
74
        self._hbox.add(self._filechooser)
69
75
        self._hbox.set_spacing(5)
70
76
        self.action_area.pack_end(self._button_merge)
71
77
        
72
 
        if self.default_branch_path and os.path.isdir(
73
 
                            self.default_branch_path.partition('file://')[2]):
74
 
            self.directory = self.default_branch_path.partition('file://')[2]
75
 
            self._combo_source.set_active(0)
76
 
        elif self.default_branch_path:
77
 
            self._combo_source.set_active(1)
78
 
        else:
79
 
            # If no default_branch_path give, default to folder source with current folder
80
 
            self._combo_source.set_active(0)
81
78
        self.vbox.show_all()
82
 
    
83
 
    def _on_folder_source(self):
84
 
        """ Merge from folder, create a filechooser dialog and button """
85
 
        self._source = gtk.HBox()
86
 
        self._filechooser_dialog = gtk.FileChooserDialog(title="Please select a folder",
87
 
                                    parent=self.parent_window,
88
 
                                    action=gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,
89
 
                                    buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
90
 
                                             gtk.STOCK_OPEN, gtk.RESPONSE_OK))
91
 
        self._filechooser_dialog.set_default_response(gtk.RESPONSE_OK)
92
 
        self._filechooser = gtk.FileChooserButton(self._filechooser_dialog)
93
 
        self._filechooser.show()
94
 
        directory = getattr(self, 'directory', None)
95
 
        if not directory:
96
 
            directory = os.path.dirname(self.wt.abspath(self.wtpath))
97
 
        self._filechooser_dialog.set_current_folder(directory)
98
 
        self._source.pack_start(self._filechooser, True, True, 0)
99
 
        self.vbox.pack_start(self._source, True, True, 5)
100
 
        self._source.show()
101
 
    
102
 
    def _on_custom_source(self):
103
 
        """ Merge from a custom source (can be folder, remote, etc), create entry """
104
 
        self._source = gtk.HBox()
105
 
        self._custom_entry = gtk.Entry()
106
 
        if self.default_branch_path:
107
 
            self._custom_entry.set_text(self.default_branch_path)
108
 
        self._custom_entry.connect("activate", self._on_merge_clicked)
109
 
        self._custom_entry.show()
110
 
        self._source.pack_start(self._custom_entry, True, True, 0)
111
 
        self.vbox.pack_start(self._source, True, True, 5)
112
 
        self._source.show()
113
 
    
114
 
    def _on_combo_changed(self, widget):
115
 
        merge_source = self._combo_source.get_active()
116
 
        self._source.destroy()
117
 
        if merge_source == 0:
118
 
            # Merge from folder
119
 
            self._on_folder_source()
120
 
        elif merge_source == 1:
121
 
            # Merge from custom
122
 
            self._on_custom_source()
123
 
    
 
79
 
124
80
    @show_bzr_error
125
81
    def _on_merge_clicked(self, widget):
126
 
        merge_source = self._combo_source.get_active()
127
 
        if merge_source == 0:
128
 
            branch = self._filechooser.get_filename()
129
 
        elif merge_source == 1:
130
 
            branch = self._custom_entry.get_text()
 
82
        branch = self._filechooser.get_filename()
131
83
        if branch == "":
132
84
            error_dialog(_i18n('Branch not given'),
133
85
                         _i18n('Please specify a branch to merge from.'))