From: Anders R. <ma...@us...> - 2003-10-30 21:54:43
|
Update of /cvsroot/planeshift/planeshift/src/client/paws In directory sc8-pr-cvs1:/tmp/cvs-serv30526/src/client/paws Modified Files: pawspetitiongmwindow.cpp pawspetitionwindow.cpp Log Message: - Added log level LOG_LOAD, to turn on/off loading of network load. - Fixed an unhandled message in the server. The heartbeat message wasn't handled. That caused a waring to be given. - Added setlog/showlogs commands to npcclient. - Removed some tabs from the petition code. Index: pawspetitiongmwindow.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/client/paws/pawspetitiongmwindow.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** pawspetitiongmwindow.cpp 1 Oct 2003 02:21:01 -0000 1.5 --- pawspetitiongmwindow.cpp 30 Oct 2003 21:54:39 -0000 1.6 *************** *** 253,258 **** switch( button ) { ! case QUIT_BUTTON: ! { // Hide our petition window petitionList->Clear(); --- 253,258 ---- switch( button ) { ! case QUIT_BUTTON: ! { // Hide our petition window petitionList->Clear(); *************** *** 261,265 **** } ! case VIEW_BUTTON: { // Get the currently selected row: --- 261,265 ---- } ! case VIEW_BUTTON: { // Get the currently selected row: *************** *** 269,292 **** psSystemMessage error(0,MSG_INFO,windowManager->Translate("You must select a petition from the list in order to view it.")); msgqueue->Publish(error.msg); ! return true; ! } ! currentRow = sel; ! if (viewWindow != NULL) ! { ! DeleteChild(viewWindow); ! viewWindow = NULL; ! } ! ! viewWindow = (pawsPetitionViewWindow*)windowManager->CreateWidget("pawsPetitionViewWindow"); ! if(!viewWindow) ! return false; ! AddChild(viewWindow); ! viewWindow->MoveTo(screenFrame.xmin+100,screenFrame.ymin+50); ! viewWindow->UpdateView(&(petitionMessage.petitions.Get(currentRow)), true); ! windowManager->SetModalWidget(viewWindow); break; } ! case CANCEL_BUTTON: { // Get the currently selected row: --- 269,292 ---- psSystemMessage error(0,MSG_INFO,windowManager->Translate("You must select a petition from the list in order to view it.")); msgqueue->Publish(error.msg); ! return true; ! } ! currentRow = sel; ! if (viewWindow != NULL) ! { ! DeleteChild(viewWindow); ! viewWindow = NULL; ! } ! ! viewWindow = (pawsPetitionViewWindow*)windowManager->CreateWidget("pawsPetitionViewWindow"); ! if(!viewWindow) ! return false; ! AddChild(viewWindow); ! viewWindow->MoveTo(screenFrame.xmin+100,screenFrame.ymin+50); ! viewWindow->UpdateView(&(petitionMessage.petitions.Get(currentRow)), true); ! windowManager->SetModalWidget(viewWindow); break; } ! case CANCEL_BUTTON: { // Get the currently selected row: *************** *** 307,311 **** } ! case ASSIGN_BUTTON: { // Get the currently selected row: --- 307,311 ---- } ! case ASSIGN_BUTTON: { // Get the currently selected row: Index: pawspetitionwindow.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/client/paws/pawspetitionwindow.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** pawspetitionwindow.cpp 30 Oct 2003 00:51:07 -0000 1.8 --- pawspetitionwindow.cpp 30 Oct 2003 21:54:39 -0000 1.9 *************** *** 178,190 **** switch( button ) { ! case QUIT_BUTTON: ! { ! petitionList->Clear(); ! Hide(); ! break; ! } ! case VIEW_BUTTON: ! { // Get the currently selected row: int sel = petitionList->GetSelection(); --- 178,190 ---- switch( button ) { ! case QUIT_BUTTON: ! { ! petitionList->Clear(); ! Hide(); ! break; ! } ! case VIEW_BUTTON: ! { // Get the currently selected row: int sel = petitionList->GetSelection(); *************** *** 193,218 **** psSystemMessage error(0,MSG_INFO,windowManager->Translate("You must select a petition from the list in order to view it.")); msgqueue->Publish(error.msg); ! return true; ! } ! ! // The viewWindow widget can't be reused since it creates new widgets on every call to UpdateView ! if (viewWindow != NULL) ! { ! DeleteChild(viewWindow); ! viewWindow = NULL; ! } ! currentRow = sel; ! viewWindow = (pawsPetitionViewWindow*)windowManager->CreateWidget("pawsPetitionViewWindow"); ! if(!viewWindow) ! return false; ! AddChild(viewWindow); ! viewWindow->MoveTo(screenFrame.xmin+100,screenFrame.ymin+50); ! viewWindow->UpdateView(&(petitionMessage.petitions.Get(currentRow)), false); ! windowManager->SetModalWidget(viewWindow); break; } ! case CANCEL_BUTTON: ! { // Get the currently selected row: int sel = petitionList->GetSelection(); --- 193,218 ---- psSystemMessage error(0,MSG_INFO,windowManager->Translate("You must select a petition from the list in order to view it.")); msgqueue->Publish(error.msg); ! return true; ! } ! ! // The viewWindow widget can't be reused since it creates new widgets on every call to UpdateView ! if (viewWindow != NULL) ! { ! DeleteChild(viewWindow); ! viewWindow = NULL; ! } ! currentRow = sel; ! viewWindow = (pawsPetitionViewWindow*)windowManager->CreateWidget("pawsPetitionViewWindow"); ! if(!viewWindow) ! return false; ! AddChild(viewWindow); ! viewWindow->MoveTo(screenFrame.xmin+100,screenFrame.ymin+50); ! viewWindow->UpdateView(&(petitionMessage.petitions.Get(currentRow)), false); ! windowManager->SetModalWidget(viewWindow); break; } ! case CANCEL_BUTTON: ! { // Get the currently selected row: int sel = petitionList->GetSelection(); *************** *** 223,236 **** return true; } ! currentRow = sel; ! // Send a message to the server requesting cancel psPetitionRequestMessage queryMsg(false, "cancel", petitionMessage.petitions.Get(currentRow).id); msgqueue->SendMessage(queryMsg.msg); break; } ! } ! return true; } --- 223,236 ---- return true; } ! currentRow = sel; ! // Send a message to the server requesting cancel psPetitionRequestMessage queryMsg(false, "cancel", petitionMessage.petitions.Get(currentRow).id); msgqueue->SendMessage(queryMsg.msg); break; + } } ! return true; } |