From 9b096524ccd44fc667a3a8e57accffbe2e773fea Mon Sep 17 00:00:00 2001 From: blitzmann Date: Mon, 3 Mar 2014 01:53:55 -0500 Subject: [PATCH] Updated update preference view with new icon and text wrapping --- .../pyfaHTMLExportPreferences.py | 2 +- .../pyfaUpdatePreferences.py | 24 +++++++++--------- icons/prefs_update.png | Bin 0 -> 2096 bytes 3 files changed, 13 insertions(+), 13 deletions(-) create mode 100644 icons/prefs_update.png diff --git a/gui/builtinPreferenceViews/pyfaHTMLExportPreferences.py b/gui/builtinPreferenceViews/pyfaHTMLExportPreferences.py index 927a71c8b..225f42a93 100644 --- a/gui/builtinPreferenceViews/pyfaHTMLExportPreferences.py +++ b/gui/builtinPreferenceViews/pyfaHTMLExportPreferences.py @@ -31,7 +31,7 @@ class PFHTMLExportPref ( PreferenceView): mainSizer.Add( self.stTitle, 0, wx.ALL, 5 ) self.stDesc = wx.StaticText( panel, wx.ID_ANY, self.desc, wx.DefaultPosition, wx.DefaultSize, 0 ) - self.stDesc.Wrap(dlgWidth - 120) + self.stDesc.Wrap(dlgWidth - 50) mainSizer.Add( self.stDesc, 0, wx.ALL, 5 ) self.exportEnabled = wx.CheckBox( panel, wx.ID_ANY, u"Enable HTML export", wx.DefaultPosition, wx.DefaultSize, 0 ) diff --git a/gui/builtinPreferenceViews/pyfaUpdatePreferences.py b/gui/builtinPreferenceViews/pyfaUpdatePreferences.py index 0655564fd..b7f9cffbb 100644 --- a/gui/builtinPreferenceViews/pyfaUpdatePreferences.py +++ b/gui/builtinPreferenceViews/pyfaUpdatePreferences.py @@ -10,17 +10,17 @@ import gui.globalEvents as GE class PFUpdatePref (PreferenceView): - title = "Pyfa Update Options" - desc = """ -Pyfa can automatically check and notify you of new releases. -These options will allow you to choose what kind of updates, if any, you wish -to receive notifications for. -""" + title = "Updates" + desc = "Pyfa can automatically check and notify you of new releases. "+\ + "These options will allow you to choose what kind of updates, "+\ + "if any, you wish to receive notifications for." def populatePanel( self, panel ): self.UpdateSettings = service.settings.UpdateSettings.getInstance() self.dirtySettings = False + dlgWidth = panel.GetParent().GetParent().ClientSize.width + mainSizer = wx.BoxSizer( wx.VERTICAL ) self.stTitle = wx.StaticText( panel, wx.ID_ANY, self.title, wx.DefaultPosition, wx.DefaultSize, 0 ) @@ -29,6 +29,7 @@ to receive notifications for. mainSizer.Add( self.stTitle, 0, wx.ALL, 5 ) self.stDesc = wx.StaticText( panel, wx.ID_ANY, self.desc, wx.DefaultPosition, wx.DefaultSize, 0 ) + self.stDesc.Wrap(dlgWidth - 50) mainSizer.Add( self.stDesc, 0, wx.ALL, 5 ) self.suppressAll = wx.CheckBox( panel, wx.ID_ANY, u"Don't check for updates", wx.DefaultPosition, wx.DefaultSize, 0 ) @@ -51,11 +52,9 @@ to receive notifications for. self.versionTitle.Wrap( -1 ) self.versionTitle.SetFont( wx.Font( 12, 70, 90, 90, False, wx.EmptyString ) ) - self.versionInfo = ''' -There is a release available which you have chosen to suppress. -You can choose to reset notification suppression for this release, -or download the new release from GitHub. -''' + self.versionInfo = "There is a release available which you have chosen to suppress. "+\ + "You can choose to reset notification suppression for this release, "+\ + "or download the new release from GitHub." self.versionSizer.AddSpacer( ( 5, 5), 0, wx.EXPAND, 5 ) @@ -64,6 +63,7 @@ or download the new release from GitHub. self.versionSizer.Add( self.versionTitle, 0, wx.EXPAND, 5 ) self.versionDesc = wx.StaticText( panel, wx.ID_ANY, self.versionInfo, wx.DefaultPosition, wx.DefaultSize, 0 ) + self.versionDesc.Wrap(dlgWidth - 50) self.versionSizer.Add( self.versionDesc, 0, wx.ALL, 5 ) actionSizer = wx.BoxSizer( wx.HORIZONTAL ) @@ -114,6 +114,6 @@ or download the new release from GitHub. wx.LaunchDefaultBrowser('https://github.com/DarkFenX/Pyfa/releases/tag/'+self.UpdateSettings.get('version')) def getImage(self): - return bitmapLoader.getBitmap("pyfa64", "icons") + return bitmapLoader.getBitmap("prefs_update", "icons") PFUpdatePref.register() \ No newline at end of file diff --git a/icons/prefs_update.png b/icons/prefs_update.png new file mode 100644 index 0000000000000000000000000000000000000000..c1ab75d3bfabcb68c0ee0ca63ed27e12ee32783d GIT binary patch literal 2096 zcmV-02+#M4P)9aiWq^euq+Tl5+Edw?bwceeeHYgyK_F@Yi#30thIFFT>JaZ`F+3hJLi1n;Oo82 z>wEg+YBB{W4M0mJ{|!my?U--uujdcF9KIh1+}8x)e5$)I@T;BQ00JQ=k}y6!3&VFp zaAnkcSqV>fo_*~{Be+hR4}fWXPu~olz@EfEY^64LL>_nWkm^0Te{&~3y4JngH|43V zfFuGawV9yaWrLQgVu&M{PY3V7m66HAXI|ON8bIw=6FEm`GNp6{7Au5zOsF>4ic;x3I%~7F|em_@%ix}T)Y{AXO=C1 zuJ%O>w4T1v{yiHT^FdIwDB7*lJv*P{d?P39=&Q(LDqtem&;*gcM?bv41J4T}Ab0`) zH;DpRL=iZAes5qBrejI?-nzxrPaNnSC%pLp2$2tMTuXu1Q*2@z$&r|20y7`d&E-j# z*772UAnuwVa3CUBi;0K6K_B>}By3#K=vlMp$Q!gJ8vwo3C0+Z(R`}h86Afa1a(ZR)W*%+`aVs-OUDr1_06V(27HC z4=;cjS-}(V_nJUX1(=N|vjHe5t`&nv|MXJu#^5J0uNPEF!ZeAvUdZef5di7q_<#J+ zzN8k)8kZh1Qo#V!w>{&wS&LRLZK{OcE7OeXLLi9hC<4erK>8US{p9^)pT4&H7pHo5 zbx1z%bQ~EGn2)rdGE#DuxH2zZmFm16U(8KJ)vhZIxJglypnkVF8JUz|F8_Kz>V8lAj3 zGCmc$rwj{#nDGx^cu$T>Ot|@4l2keZYg??VFn<$R-&D6bxkpow`k{aPrH`mR)xGn( zQSX$b%Cn!(KQTZa>OFK$k>hDUS!GH715#!zaH3wyjDA|2eYj$)34G}=lwUs$loR_l zufg{?1<7vdYrBvAo#XgbAMM>#L45@+X1567vYWskNoD-fds4ewNWAf3Oa+F}Kuc7W zSVgFD6~nS0^gNu^F^8#Z(v~a$HsFMfo7)zZefvP~DAoA#pZsoRrK@V~EcfLSrEXRzKPVEl>aQQvM{% zz1e7B#`RxL#i6X+4Qs#I0;4mDwD647>H{qj3;ijM3=K?_!(1dgDzdjkxj7D*8q}XTK6A~LK%wnsim=v2dkOoJdDZF@OZb7)=3#9h(<;~!7medZIpN&+n-1fefkbZyWx6hr=E=Q_) z5U~4cTEWX7eea+0f;<}-pqLb!*Y9f4tHOa{LxtKk@cHTppp=#yFO4U+DibG%<2?21lxB z7Sn@7(8n+~C>4)D`5g-?2&4)+o_rKY`E;i=sz#U(0NVJ~>kzs<{O;|49luO5v+n~` zT7k2FcwzsoYr}p;PT;jlWP&j|m`O-mFs@;a6&RS1(-%cUm>T4Cy?i4OtqpGAEOwjT z*wkzQnvQ7lRCnjrp^KM%34QS7h*D39(Ndwn)od=Ka;&VWh7B9qw?DDx$XiBiK5IW| zVFqpNxA%EQwwG>F^G$X-Vi8(7T18QLO;z*epKU9tZC-D(mOQ{(ES}__2X}aq3E8jz zQnKFX?@djgs1kP{KVD5b5TdLUtxONb>zcWtzkj9I|MTlu(3_4`r