From 0383bf416800e0d384b8cea471dbe6fafd0e5465 Mon Sep 17 00:00:00 2001 From: cncfanatics Date: Thu, 19 Aug 2010 19:56:01 +0200 Subject: [PATCH] Implement changing menu-items / toolbar icons --- gui/mainFrame.py | 5 ++--- gui/mainMenuBar.py | 11 ++++++++--- gui/mainToolBar.py | 26 +++++++++++++++++++------- icons/market_big.png | Bin 0 -> 2326 bytes icons/market_small.png | Bin 0 -> 782 bytes 5 files changed, 29 insertions(+), 13 deletions(-) create mode 100644 icons/market_big.png create mode 100644 icons/market_small.png diff --git a/gui/mainFrame.py b/gui/mainFrame.py index cc5d00ef3..040e55d72 100644 --- a/gui/mainFrame.py +++ b/gui/mainFrame.py @@ -100,9 +100,8 @@ class MainFrame(wx.Frame): #Ship browser self.Bind(wx.EVT_MENU, self.toggleShipBrowser, id=10) + self.Bind(wx.EVT_MENU, self.toggleShipBrowser, id=11) def toggleShipBrowser(self, event): - toolbar = self.GetToolBar() - toolbar.ToggleTool(10, not toolbar.GetToolState(10)) - toolbar.toggleShipBrowser(event) + self.GetToolBar().toggleShipBrowser(event) diff --git a/gui/mainMenuBar.py b/gui/mainMenuBar.py index d40ea10b0..5ad68cf23 100644 --- a/gui/mainMenuBar.py +++ b/gui/mainMenuBar.py @@ -40,9 +40,14 @@ class MainMenuBar(wx.MenuBar): # Fit menu fitMenu = wx.Menu() self.Append(fitMenu, "F&it") - shipBrowserItem = wx.MenuItem(fitMenu, 10, "Ship &Browser") - shipBrowserItem.SetBitmap(bitmapLoader.getBitmap("ship_small", "icons")) - fitMenu.AppendItem(shipBrowserItem) + self.shipBrowserItem = wx.MenuItem(fitMenu, 10, "Activate &Ship Browser") + self.shipBrowserItem.SetBitmap(bitmapLoader.getBitmap("ship_small", "icons")) + fitMenu.AppendItem(self.shipBrowserItem) + + self.marketBrowserItem = wx.MenuItem(fitMenu, 11, "Activate &Market Browser") + self.marketBrowserItem.SetBitmap(bitmapLoader.getBitmap("market_small", "icons")) + fitMenu.AppendItem(self.marketBrowserItem) + self.marketBrowserItem.Enable(False) fitMenu.AppendSeparator() fitMenu.Append(wx.ID_EDIT, "&Rename", "Rename this fit.") fitMenu.Append(wx.ID_COPY) diff --git a/gui/mainToolBar.py b/gui/mainToolBar.py index c7304fe58..965ab3db0 100644 --- a/gui/mainToolBar.py +++ b/gui/mainToolBar.py @@ -26,29 +26,41 @@ class MainToolBar(wx.ToolBar): style = wx.TB_HORIZONTAL | wx.NO_BORDER | wx.TB_FLAT wx.ToolBar.__init__(self, parent, wx.ID_ANY, style=style) - self.AddCheckLabelTool(10, "Ship Browser", bitmapLoader.getBitmap("ship_big", "icons"), shortHelp="Ship browser") + self.AddLabelTool(10, "Ship Browser", bitmapLoader.getBitmap("ship_big", "icons"), shortHelp="Activate Ship Browser") self.AddCheckLabelTool(20, "Character Editor", bitmapLoader.getBitmap("character_big", "icons"), shortHelp="Character editor") self.Bind(wx.EVT_TOOL, self.toggleShipBrowser, id=10) self.Bind(wx.EVT_TOOL, self.toggleCharacterBrowser, id=20) self.Realize() - + self.shipBrowserState = False gui.mainFrame.MainFrame.getInstance().shipBrowser.Hide() def toggleShipBrowser(self, event): - newState = self.GetToolState(10) + self.shipBrowserState = not self.shipBrowserState + state = self.shipBrowserState mainFrame = gui.mainFrame.MainFrame.getInstance() + menuBar = mainFrame.GetMenuBar() - - if newState: + if self.shipBrowserState: + self.SetToolNormalBitmap(10, bitmapLoader.getBitmap("market_big", "icons")) + self.SetToolShortHelp(10, "Activate Market Browser") mainFrame.shipBrowser.build() mainFrame.marketShipBrowserSizer.Replace(mainFrame.marketBrowser, mainFrame.shipBrowser) else: + self.SetToolNormalBitmap(10, bitmapLoader.getBitmap("ship_big", "icons")) + self.SetToolShortHelp(10, "Activate Ship Browser") mainFrame.marketShipBrowserSizer.Replace(mainFrame.shipBrowser, mainFrame.marketBrowser) - mainFrame.shipBrowser.Show(newState) - mainFrame.marketBrowser.Show(not newState) + menuBar.shipBrowserItem.Enable(not state) + menuBar.marketBrowserItem.Enable(state) + + mainFrame.shipBrowser.Show(state) + mainFrame.marketBrowser.Show(not state) + mainFrame.marketShipBrowserSizer.Layout() + + + def toggleCharacterBrowser(self, event): print event diff --git a/icons/market_big.png b/icons/market_big.png new file mode 100644 index 0000000000000000000000000000000000000000..67380fa743bdd816773e0d52859f8401243cebb5 GIT binary patch literal 2326 zcmV+x3F-EUP)j;KnTZQ-BU`b@AB@AVd%afq)P~2=V=^$vw~WT-S9y&+~lW_g%+zJ>T;_291si!!;FFYp67a==b5HyT9#$mwryLM zWjT)H*p6+_#h&MR@2cp{$}G#WEJ>0Sye1{AD3NQbsi~=HXv{SR6RF$tUEMu>d*2ug z8tQJXs+J7fG_|U#>YA?WhOX@pWP}4N6R4$c@#bR-Gc6PR0E|)b;({x?e8LoZ@f8$@vvMh(>P)Jb}B^r%J zGnq`Lp`oFnHQ(Br&*$^E=IU3iT(zo8lS1{ZxwU<3?-}mX`FcEi=rr>A#>8Fo7dDDw zsOGkgr7N;^*?Lv0lz74s0z&3|;d)oSK`Ev00+@SoI2;bg;;~pJoyp{Kxm;UoTU$$W zOG{&}u`!dWO%-3?xpaB=%FM2#$H~@T{0zs>^dsiF_|EDsSf&S$I;aWBB$3S2F7D{) zlmY@bIWakI*_LIPhGE;b?KqAz=LH@BL{SvO;c!?{6eSjm#gg-q$y_d%TR6Y{_RqF2 z{N8O{o!LM*B*o?>l|VQs9e!?eaQ@;u&}SH!m!FTP9^HgwGz!3#@PtHRq6hbEBqdnvUx@uIswj0YY*p6js9FNF)-8$Kvs9T{hd$(9qD- z+|rzkhw@hr9L(0&W>ZQ-mXk7B;o#I%aDFC=`|i32%bQvN@Gxu!W4a%|dipn*7#l%L zE`eAg4KRXeBpO+_cHO#oZKmbKvA!d-v$KWk03640b1siYqtRqCnd(~6wf^q)cW+3i z(miFDhAfW9?8FGa=+0H)6UUDS+uGY3PL86xus`y&*uB? zy)WXp4oamG9LK>d^^d0T>9M=iVd5vVHyYqgNR0=NM-5}t*yn2PyZbEZ~Quj29DyvN4|;eJGLXA2*Hsg7_Nu6_8)*x zeH`vRgoi)XiHj8pQaFN{vWmfhQTyd>&%7`)GW;B+)V~fONs=UoWLc6VzFaOpx}tLh z+3@fNtn6NijypP#Z^@&#w--Z0BRDd84g*K_qH9?P;FWtKmW77`Oi#~}$QHLxA=&zsp$@InZ!@sAL78zq@0N@#8ED#6;f>JOjNm2j= zpYc2|vhU4(*!9LP?B25*wq?UG4U|h|OpH%p)%tt!%cq_}TojOOZbl`U!I|+1bhox+ zv{1s5?q%pdb_%i99uNr7bqz0X+w6tx$@0ai;xS6;2!Ij*Z~)+3lVw>}JQlxFsa8;_ zR8S}sFg`wxlc!E%W@ZMZatW1c1)8dXmt@2i-ipd>0blG{gK+nHyfr+GC%^T5u%^Yh z;LpQAe;*9P#EAoYynsGQde5ADjZ%6Fz$F0eI)LlCu4P-6X__V>WLVQQ*tQK-RZ*!_ zFg-mD#uzNig5x+)6a`X1LQ8EOCN&dV_8x>yJIsTw%KfiVWkC@xQ3MlP3ws;VG_KoA5p zIH|&$iw(Z<8a*-z^fjc{Mu5KKY7A=TTpx~8D&hiBfv2|;@ z*ro^9w459q@g}BbwyLVJXU=#x1z?O31_YQWguru>&j5RNcEWbt3vQ({L{%Ns_sUL1 zof_D;|96xlB_;}*UzoYztNI06)kc|RPhY+?)$s5=ohzT-`jY+XYx}p9%j&o&iX*=7 z+y4>(00qzULMoZ!;;}fNO4Rt8aVgN8OOv2%c|3QX1_R?7PbN4eY?5%u@pWTb%r`eN zFpraE&c8H0{KRA5c>L8@-$)#I`{c8p=l!_8K3nWqvSiuV`LUt*0^Cd-02x3GKpH?J zfHnXNuB}-BQM`YoBj5e$lh42M!n5?&+uIMsVl_SKbaLrezP#bvO}VPG5TQuK9V?|69@=l wj4=>!*Y=cB>i#$K-5iADxc_OwkM&XXPn%g{nf^dsO#lD@07*qoM6N<$f)m_w2><{9 literal 0 HcmV?d00001 diff --git a/icons/market_small.png b/icons/market_small.png new file mode 100644 index 0000000000000000000000000000000000000000..45fef411715266291a0ee67a1293676485591f05 GIT binary patch literal 782 zcmV+p1M&QcP)}qtQe>k=VF>+um|0oHCz2zR7K~@L>G!vAmwoPfbrv&CJZqaL%~|06{ev)LJzy z*_ljcGudq4)@{FTUc2tl;H=s8u4IPx_U&As*|g>7R63P%Y_n+08FS@wxm>AMDv~VA zvZiTTJQj~PP^ZYrSSLCf19&hpglum{`(=AyuLqxwj^^%L zmSstdG1k7SJ$B^qk)yqt-otva7^+!wKh-Z=DMw@Ve!ZE}4i zzG1<&n;!l%K0pZ}1O(*Dz?D75yb(yI(wOHIx!X6fJQlTs=0svj|h3`v}B(*fR^q0z|Wu|GOv7r&QS`8~!M)6#q_FoEx#5$9B|9TSh zlR0nb&d5n2a8(H5%R&fIEEY?ZO66AJL!qnip-|^I4pM7UP!vT!b^OGD%Xws^ySrNv zbZL;!T9TyvRjs-;0FVH{_kCeFR)HtlXZ>Uc%E5Xu*V^J;AG?3qYioVXDIG6Pz9{{6 zU{}xJaPCsEWS$p7_+Jf)DoQhL2&Ey*%|wyIgi_zHR`W!_tY>xQ-8(YJa<}gK0@7K^ z7@K1{upkF#)2>YHAwuK)l5 M07*qoM6N<$f>&mIC;$Ke literal 0 HcmV?d00001