[Planeshift-cvs] CVS: planeshift/src/client/gui pawsconfigkeys.cpp,1.7,1.8 pawsconfigmouse.cpp,1.5,1.6 pawsconfigmouse.h,1.2,1.3 shortcutwindow.cpp,1.5,1.6 shortcutwindow.h,1.3,1.4

[Anders R. <ma...@us...>]

Update of /cvsroot/planeshift/planeshift/src/client/gui
In directory sc8-pr-cvs1:/tmp/cvs-serv8816/src/client/gui

Modified Files:
	pawsconfigkeys.cpp pawsconfigmouse.cpp pawsconfigmouse.h 
	shortcutwindow.cpp shortcutwindow.h 
Log Message:
- Added LoadDefaultCommand function to the short cut window.
- Added loading of default mouse settings for config mouse.


Index: pawsconfigkeys.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawsconfigkeys.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** pawsconfigkeys.cpp	11 Jan 2004 16:04:50 -0000	1.7
--- pawsconfigkeys.cpp	11 Jan 2004 16:37:54 -0000	1.8
***************
*** 29,32 ****
--- 29,33 ----
  #include "globals.h"
  #include "pscharcontrol.h"
+ #include "gui/shortcutwindow.h"
  
  // COMMON INCLUDES
***************
*** 285,289 ****
  {
      psengine->GetCharControl()->ClearKeyMap();
!     psengine->GetCharControl()->LoadKeyMap("/this/data/options/keys_def.xml");
  
      SetKeyLabels(tree->GetRoot());
--- 286,295 ----
  {
      psengine->GetCharControl()->ClearKeyMap();
!     psengine->GetCharControl()->LoadDefaultKeyMap();
! 
!     pawsShortcutWindow * shortcuts = dynamic_cast<pawsShortcutWindow*>
!         (windowManager->FindWidget("Shortcut"));
!     if (shortcuts)
!         shortcuts->LoadDefaultCommands();
  
      SetKeyLabels(tree->GetRoot());

Index: pawsconfigmouse.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawsconfigmouse.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** pawsconfigmouse.cpp	11 Jan 2004 00:45:05 -0000	1.5
--- pawsconfigmouse.cpp	11 Jan 2004 16:37:54 -0000	1.6
***************
*** 46,49 ****
--- 46,51 ----
  #define NO_BIND "?"
  
+ #define MOUSE_FILE         "/this/data/options/mouse.xml"
+ #define DEFAULT_MOUSE_FILE "/this/data/options/mouse_def.xml"
  
  //////////////////////////////////////////////////////////////////////
***************
*** 78,87 ****
  bool pawsConfigMouse::LoadConfig()
  {
!     csString fileName = "/this/data/options/mouse.xml";
      if (!psengine->GetVFS()->Exists(fileName))
      {
!         fileName = "/this/data/options/mouse_def.xml";
      }
  
      if ( binds.LoadFromFile(object_reg, fileName ) )
      {
--- 80,93 ----
  bool pawsConfigMouse::LoadConfig()
  {
!     csString fileName = MOUSE_FILE;
      if (!psengine->GetVFS()->Exists(fileName))
      {
!         fileName = DEFAULT_MOUSE_FILE;
      }
+     return LoadMouse(fileName);
+ }
  
+ bool pawsConfigMouse::LoadMouse(const char * fileName)
+ {
      if ( binds.LoadFromFile(object_reg, fileName ) )
      {
***************
*** 93,96 ****
--- 99,103 ----
  	return false;
  }
+ 
  bool pawsConfigMouse::SaveConfig()
  {
***************
*** 106,112 ****
      return ok1 && ok2;
  }
  void pawsConfigMouse::SetDefault()
  {
! 
  }
  
--- 113,120 ----
      return ok1 && ok2;
  }
+ 
  void pawsConfigMouse::SetDefault()
  {
!     LoadMouse(MOUSE_FILE);
  }
  

Index: pawsconfigmouse.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawsconfigmouse.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pawsconfigmouse.h	7 Dec 2003 22:26:36 -0000	1.2
--- pawsconfigmouse.h	11 Jan 2004 16:37:54 -0000	1.3
***************
*** 54,57 ****
--- 54,60 ----
     
  protected:
+ 
+     bool LoadMouse(const char * fileName);
+     
       /** Creates the tree that makes the whole GUI.
        * @return  success.

Index: shortcutwindow.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/shortcutwindow.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** shortcutwindow.cpp	11 Jan 2004 15:38:03 -0000	1.5
--- shortcutwindow.cpp	11 Jan 2004 16:37:54 -0000	1.6
***************
*** 36,39 ****
--- 36,41 ----
  #include "gui/pawsconfigkeys.h"
  
+ #define COMMAND_FILE         "/this/data/options/shortcutcommands.xml"
+ #define DEFAULT_COMMAND_FILE "/this/data/options/shortcutcommands_def.xml"
  
  pawsShortcutWindow::pawsShortcutWindow( PawsManager* manager )
***************
*** 43,47 ****
      xml = csPtr<iDocumentSystem>(new csTinyDocumentSystem);
  
!     LoadCommands();
  
      csRef<iPSEngine> psengine =
--- 45,57 ----
      xml = csPtr<iDocumentSystem>(new csTinyDocumentSystem);
  
!     // Check if there have been created a custom file
!     // else use the default file.
!     csString fileName = COMMAND_FILE;
!     if (!vfs->Exists(fileName))
!     {
!         fileName = DEFAULT_COMMAND_FILE;
!     }
! 
!     LoadCommands(fileName);
  
      csRef<iPSEngine> psengine =
***************
*** 181,197 ****
  }
  
! void pawsShortcutWindow::LoadCommands(void)
  {
      int number;
      // Read button commands
      csRef<iDocument> doc = xml->CreateDocument();
- 
-     // Check if there have been created a custom file
-     // else use the default file.
-     csString fileName = "/this/data/options/shortcutcommands.xml";
-     if (!vfs->Exists(fileName))
-     {
-         fileName = "/this/data/options/shortcutcommands_def.xml";
-     }
      
      csRef<iDataBuffer> buf (vfs->ReadFile (fileName));
--- 191,204 ----
  }
  
! void pawsShortcutWindow::LoadDefaultCommands()
! {
!     LoadCommands(DEFAULT_COMMAND_FILE);
! }
! 
! void pawsShortcutWindow::LoadCommands(const char * fileName)
  {
      int number;
      // Read button commands
      csRef<iDocument> doc = xml->CreateDocument();
      
      csRef<iDataBuffer> buf (vfs->ReadFile (fileName));

Index: shortcutwindow.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/shortcutwindow.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** shortcutwindow.h	11 Jan 2004 15:38:03 -0000	1.3
--- shortcutwindow.h	11 Jan 2004 16:37:54 -0000	1.4
***************
*** 56,63 ****
      const csString& GetCommandName(int shortcutNum, bool local);
  
  protected:
      /// System text for easy access
      pawsMessageTextBox* systemText;
!     void LoadCommands(void);
      void SaveCommands(void);
      CmdHandler *cmdsource;
--- 56,65 ----
      const csString& GetCommandName(int shortcutNum, bool local);
  
+     void LoadDefaultCommands();
+     
  protected:
      /// System text for easy access
      pawsMessageTextBox* systemText;
!     void LoadCommands(const char * fileName);
      void SaveCommands(void);
      CmdHandler *cmdsource;