From a3f6b000cc472bb311848bc63056912bed49dc45 Mon Sep 17 00:00:00 2001 From: fortefr Date: Wed, 20 Jan 2010 12:39:41 +0000 Subject: [PATCH] Big icons fix 2 --- data/Makefile | 146 ++++++++++++++++++++++++++++++++++++------- src/app/app.pro | 14 ++--- src/icons.qrc | 22 +++---- src/mvc/delegate.cpp | 12 ++-- 4 files changed, 149 insertions(+), 45 deletions(-) diff --git a/data/Makefile b/data/Makefile index d7f7cb1..0585144 100644 --- 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 a9420ed..357474c 100644 --- 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 @@ -9,12 +9,12 @@ LIBS += -L$$DESTDIR -lgui -lmvc -lsql 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 diff --git a/src/icons.qrc b/src/icons.qrc index e39ff6d..8bdaf13 100644 --- a/src/icons.qrc +++ b/src/icons.qrc @@ -1,12 +1,12 @@ - - - icons/favourite-on.png - icons/favourite-off.png - icons/alarm-on.png - icons/alarm-off.png - icons/expand.png - icons/collapse.png - icons/fosdem.png - icons/compass.png - + + + icons/expand.png + icons/collapse.png + icons/fosdem.png + icons/alarm-offBig.png + icons/alarm-onBig.png + icons/compassBig.png + icons/favourite-offBig.png + icons/favourite-onBig.png + diff --git a/src/mvc/delegate.cpp b/src/mvc/delegate.cpp index e087d74..507bd6c 100644 --- 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 { - return QSize(30,30); + return QSize(40,40); } else // event { @@ -251,13 +251,13 @@ void Delegate::defineControls() 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 - 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); @@ -265,20 +265,20 @@ void Delegate::defineControls() // 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 - 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 - 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); -- 2.39.5