Changeset 3074

Timestamp:

07/04/08 10:52:59 (5 years ago)

Author:

nopper

Message:

First implementation of help system for umit-console

Location:

branch/UmitPlugins

Files:

• higwidgets/higtooltips.py (modified) (10 diffs)
• source-plugins/umit-console/sources/console/console.py (modified) (5 diffs)
• source-plugins/umit-console/sources/main.py (modified) (1 diff)
• source-plugins/update.sh (modified) (1 diff)

branch/UmitPlugins/higwidgets/higtooltips.py

@@ -31 +31 @@
         self.stock = stock
         self.file = file
+        self.widgets = []
+
+    def append_widget(self, widget, expand=True, fill=True, padding=0, show=True):
+        self.widgets.append(((widget, expand, fill, padding), show))
 
 class HIGTooltip(gtk.Window):
@@ -67 +71 @@
         self._tail_width = 10
         self._tail_offset = 10
-
-        HIGTooltip.__instance = self
 
     def __create_widgets(self):
@@ -85 +87 @@
         self._left = gtk.Label()
 
+        self.vbox = gtk.VBox()
+
     def __pack_widgets(self):
         hbox = gtk.HBox(False, 2)
@@ -91 +95 @@
         hbox.set_spacing(4)
 
-        vbox = gtk.VBox(False, 2)
-        vbox.pack_start(hbox, False, False, 0)
-        vbox.pack_start(gtk.HSeparator(), False, False, 0)
-        vbox.pack_start(self._message, False, False, 0)
-
-        vbox.set_spacing(4)
-        vbox.set_border_width(10)
+        self.vbox.pack_start(hbox, False, False, 0)
+        self.vbox.pack_start(gtk.HSeparator(), False, False, 0)
+        self.vbox.pack_start(self._message, False, False, 0)
+
+        self.vbox.set_spacing(4)
+        self.vbox.set_border_width(10)
 
         table = gtk.Table(3, 3)
@@ -105 +108 @@
         table.attach(self._right, 2, 3, 0, 3, xoptions=gtk.SHRINK)
         
-        table.attach(vbox, 1, 2, 1, 2)
+        table.attach(self.vbox, 1, 2, 1, 2)
 
         table.show_all()
@@ -295 +298 @@
             return (start_x, start_y, _w, _h)
 
-
-        #if self._is_top:
-        #    # Draw bottom
-        #    if self._is_left:
-        #        # Draw right
-        #        cr.move_to(w, h)
-        #        cr.rel_line_to(-self._tail_width, -self._tail_height + offset)
-        #        cr.rel_line_to(-self._tail_width * 2, 0)
-        #        return (w, h)
-        #    else:
-        #        # Draw left
-        #        cr.move_to(x, h)
-        #        cr.rel_line_to(self._tail_width, -self._tail_height + offset)
-        #        cr.rel_line_to(self._tail_width * 2, 0)
-        #        return (x, h)
-        #else:
-        #    # Draw top
-        #    if self._is_left:
-        #        # Draw right
-        #        cr.move_to(w, y)
-        #        cr.rel_line_to(-self._tail_width, self._tail_height + offset)
-        #        cr.rel_line_to(-self._tail_width * 2, 0)
-        #        return (w, y)
-        #    else:
-        #        # Draw left
-        #        cr.move_to(x, y)
-        #        cr.rel_line_to(self._tail_width, self._tail_height + offset)
-        #        cr.rel_line_to(self._tail_width * 2, 0)
-        #        return (x, y)
-    
     def do_realize(self):
         gtk.Window.do_realize(self)
@@ -386 +359 @@
         HIGTooltip.get_instance().widgets[widget] = data
     
-    def __show_tooltip(self, w):
+    def show_at(self, w, data, x, y, time=None):
+        """
+        Show the tooltip at location
+
+        (make x, y optional)
+        """
+
+        assert (self != HIGTooltip.__instance, \
+                "You should create another HIGTooltip object to do it")
+
+        if self._timeout_started or \
+           self.flags() & gtk.VISIBLE or \
+           self._hover:
+            return False
+
+        # We pack the childs now
+        for child, show in data.widgets:
+            self.vbox.pack_start(*child)
+
+            if show:
+                child[0].show()
+
+        self._hover = w
+        self._timeout_started = True
+        self.__show_tooltip(w, data, x, y)
+
+        if time:
+            self._timeout_id = gobject.timeout_add(time, self.close_and_destroy)
+
+    def close_and_destroy(self):
+        """
+        Hide the widget resetting values used and also destroy window
+        """
+        assert (self != HIGTooltip.__instance, \
+                "You should create another HIGTooltip object to do it")
+
+        self._hover = None
+        self._timeout_started = False
+
+        if self._timeout_id:
+            gobject.source_remove(self._timeout_id)
+            self._timeout_id = None
+
+        self.hide()
+        self.destroy()
+
+        return False
+
+    def __show_tooltip(self, w, data=None, x=None, y=None):
         if not self._timeout_started or \
            self.flags() & gtk.VISIBLE or \
@@ -392 +413 @@
             return False
 
-        window = w.get_parent_window()
-
-        x, y = window.get_position()
-        px, py, pmask = window.get_pointer()
-
-        x += px; y += py
+        if not data:
+            window = w.get_parent_window()
+
+            x, y = window.get_position()
+            px, py, pmask = window.get_pointer()
+
+            x += px; y += py
+
         rect = w.get_allocation()
 
@@ -412 +435 @@
         else: self._is_top = False
         
-        data = self._widgets[w]
+        if not data:
+            data = self._widgets[w]
 
         self.title = data.title
@@ -451 +475 @@
         "Return the instance of HIGTooltip"
         if not HIGTooltip.__instance:
-            HIGTooltip()
+            HIGTooltip.__instance = HIGTooltip()
 
         return HIGTooltip.__instance

branch/UmitPlugins/source-plugins/umit-console/sources/console/console.py

@@ -50 +50 @@
 import gtk
 import pango
+import gobject
 
 # Completions stuff
@@ -212 +213 @@
     """ Interactive GTK console class """
 
+    __gsignals__ = {
+        'eval' : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_BOOLEAN, (gobject.TYPE_STRING, ))
+    }
+
     def __init__(self, namespace={}, quit_handler = None):
         """ Initialize console
@@ -400 +405 @@
         self.prompt1()
 
+    def append_text(self, txt):
+        iter = self.buffer.get_iter_at_mark(self.buffer.get_insert())
+        self.buffer.insert_with_tags_by_name(iter, txt, 'normal')
+        self.text.scroll_to_mark (self.buffer.get_insert(), 0)
 
     def prompt1 (self):
@@ -560 +569 @@
     def execute (self, cmd):
         """ Execute a given command """
+
+        if self.emit('eval', cmd):
+            return
 
         sys.stdout, self.stdout = self.stdout, sys.stdout
@@ -733 +745 @@
         return False
 
-
+gobject.type_register(Console)
 
 # =============================================================================

branch/UmitPlugins/source-plugins/umit-console/sources/main.py

@@ -29 +29 @@
 
 from umitPlugin.Engine import Plugin
+from higwidgets.higtooltips import HIGTooltip, HIGTooltipData
 
 class ConsoleView(UmitView):
     label_text = "Umit Shell"
-    
+
     def create_ui(self):
         con = console.Console(globals())
         con.banner()
 
+        con.connect('eval', self.__on_help)
+
         self._main_widget.add(con)
         self._main_widget.show_all()
+
+    def __on_help(self, console, cmd):
+        print console, cmd
+
+        cmd = cmd.replace("\n", "")
+
+        if cmd == "help":
+            console.append_text("Have you called help?\n")
+
+            data = HIGTooltipData(
+                "This is the help system of umitConsole.\n"
+                "Now i'll show you some umit funcionality\n\n\n" +
+                "<i>Press <b>Close</b> or <b>Next</b> to continue</i>\n")
+
+            hbb = gtk.HButtonBox()
+            hbb.set_layout(gtk.BUTTONBOX_END)
+
+            btn = gtk.Button(stock=gtk.STOCK_CLOSE)
+            hbb.pack_start(btn)
+            
+            btn = gtk.Button(stock=gtk.STOCK_GO_FORWARD)
+            hbb.pack_start(btn)
+
+            hbb.show_all()
+            data.append_widget(hbb)
+
+            x, y = console.window.get_origin()
+
+            tip = HIGTooltip()
+            tip.show_at(console, data, x, y, 10000)
+
+            return True
+        
+        return False
 
 class ConsolePlugin(Plugin):

branch/UmitPlugins/source-plugins/update.sh

@@ -8 +8 @@
 dir=`dirname $current`
 
-for i in */
-do
-        cd ${current}/${i}
-        PYTHONPATH=$dir:$PYTHONPATH python setup.py install
+if [ -e "$1" ]; then
+        cd ${current}/$1
+        PYTHONPATH=$dir:$PYTHONPATH python setup.py install --no-compile
         mv *.ump ../
-done
+else
+    for i in */
+    do
+        cd ${current}/${i}
+        PYTHONPATH=$dir:$PYTHONPATH python setup.py install --no-compile
+        mv *.ump ../
+    done
+fi
 
 echo