Changeset 3093

Timestamp:

07/07/08 15:10:11 (5 years ago)

Author:

nopper

Message:

Fixing bugs for console (umit-console plugin) and higtooltips (hiwidgets) and implementing a more sensed help system for umit-console

Location:

branch/UmitPlugins

Files:

• higwidgets/higtooltips.py (modified) (3 diffs)
• source-plugins/umit-console/sources/console/console.py (modified) (5 diffs)
• source-plugins/umit-console/sources/main.py (modified) (2 diffs)
• umitPlugin/Core.py (modified) (1 diff)

branch/UmitPlugins/higwidgets/higtooltips.py

@@ -49 +49 @@
         Create a HIGTooltip object
         """
-        gtk.Window.__init__(self, gtk.WINDOW_POPUP)
+        gtk.Window.__init__(self)#, gtk.WINDOW_POPUP)
+        self.set_decorated(False)
 
         self.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_MENU) # should be tooltip
@@ -381 +382 @@
                 child[0].show()
 
+        w.get_toplevel().connect('configure-event', self.__close_on_event)
+
         self._hover = w
         self._timeout_started = True
@@ -387 +390 @@
         if time:
             self._timeout_id = gobject.timeout_add(time, self.close_and_destroy)
+    def __close_on_event(self, w, event):
+        self.close_and_destroy()
 
     def close_and_destroy(self):

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

@@ -358 +358 @@
 
         iter = self.buffer.get_iter_at_mark(self.buffer.get_insert())
-        self.buffer.insert(iter, '\n')
+        self.buffer.insert_with_tags_by_name(iter, '\n', 'normal')
 
         width = max(self.get_width(), 4)
@@ -383 +383 @@
                     else:
                         n_spaces = col_width - len(completions[ind])
-                    self.buffer.insert(iter, completions[ind] + " " * n_spaces)
-            self.buffer.insert(iter, "\n")
+                    self.buffer.insert_with_tags_by_name( \
+                            iter, completions[ind] + " " * n_spaces, 'normal')
+            self.buffer.insert_with_tags_by_name(iter, '\n', 'normal')
 
         self.write (self.prompt, 'prompt')
@@ -526 +527 @@
         
         l = self.current_line()
-        self.write ('\n')
+        self.write ('\n', 'normal')
         self.history.append (l)
         end = self.buffer.get_end_iter()
@@ -621 +622 @@
             for line in f:
                 self.write ('\t'+line, 'script')
-            self.write ('\n')
+            self.write ('\n', 'normal')
             self.execute ("execfile('%s')" % filename)
             self.prompt1()
@@ -660 +661 @@
                 self.buffer.apply_tag_by_name('script', start, end)
 
-                self.write('\n')
+                self.write('\n', 'normal')
             else:
                 start, end = self.current_line_bounds()

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

@@ -28 +28 @@
 from tabber.views import UmitView
 
+from umitCore.I18N import _
 from umitPlugin.Engine import Plugin
+from umitPlugin.Atoms import Singleton
+from higwidgets.higbuttons import HIGButton
 from higwidgets.higtooltips import HIGTooltip, HIGTooltipData
+
+help_strings = [
+    _("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"),
+
+    _("Ok, let's introduce myself. The window above is a Python prompt.\n"
+      "Type a line of Python code, hit <i>Enter</i> and watch it run!\n\n"
+      "For example try typing some math. Like <tt>2 + 6</tt>\n"),
+
+    _("It could handle everything that Python supports. But it is also\n"
+      "used to interact with <b>UMIT</b> codebase and his <i>UI</i>.\n"
+      "For example try typing:\n\n"
+      "<tt>from umitPlugin.Core import Core</tt>\n"
+      "<tt>Core().get_main_toolbar().hide()</tt>\n")
+]
+
+
+class MiniButton(gtk.Button):
+    def __init__(self, stock):
+        gtk.Button.__init__(self)
+
+        img = gtk.image_new_from_stock(stock, gtk.ICON_SIZE_MENU)
+        img.show()
+
+        self.add(img)
+        self.set_relief(gtk.RELIEF_NONE)
+        self.connect('size-allocate', self.__size_allocate)
+
+    def __size_allocate(self, widget, alloc):
+        alloc.width = alloc.height
+        return gtk.Button.do_size_allocate(self, alloc)
+
+class Help(object):
+    def __init__(self, console):
+        self.index = 0
+        self.array = help_strings
+        self.console = console
+        self.tip = None
+
+    def next(self):
+        if self.index < len(self.array) - 1:
+            self.index += 1
+
+    def previous(self):
+        if self.index > 0:
+            self.index -= 1
+
+    def current(self):
+        string = self.array[self.index]
+        data = HIGTooltipData(string)
+
+        hbb = gtk.HBox(2, False)
+
+        btn = MiniButton(stock=gtk.STOCK_CLOSE)
+        btn.connect('clicked', self.__on_close)
+        hbb.pack_start(btn, False, False, 0)
+        
+        btn = MiniButton(stock=gtk.STOCK_GO_BACK)
+        btn.connect('clicked', self.__on_back)
+
+        if self.index == 0:
+            btn.set_sensitive(False)
+
+        hbb.pack_start(btn, False, False, 0)
+
+        btn = MiniButton(stock=gtk.STOCK_GO_FORWARD)
+        btn.connect('clicked', self.__on_forward)
+
+        if self.index == len(self.array) - 1:
+            btn.set_sensitive(False)
+
+        hbb.pack_start(btn, False, False, 0)
+
+        hbb.show_all()
+        
+        align = gtk.Alignment(1.0, 0.5)
+        align.add(hbb)
+
+        align.show_all()
+
+        data.append_widget(align)
+
+        return data
+
+    def __on_back(self, widget):
+        self.previous()
+        self.__on_close(widget)
+        self.show_help()
+
+    def __on_forward(self, widget):
+        self.next()
+        self.__on_close(widget)
+        self.show_help()
+
+    def __on_close(self, widget):
+        if self.tip:
+            self.tip.close_and_destroy()
+
+    def show_help(self):
+        self.__on_close(None)
+        self.tip = HIGTooltip()
+        x, y = self.console.window.get_origin()
+        self.tip.show_at(self.console, self.current(), x, y)
 
 class ConsoleView(UmitView):
@@ -35 +142 @@
 
     def create_ui(self):
-        con = console.Console(globals())
-        con.banner()
+        self.console = console.Console(globals())
+        self.console.connect('eval', self.__on_help)
+        self.console.banner()
 
-        con.connect('eval', self.__on_help)
+        self.help = Help(self.console)
 
-        self._main_widget.add(con)
+        self._main_widget.add(self.console)
         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")
+            #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)
+            self.help.show_help()
             
-            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
         

branch/UmitPlugins/umitPlugin/Core.py

@@ -109 +109 @@
 
     def open_url(self, link):
+        """
+        Open the default browser at link location
+
+        @param link the link to open
+        """
+
         import webbrowser