Big icons fix 2

diff --git a/data/Makefile b/data/Makefile
index d7f7cb1fdd90aa763c709d0ae646fc3a6aa56d43..0585144ddd95cded0530c87ab4c60d8d8fc01331 100644 (file)
--- a/data/Makefile
+++ b/data/Makefile
@@ -1,31 +1,135 @@
-# Makefile - install Maemo specific data files 
+#############################################################################
+# Makefile for building: data
+# Generated by qmake (2.01a) (Qt 4.6.0) on: Tue Jan 19 15:46:08 2010
+# Project:  data.pro
+# Template: app
+# Command: /home/maemo/qtsdk-2009.05/qt/bin/qmake -spec /home/maemo/qtsdk-2009.05/qt/mkspecs/linux-g++ -unix CONFIG+=debug -o Makefile data.pro
+#############################################################################

 
 

-PKG            = fosdem
-PREFIX         = $(INSTALL_ROOT)/usr/share
-INSTALL_FILE   = install -m 644 -p
-CHK_DIR        = test -d
-MKDIR          = mkdir -p
+####### Compiler, tools and options

 
 

-.PHONY: install uninstall clean distclean
+CC            = gcc
+CXX           = g++
+DEFINES       = 
+CFLAGS        = -pipe $(DEFINES)
+CXXFLAGS      = -pipe $(DEFINES)
+INCPATH       = -I/home/maemo/qtsdk-2009.05/qt/mkspecs/linux-g++ -I.
+LINK          = g++
+LFLAGS        = -Wl,-rpath,/home/maemo/qtsdk-2009.05/qt/lib
+LIBS          = $(SUBLIBS)    
+AR            = ar cqs
+RANLIB        = 
+QMAKE         = /home/maemo/qtsdk-2009.05/qt/bin/qmake
+TAR           = tar -cf
+COMPRESS      = gzip -9f
+COPY          = cp -f
+SED           = sed
+COPY_FILE     = $(COPY)
+COPY_DIR      = $(COPY) -r
+STRIP         = strip
+INSTALL_FILE  = install -m 644 -p
+INSTALL_DIR   = $(COPY_DIR)
+INSTALL_PROGRAM = install -m 755 -p
+DEL_FILE      = rm -f
+SYMLINK       = ln -sf
+DEL_DIR       = rmdir
+MOVE          = mv -f
+CHK_DIR_EXISTS= test -d
+MKDIR         = mkdir -p

 
 

-all:
+####### Output directory

 
 

-install: 
-       $(CHK_DIR) $(PREFIX)/applications/hildon/ || $(MKDIR) $(PREFIX)/applications/hildon/ 
-       $(INSTALL_FILE) ./maemo/$(PKG).desktop $(PREFIX)/applications/hildon/
+OBJECTS_DIR   = ./

 
 

-       $(CHK_DIR) $(PREFIX)/icons/hicolor/26x26/hildon/ || $(MKDIR) $(PREFIX)/icons/hicolor/26x26/hildon/ 
-       $(INSTALL_FILE) ./26x26/$(PKG).png $(PREFIX)/icons/hicolor/26x26/hildon/
+####### Files

 
 

-       $(CHK_DIR) $(PREFIX)/icons/hicolor/48x48/hildon/ || $(MKDIR) $(PREFIX)/icons/hicolor/48x48/hildon/ 
-       $(INSTALL_FILE) ./48x48/$(PKG).png $(PREFIX)/icons/hicolor/48x48/hildon/
+SOURCES       =  
+OBJECTS       = 
+DIST          = /home/maemo/qtsdk-2009.05/qt/mkspecs/common/g++.conf \
+               /home/maemo/qtsdk-2009.05/qt/mkspecs/common/unix.conf \
+               /home/maemo/qtsdk-2009.05/qt/mkspecs/common/linux.conf \
+               /home/maemo/qtsdk-2009.05/qt/mkspecs/qconfig.pri \
+               /home/maemo/qtsdk-2009.05/qt/mkspecs/features/qt_functions.prf \
+               /home/maemo/qtsdk-2009.05/qt/mkspecs/features/qt_config.prf \
+               /home/maemo/qtsdk-2009.05/qt/mkspecs/features/exclusive_builds.prf \
+               /home/maemo/qtsdk-2009.05/qt/mkspecs/features/default_pre.prf \
+               data.pro
+QMAKE_TARGET  = data
+DESTDIR       = 
+TARGET        = data

 
 

+first: all
+####### Implicit rules

 
 

-uninstall:
-       $(RM) $(PREFIX)/applications/hildon/$(PKG).desktop
-       $(RM) $(PREFIX)/icons/hicolor/26x26/hildon/$(PKG).png
-       $(RM) $(PREFIX)/icons/hicolor/48x48/hildon/$(PKG).png
+.SUFFIXES: .o .c .cpp .cc .cxx .C

 
 

-clean:
+.cpp.o:
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.cc.o:
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.cxx.o:
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.C.o:
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.c.o:
+       $(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<"
+
+####### Build rules
+
+all: Makefile $(TARGET)
+
+$(TARGET):  $(OBJECTS)  
+       $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
+
+Makefile: data.pro  /home/maemo/qtsdk-2009.05/qt/mkspecs/linux-g++/qmake.conf /home/maemo/qtsdk-2009.05/qt/mkspecs/common/g++.conf \
+               /home/maemo/qtsdk-2009.05/qt/mkspecs/common/unix.conf \
+               /home/maemo/qtsdk-2009.05/qt/mkspecs/common/linux.conf \
+               /home/maemo/qtsdk-2009.05/qt/mkspecs/qconfig.pri \
+               /home/maemo/qtsdk-2009.05/qt/mkspecs/features/qt_functions.prf \
+               /home/maemo/qtsdk-2009.05/qt/mkspecs/features/qt_config.prf \
+               /home/maemo/qtsdk-2009.05/qt/mkspecs/features/exclusive_builds.prf \
+               /home/maemo/qtsdk-2009.05/qt/mkspecs/features/default_pre.prf
+       $(QMAKE) -spec /home/maemo/qtsdk-2009.05/qt/mkspecs/linux-g++ -unix CONFIG+=debug -o Makefile data.pro
+/home/maemo/qtsdk-2009.05/qt/mkspecs/common/g++.conf:
+/home/maemo/qtsdk-2009.05/qt/mkspecs/common/unix.conf:
+/home/maemo/qtsdk-2009.05/qt/mkspecs/common/linux.conf:
+/home/maemo/qtsdk-2009.05/qt/mkspecs/qconfig.pri:
+/home/maemo/qtsdk-2009.05/qt/mkspecs/features/qt_functions.prf:
+/home/maemo/qtsdk-2009.05/qt/mkspecs/features/qt_config.prf:
+/home/maemo/qtsdk-2009.05/qt/mkspecs/features/exclusive_builds.prf:
+/home/maemo/qtsdk-2009.05/qt/mkspecs/features/default_pre.prf:
+qmake:  FORCE
+       @$(QMAKE) -spec /home/maemo/qtsdk-2009.05/qt/mkspecs/linux-g++ -unix CONFIG+=debug -o Makefile data.pro
+
+dist: 
+       @$(CHK_DIR_EXISTS) .tmp/data1.0.0 || $(MKDIR) .tmp/data1.0.0 
+       $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/data1.0.0/ && (cd `dirname .tmp/data1.0.0` && $(TAR) data1.0.0.tar data1.0.0 && $(COMPRESS) data1.0.0.tar) && $(MOVE) `dirname .tmp/data1.0.0`/data1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/data1.0.0
+
+
+clean:compiler_clean 
+       -$(DEL_FILE) *~ core *.core
+
+
+####### Sub-libraries
+
+distclean: clean
+       -$(DEL_FILE) $(TARGET) 
+       -$(DEL_FILE) Makefile
+
+
+compiler_clean: 
+
+####### Compile
+
+####### Install
+
+install:   FORCE
+
+uninstall:   FORCE
+
+FORCE:

 
 

-distclean:
\ No newline at end of file

diff --git a/src/app/app.pro b/src/app/app.pro
index a9420ed58effe03c3dac2addcfc4d4cfd6cb12c2..357474ce1bd13471e799640a3d0f3ff14b74bfe9 100644 (file)
--- a/src/app/app.pro
+++ b/src/app/app.pro
@@ -1,4 +1,4 @@
-include(../global.pri)
+#include(../global.pri)

 TEMPLATE = app
 TARGET = fosdem
 DESTDIR = ../bin
 TEMPLATE = app
 TARGET = fosdem
 DESTDIR = ../bin


@@ -9,12 +9,12 @@ LIBS += -L$$DESTDIR -lgui -lmvc -lsql
 INCLUDEPATH += ../gui
 DEPENDPATH += . ../gui
 TARGETDEPS += $$DESTDIR/libmvc.a $$DESTDIR/libgui.a $$DESTDIR/libsql.a
 INCLUDEPATH += ../gui
 DEPENDPATH += . ../gui
 TARGETDEPS += $$DESTDIR/libmvc.a $$DESTDIR/libgui.a $$DESTDIR/libsql.a

-maemo {
-    LIBS += -L$$DESTDIR -lqalarm -lalarm
-    INCLUDEPATH += ../alarm
-    DEPENDPATH +=  ../alarm
-    TARGETDEPS += $$DESTDIR/libqalarm.a
-}
+#maemo {
+#    LIBS += -L$$DESTDIR -lqalarm -lalarm
+#    INCLUDEPATH += ../alarm
+#    DEPENDPATH +=  ../alarm
+#    TARGETDEPS += $$DESTDIR/libqalarm.a
+#}

 
 SOURCES += main.cpp
 
 
 SOURCES += main.cpp
 

diff --git a/src/icons.qrc b/src/icons.qrc
index e39ff6d0e2ef5a843b9c202bcbf449c98982afe0..8bdaf13b074936665504974f828eee334cf198fe 100644 (file)
--- a/src/icons.qrc
+++ b/src/icons.qrc
@@ -1,12 +1,12 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource>
-    <file>icons/favourite-on.png</file>
-    <file>icons/favourite-off.png</file>
-    <file>icons/alarm-on.png</file>
-    <file>icons/alarm-off.png</file>
-    <file>icons/expand.png</file>
-    <file>icons/collapse.png</file>
-    <file>icons/fosdem.png</file>
-    <file>icons/compass.png</file>
-</qresource>
+<RCC>
+    <qresource prefix="/">
+        <file>icons/expand.png</file>
+        <file>icons/collapse.png</file>
+        <file>icons/fosdem.png</file>
+        <file>icons/alarm-offBig.png</file>
+        <file>icons/alarm-onBig.png</file>
+        <file>icons/compassBig.png</file>
+        <file>icons/favourite-offBig.png</file>
+        <file>icons/favourite-onBig.png</file>
+    </qresource>

 </RCC>
 </RCC>

diff --git a/src/mvc/delegate.cpp b/src/mvc/delegate.cpp
index e087d741f535e77ef07e61b833dc2e29f3f40bad..507bd6cbbda79646f74a059d8481adacbde49313 100644 (file)
--- a/src/mvc/delegate.cpp
+++ b/src/mvc/delegate.cpp
@@ -194,7 +194,7 @@ QSize Delegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &
 
     if (index.internalId() == 0) // time group
     {
 
     if (index.internalId() == 0) // time group
     {

-        return QSize(30,30);
+        return QSize(40,40);

     }
     else // event
     {
     }
     else // event
     {


@@ -251,13 +251,13 @@ void Delegate::defineControls()
     QPoint p(0,0);
     // FAVOURITE ICONs
     // on
     QPoint p(0,0);
     // FAVOURITE ICONs
     // on

-    control = new Control(FavouriteControlOn,QString(":icons/favourite-on.png"));
+    control = new Control(FavouriteControlOn,QString(":icons/favourite-onBig.png"));

     p = QPoint(0,SPACER);
     p.setX(p.x()-control->image()->width()-SPACER);
     control->setDrawPoint(p);
     mControls.insert(FavouriteControlOn,control);
     // off
     p = QPoint(0,SPACER);
     p.setX(p.x()-control->image()->width()-SPACER);
     control->setDrawPoint(p);
     mControls.insert(FavouriteControlOn,control);
     // off

-    control = new Control(FavouriteControlOff,QString(":icons/favourite-off.png"));
+    control = new Control(FavouriteControlOff,QString(":icons/favourite-offBig.png"));

     p = QPoint(0,SPACER);
     p.setX(p.x()-control->image()->width()-SPACER);
     control->setDrawPoint(p);
     p = QPoint(0,SPACER);
     p.setX(p.x()-control->image()->width()-SPACER);
     control->setDrawPoint(p);


@@ -265,20 +265,20 @@ void Delegate::defineControls()
 
     // ALARM ICONs
     // on
 
     // ALARM ICONs
     // on

-    control = new Control(AlarmControlOn,QString(":icons/alarm-on.png"));
+    control = new Control(AlarmControlOn,QString(":icons/alarm-onBig.png"));

     p = mControls[FavouriteControlOn]->drawPoint();
     p.setX(p.x()-control->image()->width()-SPACER);
     control->setDrawPoint(p);
     mControls.insert(AlarmControlOn,control);
     // off
     p = mControls[FavouriteControlOn]->drawPoint();
     p.setX(p.x()-control->image()->width()-SPACER);
     control->setDrawPoint(p);
     mControls.insert(AlarmControlOn,control);
     // off

-    control = new Control(AlarmControlOff,QString(":icons/alarm-off.png"));
+    control = new Control(AlarmControlOff,QString(":icons/alarm-offBig.png"));

     p = mControls[FavouriteControlOff]->drawPoint();
     p.setX(p.x()-control->image()->width()-SPACER);
     control->setDrawPoint(p);
     mControls.insert(AlarmControlOff,control);
 
     // MAP ICON
     p = mControls[FavouriteControlOff]->drawPoint();
     p.setX(p.x()-control->image()->width()-SPACER);
     control->setDrawPoint(p);
     mControls.insert(AlarmControlOff,control);
 
     // MAP ICON

-    control = new Control(MapControl,QString(":icons/compass.png"));
+    control = new Control(MapControl,QString(":icons/compassBig.png"));

     p = mControls[AlarmControlOn]->drawPoint();
     p.setX(p.x()-control->image()->width()-SPACER);
     control->setDrawPoint(p);
     p = mControls[AlarmControlOn]->drawPoint();
     p.setX(p.x()-control->image()->width()-SPACER);
     control->setDrawPoint(p);