conduit r1639 - in trunk: . conduit conduit/gtkui conduit/modules data test/python-tests

[jstowers svn gnome org]

Author: jstowers
Date: Sun Aug  3 10:48:45 2008
New Revision: 1639
URL: http://svn.gnome.org/viewvc/conduit?rev=1639&view=rev

Log:
	* conduit/Settings.py:
	* conduit/Web.py:
	* conduit/__init__.py:
	* conduit/gtkui/UI.py:
	* conduit/modules/TestModule.py:
	* data/conduit.glade:
	* test/python-tests/TestCoreSettings.py:
	* test/python-tests/common.py: Using the built in web browser
    is now the default behaviour. Selected browser is defined in
    conduit.BROWSER_IMPL.


Modified:
   trunk/   (props changed)
   trunk/ChangeLog
   trunk/conduit/Settings.py
   trunk/conduit/Web.py
   trunk/conduit/__init__.py
   trunk/conduit/gtkui/UI.py
   trunk/conduit/modules/TestModule.py
   trunk/data/conduit.glade
   trunk/test/python-tests/TestCoreSettings.py
   trunk/test/python-tests/common.py

Modified: trunk/conduit/Settings.py
==============================================================================
--- trunk/conduit/Settings.py	(original)
+++ trunk/conduit/Settings.py	Sun Aug  3 10:48:45 2008
@@ -79,7 +79,6 @@
         '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"
     }
         
     def __init__(self, implName):

Modified: trunk/conduit/Web.py
==============================================================================
--- trunk/conduit/Web.py	(original)
+++ trunk/conduit/Web.py	Sun Aug  3 10:48:45 2008
@@ -158,7 +158,7 @@
     either the system browser, or conduits own one.
     """
     def __init__(self, name, url, **kwargs):
-        browser = kwargs.get("browser",conduit.GLOBALS.settings.get("web_login_browser"))
+        browser = kwargs.get("browser",conduit.BROWSER_IMPL)
         log.info("Logging in using browser: %s (thread: %s)" % (browser,thread.get_ident()))
 
         #instantiate the browser

Modified: trunk/conduit/__init__.py
==============================================================================
--- trunk/conduit/__init__.py	(original)
+++ trunk/conduit/__init__.py	Sun Aug  3 10:48:45 2008
@@ -52,7 +52,8 @@
     SHARED_DATA_DIR =           os.path.join(DIRECTORY, "data")
     GLADE_FILE =                os.path.join(DIRECTORY, "data","conduit.glade")
     SHARED_MODULE_DIR =         os.path.join(DIRECTORY, "conduit", "modules")
-    SETTINGS_IMPL =             "GConf"
+    BROWSER_IMPL =              "gtkmozembed"   #{gtkmozembed, webkit, system}
+    SETTINGS_IMPL =             "GConf"         #{GConf,Python}
 
 import Globals
 GLOBALS = Globals.Globals()

Modified: trunk/conduit/gtkui/UI.py
==============================================================================
--- trunk/conduit/gtkui/UI.py	(original)
+++ trunk/conduit/gtkui/UI.py	Sun Aug  3 10:48:45 2008
@@ -356,8 +356,6 @@
         status_icon_check.set_active(conduit.GLOBALS.settings.get("show_status_icon")) 
         minimize_to_tray_check = tree.get_widget("minimize_to_tray_check")
         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"))
 
@@ -394,10 +392,6 @@
             conduit.GLOBALS.settings.set("save_on_exit", save_settings_check.get_active())
             conduit.GLOBALS.settings.set("show_status_icon", status_icon_check.get_active())
             conduit.GLOBALS.settings.set("gui_minimize_to_tray", minimize_to_tray_check.get_active())
-            if web_browser_check.get_active():
-                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:

Modified: trunk/conduit/modules/TestModule.py
==============================================================================
--- trunk/conduit/modules/TestModule.py	(original)
+++ trunk/conduit/modules/TestModule.py	Sun Aug  3 10:48:45 2008
@@ -588,7 +588,7 @@
     def __init__(self, *args):
         TestTwoWay.__init__(self)
         self.url = "http://www.google.com";
-        self.browser = conduit.GLOBALS.settings.get("web_login_browser")
+        self.browser = conduit.BROWSER_IMPL
 
     def configure(self, window):
         import gtk

Modified: trunk/data/conduit.glade
==============================================================================
--- trunk/data/conduit.glade	(original)
+++ trunk/data/conduit.glade	Sun Aug  3 10:48:45 2008
@@ -792,19 +792,6 @@
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkCheckButton" id="web_check">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="label" translatable="yes">Use built in Web browser</property>
-                                <property name="use_underline">True</property>
-                                <property name="response_id">0</property>
-                                <property name="draw_indicator">True</property>
-                              </widget>
-                              <packing>
-                                <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>
@@ -813,7 +800,7 @@
                                 <property name="draw_indicator">True</property>
                               </widget>
                               <packing>
-                                <property name="position">4</property>
+                                <property name="position">3</property>
                               </packing>
                             </child>
                           </widget>

Modified: trunk/test/python-tests/TestCoreSettings.py
==============================================================================
--- trunk/test/python-tests/TestCoreSettings.py	(original)
+++ trunk/test/python-tests/TestCoreSettings.py	Sun Aug  3 10:48:45 2008
@@ -10,7 +10,7 @@
         'gui_expanded_rows'         :   [],
         'gui_hpane_postion'         :   250,
         'gui_minimize_to_tray'      :   False,
-        'web_login_browser'         :   "system"
+        'default_policy_conflict'   :   "ask"
 }
 
 for impl in ("GConf", "Python"):

Modified: trunk/test/python-tests/common.py
==============================================================================
--- trunk/test/python-tests/common.py	(original)
+++ trunk/test/python-tests/common.py	Sun Aug  3 10:48:45 2008
@@ -37,12 +37,9 @@
 conduit.IS_DEVELOPMENT_VERSION =    True
 conduit.SHARED_DATA_DIR =           os.path.join(base_path,"data")
 conduit.SHARED_MODULE_DIR =         os.path.join(base_path,"conduit","modules")
+conduit.BROWSER_IMPL =              "system"
 conduit.SETTINGS_IMPL =             "GConf"
-
-# override some conduit settings. 
-# without a gobject main loop the gtkmozembed browser hangs
 conduit.GLOBALS.settings = Settings.Settings(conduit.SETTINGS_IMPL)
-conduit.GLOBALS.settings.set_overrides(web_login_browser="system")
 
 def is_online():
     try: