From 82e19a10f13005a327b134999315ecf39d5d70e3 Mon Sep 17 00:00:00 2001
From: Alessandro Portale <aportale@trolltech.com>
Date: Mon, 15 Jun 2009 19:40:18 +0200
Subject: Fix for Task #256174

Bring back the keyPad Navigation focus visualization. It disappeared
with commit e0690577327097ec3d9be99205bfcf01f8404d23
---
 src/gui/styles/qs60style.cpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp
index c6118d6..1292092 100644
--- a/src/gui/styles/qs60style.cpp
+++ b/src/gui/styles/qs60style.cpp
@@ -2038,16 +2038,12 @@ void QS60Style::drawPrimitive(PrimitiveElement element, const QStyleOption *opti
 #endif //QT_NO_SPINBOX
     case PE_FrameFocusRect:
 // Calendar widget and combox both do not use styled itemDelegate
-        if ( widget && (
+        if (!(false
 #ifndef QT_NO_CALENDARWIDGET
-             (qobject_cast<const QCalendarWidget *>(widget->parent()))
-#else
-             false
+            || (widget && qobject_cast<const QCalendarWidget *>(widget->parent()))
 #endif //QT_NO_CALENDARWIDGET
 #ifndef QT_NO_COMBOBOX
             || (qobject_cast<const QComboBoxListView *>(widget))
-#else
-            || false
 #endif //QT_NO_COMBOBOX
             )) {
             // no focus selection for touch
@@ -2326,6 +2322,7 @@ int QS60Style::styleHint(StyleHint sh, const QStyleOption *opt, const QWidget *w
             break;
         case SH_UnderlineShortcut:
             retValue = 0;
+			break;
         default:
             break;
     }
-- 
cgit v0.12


From de3e3d6bff2b585524cd504cf052cf181a6c2eae Mon Sep 17 00:00:00 2001
From: Alessandro Portale <aportale@trolltech.com>
Date: Mon, 15 Jun 2009 23:29:19 +0200
Subject: Fix commit 82e19a10f13005a327b134999315ecf39d5d70e3

---
 src/gui/styles/qs60style.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp
index 29827b7..d2bd679 100644
--- a/src/gui/styles/qs60style.cpp
+++ b/src/gui/styles/qs60style.cpp
@@ -2038,12 +2038,12 @@ void QS60Style::drawPrimitive(PrimitiveElement element, const QStyleOption *opti
 #endif //QT_NO_SPINBOX
     case PE_FrameFocusRect:
 // Calendar widget and combox both do not use styled itemDelegate
-        if (!(false
+        if (widget && !(false
 #ifndef QT_NO_CALENDARWIDGET
-            || (widget && qobject_cast<const QCalendarWidget *>(widget->parent()))
+            || qobject_cast<const QCalendarWidget *>(widget->parent())
 #endif //QT_NO_CALENDARWIDGET
 #ifndef QT_NO_COMBOBOX
-            || (qobject_cast<const QComboBoxListView *>(widget))
+            || qobject_cast<const QComboBoxListView *>(widget)
 #endif //QT_NO_COMBOBOX
             )) {
             // no focus selection for touch
@@ -2322,7 +2322,7 @@ int QS60Style::styleHint(StyleHint sh, const QStyleOption *opt, const QWidget *w
             break;
         case SH_UnderlineShortcut:
             retValue = 0;
-			break;
+            break;
         default:
             break;
     }
-- 
cgit v0.12


From 4f734500e1833d43805d39747f94bb77e47ebbe3 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Tue, 16 Jun 2009 09:23:24 +0300
Subject: New screenshots for S60 fluidlauncher.

---
 demos/embedded/fluidlauncher/config_s60/config.xml    |  18 +++++++++---------
 .../embedded/fluidlauncher/screenshots/context2d.png  | Bin 23995 -> 0 bytes
 .../fluidlauncher/screenshots/context2d_s60.png       | Bin 0 -> 49182 bytes
 .../fluidlauncher/screenshots/desktopservices.png     | Bin 43341 -> 0 bytes
 .../fluidlauncher/screenshots/desktopservices_s60.png | Bin 0 -> 38216 bytes
 .../embedded/fluidlauncher/screenshots/drilldown.png  | Bin 102922 -> 0 bytes
 .../fluidlauncher/screenshots/drilldown_s60.png       | Bin 0 -> 60089 bytes
 .../screenshots/embeddedsvgviewer_s60.png             | Bin 0 -> 42764 bytes
 .../fluidlauncher/screenshots/fridgemagnets.png       | Bin 50464 -> 0 bytes
 .../fluidlauncher/screenshots/fridgemagnets_s60.png   | Bin 0 -> 45318 bytes
 demos/embedded/fluidlauncher/screenshots/ftp.png      | Bin 29831 -> 0 bytes
 demos/embedded/fluidlauncher/screenshots/ftp_s60.png  | Bin 0 -> 38370 bytes
 .../fluidlauncher/screenshots/saxbookmarks.png        | Bin 27098 -> 0 bytes
 .../fluidlauncher/screenshots/saxbookmarks_s60.png    | Bin 0 -> 56905 bytes
 .../fluidlauncher/screenshots/styledemo_s60.png       | Bin 0 -> 63062 bytes
 .../embedded/fluidlauncher/screenshots/wiggly_s60.png | Bin 0 -> 7950 bytes
 16 files changed, 9 insertions(+), 9 deletions(-)
 delete mode 100644 demos/embedded/fluidlauncher/screenshots/context2d.png
 create mode 100644 demos/embedded/fluidlauncher/screenshots/context2d_s60.png
 delete mode 100644 demos/embedded/fluidlauncher/screenshots/desktopservices.png
 create mode 100644 demos/embedded/fluidlauncher/screenshots/desktopservices_s60.png
 delete mode 100644 demos/embedded/fluidlauncher/screenshots/drilldown.png
 create mode 100644 demos/embedded/fluidlauncher/screenshots/drilldown_s60.png
 create mode 100644 demos/embedded/fluidlauncher/screenshots/embeddedsvgviewer_s60.png
 delete mode 100644 demos/embedded/fluidlauncher/screenshots/fridgemagnets.png
 create mode 100644 demos/embedded/fluidlauncher/screenshots/fridgemagnets_s60.png
 delete mode 100644 demos/embedded/fluidlauncher/screenshots/ftp.png
 create mode 100644 demos/embedded/fluidlauncher/screenshots/ftp_s60.png
 delete mode 100644 demos/embedded/fluidlauncher/screenshots/saxbookmarks.png
 create mode 100644 demos/embedded/fluidlauncher/screenshots/saxbookmarks_s60.png
 create mode 100644 demos/embedded/fluidlauncher/screenshots/styledemo_s60.png
 create mode 100644 demos/embedded/fluidlauncher/screenshots/wiggly_s60.png

diff --git a/demos/embedded/fluidlauncher/config_s60/config.xml b/demos/embedded/fluidlauncher/config_s60/config.xml
index 41b3b6d..0cde71b 100644
--- a/demos/embedded/fluidlauncher/config_s60/config.xml
+++ b/demos/embedded/fluidlauncher/config_s60/config.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <demolauncher>
   <demos>
-    <example filename="embeddedsvgviewer" name="SVG Viewer" image="screenshots/embeddedsvgviewer.png" args="/data/images/qt/demos/embeddedsvgviewer/shapes.svg"/>
-    <example filename="styledemo" name="Stylesheets" image="screenshots/styledemo.png"/>
+    <example filename="embeddedsvgviewer_s60" name="SVG Viewer" image="screenshots/embeddedsvgviewer_s60.png" args="/data/images/qt/demos/embeddedsvgviewer/shapes.svg"/>
+    <example filename="styledemo_s60" name="Stylesheets" image="screenshots/styledemo_s60.png"/>
     <example filename="deform" name="Vector Deformation" image="screenshots/deform.png" args="-small-screen"/>
     <example filename="pathstroke" name="Path Stroking" image="screenshots/pathstroke.png" args="-small-screen"/>
-    <example filename="wiggly" name="Wiggly Text" image="screenshots/wiggly.png" args="-small-screen"/>
-    <example filename="ftp" name="Ftp Client" image="screenshots/ftp.png"/>
-    <example filename="context2d" name="Context2d" image="screenshots/context2d.png"/>
-    <example filename="saxbookmarks" name="SaxBookmarks" image="screenshots/saxbookmarks.png"/>
-    <example filename="desktopservices" name="Desktop Services" image="screenshots/desktopservices.png"/>
-    <example filename="fridgemagnets" name="Fridge Magnets" image="screenshots/fridgemagnets.png" args="-small-screen"/>
-    <example filename="drilldown" name="Drilldown" image="screenshots/drilldown.png"/>
+    <example filename="wiggly_s60" name="Wiggly Text" image="screenshots/wiggly_s60.png" args="-small-screen"/>
+    <example filename="ftp_s60" name="Ftp Client" image="screenshots/ftp_s60.png"/>
+    <example filename="context2d_s60" name="Context2d" image="screenshots/context2d_s60.png"/>
+    <example filename="saxbookmarks_s60" name="SaxBookmarks" image="screenshots/saxbookmarks_s60.png"/>
+    <example filename="desktopservices_s60" name="Desktop Services" image="screenshots/desktopservices_s60.png"/>
+    <example filename="fridgemagnets_s60" name="Fridge Magnets" image="screenshots/fridgemagnets_s60.png" args="-small-screen"/>
+    <example filename="drilldown_s60" name="Drilldown" image="screenshots/drilldown_s60.png"/>
   </demos>
   <slideshow timeout="60000" interval="10000">
     <imagedir dir="slides"/>
diff --git a/demos/embedded/fluidlauncher/screenshots/context2d.png b/demos/embedded/fluidlauncher/screenshots/context2d.png
deleted file mode 100644
index d571546..0000000
Binary files a/demos/embedded/fluidlauncher/screenshots/context2d.png and /dev/null differ
diff --git a/demos/embedded/fluidlauncher/screenshots/context2d_s60.png b/demos/embedded/fluidlauncher/screenshots/context2d_s60.png
new file mode 100644
index 0000000..a53f5b0
Binary files /dev/null and b/demos/embedded/fluidlauncher/screenshots/context2d_s60.png differ
diff --git a/demos/embedded/fluidlauncher/screenshots/desktopservices.png b/demos/embedded/fluidlauncher/screenshots/desktopservices.png
deleted file mode 100644
index a8d82ce..0000000
Binary files a/demos/embedded/fluidlauncher/screenshots/desktopservices.png and /dev/null differ
diff --git a/demos/embedded/fluidlauncher/screenshots/desktopservices_s60.png b/demos/embedded/fluidlauncher/screenshots/desktopservices_s60.png
new file mode 100644
index 0000000..f4aa1a2
Binary files /dev/null and b/demos/embedded/fluidlauncher/screenshots/desktopservices_s60.png differ
diff --git a/demos/embedded/fluidlauncher/screenshots/drilldown.png b/demos/embedded/fluidlauncher/screenshots/drilldown.png
deleted file mode 100644
index 413d713..0000000
Binary files a/demos/embedded/fluidlauncher/screenshots/drilldown.png and /dev/null differ
diff --git a/demos/embedded/fluidlauncher/screenshots/drilldown_s60.png b/demos/embedded/fluidlauncher/screenshots/drilldown_s60.png
new file mode 100644
index 0000000..50376c1
Binary files /dev/null and b/demos/embedded/fluidlauncher/screenshots/drilldown_s60.png differ
diff --git a/demos/embedded/fluidlauncher/screenshots/embeddedsvgviewer_s60.png b/demos/embedded/fluidlauncher/screenshots/embeddedsvgviewer_s60.png
new file mode 100644
index 0000000..11459dc
Binary files /dev/null and b/demos/embedded/fluidlauncher/screenshots/embeddedsvgviewer_s60.png differ
diff --git a/demos/embedded/fluidlauncher/screenshots/fridgemagnets.png b/demos/embedded/fluidlauncher/screenshots/fridgemagnets.png
deleted file mode 100644
index 87b9099..0000000
Binary files a/demos/embedded/fluidlauncher/screenshots/fridgemagnets.png and /dev/null differ
diff --git a/demos/embedded/fluidlauncher/screenshots/fridgemagnets_s60.png b/demos/embedded/fluidlauncher/screenshots/fridgemagnets_s60.png
new file mode 100644
index 0000000..56da9dc
Binary files /dev/null and b/demos/embedded/fluidlauncher/screenshots/fridgemagnets_s60.png differ
diff --git a/demos/embedded/fluidlauncher/screenshots/ftp.png b/demos/embedded/fluidlauncher/screenshots/ftp.png
deleted file mode 100644
index fae7ffc..0000000
Binary files a/demos/embedded/fluidlauncher/screenshots/ftp.png and /dev/null differ
diff --git a/demos/embedded/fluidlauncher/screenshots/ftp_s60.png b/demos/embedded/fluidlauncher/screenshots/ftp_s60.png
new file mode 100644
index 0000000..ea6a321
Binary files /dev/null and b/demos/embedded/fluidlauncher/screenshots/ftp_s60.png differ
diff --git a/demos/embedded/fluidlauncher/screenshots/saxbookmarks.png b/demos/embedded/fluidlauncher/screenshots/saxbookmarks.png
deleted file mode 100644
index 6a2b07f..0000000
Binary files a/demos/embedded/fluidlauncher/screenshots/saxbookmarks.png and /dev/null differ
diff --git a/demos/embedded/fluidlauncher/screenshots/saxbookmarks_s60.png b/demos/embedded/fluidlauncher/screenshots/saxbookmarks_s60.png
new file mode 100644
index 0000000..c451198
Binary files /dev/null and b/demos/embedded/fluidlauncher/screenshots/saxbookmarks_s60.png differ
diff --git a/demos/embedded/fluidlauncher/screenshots/styledemo_s60.png b/demos/embedded/fluidlauncher/screenshots/styledemo_s60.png
new file mode 100644
index 0000000..bad9692
Binary files /dev/null and b/demos/embedded/fluidlauncher/screenshots/styledemo_s60.png differ
diff --git a/demos/embedded/fluidlauncher/screenshots/wiggly_s60.png b/demos/embedded/fluidlauncher/screenshots/wiggly_s60.png
new file mode 100644
index 0000000..690ab48
Binary files /dev/null and b/demos/embedded/fluidlauncher/screenshots/wiggly_s60.png differ
-- 
cgit v0.12


From df299de9748adb2cdb21834956907076971ff45d Mon Sep 17 00:00:00 2001
From: Markku Luukkainen <markku.luukkainen@digia.com>
Date: Tue, 16 Jun 2009 09:44:07 +0200
Subject: Bugfix. Softkeys were set to wrong widget when combobox was focused.

---
 examples/widgets/softkeys/softkeys.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/examples/widgets/softkeys/softkeys.cpp b/examples/widgets/softkeys/softkeys.cpp
index 9672aee..e717510 100644
--- a/examples/widgets/softkeys/softkeys.cpp
+++ b/examples/widgets/softkeys/softkeys.cpp
@@ -127,7 +127,9 @@ void MainWindow::addSoftKeys()
     QList<QAction*> softkeys;
     softkeys.append(ok);
     softkeys.append(cancel);
-    pushButton->setSoftKeys(softkeys);
+    QWidget* focusWidget = QApplication::focusWidget();
+    if (focusWidget)
+        focusWidget->setSoftKeys(softkeys);
 }
 
 void MainWindow::exitApplication()
@@ -138,13 +140,17 @@ void MainWindow::exitApplication()
 void MainWindow::okPressed()
 {
     infoLabel->setText(tr("OK pressed"));
-    pushButton->setSoftKey(0);
+    QWidget* focusWidget = QApplication::focusWidget();
+    if (focusWidget)
+        focusWidget->setSoftKey(0);
 }
 
 void MainWindow::cancelPressed()
 {
     infoLabel->setText(tr("Cancel pressed"));
-    pushButton->setSoftKey(0);
+    QWidget* focusWidget = QApplication::focusWidget();
+    if (focusWidget)
+        focusWidget->setSoftKey(0);
 }
 
 
-- 
cgit v0.12