From 949144ab2597edccbb601ba31f880a5657b7812a Mon Sep 17 00:00:00 2001 From: Ebag333 Date: Thu, 16 Feb 2017 10:45:28 -0800 Subject: [PATCH] Embiggen the preference pane window. Change text, and clean up some unused imports. --- gui/builtinPreferenceViews/pyfaContextMenuPreferences.py | 2 ++ gui/builtinPreferenceViews/pyfaDatabasePreferences.py | 4 +--- gui/builtinPreferenceViews/pyfaLoggingPreferences.py | 5 +---- gui/preferenceDialog.py | 6 +++--- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/gui/builtinPreferenceViews/pyfaContextMenuPreferences.py b/gui/builtinPreferenceViews/pyfaContextMenuPreferences.py index 29ce587d3..f9f92d4e9 100644 --- a/gui/builtinPreferenceViews/pyfaContextMenuPreferences.py +++ b/gui/builtinPreferenceViews/pyfaContextMenuPreferences.py @@ -62,10 +62,12 @@ class PFContextMenuPref(PreferenceView): rbSizerRow2.Add(self.rbBox4, 1, wx.TOP | wx.RIGHT, 5) self.rbBox4.Bind(wx.EVT_RADIOBOX, self.OnSetting4Change) + ''' self.rbBox5 = wx.RadioBox(panel, -1, "Charge", wx.DefaultPosition, wx.DefaultSize, ['Disabled', 'Enabled'], 1, wx.RA_SPECIFY_COLS) self.rbBox5.SetSelection(self.settings.get('moduleAmmoPicker')) rbSizerRow2.Add(self.rbBox5, 1, wx.ALL, 5) self.rbBox5.Bind(wx.EVT_RADIOBOX, self.OnSetting5Change) + ''' self.rbBox6 = wx.RadioBox(panel, -1, "Charge (All)", wx.DefaultPosition, wx.DefaultSize, ['Disabled', 'Enabled'], 1, wx.RA_SPECIFY_COLS) self.rbBox6.SetSelection(self.settings.get('moduleGlobalAmmoPicker')) diff --git a/gui/builtinPreferenceViews/pyfaDatabasePreferences.py b/gui/builtinPreferenceViews/pyfaDatabasePreferences.py index 1460599a1..2ef248d18 100644 --- a/gui/builtinPreferenceViews/pyfaDatabasePreferences.py +++ b/gui/builtinPreferenceViews/pyfaDatabasePreferences.py @@ -3,7 +3,6 @@ import wx from gui.preferenceView import PreferenceView from gui.bitmapLoader import BitmapLoader -from gui.mainFrame import MainFrame import config import logging @@ -15,7 +14,6 @@ class PFGeneralPref(PreferenceView): title = "Database" def populatePanel(self, panel): - self.mainFrame = MainFrame.getInstance() self.dirtySettings = False # self.openFitsSettings = service.SettingsProvider.getInstance().getSettings("pyfaPrevOpenFits", {"enabled": False, "pyfaOpenFits": []}) @@ -26,7 +24,7 @@ class PFGeneralPref(PreferenceView): self.stTitle.SetFont(wx.Font(12, 70, 90, 90, False, wx.EmptyString)) mainSizer.Add(self.stTitle, 0, wx.ALL, 5) - self.stSubTitle = wx.StaticText(panel, wx.ID_ANY, u"(Cannot be changed while Pyfa is running.)", wx.DefaultPosition, wx.DefaultSize, 0) + self.stSubTitle = wx.StaticText(panel, wx.ID_ANY, u"(Cannot be changed while Pyfa is running. Set via command line switches.)", wx.DefaultPosition, wx.DefaultSize, 0) self.stSubTitle.Wrap(-1) self.stSubTitle.SetFont(wx.Font(10, 70, 90, 90, False, wx.EmptyString)) mainSizer.Add(self.stSubTitle, 0, wx.ALL, 5) diff --git a/gui/builtinPreferenceViews/pyfaLoggingPreferences.py b/gui/builtinPreferenceViews/pyfaLoggingPreferences.py index ecc0a6140..286aa9966 100644 --- a/gui/builtinPreferenceViews/pyfaLoggingPreferences.py +++ b/gui/builtinPreferenceViews/pyfaLoggingPreferences.py @@ -2,8 +2,6 @@ import wx from gui.preferenceView import PreferenceView from gui.bitmapLoader import BitmapLoader - -from gui.mainFrame import MainFrame import config @@ -11,7 +9,6 @@ class PFGeneralPref(PreferenceView): title = "Logging" def populatePanel(self, panel): - self.mainFrame = MainFrame.getInstance() self.dirtySettings = False # self.openFitsSettings = service.SettingsProvider.getInstance().getSettings("pyfaPrevOpenFits", {"enabled": False, "pyfaOpenFits": []}) @@ -22,7 +19,7 @@ class PFGeneralPref(PreferenceView): self.stTitle.SetFont(wx.Font(12, 70, 90, 90, False, wx.EmptyString)) mainSizer.Add(self.stTitle, 0, wx.ALL, 5) - self.stSubTitle = wx.StaticText(panel, wx.ID_ANY, u"(Cannot be changed while Pyfa is running.)", wx.DefaultPosition, wx.DefaultSize, 0) + self.stSubTitle = wx.StaticText(panel, wx.ID_ANY, u"(Cannot be changed while Pyfa is running. Set via command line switches.)", wx.DefaultPosition, wx.DefaultSize, 0) self.stSubTitle.Wrap(-1) self.stSubTitle.SetFont(wx.Font(10, 70, 90, 90, False, wx.EmptyString)) mainSizer.Add(self.stSubTitle, 0, wx.ALL, 5) diff --git a/gui/preferenceDialog.py b/gui/preferenceDialog.py index e6c5f12af..2ed0f829a 100644 --- a/gui/preferenceDialog.py +++ b/gui/preferenceDialog.py @@ -66,12 +66,12 @@ class PreferenceDialog(wx.Dialog): # Set the height based on a condition. Can all the panels fit in the current height? # If not, use the .GetBestVirtualSize() to ensure that all content is available. - minHeight = 360 + minHeight = 550 bestFit = self.GetBestVirtualSize() if minHeight > bestFit[1]: - self.SetSizeWH(450, minHeight) + self.SetSizeWH(650, minHeight) else: - self.SetSizeWH(450, bestFit[1]) + self.SetSizeWH(650, bestFit[1]) self.Layout()