dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 17 Wiki Activity

Merge remote-tracking branch 'origin/development' into release/v2.5.0

Browse Source
This commit is contained in:
blitzmann
2018-10-08 12:40:23 -04:00
parent 9ec54c9004 f598e8e3c2
commit 1454cd8a0d
181 changed files with 6606 additions and 2836 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gui/builtinPreferenceViews/pyfaEsiPreferences.py
View File

@@ -1,17 +1,13 @@
# noinspection PyPackageRequirements
import wx
from gui.preferenceView import PreferenceView
from gui.bitmap_loader import BitmapLoader
import gui.mainFrame
from gui.bitmap_loader import BitmapLoader
from gui.preferenceView import PreferenceView
from service.settings import EsiSettings
# noinspection PyPackageRequirements
from wx.lib.intctrl import IntCtrl
from service.esi import Esi
# noinspection PyPackageRequirements
class PFEsiPref(PreferenceView):

5
gui/builtinPreferenceViews/pyfaGaugePreferences.py
View File

@@ -3,12 +3,9 @@
# noinspection PyPackageRequirements
import wx
import copy
from gui.preferenceView import PreferenceView
from gui.bitmap_loader import BitmapLoader
from gui.utils.color import CalculateTransition
import gui.utils.draw as drawUtils
from gui.preferenceView import PreferenceView
###########################################################################