diff options
| author | Max Waterman <david.waterman@nokia.com> | 2010-07-20 17:12:22 +0300 |
|---|---|---|
| committer | Dominik Kapusta <dominik.kapusta@teleca.com> | 2010-08-03 15:40:28 +0200 |
| commit | e941f56a4276525f3fbe372a3d795dd722341adc (patch) | |
| tree | d111627722dbba581d0ab255fef5ba92767acb4c /examples/chaining | |
| parent | 6e3d8a5cbe4053057845d1d0cb3a531e3fc44370 (diff) | |
Changes: DUI-3234 and DUI-3235 - allow user to specify page title; appname by default
RevBy: Dominik
Details:
Chained methods have an optional last parameter for the page title. It
defaults to the null QString, but the nullness doesn't get passed
through qdbus so if it isEmpty() is used to test if the user has set
it to anything; I think the user shouldn't be allowed to set it to
the empty string, so this is actually a good thing.
Diffstat (limited to 'examples/chaining')
| -rw-r--r-- | examples/chaining/INSTALL.txt | 29 | ||||
| -rw-r--r-- | examples/chaining/chainingexampleapp1/imageviewer.cpp | 2 |
2 files changed, 1 insertions, 30 deletions
diff --git a/examples/chaining/INSTALL.txt b/examples/chaining/INSTALL.txt deleted file mode 100644 index 43efd0b2..00000000 --- a/examples/chaining/INSTALL.txt +++ /dev/null @@ -1,29 +0,0 @@ -# here are some commands you can use/adapt to help you get this example installed on the device. - -mkdir install -cp chainingexampleapp?/*chainingexampleapp?{,.desktop,.service} install -cp chainingexampleinterface/libchainingexampleinterface.so.1.0.0 install -tar -zcf install.tar.gz install -scp install.tar.gz root@192.168.2.15:/home/user -ssh 192.168.2.15 -l root -cd /home/user -tar -zxf install.tar.gz -cp install/*.desktop /usr/share/applications/ -cp install/*.service /usr/share/dbus-1/services -cp install/chainingexampleapp1 /usr/bin/chainingexampleapp1.exe -cp install/chainingexampleapp2 /usr/bin/chainingexampleapp2.exe -cp install/libchainingexampleinterface.so.1.0.0 /usr/lib -ln -s /usr/lib/libchainingexampleinterface.so.1.0.0 /usr/lib/libchainingexampleinterface.so.1.0 -ln -s /usr/lib/libchainingexampleinterface.so.1.0.0 /usr/lib/libchainingexampleinterface.so.1 -ln -s /usr/lib/libchainingexampleinterface.so.1.0.0 /usr/lib/libchainingexampleinterface.so -cat > /usr/bin/chainingexampleapp1 <<EOF -#!/bin/sh - -/usr/bin/chainingexampleapp1.exe $* > /tmp/chainingexampleapp1.out 2>&1 -EOF -cat > /usr/bin/chainingexampleapp2 <<EOF -#!/bin/sh - -/usr/bin/chainingexampleapp2.exe $* > /tmp/chainingexampleapp2.out 2>&1 -EOF -chmod +x /usr/bin/chainingexampleapp? diff --git a/examples/chaining/chainingexampleapp1/imageviewer.cpp b/examples/chaining/chainingexampleapp1/imageviewer.cpp index 2442baae..4750d2b1 100644 --- a/examples/chaining/chainingexampleapp1/imageviewer.cpp +++ b/examples/chaining/chainingexampleapp1/imageviewer.cpp @@ -23,7 +23,7 @@ void ImageViewer::showImage() list << imageFilename; if ( chainingExampleInterface->isValid() ) { - chainingExampleInterface->showImage( imageFilename, list ); + chainingExampleInterface->showImage( imageFilename, list, "title set by app1" ); } else { qDebug() << "chainingExampleInterface not valid : " << chainingExampleInterface; } |