From ea3969e1e3f7fdf44e4893fa0fb9ab510d3a9c0d Mon Sep 17 00:00:00 2001
From: blitzmann <ryan.xgamer99@gmail.com>
Date: Sun, 2 Mar 2014 20:02:36 -0500
Subject: [PATCH] Show preference pages in the order they appear in
 builtinPreferenceViews

---
 gui/builtinPreferenceViews/__init__.py              | 2 +-
 gui/builtinPreferenceViews/pyfaGlobalPreferences.py | 2 +-
 gui/preferenceDialog.py                             | 4 ++--
 gui/preferenceView.py                               | 8 ++------
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/gui/builtinPreferenceViews/__init__.py b/gui/builtinPreferenceViews/__init__.py
index 2aa354eb0..457724c9a 100644
--- a/gui/builtinPreferenceViews/__init__.py
+++ b/gui/builtinPreferenceViews/__init__.py
@@ -1 +1 @@
-__all__ = ["pyfaGlobalPreferences","pyfaProxyPreferences","pyfaHTMLExportPreferences"]
+__all__ = ["pyfaGlobalPreferences","pyfaHTMLExportPreferences","pyfaProxyPreferences"]
diff --git a/gui/builtinPreferenceViews/pyfaGlobalPreferences.py b/gui/builtinPreferenceViews/pyfaGlobalPreferences.py
index af9fb6b33..22384b932 100644
--- a/gui/builtinPreferenceViews/pyfaGlobalPreferences.py
+++ b/gui/builtinPreferenceViews/pyfaGlobalPreferences.py
@@ -11,7 +11,7 @@ import gui.globalEvents as GE
 
 
 class PFGlobalPref ( PreferenceView):
-    title = "General Options"
+    title = "General"
 
     def populatePanel( self, panel ):
         charHelpText = '''Each fit has a character assigned to it, with different fits having different
diff --git a/gui/preferenceDialog.py b/gui/preferenceDialog.py
index c9b10c636..15f0c2add 100644
--- a/gui/preferenceDialog.py
+++ b/gui/preferenceDialog.py
@@ -53,7 +53,7 @@ class PreferenceDialog(wx.Dialog):
 
         self.Centre(wx.BOTH)
 
-        for title, prefView in PreferenceView.views.iteritems():
+        for prefView in PreferenceView.views:
             page = wx.Panel(self.listbook)
             bmp = prefView.getImage()
             if bmp:
@@ -61,7 +61,7 @@ class PreferenceDialog(wx.Dialog):
             else:
                 imgID = -1
             prefView.populatePanel(page)
-            self.listbook.AddPage(page, title, imageId = imgID)
+            self.listbook.AddPage(page, prefView.title, imageId = imgID)
 
         self.Fit()
         self.Layout()
diff --git a/gui/preferenceView.py b/gui/preferenceView.py
index 8833d8cb7..bf1ba76ed 100644
--- a/gui/preferenceView.py
+++ b/gui/preferenceView.py
@@ -20,17 +20,13 @@
 import wx
 
 class PreferenceView(object):
-    views = {}
+    views = []
     def __init__(self):
         pass
 
     @classmethod
     def register(cls):
-        PreferenceView.views[cls.title] = cls()
-
-    @classmethod
-    def getView(cls, name):
-        return cls.views[name]
+        PreferenceView.views.append(cls())
 
     def populatePanel(self, panel):
         raise NotImplementedError()