- support "Rotation" setting in .desktop applnk file

- changed properties dialog to make Rotation editable
- fixed a long-standing QPE bug:
  launcher expects AppLnk::file() to return QString::null for *all real*
  applnks (as opposed to doclnks) -- but AppLnk itself initializes this
  field to the name of the dir, where the applnk is stored.
  This is why qcop "QPE/System" "linkChanged(QString)" xyz.desktop cleared
  a whole launcher tab

I hope I didn't break anything with this change ;)

5 files changed, 370 insertions, 65 deletions

diff --git a/core/launcher/launcherview.cpp b/core/launcher/launcherview.cpp
index fa46543..6e63fca 100644
--- a/core/launcher/launcherview.cpp
+++ b/core/launcher/launcherview.cpp
@@ -492,6 +492,5 @@ bool LauncherIconView::removeLink(const QString& linkfile)
 	l = item->appLnk();
-	if (  l->linkFileKnown() && l->linkFile() == linkfile
-		|| l->fileKnown() && (
-		    l->file() == linkfile
-		    || dl.isValid() && dl.file() == l->file() ) ) {
+	if ( ( l->linkFileKnown() && ( l->linkFile() == linkfile ))
+	  || ( l->fileKnown() && ( l->file() == linkfile ))
+	  || ( dl.fileKnown() && l->fileKnown() && ( dl.file() == l->file() )) ) {
 	    delete item;
@@ -504,5 +503,5 @@ bool LauncherIconView::removeLink(const QString& linkfile)
 	++it;
-	if ( l->linkFileKnown() && l->linkFile() == linkfile
-		|| l->file() == linkfile
-		|| dl.isValid() && dl.file() == l->file() ) {
+	if ( ( l->linkFileKnown() && ( l->linkFile() == linkfile ))
+	  || ( l->file() == linkfile )
+	  || ( dl.fileKnown() && ( dl.file() == l->file() )) ) {
 	    hidden.removeRef(l);
diff --git a/library/applnk.cpp b/library/applnk.cpp
index 44f3f58..a56da5d 100644
--- a/library/applnk.cpp
+++ b/library/applnk.cpp
@@ -374,3 +374,6 @@ AppLnk::AppLnk( const QString &file )
 	    mFile = config.readEntry("File", QString::null);
-	    if ( mFile[0] != '/' ) {
+	    if ( !mExec. isEmpty ( )) {
+		mFile = QString::null;
+	    }
+	    else if ( mFile[0] != '/' ) {
 		int slash = file.findRev('/');
@@ -522,3 +525,3 @@ QString AppLnk::file() const
 {
-    if ( mFile.isNull() ) {
+    if ( mExec.isEmpty ( ) && mFile.isNull() ) {
 	AppLnk* that = (AppLnk*)this;
@@ -531,2 +534,3 @@ QString AppLnk::file() const
 		    ? mLinkFile.left(mLinkFile.length()-8) : mLinkFile;
+	qDebug("mFile now == %s", mFile.latin1());
 	} else if ( mType.contains('/') ) {
@@ -699,2 +703,14 @@ void AppLnk::setExec( const QString& exec )
 
+#if 0 // this was inlined for better BC
+/*!
+  Sets the Rotation property to \a rot.
+
+  \sa rotation()
+*/
+void AppLnk::setRotation ( const QString &rot )
+{
+	mRotation = rot;
+}
+#endif
+
 /*!
@@ -837,2 +853,6 @@ void AppLnk::storeLink() const
     config.writeEntry("Type",type());
+    if(!rotation().isEmpty())
+	config.writeEntry("Rotation",rotation());
+    else
+	config.removeEntry("Rotation");    
     if ( !mComment.isNull() ) config.writeEntry("Comment",mComment);
diff --git a/library/applnk.h b/library/applnk.h
index 71b62ef..b92ddba 100644
--- a/library/applnk.h
+++ b/library/applnk.h
@@ -75,2 +75,3 @@ public:
     void setType( const QString& mimetype );
+    inline void setRotation ( const QString &rotation ) { mRotation = rot; } // inline for BC 
     void setIcon( const QString& iconname );
diff --git a/library/lnkproperties.cpp b/library/lnkproperties.cpp
index 983c677..0b30a9a 100644
--- a/library/lnkproperties.cpp
+++ b/library/lnkproperties.cpp
@@ -28,2 +28,3 @@
 
+#include <qpe/qpeapplication.h>
 #include <qpe/applnk.h>
@@ -52,2 +53,3 @@
 #include <qregexp.h>
+#include <qbuttongroup.h>
 
@@ -87,3 +89,5 @@ LnkProperties::LnkProperties( AppLnk* l, QWidget* parent )
 	d->preload->hide();
-	d->spacer->hide();
+	d->rotate->hide();
+	d->rotateButtons->hide();
+	d->labelspacer->hide();
 
@@ -112,2 +116,9 @@ LnkProperties::LnkProperties( AppLnk* l, QWidget* parent )
 	    d->preload->hide();
+	if ( !l->property("Rotation"). isEmpty ()) {
+	    d->rotate->setChecked ( true );
+	    d->rotateButtons->setButton(((QPEApplication::defaultRotation()+l->rotation().toInt())%360)/90);
+	}
+	else {
+	    d->rotateButtons->setEnabled(false);
+	}
 
@@ -277,2 +288,18 @@ void LnkProperties::done(int ok)
 	}
+	if ( !d->rotate->isHidden()) {
+	    QString newrot;
+	
+	    if (d->rotate->isChecked()) {
+		int rot=0;
+		for(; rot<4; rot++) {
+		    if (d->rotateButtons->find(rot)->isOn())
+		        break;
+		}
+		newrot = QString::number((QPEApplication::defaultRotation()+rot*90)%360);
+	    }
+	    if (newrot !=lnk->rotation()) {
+		lnk->setRotation(newrot);
+		changed = TRUE;
+	    }
+	}
 	if ( d->preload->isHidden() && d->locationCombo->currentItem() != currentLocation ) {
@@ -282,3 +309,3 @@ void LnkProperties::done(int ok)
 	}
-
+	
 	if ( !d->preload->isHidden() ) {
diff --git a/library/lnkpropertiesbase_p.ui b/library/lnkpropertiesbase_p.ui
index e7139e7..c2271f1 100644
--- a/library/lnkpropertiesbase_p.ui
+++ b/library/lnkpropertiesbase_p.ui
@@ -13,4 +13,4 @@
             <y>0</y>
-            <width>289</width>
-            <height>449</height>
+            <width>267</width>
+            <height>450</height>
         </rect>
@@ -33,2 +33,6 @@
     </property>
+    <property stdset="1">
+        <name>icon</name>
+        <pixmap>image0</pixmap>
+    </property>
     <property>
@@ -81,3 +85,3 @@
                 </property>
-                <widget row="6"  column="0"  rowspan="1"  colspan="2" >
+                <widget row="8"  column="0"  rowspan="1"  colspan="2" >
                     <class>CategoryWidget</class>
@@ -96,13 +100,6 @@
                 <widget row="5"  column="0"  rowspan="1"  colspan="2" >
-                    <class>QLabel</class>
+                    <class>QCheckBox</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>spacer</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>sizePolicy</name>
-                        <sizepolicy>
-                            <hsizetype>1</hsizetype>
-                            <vsizetype>7</vsizetype>
-                        </sizepolicy>
+                        <cstring>rotate</cstring>
                     </property>
@@ -110,25 +107,27 @@
                         <name>text</name>
-                        <string></string>
+                        <string>Use custom rotation</string>
                     </property>
-                </widget>
-                <widget row="3"  column="0" >
-                    <class>QLabel</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>commentLabel</cstring>
+                    <property>
+                        <name>layoutMargin</name>
                     </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>Comment:</string>
+                    <property>
+                        <name>layoutSpacing</name>
+                    </property>
+                    <property>
+                        <name>whatsThis</name>
+                        <string>Preload this application so that it is available instantly.</string>
                     </property>
                 </widget>
-                <widget row="2"  column="0" >
-                    <class>QLabel</class>
+                <widget row="0"  column="1" >
+                    <class>QLineEdit</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>typeLabel</cstring>
+                        <cstring>docname</cstring>
                     </property>
                     <property stdset="1">
-                        <name>focusPolicy</name>
-                        <enum>NoFocus</enum>
+                        <name>sizePolicy</name>
+                        <sizepolicy>
+                            <hsizetype>7</hsizetype>
+                            <vsizetype>0</vsizetype>
+                        </sizepolicy>
                     </property>
@@ -136,9 +135,7 @@
                         <name>text</name>
-                        <string>Type:</string>
-                    </property>
-                    <property>
-                        <name>layoutMargin</name>
+                        <string></string>
                     </property>
                     <property>
-                        <name>layoutSpacing</name>
+                        <name>whatsThis</name>
+                        <string>The name of this document.</string>
                     </property>
@@ -163,14 +160,11 @@
                 </widget>
-                <widget row="0"  column="1" >
-                    <class>QLineEdit</class>
+                <widget row="2"  column="0" >
+                    <class>QLabel</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>docname</cstring>
+                        <cstring>typeLabel</cstring>
                     </property>
                     <property stdset="1">
-                        <name>sizePolicy</name>
-                        <sizepolicy>
-                            <hsizetype>7</hsizetype>
-                            <vsizetype>0</vsizetype>
-                        </sizepolicy>
+                        <name>focusPolicy</name>
+                        <enum>NoFocus</enum>
                     </property>
@@ -178,10 +172,12 @@
                         <name>text</name>
-                        <string></string>
+                        <string>Type:</string>
                     </property>
                     <property>
-                        <name>whatsThis</name>
-                        <string>The name of this document.</string>
+                        <name>layoutMargin</name>
+                    </property>
+                    <property>
+                        <name>layoutSpacing</name>
                     </property>
                 </widget>
-                <widget row="0"  column="0" >
+                <widget row="2"  column="1" >
                     <class>QLabel</class>
@@ -189,7 +185,3 @@
                         <name>name</name>
-                        <cstring>TextLabel1</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>frameShadow</name>
-                        <enum>MShadow</enum>
+                        <cstring>type</cstring>
                     </property>
@@ -197,3 +189,3 @@
                         <name>text</name>
-                        <string>Name:</string>
+                        <string></string>
                     </property>
@@ -228,3 +220,3 @@
                 </widget>
-                <widget row="2"  column="1" >
+                <widget row="0"  column="0" >
                     <class>QLabel</class>
@@ -232,3 +224,7 @@
                         <name>name</name>
-                        <cstring>type</cstring>
+                        <cstring>TextLabel1</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>frameShadow</name>
+                        <enum>MShadow</enum>
                     </property>
@@ -236,3 +232,3 @@
                         <name>text</name>
-                        <string></string>
+                        <string>Name:</string>
                     </property>
@@ -250,2 +246,229 @@
                 </widget>
+                <widget row="6"  column="0"  rowspan="1"  colspan="2" >
+                    <class>QButtonGroup</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>rotateButtons</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>frameShape</name>
+                        <enum>NoFrame</enum>
+                    </property>
+                    <property stdset="1">
+                        <name>title</name>
+                        <string></string>
+                    </property>
+                    <property stdset="1">
+                        <name>exclusive</name>
+                        <bool>true</bool>
+                    </property>
+                    <property>
+                        <name>layoutMargin</name>
+                    </property>
+                    <property>
+                        <name>layoutSpacing</name>
+                    </property>
+                    <hbox>
+                        <property stdset="1">
+                            <name>margin</name>
+                            <number>0</number>
+                        </property>
+                        <property stdset="1">
+                            <name>spacing</name>
+                            <number>3</number>
+                        </property>
+                        <spacer>
+                            <property>
+                                <name>name</name>
+                                <cstring>s1</cstring>
+                            </property>
+                            <property stdset="1">
+                                <name>orientation</name>
+                                <enum>Horizontal</enum>
+                            </property>
+                            <property stdset="1">
+                                <name>sizeType</name>
+                                <enum>Fixed</enum>
+                            </property>
+                            <property>
+                                <name>sizeHint</name>
+                                <size>
+                                    <width>20</width>
+                                    <height>28</height>
+                                </size>
+                            </property>
+                        </spacer>
+                        <widget>
+                            <class>QToolButton</class>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>ToolButton1</cstring>
+                            </property>
+                            <property stdset="1">
+                                <name>text</name>
+                                <string></string>
+                            </property>
+                            <property stdset="1">
+                                <name>pixmap</name>
+                                <pixmap>image0</pixmap>
+                            </property>
+                            <property stdset="1">
+                                <name>toggleButton</name>
+                                <bool>true</bool>
+                            </property>
+                            <property stdset="1">
+                                <name>on</name>
+                                <bool>false</bool>
+                            </property>
+                            <property stdset="1">
+                                <name>usesBigPixmap</name>
+                                <bool>true</bool>
+                            </property>
+                            <property stdset="1">
+                                <name>toggleButton</name>
+                                <bool>true</bool>
+                            </property>
+                            <property stdset="1">
+                                <name>on</name>
+                                <bool>false</bool>
+                            </property>
+                            <property stdset="1">
+                                <name>buttonGroupId</name>
+                                <number>0</number>
+                            </property>
+                        </widget>
+                        <widget>
+                            <class>QToolButton</class>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>ToolButton2</cstring>
+                            </property>
+                            <property stdset="1">
+                                <name>text</name>
+                                <string></string>
+                            </property>
+                            <property stdset="1">
+                                <name>pixmap</name>
+                                <pixmap>image1</pixmap>
+                            </property>
+                            <property stdset="1">
+                                <name>toggleButton</name>
+                                <bool>true</bool>
+                            </property>
+                            <property stdset="1">
+                                <name>usesBigPixmap</name>
+                                <bool>true</bool>
+                            </property>
+                            <property stdset="1">
+                                <name>toggleButton</name>
+                                <bool>true</bool>
+                            </property>
+                            <property stdset="1">
+                                <name>buttonGroupId</name>
+                                <number>1</number>
+                            </property>
+                        </widget>
+                        <widget>
+                            <class>QToolButton</class>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>ToolButton3</cstring>
+                            </property>
+                            <property stdset="1">
+                                <name>text</name>
+                                <string></string>
+                            </property>
+                            <property stdset="1">
+                                <name>pixmap</name>
+                                <pixmap>image2</pixmap>
+                            </property>
+                            <property stdset="1">
+                                <name>toggleButton</name>
+                                <bool>true</bool>
+                            </property>
+                            <property stdset="1">
+                                <name>usesBigPixmap</name>
+                                <bool>true</bool>
+                            </property>
+                            <property stdset="1">
+                                <name>toggleButton</name>
+                                <bool>true</bool>
+                            </property>
+                            <property stdset="1">
+                                <name>buttonGroupId</name>
+                                <number>2</number>
+                            </property>
+                        </widget>
+                        <widget>
+                            <class>QToolButton</class>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>ToolButton4</cstring>
+                            </property>
+                            <property stdset="1">
+                                <name>text</name>
+                                <string></string>
+                            </property>
+                            <property stdset="1">
+                                <name>pixmap</name>
+                                <pixmap>image3</pixmap>
+                            </property>
+                            <property stdset="1">
+                                <name>toggleButton</name>
+                                <bool>true</bool>
+                            </property>
+                            <property stdset="1">
+                                <name>usesBigPixmap</name>
+                                <bool>true</bool>
+                            </property>
+                            <property stdset="1">
+                                <name>toggleButton</name>
+                                <bool>true</bool>
+                            </property>
+                            <property stdset="1">
+                                <name>buttonGroupId</name>
+                                <number>3</number>
+                            </property>
+                        </widget>
+                        <spacer>
+                            <property>
+                                <name>name</name>
+                                <cstring>s4</cstring>
+                            </property>
+                            <property stdset="1">
+                                <name>orientation</name>
+                                <enum>Horizontal</enum>
+                            </property>
+                            <property stdset="1">
+                                <name>sizeType</name>
+                                <enum>MinimumExpanding</enum>
+                            </property>
+                            <property>
+                                <name>sizeHint</name>
+                                <size>
+                                    <width>20</width>
+                                    <height>20</height>
+                                </size>
+                            </property>
+                        </spacer>
+                    </hbox>
+                </widget>
+                <widget row="7"  column="0"  rowspan="1"  colspan="2" >
+                    <class>QLabel</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>labelspacer</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>sizePolicy</name>
+                        <sizepolicy>
+                            <hsizetype>1</hsizetype>
+                            <vsizetype>7</vsizetype>
+                        </sizepolicy>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string></string>
+                    </property>
+                </widget>
                 <widget row="4"  column="0"  rowspan="1"  colspan="2" >
@@ -271,2 +494,13 @@
                 </widget>
+                <widget row="3"  column="0" >
+                    <class>QLabel</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>commentLabel</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Comment:</string>
+                    </property>
+                </widget>
             </grid>
@@ -405,3 +639,3 @@
         </sizepolicy>
-        <pixmap>image0</pixmap>
+        <pixmap>image4</pixmap>
     </customwidget>
@@ -411,2 +645,18 @@
         <name>image0</name>
+        <data format="XPM.GZ" length="1226">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523236520022230543251d2e253d856405bffcbc54105b19c856360003b014013032d4282b2b13366708a951067908240fa6a00a95612cb01a6528d04362e92158e0a40213830510c4546598dd103570b72098482ea3ae1ac2eec1ef2f6565d4f051c6123e3035f8c1a81a2aa8a9b5e60200f6abd263</data>
+    </image>
+    <image>
+        <name>image1</name>
+        <data format="XPM.GZ" length="1226">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523236520022230543251d2e253d856405bffcbc54105b19c856360003b01416a0ac8c6053a2061960aa019b806c0ca61a65a81a7c764125e9a486b07b40d2cacaf8fd0555a4875f0d0620cf1c22dc33d8c2197fda504605e4ab41b5129f7b3001b630c46317f16a88cb17c814add5d02ecdd75a730100b509d263</data>
+    </image>
+    <image>
+        <name>image2</name>
+        <data format="XPM.GZ" length="1226">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523236520022230543251d2e253d856405bffcbc54105b19c856360003b0140130aa863a6a9495f5f49441002c02664030840d53a3ac0c53a40c67c25950bb60d27a70857a08268a7b20164059082695d510e31e62fc85193e7aa8e1832568a1eaf1c6c5e053a34c500d0a18b66a6aadb9001be4d263</data>
+    </image>
+    <image>
+        <name>image3</name>
+        <data format="XPM.GZ" length="1226">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523236520022230543251d2e253d856405bffcbc54105b19c856360003b014125006013d5480a64659198b22543510697445e86a9029daaad183ba87809bb1788c7435d8019a392872cad8d5a002b2d510e777648ad66a08a70d62d2185169152b1819699ec870c634869cf48c1e7cc4aba9b5e602005d86d263</data>
+    </image>
+    <image>
+        <name>image4</name>
         <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data>
@@ -414,2 +664,10 @@
 </images>
+<connections>
+    <connection>
+        <sender>rotate</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>rotateButtons</receiver>
+        <slot>setEnabled(bool)</slot>
+    </connection>
+</connections>
 <tabstops>