/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: Jelmer Vernooij
  • Date: 2007-07-15 18:12:57 UTC
  • Revision ID: jelmer@samba.org-20070715181257-g264qus2zyi3v39z
Add RevisionSelectionBox widget, use in TagDialog.

Show diffs side-by-side

added added

removed removed

Lines of Context:
commit.py
26
26
 
27
27
import os.path
28
28
 
29
 
from bzrlib import errors, osutils
30
 
from bzrlib.trace import mutter
 
29
import bzrlib.errors as errors
 
30
from bzrlib import osutils
31
31
 
32
32
from dialog import error_dialog, question_dialog
33
33
from errors import show_bzr_error
100
100
            self._vpaned_list = gtk.VPaned()
101
101
            self._scrolledwindow_merges = gtk.ScrolledWindow()
102
102
            self._treeview_merges = gtk.TreeView()
103
 
            self._scrolledwindow_merges.set_policy(gtk.POLICY_AUTOMATIC,
104
 
                                                   gtk.POLICY_AUTOMATIC)
105
103
 
106
104
        # Set callbacks
107
105
        self._button_commit.connect('clicked', self._on_commit_clicked)
117
115
        self._vpaned_main.set_position(200)
118
116
        self._button_commit.set_flags(gtk.CAN_DEFAULT)
119
117
 
 
118
        if self._is_pending:
 
119
            self._scrolledwindow_merges.set_policy(gtk.POLICY_AUTOMATIC,
 
120
                                                   gtk.POLICY_AUTOMATIC)
 
121
            self._treeview_files.set_sensitive(False)
 
122
        
120
123
        # Construct the dialog
121
124
        self.action_area.pack_end(self._button_commit)
122
125
        
150
153
                              '/org/freedesktop/NetworkManager')
151
154
                dbus_iface = dbus.Interface(
152
155
                        proxy_obj, 'org.freedesktop.NetworkManager')
153
 
                try:
154
 
                    # 3 is the enum value for STATE_CONNECTED
155
 
                    self._check_local.set_active(dbus_iface.state() != 3)
156
 
                except dbus.DBusException, e:
157
 
                    # Silently drop errors. While DBus may be 
158
 
                    # available, NetworkManager doesn't necessarily have to be
159
 
                    mutter("unable to get networkmanager state: %r" % e)
160
 
                
 
156
                # 3 is the enum value for STATE_CONNECTED
 
157
                self._check_local.set_active(dbus_iface.state() != 3)
 
158
        
161
159
        # Create the file list
162
160
        self._create_file_view()
163
161
        # Create the pending merges
317
315
        crt = gtk.CellRendererToggle()
318
316
        crt.set_property("activatable", True)
319
317
        crt.connect("toggled", self._toggle_commit, self._file_store)
320
 
        commit_column = gtk.TreeViewColumn(_('Commit'), crt, active=0)
321
 
        if self._is_pending:
322
 
            commit_column.set_visible(False)
323
 
        self._treeview_files.append_column(commit_column)
 
318
        self._treeview_files.append_column(gtk.TreeViewColumn(_('Commit'),
 
319
                                     crt, active=0))
324
320
        self._treeview_files.append_column(gtk.TreeViewColumn(_('Path'),
325
321
                                     gtk.CellRendererText(), text=1))
326
322
        self._treeview_files.append_column(gtk.TreeViewColumn(_('Type'),