/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-08 19:02:08 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-20060808190208-196e342eb0531ceb
Some artwork revamp; added 16x16 icons to the menu.

2006-08-08  Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
    * olive.glade: some icons redrawn + added 16x16 icons
    * icons/*: some icons redrawn + added 16x16 icons
    * setup.py: modified respectively

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