OU/CWE-ou-minkata
2
3
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-14 02:27:40 -04:00
Code Releases Activity

Add support for external resource Linking and Update text.

Browse Source
This commit is contained in:
Joseph Davies
2011-06-16 23:04:16 -07:00
parent b4422d2e95
commit 6d2ce47b37
6 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/Plasma/Apps/plClient/res/resource.h
View File

@ -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

BIN
Sources/Plasma/Apps/plClient/res/xLoading_Linking_Text.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 29 KiB

BIN
Sources/Plasma/Apps/plClient/res/xLoading_Updating_Text.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 29 KiB

2
Sources/Plasma/PubUtilLib/plPipeline/plDTProgressMgr.cpp
View File

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

8
Sources/Plasma/PubUtilLib/plProgressMgr/plProgressMgr.cpp
View File

@ -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];
}

4
Sources/Plasma/PubUtilLib/plProgressMgr/plProgressMgr.h
View File

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