/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 missing.py

  • Committer: Vincent Ladeuil
  • Date: 2008-05-05 18:16:46 UTC
  • mto: (487.1.1 gtk)
  • mto: This revision was merged to the branch mainline in revision 490.
  • Revision ID: v.ladeuil+lp@free.fr-20080505181646-n95l8ltw2u6jtr26
Fix bug #187283 fix replacing _() by _i18n().

* genpot.sh 
Remove duplication. Add the ability to specify the genrated pot
file on command-line for debugging purposes.

* po/olive-gtk.pot:
Regenerated.

* __init__.py, branch.py, branchview/treeview.py, checkout.py,
commit.py, conflicts.py, diff.py, errors.py, initialize.py,
merge.py, nautilus-bzr.py, olive/__init__.py, olive/add.py,
olive/bookmark.py, olive/guifiles.py, olive/info.py,
olive/menu.py, olive/mkdir.py, olive/move.py, olive/remove.py,
olive/rename.py, push.py, revbrowser.py, status.py, tags.py:
Replace all calls to _() by calls to _i18n(), the latter being
defined in __init__.py and imported in the other modules from
there. This fix the problem encountered countless times when
running bzr selftest and getting silly error messages about
boolean not being callables.

Show diffs side-by-side

added added

removed removed

Lines of Context:
missing.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
 
 
 
17
try:
 
18
    import pygtk
 
19
    pygtk.require("2.0")
 
20
except:
 
21
    pass
 
22
 
 
23
import gtk
 
24
 
 
25
from bzrlib.config import GlobalConfig
19
26
from bzrlib.missing import find_unmerged
20
27
 
21
 
from bzrlib.plugins.gtk.revisionview import RevisionView
22
 
 
23
 
 
24
 
class MissingWindow(Gtk.Dialog):
 
28
from revisionview import RevisionView
 
29
 
 
30
class MissingWindow(gtk.Dialog):
25
31
    """Displays revisions present in one branch but missing in 
26
32
    another."""
27
33
    def __init__(self, local_branch, remote_branch):
28
34
        """ Initialize the Status window. """
29
 
        super(MissingWindow, self).__init__(flags=Gtk.DialogFlags.MODAL)
 
35
        super(MissingWindow, self).__init__(flags=gtk.DIALOG_MODAL)
30
36
        self.set_title("Missing Revisions")
31
37
        self.local_branch = local_branch
32
38
        self.remote_branch = remote_branch
35
41
        self._create()
36
42
 
37
43
    def _create_revisions_frame(self, revisions):
38
 
        extra_revs = Gtk.ScrolledWindow()
39
 
        vbox = Gtk.VBox()
 
44
        extra_revs = gtk.ScrolledWindow()
 
45
        vbox = gtk.VBox()
40
46
        for rev in revisions:
41
47
            rv = RevisionView()
42
48
            rv.set_revision(rev)
43
 
            vbox.pack_start(rv, True, True, 0)
 
49
            vbox.pack_start(rv, True, True)
44
50
        extra_revs.add_with_viewport(vbox)
45
 
        extra_revs.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC)
 
51
        extra_revs.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
46
52
        return extra_revs
47
53
 
48
54
    def _create(self):
49
55
        self.set_default_size(600, 600)
50
 
        paned = Gtk.Paned.new(Gtk.Orientation.VERTICAL)
 
56
        paned = gtk.VPaned()
51
57
 
52
 
        frame = Gtk.Frame(label="You have the following extra revisions:")
 
58
        frame = gtk.Frame("You have the following extra revisions:")
53
59
 
54
60
        extra_revs = self._create_revisions_frame(
55
61
                self.local_branch.repository.get_revisions(
61
67
                self.remote_branch.repository.get_revisions(
62
68
                    map(lambda (x,y):y, self.remote_extra)))
63
69
 
64
 
        frame = Gtk.Frame(label="You are missing following revisions:")
 
70
        frame = gtk.Frame("You are missing following revisions:")
65
71
        frame.add(missing_revs)
66
72
 
67
73
        paned.pack2(frame, resize=False, shrink=True)
68
74
 
69
 
        self.get_content_area().pack_start(paned, True, True, 0)
70
 
        self.get_content_area().show_all()
 
75
        self.vbox.pack_start(paned, True, True)
 
76
        self.vbox.show_all()