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

  • Committer: Jelmer Vernooij
  • Date: 2006-09-27 17:43:04 UTC
  • mto: (0.12.2 olive)
  • mto: This revision was merged to the branch mainline in revision 83.
  • Revision ID: jelmer@samba.org-20060927174304-6e7eedf7952827d7
Fix dialog handling for log.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/ui.py
1
1
# Copyright (C) 2006 Szilveszter Farkas <szilveszter.farkas@gmail.com>
2
 
# Copyright (C) 2007 Jelmer Vernooij <jelmer@samba.org>
3
2
 
4
3
# This program is free software; you can redistribute it and/or modify
5
4
# it under the terms of the GNU General Public License as published by
23
22
import sys
24
23
 
25
24
import bzrlib.progress
 
25
from bzrlib.symbol_versioning import (deprecated_method, 
 
26
        zero_eight)
26
27
from bzrlib.ui import UIFactory
27
28
 
28
29
 
36
37
        
37
38
        self.vbox.show_all()
38
39
 
39
 
        self.add_buttons(gtk.STOCK_YES, gtk.RESPONSE_YES, gtk.STOCK_NO, 
40
 
                         gtk.RESPONSE_NO)
41
 
 
42
 
 
43
 
class GtkProgressBar(gtk.ProgressBar):
44
 
    def __init__(self, stack):
45
 
        super(GtkProgressBar, self).__init__()
46
 
        self.set_fraction(0.0)
47
 
        self._stack = stack
48
 
 
49
 
    def finished(self):
50
 
        self._stack.remove(self)
51
 
 
52
 
    def clear(self):
53
 
        pass
54
 
 
55
 
    def tick(self):
56
 
        self.pulse()
57
 
 
58
 
    def update(self, msg=None, current=None, total=None):
59
 
        if msg is not None:
60
 
            self.set_text(msg)
61
 
        if None not in (current, total):
62
 
            self.set_fraction(1.0 * current / total)
63
 
        while gtk.events_pending():
64
 
            gtk.main_iteration()
65
 
 
66
 
 
67
 
class GtkProgressBarStack(gtk.Window):
68
 
    def __init__(self):
69
 
        super(GtkProgressBarStack, self).__init__(type=gtk.WINDOW_TOPLEVEL)
70
 
        self.set_border_width(0)
71
 
        self.set_title("Progress")
72
 
        self.set_position(gtk.WIN_POS_CENTER_ALWAYS)
73
 
        self.vbox = gtk.VBox()
74
 
        self.add(self.vbox)
75
 
        self.set_resizable(False)
76
 
 
77
 
    def _adapt_size(self):
78
 
        self.resize(250, 15 * len(self.vbox.get_children()))
79
 
 
80
 
    def get_nested(self):
81
 
        nested = GtkProgressBar(self)
82
 
        self.vbox.pack_start(nested)
83
 
        self._adapt_size()
84
 
        self.show_all()
85
 
        return nested
86
 
 
87
 
    def remove(self, pb):
88
 
        self.vbox.remove(pb)
 
40
        self.add_buttons(gtk.STOCK_YES, gtk.RESPONSE_YES, gtk.STOCK_NO, gtk.RESPONSE_NO)
89
41
 
90
42
 
91
43
class PasswordDialog(gtk.Dialog):
111
63
 
112
64
 
113
65
class GtkUIFactory(UIFactory):
114
 
    """A UI factory for GTK user interfaces."""
 
66
    """A UI factory for GTK user interefaces."""
115
67
 
116
68
    def __init__(self,
 
69
                 bar_type=None,
117
70
                 stdout=None,
118
71
                 stderr=None):
119
72
        """Create a GtkUIFactory.
120
73
 
 
74
        :param bar_type: The type of progress bar to create. It defaults to 
 
75
                         letting the bzrlib.progress.ProgressBar factory auto
 
76
                         select.
121
77
        """
122
78
        super(GtkUIFactory, self).__init__()
123
 
        self._progress_bar_stack = None
 
79
        self._bar_type = bar_type
 
80
        if stdout is None:
 
81
            self.stdout = sys.stdout
 
82
        else:
 
83
            self.stdout = stdout
 
84
        if stderr is None:
 
85
            self.stderr = sys.stderr
 
86
        else:
 
87
            self.stderr = stderr
124
88
 
125
89
    def get_boolean(self, prompt):
126
90
        """GtkDialog with yes/no answers"""
127
91
        dialog = PromptDialog(prompt)
128
92
        response = dialog.run()
129
93
        dialog.destroy()
130
 
        return (response == gtk.RESPONSE_YES)
 
94
        if response == gtk.RESPONSE_YES:
 
95
            return True
 
96
        else:
 
97
            return False
131
98
        
 
99
    @deprecated_method(zero_eight)
 
100
    def progress_bar(self):
 
101
        """See UIFactory.nested_progress_bar()."""
 
102
        # this in turn is abstract, and creates either a tty or dots
 
103
        # bar depending on what we think of the terminal
 
104
        return bzrlib.progress.ProgressBar()
 
105
 
132
106
    def get_password(self, prompt='', **kwargs):
133
107
        """Prompt the user for a password.
134
108
 
150
124
 
151
125
    def nested_progress_bar(self):
152
126
        """Return a nested progress bar.
 
127
        
 
128
        The actual bar type returned depends on the progress module which
 
129
        may return a tty or dots bar depending on the terminal.
 
130
        
 
131
        FIXME: It should return a GtkProgressBar actually.
153
132
        """
154
133
        if self._progress_bar_stack is None:
155
 
            self._progress_bar_stack = GtkProgressBarStack()
 
134
            self._progress_bar_stack = bzrlib.progress.ProgressBarStack(
 
135
                klass=self._bar_type)
156
136
        return self._progress_bar_stack.get_nested()
157
137
 
158
 
    def set_progress_bar_vbox(self, vbox):
159
 
        """Change the vbox to put progress bars in.
160
 
        """
161
 
        self._progress_bar_stack = vbox
162
 
 
163
138
    def clear_term(self):
164
139
        """Prepare the terminal for output.
165
140