From 3dd1322de826788c7313dc035d660cc81e8ab84d Mon Sep 17 00:00:00 2001 From: Junx Date: Wed, 1 Apr 2020 17:12:12 +0100 Subject: [PATCH] removed help button and tcg button --- exe/win32/gl05_r.dll | Bin 2413568 -> 2413568 bytes exe/win32/gl06_r.dll | Bin 2379776 -> 2379776 bytes exe/win32/gl07_r.dll | Bin 2400256 -> 2400256 bytes src/build/win32/_all_client.vcxproj | 3 ++ .../src/shared/command/CommandCppFuncs.cpp | 2 +- .../src/shared/core/CuiActions.h | 4 +- .../build/win32/PlanetWatcher.vcxproj | 1 + .../3rd/library/dpvs/lib/win32-x86/dpvs.lib | Bin 122954 -> 53196 bytes .../3rd/library/dpvs/lib/win32-x86/dpvsd.lib | Bin 123102 -> 53346 bytes .../src/shared/core/SwgCuiManager.cpp | 8 +-- .../core/SwgCuiMediatorFactorySetup.cpp | 6 +-- .../src/shared/core/SwgCuiMediatorTypes.h | 2 +- .../src/shared/page/SwgCuiButtonBar.cpp | 12 ++--- .../src/shared/page/SwgCuiButtonBar.h | 4 +- .../shared/page/SwgCuiHarassmentMessage.cpp | 4 +- .../src/shared/page/SwgCuiHudAction.cpp | 46 +++++++++--------- .../page/SwgCuiService_KnowledgeBase.cpp | 2 +- 17 files changed, 49 insertions(+), 45 deletions(-) diff --git a/exe/win32/gl05_r.dll b/exe/win32/gl05_r.dll index 9b786d769f18ebe652aabfc197531a2dcd4be889..3d2b0f09d183a48232412b4433779eaddf574075 100644 GIT binary patch delta 9384 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 I)}EC7KQ+spIRF3v delta 9286 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 XlKB4@c3iw{Pti&y{*CvFPRjld#ZjTj diff --git a/exe/win32/gl06_r.dll b/exe/win32/gl06_r.dll index 25419b3496431e5cf02504c9182debcb7a78c439..8a329d44aa01ef5fa6144f7d1fc866abd7c44e8f 100644 GIT binary patch delta 8638 zcmc(ke^^^pn#b==p-n5%w1jZ6v?OV)SZKZZ1^IFFqYlrA72VW9%Q$Fhq%Iw?#fmoL zGKMO4jh42t-S0{0aGyTU z=%3!_`EcIzp7(psx#vCiCOI^A>|q;$-_52i`?sdM_m;D@3tO+#FeMDb4DWrPUBQ;^ zJ;~bAjVcY}+M~|g>yq&7YkMD%>|o0tAD28aE@1&J=Ycek4(5XeKnfOuMc@jM0c7Ax za21e)#b61@1d718Bx|joH3kY^&)T2P`pJI>vmR!L0*<$`9+t2%^2R$^?@8p!z{9;+ zSu0sS&~hYeAIrJ}>anb$bha*VdOYhTmTe8RPiFmU9^|p9tP03)I+e9Z!kPo+(^;=d z*cmcEp52!7` z@W74AW9g7>xJ9{h9&09FxRswl?O(6#oCo#ow=1Vvwj*%k24%Sfb87#!@|O9S^TbBw zo9tlVK$UWUh5BBP@+AePD&L_zF%MInc|;UR8c5Wot;)+sYW*6)1gOqD3TN|4(IRhD4ehxb1!AE3%cjX$L*;(La+{JT?EH`|2eZhaUfH zn(fT?>5X?Ex?{t;TH3B9D?V2qWb*^ZKUdbxV@m@YzEr-*vR&lDsIrr74*cmWWt?Se z0&QO_htqJI_m3%8vuuRyKc;M#NS6gH$CWp%g1kYV{rpvsFI8nv79xJZE!pnn&{y1- zZOlM-yLM#X2l?3@+2>h_bUFF{ciG=y$|H|t_ohMqj4ylZBN^W12R)IVM=xA_>i1Hz z^8=-VtT>mw6>I(Ux$I{oY+E4zhwRLBq)d=-{Su_`LK?T{N~}|BCby!RaIP+&0o$| zlQrLP*CYRT)1s2>rbRP(mlmyLiWXtA{0NF3aw`f+Mmq5w;mj;gf=9S(*j{p&Hb%&m zN4eFkiwH+it0lEZIh{l?pZxJC=R~hxALWc}f+)t&*iK4l(M;;cI4kzXU&hduPsYZ$ zHEapVJjPv%9br4h-HaXo#4&EAL@p(NImQ*Rb>z!q5Vnvjj&nRaN`&JWL%M)$JC4R6 z*?%0fGLqrr+)8$goTo8iQh0(+c@eqm1gbq`_X*C#R*(UB*H;Kqn^6!(lN9mR1qe&=?Br(b9aC2*- zoSofAYNK#Q$^Iz1;mC(kjMPUG)LB9bP9mg+Y&i+RAlZKsA#w5{EmY+ENluRiTQh}m z+sSXHperLSQ)u&&-YLivWRlkM$3@%R^si^1;2upWgK z3Wavv5*zQ@e(qv$h&=Ef)IEcya=8JP2m5~`2ctmbbzP9V_-X|1nWQt`mmy01D1nDAb}N) zfg@lT^ny;X548C3#|v(S@NTdbG=mzjDXW1qe#Q#gI|KJ;8E~2coDn?`oRBy5fA|h zAjb-+KoPhVRDpUxF9~uU!*U-6A@DAE89b-cNA8NIM7-nLH=3r0sma z$6Y<==FXGPXHoNT-{-dddVPL34DdicA7o;$V$JrUG>sNaM7Yp5IN9rWCQx)JsJP;W%tinroE{mVKqpV@v)J zIkzC^#Z7Ai|B&-q$DuFASmgc}*2>!-+`Rq4%5|IW-?F*#!EFz1zh`sh_RV$M9<2P; zh8s8jqIS#Xt@Rsk-R!O3c*~|OTZ!ke+DO_CtF>99*ed8DdC{(-sK?32hcVPBnLez} z%+X?d%mySkq7ii$h?8YstMhc?W*Wv{bI4OClF&{YQE#60@q`Vlvsa5lsH_UIphzZx zZxHoiDkZOCBzzb6_-l1$RvPvvRnUueu0TDPoJE91+(euE&}o?{oOW7?dJUD#`e_VH z9zf66i9@M8j;1z|oQ~Fox}WR{tMgWin`pRdA|KTc zp*}L}>s(2;eyvun7RONCFmzHpztpA|oh*mC7K{+~h&t~&aWf4`yY`T$TqL1GRij=@ zZbG<8+(g6k5#BBerz3Qu9;A|4e?HM2RcEgfhf!%6q!E#njxYD0P>Ts36pQFZ3BHj#p=c=;huCwvtsC1gDf z8ALUyxGZ!Y!o%bnge;7q$@@2jPJ#E<-%}LQcb({>GJ&ieQ!h1Dq3Q1pmIjIUGHE-c zEo2Xs`hP+?c$u^p(oymal`?pN{@AD-+C}qa!jKjc-7!erKOwETOv)@iXPA$0r!?8vA{Mt5WabtyhwwDc2(#w0g?It?33_VR1jYzu9r1Gz=f z)OYC`L+|3)q(2`o2a%qR*ot~P?SuU81fEcFGnM2*61q$>ih6`fX8pNj=LvPTT^vTG z0;C*1^r%fQ`atBPZU$mGjgzEa$l`D+sX|kYs0(_-Uep`OT@g%H+(g5@2=|M^>HYPg z9-@+2zc)EqlQ@h@TOmzcCe6SnG6yb6Ta(h&;xH=hg0vK2)TS35wF32ODkW>j@kv%n zHjU$xb>C%Cov8bhQM(Xj5;xP1#?W#2GD!^e1eMIrbu2ljG#d8ogj$6kg6au%0e%Rg z$Ro8A>J0oOOWJMJ?oQe=W-92>r0>n4>p4O`riwJOa}tW&Nks7}yOi3MNn18_a!%1q zT?P0Vo>YWrR5)eNP&yXA%f1z;C;x>ts}Y1E^!+A`JjTqhOORe+zQ$*6W37T-Q>M3<5evogPQs>F~ zM9nqSRe&Gow1sp}sTKH5-cMcelq=&D`c;vSPodd-3e9CHyO#PJQ+6A*yOXv|{_Wgs zv8t!gQyTduhAAwIVG2Ca#o)p!#L!_w48qow-9_!*q%HG*H`hsostZ^J*)xq!R!?J* zT-44Z71L1ECT&^x`#D7$brs-*BdPd`Dq<;x^fVN?WbJ9Jg6qtjqLjJ{aGF6|NDGbX zNZCPZhf<1Id`>Y#rl~?p4txuR@GYX;DZ7T+4M|(Zh!kDaMU$OWL}?U5UX4S|#bFnw z?2>0I;Y(Aqd&^6;oMukU^zAe14>7&?&5=HX5h^r4{&=}f=G0xz* ziP9pQBxsj%vVI1(Y6iA3Y0F%RIRze=87LZ3Q7ts8BW3%kJ&;oLi4@pxRFOd*IE#LB z&mxLX*)D3ACvBPQhq*Dl)Mdb$Bo)0hYA9ugsU1%#`a}w>?m3Jh&?1|ZokLVr%C4h! zQ__~XF3gRA-9r_jRMaSqiY4u5&%;y@-FbDktWPAs>*hQJmB|)Tdmh`WF|hMIzS-rp zUwtt7;-jnH4V$iPFG_}N3TZN*32X9Y+NB3Qw3$a)7RX{X+3D%^Dh)G4bn`U@KBF3^ zAmCB(Gzfw)Sfattc~AnXKqGho{1r?9=?WalfKu>V@GSTQTmbo6_(45*4h(`Bu<{xl z_W&<=6HHvAu`=eBIIIBeU<$0f783&7K{Mz9pMe<2$j7k{xEH(-$XcNJN9lE!&Jhmc zA1d_rFA+q&7xV%7+Y06*^5?5G*}iC@20^LIjiZW|B{@vpsyW|Q_~h~&W<=z>14kTQ z`1(XzInG9^p!JI4x^eKsA+Ac~I}RTM-|R)+e?@bp55AxA?2hsMyk~bfJp5VD?pEXQ z@aH_c+wH?y-OqS-$1MNxv%A2=5{*2^|m6p}wzb2bXv?kxMdBhwsN6m3_h9%dcvhWt8#cXj|Dl9dYT1$ha(b8<`u=p)K zmI2G4C1e@4L@fymW0hMK)?BO6T4F7=R#+>oRn{77qqWt#&)RA2vihxq))DKdHENAn z#Vbj|3ZDyNbbJOnv7wj&3iM`BTZLhI6+S}~y zcE7#PK42fThwWqbh&^G?aL64BN1=mv7#*dK3P+`*%HehR8XS#|CP$m2%hB!dI|dyg z$B<*#5pm2o5)Q`6Idh#Vr`Bn9mO9IvZfA|N)>-GQcQ!lQobApIXVBT}>~jt{N1PF7 z)ERTqSB8d(;)N#VGk7_#;PZJiFYqqDg0JMO_-fwEH}frgJKw?k`5wO4#}D&ke1xCj z6Fj4n>Qp+dPSBO<+`4LAjn1oU(6#7Vb^CPfx*pwtZcsO(8`Xt%5gntK>lJ#fK3`v` z=k;d2TVJKG*4OL3`bK@5zDwV&@74F|2lOHRm_Dwb(Mt^(2DyPV@CKKm#87UiFjN|< z4Gjigi=oxfVdyk;8T^Jp!-!$j5H-XMaYMqOFcuok#tLJ#vB}tK^c#DPqsE9)YEqbt zCYPzoRBLK6wV8sZ0n?Z%W|9}>770bAMKwkBMf-}{i#m(Ci-JWXMPo&2#qwglSSYS6 zt|@LV-dEgH+*cefjuvN_IkVYkcA3k}wPvrm&D?1oFo&=mXUu69EjFSXo3Pr_WNF3r z>$QwpA{Hq&ozW^_%hg!xvDG@Pebx{**^HIL1}m|-ZFSgK?buU;wqaWwyGbP!Vi#2i zUhJSw?42QDR7eO?>=~oI++Jn(HQHP3-S(h;1luGHTZDHA*c#Q2I!CLc-O-C35pl#F z3hV+Gc0jGui_CW-<3q@Hg63PUVH%L{Tx7bGFX!v|M&!1e5Ah>NY8ukXBbk**VHZ-^ zs|z88Fr=sWd({h)qWA4Rt0hFpUYnW{+Us2K^O>FG5L8^VSe zLz*$ym~V6$%aEEnW3zFevD+9l4k0~pBV*!BT9aTZO(v)*nW8~c#3U`sM{=r>p5~&i zqQRm_QM`zz#pf=rD{d|J7Y`N3isfeB>^9e#Tg~m}Ad(TrdqHYZAQgh86z_v(OBdb& zV@O1rRcg(*@<@g|`SjOYy+}tJp8OD=`>-{`Cbw}m6`uJ*n-NdE8&74S0S#@a%@|j6>ycIm#S0j(Q}+j|Vg6kUM!ihIP(X br$3nj249Qlza!*4&j%`R(ss_@!>9c}T%5>( delta 8619 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 K#gDa}bN?3s8^E3b diff --git a/exe/win32/gl07_r.dll b/exe/win32/gl07_r.dll index 3f2af54347bfb3c1b28e4c9b3cfde257dacd082f..6728bde1d188aa3544661a92e1a780873b780d5c 100644 GIT binary patch delta 9191 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./_all_client.tlb + + false + diff --git a/src/engine/client/library/clientGame/src/shared/command/CommandCppFuncs.cpp b/src/engine/client/library/clientGame/src/shared/command/CommandCppFuncs.cpp index f2793cff..461c8cf2 100644 --- a/src/engine/client/library/clientGame/src/shared/command/CommandCppFuncs.cpp +++ b/src/engine/client/library/clientGame/src/shared/command/CommandCppFuncs.cpp @@ -2452,7 +2452,7 @@ void CommandCppFuncsNamespace::commandFuncVoiceKick(Command const &, NetworkId c void CommandCppFuncsNamespace::commandFuncTcg(Command const & , NetworkId const & , NetworkId const & , Unicode::String const & params) { - CuiActionManager::performAction(CuiActions::tcg, params); + CuiSystemMessageManager::sendFakeSystemMessage(Unicode::narrowToWide("This feature is not available.")); } //---------------------------------------------------------------------- diff --git a/src/engine/client/library/clientUserInterface/src/shared/core/CuiActions.h b/src/engine/client/library/clientUserInterface/src/shared/core/CuiActions.h index 0fc447f7..abb9be9c 100644 --- a/src/engine/client/library/clientUserInterface/src/shared/core/CuiActions.h +++ b/src/engine/client/library/clientUserInterface/src/shared/core/CuiActions.h @@ -200,7 +200,7 @@ namespace CuiActions MAKE_ACTION(questHelper); MAKE_ACTION(roadmap); MAKE_ACTION(expertise); - MAKE_ACTION(ticketSubmission); + //MAKE_ACTION(ticketSubmission); MAKE_ACTION(harassmentMessage); // displayed right before the normal harassment form MAKE_ACTION(harassmentMessageFromKBSearch); // displayed before a ticket submittal from a 'Community Standards' category search MAKE_ACTION(droidCommand); @@ -257,7 +257,7 @@ namespace CuiActions MAKE_ACTION(collections); MAKE_ACTION(myCollections); MAKE_ACTION(sendSavedPlayerInterestsToServer); - MAKE_ACTION(tcg); + //MAKE_ACTION(tcg); MAKE_ACTION(appearanceTab); MAKE_ACTION(questBuilder); MAKE_ACTION(rating); diff --git a/src/engine/shared/application/PlanetWatcher/build/win32/PlanetWatcher.vcxproj b/src/engine/shared/application/PlanetWatcher/build/win32/PlanetWatcher.vcxproj index b8022e16..ffca7581 100644 --- a/src/engine/shared/application/PlanetWatcher/build/win32/PlanetWatcher.vcxproj +++ b/src/engine/shared/application/PlanetWatcher/build/win32/PlanetWatcher.vcxproj @@ -309,6 +309,7 @@ true $(OutDir)$(ProjectName)_r.pdb Windows + false NDEBUG;%(PreprocessorDefinitions) diff --git a/src/external/3rd/library/dpvs/lib/win32-x86/dpvs.lib b/src/external/3rd/library/dpvs/lib/win32-x86/dpvs.lib index 1e2c661e422f7c4f89b10d83300bcc31804bcbc9..69ddd11fad1dc1131b80163a6407b1b72df56c64 100644 GIT binary patch literal 53196 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 literal 122954 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 diff --git a/src/external/3rd/library/dpvs/lib/win32-x86/dpvsd.lib b/src/external/3rd/library/dpvs/lib/win32-x86/dpvsd.lib index 5e02140415d9264fce96fe756d854c6747a5d281..dfb019dd547671b3295558f6545b0f516ffca492 100644 GIT binary patch literal 53346 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 a2+U2B90<{N?2B%`g=2`lw^6A9mi;fNX+{YE literal 123102 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 diff --git a/src/game/client/library/swgClientUserInterface/src/shared/core/SwgCuiManager.cpp b/src/game/client/library/swgClientUserInterface/src/shared/core/SwgCuiManager.cpp index a0505b5c..ad5079e3 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/core/SwgCuiManager.cpp +++ b/src/game/client/library/swgClientUserInterface/src/shared/core/SwgCuiManager.cpp @@ -68,7 +68,7 @@ #include "swgClientUserInterface/SwgCuiQuestHelper.h" #include "swgClientUserInterface/SwgCuiServerData.h" #include "swgClientUserInterface/SwgCuiStatusGround.h" -#include "swgClientUserInterface/SwgCuiTcgManager.h" +//#include "swgClientUserInterface/SwgCuiTcgManager.h" #include "swgClientUserInterface/SwgCuiWebBrowserManager.h" // ====================================================================== @@ -472,7 +472,7 @@ void SwgCuiManager::install () SwgCuiAvatarCreationHelper::install(); SwgCuiQuestHelper::install(); SwgCuiWebBrowserManager::install(); - SwgCuiTcgManager::install(); + //SwgCuiTcgManager::install(); s_receiver = new Listener; @@ -501,7 +501,7 @@ void SwgCuiManager::remove () s_receiver = 0; SwgCuiWebBrowserManager::remove(); - SwgCuiTcgManager::remove (); + //SwgCuiTcgManager::remove (); SwgCuiQuestHelper::remove (); SwgCuiAvatarCreationHelper::remove (); SwgCuiMediatorFactorySetup::remove (); @@ -549,7 +549,7 @@ void SwgCuiManager::update (float deltaTimeSecs) UNREF (deltaTimeSecs); SwgCuiWebBrowserManager::update(deltaTimeSecs); - SwgCuiTcgManager::update(deltaTimeSecs); + //SwgCuiTcgManager::update(deltaTimeSecs); if (s_checkHud) { diff --git a/src/game/client/library/swgClientUserInterface/src/shared/core/SwgCuiMediatorFactorySetup.cpp b/src/game/client/library/swgClientUserInterface/src/shared/core/SwgCuiMediatorFactorySetup.cpp index f291ee5d..2cc0fd40 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/core/SwgCuiMediatorFactorySetup.cpp +++ b/src/game/client/library/swgClientUserInterface/src/shared/core/SwgCuiMediatorFactorySetup.cpp @@ -125,7 +125,7 @@ #include "swgClientUserInterface/SwgCuiSpaceZoneMap.h" #include "swgClientUserInterface/SwgCuiSplash.h" #include "swgClientUserInterface/SwgCuiStructurePlacement.h" -#include "swgClientUserInterface/SwgCuiTcgWindow.h" +//#include "swgClientUserInterface/SwgCuiTcgWindow.h" #include "swgClientUserInterface/SwgCuiTicketPurchase.h" #include "swgClientUserInterface/SwgCuiTrade.h" #include "swgClientUserInterface/SwgCuiVendor.h" @@ -259,7 +259,7 @@ void SwgCuiMediatorFactorySetup::install () MAKE_SWG_CTOR_WS (Collections, "/pda.Collections"); MAKE_SWG_CTOR_WS (VoiceFlyBar, "/Voice.VoiceFlyBar"); MAKE_SWG_CTOR_WS (VoiceActiveSpeakers, "/Voice.VoiceActiveSpeakers"); - MAKE_SWG_CTOR_WS (TcgWindow, "/pda.Tcg"); + //MAKE_SWG_CTOR_WS (TcgWindow, "/pda.Tcg"); MAKE_SWG_CTOR_WS (Mahjong, "/pda.Mahjong"); MAKE_SWG_CTOR_WS (AppearanceTab, "/pda.AppearanceTab"); MAKE_SWG_CTOR_WS (QuestBuilder, "/pda.QuestBuilder"); @@ -290,7 +290,7 @@ void SwgCuiMediatorFactorySetup::install () CuiMediatorFactory::addConstructor (CuiMediatorTypes::WS_TicketListAddComment, new CuiMediatorFactory::Constructor ("/PDA.Service.edit", true)); MAKE_SWG_CTOR (ResourceSplitter, "/pda.SplitResource.main"); - MAKE_SWG_CTOR_WS (HarassmentReport, "/pda.Service.harassment"); + //MAKE_SWG_CTOR_WS (HarassmentReport, "/pda.Service.harassment"); MAKE_SWG_CTOR_WS (IMEIndicator, "/pda.ime"); MAKE_SWG_CTOR_WS (IMEIndicatorSpace, "/pda.imeSpace"); diff --git a/src/game/client/library/swgClientUserInterface/src/shared/core/SwgCuiMediatorTypes.h b/src/game/client/library/swgClientUserInterface/src/shared/core/SwgCuiMediatorTypes.h index 4a3b1648..b313b461 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/core/SwgCuiMediatorTypes.h +++ b/src/game/client/library/swgClientUserInterface/src/shared/core/SwgCuiMediatorTypes.h @@ -103,7 +103,7 @@ namespace CuiMediatorTypes MAKE_MEDIATOR_TYPE (WS_Collections); MAKE_MEDIATOR_TYPE (WS_VoiceFlyBar); MAKE_MEDIATOR_TYPE (WS_VoiceActiveSpeakers); - MAKE_MEDIATOR_TYPE (WS_TcgWindow); + //MAKE_MEDIATOR_TYPE (WS_TcgWindow); MAKE_MEDIATOR_TYPE (WS_Mahjong); MAKE_MEDIATOR_TYPE (WS_AppearanceTab); MAKE_MEDIATOR_TYPE (WS_QuestBuilder); diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiButtonBar.cpp b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiButtonBar.cpp index 2379391d..abc0735e 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiButtonBar.cpp +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiButtonBar.cpp @@ -117,12 +117,12 @@ m_characterButton(0), m_expertiseButton(0), m_optionsButton(0), m_commandsButton(0), -m_serviceButton(0), +//m_serviceButton(0), m_submenuButton(0), m_shipDetailsButton(0), m_homePortButton(0), m_myCollectionsButton(0), -m_tcgButton(0), +//m_tcgButton(0), m_appearanceButton(0), m_questBuilderButton(0), m_gcwInfoButton(0), @@ -152,12 +152,12 @@ m_opacityCallback (0) getCodeDataObject (TUIButton, m_expertiseButton, "buttonExpertise"); getCodeDataObject (TUIButton, m_optionsButton, "buttonOptions"); getCodeDataObject (TUIButton, m_commandsButton, "buttonCommands"); - getCodeDataObject (TUIButton, m_serviceButton, "buttonService"); + //getCodeDataObject (TUIButton, m_serviceButton, "buttonService"); getCodeDataObject (TUIButton, m_submenuButton, "buttonMenu"); getCodeDataObject (TUIButton, m_shipDetailsButton, "buttonShipDetails", true); getCodeDataObject (TUIButton, m_homePortButton, "buttonHomePort", true); getCodeDataObject (TUIButton, m_myCollectionsButton, "buttonMyCollections"); - getCodeDataObject (TUIButton, m_tcgButton, "buttonTcg"); + //getCodeDataObject (TUIButton, m_tcgButton, "buttonTcg"); getCodeDataObject (TUIButton, m_appearanceButton, "buttonAppearance"); getCodeDataObject (TUIButton, m_questBuilderButton, "buttonQuestBuilder"); getCodeDataObject (TUIButton, m_gcwInfoButton, "buttonGCW"); @@ -185,10 +185,10 @@ m_opacityCallback (0) registerMediatorObject (*m_expertiseButton, true); registerMediatorObject (*m_optionsButton, true); registerMediatorObject (*m_commandsButton, true); - registerMediatorObject (*m_serviceButton, true); + //registerMediatorObject (*m_serviceButton, true); registerMediatorObject (*m_submenuButton, true); registerMediatorObject (*m_myCollectionsButton, true); - registerMediatorObject (*m_tcgButton, true); + //registerMediatorObject (*m_tcgButton, true); registerMediatorObject (*m_appearanceButton, true); registerMediatorObject (*m_questBuilderButton, true); registerMediatorObject (*m_gcwInfoButton, true); diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiButtonBar.h b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiButtonBar.h index 003b8c2c..38488f61 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiButtonBar.h +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiButtonBar.h @@ -83,12 +83,12 @@ private: UIButton * m_expertiseButton; UIButton * m_optionsButton; UIButton * m_commandsButton; - UIButton * m_serviceButton; + //UIButton * m_serviceButton; UIButton * m_submenuButton; UIButton * m_shipDetailsButton; UIButton * m_homePortButton; UIButton * m_myCollectionsButton; - UIButton * m_tcgButton; + //UIButton * m_tcgButton; UIButton * m_appearanceButton; UIButton * m_questBuilderButton; UIButton * m_gcwInfoButton; diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiHarassmentMessage.cpp b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiHarassmentMessage.cpp index 17be039f..0481167f 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiHarassmentMessage.cpp +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiHarassmentMessage.cpp @@ -74,8 +74,8 @@ void SwgCuiHarassmentMessage::OnButtonPressed(UIWidget *context) { if(m_fromKBSearch) { - SwgCuiTicketSubmission::NewTicket::setTicketSubmissionEnabled(true); - IGNORE_RETURN(CuiActionManager::performAction (CuiActions::ticketSubmission, Unicode::emptyString)); + //SwgCuiTicketSubmission::NewTicket::setTicketSubmissionEnabled(true); + //IGNORE_RETURN(CuiActionManager::performAction (CuiActions::ticketSubmission, Unicode::emptyString)); } else { diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiHudAction.cpp b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiHudAction.cpp index 1cd79035..24517c6c 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiHudAction.cpp +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiHudAction.cpp @@ -104,8 +104,8 @@ #include "swgClientUserInterface/SwgCuiQuestHelper.h" #include "swgClientUserInterface/SwgCuiResourceExtraction.h" #include "swgClientUserInterface/SwgCuiSpaceConversation.h" -#include "swgClientUserInterface/SwgCuiTcgManager.h" -#include "swgClientUserInterface/SwgCuiTcgWindow.h" +//#include "swgClientUserInterface/SwgCuiTcgManager.h" +//#include "swgClientUserInterface/SwgCuiTcgWindow.h" #include "swgClientUserInterface/SwgCuiToolbar.h" #include "swgClientUserInterface/SwgCuiWebBrowserManager.h" #include "swgClientUserInterface/SwgCuiVoiceFlyBar.h" @@ -253,7 +253,7 @@ m_toggleDownTimeNames (0.0f) CuiActionManager::addAction (CuiActions::notepad, this, false); CuiActionManager::addAction (CuiActions::setName, this, false); - CuiActionManager::addAction (CuiActions::ticketSubmission, this, false); + //CuiActionManager::addAction (CuiActions::ticketSubmission, this, false); CuiActionManager::addAction (CuiActions::harassmentMessage, this, false); CuiActionManager::addAction (CuiActions::harassmentMessageFromKBSearch,this, false); CuiActionManager::addAction (CuiActions::manageShipComponents, this, false); @@ -285,7 +285,7 @@ m_toggleDownTimeNames (0.0f) CuiActionManager::addAction(CuiActions::sendSavedPlayerInterestsToServer, this, false); CuiActionManager::addAction (SwgCuiActions::toggleVoiceFlyBar, this, false); - CuiActionManager::addAction (CuiActions::tcg, this, false); + //CuiActionManager::addAction (CuiActions::tcg, this, false); CuiActionManager::addAction (CuiActions::appearanceTab, this, false); @@ -1186,10 +1186,10 @@ bool SwgCuiHudAction::performAction (const std::string & id, const Unicode::Str SwgCuiWebBrowserManager::setURL(finalUrl.c_str(), true); } - else if (id == CuiActions::ticketSubmission) // Ticket Submission tabbed form - { - m_mediator.m_windowManager->spawnTicketSubmission(); - } +// else if (id == CuiActions::ticketSubmission) // Ticket Submission tabbed form + //{ + // m_mediator.m_windowManager->spawnTicketSubmission(); + //} else if (id == CuiActions::harassmentMessage) // Message displayed prior to a harrassment report { @@ -1593,22 +1593,22 @@ bool SwgCuiHudAction::performAction (const std::string & id, const Unicode::Str { CuiMediatorFactory::toggleInWorkspace(CuiMediatorTypes::WS_VoiceActiveSpeakers); } - else if (id == CuiActions::tcg) - { - SwgCuiTcgWindow * tcgWindow = safe_cast(CuiMediatorFactory::getInWorkspace(CuiMediatorTypes::WS_TcgWindow, false, false, false)); +// else if (id == CuiActions::tcg) + //{ + // SwgCuiTcgWindow * tcgWindow = safe_cast(CuiMediatorFactory::getInWorkspace(CuiMediatorTypes::WS_TcgWindow, false, false, false)); - if (tcgWindow && tcgWindow->isActive()) - { - CuiMediatorFactory::deactivateInWorkspace(CuiMediatorTypes::WS_TcgWindow); - } - else - { - SwgCuiTcgManager::setLoginInfo(GameNetwork::getUserName().c_str(), CuiLoginManager::getSessionIdKey(true)); - SwgCuiTcgManager::launch(); - - tcgWindow = safe_cast(CuiMediatorFactory::activateInWorkspace(CuiMediatorTypes::WS_TcgWindow, false, false)); - } - } + // if (tcgWindow && tcgWindow->isActive()) + // { + // CuiMediatorFactory::deactivateInWorkspace(CuiMediatorTypes::WS_TcgWindow); + // } + // else + // { + // SwgCuiTcgManager::setLoginInfo(GameNetwork::getUserName().c_str(), CuiLoginManager::getSessionIdKey(true)); + // SwgCuiTcgManager::launch(); + // + // tcgWindow = safe_cast(CuiMediatorFactory::activateInWorkspace(CuiMediatorTypes::WS_TcgWindow, false, false)); + // } + //} else if (id == CuiActions::appearanceTab) { CuiMediatorFactory::toggleInWorkspace(CuiMediatorTypes::WS_AppearanceTab); diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiService_KnowledgeBase.cpp b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiService_KnowledgeBase.cpp index fbb003ef..cff03649 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiService_KnowledgeBase.cpp +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiService_KnowledgeBase.cpp @@ -207,7 +207,7 @@ void SwgCuiService::KnowledgeBase::OnButtonPressed(UIWidget *context) } else if (context == m_didNotHelpButton) { - IGNORE_RETURN(CuiActionManager::performAction(CuiActions::ticketSubmission, Unicode::emptyString)); +// IGNORE_RETURN(CuiActionManager::performAction(CuiActions::ticketSubmission, Unicode::emptyString)); } }