From: <wel...@us...> - 2011-05-14 06:20:22
|
Revision: 7263 http://planeshift.svn.sourceforge.net/planeshift/?rev=7263&view=rev Author: weltall2 Date: 2011-05-14 06:20:16 +0000 (Sat, 14 May 2011) Log Message: ----------- Implemented PS#277 - Allow player to disable the "Active Magics" notification window patch by Tapped Modified Paths: -------------- trunk/src/common/paws/pawsmanager.cpp trunk/src/tools/pawseditor/pawseditorapp.cpp trunk/src/tools/pawseditor/pepawsmanager.cpp trunk/src/tools/pawseditor/pepawsmanager.h Modified: trunk/src/common/paws/pawsmanager.cpp =================================================================== --- trunk/src/common/paws/pawsmanager.cpp 2011-05-14 05:51:58 UTC (rev 7262) +++ trunk/src/common/paws/pawsmanager.cpp 2011-05-14 06:20:16 UTC (rev 7263) @@ -165,7 +165,7 @@ { if(!LoadSkinDefinition(skinBase)) { - Error2("Couldn't load base skin '%s'!\n", skinBase); + Error2("Couldn't load base skin '%s'!", skinBase); } } @@ -174,7 +174,6 @@ if ( !prefs->LoadBorderFile( borderFile ) ) Error2("Failed to load borderFile '%s'", borderFile.GetData()); - mouse = new pawsMouse(); mouse->ChangeImage("Standard Mouse Pointer"); Modified: trunk/src/tools/pawseditor/pawseditorapp.cpp =================================================================== --- trunk/src/tools/pawseditor/pawseditorapp.cpp 2011-05-14 05:51:58 UTC (rev 7262) +++ trunk/src/tools/pawseditor/pawseditorapp.cpp 2011-05-14 06:20:16 UTC (rev 7263) @@ -179,7 +179,7 @@ SevereError("Could not initialize PAWS!"); return false; } - +printf("b\n"); // Mount base skin to satisfy unskined elements csString skinPath = cfgmgr->GetStr("Planeshift.GUI.Skin.Base","/planeshift/art/skins/base/client_base.zip"); if(!paws->LoadSkinDefinition(skinPath)) @@ -200,8 +200,6 @@ "Warning: Some PAWS widgets failed to load"); } - paws->GetMouse()->ChangeImage("peStandardMousePointer"); - paws->FindWidget( "peMenu" )->SetAlwaysOnTop( true ); widgetTree = (peWidgetTree *) paws->FindWidget( "peWidgetTree" ); widgetTree->SetAlwaysOnTop( true ); @@ -220,6 +218,7 @@ // Load Default Skin csString skin = cfgmgr->GetStr("PlaneShift.GUI.Skin.Selected","default"); + printf("a %s\n", skin.GetData()); if(skin != "") //should not happen but who knows what an user might do :P LoadSkin( skin ); Modified: trunk/src/tools/pawseditor/pepawsmanager.cpp =================================================================== --- trunk/src/tools/pawseditor/pepawsmanager.cpp 2011-05-14 05:51:58 UTC (rev 7262) +++ trunk/src/tools/pawseditor/pepawsmanager.cpp 2011-05-14 06:20:16 UTC (rev 7263) @@ -27,7 +27,7 @@ #include "pepawsmanager.h" -pePawsManager::pePawsManager(iObjectRegistry* objectReg, const char* skin, const char * pawsConfigFile ) : PawsManager( objectReg, skin, pawsConfigFile ) +pePawsManager::pePawsManager(iObjectRegistry* objectReg, const char* skin) : PawsManager(objectReg, skin) { } Modified: trunk/src/tools/pawseditor/pepawsmanager.h =================================================================== --- trunk/src/tools/pawseditor/pepawsmanager.h 2011-05-14 05:51:58 UTC (rev 7262) +++ trunk/src/tools/pawseditor/pepawsmanager.h 2011-05-14 06:20:16 UTC (rev 7263) @@ -30,7 +30,7 @@ class pePawsManager : public PawsManager { public: - pePawsManager(iObjectRegistry* objectReg, const char* skin, const char * pawsConfigFile = "/this/planeshift.cfg"); + pePawsManager(iObjectRegistry* objectReg, const char* skin); virtual ~pePawsManager(void); void ReloadStyles(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |