[Planeshift-cvs] CVS: planeshift/src/client/gui pawsconfigkeys.cpp,1.30,1.31 shortcutwindow.cpp,1.46,1.47

[Jorrit T. <jo...@us...>]

Update of /cvsroot/planeshift/planeshift/src/client/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14550/src/client/gui

Modified Files:
	pawsconfigkeys.cpp shortcutwindow.cpp 
Log Message:
- Fixed PS for latest CS event changes.



Index: pawsconfigkeys.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawsconfigkeys.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** pawsconfigkeys.cpp	17 Nov 2005 07:54:08 -0000	1.30
--- pawsconfigkeys.cpp	14 Dec 2005 06:25:34 -0000	1.31
***************
*** 158,162 ****
                  {
                      csKeyModifiers modifiers = cm->CreateCSMods();
!                     csString str = csInputDefinition::GetKeyString ( 0, &modifiers, true );
                      keyLabel->SetText( str.GetData() );
                  }
--- 158,163 ----
                  {
                      csKeyModifiers modifiers = cm->CreateCSMods();
! 		    iEventNameRegistry* nr = GetWindowManager ()->GetEventNameRegistry ();
!                     csString str = csInputDefinition::GetKeyString (nr, 0, &modifiers, true );
                      keyLabel->SetText( str.GetData() );
                  }
***************
*** 180,184 ****
  
                      csKeyModifiers modifiers = ctrl->CreateCSMods();
!                     csString str = csInputDefinition::GetKeyString ( ctrl->GetTrigger(), &modifiers, true );
                      keyLabel->SetText( str.GetData() );
                  }
--- 181,186 ----
  
                      csKeyModifiers modifiers = ctrl->CreateCSMods();
! 		    iEventNameRegistry* nr = GetWindowManager ()->GetEventNameRegistry ();
!                     csString str = csInputDefinition::GetKeyString (nr, ctrl->GetTrigger(), &modifiers, true );
                      keyLabel->SetText( str.GetData() );
                  }
***************
*** 389,395 ****
                                         csKeyEventHelper::GetModifiersBits(enteredTrigger.modifiers) ))
              {
                  SetTriggerTextOfCommand(
                      editedCmd,
!                     csInputDefinition::GetKeyString ( enteredTrigger.codeRaw, &(enteredTrigger.modifiers), true ) 
                                  );
  
--- 391,398 ----
                                         csKeyEventHelper::GetModifiersBits(enteredTrigger.modifiers) ))
              {
+ 		iEventNameRegistry* nr = GetWindowManager ()->GetEventNameRegistry ();
                  SetTriggerTextOfCommand(
                      editedCmd,
!                     csInputDefinition::GetKeyString (nr, enteredTrigger.codeRaw, &(enteredTrigger.modifiers), true ) 
                                  );
  
***************
*** 437,441 ****
              // Update text
              csKeyModifiers d = cm->CreateCSMods();
!             SetTriggerTextOfCommand( editedCmd, csInputDefinition::GetKeyString ( 0, &d , true ));
          }
          break;
--- 440,445 ----
              // Update text
              csKeyModifiers d = cm->CreateCSMods();
! 	    iEventNameRegistry* nr = GetWindowManager ()->GetEventNameRegistry ();
!             SetTriggerTextOfCommand( editedCmd, csInputDefinition::GetKeyString (nr, 0, &d , true ));
          }
          break;
***************
*** 534,538 ****
  {
      csString str;
!     csString trig = csInputDefinition::GetKeyString(trigger.codeRaw,&(trigger.modifiers),true);
  
      str = "Key \"";
--- 538,543 ----
  {
      csString str;
!     iEventNameRegistry* nr = GetWindowManager ()->GetEventNameRegistry ();
!     csString trig = csInputDefinition::GetKeyString(nr, trigger.codeRaw,&(trigger.modifiers),true);
  
      str = "Key \"";

Index: shortcutwindow.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/shortcutwindow.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** shortcutwindow.cpp	13 Dec 2005 07:30:04 -0000	1.46
--- shortcutwindow.cpp	14 Dec 2005 06:25:34 -0000	1.47
***************
*** 377,381 ****
          
          csKeyModifiers modifiers = ctrl->CreateCSMods();
!         csString str = csInputDefinition::GetKeyString ( ctrl->GetTrigger(), &modifiers, true );
          return str;
      }
--- 377,382 ----
          
          csKeyModifiers modifiers = ctrl->CreateCSMods();
! 	iEventNameRegistry* nr = GetWindowManager ()->GetEventNameRegistry ();
!         csString str = csInputDefinition::GetKeyString (nr, ctrl->GetTrigger(), &modifiers, true );
          return str;
      }