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

  • Committer: Jelmer Vernooij
  • Date: 2011-11-02 11:11:06 UTC
  • mfrom: (734.1.55 gtk3)
  • Revision ID: jelmer@samba.org-20111102111106-7l0vso8eg24dpf87
Merge gtk3 support from Curtis.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ui.py
19
19
"""GTK UI
20
20
"""
21
21
 
22
 
import gtk
 
22
from gi.repository import Gtk
23
23
 
24
24
from bzrlib.ui import UIFactory
25
25
 
26
26
 
27
 
class PromptDialog(gtk.Dialog):
 
27
class PromptDialog(Gtk.Dialog):
28
28
    """Prompt the user for a yes/no answer."""
29
29
 
30
30
    def __init__(self, prompt):
31
 
        gtk.Dialog.__init__(self)
32
 
 
33
 
        label = gtk.Label(prompt)
34
 
        self.vbox.pack_start(label, padding=10)
35
 
        self.vbox.show_all()
36
 
 
37
 
        self.add_buttons(gtk.STOCK_YES, gtk.RESPONSE_YES, gtk.STOCK_NO,
38
 
                         gtk.RESPONSE_NO)
39
 
 
40
 
 
41
 
class GtkProgressBar(gtk.ProgressBar):
 
31
        super(PromptDialog, self).__init__()
 
32
 
 
33
        label = Gtk.Label(label=prompt)
 
34
        self.get_content_area().pack_start(label, True, True, 10)
 
35
        self.get_content_area().show_all()
 
36
 
 
37
        self.add_buttons(Gtk.STOCK_YES, Gtk.ResponseType.YES, Gtk.STOCK_NO,
 
38
                         Gtk.ResponseType.NO)
 
39
 
 
40
 
 
41
class GtkProgressBar(Gtk.ProgressBar):
42
42
 
43
43
    def __init__(self):
44
 
        gtk.ProgressBar.__init__(self)
 
44
        super(GtkProgressBar, self).__init__()
45
45
        self.set_fraction(0.0)
46
46
        self.current = None
47
47
        self.total = None
63
63
            if self.fraction < 0.0 or self.fraction > 1.0:
64
64
                raise AssertionError
65
65
            self.set_fraction(self.fraction)
66
 
        while gtk.events_pending():
67
 
            gtk.main_iteration()
 
66
        while Gtk.events_pending():
 
67
            Gtk.main_iteration()
68
68
 
69
69
    def finished(self):
70
70
        self.hide()
73
73
        self.hide()
74
74
 
75
75
 
76
 
class ProgressBarWindow(gtk.Window):
 
76
class ProgressBarWindow(Gtk.Window):
77
77
 
78
78
    def __init__(self):
79
 
        super(ProgressBarWindow, self).__init__(type=gtk.WINDOW_TOPLEVEL)
 
79
        super(ProgressBarWindow, self).__init__(type=Gtk.WindowType.TOPLEVEL)
80
80
        self.set_border_width(0)
81
81
        self.set_title("Progress")
82
 
        self.set_position(gtk.WIN_POS_CENTER_ALWAYS)
 
82
        self.set_position(Gtk.WindowPosition.CENTER_ALWAYS)
83
83
        self.pb = GtkProgressBar()
84
84
        self.add(self.pb)
85
85
        self.resize(250, 15)
95
95
 
96
96
    def finished(self):
97
97
        self.pb.finished()
98
 
        self.hide_all()
 
98
        self.hide()
99
99
        self.destroy()
100
100
 
101
101
    def clear(self):
102
102
        self.pb.clear()
103
 
        self.hide_all()
104
 
 
105
 
 
106
 
class ProgressPanel(gtk.HBox):
 
103
        self.hide()
 
104
 
 
105
 
 
106
class ProgressPanel(Gtk.HBox):
107
107
 
108
108
    def __init__(self):
109
109
        super(ProgressPanel, self).__init__()
110
 
        image_loading = gtk.image_new_from_stock(gtk.STOCK_REFRESH,
111
 
                                                 gtk.ICON_SIZE_BUTTON)
 
110
        image_loading = Gtk.Image.new_from_stock(Gtk.STOCK_REFRESH,
 
111
                                                 Gtk.IconSize.BUTTON)
112
112
        image_loading.show()
113
113
 
114
114
        self.pb = GtkProgressBar()
115
115
        self.set_spacing(5)
116
116
        self.set_border_width(5)
117
 
        self.pack_start(image_loading, False, False)
118
 
        self.pack_start(self.pb, True, True)
 
117
        self.pack_start(image_loading, False, False, 0)
 
118
        self.pack_start(self.pb, True, True, 0)
119
119
 
120
120
    def tick(self, *args, **kwargs):
121
121
        self.show_all()
127
127
 
128
128
    def finished(self):
129
129
        self.pb.finished()
130
 
        self.hide_all()
 
130
        self.hide()
131
131
 
132
132
    def clear(self):
133
133
        self.pb.clear()
134
 
        self.hide_all()
135
 
 
136
 
 
137
 
class PasswordDialog(gtk.Dialog):
 
134
        self.hide()
 
135
 
 
136
 
 
137
class PasswordDialog(Gtk.Dialog):
138
138
    """ Prompt the user for a password. """
139
139
 
140
140
    def __init__(self, prompt):
141
 
        gtk.Dialog.__init__(self)
142
 
 
143
 
        label = gtk.Label(prompt)
144
 
        self.vbox.pack_start(label, padding=10)
145
 
 
146
 
        self.entry = gtk.Entry()
 
141
        super(PasswordDialog, self).__init__()
 
142
 
 
143
        label = Gtk.Label(label=prompt)
 
144
        self.get_content_area().pack_start(label, True, True, 10)
 
145
 
 
146
        self.entry = Gtk.Entry()
147
147
        self.entry.set_visibility(False)
148
 
        self.vbox.pack_end(self.entry, padding=10)
149
 
 
150
 
        self.vbox.show_all()
151
 
 
152
 
        self.add_buttons(gtk.STOCK_OK, gtk.RESPONSE_OK,
153
 
                         gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL)
 
148
        self.get_content_area().pack_end(self.entry, False, False, 10)
 
149
 
 
150
        self.get_content_area().show_all()
 
151
 
 
152
        self.add_buttons(Gtk.STOCK_OK, Gtk.ResponseType.OK,
 
153
                         Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL)
154
154
 
155
155
    def _get_passwd(self):
156
156
        return self.entry.get_text()
174
174
        dialog = PromptDialog(prompt)
175
175
        response = dialog.run()
176
176
        dialog.destroy()
177
 
        return (response == gtk.RESPONSE_YES)
 
177
        return (response == Gtk.ResponseType.YES)
178
178
 
179
179
    def get_password(self, prompt='', **kwargs):
180
180
        """Prompt the user for a password.
190
190
        response = dialog.run()
191
191
        passwd = dialog.passwd
192
192
        dialog.destroy()
193
 
        if response == gtk.RESPONSE_OK:
 
193
        if response == Gtk.ResponseType.OK:
194
194
            return passwd
195
195
        else:
196
196
            return None