[Frontierproject-cvs] frontierproject/include vTemplate.h,1.1,1.2 v_FIO.h,1.3,1.4 v_Fleet.h,1.2,1.3

[Brandon B. <bdr...@us...>]

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

Modified Files:
	vTemplate.h v_FIO.h v_Fleet.h 
Log Message:
Modified vTemplate a lot.
Now the repositioning buttons can be shown/hidden to leave more room for the titles.

Index: v_FIO.h
===================================================================
RCS file: /cvsroot/frontierproject/frontierproject/include/v_FIO.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** v_FIO.h	14 May 2006 03:28:10 -0000	1.3
--- v_FIO.h	17 May 2006 04:59:35 -0000	1.4
***************
*** 1,4 ****
  /*****************************************************************************
!  * Copyright (C) 2004-2005 Brandon Bergren                                   *
   *                                                                           *
   * This file is part of The Frontier Project.                                *
--- 1,4 ----
  /*****************************************************************************
!  * Copyright (C) 2004-2005,2006 Brandon Bergren                              *
   *                                                                           *
   * This file is part of The Frontier Project.                                *
***************
*** 20,71 ****
   ****************************************************************************/
  
- 
- //2004
- 
- 
  #ifndef V_FIO_H
  #define V_FIO_H
  
- 
  #include "FrontierClient.h"
  
- 
  class v_FIO:
  public vTemplate
  {
    FXDECLARE(v_FIO)
- 
    public:
  
!     void create();
! 
!     v_FIO(FXComposite* p,FXObject* target=NULL,FXSelector sel=0,FXuint opts=FRAME_SUNKEN|FRAME_THICK);
! 
!     ///Message map.
!     enum
!     {
!       ID_FOO = vTemplate::ID_LAST,
!       ID_LAST
!     };
  
-     //Handlers
-     long onFoo(FXObject*,FXSelector,void*);
  
  
!     void setPlanet(FreeStars::Planet *planet);
  
  
    protected:
!     //Disable default and copy ctors.
!     v_FIO(){};
!     v_FIO(const v_FIO&){};
! 
!     FXButton *btnGoto;
!     FXButton *btnCargo;
  
!     FXListBox *lstFleets;
  
  };
- 
  #endif
- 
--- 20,59 ----
   ****************************************************************************/
  
  #ifndef V_FIO_H
  #define V_FIO_H
  
  #include "FrontierClient.h"
  
  class v_FIO:
  public vTemplate
  {
    FXDECLARE(v_FIO)
    public:
  
!   v_FIO(FXComposite* p,FXObject* target=NULL,FXSelector sel=0,FXuint opts=FRAME_SUNKEN|FRAME_THICK);
!   void create();
  
  
+   ///Message map.
+   enum
+   {
+     ID_FOO = vTemplate::ID_LAST,
+     ID_LAST
+   };
  
!   //Handlers
!   long onFoo(FXObject*,FXSelector,void*);
  
+   void setPlanet(FreeStars::Planet *planet);
  
    protected:
!   //Disable default and copy ctors.
!   v_FIO(){};
!   v_FIO(const v_FIO&){};
  
!   FXButton *btnGoto;
!   FXButton *btnCargo;
  
+   FXListBox *lstFleets;
  };
  #endif

Index: v_Fleet.h
===================================================================
RCS file: /cvsroot/frontierproject/frontierproject/include/v_Fleet.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** v_Fleet.h	15 Aug 2005 21:24:51 -0000	1.2
--- v_Fleet.h	17 May 2006 04:59:35 -0000	1.3
***************
*** 1,4 ****
  /*****************************************************************************
!  * Copyright (C) 2004-2005 Brandon Bergren                                   *
   *                                                                           *
   * This file is part of The Frontier Project.                                *
--- 1,4 ----
  /*****************************************************************************
!  * Copyright (C) 2004-2005,2006 Brandon Bergren                              *
   *                                                                           *
   * This file is part of The Frontier Project.                                *
***************
*** 20,70 ****
   ****************************************************************************/
  
- //2004
- 
- 
  #ifndef V_FLEET_H
  #define V_FLEET_H
  
- //#include "vTemplate.h"
- //#include "FrontierTypes.h"
- //#include "Fleet.h"
- 
  class v_Fleet:
  public vTemplate
  {
    FXDECLARE(v_Fleet)
- 
    public:
  
!     void create();
! 
!     v_Fleet(FXComposite* p,FXObject* target=NULL,FXSelector sel=0,FXuint opts=FRAME_SUNKEN|FRAME_THICK);
! 
!     ///Message map.
!     enum
!     {
!       ID_FOO = vTemplate::ID_LAST,
!       ID_LAST
!     };
! 
!     //Handlers
!     long onFoo(FXObject*,FXSelector,void*);
  
  
!     void setFleet(const FreeStars::Fleet *fleet);
  
  
    protected:
!     //Disable default and copy ctors.
!     v_Fleet(){};
!     v_Fleet(const v_Fleet&){};
! 
!     FXButton *btnNext;
!     FXButton *btnPrev;
!     FXButton *btnRename;
! 
!     FXImageView *planetimage;
  
  
  };
  
--- 20,57 ----
   ****************************************************************************/
  
  #ifndef V_FLEET_H
  #define V_FLEET_H
  
  class v_Fleet:
  public vTemplate
  {
    FXDECLARE(v_Fleet)
    public:
  
!   v_Fleet(FXComposite* p,FXObject* target=NULL,FXSelector sel=0,FXuint opts=FRAME_SUNKEN|FRAME_THICK);
!   void create();
  
+   //Message map.
+   enum
+   {
+     ID_FOO = vTemplate::ID_LAST,
+     ID_LAST
+   };
  
!   //Handlers
!   long onFoo(FXObject*,FXSelector,void*);
  
+   void setFleet(const FreeStars::Fleet *fleet);
  
    protected:
!   //Disable default and copy ctors.
!   v_Fleet(){};
!   v_Fleet(const v_Fleet&){};
  
+   FXButton *btnNext;
+   FXButton *btnPrev;
+   FXButton *btnRename;
  
+   FXImageView *pic;
  };
  

Index: vTemplate.h
===================================================================
RCS file: /cvsroot/frontierproject/frontierproject/include/vTemplate.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** vTemplate.h	20 Jul 2005 02:34:37 -0000	1.1
--- vTemplate.h	17 May 2006 04:59:35 -0000	1.2
***************
*** 66,69 ****
--- 66,70 ----
      long onUpBtnPress(FXObject*,FXSelector,void*);
      long onDownBtnPress(FXObject*,FXSelector,void*);
+     long onStar(FXObject*,FXSelector,void*);
  
      ///Message map.
***************
*** 75,78 ****
--- 76,80 ----
        ID_UPBUTTON,
        ID_DOWNBUTTON,
+       ID_STARBUTTON,
        ID_LAST
      };
***************
*** 86,93 ****
  
  
!     FXPacker *pacTop;
      FXLabel *lblHeader;
      //FXButton *btnSizer;
      FXToggleButton *btnSizer;
     
      FXPacker *pacClient;
--- 88,97 ----
  
  
!     FXHorizontalFrame *pacTop;
      FXLabel *lblHeader;
      //FXButton *btnSizer;
      FXToggleButton *btnSizer;
+     
+     FXHorizontalFrame *buttonFrame;
     
      FXPacker *pacClient;