Add support for external resource Linking and Update text.

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

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);

Sources/Plasma/PubUtilLib/plProgressMgr/plProgressMgr.cpp

@@ -55,9 +55,9 @@ plProgressMgr   *plProgressMgr::fManager = nil;
 
 char* plProgressMgr::fImageRotation[LOADING_RES_COUNT];
 
-int plProgressMgr::fStaticTextIDs[] = {
+char* plProgressMgr::fStaticTextIDs[] = {
-    0,
+    "xLoading_Linking_Text.png",
-    IDR_LOADING_UPDATETEXT,
+    "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];
 }

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 ) { }