From 5f8efc5c505006d782df75b180f12f5f21e5ebf4 Mon Sep 17 00:00:00 2001 From: cncfanatics Date: Sat, 30 Oct 2010 15:33:21 +0200 Subject: [PATCH 1/9] Add an icon for the pattern editor --- gui/mainMenuBar.py | 1 + icons/damagePattern_small.png | Bin 0 -> 749 bytes 2 files changed, 1 insertion(+) create mode 100755 icons/damagePattern_small.png diff --git a/gui/mainMenuBar.py b/gui/mainMenuBar.py index d983bfd25..43137d7d2 100644 --- a/gui/mainMenuBar.py +++ b/gui/mainMenuBar.py @@ -75,6 +75,7 @@ class MainMenuBar(wx.MenuBar): windowMenu.AppendItem(charEditItem) damagePatternEditItem = wx.MenuItem(windowMenu, self.damagePatternEditorId, "Damage Pattern Editor\tCTRL+D") + damagePatternEditItem.SetBitmap(bitmapLoader.getBitmap("damagePattern_small", "icons")) windowMenu.AppendItem(damagePatternEditItem) windowMenu.Append(wx.ID_PREFERENCES) diff --git a/icons/damagePattern_small.png b/icons/damagePattern_small.png new file mode 100755 index 0000000000000000000000000000000000000000..89b5322bceb5dd5de04d8d1327912c7f902ea3f3 GIT binary patch literal 749 zcmV(0I`iFT zv)Sx$I2`G`s;Zebi)v5jOn;lDl-l}=(u-wFE2jHedSoCNxPAQS(JEcnn=99@J}IQB z=*+q5MS~^~LRj|isJy;*-I`KgOVsLr^D;BbEXxn&mp{{Ce~<_R>16(P--EOwETqmiRImI5|FNFjtgeP~x>S=qu#t#J$O zfp;ulwu1Ag4l;dw4tBc*JtgpeY^SHUkMQRRHmhY8FcGksoKB~Em}V=etqU-7_B>n_ zE7`Mk16$V2!X#lphe+rXeVxtJTsT6}i0=$hx|~2RAWeyco_JB`RUi63bM{;{GfGCX zeUpd&*f$ae#CyW{-vzk!EI6=nRjyhvB*vw$u`pl-G8A3c2Li2O&0SbDHB-?=sJ)YT z{{Z$Z6UkVFdrum8`X*#(naTL#xvE-oH-(J%zYlaK9|0{&DwRrh_r@QzhdaIw%`ccR zdW2@zvZQ$B^>O3QYohUlkx1yt)-T_igvpV&a9WDXwXsmNFX;t*f7AfT7D9NW5GThL z=G8BsKdx)VoWjJ=Y_-;I$=F$QVu7)`e5O%cm=?(q?#?=YC?{l-;00000NkvXXu0mjfHr8lE literal 0 HcmV?d00001 From 582a25030df8e3eb6853167fde5f16b30fdd3ad3 Mon Sep 17 00:00:00 2001 From: cncfanatics Date: Sat, 30 Oct 2010 15:34:39 +0200 Subject: [PATCH 2/9] Hide the preferences menu entry for now --- gui/mainMenuBar.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/mainMenuBar.py b/gui/mainMenuBar.py index 43137d7d2..30a09038c 100644 --- a/gui/mainMenuBar.py +++ b/gui/mainMenuBar.py @@ -78,7 +78,7 @@ class MainMenuBar(wx.MenuBar): damagePatternEditItem.SetBitmap(bitmapLoader.getBitmap("damagePattern_small", "icons")) windowMenu.AppendItem(damagePatternEditItem) - windowMenu.Append(wx.ID_PREFERENCES) + #windowMenu.Append(wx.ID_PREFERENCES) # Help menu helpMenu = wx.Menu() From 5f926200e32b807ed99eb5910f1da6e3b8f3535f Mon Sep 17 00:00:00 2001 From: Corollax Date: Sat, 30 Oct 2010 08:37:15 -0500 Subject: [PATCH 3/9] Added new skillbook colorized icons, per request "Twilight Sparkle: A unicorn pony with a light violet body and an indigo mane & tail with pink & purple streaks." ~ Wikipedia, on why girls have more words for colors than boys. --- icons/skillGreen_big.png | Bin 0 -> 1250 bytes icons/skillRed_big (copy).png | Bin 0 -> 1251 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 icons/skillGreen_big.png create mode 100644 icons/skillRed_big (copy).png diff --git a/icons/skillGreen_big.png b/icons/skillGreen_big.png new file mode 100644 index 0000000000000000000000000000000000000000..03904c2e0f5da90b92d8cdf531a59b021266e139 GIT binary patch literal 1250 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 Date: Sat, 30 Oct 2010 08:40:29 -0500 Subject: [PATCH 4/9] Fixed naming fail So much fail... --- icons/skillRed_big (copy).png | Bin 1251 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 icons/skillRed_big (copy).png diff --git a/icons/skillRed_big (copy).png b/icons/skillRed_big (copy).png deleted file mode 100644 index d418e25b75554d633eee28e90a8832f5a07e531c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1251 zcmV<91RVQ`P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igiA z4I~5QK8~vZ00d)6L_t(Y$K{nvY*bYk$A9O}%$?4&({@_wPzLFwrbRTtAW11tgRC@! z#0`{0Opt}J(3L9_7bZkjE-*l%hPWZd3P@NeF&H9X10fJ>p%kdJooPFv^Stx8b6>}W z1F6trHF4!lzU1ETocw?HJKs6y5C5B|sVVYQZvX!G@cDfI3GcD$vCj|F+SFyF25g_&qwCcrSg)kTcd#fEP(Q4 zB9KUI4s~}EOeF9vU5euMqBb|<4u?@x6`?3NhCv{a2n_Dr`4PaCJ$qb>29!oeCkn&E z7`YtoU=Smpmu8`WU9BQ*`_Hl!MS7!A;{E;mfcVA{2G zi{0H@y=`rNwWS4Zco?f(#;#O^rD@X4=dsFVAruA2H2piuW%1?E(2u{5kJAy0QPi~g z0m)<%DJ5GD9I)P9v*rzBcDAi)^=fk0u93ff9V3$wmZsqt22QOe%zR$Dyk1e6oP2fg z_U+R%x}Gj-8Ueo_(=?w30K6ro`^be0)`xrd?(l@eaZA%sRF$7koDkKC31l)UYU#Al zr>D^$KBSsVI^LERS1gqZe?K*K68MWafP3!8*;A(^U|&CS$b{ zu_&^JAscf!8eA^ncezki)g|0+f-YCT-{tzWV%xtpdOS+OG@W^y{PFOx1IYJp+!zcd z5}+uUg@Rn&)5E<|iF>6IBbvsoVv(DL0>haMH`8fSy3W4N&VvAFw{4rh2LQH|0Pccm zhTiGwdfhIU!}`n&zF18BbonwR%My9h6a~YeU|FJIn&eDV<_$w=rujn6aeh5CG<5Ha zPd?zx`N5|FbE*oj%Vbvd?B3m#yLwd$x0~^i5pla%l(v-EAXG(>HQUB=95JoyQgfTL|HR+8GGMS1wz&{=0zzo-+(#Rjb^{=Lxvolr2kS4MU`K zos3~nv2FUIQSoM9pD&%m(5$MWEG=299|f_%C8z@JKpbcTq=1r3h@6BHP<5o#B~ Date: Sat, 30 Oct 2010 15:43:20 +0200 Subject: [PATCH 5/9] Remove undo & redo menu entries until they work --- gui/mainMenuBar.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gui/mainMenuBar.py b/gui/mainMenuBar.py index 30a09038c..caf9fe710 100644 --- a/gui/mainMenuBar.py +++ b/gui/mainMenuBar.py @@ -45,8 +45,8 @@ class MainMenuBar(wx.MenuBar): editMenu = wx.Menu() self.Append(editMenu, "&Edit") - editMenu.Append(wx.ID_UNDO) - editMenu.Append(wx.ID_REDO) + #editMenu.Append(wx.ID_UNDO) + #editMenu.Append(wx.ID_REDO) # Fit menu self.fitMenu = fitMenu = wx.Menu() From b828fd65c5b3bf22a8f78fb1b7955597b47aff82 Mon Sep 17 00:00:00 2001 From: Corollax Date: Sat, 30 Oct 2010 08:44:05 -0500 Subject: [PATCH 6/9] Finally got that red icon in Urgh. --- icons/skillRed_big.png | Bin 0 -> 1251 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 icons/skillRed_big.png diff --git a/icons/skillRed_big.png b/icons/skillRed_big.png new file mode 100644 index 0000000000000000000000000000000000000000..d418e25b75554d633eee28e90a8832f5a07e531c GIT binary patch literal 1251 zcmV<91RVQ`P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igiA z4I~5QK8~vZ00d)6L_t(Y$K{nvY*bYk$A9O}%$?4&({@_wPzLFwrbRTtAW11tgRC@! z#0`{0Opt}J(3L9_7bZkjE-*l%hPWZd3P@NeF&H9X10fJ>p%kdJooPFv^Stx8b6>}W z1F6trHF4!lzU1ETocw?HJKs6y5C5B|sVVYQZvX!G@cDfI3GcD$vCj|F+SFyF25g_&qwCcrSg)kTcd#fEP(Q4 zB9KUI4s~}EOeF9vU5euMqBb|<4u?@x6`?3NhCv{a2n_Dr`4PaCJ$qb>29!oeCkn&E z7`YtoU=Smpmu8`WU9BQ*`_Hl!MS7!A;{E;mfcVA{2G zi{0H@y=`rNwWS4Zco?f(#;#O^rD@X4=dsFVAruA2H2piuW%1?E(2u{5kJAy0QPi~g z0m)<%DJ5GD9I)P9v*rzBcDAi)^=fk0u93ff9V3$wmZsqt22QOe%zR$Dyk1e6oP2fg z_U+R%x}Gj-8Ueo_(=?w30K6ro`^be0)`xrd?(l@eaZA%sRF$7koDkKC31l)UYU#Al zr>D^$KBSsVI^LERS1gqZe?K*K68MWafP3!8*;A(^U|&CS$b{ zu_&^JAscf!8eA^ncezki)g|0+f-YCT-{tzWV%xtpdOS+OG@W^y{PFOx1IYJp+!zcd z5}+uUg@Rn&)5E<|iF>6IBbvsoVv(DL0>haMH`8fSy3W4N&VvAFw{4rh2LQH|0Pccm zhTiGwdfhIU!}`n&zF18BbonwR%My9h6a~YeU|FJIn&eDV<_$w=rujn6aeh5CG<5Ha zPd?zx`N5|FbE*oj%Vbvd?B3m#yLwd$x0~^i5pla%l(v-EAXG(>HQUB=95JoyQgfTL|HR+8GGMS1wz&{=0zzo-+(#Rjb^{=Lxvolr2kS4MU`K zos3~nv2FUIQSoM9pD&%m(5$MWEG=299|f_%C8z@JKpbcTq=1r3h@6BHP<5o#B~ Date: Sat, 30 Oct 2010 15:46:09 +0200 Subject: [PATCH 7/9] Move menu entries around a bit --- gui/mainMenuBar.py | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/gui/mainMenuBar.py b/gui/mainMenuBar.py index caf9fe710..fe56fcfac 100644 --- a/gui/mainMenuBar.py +++ b/gui/mainMenuBar.py @@ -33,12 +33,15 @@ class MainMenuBar(wx.MenuBar): # File menu fileMenu = wx.Menu() self.Append(fileMenu, "&File") - fileMenu.Append(self.backupFitsId, "&Backup fits", "Backup all fittings to a XML file") if 'wxMSW' in wx.PlatformInfo: fileMenu.Append(wx.ID_CLOSE, "&Close\tCTRL+W", "Close the currently open fit") else: fileMenu.Append(wx.ID_CLOSE) fileMenu.Append(wx.ID_EXIT) + fileMenu.AppendSeparator() + fileMenu.Append(self.backupFitsId, "&Backup fits", "Backup all fittings to a XML file") + fileMenu.Append(wx.ID_OPEN, "&Import\tCTRL+O", "Import a fit into pyfa.") + fileMenu.Append(wx.ID_SAVEAS, "&Export\tCTRL+S", "Export the fit to another format.") # Edit menu @@ -48,22 +51,16 @@ class MainMenuBar(wx.MenuBar): #editMenu.Append(wx.ID_UNDO) #editMenu.Append(wx.ID_REDO) - # Fit menu - self.fitMenu = fitMenu = wx.Menu() - self.Append(fitMenu, "F&it") - fitMenu.Append(wx.ID_OPEN, "&Import", "Import a fit into pyfa.") - fitMenu.Append(wx.ID_SAVEAS, "&Export\tCTRL+S", "Export the fit to another format.") - clipboardMenu = wx.Menu() self.idExportDna, self.idExportEft, self.idExportXml = wx.NewId(), wx.NewId(), wx.NewId() clipboardMenu.Append(self.idExportEft, "&EFT", "Copy the EFT export of this fit to the clipboard") clipboardMenu.Append(self.idExportXml, "&XML", "Copy the XML export of this fit to the clipboard") clipboardMenu.Append(self.idExportDna, "&DNA", "Copy the DNA export of this fit to the clipboard") - copyText = "&To Clipboard" + ("\tCTRL+C" if 'wxMSW' in wx.PlatformInfo else "") - pasteText = "&From Clipboard" + ("\tCTRL+V" if 'wxMSW' in wx.PlatformInfo else "") - fitMenu.AppendMenu(wx.ID_COPY, copyText, clipboardMenu, "Export a fit to the clipboard") - fitMenu.Append(wx.ID_PASTE, pasteText, "Import a fit from the clipboard") + copyText = "Export &To Clipboard" + ("\tCTRL+C" if 'wxMSW' in wx.PlatformInfo else "") + pasteText = "Import &From Clipboard" + ("\tCTRL+V" if 'wxMSW' in wx.PlatformInfo else "") + editMenu.AppendMenu(wx.ID_COPY, copyText, clipboardMenu, "Export a fit to the clipboard") + editMenu.Append(wx.ID_PASTE, pasteText, "Import a fit from the clipboard") # Character menu From 2c1a09e971fa870100738c6b58490d2a3144c7a1 Mon Sep 17 00:00:00 2001 From: Corollax Date: Sat, 30 Oct 2010 08:48:57 -0500 Subject: [PATCH 8/9] Fixed Permissions divots To avoid permission errors, chmod 644! To avoid permission errors, chmod 644!, To avert permission terror, Yet keep permissions fairer, To avoid permission errors, chmod 644! --- gui/builtinViewColumns/moduleTracking.py | 0 gui/builtinViewColumns/projectedAmmo.py | 0 gui/builtinViewColumns/projectedAmmoIcon.py | 0 icons/damagePattern_small.png | Bin 4 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 gui/builtinViewColumns/moduleTracking.py mode change 100755 => 100644 gui/builtinViewColumns/projectedAmmo.py mode change 100755 => 100644 gui/builtinViewColumns/projectedAmmoIcon.py mode change 100755 => 100644 icons/damagePattern_small.png diff --git a/gui/builtinViewColumns/moduleTracking.py b/gui/builtinViewColumns/moduleTracking.py old mode 100755 new mode 100644 diff --git a/gui/builtinViewColumns/projectedAmmo.py b/gui/builtinViewColumns/projectedAmmo.py old mode 100755 new mode 100644 diff --git a/gui/builtinViewColumns/projectedAmmoIcon.py b/gui/builtinViewColumns/projectedAmmoIcon.py old mode 100755 new mode 100644 diff --git a/icons/damagePattern_small.png b/icons/damagePattern_small.png old mode 100755 new mode 100644 From 43426c0255503d9ef35e677a4fd486dfb5280637 Mon Sep 17 00:00:00 2001 From: cncfanatics Date: Sat, 30 Oct 2010 16:13:14 +0200 Subject: [PATCH 9/9] Put the hardpoints, drone amount & calibration in a top row --- gui/builtinStatsViews/resourcesViewFull.py | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/gui/builtinStatsViews/resourcesViewFull.py b/gui/builtinStatsViews/resourcesViewFull.py index ed8156a9d..d2051da99 100644 --- a/gui/builtinStatsViews/resourcesViewFull.py +++ b/gui/builtinStatsViews/resourcesViewFull.py @@ -42,35 +42,35 @@ class ResourcesViewFull(StatsView): def populatePanel(self, contentPanel, headerPanel): contentSizer = contentPanel.GetSizer() + root = wx.BoxSizer(wx.VERTICAL) + contentSizer.Add(root, 0, wx.EXPAND, 0) + + sizer = wx.GridSizer(1, 4) + root.Add(sizer, 0, wx.EXPAND) + root.Add(wx.StaticLine(contentPanel, wx.ID_ANY, style=wx.HORIZONTAL), 0, wx.EXPAND) + sizerResources = wx.BoxSizer(wx.HORIZONTAL) - contentSizer.Add( sizerResources, 0, wx.EXPAND, 0) + root.Add(sizerResources, 1, wx.EXPAND, 0) parent = self.panel = contentPanel self.headerPanel = headerPanel panel = "full" - sizer = wx.FlexGridSizer(2, 2) - sizer.SetMinSize(wx.Size(36 + self.getTextExtentW("400/400"), 0)) - for i in xrange(3): - sizer.AddGrowableCol(i + 1) base = sizerResources - base.Add(sizer, 0, wx.ALIGN_CENTER) #Turrets & launcher hardslots display tooltipText = {"turret":"Turret hardpoints", "drones":"Drones active", "launcher":"Launcher hardpoints", "calibration":"Calibration"} for type in ("turret", "drones", "launcher", "calibration"): - outerBox = wx.BoxSizer(wx.VERTICAL) box = wx.BoxSizer(wx.HORIZONTAL) bitmap = bitmapLoader.getStaticBitmap("%s_big" % type, parent, "icons") tooltip = wx.ToolTip(tooltipText[type]) bitmap.SetToolTip(tooltip) - outerBox.Add(bitmap, 0, wx.ALIGN_CENTER) - outerBox.Add(box, 0, wx.ALIGN_CENTER) + box.Add(bitmap, 0, wx.ALIGN_CENTER) - sizer.Add(outerBox, 0, wx.ALIGN_CENTER) + sizer.Add(box, 0, wx.ALIGN_CENTER) suffix = {'turret':'Hardpoints', 'drones':'Active', 'launcher':'Hardpoints', 'calibration':'Points'} lbl = wx.StaticText(parent, wx.ID_ANY, "0") @@ -83,7 +83,6 @@ class ResourcesViewFull(StatsView): setattr(self, "label%sTotal%s%s" % (panel.capitalize(), type.capitalize(), suffix[type].capitalize()), lbl) box.Add(lbl, 0, wx.ALIGN_CENTER) - base.Add(wx.StaticLine(parent, wx.ID_ANY, style=wx.VERTICAL), 0, wx.EXPAND | wx.LEFT, 3 if panel == "full" else 0) #PG, Cpu & drone stuff tooltipText = {"cpu":"CPU", "pg":"PowerGrid", "droneBay":"Drone bay", "droneBandwidth":"Drone bandwidth"}