Changeset 186:a808eda90d15

Timestamp:

05/16/12 18:22:04 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Attempted to make the General tab of the Preferences dialog better looking

Location:

src/mlx

Files:

• gui/prefs.py (modified) (3 diffs)
• i18n.py (modified) (2 diffs)

src/mlx/gui/prefs.py

@@ -299 +299 @@
         mainAlignment = gtk.Alignment(xalign = 0.0, yalign = 0.0,
                                       xscale = 1.0, yscale = 0.0)
-        mainAlignment.set_padding(padding_top = 16, padding_bottom = 8,
+        mainAlignment.set_padding(padding_top = 0, padding_bottom = 8,
                                   padding_left = 4, padding_right = 4)
         mainBox = gtk.VBox()
         mainAlignment.add(mainBox)
 
+        guiBox = self._createFrame(mainBox, xstr("prefs_frame_gui"))
+        
         languageBox = gtk.HBox()
-        mainBox.pack_start(languageBox, False, False, 4)
+        guiBox.pack_start(languageBox, False, False, 4)
 
         label = gtk.Label(xstr("prefs_language"))
@@ -334 +336 @@
         self._hideMinimizedWindow.set_use_underline(True)
         self._hideMinimizedWindow.set_tooltip_text(xstr("prefs_hideMinimizedWindow_tooltip"))
-        mainBox.pack_start(self._hideMinimizedWindow, False, False, 4)
+        guiBox.pack_start(self._hideMinimizedWindow, False, False, 4)
+
+        onlineBox = self._createFrame(mainBox, xstr("prefs_frame_online"))        
 
         self._onlineGateSystem = gtk.CheckButton(xstr("prefs_onlineGateSystem"))
         self._onlineGateSystem.set_use_underline(True)
         self._onlineGateSystem.set_tooltip_text(xstr("prefs_onlineGateSystem_tooltip"))
-        mainBox.pack_start(self._onlineGateSystem, False, False, 4)
+        onlineBox.pack_start(self._onlineGateSystem, False, False, 4)
 
         self._onlineACARS = gtk.CheckButton(xstr("prefs_onlineACARS"))
         self._onlineACARS.set_use_underline(True)
         self._onlineACARS.set_tooltip_text(xstr("prefs_onlineACARS_tooltip"))
-        mainBox.pack_start(self._onlineACARS, False, False, 4)
+        onlineBox.pack_start(self._onlineACARS, False, False, 4)
+
+        simulatorBox = self._createFrame(mainBox, xstr("prefs_frame_simulator"))
 
         self._flareTimeFromFS = gtk.CheckButton(xstr("prefs_flaretimeFromFS"))
         self._flareTimeFromFS.set_use_underline(True)
         self._flareTimeFromFS.set_tooltip_text(xstr("prefs_flaretimeFromFS_tooltip"))
-        mainBox.pack_start(self._flareTimeFromFS, False, False, 4)
+        simulatorBox.pack_start(self._flareTimeFromFS, False, False, 4)
                                        
         self._syncFSTime = gtk.CheckButton(xstr("prefs_syncFSTime"))
         self._syncFSTime.set_use_underline(True)
         self._syncFSTime.set_tooltip_text(xstr("prefs_syncFSTime_tooltip"))
-        mainBox.pack_start(self._syncFSTime, False, False, 4)
+        simulatorBox.pack_start(self._syncFSTime, False, False, 4)
 
         self._usingFS2Crew = gtk.CheckButton(xstr("prefs_usingFS2Crew"))
         self._usingFS2Crew.set_use_underline(True)
         self._usingFS2Crew.set_tooltip_text(xstr("prefs_usingFS2Crew_tooltip"))
-        mainBox.pack_start(self._usingFS2Crew, False, False, 4)
+        simulatorBox.pack_start(self._usingFS2Crew, False, False, 4)
 
         pirepBox = gtk.HBox()
-        mainBox.pack_start(pirepBox, False, False, 4)
+        mainBox.pack_start(pirepBox, False, False, 8)
 
         label = gtk.Label(xstr("prefs_pirepDirectory"))
@@ -379 +385 @@
         
         return mainAlignment
+
+    def _createFrame(self, mainBox, label):
+        """Create a frame with an inner alignment and VBox.
+
+        Return the vbox."""
+        frame = gtk.Frame(label = label)
+        mainBox.pack_start(frame, False, False, 4)
+        alignment = gtk.Alignment(xalign = 0.0, yalign = 0.0,
+                                  xscale = 1.0, yscale = 0.0)
+        alignment.set_padding(padding_top = 4, padding_bottom = 0,
+                              padding_left = 0, padding_right = 0)
+        frame.add(alignment)
+        vbox = gtk.VBox()
+        alignment.add(vbox)
+
+        return vbox
 
     def _setLanguage(self, language):

src/mlx/i18n.py

@@ -666 +666 @@
         self.add("prefs_pirepDirectory_browser_title",
                  "Select PIREP directory")
+        self.add("prefs_frame_gui", "GUI")
+        self.add("prefs_frame_online", "MAVA Online Systems")
+        self.add("prefs_frame_simulator", "Simulator")
 
         self.add("chklst_title", "Checklist Editor")
@@ -1390 +1393 @@
         self.add("prefs_pirepDirectory_browser_title",
                  "Válaszd ki a PIREP-ek könyvtárát")
+        self.add("prefs_frame_gui", "Grafikus felület")
+        self.add("prefs_frame_online", "MAVA online rendszerek")
+        self.add("prefs_frame_simulator", "Szimulátor")
 
         self.add("prefs_sounds_frame_bg", "Háttérhangok")