[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Camino-devel] camino/src/client Theme.h Theme.cpp
From: |
Pascal Audoux |
Subject: |
[Camino-devel] camino/src/client Theme.h Theme.cpp |
Date: |
Sun, 02 Mar 2003 16:08:31 -0500 |
CVSROOT: /cvsroot/camino
Module name: camino
Changes by: Pascal Audoux <address@hidden> 03/03/02 16:08:30
Modified files:
src/client : Theme.h Theme.cpp
Log message:
change methode 'signature' for getting tiles
Patches:
Index: camino/src/client/Theme.cpp
diff -u camino/src/client/Theme.cpp:1.8 camino/src/client/Theme.cpp:1.9
--- camino/src/client/Theme.cpp:1.8 Fri Feb 28 07:08:07 2003
+++ camino/src/client/Theme.cpp Sun Mar 2 16:08:30 2003
@@ -2,7 +2,7 @@
**
** Camino
**
-** Version : $Id: Theme.cpp,v 1.8 2003/02/28 12:08:07 pfremy Exp $
+** Version : $Id: Theme.cpp,v 1.9 2003/03/02 21:08:30 Audoux Exp $
**
** Author(s) : Philippe Fremy, Pascal Audoux
** Creation : 22/01/2003
@@ -33,6 +33,25 @@
Theme * Theme::_theme = 0L;
+QString computeZoomName( int level )
+{
+ QString ret = "medium";
+
+ switch( level ) {
+ case 1:
+ ret = "small";
+ break;
+ case 2:
+ ret = "medium";
+ break;
+ case 3:
+ ret = "large";
+ break;
+ }
+
+ return ret;
+}
+
Theme * Theme::getTheme()
{
if (_theme == 0L) {
@@ -69,8 +88,6 @@
void Theme::init( QString name )
{
-
- // ----
QPixmap * pixmap = 0L;
QString filename;
if( _name != "" ) {
@@ -81,14 +98,18 @@
_tiles = new QCanvasPixmapArray *** [3];
for( int i = 0; i < 3; i++ ) {
_tiles[i] = new QCanvasPixmapArray ** [14];
- for( int j = 0; j < 14; j++ ) {
+ for( int j = 0; j < int(Tile::LAST_TILE); j++ ) {
_tiles[i][j] = new QCanvasPixmapArray * [4];
for( int k = 0; k < 4; k++ ) {
QPtrList<QPixmap> list1;
list1.setAutoDelete( true );
QPtrList<QPoint> list2;
list2.setAutoDelete( true );
- filename =
"./themes/classic/large/tile_0_0_0.png";
+ filename = "./themes/";
+ filename += _name + "/";
+ filename += computeZoomName( i+1 ) +
"/";
+ filename += computeTileName( j ) + "_";
+ filename += QString::number( k ) +
"_0.png";
pixmap = new QPixmap( filename );
if (pixmap->size() == QSize(0,0) ) {
qDebug("Unable to load pixmap
%s", filename.latin1() );
@@ -117,10 +138,10 @@
_tiles = 0;
}
-QCanvasPixmapArray * Theme::getTileArray( int num, int side )
+QCanvasPixmapArray * Theme::getTileArray( Tile::TileType num, int side )
{
// XXX: add some checks...
- return _tiles[_level-1][num][side];
+ return _tiles[_level-1][(int)num][side];
}
const QPixmap & Theme::getTilePixmap( int num, int side )
@@ -137,7 +158,6 @@
}
return *pixmap;
}
-
QString Theme::filenameForType( Tile::TileType tile )
{
Index: camino/src/client/Theme.h
diff -u camino/src/client/Theme.h:1.7 camino/src/client/Theme.h:1.8
--- camino/src/client/Theme.h:1.7 Thu Feb 27 12:26:25 2003
+++ camino/src/client/Theme.h Sun Mar 2 16:08:30 2003
@@ -5,7 +5,7 @@
** Theme.h
** Manage theme data and pictures
**
-** Version : $Id: Theme.h,v 1.7 2003/02/27 17:26:25 pfremy Exp $
+** Version : $Id: Theme.h,v 1.8 2003/03/02 21:08:30 Audoux Exp $
** Author(s) : Philippe Fremy, Pascal Audoux
** Creation : 22/01/2003
** Copyright: Pascal Audoux, Philippe Fremy 2003
@@ -36,6 +36,8 @@
// application specific include files
+QString computeZoomName( int level );
+
/* ------------------------------
* Theme
* ------------------------------ */
@@ -62,7 +64,7 @@
QString getName() { return _name; }
- QCanvasPixmapArray * getTileArray( int num, int side );
+ QCanvasPixmapArray * getTileArray( Tile::TileType num, int side );
void setZoomLevel( int level ) { _level = level; }
int getZoomLevel() { return _level; }
- [Camino-devel] camino/src/client Theme.h Theme.cpp,
Pascal Audoux <=