[Planeshift-cvs] CVS: planeshift/src/common/paws pawsnumberpromptwindow.cpp,1.13,1.14 pawspromptwindow.cpp,1.7,1.8 pawswidget.cpp,1.49,1.50

[Christian S. <blu...@us...>]

Update of /cvsroot/planeshift/planeshift/src/common/paws
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27978

Modified Files:
	pawsnumberpromptwindow.cpp pawspromptwindow.cpp pawswidget.cpp 
Log Message:
See history.txt for details

Index: pawsnumberpromptwindow.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/paws/pawsnumberpromptwindow.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** pawsnumberpromptwindow.cpp	13 Mar 2004 08:58:02 -0000	1.13
--- pawsnumberpromptwindow.cpp	8 May 2004 16:12:29 -0000	1.14
***************
*** 121,126 ****
      if (label != NULL)
      {
!         numberStr = maxNumber;
!         label->SetText("max = "+numberStr);
      }
      
--- 121,129 ----
      if (label != NULL)
      {
!         if(!strcmp(label->GetText(),""))
!         {
!             numberStr = maxNumber;
!             label->SetText("Max "+numberStr);
!         }
      }
      
***************
*** 198,206 ****
  }
  
! void pawsNumberPromptWindow::Initialize(const csString & label, int number, int minNumber, int maxNumber, iOnNumberEnteredAction * action)
  {
      windowManager->SetCurrentFocusedWidget(editBox);
      
!     SetLabel(label);
      this->minNumber = minNumber;
      SetMaxNumber(maxNumber);
--- 201,213 ----
  }
  
! void pawsNumberPromptWindow::Initialize(const csString & labelStr, int number, int minNumber, int maxNumber, iOnNumberEnteredAction * action)
  {
      windowManager->SetCurrentFocusedWidget(editBox);
      
!     SetLabel(labelStr);
! 
!     if(label != NULL)
!         label->SetText(labelStr);
! 
      this->minNumber = minNumber;
      SetMaxNumber(maxNumber);
***************
*** 230,234 ****
      w->PostSetup();
      w->UseBorder();
!     w->SetTitle( "Amount:", "Blue Title", "center", "no" );
      windowManager->SetModalWidget(w);
      w->Initialize(label, number, minNumber, maxNumber, action);
--- 237,241 ----
      w->PostSetup();
      w->UseBorder();
!     w->SetTitle( "Amount", "Blue Title", "center", "no" );
      windowManager->SetModalWidget(w);
      w->Initialize(label, number, minNumber, maxNumber, action);

Index: pawspromptwindow.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/paws/pawspromptwindow.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** pawspromptwindow.cpp	13 Mar 2004 08:58:02 -0000	1.7
--- pawspromptwindow.cpp	8 May 2004 16:12:29 -0000	1.8
***************
*** 61,65 ****
      cancelButton->SetUpImage("Blue Title");
      cancelButton->SetRelativeFrameSize(60, 20);
!     cancelButton->SetText(windowManager->Translate("cancel"));
  
      SetBackgroundAlpha(0);
--- 61,65 ----
      cancelButton->SetUpImage("Blue Title");
      cancelButton->SetRelativeFrameSize(60, 20);
!     cancelButton->SetText(windowManager->Translate("Cancel"));
  
      SetBackgroundAlpha(0);

Index: pawswidget.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/paws/pawswidget.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** pawswidget.cpp	4 May 2004 12:06:59 -0000	1.49
--- pawswidget.cpp	8 May 2004 16:12:30 -0000	1.50
***************
*** 449,464 ****
          max_height = GetActualHeight(maxFrameNode->GetAttributeValueAsInt("height"));
      }
-     
-     // Check to see if we have possible saved positions to use. 
-     if ( saveWidgetPositions )
-     {
-         csRect pos = LoadPositions();
-         // Resize to loaded positions.
-         MoveTo( pos.xmin, pos.ymin );
-        
-         //only set size if widget is resizable
-         if( IsResizable() )
-             SetSize( pos.Width(), pos.Height() );        
-     }
  
      return true;
--- 449,452 ----
***************
*** 485,488 ****
--- 473,488 ----
          return false;
      }
+ 
+     // Check to see if we have possible saved positions to use. 
+     if ( saveWidgetPositions )
+     {
+         csRect pos = LoadPositions();
+         // Resize to loaded positions.
+         MoveTo( pos.xmin, pos.ymin );
+        
+         //only set size if widget is resizable
+         if( IsResizable() )
+             SetSize( pos.Width(), pos.Height() );        
+     }
      
      Resize();