/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 annotate/config.py

  • Committer: Lucas Shrewsbury
  • Date: 2009-08-24 05:45:14 UTC
  • mto: This revision was merged to the branch mainline in revision 663.
  • Revision ID: rollbak@gmail.com-20090824054514-x5cteatkygzhw1ls
Fix #294632 by adding ignored emblem and correct status.
Fix #417966 by setting not emblem and correcting status.

* nautilus-bzr.py:
(BzrExtension.update_file_info): added check for ignored and unversioned files.

* setup.py: 
(data_files): added ignored emblem image.

Show diffs side-by-side

added added

removed removed

Lines of Context:
annotate/config.py
16
16
 
17
17
import os
18
18
 
19
 
from gi.repository import Gdk
 
19
import gtk.gdk
20
20
 
21
21
from bzrlib import config
22
 
try:
23
 
    import bzrlib.util.configobj.configobj as configobj
24
 
except ImportError:
25
 
    import configobj
 
22
import bzrlib.util.configobj.configobj as configobj
26
23
 
27
24
 
28
25
def gannotate_config_filename():
38
35
    """
39
36
 
40
37
    def __init__(self, window):
41
 
        super(GAnnotateConfig, self).__init__(gannotate_config_filename())
 
38
        configobj.ConfigObj.__init__(self, gannotate_config_filename())
42
39
        self.window = window
43
40
        self.pane = window.pane
44
41
 
62
59
        self.pane.set_position(self['window'].as_int('pane_position'))
63
60
        self.window.set_default_size(self['window'].as_int('width'),
64
61
                                     self['window'].as_int('height'))
65
 
        self.window.move(
66
 
            self['window'].as_int('x'), self['window'].as_int('y'))
 
62
        self.window.move(self['window'].as_int('x'), self['window'].as_int('y'))
67
63
 
68
64
        if self['window'].as_bool('maximized'):
69
65
            self.window.maximize()
72
68
        self.window.connect("destroy", self._write)
73
69
        self.window.connect("configure-event", self._save_window_props)
74
70
        self.window.connect("window-state-event", self._save_window_props)
 
71
        self.pane.connect("notify", self._save_pane_props)
75
72
 
76
73
    def _save_window_props(self, w, e, *args):
77
 
        if e.window.get_state() & Gdk.WindowState.MAXIMIZED:
 
74
        if e.window.get_state() & gtk.gdk.WINDOW_STATE_MAXIMIZED:
78
75
            maximized = True
79
76
        else:
80
77
            self["window"]["width"], self["window"]["height"] = w.get_size()
83
80
        self["window"]["maximized"] = maximized
84
81
        return False
85
82
 
86
 
    def _save_pane_props(self):
87
 
        self["window"]["pane_position"] = self.pane.get_position()
 
83
    def _save_pane_props(self, w, gparam):
 
84
        if gparam.name == "position":
 
85
            self["window"]["pane_position"] = w.get_position()
 
86
 
 
87
        return False
88
88
 
89
89
    def _write(self, *args):
90
 
        self._save_pane_props()
91
 
        config.ensure_config_dir_exists()
92
90
        self.write()
 
91
 
93
92
        return False
 
93