[elvystrac] r1783 - - all periods are now defined in ms
- From: elvys@xxxxxxxxxxxxxxxxxxxxxx
- To: elvystrac@xxxxxxxxxxxxx
- Date: Thu, 18 Feb 2010 17:55:16 +0100
Author: JirkaH
Date: 2010-02-18 17:55:15 +0100 (Thu, 18 Feb 2010)
New Revision: 1783
Modified:
trunk/client/elvys-client/src/Makefile
trunk/client/elvys-client/src/abstractmaintainer.h
trunk/client/elvys-client/src/appconfigdata.cpp
trunk/client/elvys-client/src/appmaintainer.cpp
trunk/client/elvys-client/src/autodeleter.cpp
trunk/client/elvys-client/src/autodeleter.h
trunk/client/elvys-client/src/categorymaintainerdoc.cpp
trunk/client/elvys-client/src/categorymaintainerlayout.cpp
trunk/client/elvys-client/src/categorymanager.cpp
trunk/client/elvys-client/src/documentmaintainer.cpp
trunk/client/elvys-client/src/elvys.cpp
trunk/client/elvys-client/src/elvys.h
trunk/client/elvys-client/src/filecachemaintainer.cpp
trunk/client/elvys-client/src/main.cpp
trunk/client/elvys-client/src/pdfpresentationdocument.h
trunk/client/elvys-client/src/pdfpresentationviewer.cpp
trunk/client/elvys-client/src/pdfpresentationviewer.h
Log:
- all periods are now defined in ms
- configuration xmls are now read from executable's directory instead of
current directory
- default value for filecacheconfig added (was forever loop as timer was set
with period 0)
Modified: trunk/client/elvys-client/src/Makefile
===================================================================
--- trunk/client/elvys-client/src/Makefile 2010-02-18 16:25:54 UTC (rev
1782)
+++ trunk/client/elvys-client/src/Makefile 2010-02-18 16:55:15 UTC (rev
1783)
@@ -1,68 +1,282 @@
#############################################################################
# Makefile for building: ../bin/elvys-client
-# Generated by qmake (2.01a) (Qt 4.5.3) on: Wed Feb 17 09:52:32 2010
+# Generated by qmake (2.01a) (Qt 4.5.3) on: Thu Feb 18 17:45:54 2010
# Project: src.pro
# Template: app
-# Command: /usr/bin/qmake -spec /usr/share/qt4/mkspecs/linux-g++ -unix
CONFIG+=debug_and_release -o Makefile src.pro
+# Command: /usr/bin/qmake -spec /usr/share/qt4/mkspecs/linux-g++ -unix
CONFIG+=release -o Makefile src.pro
#############################################################################
-first: debug
-install: debug-install
-uninstall: debug-uninstall
-MAKEFILE = Makefile
+####### Compiler, tools and options
+
+CC = gcc
+CXX = g++
+DEFINES = -D_TTY_POSIX_ -DQT_SQL_LIB -DQT_XML_LIB -DQT_GUI_LIB
-DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
+CFLAGS = -pipe -g -D_REENTRANT -Wall -W $(DEFINES)
+CXXFLAGS = -pipe -g -D_REENTRANT -Wall -W $(DEFINES)
+INCPATH = -I/usr/share/qt4/mkspecs/linux-g++ -I.
-I/usr/include/qt4/QtCore -I/usr/include/qt4/QtNetwork -I/usr/include/qt4/QtGui
-I/usr/include/qt4/QtXml -I/usr/include/qt4/QtSql -I/usr/include/qt4
-I/usr/include/qt4/QtTest -Iserial -I/usr/include/XpdfRasterizer
-I/usr/include/KDE -I.
+LINK = g++
+LFLAGS = -Wl,-rpath,/usr/lib/qt4
+LIBS = $(SUBLIBS) -L/usr/lib/qt4
-L../../XpdfRasterizer-3.02.14-linux/lib -L/usr/lib -lsqlite -lphonon
-lXpdfRasterizer -lQtTest -L/usr/lib/qt4 -pthread -pthread -lQtSql
-L/usr/lib/mysql -pthread -pthread -lQtXml -pthread -pthread -lQtGui
-L/usr/X11R6/lib -pthread -lpng -lfreetype -lgobject-2.0 -lSM -lICE -pthread
-pthread -lXrender -lXrandr -lXinerama -lfontconfig -lXext -lX11 -lQtNetwork
-pthread -pthread -lQtCore -lz -lm -pthread -lgthread-2.0 -lrt -lglib-2.0 -ldl
-lpthread
+AR = ar cqs
+RANLIB =
QMAKE = /usr/bin/qmake
-DEL_FILE = rm -f
-CHK_DIR_EXISTS= test -d
-MKDIR = mkdir -p
+TAR = tar -cf
+COMPRESS = gzip -9f
COPY = cp -f
+SED = sed
COPY_FILE = $(COPY)
COPY_DIR = $(COPY) -r
INSTALL_FILE = install -m 644 -p
+INSTALL_DIR = $(COPY_DIR)
INSTALL_PROGRAM = install -m 755 -p
-INSTALL_DIR = $(COPY_DIR)
DEL_FILE = rm -f
SYMLINK = ln -sf
DEL_DIR = rmdir
MOVE = mv -f
CHK_DIR_EXISTS= test -d
MKDIR = mkdir -p
-SUBTARGETS = \
- debug \
- release
-debug: $(MAKEFILE).Debug FORCE
- $(MAKE) -f $(MAKEFILE).Debug
-debug-make_default: $(MAKEFILE).Debug FORCE
- $(MAKE) -f $(MAKEFILE).Debug
-debug-make_first: $(MAKEFILE).Debug FORCE
- $(MAKE) -f $(MAKEFILE).Debug first
-debug-all: $(MAKEFILE).Debug FORCE
- $(MAKE) -f $(MAKEFILE).Debug all
-debug-clean: $(MAKEFILE).Debug FORCE
- $(MAKE) -f $(MAKEFILE).Debug clean
-debug-distclean: $(MAKEFILE).Debug FORCE
- $(MAKE) -f $(MAKEFILE).Debug distclean
-debug-install: $(MAKEFILE).Debug FORCE
- $(MAKE) -f $(MAKEFILE).Debug install
-debug-uninstall: $(MAKEFILE).Debug FORCE
- $(MAKE) -f $(MAKEFILE).Debug uninstall
-release: $(MAKEFILE).Release FORCE
- $(MAKE) -f $(MAKEFILE).Release
-release-make_default: $(MAKEFILE).Release FORCE
- $(MAKE) -f $(MAKEFILE).Release
-release-make_first: $(MAKEFILE).Release FORCE
- $(MAKE) -f $(MAKEFILE).Release first
-release-all: $(MAKEFILE).Release FORCE
- $(MAKE) -f $(MAKEFILE).Release all
-release-clean: $(MAKEFILE).Release FORCE
- $(MAKE) -f $(MAKEFILE).Release clean
-release-distclean: $(MAKEFILE).Release FORCE
- $(MAKE) -f $(MAKEFILE).Release distclean
-release-install: $(MAKEFILE).Release FORCE
- $(MAKE) -f $(MAKEFILE).Release install
-release-uninstall: $(MAKEFILE).Release FORCE
- $(MAKE) -f $(MAKEFILE).Release uninstall
+####### Output directory
+OBJECTS_DIR = ./
+
+####### Files
+
+SOURCES = main.cpp \
+ pdfdocument.cpp \
+ pdffiller.cpp \
+ pdfviewer.cpp \
+ pdfzoomed.cpp \
+ pdfpage.cpp \
+ xmllayoutparser.cpp \
+ elvys.cpp \
+ xmldocumentparser.cpp \
+ appconfig.cpp \
+ screenshooter.cpp \
+ http.cpp \
+ dynamictext.cpp \
+ statictext.cpp \
+ serial/posix_qextserialport.cpp \
+ serial/qextserialbase.cpp \
+ serial/qextserialport.cpp \
+ serialcontrols.cpp \
+ xmlappparser.cpp \
+ xmlabstractparser.cpp \
+ abstractmaintainer.cpp \
+ appmaintainer.cpp \
+ layoutmaintainer.cpp \
+ documentmaintainer.cpp \
+ modechanger.cpp \
+ saver.cpp \
+ appconfigdata.cpp \
+ dummydocument.cpp \
+ page.cpp \
+ statisticsdata.cpp \
+ xmlstatisticswriter.cpp \
+ textdocument.cpp \
+ category.cpp \
+ panel.cpp \
+ categorymaintainerdoc.cpp \
+ categorymaintainerlayout.cpp \
+ xmlcatlayoutparser.cpp \
+ categorymanager.cpp \
+ xmlcatdocparser.cpp \
+ xmlpaneldocparser.cpp \
+ statisticevent.cpp \
+ statistics.cpp \
+ videodocument.cpp \
+ autodeleter.cpp \
+ xmlfilecacheparser.cpp \
+ filecachemaintainer.cpp \
+ logotabbar.cpp \
+ pdfpresentationdocument.cpp \
+ pdfpresentationviewer.cpp \
+ pdfcommonviewer.cpp moc_elvys.cpp \
+ moc_pdfdocument.cpp \
+ moc_pdffiller.cpp \
+ moc_pdfviewer.cpp \
+ moc_pdfzoomed.cpp \
+ moc_statictext.cpp \
+ moc_xmllayoutparser.cpp \
+ moc_xmldocumentparser.cpp \
+ moc_screenshooter.cpp \
+ moc_http.cpp \
+ moc_dynamictext.cpp \
+ moc_xmlappparser.cpp \
+ moc_xmlabstractparser.cpp \
+ moc_appmaintainer.cpp \
+ moc_abstractmaintainer.cpp \
+ moc_layoutmaintainer.cpp \
+ moc_documentmaintainer.cpp \
+ moc_document.cpp \
+ moc_modechanger.cpp \
+ moc_saver.cpp \
+ moc_appconfigdata.cpp \
+ moc_dummydocument.cpp \
+ moc_textdocument.cpp \
+ moc_category.cpp \
+ moc_panel.cpp \
+ moc_categorymaintainerdoc.cpp \
+ moc_categorymaintainerlayout.cpp \
+ moc_xmlcatlayoutparser.cpp \
+ moc_categorymanager.cpp \
+ moc_xmlcatdocparser.cpp \
+ moc_xmlpaneldocparser.cpp \
+ moc_statisticsdata.cpp \
+ moc_statistics.cpp \
+ moc_videodocument.cpp \
+ moc_autodeleter.cpp \
+ moc_xmlfilecacheparser.cpp \
+ moc_filecachemaintainer.cpp \
+ moc_pdfpresentationdocument.cpp \
+ moc_pdfpresentationviewer.cpp \
+ moc_pdfcommonviewer.cpp \
+ qrc_application.cpp
+OBJECTS = main.o \
+ pdfdocument.o \
+ pdffiller.o \
+ pdfviewer.o \
+ pdfzoomed.o \
+ pdfpage.o \
+ xmllayoutparser.o \
+ elvys.o \
+ xmldocumentparser.o \
+ appconfig.o \
+ screenshooter.o \
+ http.o \
+ dynamictext.o \
+ statictext.o \
+ posix_qextserialport.o \
+ qextserialbase.o \
+ qextserialport.o \
+ serialcontrols.o \
+ xmlappparser.o \
+ xmlabstractparser.o \
+ abstractmaintainer.o \
+ appmaintainer.o \
+ layoutmaintainer.o \
+ documentmaintainer.o \
+ modechanger.o \
+ saver.o \
+ appconfigdata.o \
+ dummydocument.o \
+ page.o \
+ statisticsdata.o \
+ xmlstatisticswriter.o \
+ textdocument.o \
+ category.o \
+ panel.o \
+ categorymaintainerdoc.o \
+ categorymaintainerlayout.o \
+ xmlcatlayoutparser.o \
+ categorymanager.o \
+ xmlcatdocparser.o \
+ xmlpaneldocparser.o \
+ statisticevent.o \
+ statistics.o \
+ videodocument.o \
+ autodeleter.o \
+ xmlfilecacheparser.o \
+ filecachemaintainer.o \
+ logotabbar.o \
+ pdfpresentationdocument.o \
+ pdfpresentationviewer.o \
+ pdfcommonviewer.o \
+ moc_elvys.o \
+ moc_pdfdocument.o \
+ moc_pdffiller.o \
+ moc_pdfviewer.o \
+ moc_pdfzoomed.o \
+ moc_statictext.o \
+ moc_xmllayoutparser.o \
+ moc_xmldocumentparser.o \
+ moc_screenshooter.o \
+ moc_http.o \
+ moc_dynamictext.o \
+ moc_xmlappparser.o \
+ moc_xmlabstractparser.o \
+ moc_appmaintainer.o \
+ moc_abstractmaintainer.o \
+ moc_layoutmaintainer.o \
+ moc_documentmaintainer.o \
+ moc_document.o \
+ moc_modechanger.o \
+ moc_saver.o \
+ moc_appconfigdata.o \
+ moc_dummydocument.o \
+ moc_textdocument.o \
+ moc_category.o \
+ moc_panel.o \
+ moc_categorymaintainerdoc.o \
+ moc_categorymaintainerlayout.o \
+ moc_xmlcatlayoutparser.o \
+ moc_categorymanager.o \
+ moc_xmlcatdocparser.o \
+ moc_xmlpaneldocparser.o \
+ moc_statisticsdata.o \
+ moc_statistics.o \
+ moc_videodocument.o \
+ moc_autodeleter.o \
+ moc_xmlfilecacheparser.o \
+ moc_filecachemaintainer.o \
+ moc_pdfpresentationdocument.o \
+ moc_pdfpresentationviewer.o \
+ moc_pdfcommonviewer.o \
+ qrc_application.o
+DIST = serialport \
+ /usr/share/qt4/mkspecs/common/g++.conf \
+ /usr/share/qt4/mkspecs/common/unix.conf \
+ /usr/share/qt4/mkspecs/common/linux.conf \
+ /usr/share/qt4/mkspecs/qconfig.pri \
+ /usr/share/qt4/mkspecs/features/qt_functions.prf \
+ /usr/share/qt4/mkspecs/features/qt_config.prf \
+ /usr/share/qt4/mkspecs/features/exclusive_builds.prf \
+ /usr/share/qt4/mkspecs/features/default_pre.prf \
+ /usr/share/qt4/mkspecs/features/debug.prf \
+ /usr/share/qt4/mkspecs/features/default_post.prf \
+ /usr/share/qt4/mkspecs/features/qtestlib.prf \
+ /usr/share/qt4/mkspecs/features/qt.prf \
+ /usr/share/qt4/mkspecs/features/moc.prf \
+ /usr/share/qt4/mkspecs/features/unix/thread.prf \
+ /usr/share/qt4/mkspecs/features/warn_on.prf \
+ /usr/share/qt4/mkspecs/features/resources.prf \
+ /usr/share/qt4/mkspecs/features/uic.prf \
+ /usr/share/qt4/mkspecs/features/yacc.prf \
+ /usr/share/qt4/mkspecs/features/lex.prf \
+ /usr/share/qt4/mkspecs/features/include_source_dir.prf \
+ src.pro
+QMAKE_TARGET = elvys-client
+DESTDIR = ../bin/
+TARGET = ../bin/elvys-client
+
+first: all
+####### Implicit rules
+
+.SUFFIXES: .o .c .cpp .cc .cxx .C
+
+.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)
+ @$(CHK_DIR_EXISTS) ../bin/ || $(MKDIR) ../bin/
+ $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
+
Makefile: src.pro /usr/share/qt4/mkspecs/linux-g++/qmake.conf
/usr/share/qt4/mkspecs/common/g++.conf \
/usr/share/qt4/mkspecs/common/unix.conf \
/usr/share/qt4/mkspecs/common/linux.conf \
@@ -72,7 +286,6 @@
/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
/usr/share/qt4/mkspecs/features/default_pre.prf \
/usr/share/qt4/mkspecs/features/debug.prf \
- /usr/share/qt4/mkspecs/features/debug_and_release.prf \
/usr/share/qt4/mkspecs/features/default_post.prf \
/usr/share/qt4/mkspecs/features/qtestlib.prf \
/usr/share/qt4/mkspecs/features/qt.prf \
@@ -90,7 +303,7 @@
/usr/lib/qt4/libQtXml.prl \
/usr/lib/qt4/libQtGui.prl \
/usr/lib/qt4/libQtNetwork.prl
- $(QMAKE) -spec /usr/share/qt4/mkspecs/linux-g++ -unix
CONFIG+=debug_and_release -o Makefile src.pro
+ $(QMAKE) -spec /usr/share/qt4/mkspecs/linux-g++ -unix CONFIG+=release
-o Makefile src.pro
/usr/share/qt4/mkspecs/common/g++.conf:
/usr/share/qt4/mkspecs/common/unix.conf:
/usr/share/qt4/mkspecs/common/linux.conf:
@@ -100,7 +313,6 @@
/usr/share/qt4/mkspecs/features/exclusive_builds.prf:
/usr/share/qt4/mkspecs/features/default_pre.prf:
/usr/share/qt4/mkspecs/features/debug.prf:
-/usr/share/qt4/mkspecs/features/debug_and_release.prf:
/usr/share/qt4/mkspecs/features/default_post.prf:
/usr/share/qt4/mkspecs/features/qtestlib.prf:
/usr/share/qt4/mkspecs/features/qt.prf:
@@ -118,30 +330,1091 @@
/usr/lib/qt4/libQtXml.prl:
/usr/lib/qt4/libQtGui.prl:
/usr/lib/qt4/libQtNetwork.prl:
-qmake: qmake_all FORCE
- @$(QMAKE) -spec /usr/share/qt4/mkspecs/linux-g++ -unix
CONFIG+=debug_and_release -o Makefile src.pro
+qmake: FORCE
+ @$(QMAKE) -spec /usr/share/qt4/mkspecs/linux-g++ -unix CONFIG+=release
-o Makefile src.pro
-qmake_all: FORCE
+dist:
+ @$(CHK_DIR_EXISTS) .tmp/elvys-client1.0.0 || $(MKDIR)
.tmp/elvys-client1.0.0
+ $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/elvys-client1.0.0/ &&
$(COPY_FILE) --parents elvys.h pdfdocument.h pdffiller.h pdfviewer.h
pdfzoomed.h constants.h pdfpage.h statictext.h xmllayoutparser.h
xmldocumentparser.h appconfig.h screenshooter.h http.h dynamictext.h
serial/posix_qextserialport.h serialcontrols.h serial/qextserialbase.h
serial/qextserialport.h xmlappparser.h xmlabstractparser.h appmaintainer.h
abstractmaintainer.h layoutmaintainer.h documentmaintainer.h document.h
modechanger.h saver.h appconfigdata.h dummydocument.h page.h
xmlstatisticswriter.h textdocument.h pageselector.h category.h panel.h
categorymaintainerdoc.h categorymaintainerlayout.h xmlcatlayoutparser.h
categorymanager.h xmlcatdocparser.h xmlpaneldocparser.h statisticevent.h
statisticsdata.h statistics.h videodocument.h autodeleter.h
xmlfilecacheparser.h filecachemaintainer.h logotabbar.h
pdfpresentationdocument.h pdfpresentationviewer.h pdfcommonviewer.h
.tmp/elvys-client1.0.0/ && $(COPY_FIL
E) --parents application.qrc .tmp/elvys-client1.0.0/ && $(COPY_FILE) --parents
main.cpp pdfdocument.cpp pdffiller.cpp pdfviewer.cpp pdfzoomed.cpp pdfpage.cpp
xmllayoutparser.cpp elvys.cpp xmldocumentparser.cpp appconfig.cpp
screenshooter.cpp http.cpp dynamictext.cpp statictext.cpp
serial/posix_qextserialport.cpp serial/qextserialbase.cpp
serial/qextserialport.cpp serialcontrols.cpp xmlappparser.cpp
xmlabstractparser.cpp abstractmaintainer.cpp appmaintainer.cpp
layoutmaintainer.cpp documentmaintainer.cpp modechanger.cpp saver.cpp
appconfigdata.cpp dummydocument.cpp page.cpp statisticsdata.cpp
xmlstatisticswriter.cpp textdocument.cpp category.cpp panel.cpp
categorymaintainerdoc.cpp categorymaintainerlayout.cpp xmlcatlayoutparser.cpp
categorymanager.cpp xmlcatdocparser.cpp xmlpaneldocparser.cpp
statisticevent.cpp statistics.cpp videodocument.cpp autodeleter.cpp
xmlfilecacheparser.cpp filecachemaintainer.cpp logotabbar.cpp
pdfpresentationdocument.cpp pdfpresentationviewer.cpp pd
fcommonviewer.cpp .tmp/elvys-client1.0.0/ && (cd `dirname
.tmp/elvys-client1.0.0` && $(TAR) elvys-client1.0.0.tar elvys-client1.0.0 &&
$(COMPRESS) elvys-client1.0.0.tar) && $(MOVE) `dirname
.tmp/elvys-client1.0.0`/elvys-client1.0.0.tar.gz . && $(DEL_FILE) -r
.tmp/elvys-client1.0.0
-make_default: debug-make_default release-make_default FORCE
-make_first: debug-make_first release-make_first FORCE
-all: debug-all release-all FORCE
-clean: debug-clean release-clean FORCE
-distclean: debug-distclean release-distclean FORCE
+
+clean:compiler_clean
+ -$(DEL_FILE) $(OBJECTS)
+ -$(DEL_FILE) *~ core *.core
+
+
+####### Sub-libraries
+
+distclean: clean
+ -$(DEL_FILE) $(TARGET)
-$(DEL_FILE) Makefile
-debug-mocclean: $(MAKEFILE).Debug
- $(MAKE) -f $(MAKEFILE).Debug mocclean
-release-mocclean: $(MAKEFILE).Release
- $(MAKE) -f $(MAKEFILE).Release mocclean
-mocclean: debug-mocclean release-mocclean
-debug-mocables: $(MAKEFILE).Debug
- $(MAKE) -f $(MAKEFILE).Debug mocables
-release-mocables: $(MAKEFILE).Release
- $(MAKE) -f $(MAKEFILE).Release mocables
-mocables: debug-mocables release-mocables
+mocclean: compiler_moc_header_clean compiler_moc_source_clean
+
+mocables: compiler_moc_header_make_all compiler_moc_source_make_all
+
+compiler_moc_header_make_all: moc_elvys.cpp moc_pdfdocument.cpp
moc_pdffiller.cpp moc_pdfviewer.cpp moc_pdfzoomed.cpp moc_statictext.cpp
moc_xmllayoutparser.cpp moc_xmldocumentparser.cpp moc_screenshooter.cpp
moc_http.cpp moc_dynamictext.cpp moc_xmlappparser.cpp moc_xmlabstractparser.cpp
moc_appmaintainer.cpp moc_abstractmaintainer.cpp moc_layoutmaintainer.cpp
moc_documentmaintainer.cpp moc_document.cpp moc_modechanger.cpp moc_saver.cpp
moc_appconfigdata.cpp moc_dummydocument.cpp moc_textdocument.cpp
moc_category.cpp moc_panel.cpp moc_categorymaintainerdoc.cpp
moc_categorymaintainerlayout.cpp moc_xmlcatlayoutparser.cpp
moc_categorymanager.cpp moc_xmlcatdocparser.cpp moc_xmlpaneldocparser.cpp
moc_statisticsdata.cpp moc_statistics.cpp moc_videodocument.cpp
moc_autodeleter.cpp moc_xmlfilecacheparser.cpp moc_filecachemaintainer.cpp
moc_pdfpresentationdocument.cpp moc_pdfpresentationviewer.cpp
moc_pdfcommonviewer.cpp
+compiler_moc_header_clean:
+ -$(DEL_FILE) moc_elvys.cpp moc_pdfdocument.cpp moc_pdffiller.cpp
moc_pdfviewer.cpp moc_pdfzoomed.cpp moc_statictext.cpp moc_xmllayoutparser.cpp
moc_xmldocumentparser.cpp moc_screenshooter.cpp moc_http.cpp
moc_dynamictext.cpp moc_xmlappparser.cpp moc_xmlabstractparser.cpp
moc_appmaintainer.cpp moc_abstractmaintainer.cpp moc_layoutmaintainer.cpp
moc_documentmaintainer.cpp moc_document.cpp moc_modechanger.cpp moc_saver.cpp
moc_appconfigdata.cpp moc_dummydocument.cpp moc_textdocument.cpp
moc_category.cpp moc_panel.cpp moc_categorymaintainerdoc.cpp
moc_categorymaintainerlayout.cpp moc_xmlcatlayoutparser.cpp
moc_categorymanager.cpp moc_xmlcatdocparser.cpp moc_xmlpaneldocparser.cpp
moc_statisticsdata.cpp moc_statistics.cpp moc_videodocument.cpp
moc_autodeleter.cpp moc_xmlfilecacheparser.cpp moc_filecachemaintainer.cpp
moc_pdfpresentationdocument.cpp moc_pdfpresentationviewer.cpp
moc_pdfcommonviewer.cpp
+moc_elvys.cpp: appmaintainer.h \
+ abstractmaintainer.h \
+ http.h \
+ appconfig.h \
+ appconfigdata.h \
+ xmlabstractparser.h \
+ xmlappparser.h \
+ filecachemaintainer.h \
+ xmlfilecacheparser.h \
+ constants.h \
+ statisticevent.h \
+ statistics.h \
+ statisticsdata.h \
+ xmlstatisticswriter.h \
+ categorymanager.h \
+ categorymaintainerdoc.h \
+ xmlcatdocparser.h \
+ categorymaintainerlayout.h \
+ xmlcatlayoutparser.h \
+ logotabbar.h \
+ category.h \
+ layoutmaintainer.h \
+ modechanger.h \
+ xmlpaneldocparser.h \
+ panel.h \
+ documentmaintainer.h \
+ document.h \
+ dummydocument.h \
+ pdfdocument.h \
+ pdffiller.h \
+ pdfpage.h \
+ pageselector.h \
+ pdfviewer.h \
+ pdfzoomed.h \
+ page.h \
+ pdfcommonviewer.h \
+ dynamictext.h \
+ textdocument.h \
+ statictext.h \
+ screenshooter.h \
+ autodeleter.h \
+ elvys.h
+ /usr/bin/moc $(DEFINES) $(INCPATH) elvys.h -o moc_elvys.cpp
+
+moc_pdfdocument.cpp: document.h \
+ pdffiller.h \
+ constants.h \
+ pdfpage.h \
+ pageselector.h \
+ pdfviewer.h \
+ pdfzoomed.h \
+ page.h \
+ pdfcommonviewer.h \
+ appconfig.h \
+ appconfigdata.h \
+ pdfdocument.h
+ /usr/bin/moc $(DEFINES) $(INCPATH) pdfdocument.h -o moc_pdfdocument.cpp
+
+moc_pdffiller.cpp: document.h \
+ constants.h \
+ pdfpage.h \
+ pageselector.h \
+ pdffiller.h
+ /usr/bin/moc $(DEFINES) $(INCPATH) pdffiller.h -o moc_pdffiller.cpp
+
+moc_pdfviewer.cpp: pdfzoomed.h \
+ pdfpage.h \
+ page.h \
+ pageselector.h \
+ pdfcommonviewer.h \
+ constants.h \
+ document.h \
+ appconfig.h \
+ appconfigdata.h \
+ pdfviewer.h
+ /usr/bin/moc $(DEFINES) $(INCPATH) pdfviewer.h -o moc_pdfviewer.cpp
+
+moc_pdfzoomed.cpp: pdfpage.h \
+ page.h \
+ pageselector.h \
+ pdfzoomed.h
+ /usr/bin/moc $(DEFINES) $(INCPATH) pdfzoomed.h -o moc_pdfzoomed.cpp
+
+moc_statictext.cpp: textdocument.h \
+ document.h \
+ statictext.h
+ /usr/bin/moc $(DEFINES) $(INCPATH) statictext.h -o moc_statictext.cpp
+
+moc_xmllayoutparser.cpp: xmlabstractparser.h \
+ xmllayoutparser.h
+ /usr/bin/moc $(DEFINES) $(INCPATH) xmllayoutparser.h -o
moc_xmllayoutparser.cpp
+
+moc_xmldocumentparser.cpp: xmlabstractparser.h \
+ xmldocumentparser.h
+ /usr/bin/moc $(DEFINES) $(INCPATH) xmldocumentparser.h -o
moc_xmldocumentparser.cpp
+
+moc_screenshooter.cpp: http.h \
+ appconfig.h \
+ appconfigdata.h \
+ screenshooter.h
+ /usr/bin/moc $(DEFINES) $(INCPATH) screenshooter.h -o
moc_screenshooter.cpp
+
+moc_http.cpp: appconfig.h \
+ appconfigdata.h \
+ http.h
+ /usr/bin/moc $(DEFINES) $(INCPATH) http.h -o moc_http.cpp
+
+moc_dynamictext.cpp: textdocument.h \
+ document.h \
+ dynamictext.h
+ /usr/bin/moc $(DEFINES) $(INCPATH) dynamictext.h -o moc_dynamictext.cpp
+
+moc_xmlappparser.cpp: appconfig.h \
+ appconfigdata.h \
+ xmlabstractparser.h \
+ xmlappparser.h
+ /usr/bin/moc $(DEFINES) $(INCPATH) xmlappparser.h -o
moc_xmlappparser.cpp
+
+moc_xmlabstractparser.cpp: xmlabstractparser.h
+ /usr/bin/moc $(DEFINES) $(INCPATH) xmlabstractparser.h -o
moc_xmlabstractparser.cpp
+
+moc_appmaintainer.cpp: abstractmaintainer.h \
+ http.h \
+ appconfig.h \
+ appconfigdata.h \
+ xmlabstractparser.h \
+ xmlappparser.h \
+ appmaintainer.h
+ /usr/bin/moc $(DEFINES) $(INCPATH) appmaintainer.h -o
moc_appmaintainer.cpp
+
+moc_abstractmaintainer.cpp: http.h \
+ appconfig.h \
+ appconfigdata.h \
+ xmlabstractparser.h \
+ abstractmaintainer.h
+ /usr/bin/moc $(DEFINES) $(INCPATH) abstractmaintainer.h -o
moc_abstractmaintainer.cpp
+
+moc_layoutmaintainer.cpp: abstractmaintainer.h \
+ http.h \
+ appconfig.h \
+ appconfigdata.h \
+ xmlabstractparser.h \
+ modechanger.h \
+ layoutmaintainer.h
+ /usr/bin/moc $(DEFINES) $(INCPATH) layoutmaintainer.h -o
moc_layoutmaintainer.cpp
+
+moc_documentmaintainer.cpp: statisticevent.h \
+ http.h \
+ appconfig.h \
+ appconfigdata.h \
+ abstractmaintainer.h \
+ xmlabstractparser.h \
+ documentmaintainer.h
+ /usr/bin/moc $(DEFINES) $(INCPATH) documentmaintainer.h -o
moc_documentmaintainer.cpp
+
+moc_document.cpp: document.h
+ /usr/bin/moc $(DEFINES) $(INCPATH) document.h -o moc_document.cpp
+
+moc_modechanger.cpp: modechanger.h
+ /usr/bin/moc $(DEFINES) $(INCPATH) modechanger.h -o moc_modechanger.cpp
+
+moc_saver.cpp: saver.h
+ /usr/bin/moc $(DEFINES) $(INCPATH) saver.h -o moc_saver.cpp
+
+moc_appconfigdata.cpp: appconfigdata.h
+ /usr/bin/moc $(DEFINES) $(INCPATH) appconfigdata.h -o
moc_appconfigdata.cpp
+
+moc_dummydocument.cpp: document.h \
+ dummydocument.h
+ /usr/bin/moc $(DEFINES) $(INCPATH) dummydocument.h -o
moc_dummydocument.cpp
+
+moc_textdocument.cpp: document.h \
+ textdocument.h
+ /usr/bin/moc $(DEFINES) $(INCPATH) textdocument.h -o
moc_textdocument.cpp
+
+moc_category.cpp: layoutmaintainer.h \
+ abstractmaintainer.h \
+ http.h \
+ appconfig.h \
+ appconfigdata.h \
+ xmlabstractparser.h \
+ modechanger.h \
+ xmlpaneldocparser.h \
+ constants.h \
+ panel.h \
+ documentmaintainer.h \
+ statisticevent.h \
+ document.h \
+ dummydocument.h \
+ pdfdocument.h \
+ pdffiller.h \
+ pdfpage.h \
+ pageselector.h \
+ pdfviewer.h \
+ pdfzoomed.h \
+ page.h \
+ pdfcommonviewer.h \
+ dynamictext.h \
+ textdocument.h \
+ statictext.h \
+ category.h
+ /usr/bin/moc $(DEFINES) $(INCPATH) category.h -o moc_category.cpp
+
+moc_panel.cpp: documentmaintainer.h \
+ statisticevent.h \
+ http.h \
+ appconfig.h \
+ appconfigdata.h \
+ abstractmaintainer.h \
+ xmlabstractparser.h \
+ document.h \
+ dummydocument.h \
+ pdfdocument.h \
+ pdffiller.h \
+ constants.h \
+ pdfpage.h \
+ pageselector.h \
+ pdfviewer.h \
+ pdfzoomed.h \
+ page.h \
+ pdfcommonviewer.h \
+ dynamictext.h \
+ textdocument.h \
+ statictext.h \
+ panel.h
+ /usr/bin/moc $(DEFINES) $(INCPATH) panel.h -o moc_panel.cpp
+
+moc_categorymaintainerdoc.cpp: abstractmaintainer.h \
+ http.h \
+ appconfig.h \
+ appconfigdata.h \
+ xmlabstractparser.h \
+ xmlcatdocparser.h \
+ constants.h \
+ categorymaintainerdoc.h
+ /usr/bin/moc $(DEFINES) $(INCPATH) categorymaintainerdoc.h -o
moc_categorymaintainerdoc.cpp
+
+moc_categorymaintainerlayout.cpp: abstractmaintainer.h \
+ http.h \
+ appconfig.h \
+ appconfigdata.h \
+ xmlabstractparser.h \
+ xmlcatlayoutparser.h \
+ constants.h \
+ categorymaintainerlayout.h
+ /usr/bin/moc $(DEFINES) $(INCPATH) categorymaintainerlayout.h -o
moc_categorymaintainerlayout.cpp
+
+moc_xmlcatlayoutparser.cpp: constants.h \
+ xmlabstractparser.h \
+ xmlcatlayoutparser.h
+ /usr/bin/moc $(DEFINES) $(INCPATH) xmlcatlayoutparser.h -o
moc_xmlcatlayoutparser.cpp
+
+moc_categorymanager.cpp: categorymaintainerdoc.h \
+ abstractmaintainer.h \
+ http.h \
+ appconfig.h \
+ appconfigdata.h \
+ xmlabstractparser.h \
+ xmlcatdocparser.h \
+ constants.h \
+ categorymaintainerlayout.h \
+ xmlcatlayoutparser.h \
+ logotabbar.h \
+ category.h \
+ layoutmaintainer.h \
+ modechanger.h \
+ xmlpaneldocparser.h \
+ panel.h \
+ documentmaintainer.h \
+ statisticevent.h \
+ document.h \
+ dummydocument.h \
+ pdfdocument.h \
+ pdffiller.h \
+ pdfpage.h \
+ pageselector.h \
+ pdfviewer.h \
+ pdfzoomed.h \
+ page.h \
+ pdfcommonviewer.h \
+ dynamictext.h \
+ textdocument.h \
+ statictext.h \
+ categorymanager.h
+ /usr/bin/moc $(DEFINES) $(INCPATH) categorymanager.h -o
moc_categorymanager.cpp
+
+moc_xmlcatdocparser.cpp: constants.h \
+ xmlabstractparser.h \
+ xmlcatdocparser.h
+ /usr/bin/moc $(DEFINES) $(INCPATH) xmlcatdocparser.h -o
moc_xmlcatdocparser.cpp
+
+moc_xmlpaneldocparser.cpp: constants.h \
+ xmlabstractparser.h \
+ xmlpaneldocparser.h
+ /usr/bin/moc $(DEFINES) $(INCPATH) xmlpaneldocparser.h -o
moc_xmlpaneldocparser.cpp
+
+moc_statisticsdata.cpp: xmlstatisticswriter.h \
+ statisticevent.h \
+ http.h \
+ appconfig.h \
+ appconfigdata.h \
+ statisticsdata.h
+ /usr/bin/moc $(DEFINES) $(INCPATH) statisticsdata.h -o
moc_statisticsdata.cpp
+
+moc_statistics.cpp: statisticsdata.h \
+ xmlstatisticswriter.h \
+ statisticevent.h \
+ http.h \
+ appconfig.h \
+ appconfigdata.h \
+ statistics.h
+ /usr/bin/moc $(DEFINES) $(INCPATH) statistics.h -o moc_statistics.cpp
+
+moc_videodocument.cpp: appconfig.h \
+ appconfigdata.h \
+ document.h \
+ constants.h \
+ videodocument.h
+ /usr/bin/moc $(DEFINES) $(INCPATH) videodocument.h -o
moc_videodocument.cpp
+
+moc_autodeleter.cpp: autodeleter.h
+ /usr/bin/moc $(DEFINES) $(INCPATH) autodeleter.h -o moc_autodeleter.cpp
+
+moc_xmlfilecacheparser.cpp: constants.h \
+ xmlabstractparser.h \
+ xmlfilecacheparser.h
+ /usr/bin/moc $(DEFINES) $(INCPATH) xmlfilecacheparser.h -o
moc_xmlfilecacheparser.cpp
+
+moc_filecachemaintainer.cpp: abstractmaintainer.h \
+ http.h \
+ appconfig.h \
+ appconfigdata.h \
+ xmlabstractparser.h \
+ xmlfilecacheparser.h \
+ constants.h \
+ statisticevent.h \
+ statistics.h \
+ statisticsdata.h \
+ xmlstatisticswriter.h \
+ filecachemaintainer.h
+ /usr/bin/moc $(DEFINES) $(INCPATH) filecachemaintainer.h -o
moc_filecachemaintainer.cpp
+
+moc_pdfpresentationdocument.cpp: document.h \
+ pdfpresentationviewer.h \
+ pageselector.h \
+ pdfpage.h \
+ page.h \
+ pdfcommonviewer.h \
+ constants.h \
+ appconfig.h \
+ appconfigdata.h \
+ pdffiller.h \
+ pdfpresentationdocument.h
+ /usr/bin/moc $(DEFINES) $(INCPATH) pdfpresentationdocument.h -o
moc_pdfpresentationdocument.cpp
+
+moc_pdfpresentationviewer.cpp: document.h \
+ pageselector.h \
+ pdfpage.h \
+ page.h \
+ pdfcommonviewer.h \
+ constants.h \
+ appconfig.h \
+ appconfigdata.h \
+ pdfpresentationviewer.h
+ /usr/bin/moc $(DEFINES) $(INCPATH) pdfpresentationviewer.h -o
moc_pdfpresentationviewer.cpp
+
+moc_pdfcommonviewer.cpp: constants.h \
+ document.h \
+ pageselector.h \
+ pdfpage.h \
+ page.h \
+ appconfig.h \
+ appconfigdata.h \
+ pdfcommonviewer.h
+ /usr/bin/moc $(DEFINES) $(INCPATH) pdfcommonviewer.h -o
moc_pdfcommonviewer.cpp
+
+compiler_rcc_make_all: qrc_application.cpp
+compiler_rcc_clean:
+ -$(DEL_FILE) qrc_application.cpp
+qrc_application.cpp: application.qrc
+ /usr/bin/rcc -name application application.qrc -o qrc_application.cpp
+
+compiler_image_collection_make_all: qmake_image_collection.cpp
+compiler_image_collection_clean:
+ -$(DEL_FILE) qmake_image_collection.cpp
+compiler_moc_source_make_all:
+compiler_moc_source_clean:
+compiler_uic_make_all:
+compiler_uic_clean:
+compiler_yacc_decl_make_all:
+compiler_yacc_decl_clean:
+compiler_yacc_impl_make_all:
+compiler_yacc_impl_clean:
+compiler_lex_make_all:
+compiler_lex_clean:
+compiler_clean: compiler_moc_header_clean compiler_rcc_clean
+
+####### Compile
+
+main.o: main.cpp elvys.h \
+ appmaintainer.h \
+ abstractmaintainer.h \
+ http.h \
+ appconfig.h \
+ appconfigdata.h \
+ xmlabstractparser.h \
+ xmlappparser.h \
+ filecachemaintainer.h \
+ xmlfilecacheparser.h \
+ constants.h \
+ statisticevent.h \
+ statistics.h \
+ statisticsdata.h \
+ xmlstatisticswriter.h \
+ categorymanager.h \
+ categorymaintainerdoc.h \
+ xmlcatdocparser.h \
+ categorymaintainerlayout.h \
+ xmlcatlayoutparser.h \
+ logotabbar.h \
+ category.h \
+ layoutmaintainer.h \
+ modechanger.h \
+ xmlpaneldocparser.h \
+ panel.h \
+ documentmaintainer.h \
+ document.h \
+ dummydocument.h \
+ pdfdocument.h \
+ pdffiller.h \
+ pdfpage.h \
+ pageselector.h \
+ pdfviewer.h \
+ pdfzoomed.h \
+ page.h \
+ pdfcommonviewer.h \
+ dynamictext.h \
+ textdocument.h \
+ statictext.h \
+ screenshooter.h \
+ autodeleter.h \
+ saver.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp
+
+pdfdocument.o: pdfdocument.cpp pdfdocument.h \
+ document.h \
+ pdffiller.h \
+ constants.h \
+ pdfpage.h \
+ pageselector.h \
+ pdfviewer.h \
+ pdfzoomed.h \
+ page.h \
+ pdfcommonviewer.h \
+ appconfig.h \
+ appconfigdata.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o pdfdocument.o pdfdocument.cpp
+
+pdffiller.o: pdffiller.cpp pdffiller.h \
+ document.h \
+ constants.h \
+ pdfpage.h \
+ pageselector.h \
+ pdfdocument.h \
+ pdfviewer.h \
+ pdfzoomed.h \
+ page.h \
+ pdfcommonviewer.h \
+ appconfig.h \
+ appconfigdata.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o pdffiller.o pdffiller.cpp
+
+pdfviewer.o: pdfviewer.cpp pdfviewer.h \
+ pdfzoomed.h \
+ pdfpage.h \
+ page.h \
+ pageselector.h \
+ pdfcommonviewer.h \
+ constants.h \
+ document.h \
+ appconfig.h \
+ appconfigdata.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o pdfviewer.o pdfviewer.cpp
+
+pdfzoomed.o: pdfzoomed.cpp pdfzoomed.h \
+ pdfpage.h \
+ page.h \
+ pageselector.h \
+ pdffiller.h \
+ document.h \
+ constants.h \
+ appconfig.h \
+ appconfigdata.h \
+ pdfdocument.h \
+ pdfviewer.h \
+ pdfcommonviewer.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o pdfzoomed.o pdfzoomed.cpp
+
+pdfpage.o: pdfpage.cpp pdfpage.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o pdfpage.o pdfpage.cpp
+
+xmllayoutparser.o: xmllayoutparser.cpp xmllayoutparser.h \
+ xmlabstractparser.h \
+ constants.h \
+ appconfig.h \
+ appconfigdata.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o xmllayoutparser.o
xmllayoutparser.cpp
+
+elvys.o: elvys.cpp elvys.h \
+ appmaintainer.h \
+ abstractmaintainer.h \
+ http.h \
+ appconfig.h \
+ appconfigdata.h \
+ xmlabstractparser.h \
+ xmlappparser.h \
+ filecachemaintainer.h \
+ xmlfilecacheparser.h \
+ constants.h \
+ statisticevent.h \
+ statistics.h \
+ statisticsdata.h \
+ xmlstatisticswriter.h \
+ categorymanager.h \
+ categorymaintainerdoc.h \
+ xmlcatdocparser.h \
+ categorymaintainerlayout.h \
+ xmlcatlayoutparser.h \
+ logotabbar.h \
+ category.h \
+ layoutmaintainer.h \
+ modechanger.h \
+ xmlpaneldocparser.h \
+ panel.h \
+ documentmaintainer.h \
+ document.h \
+ dummydocument.h \
+ pdfdocument.h \
+ pdffiller.h \
+ pdfpage.h \
+ pageselector.h \
+ pdfviewer.h \
+ pdfzoomed.h \
+ page.h \
+ pdfcommonviewer.h \
+ dynamictext.h \
+ textdocument.h \
+ statictext.h \
+ screenshooter.h \
+ autodeleter.h \
+ serialcontrols.h \
+ serial/qextserialport.h \
+ serial/posix_qextserialport.h \
+ serial/qextserialbase.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o elvys.o elvys.cpp
+
+xmldocumentparser.o: xmldocumentparser.cpp xmldocumentparser.h \
+ xmlabstractparser.h \
+ constants.h \
+ appconfig.h \
+ appconfigdata.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o xmldocumentparser.o
xmldocumentparser.cpp
+
+appconfig.o: appconfig.cpp appconfig.h \
+ appconfigdata.h \
+ xmlappparser.h \
+ xmlabstractparser.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o appconfig.o appconfig.cpp
+
+screenshooter.o: screenshooter.cpp screenshooter.h \
+ http.h \
+ appconfig.h \
+ appconfigdata.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o screenshooter.o screenshooter.cpp
+
+http.o: http.cpp http.h \
+ appconfig.h \
+ appconfigdata.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o http.o http.cpp
+
+dynamictext.o: dynamictext.cpp dynamictext.h \
+ textdocument.h \
+ document.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o dynamictext.o dynamictext.cpp
+
+statictext.o: statictext.cpp statictext.h \
+ textdocument.h \
+ document.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o statictext.o statictext.cpp
+
+posix_qextserialport.o: serial/posix_qextserialport.cpp
serial/posix_qextserialport.h \
+ serial/qextserialbase.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o posix_qextserialport.o
serial/posix_qextserialport.cpp
+
+qextserialbase.o: serial/qextserialbase.cpp serial/qextserialbase.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o qextserialbase.o
serial/qextserialbase.cpp
+
+qextserialport.o: serial/qextserialport.cpp serial/qextserialport.h \
+ constants.h \
+ serial/posix_qextserialport.h \
+ serial/qextserialbase.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o qextserialport.o
serial/qextserialport.cpp
+
+serialcontrols.o: serialcontrols.cpp serialcontrols.h \
+ serial/qextserialport.h \
+ constants.h \
+ serial/posix_qextserialport.h \
+ serial/qextserialbase.h \
+ appconfig.h \
+ appconfigdata.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o serialcontrols.o serialcontrols.cpp
+
+xmlappparser.o: xmlappparser.cpp xmlappparser.h \
+ appconfig.h \
+ appconfigdata.h \
+ xmlabstractparser.h \
+ constants.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o xmlappparser.o xmlappparser.cpp
+
+xmlabstractparser.o: xmlabstractparser.cpp xmlabstractparser.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o xmlabstractparser.o
xmlabstractparser.cpp
+
+abstractmaintainer.o: abstractmaintainer.cpp abstractmaintainer.h \
+ http.h \
+ appconfig.h \
+ appconfigdata.h \
+ xmlabstractparser.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o abstractmaintainer.o
abstractmaintainer.cpp
+
+appmaintainer.o: appmaintainer.cpp appconfig.h \
+ appconfigdata.h \
+ appmaintainer.h \
+ abstractmaintainer.h \
+ http.h \
+ xmlabstractparser.h \
+ xmlappparser.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o appmaintainer.o appmaintainer.cpp
+
+layoutmaintainer.o: layoutmaintainer.cpp layoutmaintainer.h \
+ abstractmaintainer.h \
+ http.h \
+ appconfig.h \
+ appconfigdata.h \
+ xmlabstractparser.h \
+ modechanger.h \
+ xmllayoutparser.h \
+ document.h \
+ pdfdocument.h \
+ pdffiller.h \
+ constants.h \
+ pdfpage.h \
+ pageselector.h \
+ pdfviewer.h \
+ pdfzoomed.h \
+ page.h \
+ pdfcommonviewer.h \
+ statictext.h \
+ textdocument.h \
+ dynamictext.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o layoutmaintainer.o
layoutmaintainer.cpp
+
+documentmaintainer.o: documentmaintainer.cpp documentmaintainer.h \
+ statisticevent.h \
+ http.h \
+ appconfig.h \
+ appconfigdata.h \
+ abstractmaintainer.h \
+ xmlabstractparser.h \
+ xmldocumentparser.h \
+ statistics.h \
+ statisticsdata.h \
+ xmlstatisticswriter.h \
+ document.h \
+ pdfdocument.h \
+ pdffiller.h \
+ constants.h \
+ pdfpage.h \
+ pageselector.h \
+ pdfviewer.h \
+ pdfzoomed.h \
+ page.h \
+ pdfcommonviewer.h \
+ pdfpresentationdocument.h \
+ pdfpresentationviewer.h \
+ dummydocument.h \
+ statictext.h \
+ textdocument.h \
+ dynamictext.h \
+ videodocument.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o documentmaintainer.o
documentmaintainer.cpp
+
+modechanger.o: modechanger.cpp modechanger.h \
+ appconfig.h \
+ appconfigdata.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o modechanger.o modechanger.cpp
+
+saver.o: saver.cpp saver.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o saver.o saver.cpp
+
+appconfigdata.o: appconfigdata.cpp appconfigdata.h \
+ xmlappparser.h \
+ appconfig.h \
+ xmlabstractparser.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o appconfigdata.o appconfigdata.cpp
+
+dummydocument.o: dummydocument.cpp dummydocument.h \
+ document.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o dummydocument.o dummydocument.cpp
+
+page.o: page.cpp page.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o page.o page.cpp
+
+statisticsdata.o: statisticsdata.cpp statisticsdata.h \
+ xmlstatisticswriter.h \
+ statisticevent.h \
+ http.h \
+ appconfig.h \
+ appconfigdata.h \
+ constants.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o statisticsdata.o statisticsdata.cpp
+
+xmlstatisticswriter.o: xmlstatisticswriter.cpp xmlstatisticswriter.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o xmlstatisticswriter.o
xmlstatisticswriter.cpp
+
+textdocument.o: textdocument.cpp textdocument.h \
+ document.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o textdocument.o textdocument.cpp
+
+category.o: category.cpp category.h \
+ layoutmaintainer.h \
+ abstractmaintainer.h \
+ http.h \
+ appconfig.h \
+ appconfigdata.h \
+ xmlabstractparser.h \
+ modechanger.h \
+ xmlpaneldocparser.h \
+ constants.h \
+ panel.h \
+ documentmaintainer.h \
+ statisticevent.h \
+ document.h \
+ dummydocument.h \
+ pdfdocument.h \
+ pdffiller.h \
+ pdfpage.h \
+ pageselector.h \
+ pdfviewer.h \
+ pdfzoomed.h \
+ page.h \
+ pdfcommonviewer.h \
+ dynamictext.h \
+ textdocument.h \
+ statictext.h \
+ statistics.h \
+ statisticsdata.h \
+ xmlstatisticswriter.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o category.o category.cpp
+
+panel.o: panel.cpp panel.h \
+ documentmaintainer.h \
+ statisticevent.h \
+ http.h \
+ appconfig.h \
+ appconfigdata.h \
+ abstractmaintainer.h \
+ xmlabstractparser.h \
+ document.h \
+ dummydocument.h \
+ pdfdocument.h \
+ pdffiller.h \
+ constants.h \
+ pdfpage.h \
+ pageselector.h \
+ pdfviewer.h \
+ pdfzoomed.h \
+ page.h \
+ pdfcommonviewer.h \
+ dynamictext.h \
+ textdocument.h \
+ statictext.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o panel.o panel.cpp
+
+categorymaintainerdoc.o: categorymaintainerdoc.cpp categorymaintainerdoc.h \
+ abstractmaintainer.h \
+ http.h \
+ appconfig.h \
+ appconfigdata.h \
+ xmlabstractparser.h \
+ xmlcatdocparser.h \
+ constants.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o categorymaintainerdoc.o
categorymaintainerdoc.cpp
+
+categorymaintainerlayout.o: categorymaintainerlayout.cpp
categorymaintainerlayout.h \
+ abstractmaintainer.h \
+ http.h \
+ appconfig.h \
+ appconfigdata.h \
+ xmlabstractparser.h \
+ xmlcatlayoutparser.h \
+ constants.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o categorymaintainerlayout.o
categorymaintainerlayout.cpp
+
+xmlcatlayoutparser.o: xmlcatlayoutparser.cpp xmlcatlayoutparser.h \
+ constants.h \
+ xmlabstractparser.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o xmlcatlayoutparser.o
xmlcatlayoutparser.cpp
+
+categorymanager.o: categorymanager.cpp categorymanager.h \
+ categorymaintainerdoc.h \
+ abstractmaintainer.h \
+ http.h \
+ appconfig.h \
+ appconfigdata.h \
+ xmlabstractparser.h \
+ xmlcatdocparser.h \
+ constants.h \
+ categorymaintainerlayout.h \
+ xmlcatlayoutparser.h \
+ logotabbar.h \
+ category.h \
+ layoutmaintainer.h \
+ modechanger.h \
+ xmlpaneldocparser.h \
+ panel.h \
+ documentmaintainer.h \
+ statisticevent.h \
+ document.h \
+ dummydocument.h \
+ pdfdocument.h \
+ pdffiller.h \
+ pdfpage.h \
+ pageselector.h \
+ pdfviewer.h \
+ pdfzoomed.h \
+ page.h \
+ pdfcommonviewer.h \
+ dynamictext.h \
+ textdocument.h \
+ statictext.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o categorymanager.o
categorymanager.cpp
+
+xmlcatdocparser.o: xmlcatdocparser.cpp xmlcatdocparser.h \
+ constants.h \
+ xmlabstractparser.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o xmlcatdocparser.o
xmlcatdocparser.cpp
+
+xmlpaneldocparser.o: xmlpaneldocparser.cpp xmlpaneldocparser.h \
+ constants.h \
+ xmlabstractparser.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o xmlpaneldocparser.o
xmlpaneldocparser.cpp
+
+statisticevent.o: statisticevent.cpp statisticevent.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o statisticevent.o statisticevent.cpp
+
+statistics.o: statistics.cpp statistics.h \
+ statisticsdata.h \
+ xmlstatisticswriter.h \
+ statisticevent.h \
+ http.h \
+ appconfig.h \
+ appconfigdata.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o statistics.o statistics.cpp
+
+videodocument.o: videodocument.cpp videodocument.h \
+ appconfig.h \
+ appconfigdata.h \
+ document.h \
+ constants.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o videodocument.o videodocument.cpp
+
+autodeleter.o: autodeleter.cpp autodeleter.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o autodeleter.o autodeleter.cpp
+
+xmlfilecacheparser.o: xmlfilecacheparser.cpp xmlfilecacheparser.h \
+ constants.h \
+ xmlabstractparser.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o xmlfilecacheparser.o
xmlfilecacheparser.cpp
+
+filecachemaintainer.o: filecachemaintainer.cpp filecachemaintainer.h \
+ abstractmaintainer.h \
+ http.h \
+ appconfig.h \
+ appconfigdata.h \
+ xmlabstractparser.h \
+ xmlfilecacheparser.h \
+ constants.h \
+ statisticevent.h \
+ statistics.h \
+ statisticsdata.h \
+ xmlstatisticswriter.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o filecachemaintainer.o
filecachemaintainer.cpp
+
+logotabbar.o: logotabbar.cpp logotabbar.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o logotabbar.o logotabbar.cpp
+
+pdfpresentationdocument.o: pdfpresentationdocument.cpp
pdfpresentationdocument.h \
+ document.h \
+ pdfpresentationviewer.h \
+ pageselector.h \
+ pdfpage.h \
+ page.h \
+ pdfcommonviewer.h \
+ constants.h \
+ appconfig.h \
+ appconfigdata.h \
+ pdffiller.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o pdfpresentationdocument.o
pdfpresentationdocument.cpp
+
+pdfpresentationviewer.o: pdfpresentationviewer.cpp pdfpresentationviewer.h \
+ document.h \
+ pageselector.h \
+ pdfpage.h \
+ page.h \
+ pdfcommonviewer.h \
+ constants.h \
+ appconfig.h \
+ appconfigdata.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o pdfpresentationviewer.o
pdfpresentationviewer.cpp
+
+pdfcommonviewer.o: pdfcommonviewer.cpp pdfcommonviewer.h \
+ constants.h \
+ document.h \
+ pageselector.h \
+ pdfpage.h \
+ page.h \
+ appconfig.h \
+ appconfigdata.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o pdfcommonviewer.o
pdfcommonviewer.cpp
+
+moc_elvys.o: moc_elvys.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_elvys.o moc_elvys.cpp
+
+moc_pdfdocument.o: moc_pdfdocument.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_pdfdocument.o
moc_pdfdocument.cpp
+
+moc_pdffiller.o: moc_pdffiller.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_pdffiller.o moc_pdffiller.cpp
+
+moc_pdfviewer.o: moc_pdfviewer.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_pdfviewer.o moc_pdfviewer.cpp
+
+moc_pdfzoomed.o: moc_pdfzoomed.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_pdfzoomed.o moc_pdfzoomed.cpp
+
+moc_statictext.o: moc_statictext.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_statictext.o moc_statictext.cpp
+
+moc_xmllayoutparser.o: moc_xmllayoutparser.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_xmllayoutparser.o
moc_xmllayoutparser.cpp
+
+moc_xmldocumentparser.o: moc_xmldocumentparser.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_xmldocumentparser.o
moc_xmldocumentparser.cpp
+
+moc_screenshooter.o: moc_screenshooter.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_screenshooter.o
moc_screenshooter.cpp
+
+moc_http.o: moc_http.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_http.o moc_http.cpp
+
+moc_dynamictext.o: moc_dynamictext.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_dynamictext.o
moc_dynamictext.cpp
+
+moc_xmlappparser.o: moc_xmlappparser.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_xmlappparser.o
moc_xmlappparser.cpp
+
+moc_xmlabstractparser.o: moc_xmlabstractparser.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_xmlabstractparser.o
moc_xmlabstractparser.cpp
+
+moc_appmaintainer.o: moc_appmaintainer.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_appmaintainer.o
moc_appmaintainer.cpp
+
+moc_abstractmaintainer.o: moc_abstractmaintainer.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_abstractmaintainer.o
moc_abstractmaintainer.cpp
+
+moc_layoutmaintainer.o: moc_layoutmaintainer.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_layoutmaintainer.o
moc_layoutmaintainer.cpp
+
+moc_documentmaintainer.o: moc_documentmaintainer.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_documentmaintainer.o
moc_documentmaintainer.cpp
+
+moc_document.o: moc_document.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_document.o moc_document.cpp
+
+moc_modechanger.o: moc_modechanger.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_modechanger.o
moc_modechanger.cpp
+
+moc_saver.o: moc_saver.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_saver.o moc_saver.cpp
+
+moc_appconfigdata.o: moc_appconfigdata.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_appconfigdata.o
moc_appconfigdata.cpp
+
+moc_dummydocument.o: moc_dummydocument.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_dummydocument.o
moc_dummydocument.cpp
+
+moc_textdocument.o: moc_textdocument.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_textdocument.o
moc_textdocument.cpp
+
+moc_category.o: moc_category.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_category.o moc_category.cpp
+
+moc_panel.o: moc_panel.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_panel.o moc_panel.cpp
+
+moc_categorymaintainerdoc.o: moc_categorymaintainerdoc.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_categorymaintainerdoc.o
moc_categorymaintainerdoc.cpp
+
+moc_categorymaintainerlayout.o: moc_categorymaintainerlayout.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_categorymaintainerlayout.o
moc_categorymaintainerlayout.cpp
+
+moc_xmlcatlayoutparser.o: moc_xmlcatlayoutparser.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_xmlcatlayoutparser.o
moc_xmlcatlayoutparser.cpp
+
+moc_categorymanager.o: moc_categorymanager.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_categorymanager.o
moc_categorymanager.cpp
+
+moc_xmlcatdocparser.o: moc_xmlcatdocparser.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_xmlcatdocparser.o
moc_xmlcatdocparser.cpp
+
+moc_xmlpaneldocparser.o: moc_xmlpaneldocparser.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_xmlpaneldocparser.o
moc_xmlpaneldocparser.cpp
+
+moc_statisticsdata.o: moc_statisticsdata.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_statisticsdata.o
moc_statisticsdata.cpp
+
+moc_statistics.o: moc_statistics.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_statistics.o moc_statistics.cpp
+
+moc_videodocument.o: moc_videodocument.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_videodocument.o
moc_videodocument.cpp
+
+moc_autodeleter.o: moc_autodeleter.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_autodeleter.o
moc_autodeleter.cpp
+
+moc_xmlfilecacheparser.o: moc_xmlfilecacheparser.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_xmlfilecacheparser.o
moc_xmlfilecacheparser.cpp
+
+moc_filecachemaintainer.o: moc_filecachemaintainer.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_filecachemaintainer.o
moc_filecachemaintainer.cpp
+
+moc_pdfpresentationdocument.o: moc_pdfpresentationdocument.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_pdfpresentationdocument.o
moc_pdfpresentationdocument.cpp
+
+moc_pdfpresentationviewer.o: moc_pdfpresentationviewer.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_pdfpresentationviewer.o
moc_pdfpresentationviewer.cpp
+
+moc_pdfcommonviewer.o: moc_pdfcommonviewer.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_pdfcommonviewer.o
moc_pdfcommonviewer.cpp
+
+qrc_application.o: qrc_application.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o qrc_application.o
qrc_application.cpp
+
+####### Install
+
+install: FORCE
+
+uninstall: FORCE
+
FORCE:
-$(MAKEFILE).Debug: Makefile
-$(MAKEFILE).Release: Makefile
Modified: trunk/client/elvys-client/src/abstractmaintainer.h
===================================================================
--- trunk/client/elvys-client/src/abstractmaintainer.h 2010-02-18 16:25:54 UTC
(rev 1782)
+++ trunk/client/elvys-client/src/abstractmaintainer.h 2010-02-18 16:55:15 UTC
(rev 1783)
@@ -4,6 +4,7 @@
#include <QTimer>
#include <QFile>
#include <QByteArray>
+#include <QCoreApplication>
#include "http.h"
#include "xmlabstractparser.h"
Modified: trunk/client/elvys-client/src/appconfigdata.cpp
===================================================================
--- trunk/client/elvys-client/src/appconfigdata.cpp 2010-02-18 16:25:54 UTC
(rev 1782)
+++ trunk/client/elvys-client/src/appconfigdata.cpp 2010-02-18 16:55:15 UTC
(rev 1783)
@@ -22,6 +22,7 @@
statisticsPeriod = 30 * 1000;
documentPeriod = 60000;
categoryPeriod = 60000;
+ fileCachePeriod = 60000;
elvysMode = Day;
dayModeStart = QTime(20, 13);
nightModeStart = QTime(20, 12);
Modified: trunk/client/elvys-client/src/appmaintainer.cpp
===================================================================
--- trunk/client/elvys-client/src/appmaintainer.cpp 2010-02-18 16:25:54 UTC
(rev 1782)
+++ trunk/client/elvys-client/src/appmaintainer.cpp 2010-02-18 16:55:15 UTC
(rev 1783)
@@ -9,7 +9,7 @@
AppMaintainer::AppMaintainer() {
parser = new XMLAppParser();
- xmlName = "appconfig.xml";
+ xmlName = QCoreApplication::applicationDirPath() + "/appconfig.xml";
xmlNameTemp = xmlName + ".tmp";
fileTemp = new QFile(xmlNameTemp);
Modified: trunk/client/elvys-client/src/autodeleter.cpp
===================================================================
--- trunk/client/elvys-client/src/autodeleter.cpp 2010-02-18 16:25:54 UTC
(rev 1782)
+++ trunk/client/elvys-client/src/autodeleter.cpp 2010-02-18 16:55:15 UTC
(rev 1783)
@@ -4,7 +4,7 @@
*/
AutoDeleter::AutoDeleter() {
- _interval = 600;
+ _interval = 600 * 1000;
_lowThreshold = 70;
_highThreshold = 90;
_baseSize = BASE_SIZE_UNDEF;
@@ -31,7 +31,7 @@
if (timer->isActive()) {
timer->stop();
}
- timer->start(_interval * 1000);
+ timer->start(_interval);
}
}
@@ -149,8 +149,8 @@
@arg seconds interval in seconds
*/
-void AutoDeleter::setInterval(int seconds) {
- _interval = seconds;
+void AutoDeleter::setInterval(int ms) {
+ _interval = ms;
if (_interval == 0) {
timer->stop();
}
Modified: trunk/client/elvys-client/src/autodeleter.h
===================================================================
--- trunk/client/elvys-client/src/autodeleter.h 2010-02-18 16:25:54 UTC (rev
1782)
+++ trunk/client/elvys-client/src/autodeleter.h 2010-02-18 16:55:15 UTC (rev
1783)
@@ -38,7 +38,7 @@
QString directory();
void setExcludeFileList(QStringList & excludeFileList);
QStringList excludeFileList();
- void setInterval(int seconds);
+ void setInterval(int ms);
int interval();
void setLowThreshold(int lowThreshold);
int lowThreshold();
Modified: trunk/client/elvys-client/src/categorymaintainerdoc.cpp
===================================================================
--- trunk/client/elvys-client/src/categorymaintainerdoc.cpp 2010-02-18
16:25:54 UTC (rev 1782)
+++ trunk/client/elvys-client/src/categorymaintainerdoc.cpp 2010-02-18
16:55:15 UTC (rev 1783)
@@ -3,7 +3,7 @@
CategoryMaintainerDoc::CategoryMaintainerDoc() {
offset = -1;
parser = new XMLCatDocParser();
- xmlName = "document.xml";
+ xmlName = QCoreApplication::applicationDirPath() + "/document.xml";
xmlNameTemp = xmlName + ".tmp";
fileTemp = new QFile(xmlNameTemp);
Modified: trunk/client/elvys-client/src/categorymaintainerlayout.cpp
===================================================================
--- trunk/client/elvys-client/src/categorymaintainerlayout.cpp 2010-02-18
16:25:54 UTC (rev 1782)
+++ trunk/client/elvys-client/src/categorymaintainerlayout.cpp 2010-02-18
16:55:15 UTC (rev 1783)
@@ -6,7 +6,7 @@
CategoryMaintainerLayout::CategoryMaintainerLayout() {
offset = -1;
parser = new XMLCatLayoutParser();
- xmlName = "category.xml";
+ xmlName = QCoreApplication::applicationDirPath() + "/category.xml";
xmlNameTemp = xmlName + ".tmp";
fileTemp = new QFile(xmlNameTemp);
Modified: trunk/client/elvys-client/src/categorymanager.cpp
===================================================================
--- trunk/client/elvys-client/src/categorymanager.cpp 2010-02-18 16:25:54 UTC
(rev 1782)
+++ trunk/client/elvys-client/src/categorymanager.cpp 2010-02-18 16:55:15 UTC
(rev 1783)
@@ -13,7 +13,7 @@
connect(catDocMaint, SIGNAL(newCategoryDocuments(int,int)), this,
SLOT(gotNewCategoryDocuments(int,int)));
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
- QString logoFileName = "data/logo.png";
+ QString logoFileName = QCoreApplication::applicationDirPath() +
"/data/logo.png";
tBar = new LogoTabBar(this, logoFileName, "PNG");
tBar->setDocumentMode(true);
tBar->setExpanding(true);
Modified: trunk/client/elvys-client/src/documentmaintainer.cpp
===================================================================
--- trunk/client/elvys-client/src/documentmaintainer.cpp 2010-02-18
16:25:54 UTC (rev 1782)
+++ trunk/client/elvys-client/src/documentmaintainer.cpp 2010-02-18
16:55:15 UTC (rev 1783)
@@ -21,7 +21,7 @@
DocumentMaintainer::DocumentMaintainer(QObject * _panel) {
panel = _panel;
parser = new XMLDocumentParser();
- xmlName = "document.xml";
+ xmlName = QCoreApplication::applicationDirPath() + "/document.xml";
xmlNameTemp = xmlName + ".tmp";
fileTemp = new QFile(xmlNameTemp);
Modified: trunk/client/elvys-client/src/elvys.cpp
===================================================================
--- trunk/client/elvys-client/src/elvys.cpp 2010-02-18 16:25:54 UTC (rev
1782)
+++ trunk/client/elvys-client/src/elvys.cpp 2010-02-18 16:55:15 UTC (rev
1783)
@@ -73,7 +73,7 @@
filecache->maintain();
connect(timer, SIGNAL(timeout()), this, SLOT(checkAvailableSpace()));
- timer->start(600*1000);
+ timer->start(600*1000); //every ten minutes
//modeChanger.start();
QPixmapCache::setCacheLimit(PIXMAP_CACHE_LIMIT);
Modified: trunk/client/elvys-client/src/elvys.h
===================================================================
--- trunk/client/elvys-client/src/elvys.h 2010-02-18 16:25:54 UTC (rev
1782)
+++ trunk/client/elvys-client/src/elvys.h 2010-02-18 16:55:15 UTC (rev
1783)
@@ -35,8 +35,7 @@
CategoryManager * catManager;
ScreenShooter * screenS;
- QVBoxLayout * layout;
- ModeChanger modeChanger;
+ QVBoxLayout * layout;
AutoDeleter * deleter;
FileCacheMaintainer * filecache;
QTimer * timer;
Modified: trunk/client/elvys-client/src/filecachemaintainer.cpp
===================================================================
--- trunk/client/elvys-client/src/filecachemaintainer.cpp 2010-02-18
16:25:54 UTC (rev 1782)
+++ trunk/client/elvys-client/src/filecachemaintainer.cpp 2010-02-18
16:55:15 UTC (rev 1783)
@@ -5,7 +5,7 @@
FileCacheMaintainer::FileCacheMaintainer() {
parser = new XMLFileCacheParser();
- xmlName = "filecache.xml";
+ xmlName = QCoreApplication::applicationDirPath() + "/filecache.xml";
xmlNameTemp = xmlName + ".tmp";
fileTemp = new QFile(xmlNameTemp);
fileTemp->remove();
Modified: trunk/client/elvys-client/src/main.cpp
===================================================================
--- trunk/client/elvys-client/src/main.cpp 2010-02-18 16:25:54 UTC (rev
1782)
+++ trunk/client/elvys-client/src/main.cpp 2010-02-18 16:55:15 UTC (rev
1783)
@@ -47,18 +47,17 @@
}
-int main(int argc, char *argv[]) {
- //Q_INIT_RESOURCE(application);
+int main(int argc, char *argv[]) {
QApplication::setStyle(new QPlastiqueStyle);
QApplication app(argc, argv);
- QString appname = QString("elvys-client") + ELVYS_VERSION;
+ QString appname = QString("elvys-client") + ELVYS_VERSION;
QCoreApplication::setApplicationName(appname);
qInstallMsgHandler( myMessageOutput );
- Elvys elvys;
+ Elvys elvys;
QString style;
- QString fileName = "data/style.css";
+ QString fileName = QCoreApplication::applicationDirPath() +
"/data/style.css";
QFile file(fileName);
//qDebug() << "Starting...";
Modified: trunk/client/elvys-client/src/pdfpresentationdocument.h
===================================================================
--- trunk/client/elvys-client/src/pdfpresentationdocument.h 2010-02-18
16:25:54 UTC (rev 1782)
+++ trunk/client/elvys-client/src/pdfpresentationdocument.h 2010-02-18
16:55:15 UTC (rev 1783)
@@ -37,7 +37,7 @@
virtual bool isZoomed();
virtual void setZoomable(bool _zoomable);
virtual QString getFileName();
- void setPeriod(int period);
+ void setPeriod(int ms);
int period();
protected:
Modified: trunk/client/elvys-client/src/pdfpresentationviewer.cpp
===================================================================
--- trunk/client/elvys-client/src/pdfpresentationviewer.cpp 2010-02-18
16:25:54 UTC (rev 1782)
+++ trunk/client/elvys-client/src/pdfpresentationviewer.cpp 2010-02-18
16:55:15 UTC (rev 1783)
@@ -12,7 +12,7 @@
PDFPresentationViewer::PDFPresentationViewer(QWidget * parent, const QRect &
rect) : PDFCommonViewer(parent, rect) {
_autoRotating = true;
currentPage = 0;
- _period = 10;
+ _period = 10000;
inPageTransition = false;
@@ -155,8 +155,8 @@
*/
void PDFPresentationViewer::nextPageTimer() {
- if ( nextTimer.interval() != _period * 1000) {
- nextTimer.setInterval(_period * 1000);
+ if ( nextTimer.interval() != _period) {
+ nextTimer.setInterval(_period);
}
if ( currentPage == pages.size() -1 && pageChanges.size() == 0 ) { //
we reached end of the document already and no movements are queued
@@ -581,8 +581,8 @@
@param period period to be set
*/
-void PDFPresentationViewer::setPeriod(int period) {
- _period = period;
+void PDFPresentationViewer::setPeriod(int ms) {
+ _period = ms;
}
int PDFPresentationViewer::period() {
Modified: trunk/client/elvys-client/src/pdfpresentationviewer.h
===================================================================
--- trunk/client/elvys-client/src/pdfpresentationviewer.h 2010-02-18
16:25:54 UTC (rev 1782)
+++ trunk/client/elvys-client/src/pdfpresentationviewer.h 2010-02-18
16:55:15 UTC (rev 1783)
@@ -34,7 +34,7 @@
public:
PDFPresentationViewer(QWidget * parent, const QRect & rect);
virtual ~PDFPresentationViewer();
- void setPeriod(int period);
+ void setPeriod(int ms);
int period();
void setAutoRotating(bool enabled);
bool autoRotating();
Other related posts:
- » [elvystrac] r1783 - - all periods are now defined in ms - elvys
