From: Willem Liu Date: Fri, 29 Apr 2011 19:48:08 +0000 (+0200) Subject: Added sync functionality with website. http://www.willemliu.nl/qt/maemo/easylist... X-Git-Tag: easylist-0.3.24~3 X-Git-Url: http://vcs.maemo.org/git/?p=easylist;a=commitdiff_plain;h=fce0a4ef7d2ce4f362f314799652514fbec56180 Added sync functionality with website. willemliu.nl/qt/maemo/easylist/getList.php --- diff --git a/Makefile b/Makefile index d71e6b7..2e0312d 100755 --- a/Makefile +++ b/Makefile @@ -1,147 +1,495 @@ ############################################################################# # Makefile for building: easylist -# Generated by qmake (2.01a) (Qt 4.7.2) on: wo 27. apr 17:28:19 2011 +# Generated by qmake (2.01a) (Qt 4.7.0) on: vr 29. apr 21:46:48 2011 # Project: easylist.pro # Template: app -# Command: c:\qtsdk\desktop\qt\4.7.2\mingw\bin\qmake.exe -spec ..\..\..\QtSDK\Desktop\Qt\4.7.2\mingw\mkspecs\win32-g++ CONFIG+=release QMLJSDEBUGGER_PATH=C:/QtSDK/QtCreator/share/qtcreator/qml/qmljsdebugger -o Makefile easylist.pro +# Command: c:/qtsdk/maemo/4.6.2/targets/fremantle-pr13/bin/qmake.exe -spec ../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/default -unix QMLJSDEBUGGER_PATH=C:/QtSDK/QtCreator/share/qtcreator/qml/qmljsdebugger -o Makefile easylist.pro ############################################################################# -first: release -install: release-install -uninstall: release-uninstall -MAKEFILE = Makefile -QMAKE = c:\qtsdk\desktop\qt\4.7.2\mingw\bin\qmake.exe -DEL_FILE = del -CHK_DIR_EXISTS= if not exist -MKDIR = mkdir -COPY = copy /y +####### Compiler, tools and options + +CC = gcc +CXX = g++ +DEFINES = -DQT_GL_NO_SCISSOR_TEST -DQT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH=1024 -DDATADIR=\"/usr/share\" -DPKGDATADIR=\"\" -DQT_NO_DEBUG -DQT_MAEMO5_LIB -DQT_DBUS_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED +CFLAGS = -pipe -O3 -fno-omit-frame-pointer -fno-optimize-sibling-calls -Wall -W -D_REENTRANT $(DEFINES) +CXXFLAGS = -pipe -O3 -fno-omit-frame-pointer -fno-optimize-sibling-calls -Wall -W -D_REENTRANT $(DEFINES) +INCPATH = -I../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/default -I. -I../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/include/QtCore -I../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/include/QtNetwork -I../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/include/QtGui -I../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/include/QtDBus -I../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/include/QtMaemo5 -I../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/include -I. -I/usr/include -I. -I. +LINK = g++ +LFLAGS = -Wl,-rpath-link,/usr/lib -Wl,-O1 -Wl,--hash-style=gnu -Wl,-rpath,C:/usr/lib +LIBS = $(SUBLIBS) -LC:/QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/lib -L/usr/lib -lQtMaemo5 -L/usr/X11R6/lib -lQtGui -lQtNetwork -lQtDBus -lQtXml -lQtCore -lpthread +AR = ar cqs +RANLIB = +QMAKE = c:/qtsdk/maemo/4.6.2/targets/fremantle-pr13/bin/qmake.exe +TAR = tar -cf +COMPRESS = gzip -9f +COPY = cp -f +SED = sed COPY_FILE = $(COPY) -COPY_DIR = xcopy /s /q /y /i -INSTALL_FILE = $(COPY_FILE) -INSTALL_PROGRAM = $(COPY_FILE) +COPY_DIR = $(COPY) -r +STRIP = strip +INSTALL_FILE = install -m 644 -p INSTALL_DIR = $(COPY_DIR) -DEL_FILE = del -SYMLINK = +INSTALL_PROGRAM = install -m 755 -p +DEL_FILE = rm -f +SYMLINK = ln -f -s DEL_DIR = rmdir -MOVE = move -CHK_DIR_EXISTS= if not exist -MKDIR = mkdir -SUBTARGETS = \ - release \ - debug - -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 -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 - -Makefile: easylist.pro ../../../QtSDK/Desktop/Qt/4.7.2/mingw/mkspecs/win32-g++/qmake.conf ../../../QtSDK/Desktop/Qt/4.7.2/mingw/mkspecs/qconfig.pri \ - ../../../QtSDK/Desktop/Qt/4.7.2/mingw/mkspecs/modules/qt_webkit_version.pri \ - ../../../QtSDK/Desktop/Qt/4.7.2/mingw/mkspecs/features/qt_functions.prf \ - ../../../QtSDK/Desktop/Qt/4.7.2/mingw/mkspecs/features/qt_config.prf \ - ../../../QtSDK/Desktop/Qt/4.7.2/mingw/mkspecs/features/exclusive_builds.prf \ - ../../../QtSDK/Desktop/Qt/4.7.2/mingw/mkspecs/features/default_pre.prf \ - ../../../QtSDK/Desktop/Qt/4.7.2/mingw/mkspecs/features/win32/default_pre.prf \ - ../../../QtSDK/Desktop/Qt/4.7.2/mingw/mkspecs/features/release.prf \ - ../../../QtSDK/Desktop/Qt/4.7.2/mingw/mkspecs/features/debug_and_release.prf \ - ../../../QtSDK/Desktop/Qt/4.7.2/mingw/mkspecs/features/default_post.prf \ - ../../../QtSDK/Desktop/Qt/4.7.2/mingw/mkspecs/features/win32/default_post.prf \ - ../../../QtSDK/Desktop/Qt/4.7.2/mingw/mkspecs/features/win32/rtti.prf \ - ../../../QtSDK/Desktop/Qt/4.7.2/mingw/mkspecs/features/win32/exceptions.prf \ - ../../../QtSDK/Desktop/Qt/4.7.2/mingw/mkspecs/features/win32/stl.prf \ - ../../../QtSDK/Desktop/Qt/4.7.2/mingw/mkspecs/features/shared.prf \ - ../../../QtSDK/Desktop/Qt/4.7.2/mingw/mkspecs/features/warn_on.prf \ - ../../../QtSDK/Desktop/Qt/4.7.2/mingw/mkspecs/features/qt.prf \ - ../../../QtSDK/Desktop/Qt/4.7.2/mingw/mkspecs/features/win32/thread.prf \ - ../../../QtSDK/Desktop/Qt/4.7.2/mingw/mkspecs/features/moc.prf \ - ../../../QtSDK/Desktop/Qt/4.7.2/mingw/mkspecs/features/win32/windows.prf \ - ../../../QtSDK/Desktop/Qt/4.7.2/mingw/mkspecs/features/resources.prf \ - ../../../QtSDK/Desktop/Qt/4.7.2/mingw/mkspecs/features/uic.prf \ - ../../../QtSDK/Desktop/Qt/4.7.2/mingw/mkspecs/features/yacc.prf \ - ../../../QtSDK/Desktop/Qt/4.7.2/mingw/mkspecs/features/lex.prf \ - ../../../QtSDK/Desktop/Qt/4.7.2/mingw/mkspecs/features/include_source_dir.prf \ - c:/QtSDK/Desktop/Qt/4.7.2/mingw/lib/qtmain.prl - $(QMAKE) -spec ..\..\..\QtSDK\Desktop\Qt\4.7.2\mingw\mkspecs\win32-g++ CONFIG+=release QMLJSDEBUGGER_PATH=C:/QtSDK/QtCreator/share/qtcreator/qml/qmljsdebugger -o Makefile easylist.pro -..\..\..\QtSDK\Desktop\Qt\4.7.2\mingw\mkspecs\qconfig.pri: -..\..\..\QtSDK\Desktop\Qt\4.7.2\mingw\mkspecs\modules\qt_webkit_version.pri: -..\..\..\QtSDK\Desktop\Qt\4.7.2\mingw\mkspecs\features\qt_functions.prf: -..\..\..\QtSDK\Desktop\Qt\4.7.2\mingw\mkspecs\features\qt_config.prf: -..\..\..\QtSDK\Desktop\Qt\4.7.2\mingw\mkspecs\features\exclusive_builds.prf: -..\..\..\QtSDK\Desktop\Qt\4.7.2\mingw\mkspecs\features\default_pre.prf: -..\..\..\QtSDK\Desktop\Qt\4.7.2\mingw\mkspecs\features\win32\default_pre.prf: -..\..\..\QtSDK\Desktop\Qt\4.7.2\mingw\mkspecs\features\release.prf: -..\..\..\QtSDK\Desktop\Qt\4.7.2\mingw\mkspecs\features\debug_and_release.prf: -..\..\..\QtSDK\Desktop\Qt\4.7.2\mingw\mkspecs\features\default_post.prf: -..\..\..\QtSDK\Desktop\Qt\4.7.2\mingw\mkspecs\features\win32\default_post.prf: -..\..\..\QtSDK\Desktop\Qt\4.7.2\mingw\mkspecs\features\win32\rtti.prf: -..\..\..\QtSDK\Desktop\Qt\4.7.2\mingw\mkspecs\features\win32\exceptions.prf: -..\..\..\QtSDK\Desktop\Qt\4.7.2\mingw\mkspecs\features\win32\stl.prf: -..\..\..\QtSDK\Desktop\Qt\4.7.2\mingw\mkspecs\features\shared.prf: -..\..\..\QtSDK\Desktop\Qt\4.7.2\mingw\mkspecs\features\warn_on.prf: -..\..\..\QtSDK\Desktop\Qt\4.7.2\mingw\mkspecs\features\qt.prf: -..\..\..\QtSDK\Desktop\Qt\4.7.2\mingw\mkspecs\features\win32\thread.prf: -..\..\..\QtSDK\Desktop\Qt\4.7.2\mingw\mkspecs\features\moc.prf: -..\..\..\QtSDK\Desktop\Qt\4.7.2\mingw\mkspecs\features\win32\windows.prf: -..\..\..\QtSDK\Desktop\Qt\4.7.2\mingw\mkspecs\features\resources.prf: -..\..\..\QtSDK\Desktop\Qt\4.7.2\mingw\mkspecs\features\uic.prf: -..\..\..\QtSDK\Desktop\Qt\4.7.2\mingw\mkspecs\features\yacc.prf: -..\..\..\QtSDK\Desktop\Qt\4.7.2\mingw\mkspecs\features\lex.prf: -..\..\..\QtSDK\Desktop\Qt\4.7.2\mingw\mkspecs\features\include_source_dir.prf: -c:\QtSDK\Desktop\Qt\4.7.2\mingw\lib\qtmain.prl: -qmake: qmake_all FORCE - @$(QMAKE) -spec ..\..\..\QtSDK\Desktop\Qt\4.7.2\mingw\mkspecs\win32-g++ CONFIG+=release QMLJSDEBUGGER_PATH=C:/QtSDK/QtCreator/share/qtcreator/qml/qmljsdebugger -o Makefile easylist.pro - -qmake_all: FORCE - -make_default: release-make_default debug-make_default FORCE -make_first: release-make_first debug-make_first FORCE -all: release-all debug-all FORCE -clean: release-clean debug-clean FORCE -distclean: release-distclean debug-distclean FORCE +MOVE = mv -f +CHK_DIR_EXISTS= test -d +MKDIR = mkdir -p + +####### Output directory + +OBJECTS_DIR = ./ + +####### Files + +SOURCES = main.cpp \ + mycheckbox.cpp \ + mainform.cpp \ + mycheckboxcontainer.cpp \ + systemsettings.cpp \ + listform.cpp \ + editform.cpp \ + slidewidget.cpp \ + chooselistform.cpp \ + requestwebpage.cpp \ + settingsform.cpp moc_mycheckbox.cpp \ + moc_mainform.cpp \ + moc_mycheckboxcontainer.cpp \ + moc_systemsettings.cpp \ + moc_listform.cpp \ + moc_editform.cpp \ + moc_slidewidget.cpp \ + moc_chooselistform.cpp \ + moc_requestwebpage.cpp \ + moc_settingsform.cpp +OBJECTS = main.o \ + mycheckbox.o \ + mainform.o \ + mycheckboxcontainer.o \ + systemsettings.o \ + listform.o \ + editform.o \ + slidewidget.o \ + chooselistform.o \ + requestwebpage.o \ + settingsform.o \ + moc_mycheckbox.o \ + moc_mainform.o \ + moc_mycheckboxcontainer.o \ + moc_systemsettings.o \ + moc_listform.o \ + moc_editform.o \ + moc_slidewidget.o \ + moc_chooselistform.o \ + moc_requestwebpage.o \ + moc_settingsform.o +DIST = ../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/common/unix.conf \ + ../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/common/linux.conf \ + ../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/qconfig.pri \ + ../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/qt_functions.prf \ + ../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/qt_config.prf \ + ../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/exclusive_builds.prf \ + ../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/default_pre.prf \ + ../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/release.prf \ + ../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/default_post.prf \ + ../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/mobility.prf \ + ../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/warn_on.prf \ + ../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/qt.prf \ + ../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/moc.prf \ + ../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/dbusinterfaces.prf \ + ../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/dbusadaptors.prf \ + ../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/unix/thread.prf \ + ../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/resources.prf \ + ../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/uic.prf \ + ../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/yacc.prf \ + ../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/lex.prf \ + ../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/include_source_dir.prf \ + easylist.pro +QMAKE_TARGET = easylist +DESTDIR = +TARGET = easylist + +first: all +####### Implicit rules + +.SUFFIXES: .o .c .cpp .cc .cxx + +.cpp.o: + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" + +.cc.o: + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" + +.cxx.o: + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" + +.c.o: + $(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<" + +####### Build rules + +all: Makefile $(TARGET) + +$(TARGET): ui_mainform.h ui_listform.h ui_editform.h ui_chooselistform.h ui_settingsform.h $(OBJECTS) + $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) + +Makefile: easylist.pro ../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/default/qmake.conf ../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/common/unix.conf \ + ../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/common/linux.conf \ + ../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/qconfig.pri \ + ../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/qt_functions.prf \ + ../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/qt_config.prf \ + ../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/exclusive_builds.prf \ + ../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/default_pre.prf \ + ../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/release.prf \ + ../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/default_post.prf \ + ../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/mobility.prf \ + ../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/warn_on.prf \ + ../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/qt.prf \ + ../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/moc.prf \ + ../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/dbusinterfaces.prf \ + ../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/dbusadaptors.prf \ + ../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/unix/thread.prf \ + ../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/resources.prf \ + ../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/uic.prf \ + ../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/yacc.prf \ + ../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/lex.prf \ + ../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/include_source_dir.prf \ + c:/QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/lib/libQtMaemo5.prl \ + c:/QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/lib/libQtGui.prl \ + c:/QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/lib/libQtDBus.prl \ + c:/QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/lib/libQtXml.prl \ + c:/QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/lib/libQtCore.prl \ + c:/QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/lib/libQtNetwork.prl + $(QMAKE) -spec ../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/default -unix QMLJSDEBUGGER_PATH=C:/QtSDK/QtCreator/share/qtcreator/qml/qmljsdebugger -o Makefile easylist.pro +../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/common/unix.conf: +../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/common/linux.conf: +../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/qconfig.pri: +../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/qt_functions.prf: +../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/qt_config.prf: +../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/exclusive_builds.prf: +../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/default_pre.prf: +../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/release.prf: +../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/default_post.prf: +../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/mobility.prf: +../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/warn_on.prf: +../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/qt.prf: +../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/moc.prf: +../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/dbusinterfaces.prf: +../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/dbusadaptors.prf: +../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/unix/thread.prf: +../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/resources.prf: +../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/uic.prf: +../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/yacc.prf: +../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/lex.prf: +../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/include_source_dir.prf: +c:/QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/lib/libQtMaemo5.prl: +c:/QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/lib/libQtGui.prl: +c:/QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/lib/libQtDBus.prl: +c:/QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/lib/libQtXml.prl: +c:/QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/lib/libQtCore.prl: +c:/QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/lib/libQtNetwork.prl: +qmake: FORCE + @$(QMAKE) -spec ../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/default -unix QMLJSDEBUGGER_PATH=C:/QtSDK/QtCreator/share/qtcreator/qml/qmljsdebugger -o Makefile easylist.pro + +dist: + @$(CHK_DIR_EXISTS) .tmp/easylist1.0.0 || $(MKDIR) .tmp/easylist1.0.0 + $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/easylist1.0.0/ && $(COPY_FILE) --parents mycheckbox.h mainform.h mycheckboxcontainer.h systemsettings.h listform.h editform.h slidewidget.h chooselistform.h globals.h requestwebpage.h settingsform.h .tmp/easylist1.0.0/ && $(COPY_FILE) --parents main.cpp mycheckbox.cpp mainform.cpp mycheckboxcontainer.cpp systemsettings.cpp listform.cpp editform.cpp slidewidget.cpp chooselistform.cpp requestwebpage.cpp settingsform.cpp .tmp/easylist1.0.0/ && $(COPY_FILE) --parents mainform.ui listform.ui editform.ui chooselistform.ui settingsform.ui .tmp/easylist1.0.0/ && (cd `dirname .tmp/easylist1.0.0` && $(TAR) easylist1.0.0.tar easylist1.0.0 && $(COMPRESS) easylist1.0.0.tar) && $(MOVE) `dirname .tmp/easylist1.0.0`/easylist1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/easylist1.0.0 + + +clean:compiler_clean + -$(DEL_FILE) $(OBJECTS) + -$(DEL_FILE) *~ core *.core + + +####### Sub-libraries + +distclean: clean + -$(DEL_FILE) $(TARGET) -$(DEL_FILE) Makefile + check: first -release-mocclean: $(MAKEFILE).Release - $(MAKE) -f $(MAKEFILE).Release mocclean -debug-mocclean: $(MAKEFILE).Debug - $(MAKE) -f $(MAKEFILE).Debug mocclean -mocclean: release-mocclean debug-mocclean - -release-mocables: $(MAKEFILE).Release - $(MAKE) -f $(MAKEFILE).Release mocables -debug-mocables: $(MAKEFILE).Debug - $(MAKE) -f $(MAKEFILE).Debug mocables -mocables: release-mocables debug-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_mycheckbox.cpp moc_mainform.cpp moc_mycheckboxcontainer.cpp moc_systemsettings.cpp moc_listform.cpp moc_editform.cpp moc_slidewidget.cpp moc_chooselistform.cpp moc_requestwebpage.cpp moc_settingsform.cpp +compiler_moc_header_clean: + -$(DEL_FILE) moc_mycheckbox.cpp moc_mainform.cpp moc_mycheckboxcontainer.cpp moc_systemsettings.cpp moc_listform.cpp moc_editform.cpp moc_slidewidget.cpp moc_chooselistform.cpp moc_requestwebpage.cpp moc_settingsform.cpp +moc_mycheckbox.cpp: mycheckbox.h + C:/QtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/moc.exe $(DEFINES) $(INCPATH) mycheckbox.h -o moc_mycheckbox.cpp + +moc_mainform.cpp: slidewidget.h \ + listform.h \ + mycheckboxcontainer.h \ + mycheckbox.h \ + systemsettings.h \ + globals.h \ + editform.h \ + chooselistform.h \ + settingsform.h \ + requestwebpage.h \ + mainform.h + C:/QtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/moc.exe $(DEFINES) $(INCPATH) mainform.h -o moc_mainform.cpp + +moc_mycheckboxcontainer.cpp: mycheckbox.h \ + mycheckboxcontainer.h + C:/QtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/moc.exe $(DEFINES) $(INCPATH) mycheckboxcontainer.h -o moc_mycheckboxcontainer.cpp + +moc_systemsettings.cpp: globals.h \ + systemsettings.h + C:/QtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/moc.exe $(DEFINES) $(INCPATH) systemsettings.h -o moc_systemsettings.cpp + +moc_listform.cpp: mycheckboxcontainer.h \ + mycheckbox.h \ + systemsettings.h \ + globals.h \ + slidewidget.h \ + listform.h + C:/QtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/moc.exe $(DEFINES) $(INCPATH) listform.h -o moc_listform.cpp + +moc_editform.cpp: mycheckboxcontainer.h \ + mycheckbox.h \ + slidewidget.h \ + systemsettings.h \ + globals.h \ + editform.h + C:/QtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/moc.exe $(DEFINES) $(INCPATH) editform.h -o moc_editform.cpp + +moc_slidewidget.cpp: slidewidget.h + C:/QtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/moc.exe $(DEFINES) $(INCPATH) slidewidget.h -o moc_slidewidget.cpp + +moc_chooselistform.cpp: globals.h \ + slidewidget.h \ + chooselistform.h + C:/QtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/moc.exe $(DEFINES) $(INCPATH) chooselistform.h -o moc_chooselistform.cpp + +moc_requestwebpage.cpp: requestwebpage.h + C:/QtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/moc.exe $(DEFINES) $(INCPATH) requestwebpage.h -o moc_requestwebpage.cpp + +moc_settingsform.cpp: slidewidget.h \ + globals.h \ + settingsform.h + C:/QtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/moc.exe $(DEFINES) $(INCPATH) settingsform.h -o moc_settingsform.cpp + +compiler_dbus_interface_source_make_all: +compiler_dbus_interface_source_clean: +compiler_dbus_adaptor_source_make_all: +compiler_dbus_adaptor_source_clean: +compiler_rcc_make_all: +compiler_rcc_clean: +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_dbus_interface_header_make_all: +compiler_dbus_interface_header_clean: +compiler_dbus_interface_moc_make_all: +compiler_dbus_interface_moc_clean: +compiler_dbus_adaptor_header_make_all: +compiler_dbus_adaptor_header_clean: +compiler_dbus_adaptor_moc_make_all: +compiler_dbus_adaptor_moc_clean: +compiler_uic_make_all: ui_mainform.h ui_listform.h ui_editform.h ui_chooselistform.h ui_settingsform.h +compiler_uic_clean: + -$(DEL_FILE) ui_mainform.h ui_listform.h ui_editform.h ui_chooselistform.h ui_settingsform.h +ui_mainform.h: mainform.ui + c:/QtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/uic.exe mainform.ui -o ui_mainform.h + +ui_listform.h: listform.ui + c:/QtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/uic.exe listform.ui -o ui_listform.h + +ui_editform.h: editform.ui + c:/QtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/uic.exe editform.ui -o ui_editform.h + +ui_chooselistform.h: chooselistform.ui + c:/QtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/uic.exe chooselistform.ui -o ui_chooselistform.h + +ui_settingsform.h: settingsform.ui + c:/QtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/uic.exe settingsform.ui -o ui_settingsform.h + +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_uic_clean + +####### Compile + +main.o: main.cpp mainform.h \ + slidewidget.h \ + listform.h \ + mycheckboxcontainer.h \ + mycheckbox.h \ + systemsettings.h \ + globals.h \ + editform.h \ + chooselistform.h \ + settingsform.h \ + requestwebpage.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp + +mycheckbox.o: mycheckbox.cpp mycheckbox.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o mycheckbox.o mycheckbox.cpp + +mainform.o: mainform.cpp mainform.h \ + slidewidget.h \ + listform.h \ + mycheckboxcontainer.h \ + mycheckbox.h \ + systemsettings.h \ + globals.h \ + editform.h \ + chooselistform.h \ + settingsform.h \ + requestwebpage.h \ + ui_mainform.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o mainform.o mainform.cpp + +mycheckboxcontainer.o: mycheckboxcontainer.cpp mycheckboxcontainer.h \ + mycheckbox.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o mycheckboxcontainer.o mycheckboxcontainer.cpp + +systemsettings.o: systemsettings.cpp systemsettings.h \ + globals.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o systemsettings.o systemsettings.cpp + +listform.o: listform.cpp listform.h \ + mycheckboxcontainer.h \ + mycheckbox.h \ + systemsettings.h \ + globals.h \ + slidewidget.h \ + ui_listform.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o listform.o listform.cpp + +editform.o: editform.cpp editform.h \ + mycheckboxcontainer.h \ + mycheckbox.h \ + slidewidget.h \ + systemsettings.h \ + globals.h \ + ui_editform.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o editform.o editform.cpp + +slidewidget.o: slidewidget.cpp slidewidget.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o slidewidget.o slidewidget.cpp + +chooselistform.o: chooselistform.cpp chooselistform.h \ + globals.h \ + slidewidget.h \ + ui_chooselistform.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o chooselistform.o chooselistform.cpp + +requestwebpage.o: requestwebpage.cpp requestwebpage.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o requestwebpage.o requestwebpage.cpp + +settingsform.o: settingsform.cpp settingsform.h \ + slidewidget.h \ + globals.h \ + ui_settingsform.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o settingsform.o settingsform.cpp + +moc_mycheckbox.o: moc_mycheckbox.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_mycheckbox.o moc_mycheckbox.cpp + +moc_mainform.o: moc_mainform.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_mainform.o moc_mainform.cpp + +moc_mycheckboxcontainer.o: moc_mycheckboxcontainer.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_mycheckboxcontainer.o moc_mycheckboxcontainer.cpp + +moc_systemsettings.o: moc_systemsettings.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_systemsettings.o moc_systemsettings.cpp + +moc_listform.o: moc_listform.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_listform.o moc_listform.cpp + +moc_editform.o: moc_editform.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_editform.o moc_editform.cpp + +moc_slidewidget.o: moc_slidewidget.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_slidewidget.o moc_slidewidget.cpp + +moc_chooselistform.o: moc_chooselistform.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_chooselistform.o moc_chooselistform.cpp + +moc_requestwebpage.o: moc_requestwebpage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_requestwebpage.o moc_requestwebpage.cpp + +moc_settingsform.o: moc_settingsform.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_settingsform.o moc_settingsform.cpp + +####### Install + +install_target: first FORCE + @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/opt/easylist/bin/ || $(MKDIR) $(INSTALL_ROOT)/opt/easylist/bin/ + -$(INSTALL_PROGRAM) "$(QMAKE_TARGET)" "$(INSTALL_ROOT)/opt/easylist/bin/$(QMAKE_TARGET)" + -$(STRIP) "$(INSTALL_ROOT)/opt/easylist/bin/$(QMAKE_TARGET)" + +uninstall_target: FORCE + -$(DEL_FILE) "$(INSTALL_ROOT)/opt/easylist/bin/$(QMAKE_TARGET)" + -$(DEL_DIR) $(INSTALL_ROOT)/opt/easylist/bin/ + + +install_desktop: first FORCE + @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/share/applications/hildon/ || $(MKDIR) $(INSTALL_ROOT)/usr/share/applications/hildon/ + -$(INSTALL_FILE) c:/dev/cpp/easylist-0.3.24/easylist.desktop $(INSTALL_ROOT)/usr/share/applications/hildon/ + + +uninstall_desktop: FORCE + -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/share/applications/hildon/easylist.desktop + -$(DEL_DIR) $(INSTALL_ROOT)/usr/share/applications/hildon/ + + +install_icon26: first FORCE + @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/share/icons/hicolor/26x26/apps/ || $(MKDIR) $(INSTALL_ROOT)/usr/share/icons/hicolor/26x26/apps/ + -$(INSTALL_FILE) c:/dev/cpp/easylist-0.3.24/data/26x26/easylist.png $(INSTALL_ROOT)/usr/share/icons/hicolor/26x26/apps/ + + +uninstall_icon26: FORCE + -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/share/icons/hicolor/26x26/apps/easylist.png + -$(DEL_DIR) $(INSTALL_ROOT)/usr/share/icons/hicolor/26x26/apps/ + + +install_icon40: first FORCE + @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/share/icons/hicolor/40x40/apps/ || $(MKDIR) $(INSTALL_ROOT)/usr/share/icons/hicolor/40x40/apps/ + -$(INSTALL_FILE) c:/dev/cpp/easylist-0.3.24/data/40x40/easylist.png $(INSTALL_ROOT)/usr/share/icons/hicolor/40x40/apps/ + + +uninstall_icon40: FORCE + -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/share/icons/hicolor/40x40/apps/easylist.png + -$(DEL_DIR) $(INSTALL_ROOT)/usr/share/icons/hicolor/40x40/apps/ + + +install_icon48: first FORCE + @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/share/icons/hicolor/48x48/apps/ || $(MKDIR) $(INSTALL_ROOT)/usr/share/icons/hicolor/48x48/apps/ + -$(INSTALL_FILE) c:/dev/cpp/easylist-0.3.24/data/48x48/easylist.png $(INSTALL_ROOT)/usr/share/icons/hicolor/48x48/apps/ + + +uninstall_icon48: FORCE + -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/share/icons/hicolor/48x48/apps/easylist.png + -$(DEL_DIR) $(INSTALL_ROOT)/usr/share/icons/hicolor/48x48/apps/ + + +install_icon64: first FORCE + @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/share/icons/hicolor/64x64/apps/ || $(MKDIR) $(INSTALL_ROOT)/usr/share/icons/hicolor/64x64/apps/ + -$(INSTALL_FILE) c:/dev/cpp/easylist-0.3.24/data/64x64/easylist.png $(INSTALL_ROOT)/usr/share/icons/hicolor/64x64/apps/ + + +uninstall_icon64: FORCE + -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/share/icons/hicolor/64x64/apps/easylist.png + -$(DEL_DIR) $(INSTALL_ROOT)/usr/share/icons/hicolor/64x64/apps/ + + +install: install_target install_desktop install_icon26 install_icon40 install_icon48 install_icon64 FORCE + +uninstall: uninstall_target uninstall_desktop uninstall_icon26 uninstall_icon40 uninstall_icon48 uninstall_icon64 FORCE + FORCE: -$(MAKEFILE).Release: Makefile -$(MAKEFILE).Debug: Makefile diff --git a/debian/changelog b/debian/changelog index 035c2e3..a4fba97 100755 --- a/debian/changelog +++ b/debian/changelog @@ -4,88 +4,88 @@ easylist (0.3.24) unstable; urgency=low -- Willem Liu Sat, 26 Mar 2011 11:17:23 +0100 -easylist (0.3.23) unstable; urgency=low +easylist (0.3.24) unstable; urgency=low * Added prompt when clicked Uncheck All. -- Willem Liu Sat, 26 Mar 2011 11:17:23 +0100 -easylist (0.3.22) unstable; urgency=low +easylist (0.3.24) unstable; urgency=low * Now the list is also saved under its list name. -- Willem Liu Sat, 26 Mar 2011 11:17:23 +0100 -easylist (0.3.20) unstable; urgency=low +easylist (0.3.24) unstable; urgency=low * Repackaged to reduce package size. -- Willem Liu Thu, 26 Oct 2010 18:08:00 +0200 -easylist (0.3.19) unstable; urgency=low +easylist (0.3.24) unstable; urgency=low * Repackaged to reduce package size. -- Willem Liu Thu, 26 Oct 2010 18:06:00 +0200 -easylist (0.3.18) unstable; urgency=low +easylist (0.3.24) unstable; urgency=low * Added warning message box when clear checked message is pressed. -- Willem Liu Thu, 26 Oct 2010 17:47:00 +0200 -easylist (0.3.17) unstable; urgency=low +easylist (0.3.24) unstable; urgency=low * Fixed bug when saving to a list template with empty name causes all lists to disappear. -- Willem Liu Thu, 21 Oct 2010 19:19:00 +0200 -easylist (0.3.16) unstable; urgency=low +easylist (0.3.24) unstable; urgency=low * Fixed minor bug. Switching to Lists... view didn't save current list item states. * Added notification when saving list as template. -- Willem Liu Thu, 21 Oct 2010 19:19:00 +0200 -easylist (0.3.15) unstable; urgency=low +easylist (0.3.24) unstable; urgency=low * Support for multiple lists. * Changed order of menu items. -- Willem Liu Thu, 21 Oct 2010 00:05:00 +0200 -easylist (0.3.14) unstable; urgency=low +easylist (0.3.24) unstable; urgency=low * Changed control description. -- Willem Liu Tue, 07 Sep 2010 13:56:12 +0200 -easylist (0.3.13) unstable; urgency=low +easylist (0.3.24) unstable; urgency=low * Changed changelog to include all previous version changes. -- Willem Liu Tue, 07 Sep 2010 13:56:12 +0200 -easylist (0.3.12) unstable; urgency=low +easylist (0.3.24) unstable; urgency=low * Fixed sorting problem. -- Willem Liu Thu, 29 Sep 2010 03:12:00 +0200 -easylist (0.3.11) unstable; urgency=low +easylist (0.3.24) unstable; urgency=low * Fixed Sort A-Z bug. Caused list to disappear when turned on with option "Checked To Bottom" turned off. -- Willem Liu Thu, 29 Sep 2010 03:11:00 +0200 -easylist (0.3.10) unstable; urgency=low +easylist (0.3.24) unstable; urgency=low * Alphabetical sorting now ignores case. * Checked items now have grey text instead of white and are striked through. -- Willem Liu Tue, 28 Sep 2010 17:12:00 +0200 -easylist (0.3.9) unstable; urgency=low +easylist (0.3.24) unstable; urgency=low * Alphabetical sorting now possible. * Label "Checked bottom" changed to "Checked to bottom". @@ -93,7 +93,7 @@ easylist (0.3.9) unstable; urgency=low -- Willem Liu Sun, 26 Sep 2010 17:43:00 +0200 -easylist (0.3.5) unstable; urgency=low +easylist (0.3.24) unstable; urgency=low * Significantly changed the source code. * Divided in multiple classes. @@ -102,37 +102,37 @@ easylist (0.3.5) unstable; urgency=low -- Willem Liu Wed, 22 Sep 2010 22:46:00 +0200 -easylist (0.3.4) unstable; urgency=low +easylist (0.3.24) unstable; urgency=low * Now supports sorting checked items to bottom of the list. -- Willem Liu Thu, 16 Sep 2010 13:43:00 +0200 -easylist (0.3.1) unstable; urgency=low +easylist (0.3.24) unstable; urgency=low * Initial Release. -- Willem Liu Tue, 07 Sep 2010 11:56:00 +0200 -easylist (0.3.0) unstable; urgency=low +easylist (0.3.24) unstable; urgency=low * Changed binary version number. -- Willem Liu Tue, 07 Sep 2010 11:56:00 +0200 -easylist (0.2) unstable; urgency=low +easylist (0.3.24) unstable; urgency=low * Added optify file. -- Willem Liu Tue, 07 Sep 2010 11:56:00 +0200 -easylist (0.1) unstable; urgency=low +easylist (0.3.24) unstable; urgency=low * Initial Release. -- Willem Liu Tue, 07 Sep 2010 11:56:00 +0200 -easylist (0.0.1) unstable; urgency=low +easylist (0.3.24) unstable; urgency=low * Initial Release. diff --git a/debian/rules b/debian/rules index 46d61ec..b262521 100755 --- a/debian/rules +++ b/debian/rules @@ -27,7 +27,7 @@ build-stamp: configure-stamp dh_testdir # Add here commands to compile the package. - qmake + # qmake $(MAKE) #docbook-to-man debian/easylist.sgml > easylist.1 @@ -39,6 +39,7 @@ clean: rm -f build-stamp configure-stamp # Add here commands to clean up after the build process. + $(MAKE) clean dh_clean @@ -82,7 +83,7 @@ binary-arch: build install # dh_perl # dh_makeshlibs dh_installdeb - # dh_shlibdeps # Uncomment this line for publishing! + # dh_shlibdeps dh_gencontrol dh_md5sums dh_builddeb diff --git a/easylist.pro b/easylist.pro index 0a17108..74f5e0a 100755 --- a/easylist.pro +++ b/easylist.pro @@ -6,7 +6,7 @@ # This needs to be removed in order for the binary # to be chmod to 755 in the debian package. -QT += core gui maemo5 +QT += core gui maemo5 network TARGET = easylist TEMPLATE = app DEPENDPATH += . @@ -21,7 +21,9 @@ SOURCES += main.cpp\ listform.cpp \ editform.cpp \ slidewidget.cpp \ - chooselistform.cpp + chooselistform.cpp \ + requestwebpage.cpp \ + settingsform.cpp HEADERS +=\ mycheckbox.h \ @@ -32,13 +34,16 @@ HEADERS +=\ editform.h \ slidewidget.h \ chooselistform.h \ - globals.h + globals.h \ + requestwebpage.h \ + settingsform.h FORMS += \ mainform.ui \ listform.ui \ editform.ui \ - chooselistform.ui + chooselistform.ui \ + settingsform.ui CONFIG += mobility diff --git a/easylist.pro.user b/easylist.pro.user index a2b3fc8..7e7dcb6 100755 --- a/easylist.pro.user +++ b/easylist.pro.user @@ -2,7 +2,7 @@ ProjectExplorer.Project.ActiveTarget - 0 + 2 ProjectExplorer.Project.EditorSettings @@ -206,7 +206,7 @@ -us C:/QtSDK/Maemo/4.6.2/wbin/mad.cmd - true + false $BUILDDIR Custom Process Step @@ -273,7 +273,7 @@ - 2011-04-26T21:01:00 + 2011-04-29T21:34:26 2011-03-26T11:43:07 @@ -285,7 +285,7 @@ -S C:/NokiaQtSDK/Maemo/4.6.2/madbin/mad.cmd - true + false $BUILDDIR Custom Process Step @@ -303,13 +303,13 @@ 1 - src + easylist Qt4ProjectManager.MaemoRunConfiguration 1 - src/src.pro + easylist.pro false @@ -343,7 +343,9 @@ Qt4ProjectManager.MakeStep false - + + -j + 2 diff --git a/globals.h b/globals.h index fa4c1ae..87826d7 100755 --- a/globals.h +++ b/globals.h @@ -13,6 +13,11 @@ #define AUTO_ORIENTATION "AutoOrientation" #define LIST_TEXT "ListText" #define SORT_A_Z "SortAlphabetically" +#define USERNAME "Username" +#define PASSWORD "Password" +#define SYNC_URL "SyncUrl" +#define DEFAULT_SYNC_URL "http://www.willemliu.nl/qt/maemo/easylist/getList.php" +#define SYNC_LIST_NAME "SyncList" static const int BACK = 0; static const int FORWARD = 1; diff --git a/mainform.cpp b/mainform.cpp index 9ce30da..c271bed 100755 --- a/mainform.cpp +++ b/mainform.cpp @@ -8,6 +8,9 @@ MainForm::MainForm(QWidget *parent) : ui->setupUi(this); settings = new QSettings(WILLEM_LIU, EASY_LIST); + requestWebpage = new RequestWebpage(this); + connect(requestWebpage, SIGNAL(finished(QNetworkReply*)), this, SLOT(slotSyncList(QNetworkReply*))); + newIndex = 0; connect(SystemSettings::getInstance(), SIGNAL(signalKeyboardClosed(bool)), this, SLOT(keyboardClosed(bool))); @@ -56,6 +59,7 @@ MainForm::MainForm(QWidget *parent) : listForm = new ListForm(this); editForm = new EditForm(this); chooseListForm = new ChooseListForm(this); + settingsForm = new SettingsForm(this); connect(listForm, SIGNAL(signalTransitionOutFinished()), this, SLOT(stateOutFinished())); connect(listForm, SIGNAL(signalNavigate(int)), this, SLOT(changeWidget(int))); @@ -66,9 +70,13 @@ MainForm::MainForm(QWidget *parent) : connect(chooseListForm, SIGNAL(signalTransitionOutFinished()), this, SLOT(stateOutFinished())); connect(chooseListForm, SIGNAL(signalNavigate(int)), this, SLOT(changeWidget(int))); + connect(settingsForm, SIGNAL(signalTransitionOutFinished()), this, SLOT(stateOutFinished())); + connect(settingsForm, SIGNAL(signalNavigate(int)), this, SLOT(changeWidget(int))); + ui->stackedWidget->addWidget(listForm); ui->stackedWidget->addWidget(editForm); ui->stackedWidget->addWidget(chooseListForm); + ui->stackedWidget->addWidget(settingsForm); ui->stackedWidget->setCurrentWidget(listForm); } @@ -125,7 +133,7 @@ void MainForm::setLandscapeMode(bool landscape) { tempLandscapeMode = true; qDebug() << LANDSCAPE; -#ifdef Q_WS_MAEMO_5 +#if defined(Q_WS_MAEMO_5) || defined(Q_WS_HILDON) setAttribute(Qt::WA_Maemo5AutoOrientation, false); setAttribute(Qt::WA_Maemo5LandscapeOrientation, true); setAttribute(Qt::WA_Maemo5PortraitOrientation, false); @@ -135,7 +143,7 @@ void MainForm::setLandscapeMode(bool landscape) { tempLandscapeMode = false; qDebug() << PORTRAIT; -#ifdef Q_WS_MAEMO_5 +#if defined(Q_WS_MAEMO_5) || defined(Q_WS_HILDON) setAttribute(Qt::WA_Maemo5AutoOrientation, false); setAttribute(Qt::WA_Maemo5PortraitOrientation, true); setAttribute(Qt::WA_Maemo5LandscapeOrientation, false); @@ -213,3 +221,36 @@ void MainForm::on_actionLists_triggered() listForm->saveList(); changeWidget(2); } + +void MainForm::on_actionSync_triggered() +{ + QString username = settings->value(USERNAME, "").toString(); + QString password = settings->value(PASSWORD, "").toString(); + QString url = settings->value(SYNC_URL, DEFAULT_SYNC_URL).toString(); + url.append("?username=" + username); + url.append("&password=" + password); + qDebug() << url; + requestWebpage->fetch(url); +} + +void MainForm::slotSyncList(QNetworkReply* pReply) +{ + QByteArray data=pReply->readAll(); + QString list(data); + settings->setValue(LIST_TEXT, list); + settings->setValue(SELECTED_LIST_NAME, SYNC_LIST_NAME); + settings->setValue(SYNC_LIST_NAME, settings->value(LIST_TEXT, "")); + QStringList listNames = settings->value(LIST_NAMES, "").toStringList(); + if(listNames.contains(SYNC_LIST_NAME) == false) + { + listNames.append(SYNC_LIST_NAME); + } + settings->setValue(LIST_NAMES, QVariant(listNames)); + changeWidget(0); + pReply->deleteLater(); +} + +void MainForm::on_actionSetting_triggered() +{ + changeWidget(3); +} diff --git a/mainform.h b/mainform.h index c54974c..e50188b 100755 --- a/mainform.h +++ b/mainform.h @@ -16,8 +16,10 @@ #include "listform.h" #include "editform.h" #include "chooselistform.h" +#include "settingsform.h" #include "systemsettings.h" #include "mycheckboxcontainer.h" +#include "requestwebpage.h" #include "globals.h" namespace Ui { @@ -48,16 +50,22 @@ private: ListForm * listForm; EditForm * editForm; ChooseListForm * chooseListForm; + SettingsForm * settingsForm; + + RequestWebpage * requestWebpage; protected: void closeEvent(QCloseEvent *event); private slots: + void slotSyncList(QNetworkReply*); void on_actionLists_triggered(); void on_actionSort_A_Z_triggered(); void on_actionAuto_Orientation_triggered(); void on_actionChecked_bottom_triggered(); void on_actionAbout_triggered(); void on_actionRotate_triggered(); + void on_actionSync_triggered(); + void on_actionSetting_triggered(); }; #endif // MAINFORM_H diff --git a/mainform.ui b/mainform.ui index dce1e8c..93b12f4 100755 --- a/mainform.ui +++ b/mainform.ui @@ -75,11 +75,25 @@ + + + Sync + + + + + + Settings + + + + + @@ -121,6 +135,16 @@ Lists... + + + Sync + + + + + Settings + + diff --git a/qtc_packaging/debian_fremantle/rules b/qtc_packaging/debian_fremantle/rules index f837571..b262521 100755 --- a/qtc_packaging/debian_fremantle/rules +++ b/qtc_packaging/debian_fremantle/rules @@ -27,7 +27,7 @@ build-stamp: configure-stamp dh_testdir # Add here commands to compile the package. - qmake + # qmake $(MAKE) #docbook-to-man debian/easylist.sgml > easylist.1 @@ -39,6 +39,7 @@ clean: rm -f build-stamp configure-stamp # Add here commands to clean up after the build process. + $(MAKE) clean dh_clean diff --git a/requestwebpage.cpp b/requestwebpage.cpp new file mode 100755 index 0000000..1460aa7 --- /dev/null +++ b/requestwebpage.cpp @@ -0,0 +1,13 @@ +#include "requestwebpage.h" + +RequestWebpage::RequestWebpage(QObject *parent) : + QObject(parent) +{ + networkManager = new QNetworkAccessManager(this); + connect(networkManager, SIGNAL(finished(QNetworkReply*)), this, SIGNAL(finished(QNetworkReply*))); +} + +void RequestWebpage::fetch(QString url) +{ + networkManager->get(QNetworkRequest(QUrl(url))); +} diff --git a/requestwebpage.h b/requestwebpage.h new file mode 100755 index 0000000..faf3dc1 --- /dev/null +++ b/requestwebpage.h @@ -0,0 +1,26 @@ +#ifndef HTTPREQUEST_H +#define HTTPREQUEST_H + +#include +#include +#include +#include +#include + +class RequestWebpage : public QObject +{ + Q_OBJECT +public: + explicit RequestWebpage(QObject *parent = 0); + void fetch(QString url); + +private: + QNetworkAccessManager* networkManager; + +public slots: + +signals: + void finished(QNetworkReply*); +}; + +#endif // HTTPREQUEST_H diff --git a/settingsform.cpp b/settingsform.cpp new file mode 100755 index 0000000..be7f6c6 --- /dev/null +++ b/settingsform.cpp @@ -0,0 +1,58 @@ +#include "settingsform.h" +#include "ui_settingsform.h" + +SettingsForm::SettingsForm(QWidget *parent) : + SlideWidget(parent), + ui(new Ui::SettingsForm) +{ + ui->setupUi(this); + ui->syncUsernameLineEdit->setInputMethodHints(Qt::ImhNoAutoUppercase); + ui->syncPasswordLineEdit->setInputMethodHints(Qt::ImhNoAutoUppercase); + ui->syncUrlLineEdit->setInputMethodHints(Qt::ImhNoAutoUppercase); + settings = new QSettings(WILLEM_LIU, EASY_LIST); + shown(); +} + +SettingsForm::~SettingsForm() +{ + delete ui; +} + +void SettingsForm::shown() +{ + ui->syncUsernameLineEdit->clear(); + ui->syncPasswordLineEdit->clear(); + ui->syncUrlLineEdit->setText(settings->value(SYNC_URL, DEFAULT_SYNC_URL).toString()); + ui->syncUsernameLineEdit->setFocus(Qt::ActiveWindowFocusReason); +} + +void SettingsForm::on_restoreSyncPushButton_clicked() +{ + ui->syncUrlLineEdit->setText(DEFAULT_SYNC_URL); +} + +void SettingsForm::on_applyPushButton_clicked() +{ + saveSync(); +} + +void SettingsForm::on_savePushButton_clicked() +{ + saveSync(); + emit signalNavigate(0); +} + +void SettingsForm::saveSync() +{ + settings->setValue(USERNAME, ui->syncUsernameLineEdit->text()); + QVariant passString = ui->syncPasswordLineEdit->text(); + QString passMd5 = QCryptographicHash::hash(passString.toByteArray(), QCryptographicHash::Md5).toHex().constData(); + // We save the md5 hash of the password instead of the real password so it won't be retrievable. + settings->setValue(PASSWORD, passMd5); + settings->setValue(SYNC_URL, ui->syncUrlLineEdit->text()); +} + +void SettingsForm::on_cancelPushButton_clicked() +{ + emit signalNavigate(0); +} diff --git a/settingsform.h b/settingsform.h new file mode 100755 index 0000000..00a2290 --- /dev/null +++ b/settingsform.h @@ -0,0 +1,43 @@ +#ifndef SETTINGSFORM_H +#define SETTINGSFORM_H + +#include +#include +#include +#include +#include "slidewidget.h" +#include "globals.h" + +namespace Ui { + class SettingsForm; +} + +class SettingsForm : public SlideWidget +{ + Q_OBJECT + +public: + explicit SettingsForm(QWidget *parent = 0); + ~SettingsForm(); + + virtual void shown(); + +signals: + void signalNavigate(int step); + +private slots: + void on_restoreSyncPushButton_clicked(); + void on_applyPushButton_clicked(); + void on_savePushButton_clicked(); + + void on_cancelPushButton_clicked(); + +private: + Ui::SettingsForm *ui; + + QSettings * settings; + + void saveSync(); +}; + +#endif // SETTINGSFORM_H diff --git a/settingsform.ui b/settingsform.ui new file mode 100755 index 0000000..bc412d8 --- /dev/null +++ b/settingsform.ui @@ -0,0 +1,139 @@ + + + SettingsForm + + + + 0 + 0 + 400 + 300 + + + + Form + + + + 0 + + + 0 + + + + + 0 + + + + Sync + + + + 0 + + + 0 + + + + + 0 + + + + + 0 + + + + + Sync settings: + + + + 0 + + + + + Username: + + + + + + + + + + Password: + + + + + + + + + + Sync url: + + + + + + + http://www.willemliu.nl/qt/maemo/easylist/getList.php + + + + + + + Restore Sync url + + + + + + + + + + + + + + + + + + + + Cancel + + + + + + + Apply + + + + + + + Save + + + + + + + + + +