Changeset 42:f23f648550e9

Timestamp:

03/10/12 16:20:55 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Started the flight wizard and it is now possible to log in

Location:

src/mlx

Files:

• config.py (modified) (3 diffs)
• gui/common.py (modified) (2 diffs)
• gui/flight.py (added)
• gui/gui.py (modified) (4 diffs)

src/mlx/config.py

@@ -20 +20 @@
         """Construct the configuration with default values."""
 
+        self._pilotID = ""
+        self._password = ""
+
         self._autoUpdate = True        
         self._updateURL = Config.DEFAULT_UPDATE_URL
 
         self._modified = False
+
+    @property
+    def pilotID(self):
+        """Get the pilot ID."""
+        return self._pilotID
+
+    @pilotID.setter
+    def pilotID(self, pilotID):
+        """Set the pilot ID."""
+        if pilotID!=self._pilotID:
+            self._pilotID = pilotID
+            self._modified = True
+
+    @property
+    def password(self):
+        """Get the password."""
+        return self._password
+
+    @password.setter
+    def password(self, password):
+        """Set the password."""
+        if password!=self._password:
+            self._password = password
+            self._modified = True
 
     @property
@@ -54 +81 @@
         config.read(configPath)
 
+        self._pilotID = self._get(config, "login", "id", "")
+        self._password = self._get(config, "login", "password", "")
+
         self._autoUpdate = self._getBoolean(config, "update", "auto", True)
         self._updateURL = self._get(config, "update", "url",
@@ -65 +95 @@
 
         config = ConfigParser.RawConfigParser()
+
+        config.add_section("login")
+        config.set("login", "id", self._pilotID)
+        config.set("login", "password", self._password)
 
         config.add_section("update")

src/mlx/gui/common.py

@@ -17 +17 @@
     except Exception, e:
         pass
+
+    MESSAGETYPE_ERROR = gtk.MESSAGE_ERROR
+    BUTTONSTYPE_OK = gtk.BUTTONS_OK
 else:
     print "Using PyGObject"
@@ -25 +28 @@
     from gi.repository import AppIndicator3 as appindicator
     appIndicator = True
+
+    MESSAGETYPE_ERROR = gtk.MessageType.ERROR
+    BUTTONSTYPE_OK = gtk.ButtonsType.OK
 
 import cairo

src/mlx/gui/gui.py

@@ -5 +5 @@
 from update import Updater
 from mlx.gui.common import *
+from mlx.gui.flight import Wizard
 
 import mlx.const as const
@@ -40 +41 @@
 
         self._programDirectory = programDirectory
-        self._config = config
+        self.config = config
         self._connecting = False
         self._connected = False
@@ -69 +70 @@
         window.add(mainVBox)
 
+        notebook = gtk.Notebook()
+        mainVBox.add(notebook)
+
+        notebook.append_page(Wizard(self), gtk.Label("Flight"))
+
+        dataVBox = gtk.VBox()
+        notebook.append_page(dataVBox, gtk.Label("Data"))
+
         setupFrame = self._buildSetupFrame()
         setupFrame.set_border_width(8)
-        mainVBox.pack_start(setupFrame, False, False, 0)
+        dataVBox.pack_start(setupFrame, False, False, 0)
 
         dataFrame = self._buildDataFrame()
         dataFrame.set_border_width(8)
-        mainVBox.pack_start(dataFrame, False, False, 0)
-
+        dataVBox.pack_start(dataFrame, False, False, 0)
+
+        logVBox = gtk.VBox()
+        notebook.append_page(logVBox, gtk.Label("Log"))
+        
         logFrame = self._buildLogFrame()
         logFrame.set_border_width(8)
-        mainVBox.pack_start(logFrame, True, True, 0)
+        logVBox.pack_start(logFrame, True, True, 0)
 
         mainVBox.pack_start(gtk.HSeparator(), False, False, 0)
@@ -94 +106 @@
     def run(self):
         """Run the GUI."""
-        if self._config.autoUpdate:
+        if self.config.autoUpdate:
             self._updater = Updater(self,
                                     self._programDirectory,
-                                    self._config.updateURL,
+                                    self.config.updateURL,
                                     self._mainWindow)
             self._updater.start()