[Camino-devel] camino/src/client ClientInterface.h ClientInter...

[Pascal Audoux]

CVSROOT:        /cvsroot/camino
Module name:    camino
Changes by:     Pascal Audoux <address@hidden>  03/01/25 05:04:24

Modified files:
        src/client     : ClientInterface.h ClientInterface.cpp 

Log message:
        add menu "Options" (theme and zoom)

Patches:
Index: camino/src/client/ClientInterface.cpp
diff -u camino/src/client/ClientInterface.cpp:1.6 
camino/src/client/ClientInterface.cpp:1.7
--- camino/src/client/ClientInterface.cpp:1.6   Wed Jan 22 17:56:23 2003
+++ camino/src/client/ClientInterface.cpp       Sat Jan 25 05:04:24 2003
@@ -2,7 +2,7 @@
 **
 ** Camino
 **
-** Version : $Id: ClientInterface.cpp,v 1.6 2003/01/22 22:56:23 Audoux Exp $
+** Version : $Id: ClientInterface.cpp,v 1.7 2003/01/25 10:04:24 Audoux Exp $
 **
 ** Author(s) : Philippe Fremy, Pascal Audoux
 ** Creation : 15/01/2003
@@ -79,19 +79,37 @@
        CREATEACTION( "Connect to server", "&Connect to server", ACT_CONNECT );
        CREATEACTION( "Quit", "&Quit", ACT_QUIT );
 
+       CREATEACTION( "Change theme", "&Change theme", ACT_THEME );
+       CREATEACTION( "Small", "&Small", ACT_ZOOMSMALL );
+       _actions[ACT_ZOOMSMALL]->setToggleAction( true );
+       CREATEACTION( "Medium", "&Medium", ACT_ZOOMMEDIUM );
+       _actions[ACT_ZOOMMEDIUM]->setToggleAction( true );
+       CREATEACTION( "Large", "&Large", ACT_ZOOMLARGE );
+       _actions[ACT_ZOOMLARGE]->setToggleAction( true );
+
        connect( sigmap, SIGNAL( mapped( int ) ), SLOT( slot_action( int ) ) );
 }
 
 void ClientInterface::initMenuBar()
 {
-        QPopupMenu * menuFile = new QPopupMenu();
-        CHECK_PTR( menuFile );
+        QPopupMenu * menuFile = new QPopupMenu( this );
        _actions[ACT_SERVER]->addTo( menuFile );
        _actions[ACT_CONNECT]->addTo( menuFile );
        menuFile->insertSeparator();
        _actions[ACT_QUIT]->addTo( menuFile );
 
+       QPopupMenu * menuOption = new QPopupMenu( this );
+       _actions[ACT_THEME]->addTo( menuOption );
+
+       QPopupMenu * menuZoom = new QPopupMenu( menuOption );
+       _actions[ACT_ZOOMSMALL]->addTo( menuZoom );
+       _actions[ACT_ZOOMMEDIUM]->addTo( menuZoom );
+       _actions[ACT_ZOOMLARGE]->addTo( menuZoom );
+
+       menuOption->insertItem( "Zoom" , menuZoom, ACT_ZOOM );
+
        menuBar()->insertItem( "&File", menuFile );
+       menuBar()->insertItem( "&Options", menuOption );
 }
 
 void ClientInterface::initStatusBar()
@@ -111,6 +129,17 @@
        case ACT_QUIT:
                quitting();
                break;
+       case ACT_THEME:
+               break;
+       case ACT_ZOOMSMALL:
+               zoom( 1 );
+               break;
+       case ACT_ZOOMMEDIUM:
+               zoom( 2 );
+               break;
+       case ACT_ZOOMLARGE:
+               zoom( 3 );
+               break;
        default:
                break;
        }
@@ -152,4 +181,9 @@
        }
 }
 
+void ClientInterface::zoom( int level )
+{
+       theme.setZoomLevel( level );
+       //_game->reupdate();
+}
 
Index: camino/src/client/ClientInterface.h
diff -u camino/src/client/ClientInterface.h:1.5 
camino/src/client/ClientInterface.h:1.6
--- camino/src/client/ClientInterface.h:1.5     Sun Jan 19 18:00:42 2003
+++ camino/src/client/ClientInterface.h Sat Jan 25 05:04:24 2003
@@ -5,7 +5,7 @@
 ** ClientInterface.h
 ** Interface of the client
 **
-** Version : $Id: ClientInterface.h,v 1.5 2003/01/19 23:00:42 pfremy Exp $
+** Version : $Id: ClientInterface.h,v 1.6 2003/01/25 10:04:24 Audoux Exp $
 ** Author(s) : Philippe Fremy, Pascal Audoux
 ** Creation : 14/01/2003
 ** Copyright: Pascal Audoux, Philippe Fremy 2003
@@ -74,6 +74,11 @@
                ACT_SERVER = 0,
                ACT_CONNECT,
                ACT_DISCONNECT,
+               ACT_THEME,
+               ACT_ZOOM,
+               ACT_ZOOMSMALL,
+               ACT_ZOOMMEDIUM,
+               ACT_ZOOMLARGE,
                ACT_QUIT
        };
 
@@ -92,9 +97,11 @@
 
        void connectToServer();
 
+       void zoom( int level );
+
        Game * _game;
        ServerDialog * _server;
-       QAction * _actions[4];
+       QAction * _actions[9];
 };
 
 #endif // CLIENTINTERFACE_H