diff --git a/gui/builtinPreferenceViews/pyfaGeneralPreferences.py b/gui/builtinPreferenceViews/pyfaGeneralPreferences.py index 8615f7e2f..96a8696d1 100644 --- a/gui/builtinPreferenceViews/pyfaGeneralPreferences.py +++ b/gui/builtinPreferenceViews/pyfaGeneralPreferences.py @@ -1,18 +1,16 @@ # noinspection PyPackageRequirements import wx -from wx.lib.intctrl import IntCtrl -from gui.preferenceView import PreferenceView -from gui.bitmap_loader import BitmapLoader - -import gui.mainFrame import gui.globalEvents as GE -from service.settings import SettingsProvider +import gui.mainFrame +from gui.bitmap_loader import BitmapLoader +from gui.preferenceView import PreferenceView from service.fit import Fit -from service.price import Price +from service.settings import SettingsProvider class PFGeneralPref(PreferenceView): + title = "General" def populatePanel(self, panel): diff --git a/gui/builtinShipBrowser/pfListPane.py b/gui/builtinShipBrowser/pfListPane.py index 60a303b3a..6b00e221f 100644 --- a/gui/builtinShipBrowser/pfListPane.py +++ b/gui/builtinShipBrowser/pfListPane.py @@ -22,6 +22,7 @@ import wx class PFListPane(wx.ScrolledWindow): + def __init__(self, parent): wx.ScrolledWindow.__init__(self, parent, pos=wx.DefaultPosition, style=wx.TAB_TRAVERSAL) diff --git a/gui/preferenceDialog.py b/gui/preferenceDialog.py index 28b0a024a..382dc0441 100644 --- a/gui/preferenceDialog.py +++ b/gui/preferenceDialog.py @@ -57,7 +57,7 @@ class PreferenceDialog(wx.Dialog): for prefView in PreferenceView.views: page = wx.ScrolledWindow(self.listbook) - page.SetScrollbars(1, 1, 20, 20) + page.SetScrollRate(15, 15) bmp = prefView.getImage() if bmp: imgID = self.imageList.Add(bmp) diff --git a/gui/preferenceView.py b/gui/preferenceView.py index 0ee6230f5..0e5f8b369 100644 --- a/gui/preferenceView.py +++ b/gui/preferenceView.py @@ -21,7 +21,7 @@ import wx -class PreferenceView(object): +class PreferenceView: views = [] @classmethod