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 a70429fa..00000000 Binary files a/Sources/Plasma/Apps/plClient/res/xLoading_Linking_Text.jpg and /dev/null differ 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 90c02ed4..00000000 Binary files a/Sources/Plasma/Apps/plClient/res/xLoading_Updating_Text.jpg and /dev/null differ diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plDTProgressMgr.cpp b/Sources/Plasma/PubUtilLib/plPipeline/plDTProgressMgr.cpp index 0ee95f9a..ea0ff3c4 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plDTProgressMgr.cpp +++ b/Sources/Plasma/PubUtilLib/plPipeline/plDTProgressMgr.cpp @@ -68,7 +68,7 @@ void plDTProgressMgr::Activate() { plPlateManager::Instance().CreatePlate(&fStaticTextPlate); - fStaticTextPlate->CreateFromJPEGResource(MAKEINTRESOURCE(plProgressMgr::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 ) { }