Merge lp:~uriboni/unity-2d/dash-use-search-hint into lp:unity-2d/3.0

[Ugo Riboni]

[dash] Use the SearchHint from the .place file to choose what to display in the search box for a place entry.

[Aurélien Gâteau (agateau)]

Looks good. Just a minor coding style nitpick: setSearchHint argument should be "const QString&", same for searchHintChanged(), that's slightly more efficient. Feel free to mark the MR as approved when this is fixed.

review: Needs Fixing

[Ugo Riboni (uriboni)]

Let's take care of that in a separate review. All the other set* methods in that class that are of type QString are not using const QString&, so let's keep it consistent for now and fix it later all in one go. I added a FIXME.

[lp:~uriboni/unity-2d/dash-use-search-hint]

463. By Ugo Riboni on 2011-03-22

Add FIXME to suggest possible optimization later

464. By Ugo Riboni on 2011-03-22

Optimize property setter

[Aurélien Gâteau (agateau)]

review: Approve

=== modified file 'launcher/UnityApplications/place.cpp'
--- launcher/UnityApplications/place.cpp	2011-03-11 09:16:42 +0000
+++ launcher/UnityApplications/place.cpp	2011-03-22 15:21:51 +0000
@@ -98,6 +98,7 @@
             // FIXME: extract localized name
             entry->setName(m_file->value("Name").toString());
             entry->setIcon(m_file->value("Icon").toString());
+            entry->setSearchHint(m_file->value("SearchHint").toString());
             m_file->endGroup();
             entry->setPosition(i++);
             connect(entry, SIGNAL(positionChanged(uint)),

=== modified file 'launcher/UnityApplications/placeentry.cpp'
--- launcher/UnityApplications/placeentry.cpp	2011-03-17 10:42:46 +0000
+++ launcher/UnityApplications/placeentry.cpp	2011-03-22 15:21:51 +0000
@@ -347,6 +347,12 @@
     return m_hints;
 }
 
+QString
+PlaceEntry::searchHint() const
+{
+    return m_searchHint;
+}
+
 int
 PlaceEntry::activeSection() const
 {
@@ -531,6 +537,15 @@
 }
 
 void
+PlaceEntry::setSearchHint(const QString& searchHint)
+{
+    if (m_searchHint != searchHint) {
+        m_searchHint = searchHint;
+        Q_EMIT searchHintChanged(m_searchHint);
+    }
+}
+
+void
 PlaceEntry::setActiveSection(int activeSection)
 {
     if (activeSection != m_activeSection) {

=== modified file 'launcher/UnityApplications/placeentry.h'
--- launcher/UnityApplications/placeentry.h	2011-03-17 10:03:05 +0000
+++ launcher/UnityApplications/placeentry.h	2011-03-22 15:21:51 +0000
@@ -79,6 +79,7 @@
     Q_PROPERTY(bool sensitive READ sensitive WRITE setSensitive NOTIFY sensitiveChanged)
     Q_PROPERTY(DeeListModel* sections READ sections WRITE setSections NOTIFY sectionsChanged)
     Q_PROPERTY(QMap hints READ hints WRITE setHints NOTIFY hintsChanged)
+    Q_PROPERTY(QString searchHint READ searchHint WRITE setSearchHint NOTIFY searchHintChanged)
     Q_PROPERTY(int activeSection READ activeSection WRITE setActiveSection NOTIFY activeSectionChanged)
     Q_PROPERTY(bool active READ active WRITE setActive NOTIFY activeChanged)
     Q_PROPERTY(Place* place READ place)
@@ -123,6 +124,7 @@
     bool sensitive() const;
     DeeListModel* sections() const;
     QMap<QString, QVariant> hints() const;
+    QString searchHint() const;
     int activeSection() const;
     Place* place() const;
 
@@ -143,6 +145,8 @@
     QMap<QString, QVariant> globalRendererHints() const;
 
     /* setters */
+    /* FIXME: all setters of type QString should be optimized
+       by having the argument as cont QString& */
     void setName(QString);
     void setIcon(QString);
     void setFileName(QString);
@@ -154,6 +158,7 @@
     void setSensitive(bool);
     void setSections(DeeListModel*);
     void setHints(QMap<QString, QVariant>);
+    void setSearchHint(const QString&);
     void setActiveSection(int);
     void setActive(bool);
 
@@ -189,6 +194,7 @@
     void sensitiveChanged(bool);
     void sectionsChanged();
     void hintsChanged();
+    void searchHintChanged(QString);
     void activeSectionChanged();
     void activeChanged();
 
@@ -226,6 +232,7 @@
        QVariant values in order to allow exposing it as a property (see
        http://doc.trolltech.com/properties.html#requirements-for-declaring-properties). */
     QMap<QString, QVariant> m_hints;
+    QString m_searchHint;
     int m_activeSection;
     bool m_active;
     Place* m_place;

=== modified file 'places/SearchEntry.qml'
--- places/SearchEntry.qml	2011-03-22 06:15:19 +0000
+++ places/SearchEntry.qml	2011-03-22 15:21:51 +0000
@@ -157,10 +157,10 @@
                 text: {
                     if(search_input.text)
                         return ""
-                    else if(dash.currentPage != undefined && dash.currentPage.model.name)
-                        return u2d.tr("Search for %1").arg(dash.currentPage.model.name)
+                    else if(dash.currentPage != undefined && dash.currentPage.model.searchHint)
+                        return dash.currentPage.model.searchHint
                     else
-                        return u2d.tr("Search")
+                        return ""
                 }
             }
         }