Merge pull request #71 from diafero/cleanup

Cleanup
H-uru · Aug 20, 2011 · 1ef53bf · 1ef53bf
2 parents aa29afc + 2b1adbe
commit 1ef53bf
Show file tree

Hide file tree

Showing 25 changed files with 150 additions and 579 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -27,28 +27,10 @@ if(CURL_IS_STATIC)
 endif(CURL_IS_STATIC)
 
 option(PLASMA_EXTERNAL_RELEASE "Is this release intended for the general public?" OFF)
-
 if(PLASMA_EXTERNAL_RELEASE)
     add_definitions(-DPLASMA_EXTERNAL_RELEASE)
 endif(PLASMA_EXTERNAL_RELEASE)
 
-set(PLASMA_BUILD_TYPE "Live"
-    CACHE STRING "Which type of client to build")
-set_property(CACHE PLASMA_BUILD_TYPE PROPERTY STRINGS
-             "Dev" "QA" "Test" "Beta" "Live")
-
-if(PLASMA_BUILD_TYPE STREQUAL "Dev")
-    add_definitions(-DBUILD_TYPE=BUILD_TYPE_DEV)
-elseif(PLASMA_BUILD_TYPE STREQUAL "QA")
-    add_definitions(-DBUILD_TYPE=BUILD_TYPE_QA)
-elseif(PLASMA_BUILD_TYPE STREQUAL "Test")
-    add_definitions(-DBUILD_TYPE=BUILD_TYPE_TEST)
-elseif(PLASMA_BUILD_TYPE STREQUAL "Beta")
-    add_definitions(-DBUILD_TYPE=BUILD_TYPE_BETA)
-elseif(PLASMA_BUILD_TYPE STREQUAL "Live")
-    add_definitions(-DBUILD_TYPE=BUILD_TYPE_LIVE)
-endif(PLASMA_BUILD_TYPE STREQUAL "Dev")
-
 set(PLASMA_TARGETS "Client"
     CACHE STRING "Which set of plasma targets to build and use")
 set_property(CACHE PLASMA_TARGETS PROPERTY STRINGS

diff --git a/Sources/Plasma/Apps/plClient/res/plClient.rc b/Sources/Plasma/Apps/plClient/res/plClient.rc
@@ -80,57 +80,6 @@ BEGIN
     PUSHBUTTON      "Copy",IDC_COPY,239,26,50,14
 END
 
-IDD_URUTAP_LOGIN DIALOGEX 0, 0, 188, 111
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
-CAPTION "Enter Login Info"
-FONT 8, "MS Shell Dlg", 400, 0, 0x1
-BEGIN
-    DEFPUSHBUTTON   "Enter",IDOK,33,90,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,107,90,50,14
-    LTEXT           "Username",IDC_STATIC,7,7,38,11
-    EDITTEXT        IDC_URUTAP_USERNAME,52,7,129,13,ES_AUTOHSCROLL
-    LTEXT           "Password",IDC_STATIC,7,30,38,12
-    EDITTEXT        IDC_URUTAP_PASSWORD,52,28,129,12,ES_PASSWORD | 
-                    ES_AUTOHSCROLL
-    LTEXT           "Server",IDC_STATIC,7,54,35,12
-    EDITTEXT        IDC_URUTAP_SERVER,51,51,130,13,ES_AUTOHSCROLL
-    CONTROL         "Destroy and recreate player",IDC_URUTAP_DESTROY,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,51,70,130,12
-END
-
-IDD_URU_LOGIN DIALOGEX 0, 0, 200, 133
-STYLE DS_SETFONT | DS_3DLOOK | WS_POPUP | WS_SYSMENU
-EXSTYLE WS_EX_STATICEDGE
-FONT 12, "Hobo Std", 500, 0, 0x0
-BEGIN
-    DEFPUSHBUTTON   "Submit",IDOK,139,114,50,14
-    PUSHBUTTON      "Quit",IDCANCEL,77,114,50,14
-    EDITTEXT        IDC_USERNAME,65,55,110,12,ES_AUTOHSCROLL
-    EDITTEXT        IDC_PASSWORD,65,71,110,12,ES_PASSWORD | ES_AUTOHSCROLL
-    LTEXT           "Username:",IDC_TEXT_USER,25,58,36,8
-    LTEXT           "Password:",IDC_TEXT_PASS,27,73,34,8
-    LTEXT           "Welcome to URU!",IDC_TEXT_WELCOME,72,45,57,8
-    CONTROL         "Remember Password:",IDC_REMEMBER_PASS,"Button",
-                    BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,23,87,85,10
-    GROUPBOX        "",IDC_BOX_01,5,30,190,79
-    GROUPBOX        "",IDC_BOX_02,14,38,172,64
-    CONTROL         151,IDC_IMAGE_BANNER,"Static",SS_BITMAP | 
-                    SS_REALSIZEIMAGE | WS_BORDER,4,4,192,21,WS_EX_CLIENTEDGE
-END
-
-IDD_URU_EULA DIALOGEX 0, 0, 201, 158
-STYLE DS_SETFONT | WS_POPUP | WS_SYSMENU
-FONT 12, "Hobo Std", 500, 0, 0x0
-BEGIN
-    DEFPUSHBUTTON   "Accept",IDOK,141,138,50,14
-    PUSHBUTTON      "Decline",IDCANCEL,79,138,50,14
-    CONTROL         151,IDC_IMAGE_BANNER,"Static",SS_BITMAP | 
-                    SS_REALSIZEIMAGE | WS_BORDER,4,4,192,21,WS_EX_CLIENTEDGE
-    GROUPBOX        "",IDC_BOX_03,5,30,190,103
-    LTEXT           "Terms of Use Agreement",IDC_TEXT_TERMS,59,36,83,8
-    CONTROL         "Custom1",IDC_DYN_EULA,"",WS_TABSTOP,13,46,174,80
-END
-
 IDD_URULOGIN_MAIN DIALOGEX 0, 0, 302, 230
 STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_FIXEDSYS | 
     DS_CENTER | WS_POPUP

diff --git a/Sources/Plasma/Apps/plClient/res/resource.h b/Sources/Plasma/Apps/plClient/res/resource.h
@@ -6,10 +6,7 @@
 #define IDD_LOADING                     136
 #define IDD_EXCEPTION                   138
 #define IDR_CNSL1                       139
-#define IDD_URUTAP_LOGIN                148
-#define IDD_URU_LOGIN                   149
 #define IDB_BANNER                      151
-#define IDD_URU_EULA                    152
 #define IDD_URULOGIN_MAIN               153
 #define IDD_URULOGIN_EULA               154
 #define IDD_AUTHFAILED                  155
@@ -18,23 +15,6 @@
 #define IDC_COPY                        1002
 #define IDC_MSG                         1003
 #define IDC_STARTING_TEXT               1004
-#define IDC_URUTAP_USERNAME             1005
-#define IDC_URUTAP_PASSWORD             1006
-#define IDC_URUTAP_SERVER               1008
-#define IDC_URUTAP_DESTROY              1009
-#define IDC_USERNAME                    1010
-#define IDC_PASSWORD                    1011
-#define IDC_REMEMBER_PASS               1012
-#define IDC_IMAGE_BANNER                1013
-#define IDC_BOX_01                      1014
-#define IDC_BOX_02                      1015
-#define IDC_TEXT_WELCOME                1016
-#define IDC_TEXT_USER                   1017
-#define IDC_TEXT_PASS                   1018
-#define IDC_CUSTOM1                     1019
-#define IDC_DYN_EULA                    1019
-#define IDC_BOX_03                      1020
-#define IDC_TEXT_TERMS                  1021
 #define IDC_URULOGIN_REMEMBERPASS       1022
 #define IDC_URULOGIN_USERNAME           1023
 #define IDC_URULOGIN_PASSWORD           1024