/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: Mateusz Korniak
  • Date: 2007-07-21 13:16:33 UTC
  • mto: This revision was merged to the branch mainline in revision 248.
  • Revision ID: matkor@laptop-hp-20070721131633-t40kxs20j1q2fvvc
Context menu "Remove and delete added"
Acts like "Remove" but also deletes file locally.

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
        
317
320
        crt = gtk.CellRendererToggle()
318
321
        crt.set_property("activatable", True)
319
322
        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)
 
323
        self._treeview_files.append_column(gtk.TreeViewColumn(_('Commit'),
 
324
                                     crt, active=0))
324
325
        self._treeview_files.append_column(gtk.TreeViewColumn(_('Path'),
325
326
                                     gtk.CellRendererText(), text=1))
326
327
        self._treeview_files.append_column(gtk.TreeViewColumn(_('Type'),