[svn-upgrade] new version confclerk (0.5.2) upstream/0.5.2
authorgregor herrmann <gregoa@debian.org>
Sat, 23 Jul 2011 09:43:28 +0000 (09:43 -0000)
committergregor herrmann <gregoa@debian.org>
Sat, 23 Jul 2011 09:43:28 +0000 (09:43 -0000)
19 files changed:
ChangeLog
NEWS
TODO
confclerk.pro
data/confclerk.1
data/confclerk.png
data/confclerk.pod
src/alarm/alarm.cpp
src/alarm/alarm.h
src/global.pri
src/gui/conferenceeditor.ui
src/gui/eventdialog.cpp
src/gui/gui.pro
src/mvc/delegate.cpp
src/mvc/mvc.pro
src/mvc/treeview.cpp
src/orm/orm.pro
src/sql/sql.pro
src/sql/sqlengine.cpp

index f60aa829c6434a3d5fee6ce4781af466de7001ed..82fd1567165dd65d27fa60081fdeb2c2070fb424 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,39 @@
+2011-07-23  gregoa
+
+       * NEWS: Prepare NEWS before release of 0.5.2.
+       * src/sql/sqlengine.cpp: Remove conference/room records
+         unconditionally from EVENT_ROOMS
+
+2011-07-22  gregoa
+
+       * src/sql/sqlengine.cpp: SqlEngine::addRoomToDB: remove
+         event/conference combinations from EVENT_ROOM that are already
+         there. Should avoid duplicates on updates where the room name
+         changes. Hopefully fixes ticket #24.
+       * data/confclerk.pod: manpage: s/Desafinado/ConfClerk/
+
+2011-07-19  philipp
+
+       * src/gui/conferenceeditor.ui: Fixed ticket #23: No close button in
+         conference dialog when no confernces are in the list.
+
+2011-07-14  gregoa
+
+       * confclerk.pro: Don't include tarballs in release tarballs ...
+       * src/mvc/delegate.cpp: Distinguish "Presenter" and "Presenters"
+         (instead of "Presenter(s)"). Closes: Ticket #17
+       * src/alarm/alarm.cpp, src/alarm/alarm.h, src/gui/eventdialog.cpp,
+         src/mvc/treeview.cpp: Show event title instead of id in alarms.
+       * confclerk.pro: Don't remove generated files in DISTCLEAN;
+         otherwise they are gone during package builds :/
+       * TODO: Add a TODO item.
+       * confclerk.pro, src/gui/gui.pro, src/mvc/mvc.pro, src/orm/orm.pro,
+         src/sql/sql.pro: Reorganize CLEAN and DISTCLEAN targets.
+       * NEWS, src/global.pri: Bump VERSION after release.
+       * ChangeLog, confclerk.pro: Remove ChangeLog from svn (it's created
+         via svn2cl, so this is circular). Add generated files to
+         distclean target.
+
 2011-07-13  gregoa
 
        * ChangeLog: Update ChangeLog before release.
diff --git a/NEWS b/NEWS
index e77ded6e340a060d124e01b55ef8695e1cdd3d80..b19dcbb1c23631fe0416ede734196ddf7e0ab455 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,13 @@
 This is the NEWS file for ConfClerk. ConfClerk is the successor of
 fosdem-schedule; cf. docs/fosdem-schedule for the historic documentation.
 
+Version 0.5.2, 2011-07-23
+* Show close button in conference dialog also if there are no conferences
+  yet.
+* Show event title instead of id in alarm (maemo).
+* Remove event/room records on import to get rid of "old" room names; this
+  avoids duplicates when room names change.
+
 Version 0.5.1
 * Improve search function: split search string on whitespace.
 * Various small UI changes, e.g.:
diff --git a/TODO b/TODO
index 68496f8ffbc78f896b3615299bfbad09ef81235e..4eed0534b0e2caa8b30dcd730213a1cb4c886dc4 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1 +1,2 @@
 - .pro: maybe add an install target
+- explore src/alarm/calendar*
index 0b88c7623359b7ad2d4b87317b5848f534eb2257..662e5fb953dd8410200569e9ec73d015c838f01c 100644 (file)
@@ -13,7 +13,6 @@ SUBDIRS = src
 include(src/global.pri)
 
 
-QMAKE_DISTCLEAN += src/bin/*.a
 QMAKE_EXTRA_TARGETS += changelog icon man release tarball
 
 changelog.target = ChangeLog
@@ -40,6 +39,6 @@ tarball.commands = \
                $${TARGET}-$${VERSION}/$${TARGET}-$${VERSION}.tar.gz \
                $(DEL_FILE) -r $${TARGET}-$${VERSION}/$${TARGET}-$${VERSION} \
                $${TARGET}-$${VERSION}/Makefile ; \
-       tar -cz --exclude=.svn -f $$tarball.target $${TARGET}-$${VERSION} ; \
+       tar -cz --exclude=.svn --exclude=*.tar.gz -f $$tarball.target $${TARGET}-$${VERSION} ; \
        $(DEL_FILE) -r $${TARGET}-$${VERSION}
-tarball.depends = changelog icon man distclean
+tarball.depends = changelog icon man
index 76887c9d99e7a31e266cb35c50a9ac4d07d5accc..b21d5aac8a67af27eb20d3d29402946576030c68 100644 (file)
@@ -62,7 +62,7 @@
 .\" ========================================================================
 .\"
 .IX Title "CONFCLERK 1"
-.TH CONFCLERK 1 "2011-06-30" "Version 0.5.1" "Offlince conference scheduler"
+.TH CONFCLERK 1 "2011-07-22" "Version 0.5.2" "Offlince conference scheduler"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -100,7 +100,7 @@ The configuration is saved in the default QSettings location, i.e.:
 .IP "Windows" 4
 .IX Item "Windows"
 In the registry (search for the Toastfreeware key, should be at
-\&\fIHKEY_CURRENT_USER\eSoftware\eToastfreeware\eDesafinado\fR).
+\&\fIHKEY_CURRENT_USER\eSoftware\eToastfreeware\eConfClerk\fR).
 .IP "Other \s-1OS\s0" 4
 .IX Item "Other OS"
 Cf. the QSettings documentation at 
index bbdd269e76c4faef28b89ac0af3773ae861950e6..c9a8084542c3132dcf1abdfd0ea6cfe6cd76163a 100644 (file)
Binary files a/data/confclerk.png and b/data/confclerk.png differ
index 9d4c5a0e7c9a640ac40a57593db3979c3b4aba29..664c348661e6b028c51588eb1f48c29e38919bc7 100644 (file)
@@ -42,7 +42,7 @@ F<~/.config/Toastfreeware/ConfClerk.conf>
 =item Windows
 
 In the registry (search for the Toastfreeware key, should be at
-F<HKEY_CURRENT_USER\Software\Toastfreeware\Desafinado>).
+F<HKEY_CURRENT_USER\Software\Toastfreeware\ConfClerk>).
 
 =item Other OS
 
index d5fa7fe27487b9d694c93e9561134214412be877..07c503b2ff9963dc1f640dbe44625dd12f8ddacc 100644 (file)
@@ -29,7 +29,7 @@
 
 //#include <dbus-1.0/dbus/dbus-protocol.h>
 
-int Alarm::addAlarm(int aEventId, const QDateTime &aDateTime)
+int Alarm::addAlarm(int aEventId, QString aEventTitle, const QDateTime &aDateTime)
 {
     cookie_t cookie = 0;
     alarm_event_t *eve = 0;
@@ -40,7 +40,9 @@ int Alarm::addAlarm(int aEventId, const QDateTime &aDateTime)
     alarm_event_set_alarm_appid(eve, APPID);
 
     /* for Deleting purposes */
-    alarm_event_set_message(eve, QString::number(aEventId).toLocal8Bit().data());
+    // ?!
+    //alarm_event_set_message(eve, QString::number(aEventId).toLocal8Bit().data());
+    alarm_event_set_message(eve, aEventTitle.toLocal8Bit().data());
 
     /* Use absolute time triggering */
     //eve->alarm_time = time(0) + 5; // for testing (5 seconds from now)
index 9074c8e860d091cb403827e1619aedf6329850ca..e3cf5ec18cc978115071e33f1066d5d747d4717c 100644 (file)
@@ -36,7 +36,7 @@ class Alarm : public QObject
     public:
         Alarm() {}
         ~Alarm() {}
-        int addAlarm(int aEventId, const QDateTime &aDateTime); 
+        int addAlarm(int aEventId, QString aEventTitle, const QDateTime &aDateTime); 
         void deleteAlarm(int aEventId);
         static bool hasEventAlarm(int aEventId);
     signals:
index baf6391767a8da276b1ca3229f32df0eae36418f..f5af156ee49c641efd23eb1e7b03a7b0232c2371 100644 (file)
@@ -4,7 +4,7 @@
 # USAGE: include(./global.pri)
 
 # VERSION
-VERSION = 0.5.1
+VERSION = 0.5.2
 DEFINES += VERSION=\\\"$$VERSION\\\"
 
 # Define 'MAEMO' specific CONFIG/DEFINE
index 485cb198e21637fe49cd9778b3ede1846e4143df..3c1c602e1b48d8e06985b9a211250639fccf7866 100644 (file)
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>557</width>
-    <height>384</height>
+    <width>596</width>
+    <height>267</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -17,7 +17,7 @@
    <iconset resource="../../data/data.qrc">
     <normaloff>:/confclerk.svg</normaloff>:/confclerk.svg</iconset>
   </property>
-  <layout class="QHBoxLayout" name="horizontalLayout_4" stretch="0,1">
+  <layout class="QHBoxLayout" name="horizontalLayout_4">
    <item>
     <widget class="QWidget" name="widget_2" native="true">
      <layout class="QVBoxLayout" name="verticalLayout_2">
     </widget>
    </item>
    <item>
-    <layout class="QVBoxLayout" name="verticalLayout">
+    <layout class="QVBoxLayout" name="verticalLayout" stretch="0,1,0">
      <item>
       <widget class="QStackedWidget" name="conferenceInfo">
        <property name="currentIndex">
            </item>
           </layout>
          </item>
-         <item>
-          <spacer name="verticalSpacer">
-           <property name="orientation">
-            <enum>Qt::Vertical</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>20</width>
-             <height>40</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-         <item>
-          <widget class="QDialogButtonBox" name="buttonBox">
-           <property name="standardButtons">
-            <set>QDialogButtonBox::Close</set>
-           </property>
-          </widget>
-         </item>
         </layout>
        </widget>
        <widget class="QWidget" name="conferenceInfoEmpty"/>
       </widget>
      </item>
+     <item>
+      <spacer name="verticalSpacer">
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>20</width>
+         <height>40</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QDialogButtonBox" name="buttonBox">
+       <property name="standardButtons">
+        <set>QDialogButtonBox::Close</set>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
   </layout>
  </widget>
  <resources>
-  <include location="../icons.qrc"/>
   <include location="../../data/data.qrc"/>
+  <include location="../icons.qrc"/>
  </resources>
  <connections/>
 </ui>
index b4b590fdf700c8c590d569d9ec175a13d0c9b4e0..6fd700470f040fd3537f769db554d15b9ee46178 100644 (file)
@@ -117,7 +117,7 @@ void EventDialog::alarmClicked()
 #ifdef MAEMO
         // add alarm to the 'alarmd'
         Alarm alarm;
-        int cookie = alarm.addAlarm(event.id(),QDateTime::currentDateTime().addSecs(10));
+        int cookie = alarm.addAlarm(event.id(),event.title(),QDateTime::currentDateTime().addSecs(10));
 #endif /* MAEMO */
     }
     event.update("alarm");
index e9b1dd43d63c862eeeb49bc8a780f7bc0ac56124..b6898f79e8378ac340f87ff541518e8d18f87377 100644 (file)
@@ -6,6 +6,7 @@ CONFIG += static
 QT += sql \
     xml \
     network
+QMAKE_CLEAN += ../bin/libgui.a
 
 # module dependencies
 LIBS += -L$$DESTDIR \
index 1178a4fb562f27cd7e18e141a159ce983cc69e69..51cf9e5570eed1960a0b5338d3a8f0f61e87d080 100644 (file)
@@ -184,7 +184,8 @@ void Delegate::paint(QPainter *painter, const QStyleOptionViewItem &option, cons
         // persons
         titlePointF.setY(titlePointF.y()+fmSmall.height()-fmSmall.descent());
         painter->setFont(fontSmall);
-        painter->drawText(titlePointF,"Presenter(s): " + event->persons().join(" and "));
+        QString presenterPrefix = event->persons().count() < 2 ? "Presenter" : "Presenters";
+        painter->drawText(titlePointF,presenterPrefix + ": " + event->persons().join(" and "));
         // track
         titlePointF.setY(titlePointF.y()+fmSmall.height()-fmSmall.descent());
         painter->drawText(titlePointF,"Track: " + Track::retrieveTrackName(event->trackId()));
index e07d70cefd47fc92186a510340484b6eb20bf123..f0d92d751ca7568e791569edede0ad7ecf2aee9b 100644 (file)
@@ -4,6 +4,7 @@ TARGET = mvc
 DESTDIR = ../bin
 CONFIG += static
 QT += sql 
+QMAKE_CLEAN += ../bin/libmvc.a
 
 # module dependencies
 LIBS += -L$$DESTDIR \
index 151fd8a697915c9f0775d387e5700b47e7feddad..88933514eb886b950a758dbf7a4bd2b9db7e2813 100644 (file)
@@ -115,7 +115,7 @@ bool TreeView::testForControlClicked(const QModelIndex &aIndex, const QPoint &aP
                     // add alarm to the 'alarmd'
                     Alarm alarm;
                     //int cookie = alarm.addAlarm(event.id(),QDateTime::currentDateTime().addSecs(10)); // testing
-                    int cookie = alarm.addAlarm(event.id(),event.start().addSecs(-15*60)); // 15 minutes before real start
+                    int cookie = alarm.addAlarm(event.id(),event.title(),event.start().addSecs(-15*60)); // 15 minutes before real start
 #endif /* MAEMO */
                 }
                 event.update("alarm");
index 91472febd3486d855b8f982441162115496046f0..db132e304a20df40e111d033ae3cb161bd63f532 100644 (file)
@@ -3,6 +3,7 @@ TARGET = orm
 DESTDIR = ../bin
 CONFIG += static
 QT += sql
+QMAKE_CLEAN += ../bin/liborm.a
 
 # module dependencies
 DEPENDPATH += .
index 90b4ab5f2b3adf982254fdcc079e75e77c9d450e..fc3a4038bf0de37fe0a7b05b7772c1796894e566 100644 (file)
@@ -4,6 +4,7 @@ TARGET = sql
 DESTDIR = ../bin
 CONFIG += static
 QT += sql xml
+QMAKE_CLEAN += ../bin/libsql.a
 
 # module dependencies
 LIBS += -L$$DESTDIR -lmvc -lorm
index 2d82f7cea6db657e7d5022b8424fdfcdb172a4ee..9ee08ae7fa6865acef827a3bd8d203d5b97606b0 100644 (file)
@@ -261,6 +261,14 @@ void SqlEngine::addRoomToDB(QHash<QString,QString> &aRoom)
             aRoom["id"]= query.lastInsertId().toString(); // 'id' is assigned automatically
             //LOG_AUTOTEST(query);
         }
+        
+        // remove previous conference/room records; room names might have changed
+        query = QSqlQuery(db);
+        query.prepare("DELETE FROM EVENT_ROOM WHERE xid_conference=:conference_id AND xid_event=:event_id");
+        query.bindValue(":conference_id", aRoom["conference_id"]);
+        query.bindValue(":event_id", aRoom["event_id"]);
+        if (!query.exec()) qDebug() << "Could not execute SELECT * FROM EVENT_ROOM' query:" << query.lastError();
+        // and insert new ones
         query = QSqlQuery(db);
         query.prepare("INSERT INTO EVENT_ROOM (xid_conference,xid_event,xid_room) VALUES (:conference_id, :event_id, :room_id)");
         query.bindValue(":conference_id", aRoom["conference_id"]);