summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
Diffstat (limited to 'examples')
-rw-r--r--examples/btscanner/device.cpp2
-rw-r--r--examples/camera/camera.pro2
-rw-r--r--examples/declarative-camera/CaptureControls.qml179
-rw-r--r--examples/declarative-camera/declarative-camera.qml12
-rw-r--r--examples/declarative-camera/qmlcamera.cpp2
-rw-r--r--examples/declarative-location/landmarkmap/landmarkmap.pro1
-rw-r--r--examples/declarative-location/landmarkmap/qmllandmarkmap.cpp2
-rw-r--r--examples/landmarkbrowser/landmarkadddialog.cpp15
-rw-r--r--examples/landmarkbrowser/landmarkadddialog.h4
-rw-r--r--examples/landmarkbrowser/landmarkbrowser.cpp32
-rw-r--r--examples/ndefeditor/mainwindow.cpp51
-rw-r--r--examples/ndefeditor/mainwindow.h1
-rw-r--r--examples/ndefeditor/mainwindow.ui7
-rw-r--r--examples/sensors/sensors.pro3
-rw-r--r--examples/sensors/show_reflectance/main.cpp75
-rw-r--r--examples/sensors/show_reflectance/show_reflectance.pro3
-rw-r--r--examples/sfwecho/sfwecho_service/main.cpp25
-rw-r--r--examples/sysinfo/dialog.cpp4
-rw-r--r--examples/sysinfo/dialog.h3
19 files changed, 294 insertions, 129 deletions
diff --git a/examples/btscanner/device.cpp b/examples/btscanner/device.cpp
index 9c57203940..0e9a41f0a6 100644
--- a/examples/btscanner/device.cpp
+++ b/examples/btscanner/device.cpp
@@ -94,6 +94,8 @@ void DeviceDiscoveryDialog::addDevice(const QBluetoothDeviceInfo &info)
QBluetoothLocalDevice::Pairing pairingStatus = localDevice->pairingStatus(info.address());
if (pairingStatus == QBluetoothLocalDevice::Paired || pairingStatus == QBluetoothLocalDevice::AuthorizedPaired )
item->setTextColor(QColor(Qt::green));
+ else
+ item->setTextColor(QColor(Qt::black));
ui->list->addItem(item);
}
diff --git a/examples/camera/camera.pro b/examples/camera/camera.pro
index 1daee34bf9..eb405ed745 100644
--- a/examples/camera/camera.pro
+++ b/examples/camera/camera.pro
@@ -26,7 +26,7 @@ FORMS += \
imagesettings.ui
symbian {
- TARGET.CAPABILITY = UserEnvironment WriteDeviceData ReadDeviceData
+ TARGET.CAPABILITY = UserEnvironment WriteUserData ReadUserData
TARGET.EPOCHEAPSIZE = 0x20000 0x3000000
LIBS += -lavkon -leiksrv -lcone -leikcore
}
diff --git a/examples/declarative-camera/CaptureControls.qml b/examples/declarative-camera/CaptureControls.qml
index 77f69b37be..e431b73b52 100644
--- a/examples/declarative-camera/CaptureControls.qml
+++ b/examples/declarative-camera/CaptureControls.qml
@@ -49,105 +49,124 @@ FocusScope {
property alias flashMode : flashModesButton.value
property alias exposureCompensation : exposureCompensationButton.value
+ property int buttonsPanelWidth: buttonPaneShadow.width
+
signal previewSelected
id : captureControls
- Column {
- spacing : 8
- anchors.right : parent.right
- anchors.rightMargin: 8
- anchors.top : parent.top
- anchors.topMargin: 8
+ Rectangle {
+ id: buttonPaneShadow
+ width: buttonPanningPane.width + 16
+ height: parent.height
+ anchors.top: parent.top
+ anchors.right: parent.right
+ color: Qt.rgba(0.08, 0.08, 0.08, 1)
+
+ Flickable {
+ id: buttonPanningPane
+ anchors {
+ right: parent.right
+ top: parent.top
+ bottom: parent.bottom
+ margins: 8
+ }
+ width: buttonsColumn.width
- FocusButton {
- camera: captureControls.camera
- visible: false
- }
+ contentWidth: buttonsColumn.width
+ contentHeight: buttonsColumn.height
- CameraButton {
- text: "Capture"
- onClicked: camera.captureImage()
- }
+ Column {
+ id: buttonsColumn
+ spacing: 8
- CameraPropertyButton {
- id : flashModesButton
- value: Camera.FlashOff
- model: ListModel {
- ListElement {
- icon: "images/camera_flash_auto.png"
- value: Camera.FlashAuto
- text: "Auto"
- }
- ListElement {
- icon: "images/camera_flash_off.png"
- value: Camera.FlashOff
- text: "Off"
+ FocusButton {
+ camera: captureControls.camera
}
- ListElement {
- icon: "images/camera_flash_fill.png"
- value: Camera.FlashOn
- text: "On"
+
+ CameraButton {
+ text: "Capture"
+ onClicked: camera.captureImage()
}
- ListElement {
- icon: "images/camera_flash_redeye.png"
- value: Camera.FlashRedEyeReduction
- text: "Red Eye Reduction"
+
+ CameraPropertyButton {
+ id : flashModesButton
+ value: Camera.FlashOff
+ model: ListModel {
+ ListElement {
+ icon: "images/camera_flash_auto.png"
+ value: Camera.FlashAuto
+ text: "Auto"
+ }
+ ListElement {
+ icon: "images/camera_flash_off.png"
+ value: Camera.FlashOff
+ text: "Off"
+ }
+ ListElement {
+ icon: "images/camera_flash_fill.png"
+ value: Camera.FlashOn
+ text: "On"
+ }
+ ListElement {
+ icon: "images/camera_flash_redeye.png"
+ value: Camera.FlashRedEyeReduction
+ text: "Red Eye Reduction"
+ }
+ }
}
- }
- }
- CameraPropertyButton {
- id : wbModesButton
- value: Camera.WhiteBalanceAuto
- model: ListModel {
- ListElement {
- icon: "images/camera_auto_mode.png"
+ CameraPropertyButton {
+ id : wbModesButton
value: Camera.WhiteBalanceAuto
- text: "Auto"
+ model: ListModel {
+ ListElement {
+ icon: "images/camera_auto_mode.png"
+ value: Camera.WhiteBalanceAuto
+ text: "Auto"
+ }
+ ListElement {
+ icon: "images/camera_white_balance_sunny.png"
+ value: Camera.WhiteBalanceSunlight
+ text: "Sunlight"
+ }
+ ListElement {
+ icon: "images/camera_white_balance_cloudy.png"
+ value: Camera.WhiteBalanceCloudy
+ text: "Cloudy"
+ }
+ ListElement {
+ icon: "images/camera_white_balance_incandescent.png"
+ value: Camera.WhiteBalanceIncandescent
+ text: "Incandescent"
+ }
+ ListElement {
+ icon: "images/camera_white_balance_flourescent.png"
+ value: Camera.WhiteBalanceFluorescent
+ text: "Fluorescent"
+ }
+ }
}
- ListElement {
- icon: "images/camera_white_balance_sunny.png"
- value: Camera.WhiteBalanceSunlight
- text: "Sunlight"
- }
- ListElement {
- icon: "images/camera_white_balance_cloudy.png"
- value: Camera.WhiteBalanceCloudy
- text: "Cloudy"
- }
- ListElement {
- icon: "images/camera_white_balance_incandescent.png"
- value: Camera.WhiteBalanceIncandescent
- text: "Incandescent"
+
+ ExposureCompensationButton {
+ id : exposureCompensationButton
}
- ListElement {
- icon: "images/camera_white_balance_flourescent.png"
- value: Camera.WhiteBalanceFluorescent
- text: "Fluorescent"
+
+ CameraButton {
+ text: "View"
+ onClicked: captureControls.previewSelected()
+ visible: captureControls.previewAvailable
}
- }
- }
- ExposureCompensationButton {
- id : exposureCompensationButton
- }
+ CameraButton {
+ id: quitButton
+ text: "Quit"
+ onClicked: Qt.quit()
+ }
- CameraButton {
- text: "View"
- onClicked: captureControls.previewSelected()
- visible: captureControls.previewAvailable
+ }
}
}
- CameraButton {
- id: quitButton
- anchors.right : parent.right
- anchors.rightMargin: 8
- anchors.bottom : parent.bottom
- anchors.bottomMargin: 8
- text: "Quit"
- onClicked: Qt.quit()
- }
Item {
id: exposureDetails
diff --git a/examples/declarative-camera/declarative-camera.qml b/examples/declarative-camera/declarative-camera.qml
index 83509e5b36..c5e8accdb2 100644
--- a/examples/declarative-camera/declarative-camera.qml
+++ b/examples/declarative-camera/declarative-camera.qml
@@ -43,8 +43,6 @@ import QtMultimediaKit 1.1
Rectangle {
id : cameraUI
- width : 800
- height : 480
color: "black"
state: "PhotoCapture"
@@ -90,11 +88,11 @@ Rectangle {
Camera {
id: camera
- x : 0
- y : 0
- width : 640
- height : 480
- focus : visible //to receive focus and capture key events
+ x: 0
+ y: 0
+ width: parent.width - stillControls.buttonsPanelWidth
+ height: parent.height
+ focus: visible //to receive focus and capture key events
//captureResolution : "640x480"
flashMode: stillControls.flashMode
diff --git a/examples/declarative-camera/qmlcamera.cpp b/examples/declarative-camera/qmlcamera.cpp
index 77bb408662..62e17a5f91 100644
--- a/examples/declarative-camera/qmlcamera.cpp
+++ b/examples/declarative-camera/qmlcamera.cpp
@@ -39,6 +39,7 @@
****************************************************************************/
#include <QtGui/QApplication>
+#include <QtGui/QDesktopWidget>
#include <QtDeclarative/QDeclarativeView>
#include <QtDeclarative/QDeclarativeEngine>
@@ -76,6 +77,7 @@ int main(int argc, char *argv[])
// quit() signal, so do this (optionally use Qt.exit()).
QObject::connect(view.engine(), SIGNAL(quit()), qApp, SLOT(quit()));
#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6)
+ view.setGeometry(application.desktop()->screenGeometry());
view.showFullScreen();
#else
view.setGeometry(QRect(100, 100, 800, 480));
diff --git a/examples/declarative-location/landmarkmap/landmarkmap.pro b/examples/declarative-location/landmarkmap/landmarkmap.pro
index bc65ed2ed8..e3a728d615 100644
--- a/examples/declarative-location/landmarkmap/landmarkmap.pro
+++ b/examples/declarative-location/landmarkmap/landmarkmap.pro
@@ -14,6 +14,7 @@ win32 {
symbian {
TARGET.CAPABILITY = NetworkServices Location ReadUserData WriteUserData
+ TARGET.CAPABILITY += LocalServices ReadDeviceData WriteDeviceData
TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
}
diff --git a/examples/declarative-location/landmarkmap/qmllandmarkmap.cpp b/examples/declarative-location/landmarkmap/qmllandmarkmap.cpp
index 391eabb8e5..5dd2d9006c 100644
--- a/examples/declarative-location/landmarkmap/qmllandmarkmap.cpp
+++ b/examples/declarative-location/landmarkmap/qmllandmarkmap.cpp
@@ -41,10 +41,12 @@
#include <QtGui/QApplication>
#include <QtDeclarative/QDeclarativeView>
#include <QtDeclarative/QDeclarativeEngine>
+#include <QDir>
int main(int argc, char *argv[])
{
QApplication application(argc, argv);
+ QDir::setCurrent(QApplication::applicationDirPath());
const QString mainQmlApp = QLatin1String("qrc:///landmarkmap.qml");
QDeclarativeView view;
view.setSource(QUrl(mainQmlApp));
diff --git a/examples/landmarkbrowser/landmarkadddialog.cpp b/examples/landmarkbrowser/landmarkadddialog.cpp
index 680ea6efc8..213c152d03 100644
--- a/examples/landmarkbrowser/landmarkadddialog.cpp
+++ b/examples/landmarkbrowser/landmarkadddialog.cpp
@@ -80,7 +80,7 @@ LandmarkAddDialog::LandmarkAddDialog(QWidget *parent, Qt::WindowFlags flags, con
QVariant var;
var.setValue(category.categoryId());
categoryItem->setData(Qt::UserRole, var);
- categoryItem->setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled);
+ categoryItem->setFlags(categoryItem->flags() & ~ Qt::ItemIsUserCheckable);
if (landmark.categoryIds().contains(category.categoryId()))
categoryItem->setCheckState(Qt::Checked);
else
@@ -90,6 +90,8 @@ LandmarkAddDialog::LandmarkAddDialog(QWidget *parent, Qt::WindowFlags flags, con
categoryList->setMinimumHeight(categories.count()
* (categoryList->sizeHintForRow(0) + categoryList->spacing())
+ categoryList->frameWidth() *2);
+ QObject::connect(categoryList, SIGNAL(itemPressed(QListWidgetItem *)),
+ this, SLOT(categoryPressed(QListWidgetItem *)));
}
LandmarkAddDialog::~LandmarkAddDialog()
@@ -152,3 +154,14 @@ void LandmarkAddDialog::reject()
lm.clear();
QDialog::reject();
}
+
+void LandmarkAddDialog::categoryPressed(QListWidgetItem *item)
+{
+ //the purpose of this function is to ensure that when the item is pressed
+ //anywhere the checkbox will toggle (previously only clicking the box
+ //itself would cause a toggle)
+ if (item->checkState() == Qt::Checked)
+ item->setCheckState(Qt::Unchecked);
+ else
+ item->setCheckState(Qt::Checked);
+}
diff --git a/examples/landmarkbrowser/landmarkadddialog.h b/examples/landmarkbrowser/landmarkadddialog.h
index 46b8e8b89c..510f926f3f 100644
--- a/examples/landmarkbrowser/landmarkadddialog.h
+++ b/examples/landmarkbrowser/landmarkadddialog.h
@@ -63,6 +63,10 @@ public slots:
virtual void accept();
virtual void reject();
+
+private slots:
+ void categoryPressed(QListWidgetItem *item);
+
private:
QLandmark lm;
};
diff --git a/examples/landmarkbrowser/landmarkbrowser.cpp b/examples/landmarkbrowser/landmarkbrowser.cpp
index c8a61ba69a..77e139bea5 100644
--- a/examples/landmarkbrowser/landmarkbrowser.cpp
+++ b/examples/landmarkbrowser/landmarkbrowser.cpp
@@ -61,7 +61,7 @@ QTM_USE_NAMESPACE
LandmarkBrowser::LandmarkBrowser(QWidget *parent, Qt::WindowFlags flags)
:currentLandmarkOffset(0),
currentCategoryOffset(0),
- limit(20), filterDialog(0),
+ limit(20), filterDialog(0),
landmarkFetch(0), landmarkImport(0), landmarkExport(0), landmarkRemove(0),
landmarkSave(0), categoryFetch(0), categoryRemove(0),progress(0),
manager(0)
@@ -622,12 +622,22 @@ void LandmarkBrowser::on_prevCategoryButton_clicked()
void LandmarkBrowser::updateTable(const QList<QLandmark> &lms)
{
QLandmark lm;
+ QTableWidgetItem *item;
for ( int i =0; i < lms.count(); ++i) {
lm = lms.at(i);
table->insertRow(table->rowCount());
- table->setItem(table->rowCount()-1,0,new QTableWidgetItem(QString::number(lm.coordinate().latitude(),'f',2)));
- table->setItem(table->rowCount()-1,1,new QTableWidgetItem(QString::number(lm.coordinate().longitude(),'f',2)));
- table->setItem(table->rowCount()-1,2,new QTableWidgetItem(lm.name()));
+
+ item = new QTableWidgetItem(QString::number(lm.coordinate().latitude(),'f',2));
+ item->setFlags(item->flags() & ~Qt::ItemIsEditable);
+ table->setItem(table->rowCount()-1,0,item);
+
+ item = new QTableWidgetItem(QString::number(lm.coordinate().longitude(),'f',2));
+ item->setFlags(item->flags() & ~Qt::ItemIsEditable);
+ table->setItem(table->rowCount()-1,1, item);
+
+ item = new QTableWidgetItem(lm.name());
+ item->setFlags(item->flags() & ~Qt::ItemIsEditable);
+ table->setItem(table->rowCount()-1,2, item);
if (i %20)
qApp->processEvents();
@@ -637,15 +647,23 @@ void LandmarkBrowser::updateTable(const QList<QLandmark> &lms)
void LandmarkBrowser::updateCategoryTable(const QList<QLandmarkCategory> &cats)
{
QLandmarkCategory cat;
+ QTableWidgetItem *item;
for ( int i =0; i < cats.count(); ++i) {
cat = cats.at(i);
categoryTable->insertRow(categoryTable->rowCount());
if(manager->isReadOnly(cat.categoryId())) {
- categoryTable->setItem(categoryTable->rowCount()-1,0,new QTableWidgetItem(cat.name() + "(global)"));
+ item = new QTableWidgetItem(cat.name() + "(global)");
+ item->setFlags(item->flags() & ~Qt::ItemIsEditable);
+ categoryTable->setItem(categoryTable->rowCount()-1,0, item);
} else {
- categoryTable->setItem(categoryTable->rowCount()-1,0,new QTableWidgetItem(cat.name()));
+ item = new QTableWidgetItem(cat.name());
+ item->setFlags(item->flags() & ~Qt::ItemIsEditable);
+ categoryTable->setItem(categoryTable->rowCount()-1,0,item);
}
- categoryTable->setItem(categoryTable->rowCount()-1,1,new QTableWidgetItem(cat.categoryId().localId()));
+
+ item = new QTableWidgetItem(cat.categoryId().localId());
+ item->setFlags(item->flags() & ~Qt::ItemIsEditable);
+ categoryTable->setItem(categoryTable->rowCount()-1,1, item);
if (i %20)
qApp->processEvents();
diff --git a/examples/ndefeditor/mainwindow.cpp b/examples/ndefeditor/mainwindow.cpp
index 7e6997e719..eaf33f5f90 100644
--- a/examples/ndefeditor/mainwindow.cpp
+++ b/examples/ndefeditor/mainwindow.cpp
@@ -139,8 +139,6 @@ MainWindow::MainWindow(QWidget *parent)
this, SLOT(targetDetected(QNearFieldTarget*)));
connect(m_manager, SIGNAL(targetLost(QNearFieldTarget*)),
this, SLOT(targetLost(QNearFieldTarget*)));
-
- m_manager->startTargetDetection();
}
MainWindow::~MainWindow()
@@ -207,6 +205,7 @@ void MainWindow::touchReceive()
m_touchAction = ReadNdef;
m_manager->setTargetAccessModes(QNearFieldManager::NdefReadTargetAccess);
+ m_manager->startTargetDetection();
}
void MainWindow::touchStore()
@@ -216,6 +215,7 @@ void MainWindow::touchStore()
m_touchAction = WriteNdef;
m_manager->setTargetAccessModes(QNearFieldManager::NdefWriteTargetAccess);
+ m_manager->startTargetDetection();
}
void MainWindow::targetDetected(QNearFieldTarget *target)
@@ -229,14 +229,14 @@ void MainWindow::targetDetected(QNearFieldTarget *target)
connect(target, SIGNAL(error(QNearFieldTarget::Error,QNearFieldTarget::RequestId)),
this, SLOT(targetError(QNearFieldTarget::Error,QNearFieldTarget::RequestId)));
- target->readNdefMessages();
+ m_request = target->readNdefMessages();
break;
case WriteNdef:
connect(target, SIGNAL(ndefMessagesWritten()), this, SLOT(ndefMessageWritten()));
connect(target, SIGNAL(error(QNearFieldTarget::Error,QNearFieldTarget::RequestId)),
this, SLOT(targetError(QNearFieldTarget::Error,QNearFieldTarget::RequestId)));
- target->writeNdefMessages(QList<QNdefMessage>() << ndefMessage());
+ m_request = target->writeNdefMessages(QList<QNdefMessage>() << ndefMessage());
break;
}
}
@@ -267,12 +267,18 @@ void MainWindow::ndefMessageRead(const QNdefMessage &message)
ui->status->setStyleSheet(QString());
m_manager->setTargetAccessModes(QNearFieldManager::NoTargetAccess);
+ m_manager->stopTargetDetection();
+ m_request = QNearFieldTarget::RequestId();
+ ui->statusBar->clearMessage();
}
void MainWindow::ndefMessageWritten()
{
ui->status->setStyleSheet(QString());
m_manager->setTargetAccessModes(QNearFieldManager::NoTargetAccess);
+ m_manager->stopTargetDetection();
+ m_request = QNearFieldTarget::RequestId();
+ ui->statusBar->clearMessage();
}
void MainWindow::targetError(QNearFieldTarget::Error error, const QNearFieldTarget::RequestId &id)
@@ -280,8 +286,41 @@ void MainWindow::targetError(QNearFieldTarget::Error error, const QNearFieldTarg
Q_UNUSED(error);
Q_UNUSED(id);
- ui->status->setStyleSheet(QString());
- m_manager->setTargetAccessModes(QNearFieldManager::NoTargetAccess);
+ if (m_request == id) {
+ switch (error) {
+ case QNearFieldTarget::NoError:
+ ui->statusBar->clearMessage();
+ break;
+ case QNearFieldTarget::UnsupportedError:
+ ui->statusBar->showMessage(tr("Unsupported tag"));
+ break;
+ case QNearFieldTarget::TargetOutOfRangeError:
+ ui->statusBar->showMessage(tr("Tag removed from field"));
+ break;
+ case QNearFieldTarget::NoResponseError:
+ ui->statusBar->showMessage(tr("No response from tag"));
+ break;
+ case QNearFieldTarget::ChecksumMismatchError:
+ ui->statusBar->showMessage(tr("Checksum mismatch"));
+ break;
+ case QNearFieldTarget::InvalidParametersError:
+ ui->statusBar->showMessage(tr("Invalid parameters"));
+ break;
+ case QNearFieldTarget::NdefReadError:
+ ui->statusBar->showMessage(tr("NDEF read error"));
+ break;
+ case QNearFieldTarget::NdefWriteError:
+ ui->statusBar->showMessage(tr("NDEF write error"));
+ break;
+ default:
+ ui->statusBar->showMessage(tr("Unknown error"));
+ }
+
+ ui->status->setStyleSheet(QString());
+ m_manager->setTargetAccessModes(QNearFieldManager::NoTargetAccess);
+ m_manager->stopTargetDetection();
+ m_request = QNearFieldTarget::RequestId();
+ }
}
void MainWindow::clearMessage()
diff --git a/examples/ndefeditor/mainwindow.h b/examples/ndefeditor/mainwindow.h
index 47bfdffa67..ae3d975455 100644
--- a/examples/ndefeditor/mainwindow.h
+++ b/examples/ndefeditor/mainwindow.h
@@ -101,6 +101,7 @@ private:
QNearFieldManager *m_manager;
TouchAction m_touchAction;
+ QNearFieldTarget::RequestId m_request;
};
#endif // MAINWINDOW_H
diff --git a/examples/ndefeditor/mainwindow.ui b/examples/ndefeditor/mainwindow.ui
index f3e38bfbe0..adffa33116 100644
--- a/examples/ndefeditor/mainwindow.ui
+++ b/examples/ndefeditor/mainwindow.ui
@@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>551</width>
+ <width>553</width>
<height>397</height>
</rect>
</property>
@@ -120,8 +120,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>551</width>
- <height>355</height>
+ <width>553</width>
+ <height>335</height>
</rect>
</property>
</widget>
@@ -129,6 +129,7 @@
</item>
</layout>
</widget>
+ <widget class="QStatusBar" name="statusBar"/>
</widget>
<layoutdefault spacing="6" margin="11"/>
<resources/>
diff --git a/examples/sensors/sensors.pro b/examples/sensors/sensors.pro
index 5d252e58b1..285af32945 100644
--- a/examples/sensors/sensors.pro
+++ b/examples/sensors/sensors.pro
@@ -22,5 +22,6 @@ SUBDIRS +=\
show_rotation\
show_tap\
show_light\
- show_gyroscope
+ show_gyroscope\
+ show_reflectance
diff --git a/examples/sensors/show_reflectance/main.cpp b/examples/sensors/show_reflectance/main.cpp
new file mode 100644
index 0000000000..04ba1478c2
--- /dev/null
+++ b/examples/sensors/show_reflectance/main.cpp
@@ -0,0 +1,75 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in
+** the documentation and/or other materials provided with the
+** distribution.
+** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+** the names of its contributors may be used to endorse or promote
+** products derived from this software without specific prior written
+** permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtCore>
+#include <qsensor.h>
+
+QTM_USE_NAMESPACE
+
+class Filter : public QSensorFilter{
+ int lastPercent;
+public:
+ Filter(): QSensorFilter(), lastPercent(0) {}
+
+ bool filter(QSensorReading *reading)
+ {
+ qDebug()<<"reflectance "<<QString("%1").arg(reading->property("reflectance").toFloat(),2,'f',1)<<" %";
+ return false;
+ }
+};
+
+int main(int argc, char **argv)
+{
+ QCoreApplication app(argc, argv);
+ QString type("QIRProximitySensor");
+ QSensor sensor(type.toAscii());
+
+ Filter filter;
+ sensor.addFilter(&filter);
+ sensor.start();
+
+ if (!sensor.isActive()) {
+ qWarning(QString("show_reflectance: %1 didn't start.").arg(type).toAscii());
+ return 1;
+ }
+
+ return app.exec();
+}
+
diff --git a/examples/sensors/show_reflectance/show_reflectance.pro b/examples/sensors/show_reflectance/show_reflectance.pro
new file mode 100644
index 0000000000..b365518726
--- /dev/null
+++ b/examples/sensors/show_reflectance/show_reflectance.pro
@@ -0,0 +1,3 @@
+include(../sensors.pri)
+SOURCES = main.cpp
+TARGET = show_reflectance
diff --git a/examples/sfwecho/sfwecho_service/main.cpp b/examples/sfwecho/sfwecho_service/main.cpp
index 0ba62fba85..bbb43d4f37 100644
--- a/examples/sfwecho/sfwecho_service/main.cpp
+++ b/examples/sfwecho/sfwecho_service/main.cpp
@@ -66,27 +66,6 @@ public slots:
private:
};
-class EchoService2 : public EchoService
-{
- Q_OBJECT
-
-public:
- EchoService2(QObject* parent = 0)
- : EchoService(parent)
- {
- }
-
-Q_SIGNALS:
- void broadcastMessage(const QString &msg, const QDateTime &timestamp);
-
-public slots:
- void sendMessage(const QString &msg)
- {
- emit broadcastMessage(msg, QDateTime::currentDateTime());
- }
-private:
-};
-
void unregisterExampleService()
{
QServiceManager m;
@@ -128,11 +107,11 @@ int main(int argc, char** argv)
QRemoteServiceRegister *serviceRegister = new QRemoteServiceRegister();
//serviceRegister->setSecurityFilter(check);
- QRemoteServiceRegister::Entry shared = serviceRegister->createEntry<EchoService2>(
+ QRemoteServiceRegister::Entry shared = serviceRegister->createEntry<EchoService>(
"EchoService", "com.nokia.qt.example.sfwecho", "1.1");
shared.setInstantiationType(QRemoteServiceRegister::GlobalInstance);
- QRemoteServiceRegister::Entry unique = serviceRegister->createEntry<EchoService2>(
+ QRemoteServiceRegister::Entry unique = serviceRegister->createEntry<EchoService>(
"EchoService", "com.nokia.qt.example.sfwecho", "1.0");
unique.setInstantiationType(QRemoteServiceRegister::PrivateInstance);
diff --git a/examples/sysinfo/dialog.cpp b/examples/sysinfo/dialog.cpp
index 820de28aab..1be669414f 100644
--- a/examples/sysinfo/dialog.cpp
+++ b/examples/sysinfo/dialog.cpp
@@ -101,6 +101,9 @@ void Dialog::changeEvent(QEvent *e)
void Dialog::tabChanged(int index)
{
+ if (lastTab == 4 && index !=4) {
+ disconnect(bi,SIGNAL(currentFlowChanged(int)),0,0);
+ }
switch(index) {
case 0:
setupGeneral();
@@ -140,6 +143,7 @@ void Dialog::tabChanged(int index)
break;
};
+ lastTab = index;
}
void Dialog::setupGeneral()
diff --git a/examples/sysinfo/dialog.h b/examples/sysinfo/dialog.h
index 7bc4035541..2fb7e2077a 100644
--- a/examples/sysinfo/dialog.h
+++ b/examples/sysinfo/dialog.h
@@ -152,6 +152,9 @@ private slots:
void timeout3();
void timerError(QSystemAlignedTimer::AlignedTimerError error);
+
+private:
+ int lastTab;
};
#endif // DIALOG_H
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 18:04:06 +0000