ayatana-commits team mailing list archive
-
ayatana-commits team
-
Mailing list archive
-
Message #00154
[Branch ~agateau/plasma-indicatordisplay/trunk] Rev 75: Ported to libindicate-qt 0.2.1 aka v2 api
------------------------------------------------------------
revno: 75
committer: Aurelien Gateau <aurelien.gateau@xxxxxxxxxxxxx>
branch nick: plasma-indicatordisplay-v2api
timestamp: Fri 2009-09-11 17:10:09 +0200
message:
Ported to libindicate-qt 0.2.1 aka v2 api
modified:
CMakeLists.txt
src/indicatordisplay.cpp
src/listenermodel.cpp
src/listenermodel.h
tests/filtermodeltest.cpp
tests/listenermodeltest.cpp
--
lp:plasma-indicatordisplay
https://code.launchpad.net/~agateau/plasma-indicatordisplay/trunk
Your team ayatana-commits is subscribed to branch lp:plasma-indicatordisplay.
To unsubscribe from this branch go to https://code.launchpad.net/~agateau/plasma-indicatordisplay/trunk/+edit-subscription.
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2009-09-11 10:03:01 +0000
+++ CMakeLists.txt 2009-09-11 15:10:09 +0000
@@ -3,7 +3,7 @@
cmake_minimum_required(VERSION 2.6)
# Packaging
-set(PROJECT_VERSION "0.3.1")
+set(PROJECT_VERSION "0.4.0")
set(ARCHIVE_NAME ${CMAKE_PROJECT_NAME}-${PROJECT_VERSION})
add_custom_target(dist
COMMAND bzr export --root=${ARCHIVE_NAME} ${CMAKE_BINARY_DIR}/${ARCHIVE_NAME}.tar.bz2
@@ -15,7 +15,7 @@
find_package(PkgConfig REQUIRED)
# Find libindicate-qt
-pkg_check_modules(INDICATEQT REQUIRED indicate-qt>=0.2.0)
+pkg_check_modules(INDICATEQT REQUIRED indicate-qt>=0.2.1)
include_directories(
${KDE4_INCLUDES}
=== modified file 'src/indicatordisplay.cpp'
--- src/indicatordisplay.cpp 2009-09-10 13:19:07 +0000
+++ src/indicatordisplay.cpp 2009-09-11 15:10:09 +0000
@@ -102,9 +102,7 @@
void IndicatorDisplay::initFilterModel()
{
mFilterModel = new FilterModel(this);
- mFilterModel->setDisplayStyle("message.im", FilterModel::Detailed);
- mFilterModel->setDisplayStyle("message.instant", FilterModel::Detailed);
- mFilterModel->setDisplayStyle("message.micro", FilterModel::Detailed);
+ mFilterModel->setDisplayStyle("messaging", FilterModel::Detailed);
mFilterModel->setSourceModel(mSourceModel);
}
=== modified file 'src/listenermodel.cpp'
--- src/listenermodel.cpp 2009-09-11 10:03:01 +0000
+++ src/listenermodel.cpp 2009-09-11 15:10:09 +0000
@@ -91,16 +91,14 @@
connect(d->mListener,
SIGNAL(indicatorAdded(QIndicate::Listener::Server*,
- QIndicate::Listener::Indicator*,
- const QString&)),
+ QIndicate::Listener::Indicator*)),
SLOT(slotIndicatorAdded(QIndicate::Listener::Server*,
QIndicate::Listener::Indicator*))
);
connect(d->mListener,
SIGNAL(indicatorRemoved(QIndicate::Listener::Server*,
- QIndicate::Listener::Indicator*,
- const QString&)),
+ QIndicate::Listener::Indicator*)),
SLOT(slotIndicatorRemoved(QIndicate::Listener::Server*,
QIndicate::Listener::Indicator*))
);
@@ -108,11 +106,9 @@
connect(d->mListener,
SIGNAL(indicatorModified(QIndicate::Listener::Server*,
QIndicate::Listener::Indicator*,
- const QString&,
const QString&)),
SLOT(slotIndicatorModified(QIndicate::Listener::Server*,
QIndicate::Listener::Indicator*,
- const QString&,
const QString&))
);
}
@@ -213,7 +209,7 @@
void ListenerModel::slotIndicatorAdded(QIndicate::Listener::Server* server,
QIndicate::Listener::Indicator* indicator)
{
- static QVariant outdatedKeyList = QStringList() << "sender" << "icon" << "time";
+ static QVariant outdatedKeyList = QStringList() << "name" << "icon" << "time";
QStandardItem* serverItem = d->mItemForServer.value(server);
if (!serverItem) {
@@ -233,7 +229,6 @@
void ListenerModel::slotIndicatorModified(QIndicate::Listener::Server* server,
QIndicate::Listener::Indicator* indicator,
- const QString& /*type*/,
const QString& key)
{
QStandardItem* item = d->mItemForIndicator.value(ServerIndicatorPair(server, indicator));
@@ -300,7 +295,7 @@
return;
}
- if (key == "sender") {
+ if (key == "name") {
item->setText(QIndicate::Listener::stringFromValue(value));
} else if (key == "icon") {
QImage image = QIndicate::Listener::imageFromValue(value);
=== modified file 'src/listenermodel.h'
--- src/listenermodel.h 2009-09-11 10:03:01 +0000
+++ src/listenermodel.h 2009-09-11 15:10:09 +0000
@@ -53,8 +53,7 @@
QIndicate::Listener::Indicator* indicator);
void slotIndicatorModified(QIndicate::Listener::Server* server,
QIndicate::Listener::Indicator* indicator,
- const QString& key,
- const QString& value);
+ const QString& key);
void slotPropertyReceived(QIndicate::Listener::Server*,
QIndicate::Listener::Indicator*,
const QString& key,
=== modified file 'tests/filtermodeltest.cpp'
--- tests/filtermodeltest.cpp 2009-07-30 14:54:42 +0000
+++ tests/filtermodeltest.cpp 2009-09-11 15:10:09 +0000
@@ -20,7 +20,7 @@
// libindicate-qt
#include <qindicatelistener.h>
-#include <qindicateindicatormessage.h>
+#include <qindicateindicator.h>
#include <qindicateserver.h>
const QString SERVER_TYPE = "message";
@@ -61,8 +61,8 @@
mServer->show();
// Show an indicator
- QIndicate::IndicatorMessage indicator;
- indicator.setProperty("sender", "John Doe");
+ QIndicate::Indicator indicator;
+ indicator.setProperty("name", "John Doe");
indicator.show();
QTest::qWait(500);
@@ -80,7 +80,7 @@
QCOMPARE(indicatorIndex.data().toString(), QString("John Doe"));
- indicator.setProperty("sender", "Bruce Wayne");
+ indicator.setProperty("name", "Bruce Wayne");
QTest::qWait(500);
QCOMPARE(indicatorIndex.data().toString(), QString("Bruce Wayne"));
=== modified file 'tests/listenermodeltest.cpp'
--- tests/listenermodeltest.cpp 2009-09-11 10:03:01 +0000
+++ tests/listenermodeltest.cpp 2009-09-11 15:10:09 +0000
@@ -22,7 +22,7 @@
// libindicate-qt
#include <qindicatelistener.h>
-#include <qindicateindicatormessage.h>
+#include <qindicateindicator.h>
#include <qindicateserver.h>
const QString SERVER_TYPE = "message";
@@ -95,8 +95,8 @@
QCOMPARE(mModel->rowCount(serverIndex), 0);
// Show an indicator
- QIndicate::IndicatorMessage indicator;
- indicator.setProperty("sender", "John Doe");
+ QIndicate::Indicator indicator;
+ indicator.setProperty("name", "John Doe");
indicator.setProperty("icon", testImage);
indicator.show();
QTest::qWait(500);
@@ -139,8 +139,8 @@
mServer->setDesktopFile(desktopFile);
mServer->show();
- QIndicate::IndicatorMessage indicator;
- indicator.setProperty("sender", "John Doe");
+ QIndicate::Indicator indicator;
+ indicator.setProperty("name", "John Doe");
indicator.show();
QTest::qWait(500);
@@ -172,14 +172,14 @@
void ListenerModelTest::testGetProxiesFromIndex()
{
- QSignalSpy addedSpy(mListener, SIGNAL(indicatorAdded(QIndicate::Listener::Server*, QIndicate::Listener::Indicator*, const QString&)));
+ QSignalSpy addedSpy(mListener, SIGNAL(indicatorAdded(QIndicate::Listener::Server*, QIndicate::Listener::Indicator*)));
// Show server
mServer->show();
// Show an indicator
- QIndicate::IndicatorMessage indicator;
- indicator.setProperty("sender", "John Doe");
+ QIndicate::Indicator indicator;
+ indicator.setProperty("name", "John Doe");
indicator.show();
QTest::qWait(500);
@@ -227,8 +227,8 @@
mServer->show();
// Show an indicator
- QIndicate::IndicatorMessage indicator;
- indicator.setProperty("sender", "John Doe");
+ QIndicate::Indicator indicator;
+ indicator.setProperty("name", "John Doe");
indicator.setProperty("time", QDateTime(day, QTime(1, 23, 45)));
indicator.show();
QTest::qWait(500);
@@ -240,7 +240,7 @@
QCOMPARE(indicatorIndex.data().toString(), QString("John Doe"));
QCOMPARE(indicatorDateTime(indicatorIndex), QDateTime(day, QTime(1, 23, 45)));
- indicator.setProperty("sender", "Bruce Wayne");
+ indicator.setProperty("name", "Bruce Wayne");
indicator.setProperty("time", QDateTime(day, QTime(12, 34, 56)));
QTest::qWait(500);
@@ -267,14 +267,14 @@
QCOMPARE(indicatorCount(serverIndex), 0);
// Show an indicator
- QIndicate::IndicatorMessage indicator1;
+ QIndicate::Indicator indicator1;
indicator1.show();
QTest::qWait(500);
QCOMPARE(indicatorCount(serverIndex), 1);
// Show another one
- QIndicate::IndicatorMessage indicator2;
+ QIndicate::Indicator indicator2;
indicator2.show();
QTest::qWait(500);
