Merge lp:~didrocks/unity-2d/subdatadir into lp:unity-2d

[Didier Roche-Tolomelli]

[launcher] Enable storing subdir (like kde4/) in the gsettings schema.
For instance /usr/share/applications/kde4/konversation.desktop should be stored
as kde4-konversation.desktop.

This is valid for all .desktop file in XDG_DATA_DIR/applications.
Note that full path and relative path are still supported

[lp:~didrocks/unity-2d/subdatadir]

637. By Didier Roche-Tolomelli on 2011-08-04

fix typo

[Aurélien Gâteau (agateau)]

Works fine, thanks!

I have a few remarks regarding implementation, though:

# Coding style
This file is old and does not comply with unity-2d coding style, but we try to ensure new code does comply. Changes to do are:
- Use camelCase for variables
- Use curly braces for single line ifs
- Attach opening curly brace with the previous line (ie: "if (foo) {", not "if (foo)\n{")
- Whenever possible, use const refs for looping variables in Q_FOREACH

See the CODING file at the root of the repository

# Implementation
- What you are storing in m_xdg_data_dirs is no longer the list of data dirs, it is the list of application dirs. I would suggest renaming the variable to m_xdgApplicationDirs and implement the parsing this way:

Q_FOREACH(const QString& dirName, xdgString.split(':')) {
    m_xdgApplicationDirs << QDir::cleanPath(dirName + "/applications/");
}

- favoriteFromDesktopFilePath() is no longer a static method but it does not modify the object, so it should be marked "const".

review: Needs Fixing

[Didier Roche-Tolomelli (didrocks)]

Thanks Aurélien.

The new version (once the network will allow me to push it) should address all the concerns there. Please note that I slightly changed your example code (as cleanPath remove the final "/").

[lp:~didrocks/unity-2d/subdatadir]

638. By Didier Roche-Tolomelli on 2011-08-08

make it more elegant, follow unity-2d guidelines and send a reference for favoriteFromDesktopFilePath (LP: #741129)

639. By Didier Roche-Tolomelli on 2011-08-09

fixing coding guidelines

[Aurélien Gâteau (agateau)]

Looks good, approved.

review: Approve

=== modified file 'libunity-2d-private/src/launcherapplicationslist.cpp'
--- libunity-2d-private/src/launcherapplicationslist.cpp	2011-07-29 13:49:34 +0000
+++ libunity-2d-private/src/launcherapplicationslist.cpp	2011-08-09 09:23:30 +0000
@@ -101,6 +101,16 @@
         application->installX11EventFilter(this);
     }
 
+    /* Get the system applications data dirs and be flexible if / is not at the
+       end of each path. */
+    QString xdgDataDir = QFile::decodeName(getenv("XDG_DATA_DIRS"));
+    if (xdgDataDir.isEmpty()) {
+        xdgDataDir = "/usr/local/share/:/usr/share/";
+    }
+    Q_FOREACH(const QString& dirName, xdgDataDir.split(':')) {
+      m_xdgApplicationDirs << QDir::cleanPath(dirName + "/applications") + "/";
+    }
+
     load();
 }
 
@@ -178,9 +188,17 @@
 }
 
 QString
-LauncherApplicationsList::favoriteFromDesktopFilePath(QString desktop_file)
+LauncherApplicationsList::favoriteFromDesktopFilePath(const QString& _desktopFile) const
 {
-    return QDir(desktop_file).dirName();
+    QString desktopFile(_desktopFile);
+    Q_FOREACH(const QString& applicationDir, m_xdgApplicationDirs) {
+        if (_desktopFile.startsWith(applicationDir)) {
+            desktopFile.remove(applicationDir);
+            desktopFile.replace("/", "-");
+            break;
+        }
+    }
+    return desktopFile;
 }
 
 void
 
=== modified file 'libunity-2d-private/src/launcherapplicationslist.h'
--- libunity-2d-private/src/launcherapplicationslist.h	2011-07-29 13:49:34 +0000
+++ libunity-2d-private/src/launcherapplicationslist.h	2011-08-09 09:23:30 +0000
@@ -71,7 +71,7 @@
     void insertApplication(LauncherApplication* application);
     void removeApplication(LauncherApplication* application);
 
-    static QString favoriteFromDesktopFilePath(QString desktop_file);
+    QString favoriteFromDesktopFilePath(const QString& desktop_file) const;
 
     void writeFavoritesToGConf();
 
@@ -90,6 +90,7 @@
     */
     QHash<QString, LauncherApplication*> m_applicationForExecutable;
     QConf* m_dconf_launcher;
+    QStringList m_xdgApplicationDirs;
 
     /* Startup notification support */
     SnDisplay *m_snDisplay;