frontierproject-cvs Mailing List for Frontier Project

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/frontierproject/frontierproject/src
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv26898/src

Modified Files:
	DebugConsole.cpp gui_mainscreen.cpp widget_painter.cpp 
Log Message:
Commit local changes in preperation for resync.

Index: gui_mainscreen.cpp
===================================================================
RCS file: /cvsroot/frontierproject/frontierproject/src/gui_mainscreen.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** gui_mainscreen.cpp	1 Jun 2006 05:23:19 -0000	1.18
--- gui_mainscreen.cpp	9 Oct 2006 20:19:22 -0000	1.19
***************
*** 64,72 ****
            FXMainWindow(a,"Frontier Project: A FreeStars Client",s,l,DECOR_ALL,0,0,800,600)
  {
- 
-   topdock=new FXDockSite(this,LAYOUT_SIDE_TOP|LAYOUT_FILL_X);
-   bottomdock=new FXDockSite(this,LAYOUT_SIDE_BOTTOM|LAYOUT_FILL_X);
    leftdock=new FXDockSite(this,LAYOUT_SIDE_LEFT|LAYOUT_FILL_Y);
    rightdock=new FXDockSite(this,LAYOUT_SIDE_RIGHT|LAYOUT_FILL_Y);
  
    ////////////////////////////////////////
--- 64,71 ----
            FXMainWindow(a,"Frontier Project: A FreeStars Client",s,l,DECOR_ALL,0,0,800,600)
  {
    leftdock=new FXDockSite(this,LAYOUT_SIDE_LEFT|LAYOUT_FILL_Y);
    rightdock=new FXDockSite(this,LAYOUT_SIDE_RIGHT|LAYOUT_FILL_Y);
+   topdock=new FXDockSite(this,LAYOUT_SIDE_TOP|LAYOUT_FILL_X);
+   bottomdock=new FXDockSite(this,LAYOUT_SIDE_BOTTOM|LAYOUT_FILL_X);
  
    ////////////////////////////////////////
***************
*** 87,91 ****
    
    menubar_s=new FXToolBarShell(this);
!   menubar=new FXMenuBar(topdock,menubar_s,LAYOUT_SIDE_TOP|LAYOUT_FILL_X|FRAME_RAISED);
    new FXToolBarGrip(menubar,menubar,FXMenuBar::ID_TOOLBARGRIP,TOOLBARGRIP_DOUBLE);
  
--- 86,90 ----
    
    menubar_s=new FXToolBarShell(this);
!   menubar=new FXMenuBar(topdock,menubar_s,LAYOUT_FILL|FRAME_RAISED);
    new FXToolBarGrip(menubar,menubar,FXMenuBar::ID_TOOLBARGRIP,TOOLBARGRIP_DOUBLE);
  

Index: DebugConsole.cpp
===================================================================
RCS file: /cvsroot/frontierproject/frontierproject/src/DebugConsole.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** DebugConsole.cpp	18 May 2006 07:08:20 -0000	1.10
--- DebugConsole.cpp	9 Oct 2006 20:19:22 -0000	1.11
***************
*** 80,84 ****
  debugConsole::debugConsole(FXApp *app):FXDialogBox(app, "Debug Console", DECOR_TITLE|DECOR_BORDER)
  {
!   FXPacker *pak = new FXPacker(this,LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT,0,0,400,350);
  
    FXVerticalFrame *botframe = new FXVerticalFrame(pak,LAYOUT_SIDE_BOTTOM,0,0,0,0,0,0,0,0,0,0);
--- 80,93 ----
  debugConsole::debugConsole(FXApp *app):FXDialogBox(app, "Debug Console", DECOR_TITLE|DECOR_BORDER)
  {
!   FXHorizontalFrame *outer = new FXHorizontalFrame(this,0,0,0,0,0,0,0,0,0,0,0);
!   FXPacker *pak = new FXPacker(outer,LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT,0,0,400,350);
!   
!   objList = new FXFoldingList(outer,this,ID_OBJECTLIST,FOLDINGLIST_NORMAL|LAYOUT_FIX_WIDTH|LAYOUT_FILL_Y,0,0,300,0);
!   
!   /*
!   FXHorizontalFrame *right = new FXHorizontalFrame(outer,LAYOUT_FILL_Y|LAYOUT_FIX_WIDTH,0,0,300,0);
!   
!   objTree = new FXTreeList(right,this,ID_OBJECTTREE,TREELIST_NORMAL|LAYOUT_SIDE_RIGHT|LAYOUT_FILL_Y|LAYOUT_FIX_WIDTH,0,0,150,0);
!   objTable = new FXTable(right,this,ID_OBJECTTABLE,LAYOUT_FILL_X|LAYOUT_FILL_Y); */
  
    FXVerticalFrame *botframe = new FXVerticalFrame(pak,LAYOUT_SIDE_BOTTOM,0,0,0,0,0,0,0,0,0,0);
***************
*** 126,129 ****
--- 135,144 ----
  
    text->setEditable(false);
+   
+   objList->appendHeader("Test",0,40);
+   objList->appendItem(objList->appendItem(0,"Test2"),new FXFoldingItem("Test5"));
+   
+   objList->recalc();
+   
  
    vm = lua_open();

Index: widget_painter.cpp
===================================================================
RCS file: /cvsroot/frontierproject/frontierproject/src/widget_painter.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** widget_painter.cpp	1 Jun 2006 05:23:19 -0000	1.23
--- widget_painter.cpp	9 Oct 2006 20:19:22 -0000	1.24
***************
*** 83,87 ****
    drawPlanetsTEST(dc);
  
-   if(flag_planetvalueview)
      drawFlags(dc);
  
--- 83,86 ----
***************
*** 550,557 ****
      {
        //if(curPlanet->SeenBy(TheGame->GetCurrentPlayer()))
!       if(curPlanet->GetOwner() != 0) //Habited.
        {
          X = u2sx(curPlanet->GetPosX());
          Y = u2sy(curPlanet->GetPosY());
          switch(TheGame->GetCurrentPlayer()->GetRelations(curPlanet->GetOwner()))
          {
--- 549,558 ----
      {
        //if(curPlanet->SeenBy(TheGame->GetCurrentPlayer()))
!       TheGame->UpdateSeen();
!       if(curPlanet->SeenBy(TheGame->GetCurrentPlayer()) && curPlanet->GetOwner())//->GetOwner() != 0) //Habited.
        {
          X = u2sx(curPlanet->GetPosX());
          Y = u2sy(curPlanet->GetPosY());
+         CLOG("Relation: %i\n",TheGame->GetCurrentPlayer()->GetRelations(curPlanet->GetOwner()));
          switch(TheGame->GetCurrentPlayer()->GetRelations(curPlanet->GetOwner()))
          {
***************
*** 560,564 ****
              dc.fillRectangle(X-1,Y-20,9,8);
              
!             dc.setForeground(FXRGB(0,198,0)); //Green
              dc.fillRectangle(X,Y-19,7,6);
              dc.drawLine(X,Y+1,X,Y-16);
--- 561,565 ----
              dc.fillRectangle(X-1,Y-20,9,8);
              
!             dc.setForeground(FXRGB(0,0,198)); //Blue
              dc.fillRectangle(X,Y-19,7,6);
              dc.drawLine(X,Y+1,X,Y-16);
***************
*** 568,572 ****
              dc.fillRectangle(X-1,Y-20,9,8);
              
!             dc.setForeground(FXRGB(0,0,198)); //Blue @@@ Verify color
              dc.fillRectangle(X,Y-19,7,6);
              dc.drawLine(X,Y+1,X,Y-16);
--- 569,573 ----
              dc.fillRectangle(X-1,Y-20,9,8);
              
!             dc.setForeground(FXRGB(198,198,0)); //Yellow
              dc.fillRectangle(X,Y-19,7,6);
              dc.drawLine(X,Y+1,X,Y-16);
***************
*** 576,580 ****
              dc.fillRectangle(X-1,Y-20,9,8);
              
!             dc.setForeground(FXRGB(198,198,0)); //Yellow @@@ Verify color
              dc.fillRectangle(X,Y-19,7,6);
              dc.drawLine(X,Y+1,X,Y-16);
--- 577,581 ----
              dc.fillRectangle(X-1,Y-20,9,8);
              
!             dc.setForeground(FXRGB(127,0,0)); //Dark Red	
              dc.fillRectangle(X,Y-19,7,6);
              dc.drawLine(X,Y+1,X,Y-16);
***************
*** 584,588 ****
              dc.fillRectangle(X-1,Y-20,9,8);
              
!             dc.setForeground(FXRGB(198,0,0)); //Red @@@ Verify color
              dc.fillRectangle(X,Y-19,7,6);
              dc.drawLine(X,Y+1,X,Y-16);
--- 585,589 ----
              dc.fillRectangle(X-1,Y-20,9,8);
              
!             dc.setForeground(FXRGB(255,0,0)); //Light Red
              dc.fillRectangle(X,Y-19,7,6);
              dc.drawLine(X,Y+1,X,Y-16);

2005	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (3)	Sep	Oct	Nov	Dec
2006	Jan	Feb	Mar	Apr (18)	May (46)	Jun (6)	Jul	Aug	Sep	Oct (2)	Nov	Dec

frontierproject-cvs Mailing List for Frontier Project

frontierproject-cvs — CVS-commits