The big rename. Which was not so big after all ...

diff --git a/ChangeLog b/ChangeLog
index cf3adc472f12525f599e2638b2582c57595f9103..39c7cb2699fd744fd69a30762714750e60983569 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,50 @@
+2011-06-23  gregoa
+
+       * data/26x26, data/40x40, data/48x48, data/64x64, data/Makefile,
+         data/confclerk.desktop, data/maemo: De-maemofy: make .desktop
+         file generic, remove resized (old) icons and Makefile for
+         installing them.
+       * src/app/app.pro: Add new resource file to app.pro
+       * data/data.qrc, src/app/main.cpp, src/gui/about.ui,
+         src/gui/alarmdialog.ui, src/gui/conferenceeditor.ui,
+         src/icons.qrc, src/icons/brain-alone.png, src/icons/fosdem.png:
+         Icons, part 2: replace fosdem/brain icons with ConfClerk logo
+       * README, TODO, src/gui/conferenceeditor.ui,
+         src/gui/eventdialog.cpp, src/gui/eventdialog.ui, src/icons.qrc,
+         src/icons/add.png, src/icons/alarm-offBig.png,
+         src/icons/alarm-onBig.png, src/icons/applications-internet.png,
+         src/icons/appointment-soon-off.png,
+         src/icons/appointment-soon.png, src/icons/compassBig.png,
+         src/icons/dialog-warning.png, src/icons/emblem-new-off.png,
+         src/icons/emblem-new.png, src/icons/exclamation.png,
+         src/icons/favourite-offBig.png, src/icons/favourite-onBig.png,
+         src/icons/reload.png, src/icons/remove.png, src/icons/search.png,
+         src/mvc/delegate.cpp: Icons part 1: replace all icons (except the
+         FOSDEM ones) with icons from current gnome-icon-theme
+       * src/gui/mainwindow.ui, src/icons.qrc, src/icons/collapse.png,
+         src/icons/expand.png, src/icons/info.png, src/icons/settings.png:
+         Remove unused icons.
+       * src/gui/alarmdialog.cpp: Another instance of the databasename.
+         (NOTE: untested, this codepath is only used on maemo)
+       * TODO, src/app/appsettings.cpp, src/app/main.cpp,
+         src/sql/sqlengine.cpp: Move config and sqlite database. They are
+         both at the xdg-specified locations now:
+         ~/.local/share/data/Toastfreeware/ConfClerk/ConfClerk.sqlite
+         ~/.config/Toastfreeware/ConfClerk.conf
+       * src/alarm/alarm.cpp, src/app/alarmdbus.h,
+         src/app/alarmdbusadaptorp.h, src/app/main.cpp: Rename DBus
+         service. Hopefully successful.
+       * TODO: Add some conference URLs to TODO
+       * BUGS: New bug noted.
+       * BUGS: New bug noted.
+       * src/app/app.pro, src/gui/gui.pro, src/mvc/mvc.pro: qmake warning:
+         POST_TARGETDEPS instead of TARGETDEPS
+       * fosdem-schedule.pro: Remove libs in clean target.
+       * ChangeLog, README, TODO, data/confclerk.svg,
+         data/fosdem-schedule.svg, fosdem-schedule.pro,
+         src/icons/appicon.svg: Move and rename logo, create a target to
+         convert it in .pro, add copyright/license to README. Update TODO.
+
 2011-06-23  philipp
 
        * BUGS: Checked the remaining code. Didn't find possibilities for

diff --git a/TODO b/TODO
index f2eeafe9bc91fb7a208a47963c874cbb724381ff..2bd26cb7b6d02b7f0b4957bb0d18285bf24de2cf 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,24 +1,11 @@
 fosdem-schedule -> confclerk transition:
 - src/gui/about.ui
-- rename *.pro, s/fosdem-schedule/confclerk/ in various places
-- .sqlite file location, config location
-- svn rm data/fosdem-schedule.svg
 
 FOSDEM specifics:
-- data/NxM (fosdem logo)
-  + use confclerk logo in application and for .desktop
 - src/maps
-- src/icons/brain-alone.png,fosdem.png
-- fosdem.sql/schedule.xml
-
-maemo:
-- data/maemo/*.desktop - add generic .desktop file
-- ./data/Makefile
--  convert in .pro (or leave that for the packaging)
-   installation is 'broken' anyway since the removal of "SUBDIRS += data"
+- schedule.xml
 
 other:
-- copyright for icons / replace icons (gnome-icon-theme etc.)
 - add contact info
 - .pro: maybe play with install target
 - manpage
@@ -31,3 +18,4 @@ schedules:
 - FOSDEM (2011): http://fosdem.org/schedule/xml
 - DebConf (2010): http://penta.debconf.org/dc10_schedule/schedule.en.xml
 - 27C3: http://events.ccc.de/congress/2010/Fahrplan/schedule.en.xml
+

diff --git a/confclerk.pro b/confclerk.pro
new file mode 100644 (file)
index 0000000..5415144
--- /dev/null
+++ b/confclerk.pro
@@ -0,0 +1,36 @@
+# confclerk.pro
+
+QMAKEVERSION = $$[QMAKE_VERSION]
+ISQT4 = $$find(QMAKEVERSION, ^[2-9])
+isEmpty( ISQT4 ) {
+error("Use the qmake include with Qt4.4 or greater, on Debian that is
+qmake-qt4");
+}
+
+TEMPLATE = subdirs
+SUBDIRS = src
+
+VERSION = 0.5.0
+
+QMAKE_CLEAN += src/bin/*.a
+QMAKE_EXTRA_TARGETS += tarball icon changelog release
+
+changelog.target = ChangeLog
+changelog.commands = \
+       svn up && svn2cl --group-by-day --reparagraph
+changelog.CONFIG = phony
+
+icon.target = data/$${TARGET}.png
+icon.commands = convert data/$${TARGET}.svg data/$${TARGET}.png
+icon.depends = data/$${TARGET}.svg
+
+release.depends = tarball
+
+tarball.target = $${TARGET}-$${VERSION}.tar.gz
+tarball.commands = \
+       $(DEL_FILE) -r $${TARGET}-$${VERSION} ; \
+       $(MKDIR) $${TARGET}-$${VERSION} ; \
+       $(COPY_DIR) --parents * $${TARGET}-$${VERSION}/ ; \
+       tar -cz --exclude=.svn -f $$tarball.target $${TARGET}-$${VERSION} ; \
+       $(DEL_FILE) -r $${TARGET}-$${VERSION}
+tarball.depends = changelog icon

diff --git a/data/fosdem-schedule.svg b/data/fosdem-schedule.svg
deleted file mode 120000 (symlink)
index 11bdde3..0000000
--- a/data/fosdem-schedule.svg
+++ /dev/null
@@ -1 +0,0 @@
-confclerk.svg
\ No newline at end of file

diff --git a/fosdem-schedule.pro b/fosdem-schedule.pro
deleted file mode 100644 (file)
index ca934a2..0000000
--- a/fosdem-schedule.pro
+++ /dev/null
@@ -1,36 +0,0 @@
-# fosdem-schedule.pro
-
-QMAKEVERSION = $$[QMAKE_VERSION]
-ISQT4 = $$find(QMAKEVERSION, ^[2-9])
-isEmpty( ISQT4 ) {
-error("Use the qmake include with Qt4.4 or greater, on Debian that is
-qmake-qt4");
-}
-
-TEMPLATE = subdirs
-SUBDIRS = src
-
-VERSION = 0.5.0
-
-QMAKE_CLEAN += src/bin/*.a
-QMAKE_EXTRA_TARGETS += tarball icon changelog release
-
-changelog.target = ChangeLog
-changelog.commands = \
-       svn up && svn2cl --group-by-day --reparagraph
-changelog.CONFIG = phony
-
-icon.target = data/$${TARGET}.png
-icon.commands = convert data/$${TARGET}.svg data/$${TARGET}.png
-icon.depends = data/$${TARGET}.svg
-
-release.depends = tarball
-
-tarball.target = $${TARGET}-$${VERSION}.tar.gz
-tarball.commands = \
-       $(DEL_FILE) -r $${TARGET}-$${VERSION} ; \
-       $(MKDIR) $${TARGET}-$${VERSION} ; \
-       $(COPY_DIR) --parents * $${TARGET}-$${VERSION}/ ; \
-       tar -cz --exclude=.svn -f $$tarball.target $${TARGET}-$${VERSION} ; \
-       $(DEL_FILE) -r $${TARGET}-$${VERSION}
-tarball.depends = changelog icon

diff --git a/src/app/app.pro b/src/app/app.pro
index 61a31938dc363c8737673057f101023507332f11..db27fce1f9d107029e8d1649635cac587fab69e2 100644 (file)
--- a/src/app/app.pro
+++ b/src/app/app.pro
@@ -1,8 +1,8 @@
 include(../global.pri)
 TEMPLATE = app
-TARGET = fosdem-schedule
+TARGET = confclerk
 DESTDIR = ../bin
-QT += sql xml network 
+QT += sql xml network
 CONFIG(maemo5) {
     QT += maemo5 dbus
 }