/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 olive/commit.py

  • Committer: Jelmer Vernooij
  • Date: 2007-02-01 15:50:40 UTC
  • Revision ID: jelmer@samba.org-20070201155040-3hq4mfbxs99kzazy
add framework for tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/commit.py
21
21
    pass
22
22
 
23
23
import gtk
 
24
import gtk.glade
24
25
import gobject
25
26
import pango
26
27
 
31
32
 
32
33
from dialog import error_dialog, question_dialog
33
34
from errors import show_bzr_error
34
 
 
35
 
try:
36
 
    import dbus
37
 
    import dbus.glib
38
 
    bus = dbus.SystemBus()
39
 
    proxy_obj = bus.get_object('org.freedesktop.NetworkManager', 
40
 
                              '/org/freedesktop/NetworkManager')
41
 
    dbus_iface = dbus.Interface(proxy_obj, 'org.freedesktop.NetworkManager')
42
 
    have_nm = True
43
 
except ImportError:
44
 
    have_nm = False
 
35
from guifiles import GLADEFILENAME
45
36
 
46
37
class CommitDialog(gtk.Dialog):
47
38
    """ New implementation of the Commit dialog. """
90
81
        
91
82
        # Create the widgets
92
83
        self._button_commit = gtk.Button(_("Comm_it"), use_underline=True)
93
 
        self._check_strict = gtk.CheckButton(_("_Allow unknown files"),
 
84
        if self._is_checkout:
 
85
            self._check_local = gtk.CheckButton(_("_Local only commit (works in checkouts)"),
 
86
                                                use_underline=True)
 
87
        self._check_strict = gtk.CheckButton(_("_Strict commit (fails if unknown files are present)"),
94
88
                                             use_underline=True)
95
 
        self._expander_files = gtk.Expander(_("File(s) to commit"))
 
89
        self._expander_files = gtk.Expander(_("Please select the file(s) to commit"))
96
90
        self._vpaned_main = gtk.VPaned()
97
91
        self._scrolledwindow_files = gtk.ScrolledWindow()
98
92
        self._scrolledwindow_message = gtk.ScrolledWindow()
99
93
        self._treeview_files = gtk.TreeView()
100
94
        self._vbox_message = gtk.VBox()
101
 
        self._label_message = gtk.Label(_("Commit message:"))
 
95
        self._label_message = gtk.Label(_("Please specify a commit message:"))
102
96
        self._textview_message = gtk.TextView()
103
97
        
104
98
        if self._is_pending:
119
113
        self._textview_message.modify_font(pango.FontDescription("Monospace"))
120
114
        self.set_default_size(500, 500)
121
115
        self._vpaned_main.set_position(200)
122
 
        self._button_commit.set_flags(gtk.CAN_DEFAULT)
123
116
 
124
117
        if self._is_pending:
125
118
            self._scrolledwindow_merges.set_policy(gtk.POLICY_AUTOMATIC,
149
142
        self._vpaned_main.add2(self._vbox_message)
150
143
        
151
144
        self.vbox.pack_start(self._vpaned_main, True, True)
152
 
        if self._is_checkout: 
153
 
            self._check_local = gtk.CheckButton(_("_Only commit locally"),
154
 
                                                use_underline=True)
 
145
        if self._is_checkout:
155
146
            self.vbox.pack_start(self._check_local, False, False)
156
 
            if have_nm:
157
 
                # 3 is the enum value for STATE_CONNECTED
158
 
                self._check_local.set_active(dbus_iface.state() != 3)
159
147
        self.vbox.pack_start(self._check_strict, False, False)
160
148
        
161
149
        # Create the file list
171
159
        
172
160
        # Display dialog
173
161
        self.vbox.show_all()
174
 
        
175
 
        # Default to Commit button
176
 
        self._button_commit.grab_default()
177
162
    
178
163
    def _on_treeview_files_row_activated(self, treeview, path, view_column):
179
164
        # FIXME: the diff window freezes for some reason
181
166
        (model, iter) = treeselection.get_selected()
182
167
        
183
168
        if iter is not None:
184
 
            from diff import DiffWindow
 
169
            from olive import DiffWindow
185
170
            
186
171
            _selected = model.get_value(iter, 1)
187
172
            
188
173
            diff = DiffWindow()
189
 
            diff.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_DIALOG)
190
 
            diff.set_modal(True)
191
174
            parent_tree = self.wt.branch.repository.revision_tree(self.wt.branch.last_revision())
192
175
            diff.set_diff(self.wt.branch.nick, self.wt, parent_tree)
193
176
            try: