/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/frontend/gtk/status.py

  • Committer: Szilveszter Farkas (Phanatic)
  • Date: 2006-08-13 11:02:48 UTC
  • mto: (0.14.1 main) (93.1.1 win32.bialix)
  • mto: This revision was merged to the branch mainline in revision 83.
  • Revision ID: Szilveszter.Farkas@gmail.com-20060813110248-4f256d8db6247b61
Some bugs fixed in the Push dialog; added TODO items.

2006-08-13  Szilveszter Farkas <Szilveszter.Farkas@gmail.com>

    * TODO: some more items added
    * olive.glade: Push window should not be visible by default
    * olive/frontend/gtk/push.py: fixed a bug if no push location known; user
      gets an error if directory is not a branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/frontend/gtk/status.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
from gi.repository import Gtk
18
 
from bzrlib.plugins.gtk import window
19
 
from bzrlib.plugins.gtk.i18n import _i18n
20
 
 
21
 
 
22
 
class StatusWindow(window.Window):
 
17
import sys
 
18
 
 
19
try:
 
20
    import pygtk
 
21
    pygtk.require("2.0")
 
22
except:
 
23
    pass
 
24
try:
 
25
    import gtk
 
26
    import gtk.glade
 
27
    import gobject
 
28
    import pango
 
29
except:
 
30
    sys.exit(1)
 
31
 
 
32
import bzrlib
 
33
import bzrlib.errors as errors
 
34
 
 
35
if (bzrlib.version_info[0] == 0) and (bzrlib.version_info[1] < 9):
 
36
    # function deprecated after 0.9
 
37
    from bzrlib.delta import compare_trees
 
38
 
 
39
from bzrlib.status import show_tree_status
 
40
from bzrlib.workingtree import WorkingTree
 
41
 
 
42
from dialog import OliveDialog
 
43
 
 
44
class OliveStatus:
23
45
    """ Display Status window and perform the needed actions. """
24
 
 
25
 
    def __init__(self, wt, wtpath, revision=None):
26
 
        """ Initialize the Status window. """
27
 
        super(StatusWindow, self).__init__()
28
 
        self.set_title("Working tree changes")
29
 
        self._create()
30
 
        self.wt = wt
31
 
        self.wtpath = wtpath
32
 
 
33
 
        if revision is None:
34
 
            revision = self.wt.branch.last_revision()
35
 
 
 
46
    def __init__(self, gladefile, comm):
 
47
        """ Initialize the Diff window. """
 
48
        self.gladefile = gladefile
 
49
        self.glade = gtk.glade.XML(self.gladefile, 'window_status')
 
50
        
 
51
        self.comm = comm
 
52
        
 
53
        self.dialog = OliveDialog(self.gladefile)
 
54
        
 
55
        # Get the Status window widget
 
56
        self.window = self.glade.get_widget('window_status')
 
57
        
 
58
        # Check if current location is a branch
 
59
        try:
 
60
            (self.wt, path) = WorkingTree.open_containing(self.comm.get_path())
 
61
            branch = self.wt.branch
 
62
        except errors.NotBranchError:
 
63
            self.notbranch = True
 
64
            return
 
65
        except:
 
66
            raise
 
67
        
 
68
        file_id = self.wt.path2id(path)
 
69
 
 
70
        self.notbranch = False
 
71
        if file_id is None:
 
72
            self.notbranch = True
 
73
            return
 
74
        
36
75
        # Set the old working tree
37
 
        self.old_tree = self.wt.branch.repository.revision_tree(revision)
 
76
        self.old_tree = self.wt.branch.repository.revision_tree(self.wt.branch.last_revision())
 
77
        
 
78
        # Dictionary for signal_autoconnect
 
79
        dic = { "on_button_status_close_clicked": self.close }
 
80
        
 
81
        # Connect the signals to the handlers
 
82
        self.glade.signal_autoconnect(dic)
 
83
        
38
84
        # Generate status output
39
85
        self._generate_status()
40
86
 
41
 
    def _create(self):
42
 
        self.set_default_size(400, 300)
43
 
        sw = Gtk.ScrolledWindow()
44
 
        sw.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
45
 
        sw.set_shadow_type(Gtk.ShadowType.IN)
46
 
        self.treeview = Gtk.TreeView()
47
 
        sw.add(self.treeview)
48
 
        self.add(sw)
49
 
 
50
 
        # sane border and spacing widths (as recommended by GNOME HIG) 
51
 
        self.set_border_width(5)
52
 
        sw.set_border_width(5)
53
 
        self.show_all()
54
 
 
55
 
 
56
 
    def row_diff(self, tv, path, tvc):
57
 
        file = self.model[path][1]
58
 
        if file is None:
59
 
            return
60
 
        from bzrlib.plugins.gtk.diff import DiffWindow
61
 
        window = DiffWindow()
62
 
        window.set_diff("Working tree changes", self.wt, self.old_tree)
63
 
        window.set_file(file)
64
 
        window.show()
65
 
 
66
 
 
67
87
    def _generate_status(self):
68
88
        """ Generate 'bzr status' output. """
69
 
        self.model = Gtk.TreeStore(str, str)
70
 
        self.treeview.set_headers_visible(False)
 
89
        self.model = gtk.TreeStore(str, str)
 
90
        self.treeview = self.glade.get_widget('treeview_status')
71
91
        self.treeview.set_model(self.model)
72
 
        self.treeview.connect("row-activated", self.row_diff)
73
 
 
74
 
        cell = Gtk.CellRendererText()
 
92
        
 
93
        cell = gtk.CellRendererText()
75
94
        cell.set_property("width-chars", 20)
76
 
        column = Gtk.TreeViewColumn()
77
 
        column.pack_start(cell, True)
 
95
        column = gtk.TreeViewColumn()
 
96
        column.pack_start(cell, expand=True)
78
97
        column.add_attribute(cell, "text", 0)
79
98
        self.treeview.append_column(column)
80
 
 
81
 
        delta = self.wt.changes_from(self.old_tree)
82
 
 
83
 
        changes = False
 
99
        
 
100
        if (bzrlib.version_info[0] == 0) and (bzrlib.version_info[1] < 9):
 
101
            delta = compare_trees(self.old_tree, self.wt)
 
102
        else:
 
103
            delta = self.wt.changes_from(self.old_tree)
84
104
 
85
105
        if len(delta.added):
86
 
            changes = True
87
 
            titer = self.model.append(None, [ _i18n('Added'), None ])
 
106
            titer = self.model.append(None, [ "Added", None ])
88
107
            for path, id, kind in delta.added:
89
108
                self.model.append(titer, [ path, path ])
90
109
 
91
110
        if len(delta.removed):
92
 
            changes = True
93
 
            titer = self.model.append(None, [ _i18n('Removed'), None ])
 
111
            titer = self.model.append(None, [ "Removed", None ])
94
112
            for path, id, kind in delta.removed:
95
113
                self.model.append(titer, [ path, path ])
96
114
 
97
115
        if len(delta.renamed):
98
 
            changes = True
99
 
            titer = self.model.append(None, [ _i18n('Renamed'), None ])
 
116
            titer = self.model.append(None, [ "Renamed", None ])
100
117
            for oldpath, newpath, id, kind, text_modified, meta_modified \
101
118
                    in delta.renamed:
102
119
                self.model.append(titer, [ oldpath, newpath ])
103
120
 
104
121
        if len(delta.modified):
105
 
            changes = True
106
 
            titer = self.model.append(None, [ _i18n('Modified'), None ])
 
122
            titer = self.model.append(None, [ "Modified", None ])
107
123
            for path, id, kind, text_modified, meta_modified in delta.modified:
108
124
                self.model.append(titer, [ path, path ])
109
 
 
 
125
        
110
126
        done_unknown = False
111
127
        for path in self.wt.unknowns():
112
 
            changes = True
113
128
            if not done_unknown:
114
 
                titer = self.model.append(None, [ _i18n('Unknown'), None ])
 
129
                titer = self.model.append(None, [ "Unknown", None ])
115
130
                done_unknown = True
116
131
            self.model.append(titer, [ path, path ])
117
132
 
118
 
        if not changes:
119
 
            self.model.append(None, [ _i18n('No changes.'), None ])
120
 
 
121
133
        self.treeview.expand_all()
 
134
    
 
135
    def display(self):
 
136
        """ Display the Diff window. """
 
137
        if self.notbranch:
 
138
            self.dialog.error_dialog('Directory is not a branch.')
 
139
            self.close()
 
140
        else:
 
141
            self.window.show_all()
122
142
 
123
143
    def close(self, widget=None):
124
144
        self.window.destroy()