conduit r1625 - in trunk: . conduit conduit/gtkui data

[jstowers svn gnome org]

Author: jstowers
Date: Sat Aug  2 07:32:47 2008
New Revision: 1625
URL: http://svn.gnome.org/viewvc/conduit?rev=1625&view=rev

Log:
	* conduit/Settings.py:
	* conduit/gtkui/Canvas.py:
	* conduit/gtkui/UI.py:
	* data/conduit.glade: Hints can be enabled/disabled from the
	preferences menu.


Modified:
   trunk/   (props changed)
   trunk/ChangeLog
   trunk/conduit/Settings.py
   trunk/conduit/gtkui/Canvas.py
   trunk/conduit/gtkui/UI.py
   trunk/data/conduit.glade

Modified: trunk/conduit/Settings.py
==============================================================================
--- trunk/conduit/Settings.py	(original)
+++ trunk/conduit/Settings.py	Sat Aug  2 07:32:47 2008
@@ -78,6 +78,7 @@
         'gui_initial_canvas_height' :   450,            #Reduce to ~300 for eepc, etc
         'gui_initial_canvas_width'  :   450,            #Reduce for eepc, etc
         'gui_use_rgba_colormap'     :   False,          #Seems to corrupt gtkmozembed on some systems
+        'gui_show_hints'            :   True,           #Show message area hints in the Conduit GUI
         'web_login_browser'         :   "gtkmozembed"   #When loggin into websites use: "system","gtkmozembed","webkit","gtkhtml"
     }
         

Modified: trunk/conduit/gtkui/Canvas.py
==============================================================================
--- trunk/conduit/gtkui/Canvas.py	(original)
+++ trunk/conduit/gtkui/Canvas.py	Sat Aug  2 07:32:47 2008
@@ -225,6 +225,9 @@
         if not self.msg:
             return
             
+        if not conduit.GLOBALS.settings.get("gui_show_hints"):
+            return
+            
         if newItem == conduitCanvasItem:
             self._make_hint(Hints.ADD_DATAPROVIDER)
         elif newItem == dataproviderCanvasItem:
@@ -308,7 +311,7 @@
         if self.model == None or (self.model != None and self.model.num_conduits() == 0):
             if self.welcome == None:
                 self._create_welcome()
-            if self.msg:
+            if self.msg and conduit.GLOBALS.settings.get("gui_show_hints"):
                 self._make_hint(Hints.BLANK_CANVAS, timeout=0)
 
         elif self.welcome:

Modified: trunk/conduit/gtkui/UI.py
==============================================================================
--- trunk/conduit/gtkui/UI.py	(original)
+++ trunk/conduit/gtkui/UI.py	Sat Aug  2 07:32:47 2008
@@ -316,6 +316,9 @@
         minimize_to_tray_check.set_active(conduit.GLOBALS.settings.get("gui_minimize_to_tray")) 
         web_browser_check = tree.get_widget("web_check")
         web_browser_check.set_active(conduit.GLOBALS.settings.get("web_login_browser") != "system")
+        show_hints_check = tree.get_widget("show_hints_check")
+        show_hints_check.set_active(conduit.GLOBALS.settings.get("gui_show_hints"))
+
 
         #restore the current policy
         for policyName in Conduit.CONFLICT_POLICY_NAMES:
@@ -353,6 +356,7 @@
                 conduit.GLOBALS.settings.set("web_login_browser", DEFAULT_CONDUIT_BROWSER)
             else:
                 conduit.GLOBALS.settings.set("web_login_browser", "system")
+            conduit.GLOBALS.settings.set("gui_show_hints", show_hints_check.get_active())
             #save the current policy
             for policyName in Conduit.CONFLICT_POLICY_NAMES:
                 for policyValue in Conduit.CONFLICT_POLICY_VALUES:

Modified: trunk/data/conduit.glade
==============================================================================
--- trunk/data/conduit.glade	(original)
+++ trunk/data/conduit.glade	Sat Aug  2 07:32:47 2008
@@ -804,6 +804,18 @@
                                 <property name="position">3</property>
                               </packing>
                             </child>
+                            <child>
+                              <widget class="GtkCheckButton" id="show_hints_check">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">Show Hints</property>
+                                <property name="response_id">0</property>
+                                <property name="draw_indicator">True</property>
+                              </widget>
+                              <packing>
+                                <property name="position">4</property>
+                              </packing>
+                            </child>
                           </widget>
                         </child>
                       </widget>