/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: Jelmer Vernooij
  • Date: 2012-07-09 15:23:26 UTC
  • mto: This revision was merged to the branch mainline in revision 794.
  • Revision ID: jelmer@samba.org-20120709152326-dzxb8zoz0btull7n
https://launchpad.net/bugs/714767
https://launchpad.net/bugs/949798
https://launchpad.net/bugs/998994
https://launchpad.net/bugs/342135
https://launchpad.net/bugs/342136
https://launchpad.net/bugs/394536
Remove bzr-notify.

Show diffs side-by-side

added added

removed removed

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