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

  • Committer: Szilveszter Farkas (Phanatic)
  • Date: 2007-03-15 16:23:15 UTC
  • mfrom: (170 trunk)
  • mto: (170.1.3 trunk)
  • mto: This revision was merged to the branch mainline in revision 172.
  • Revision ID: szilveszter.farkas@gmail.com-20070315162315-rs1sbxjh31n314zc
Merge from trunk.

Show diffs side-by-side

added added

removed removed

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