Rename classes and import from proper directories

4 files changed, 48 insertions, 34 deletions

diff --git a/inital_setup/gui/__main__.py b/inital_setup/gui/__main__.py
index a6485b9..da99bee 100644
--- a/inital_setup/gui/__main__.py
+++ b/inital_setup/gui/__main__.py
@@ -1,37 +1,33 @@
 import os
-from pyanaconda.addons import collect_addon_paths
 
-addon_paths = ["addons"]
+# We need this so we can tell GI to look for overrides objects
+# also in anaconda source directories
+import gi.overrides
+for p in os.environ.get("ANACONDA_WIDGETS_OVERRIDES", "").split(":"):
+    gi.overrides.__path__.insert(0, p)
 
+from pyanaconda.addons import collect_addon_paths
 
+addon_paths = ["/usr/share/inital-setup/modules", "/usr/share/anaconda/addons"]
 addon_module_paths = collect_addon_paths(addon_paths)
-print addon_module_paths
 
 # Too bad anaconda does not have modularized logging
 from pyanaconda import anaconda_log
 anaconda_log.init()
 
-# Prepare data object
+# Prepare new data object
 from pyanaconda import kickstart
 data = kickstart.AnacondaKSHandler(addon_module_paths["ks"])
 
-
-# Import gui specifics
+# Import IS gui specifics
 import gui
 
-# Add to search paths
-gui.FirstbootGraphicalUserInterface.update_paths(addon_module_paths)
-
-# We need this so we can tell GI to look for overrides objects
-# also in anaconda source directories
-import os
-import gi.overrides
-for p in os.environ.get("ANACONDA_WIDGETS_OVERRIDES", "").split(":"):
-    gi.overrides.__path__.insert(0, p)
-
+# Add addons to search paths
+gui.InitalSetupGraphicalUserInterface.update_paths(addon_module_paths)
 
-g = gui.FirstbootGraphicalUserInterface(None, None, None)
-        
+# Initialize the UI
+g = gui.InitalSetupGraphicalUserInterface(None, None, None)
 g.setup(data)
 
+# Start the application
 g.run()
diff --git a/inital_setup/gui/gui.py b/inital_setup/gui/gui.py
index e830a9f..40cadb5 100644
--- a/inital_setup/gui/gui.py
+++ b/inital_setup/gui/gui.py
@@ -1,32 +1,41 @@
 from pyanaconda.ui.gui import QuitDialog, GUIObject, GraphicalUserInterface
 #from .product import productName, productVersion
-from .hubs import FirstbootHub
+from .hubs import InitalSetupMainHub
 from pyanaconda.ui.gui.spokes import StandaloneSpoke
 import pyanaconda.ui.gui.spokes
 from pyanaconda.ui.common import collect, FirstbootSpokeMixIn
-import os.path
+import os
+from gi.repository import Gdk
+import logging
+from di import inject, usesclassinject
 
-productName = "Fedora"
-productVersion = "rawhide"
-isFinal = False
+# localization
+_ = lambda t: t
+N_ = lambda t: t
 
-class FirstbootQuitDialog(QuitDialog):
-    MESSAGE = "Are you sure you want to quit the configuration process?\nYou might end up with unusable system if you do."
+productTitle = lambda: "Inital Setup of Fedora"
+isFinal = lambda: False
 
-class FirstbootGraphicalUserInterface(GraphicalUserInterface):
+class InitalSetupQuitDialog(QuitDialog):
+    MESSAGE = N_("Are you sure you want to quit the configuration process?\n"
+                 "You might end up with unusable system if you do.")
+
+@inject(Gdk, productTitle = productTitle, isFinal = isFinal)
+class InitalSetupGraphicalUserInterface(GraphicalUserInterface):
     """This is the main Gtk based firstboot interface. It inherits from
        anaconda to make the look & feel as similar as possible.
     """
 
-    TITLE = "%(productName)s %(productVersion)s SETUP"
+    screenshots_directory = "/tmp/inital-setup-screenshots"
     
+    @usesclassinject
     def __init__(self, storage, payload, instclass):
         GraphicalUserInterface.__init__(self, storage, payload, instclass,
-                                        productName, productVersion, isFinal,
-                                        quitDialog = FirstbootQuitDialog)
-    
+                                        productTitle, isFinal,
+                                        quitDialog = InitalSetupQuitDialog)
+        
     def _list_hubs(self):
-        return [FirstbootHub]
+        return [InitalSetupMainHub]
 
     basemask = "firstboot.gui"
     basepath = os.path.dirname(__file__)
diff --git a/inital_setup/gui/hubs/__init__.py b/inital_setup/gui/hubs/__init__.py
index d20b6cc..da350da 100644
--- a/inital_setup/gui/hubs/__init__.py
+++ b/inital_setup/gui/hubs/__init__.py
@@ -1 +1 @@
-from firstboot import FirstbootHub
+from inital_setup import InitalSetupMainHub
diff --git a/inital_setup/gui/hubs/inital_setup.py b/inital_setup/gui/hubs/inital_setup.py
index 27124b9..a0f6dc7 100644
--- a/inital_setup/gui/hubs/inital_setup.py
+++ b/inital_setup/gui/hubs/inital_setup.py
@@ -23,8 +23,10 @@ def collect_spokes(mask_paths):
     return spokes
 
 
-class FirstbootHub(SummaryHub):
-    uiFile = "hubs/firstboot.glade"
+class InitalSetupMainHub(Hub):
+    uiFile = "inital_setup.glade"
+    builderObjects = ["summaryWindow"]
+    mainWidgetName = "summaryWindow"
     
     def _collectCategoriesAndSpokes(self):
         """collects categories and spokes to be displayed on this Hub
@@ -46,3 +48,10 @@ class FirstbootHub(SummaryHub):
 
         return ret
 
+    @property
+    def continueButton(self):
+        return self.builder.get_object("continueButton")
+
+    @property
+    def quitButton(self):
+        return self.builder.get_object("quitButton")