From 6d2ce47b3735e2e38efc9d1d21250f6742164c7c Mon Sep 17 00:00:00 2001 From: Joseph Davies Date: Thu, 16 Jun 2011 23:04:16 -0700 Subject: [PATCH] Add support for external resource Linking and Update text. --- Sources/Plasma/Apps/plClient/res/resource.h | 2 -- .../Apps/plClient/res/xLoading_Linking_Text.jpg | Bin 30056 -> 0 bytes .../plClient/res/xLoading_Updating_Text.jpg | Bin 30050 -> 0 bytes .../PubUtilLib/plPipeline/plDTProgressMgr.cpp | 2 +- .../PubUtilLib/plProgressMgr/plProgressMgr.cpp | 8 ++++---- .../PubUtilLib/plProgressMgr/plProgressMgr.h | 4 ++-- 6 files changed, 7 insertions(+), 9 deletions(-) delete mode 100644 Sources/Plasma/Apps/plClient/res/xLoading_Linking_Text.jpg delete mode 100644 Sources/Plasma/Apps/plClient/res/xLoading_Updating_Text.jpg diff --git a/Sources/Plasma/Apps/plClient/res/resource.h b/Sources/Plasma/Apps/plClient/res/resource.h index 112ad248..6e27c82e 100644 --- a/Sources/Plasma/Apps/plClient/res/resource.h +++ b/Sources/Plasma/Apps/plClient/res/resource.h @@ -14,8 +14,6 @@ #define IDD_URULOGIN_EULA 154 #define IDD_AUTHFAILED 155 #define IDD_AUTHENTICATING 156 -#define IDR_LOADING_LINKTEXT 195 -#define IDR_LOADING_UPDATETEXT 196 #define IDC_CRASHINFO 1001 #define IDC_COPY 1002 #define IDC_MSG 1003 diff --git a/Sources/Plasma/Apps/plClient/res/xLoading_Linking_Text.jpg b/Sources/Plasma/Apps/plClient/res/xLoading_Linking_Text.jpg deleted file mode 100644 index a70429fafac648ce7431e31f315d63dc13cb3491..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 30056 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 UY%Kh7u&HWgS1s#Z#K=GY3)Ez+sQ>@~ diff --git a/Sources/Plasma/Apps/plClient/res/xLoading_Updating_Text.jpg b/Sources/Plasma/Apps/plClient/res/xLoading_Updating_Text.jpg deleted file mode 100644 index 90c02ed4da057509c99ff24cb8b7e14b947f1184..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 30050 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::GetStaticTextID(fCurrentStaticText)), 0); + fStaticTextPlate->CreateFromResource(plProgressMgr::GetStaticTextID(fCurrentStaticText)); fStaticTextPlate->SetVisible(true); fStaticTextPlate->SetOpacity(1.0f); fStaticTextPlate->SetSize(2 * 0.192f, 2 * 0.041f, true); diff --git a/Sources/Plasma/PubUtilLib/plProgressMgr/plProgressMgr.cpp b/Sources/Plasma/PubUtilLib/plProgressMgr/plProgressMgr.cpp index 0027509a..9fa6de0a 100644 --- a/Sources/Plasma/PubUtilLib/plProgressMgr/plProgressMgr.cpp +++ b/Sources/Plasma/PubUtilLib/plProgressMgr/plProgressMgr.cpp @@ -55,9 +55,9 @@ plProgressMgr *plProgressMgr::fManager = nil; char* plProgressMgr::fImageRotation[LOADING_RES_COUNT]; -int plProgressMgr::fStaticTextIDs[] = { - 0, - IDR_LOADING_UPDATETEXT, +char* plProgressMgr::fStaticTextIDs[] = { + "xLoading_Linking_Text.png", + "xLoading_Updating_Text.png" }; //// Constructor & Destructor //////////////////////////////////////////////// @@ -234,7 +234,7 @@ char* plProgressMgr::GetLoadingFrameID(int index) return fImageRotation[0]; } -int plProgressMgr::GetStaticTextID(StaticText staticTextType) +char* plProgressMgr::GetStaticTextID(StaticText staticTextType) { return fStaticTextIDs[staticTextType]; } diff --git a/Sources/Plasma/PubUtilLib/plProgressMgr/plProgressMgr.h b/Sources/Plasma/PubUtilLib/plProgressMgr/plProgressMgr.h index e54e8c97..fd9d15a4 100644 --- a/Sources/Plasma/PubUtilLib/plProgressMgr/plProgressMgr.h +++ b/Sources/Plasma/PubUtilLib/plProgressMgr/plProgressMgr.h @@ -181,7 +181,7 @@ class plProgressMgr static plProgressMgr *fManager; static char* fImageRotation[]; - static int fStaticTextIDs[]; + static char* fStaticTextIDs[]; protected: @@ -214,7 +214,7 @@ class plProgressMgr static plProgressMgr* GetInstance() { return fManager; } static char* GetLoadingFrameID(int index); - static int GetStaticTextID(StaticText staticTextType); + static char* GetStaticTextID(StaticText staticTextType); virtual void Draw( plPipeline *p ) { }