git.iko.soy/unity8
on xenial help sign in
Merge from trunk
commita4cbac43e254f0a94a2ef407a3e9d032dbd06a6f authorMichael Terry <michael.terry@canonical.com> dateWed 4 Sep 2013, 13:14 (13 years ago) parent3cb455d58e3cb6
84 files changed+683−955
compare with xenial
unifiedsplit
Components/EdgeDemo.qml+2−1 Components/EdgeDemoOverlay.qml+5 Dash/DashBar.qml+2−3 Greeter/Infographics.qml+1−2 Greeter/graphics/infographic_circle.png Greeter/graphics/infographic_circle_back.png Launcher/LauncherPanel.qml+6 Panel/Indicators/DefaultIndicatorWidget.qml+1−1 Panel/Indicators/DefaultIndicatorWidget2.qml+43−16 Panel/Indicators/NetworkIndicatorWidget.qml+1−1 build+9 debian/changelog+68 debian/control+1 main.cpp+3−2 plugins/Unity/CMakeLists.txt+1 plugins/Unity/Indicators/qml/MenuItemFactory.qml+1−16 plugins/Unity/Indicators/rootactionstate.cpp+44−14 plugins/Unity/Indicators/rootactionstate.h+9−6 plugins/Unity/Launcher/CMakeLists.txt+4 plugins/Unity/Launcher/backend/launcherbackend.cpp+159−99 plugins/Unity/Launcher/backend/launcherbackend.h+10−12 plugins/Unity/categories.cpp−3 plugins/Unity/categories.h+1−2 plugins/Unity/checkoptionfilter.cpp+3−1 plugins/Unity/filter.h+3−2 plugins/Unity/genericoptionsmodel.cpp+20−3 plugins/Unity/genericoptionsmodel.h+4−2 plugins/Unity/multirangefilter.cpp+3−1 plugins/Unity/radiooptionfilter.cpp+3−1 plugins/Unity/ratingoptionsmodel.cpp+3−3 plugins/Unity/ratingoptionsmodel.h+1−1 plugins/Unity/ratingsfilter.cpp+2−1 plugins/Unity/showallfilteroption.cpp+60 plugins/Unity/showallfilteroption.h+51 plugins/Unity/unityoptionsmodel.cpp+5−4 plugins/Unity/unityoptionsmodel.h+2−1 po/ar.po+2−29 po/az.po+2−8 po/bg.po+2−11 po/ca.po+2−29 po/de.po+2−29 po/el.po+2−8 po/en_AU.po+2−29 po/en_GB.po+2−29 po/eo.po+2−2 po/es.po+2−29 po/fi.po+2−29 po/fo.po+2−8 po/fr.po+2−5 po/gl.po+2−29 po/he.po+2−8 po/hr.po+2−8 po/hu.po+2−17 po/hy.po+2−29 po/id.po+2−2 po/it.po+2−8 po/ja.po+2−2 po/kn.po+2−8 po/ko.po+2−23 po/ky.po+2−8 po/lv.po+2−8 po/my.po+2−8 po/nb.po+2−17 po/nl.po+2−8 po/pl.po+2−29 po/pt_BR.po+2−8 po/ro.po+2−8 po/ru.po+2−29 po/si.po+2−2 po/sl.po+2−23 po/sr.po+2−8 po/sv.po+2−2 po/te.po+2−5 po/tr.po+2−29 po/ug.po+2−29 po/uk.po+2−29 po/zh_CN.po+2−29 po/zh_TW.po+2−29 tests/mocks/Unity/fake_categories.cpp−3 tests/mocks/Unity/fake_categories.h+1−2 tests/plugins/Unity/Launcher/CMakeLists.txt+4 tests/plugins/Unity/Launcher/launcherbackendtest.cpp+1−34 tests/plugins/Unity/filtersbindingstest.cpp+61−30 tests/plugins/Unity/filtersbindingstest.h+1−1
Components/EdgeDemo.qml+2−1
@@ -218,8 +218,9 @@ Item {
218218 d.finalEdgeDemo = d.overlay.createObject(demo.underlay, {
219219 "edge": "none",
220220 "title": i18n.tr("Well done"),
221− "text": i18n.tr("You have now mastered the edge gestures and can start using the phone"),
221+ "text": i18n.tr("You have now mastered the edge gestures and can start using the phone<br><br>Tap anywhere to start"),
222222 "anchors.fill": demo.dash,
223+ "showSkip": false,
223224 });
224225 }
225226 if (d.finalEdgeDemo) {
Components/EdgeDemoOverlay.qml+5
@@ -43,6 +43,11 @@ Showable {
4343 */
4444 property alias skipText: skipLabel.text
4545
46+ /*
47+ * This is the visible status of the skip button.
48+ */
49+ property alias showSkip: skipLabel.visible
50+
4651 /*
4752 * Whether this demo is running currently.
4853 */
Dash/DashBar.qml+2−3
@@ -83,9 +83,8 @@ Item {
8383 }
8484
8585 delegate:
86− Item {
87− signal clicked()
88−
86+ // FIXME: Use Panel's integrated trigger() once that works again.
87+ MouseArea {
8988 width: itemSize
9089 height: dashBar.height
9190 anchors.top: parent.top
Greeter/Infographics.qml+1−2
@@ -286,9 +286,8 @@ Item {
286286 objectName: "backgroundCircle"
287287
288288 anchors.fill: parent
289− opacity: 0.9
290289
291− source: "graphics/infographic_circle.png"
290+ source: "graphics/infographic_circle_back.png"
292291 }
293292
294293 Timer {
Greeter/graphics/infographic_circle.pngdeleted

Binary file not shown.

Greeter/graphics/infographic_circle_back.pngnew file

Binary file not shown.

Launcher/LauncherPanel.qml+6
@@ -512,6 +512,12 @@ Item {
512512 objectName: "quickListEntry" + index
513513 text: (model.clickable ? "" : "<b>") + model.label + (model.clickable ? "" : "</b>")
514514 highlightWhenPressed: model.clickable
515+
516+ // FIXME: This is a workaround for the theme not being context sensitive. I.e. the
517+ // ListItems don't know that they are sitting in a themed Popover where the color
518+ // needs to be inverted.
519+ __foregroundColor: Theme.palette.selected.backgroundText
520+
515521 onClicked: {
516522 if (!model.clickable) {
517523 return;
Panel/Indicators/DefaultIndicatorWidget.qml+1−1
@@ -24,7 +24,7 @@ import Unity.IndicatorsLegacy 0.1 as Indicators
2424Indicators.IndicatorWidget {
2525 id: indicatorWidget
2626
27− width: itemRow.width + units.gu(1)
27+ width: itemRow.width + units.gu(0.5)
2828
2929 property alias label: itemLabel.text
3030 property alias iconSource: itemImage.source
Panel/Indicators/DefaultIndicatorWidget2.qml+43−16
@@ -24,10 +24,11 @@ import Unity.Indicators 0.1 as Indicators
2424Indicators.IndicatorWidget {
2525 id: indicatorWidget
2626
27− width: itemRow.width + units.gu(1)
27+ width: itemRow.width + units.gu(0.5)
2828
29− property alias label: itemLabel.text
30− property alias iconSource: itemImage.source
29+ property alias leftLabel: itemLeftLabel.text
30+ property alias rightLabel: itemRightLabel.text
31+ property var icons: undefined
3132
3233 Row {
3334 id: itemRow
@@ -39,19 +40,43 @@ Indicators.IndicatorWidget {
3940 }
4041 spacing: units.gu(0.5)
4142
42− // FIXME : Should us Ubuntu.Icon . results in low res images
43− Image {
44− id: itemImage
45− objectName: "itemImage"
46− visible: source != ""
47− height: indicatorWidget.iconSize
48− width: indicatorWidget.iconSize
43+ Label {
44+ id: itemLeftLabel
45+ objectName: "leftLabel"
46+ color: Theme.palette.selected.backgroundText
47+ opacity: 0.8
48+ font.family: "Ubuntu"
49+ fontSize: "medium"
4950 anchors.verticalCenter: parent.verticalCenter
51+ visible: text != ""
52+ }
53+
54+ Row {
55+ width: childrenRect.width
56+ anchors {
57+ top: parent.top
58+ bottom: parent.bottom
59+ }
60+ spacing: units.gu(0.5)
61+
62+ Repeater {
63+ model: indicatorWidget.icons
64+
65+ Image {
66+ id: itemImage
67+ objectName: "itemImage"
68+ visible: source != ""
69+ source: modelData
70+ height: indicatorWidget.iconSize
71+ width: indicatorWidget.iconSize
72+ anchors.verticalCenter: parent.verticalCenter
73+ }
74+ }
5075 }
5176
5277 Label {
53− id: itemLabel
54− objectName: "itemLabel"
78+ id: itemRightLabel
79+ objectName: "rightLabel"
5580 color: Theme.palette.selected.backgroundText
5681 opacity: 0.8
5782 font.family: "Ubuntu"
@@ -63,14 +88,16 @@ Indicators.IndicatorWidget {
6388
6489 onActionStateChanged: {
6590 if (actionState == undefined) {
66− label = "";
67− iconSource = "";
91+ leftLabel = "";
92+ rightLabel = "";
93+ icons = undefined;
6894 enabled = false;
6995 return;
7096 }
7197
72− label = actionState.label;
73− iconSource = actionState.icon;
98+ leftLabel = actionState.leftLabel ? actionState.leftLabel : "";
99+ rightLabel = actionState.rightLabel ? actionState.rightLabel : "";
100+ icons = actionState.icons;
74101 enabled = actionState.visible;
75102 }
76103}
Panel/Indicators/NetworkIndicatorWidget.qml+1−1
@@ -24,7 +24,7 @@ import Unity.IndicatorsLegacy 0.1 as Indicators
2424Indicators.IndicatorWidget {
2525 id: indicatorWidget
2626
27− width: networkIcon.width + units.gu(1)
27+ width: networkIcon.width + units.gu(0.5)
2828
2929 property int signalStrength: 0
3030 property int connectionState: Indicators.NetworkConnection.Initial
build+9
@@ -57,6 +57,15 @@ mk_build_deps() {
5757 [ ! -f unity8-build-deps*deb -o $CODE_DIR/debian/control -nt unity8-build-deps*deb ] && mk-build-deps --install --root-cmd sudo $CODE_DIR/debian/control
5858}
5959
60+if [ -f "/usr/bin/ccache" ] ; then
61+ if [ "x$CC" = "x" ]; then
62+ export CC='ccache gcc'
63+ fi
64+ if [ "x$CXX" = "x" ] ; then
65+ export CXX='ccache g++'
66+ fi
67+fi
68+
6069if [ -f "/usr/bin/ninja" ] ; then
6170 GENERATOR="-G Ninja"
6271 # Ninja does not need -j, it parallelizes automatically.
debian/changelog+68
@@ -1,3 +1,71 @@
1+unity8 (7.81.3+13.10.20130904.1-0ubuntu1) saucy; urgency=low
2+
3+ [ Nicolas d'Offay ]
4+ * Switched infographic background at design's request.
5+
6+ [ Ubuntu daily release ]
7+ * Automatic snapshot from revision 287
8+
9+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 04 Sep 2013 07:34:57 +0000
10+
11+unity8 (7.81.3+13.10.20130904-0ubuntu1) saucy; urgency=low
12+
13+ [ mhall119 ]
14+ * Add a little bit of text to the last step of the tour telling the
15+ user how to end it and get to their phone.
16+
17+ [ Jussi Pakkanen ]
18+ * Use CCache if it is installed.
19+
20+ [ Nick Dedekind ]
21+ * Multiple icon/label support for indicators.
22+
23+ [ Albert Astals ]
24+ * Remove unneeded role.
25+
26+ [ Lars Uebernickel ]
27+ * Fall back to "ubuntu-mobile" icon theme if $UBUNTU_ICON_THEME is
28+ unset.
29+
30+ [ Michael Zanetti ]
31+ * Use MouseAreas in DashBar to enable clicking again.
32+ * load launcher default config from existing dconf key.
33+
34+ [ Ubuntu daily release ]
35+ * Automatic snapshot from revision 285
36+
37+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 04 Sep 2013 03:02:57 +0000
38+
39+unity8 (7.81.3+13.10.20130903.1-0ubuntu1) saucy; urgency=low
40+
41+ [ Michael Zanetti ]
42+ * workaround quicklist text color.
43+
44+ [ Ubuntu daily release ]
45+ * Automatic snapshot from revision 277
46+
47+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Tue, 03 Sep 2013 06:09:36 +0000
48+
49+unity8 (7.81.3+13.10.20130830-0ubuntu1) saucy; urgency=low
50+
51+ [ Pawel Stolowski ]
52+ * Implement a virtual 'All' filter option.
53+
54+ [ Ubuntu daily release ]
55+ * Automatic snapshot from revision 275
56+
57+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 30 Aug 2013 12:44:40 +0000
58+
59+unity8 (7.81.3+13.10.20130829.2-0ubuntu1) saucy; urgency=low
60+
61+ [ Michael Terry ]
62+ * Implement launcher item backend via AccountsService.
63+
64+ [ Ubuntu daily release ]
65+ * Automatic snapshot from revision 272
66+
67+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 29 Aug 2013 19:09:44 +0000
68+
169unity8 (7.81.3+13.10.20130829.1-0ubuntu1) saucy; urgency=low
270
371 [ Michael Terry ]
debian/control+1
@@ -9,6 +9,7 @@ Build-Depends: cmake,
99 libgl1-mesa-dev[!armhf] | libgl-dev[!armhf],
1010 libgl1-mesa-dri,
1111 libgles2-mesa-dev[armhf],
12+ libgsettings-qt-dev,
1213 libhud-client2-dev,
1314 libjson-perl,
1415 libnih-dbus-dev,
main.cpp+3−2
@@ -65,9 +65,10 @@ void appendImportPaths(QQmlEngine *engine, const QStringList &paths)
6565
6666void resolveIconTheme() {
6767 const char *ubuntuIconTheme = getenv("UBUNTU_ICON_THEME");
68− if (ubuntuIconTheme != NULL) {
69− QIcon::setThemeName(ubuntuIconTheme);
68+ if (ubuntuIconTheme == NULL) {
69+ ubuntuIconTheme = "ubuntu-mobile";
7070 }
71+ QIcon::setThemeName(ubuntuIconTheme);
7172}
7273} // namespace {
7374
plugins/Unity/CMakeLists.txt+1
@@ -43,6 +43,7 @@ set(QMLPLUGIN_SRC
4343 preview.cpp
4444 previewaction.cpp
4545 previewinfohint.cpp
46+ showallfilteroption.cpp
4647 signalslist.cpp
4748 socialpreview.cpp
4849 socialpreviewcomment.cpp
plugins/Unity/Indicators/qml/MenuItemFactory.qml+1−16
@@ -73,23 +73,8 @@ Item {
7373 'max-icon': 'icon'});
7474 }
7575
76− // FIXME: The interval should be [0.0 - 1.0]. Unfortunately, when
77− // reaching the boundaries (0.0 or 1.0), the value is converted
78− // to an integer when automatically wrapped in a variant when
79− // passed to QStateAction::updateState(…). The server chokes on
80− // those values, complaining that they’re not of the right type…
8176 onChangeState: {
82− if (value == Math.round(value)) {
83− if (value >= maximumValue) {
84− model.changeState(modelIndex, maximumValue - 0.000001);
85− } else if (value <= minimumValue) {
86− model.changeState(modelIndex, minimumValue + 0.000001);
87− } else {
88− model.changeState(modelIndex, value * 1.000001);
89− }
90− } else {
91− model.changeState(modelIndex, value);
92− }
77+ model.changeState(modelIndex, value);
9378 }
9479 }
9580 }
plugins/Unity/Indicators/rootactionstate.cpp+44−14
@@ -108,25 +108,32 @@ bool RootActionState::isValid() const
108108 return m_menu && m_menu->rowCount() > 0;
109109}
110110
111−QString RootActionState::label() const
111+QString RootActionState::leftLabel() const
112112{
113113 if (!isValid()) return QString();
114114
115− return m_cachedState.value("label", QVariant::fromValue(QString())).toString();
115+ return m_cachedState.value("pre-label", QVariant::fromValue(QString())).toString();
116116}
117117
118−QString RootActionState::icon() const
118+QString RootActionState::rightLabel() const
119119{
120120 if (!isValid()) return QString();
121121
122− return m_cachedState.value("icon", QVariant::fromValue(QString())).toString();
122+ return m_cachedState.value("label", QVariant::fromValue(QString())).toString();
123+}
124+
125+QStringList RootActionState::icons() const
126+{
127+ if (!isValid()) return QStringList();
128+
129+ return m_cachedState.value("icons", QVariant::fromValue(QStringList())).toStringList();
123130}
124131
125132QString RootActionState::accessibleName() const
126133{
127134 if (!isValid()) return QString();
128135
129− return m_cachedState.value("accessible-name", QVariant::fromValue(QString())).toString();
136+ return m_cachedState.value("accessible-desc", QVariant::fromValue(QString())).toString();
130137}
131138
132139bool RootActionState::isVisible() const
@@ -198,16 +205,39 @@ QVariant RootActionState::toQVariant(GVariant* state) const
198205 while (g_variant_iter_loop (&iter, "{sv}", &key, &vvalue))
199206 {
200207 QString str = QString::fromUtf8(key);
201− if (str == "icon") {
208+ if (str == "icon" && !qmap.contains("icons")) {
209+ QStringList icons;
210+
202211 // FIXME - should be sending a url.
203− GIcon *icon = g_icon_deserialize (vvalue);
204− if (icon) {
205− qmap.insert(str, iconUri(icon));
206− g_object_unref (icon);
212+ GIcon *gicon = g_icon_deserialize (vvalue);
213+ if (gicon) {
214+ icons << iconUri(gicon);
215+ g_object_unref (gicon);
207216 }
208− else {
209− qmap.insert(str, QVariant(""));
217+ qmap.insert("icons", icons);
218+
219+ } else if (str == "icons") {
220+
221+ QStringList icons;
222+
223+ if (g_variant_type_is_array(g_variant_get_type(vvalue))) {
224+
225+
226+ for (int i = 0, iMax = g_variant_n_children(vvalue); i < iMax; i++) {
227+ GVariant *child = g_variant_get_child_value(vvalue, i);
228+
229+ // FIXME - should be sending a url.
230+ GIcon *gicon = g_icon_deserialize (child);
231+ if (gicon) {
232+ icons << iconUri(gicon);
233+ g_object_unref (gicon);
234+ }
235+ g_variant_unref(child);
236+ }
210237 }
238+ // will overwrite icon.
239+ qmap.insert("icons", icons);
240+
211241 } else {
212242 qmap.insert(str, ActionStateParser::toQVariant(vvalue));
213243 }
@@ -230,12 +260,12 @@ QVariant RootActionState::toQVariant(GVariant* state) const
230260 &visible);
231261
232262 qmap["label"] = label ? QString::fromUtf8(label) : "";
233− qmap["accessible-name"] = accessible_name ? QString::fromUtf8(accessible_name) : "";
263+ qmap["accessible-desc"] = accessible_name ? QString::fromUtf8(accessible_name) : "";
234264 qmap["visible"] = visible;
235265
236266 gicon = g_icon_new_for_string (icon, NULL);
237267 if (gicon) {
238− qmap["icon"] = iconUri(gicon);
268+ qmap["icons"] = QStringList() << iconUri(gicon);
239269 g_object_unref (gicon);
240270 }
241271
plugins/Unity/Indicators/rootactionstate.h+9−6
@@ -32,8 +32,9 @@ class UNITYINDICATORS_EXPORT RootActionState : public ActionStateParser
3232 Q_PROPERTY(UnityMenuModel* menu READ menu WRITE setMenu NOTIFY menuChanged)
3333
3434 Q_PROPERTY(bool valid READ isValid NOTIFY validChanged)
35− Q_PROPERTY(QString label READ label NOTIFY labelChanged)
36− Q_PROPERTY(QString icon READ icon NOTIFY iconChanged)
35+ Q_PROPERTY(QString leftLabel READ leftLabel NOTIFY leftLabelChanged)
36+ Q_PROPERTY(QString rightLabel READ rightLabel NOTIFY rightLabelChanged)
37+ Q_PROPERTY(QStringList icons READ icons NOTIFY iconsChanged)
3738 Q_PROPERTY(QString accessibleName READ accessibleName NOTIFY accessibleNameChanged)
3839 Q_PROPERTY(bool visible READ isVisible NOTIFY visibleChanged)
3940public:
@@ -47,8 +48,9 @@ public:
4748 void setIndex(int index);
4849
4950 bool isValid() const;
50− QString label() const;
51− QString icon() const;
51+ QString leftLabel() const;
52+ QString rightLabel() const;
53+ QStringList icons() const;
5254 QString accessibleName() const;
5355 bool isVisible() const;
5456
@@ -62,8 +64,9 @@ Q_SIGNALS:
6264 void indexChanged();
6365
6466 void validChanged();
65− void labelChanged();
66− void iconChanged();
67+ void leftLabelChanged();
68+ void rightLabelChanged();
69+ void iconsChanged();
6770 void accessibleNameChanged();
6871 void visibleChanged();
6972
plugins/Unity/Launcher/CMakeLists.txt+4
@@ -1,11 +1,13 @@
11include(FindPkgConfig)
22pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=2)
3+pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
34
45add_definitions(-DSM_BUSNAME=systemBus)
56
67include_directories(
78 ${CMAKE_CURRENT_SOURCE_DIR}
89 ${CMAKE_SOURCE_DIR}/plugins/AccountsService
10+ ${GSETTINGS_QT_INCLUDE_DIRS}
911)
1012
1113set(QMLLAUNCHERPLUGIN_SRC
@@ -25,6 +27,8 @@ add_library(UnityLauncher-qml MODULE
2527 ${QMLLAUNCHERPLUGIN_SRC}
2628 )
2729
30+target_link_libraries(UnityLauncher-qml ${GSETTINGS_QT_LDFLAGS})
31+
2832qt5_use_modules(UnityLauncher-qml DBus Qml)
2933
3034# export the qmldir and qmltypes files
plugins/Unity/Launcher/backend/launcherbackend.cpp+159−99
@@ -24,6 +24,18 @@
2424#include <QDir>
2525#include <QDBusArgument>
2626#include <QFileInfo>
27+#include <QGSettings>
28+
29+class LauncherBackendItem
30+{
31+public:
32+ LauncherBackendItem(): pinned(false) {}
33+
34+ QString desktopFile;
35+ QString displayName;
36+ QString icon;
37+ bool pinned;
38+};
2739
2840LauncherBackend::LauncherBackend(bool useStorage, QObject *parent):
2941 QObject(parent),
@@ -32,95 +44,109 @@ LauncherBackend::LauncherBackend(bool useStorage, QObject *parent):
3244 if (useStorage) {
3345 m_accounts = new AccountsService(this);
3446 }
35− setUser(qgetenv("USER"));
47+ m_user = qgetenv("USER");
48+ syncFromAccounts();
3649}
3750
3851LauncherBackend::~LauncherBackend()
3952{
40− clearItems();
41−}
53+ m_storedApps.clear();
4254
43−void LauncherBackend::clearItems()
44−{
45− for (LauncherBackendItem &app: m_storedApps) {
46− delete app.settings;
55+ Q_FOREACH(LauncherBackendItem *item, m_itemCache) {
56+ delete item;
4757 }
48− m_storedApps.clear();
58+ m_itemCache.clear();
4959}
5060
5161QStringList LauncherBackend::storedApplications() const
5262{
53− auto files = QStringList();
54− for (const LauncherBackendItem &app: m_storedApps) {
55− files << app.settings->fileName();
56− }
57− return files;
63+ return m_storedApps;
5864}
5965
6066void LauncherBackend::setStoredApplications(const QStringList &appIds)
6167{
62− // Record all existing pinned apps, so we can notice them in new list
63− auto pinnedItems = QStringList();
64− for (LauncherBackendItem &app: m_storedApps) {
65− if (app.pinned) {
66− pinnedItems.append(app.settings->fileName());
68+ if (appIds.count() < m_storedApps.count()) {
69+ Q_FOREACH(const QString &appId, m_storedApps) {
70+ if (!appIds.contains(appId)) {
71+ delete m_itemCache.take(appId);
72+ }
6773 }
6874 }
69−
70− clearItems();
71−
72− for (const QString &appId: appIds) {
73− loadApp(makeAppDetails(appId, pinnedItems.contains(desktopFile(appId))));
74− }
75−
75+ m_storedApps = appIds;
7676 syncToAccounts();
7777}
7878
7979QString LauncherBackend::desktopFile(const QString &appId) const
8080{
81− QFileInfo fileInfo(QDir("/usr/share/applications"), appId);
82− return fileInfo.absoluteFilePath();
81+ LauncherBackendItem *item = m_itemCache.value(appId);
82+ if (item) {
83+ return item->desktopFile;
84+ }
85+
86+ return findDesktopFile(appId);
8387}
8488
8589QString LauncherBackend::displayName(const QString &appId) const
8690{
87− auto desktopFile = parseDesktopFile(appId);
88− auto displayName = desktopFile->value("Desktop Entry/Name").toString();
89− delete desktopFile;
90− return displayName;
91+ LauncherBackendItem *item = m_itemCache.value(appId);
92+ if (item) {
93+ return item->displayName;
94+ }
95+
96+ QString df = findDesktopFile(appId);
97+ if (!df.isEmpty()) {
98+ LauncherBackendItem *item = parseDesktopFile(df);
99+ m_itemCache.insert(appId, item);
100+ return item->displayName;
101+ }
102+
103+ return QString();
91104}
92105
93106QString LauncherBackend::icon(const QString &appId) const
94107{
95− auto desktopFile = parseDesktopFile(appId);
96− auto iconName = desktopFile->value("Desktop Entry/Icon").toString();
97− delete desktopFile;
98−
99− if (!iconName.isEmpty()) {
100− QFileInfo iconFileInfo(iconName);
101− if (iconFileInfo.isRelative()) {
102− iconName = "image://gicon/" + iconName;
108+ QString iconName;
109+ LauncherBackendItem *item = m_itemCache.value(appId);
110+ if (item) {
111+ iconName = item->icon;
112+ } else {
113+ QString df = findDesktopFile(appId);
114+ if (!df.isEmpty()) {
115+ LauncherBackendItem *item = parseDesktopFile(df);
116+ m_itemCache.insert(appId, item);
117+ iconName = item->icon;
103118 }
104119 }
105120
106− return iconName;
121+ QFileInfo info(iconName);
122+ if (info.exists()) {
123+ return info.absoluteFilePath();
124+ }
125+ return "image://theme/" + iconName;
107126}
108127
109128bool LauncherBackend::isPinned(const QString &appId) const
110129{
111− auto index = findItem(appId);
112− if (index < 0) {
113− return false;
114− } else {
115− return m_storedApps[index].pinned;
130+ LauncherBackendItem *item = m_itemCache.value(appId);
131+ if (item) {
132+ return item->pinned;
116133 }
134+ return false;
117135}
118136
119137void LauncherBackend::setPinned(const QString &appId, bool pinned)
120138{
121− auto index = findItem(appId);
122− if (index >= 0 && !m_storedApps[index].pinned) {
123− m_storedApps[index].pinned = pinned;
139+ if (!m_storedApps.contains(appId)) {
140+ return;
141+ }
142+
143+ LauncherBackendItem *item = m_itemCache.value(appId);
144+ if (!item) {
145+ item = new LauncherBackendItem();
146+ m_itemCache.insert(appId, item);
147+ }
148+ if (item->pinned != pinned) {
149+ item->pinned = pinned;
124150 syncToAccounts();
125151 }
126152}
@@ -153,8 +179,10 @@ int LauncherBackend::count(const QString &appId) const
153179
154180void LauncherBackend::setUser(const QString &username)
155181{
156− m_user = username;
157− syncFromAccounts();
182+ if (qgetenv("USER") == "lightdm" && m_user != username) {
183+ m_user = username;
184+ syncFromAccounts();
185+ }
158186}
159187
160188void LauncherBackend::triggerQuickListAction(const QString &appId, const QString &quickListId)
@@ -169,75 +197,118 @@ void LauncherBackend::syncFromAccounts()
169197 QList<QVariantMap> apps;
170198 bool defaults = true;
171199
172− clearItems();
200+ m_storedApps.clear();
173201
174− if (m_user != "" && m_accounts != nullptr) {
175− auto variant = m_accounts->getUserProperty(m_user, "com.canonical.unity.AccountsService", "launcher-items");
202+ if (m_accounts && m_user.isEmpty()) {
203+ QVariant variant = m_accounts->getUserProperty(m_user, "com.canonical.unity.AccountsService", "launcher-items");
176204 apps = qdbus_cast<QList<QVariantMap>>(variant.value<QDBusArgument>());
177205 defaults = isDefaultsItem(apps);
178206 }
179207
180− // TODO: load default pinned ones from default config, instead of hardcoding here...
181− if (defaults) {
182− apps <<
183− makeAppDetails("dialer-app.desktop", true) <<
184− makeAppDetails("messaging-app.desktop", true) <<
185− makeAppDetails("address-book-app.desktop", true) <<
186− makeAppDetails("camera-app.desktop", true) <<
187− makeAppDetails("gallery-app.desktop", true) <<
188− makeAppDetails("facebook-webapp.desktop", true) <<
189− makeAppDetails("webbrowser-app.desktop", true) <<
190− makeAppDetails("twitter-webapp.desktop", true) <<
191− makeAppDetails("gmail-webapp.desktop", true) <<
192− makeAppDetails("ubuntu-weather-app.desktop", true) <<
193− makeAppDetails("notes-app.desktop", true) <<
194− makeAppDetails("calendar-app.desktop", true);
195− }
196−
197− for (const QVariant &app: apps) {
198− loadApp(app.toMap());
208+ if (m_accounts && defaults) { // Checking accounts as it'll be null when !useStorage
209+ QGSettings gSettings("com.canonical.Unity.Launcher", "/com/canonical/unity/launcher/");
210+ Q_FOREACH(const QString &entry, gSettings.get("favorites").toStringList()) {
211+ if (entry.startsWith("application://")) {
212+ QString appId = entry;
213+ appId.remove("application://");
214+ QString df = findDesktopFile(appId);
215+
216+ if (!df.isEmpty()) {
217+ m_storedApps << appId;
218+
219+ if (!m_itemCache.contains(appId)) {
220+ m_itemCache.insert(appId, parseDesktopFile(df));
221+ }
222+ m_itemCache.value(appId)->pinned = true;
223+ }
224+ }
225+ }
226+ } else {
227+ for (const QVariant &app: apps) {
228+ loadFromVariant(app.toMap());
229+ }
199230 }
200231}
201232
202233void LauncherBackend::syncToAccounts()
203234{
204− if (m_user != "" && m_accounts != nullptr) {
235+ if (m_accounts && !m_user.isEmpty()) {
205236 QList<QVariantMap> items;
206237
207− for (LauncherBackendItem &app: m_storedApps) {
208− items << makeAppDetails(app.settings->fileName(), app.pinned);
238+ Q_FOREACH(const QString &appId, m_storedApps) {
239+ items << itemToVariant(appId);
209240 }
210241
211242 m_accounts->setUserProperty(m_user, "com.canonical.unity.AccountsService", "launcher-items", QVariant::fromValue(items));
212243 }
213244}
214245
215−QSettings *LauncherBackend::parseDesktopFile(const QString &appId) const
246+QString LauncherBackend::findDesktopFile(const QString &appId) const
216247{
217− auto fullAppId = desktopFile(appId);
218− return new QSettings(fullAppId, QSettings::IniFormat);
248+ int dashPos = -1;
249+ QString helper = appId;
250+
251+ do {
252+ if (dashPos != -1) {
253+ helper = helper.replace(dashPos, 1, '/');
254+ }
255+
256+ QFileInfo fileInfo(QDir("/usr/share/applications"), helper);
257+ if (fileInfo.exists()) {
258+ return fileInfo.absoluteFilePath();
259+ }
260+
261+ dashPos = helper.indexOf("-");
262+ } while (dashPos != -1);
263+
264+ return QString();
219265}
220266
221−void LauncherBackend::loadApp(const QVariantMap &details)
267+LauncherBackendItem* LauncherBackend::parseDesktopFile(const QString &desktopFile) const
222268{
223− auto appId = details.value("id").toString();
224− auto isPinned = details.value("is-pinned").toBool();
269+ QSettings settings(desktopFile, QSettings::IniFormat);
270+
225271
226− if (appId.isEmpty()) {
272+ LauncherBackendItem* item = new LauncherBackendItem();
273+ item->desktopFile = desktopFile;
274+ item->displayName = settings.value("Desktop Entry/Name").toString();
275+ item->icon = settings.value("Desktop Entry/Icon").toString();
276+ item->pinned = false;
277+ return item;
278+}
279+
280+void LauncherBackend::loadFromVariant(const QVariantMap &details)
281+{
282+ if (!details.contains("id")) {
227283 return;
228284 }
285+ QString appId = details.value("id").toString();
286+
287+ LauncherBackendItem *item = m_itemCache.value(appId);
288+ if (item) {
289+ delete item;
290+ }
291+
292+ item = new LauncherBackendItem();
293+
294+ item->desktopFile = details.value("desktopFile").toString();
295+ item->displayName = details.value("name").toString();
296+ item->icon = details.value("icon").toString();
297+ item->pinned = details.value("is-pinned").toBool();
229298
230− LauncherBackendItem item;
231− item.settings = parseDesktopFile(appId);
232− item.pinned = isPinned;
233− m_storedApps.append(item);
299+ m_itemCache.insert(appId, item);
300+ m_storedApps.append(appId);
234301}
235302
236−QVariantMap LauncherBackend::makeAppDetails(const QString &appId, bool pinned) const
303+QVariantMap LauncherBackend::itemToVariant(const QString &appId) const
237304{
305+ LauncherBackendItem *item = m_itemCache.value(appId);
238306 QVariantMap details;
239307 details.insert("id", appId);
240− details.insert("is-pinned", pinned);
308+ details.insert("name", item->displayName);
309+ details.insert("icon", item->icon);
310+ details.insert("desktopFile", item->desktopFile);
311+ details.insert("is-pinned", item->pinned);
241312 return details;
242313}
243314
@@ -248,14 +319,3 @@ bool LauncherBackend::isDefaultsItem(const QList<QVariantMap> &apps) const
248319 // list of one item with the 'defaults' field set to true.
249320 return (apps.size() == 1 && apps[0].value("defaults").toBool());
250321}
251−
252−int LauncherBackend::findItem(const QString &appId) const
253−{
254− auto fullAppId = desktopFile(appId);
255− for (int i = 0; i < m_storedApps.size(); ++i) {
256− if (m_storedApps[i].settings->fileName() == fullAppId) {
257− return i;
258− }
259− }
260− return -1;
261−}
plugins/Unity/Launcher/backend/launcherbackend.h+10−12
@@ -31,6 +31,8 @@ class AccountsService;
3131 * @brief An interface that provides all the data needed by the launcher.
3232 */
3333
34+class LauncherBackendItem;
35+
3436class LauncherBackend : public QObject
3537{
3638 Q_OBJECT
@@ -141,23 +143,19 @@ Q_SIGNALS:
141143 void countChanged(const QString &appId, int count);
142144
143145private:
144− QSettings *parseDesktopFile(const QString &appId) const;
145− QVariantMap makeAppDetails(const QString &appId, bool pinned) const;
146− void loadApp(const QVariantMap &details);
147− int findItem(const QString &appId) const;
146+ QString findDesktopFile(const QString &appId) const;
147+ LauncherBackendItem* parseDesktopFile(const QString &desktopFile) const;
148+
149+ QVariantMap itemToVariant(const QString &appId) const;
150+ void loadFromVariant(const QVariantMap &details);
151+
148152 bool isDefaultsItem(const QList<QVariantMap> &apps) const;
149153 void syncFromAccounts();
150154 void syncToAccounts();
151− void clearItems();
152155
153− class LauncherBackendItem
154− {
155− public:
156− QSettings *settings;
157− bool pinned;
158− };
156+ QList<QString> m_storedApps;
157+ mutable QHash<QString, LauncherBackendItem*> m_itemCache;
159158
160− QList<LauncherBackendItem> m_storedApps;
161159 AccountsService *m_accounts;
162160 QString m_user;
163161};
plugins/Unity/categories.cpp−3
@@ -43,7 +43,6 @@ Categories::Categories(QObject* parent)
4343 m_roles[Categories::RoleHints] = "hints";
4444 m_roles[Categories::RoleResults] = "results";
4545 m_roles[Categories::RoleCount] = "count";
46− m_roles[Categories::RoleCategoryIndex] = "categoryIndex";
4746
4847 // TODO This should not be needed but accumulatting the count changes
4948 // makes the visualization more stable and also makes crashes on fast
@@ -222,8 +221,6 @@ Categories::data(const QModelIndex& index, int role) const
222221 return QVariant::fromValue(m_overriddenCategories[id]->rowCount());
223222 }
224223 return QVariant::fromValue(getResults(index.row())->rowCount());
225− case RoleCategoryIndex:
226− return QVariant::fromValue(index.row());
227224 default:
228225 return QVariant();
229226 }
plugins/Unity/categories.h+1−2
@@ -50,8 +50,7 @@ public:
5050 RoleProgressSource,
5151 RoleHints,
5252 RoleResults,
53− RoleCount,
54− RoleCategoryIndex
53+ RoleCount
5554 };
5655
5756 Q_INVOKABLE void overrideResults(const QString& categoryId, QAbstractItemModel* model);
plugins/Unity/checkoptionfilter.cpp+3−1
@@ -52,9 +52,11 @@ void CheckOptionFilter::onOptionsChanged(unity::dash::CheckOptionFilter::CheckOp
5252
5353 m_options = new UnityOptionsModel(this, options,
5454 m_unityCheckOptionFilter->option_added,
55− m_unityCheckOptionFilter->option_removed);
55+ m_unityCheckOptionFilter->option_removed,
56+ m_unityCheckOptionFilter->show_all_button);
5657
5758 connect(m_options, SIGNAL(activeChanged(AbstractFilterOption *)), m_options, SLOT(ensureTheOnlyActive(AbstractFilterOption *)));
59+ connect(m_options, SIGNAL(showAllActivated()), this, SLOT(clear()));
5860
5961 /* Property change signals */
6062 m_signals << m_unityCheckOptionFilter->options.changed.connect(sigc::mem_fun(this, &CheckOptionFilter::onOptionsChanged));
plugins/Unity/filter.h+3−2
@@ -56,11 +56,12 @@ public:
5656 bool filtering() const;
5757 virtual GenericOptionsModel* options() const = 0;
5858
59− Q_INVOKABLE void clear();
60−
6159 static Filter* newFromUnityFilter(unity::dash::Filter::Ptr unityFilter);
6260 bool hasUnityFilter(unity::dash::Filter::Ptr unityFilter) const;
6361
62+public Q_SLOTS:
63+ void clear();
64+
6465Q_SIGNALS:
6566 void optionsChanged();
6667
plugins/Unity/genericoptionsmodel.cpp+20−3
@@ -22,10 +22,18 @@
2222
2323// local
2424#include "abstractfilteroption.h"
25+#include "showallfilteroption.h"
2526
26−GenericOptionsModel::GenericOptionsModel(QObject *parent)
27+GenericOptionsModel::GenericOptionsModel(bool showAllOption, QObject *parent)
2728 : QAbstractListModel(parent)
2829{
30+ if (showAllOption)
31+ {
32+ auto showAll = new ShowAllFilterOption(this);
33+ connect(showAll, SIGNAL(activeChanged(bool)), this, SLOT(onOptionChanged()));
34+ connect(showAll, SIGNAL(activeChanged(bool)), this, SLOT(onShowAllClicked(bool)));
35+ addOption(showAll);
36+ }
2937}
3038
3139GenericOptionsModel::~GenericOptionsModel()
@@ -73,7 +81,7 @@ QVariant GenericOptionsModel::data(const QModelIndex& index, int role) const
7381
7482int GenericOptionsModel::rowCount(const QModelIndex& /* parent */) const
7583{
76− return m_options.size ();
84+ return m_options.size();
7785}
7886
7987void GenericOptionsModel::setActive(int idx, bool value)
@@ -117,7 +125,10 @@ void GenericOptionsModel::ensureTheOnlyActive(AbstractFilterOption *activeOption
117125
118126void GenericOptionsModel::addOption(AbstractFilterOption *option, int index)
119127{
120− m_options.insert(index, option);
128+ if (index >= 0)
129+ m_options.insert(index, option);
130+ else
131+ m_options.append(option);
121132
122133 connect(option, SIGNAL(idChanged(const QString &)), this, SLOT(onOptionChanged()));
123134 connect(option, SIGNAL(nameChanged(const QString &)), this, SLOT(onOptionChanged()));
@@ -168,3 +179,9 @@ void GenericOptionsModel::onActiveChanged()
168179 Q_EMIT activeChanged(option);
169180 }
170181}
182+
183+void GenericOptionsModel::onShowAllClicked(bool active)
184+{
185+ if (active)
186+ Q_EMIT showAllActivated();
187+}
plugins/Unity/genericoptionsmodel.h+4−2
@@ -35,7 +35,7 @@ class Q_DECL_EXPORT GenericOptionsModel : public QAbstractListModel
3535 Q_ENUMS(Roles)
3636
3737public:
38− GenericOptionsModel(QObject *parent = nullptr);
38+ GenericOptionsModel(bool showAllOption = false, QObject *parent = nullptr);
3939 ~GenericOptionsModel();
4040
4141 enum Roles {
@@ -59,13 +59,15 @@ public Q_SLOTS:
5959
6060Q_SIGNALS:
6161 void activeChanged(AbstractFilterOption *option);
62+ void showAllActivated();
6263
6364protected Q_SLOTS:
6465 void onOptionChanged();
6566 void onActiveChanged();
67+ void onShowAllClicked(bool active);
6668
6769protected:
68− void addOption(AbstractFilterOption *option, int index);
70+ void addOption(AbstractFilterOption *option, int index = -1);
6971 void removeOption(int index);
7072 int indexOf(const QString &option_id);
7173
plugins/Unity/multirangefilter.cpp+3−1
@@ -52,9 +52,11 @@ void MultiRangeFilter::onOptionsChanged(unity::dash::MultiRangeFilter::Options o
5252
5353 m_options = new UnityOptionsModel(this, options,
5454 m_unityMultiRangeFilter->option_added,
55− m_unityMultiRangeFilter->option_removed);
55+ m_unityMultiRangeFilter->option_removed,
56+ m_unityMultiRangeFilter->show_all_button);
5657
5758 connect(m_options, SIGNAL(activeChanged(AbstractFilterOption *)), m_options, SLOT(ensureTheOnlyActive(AbstractFilterOption *)));
59+ connect(m_options, SIGNAL(showAllActivated()), this, SLOT(clear()));
5860
5961 /* Property change signals */
6062 m_signals << m_unityMultiRangeFilter->options.changed.connect(sigc::mem_fun(this, &MultiRangeFilter::onOptionsChanged));
plugins/Unity/radiooptionfilter.cpp+3−1
@@ -51,7 +51,9 @@ void RadioOptionFilter::onOptionsChanged(unity::dash::RadioOptionFilter::RadioOp
5151 }
5252 m_options = new UnityOptionsModel(this, m_unityRadioOptionFilter->options,
5353 m_unityRadioOptionFilter->option_added,
54− m_unityRadioOptionFilter->option_removed);
54+ m_unityRadioOptionFilter->option_removed,
55+ m_unityRadioOptionFilter->show_all_button);
56+ connect(m_options, SIGNAL(showAllActivated()), this, SLOT(clear()));
5557
5658 m_signals << m_unityRadioOptionFilter->options.changed.connect(sigc::mem_fun(this, &RadioOptionFilter::onOptionsChanged));
5759
plugins/Unity/ratingoptionsmodel.cpp+3−3
@@ -23,11 +23,11 @@
2323// local
2424#include "ratingfilteroption.h"
2525
26−RatingOptionsModel::RatingOptionsModel(QObject *parent) :
27− GenericOptionsModel(parent)
26+RatingOptionsModel::RatingOptionsModel(bool showAllOption, QObject *parent) :
27+ GenericOptionsModel(showAllOption, parent)
2828{
2929 for (int i=1; i<=5; i++) {
3030 auto opt = new RatingFilterOption(QString::number(i), i*0.2f, this);
31− addOption(opt, i-1);
31+ addOption(opt);
3232 }
3333}
plugins/Unity/ratingoptionsmodel.h+1−1
@@ -27,7 +27,7 @@ class RatingOptionsModel : public GenericOptionsModel
2727 Q_OBJECT
2828
2929public:
30− RatingOptionsModel(QObject *parent);
30+ RatingOptionsModel(bool showAllOption, QObject *parent);
3131};
3232
3333#endif // RATINGOPTIONSMODEL_H
plugins/Unity/ratingsfilter.cpp+2−1
@@ -53,9 +53,10 @@ void RatingsFilter::setUnityFilter(unity::dash::Filter::Ptr filter)
5353
5454 delete m_options;
5555
56− m_options = new RatingOptionsModel(this);
56+ m_options = new RatingOptionsModel(m_unityRatingsFilter->show_all_button, this);
5757 connect(m_options, SIGNAL(activeChanged(AbstractFilterOption *)), m_options, SLOT(ensureTheOnlyActive(AbstractFilterOption *)));
5858 connect(m_options, SIGNAL(activeChanged(AbstractFilterOption *)), this, SLOT(onActiveChanged(AbstractFilterOption *)));
59+ connect(m_options, SIGNAL(showAllActivated()), this, SLOT(clear()));
5960
6061 Q_EMIT optionsChanged();
6162}
plugins/Unity/showallfilteroption.cppnew file+60
@@ -0,0 +1,60 @@
1+/*
2+ * Copyright (C) 2013 Canonical, Ltd.
3+ *
4+ * Authors:
5+ * Pawel Stolowski <pawel.stolowski@canonical.com>
6+ *
7+ * This program is free software; you can redistribute it and/or modify
8+ * it under the terms of the GNU General Public License as published by
9+ * the Free Software Foundation; version 3.
10+ *
11+ * This program is distributed in the hope that it will be useful,
12+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
13+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+ * GNU General Public License for more details.
15+ *
16+ * You should have received a copy of the GNU General Public License
17+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
18+ */
19+
20+// self
21+#include "showallfilteroption.h"
22+
23+#include <libintl.h>
24+
25+unsigned int ShowAllFilterOption::m_showAllCount = 0;
26+
27+ShowAllFilterOption::ShowAllFilterOption(QObject *parent) :
28+ AbstractFilterOption(parent),
29+ m_active(false)
30+{
31+ m_id = QString("show_all::%1").arg(m_showAllCount++);
32+}
33+
34+QString ShowAllFilterOption::id() const
35+{
36+ return m_id;
37+}
38+
39+QString ShowAllFilterOption::name() const
40+{
41+ return QString::fromUtf8(dgettext("unity", "All"));
42+}
43+
44+QString ShowAllFilterOption::iconHint() const
45+{
46+ return QString::Null();
47+}
48+
49+bool ShowAllFilterOption::active() const
50+{
51+ return m_active;
52+}
53+
54+void ShowAllFilterOption::setActive(bool active)
55+{
56+ if (active != m_active) {
57+ m_active = active;
58+ Q_EMIT activeChanged(m_active);
59+ }
60+}
plugins/Unity/showallfilteroption.hnew file+51
@@ -0,0 +1,51 @@
1+/*
2+ * Copyright (C) 2013 Canonical, Ltd.
3+ *
4+ * Authors:
5+ * Pawel Stolowski <pawel.stolowski@canonical.com>
6+ *
7+ * This program is free software; you can redistribute it and/or modify
8+ * it under the terms of the GNU General Public License as published by
9+ * the Free Software Foundation; version 3.
10+ *
11+ * This program is distributed in the hope that it will be useful,
12+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
13+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+ * GNU General Public License for more details.
15+ *
16+ * You should have received a copy of the GNU General Public License
17+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
18+ */
19+
20+#ifndef SHOWALLFILTEROPTION_H
21+#define SHOWALLFILTEROPTION_H
22+
23+// local
24+#include "abstractfilteroption.h"
25+
26+class Q_DECL_EXPORT ShowAllFilterOption : public AbstractFilterOption
27+{
28+ Q_OBJECT
29+
30+public:
31+ explicit ShowAllFilterOption(QObject *parent = nullptr);
32+
33+ /* getters */
34+ QString id() const override;
35+ QString name() const override;
36+ QString iconHint() const override;
37+ bool active() const override;
38+
39+ /* setters */
40+ void setActive(bool active) override;
41+
42+private:
43+ bool m_active;
44+ QString m_id;
45+
46+ static unsigned int m_showAllCount;
47+};
48+
49+Q_DECLARE_METATYPE(ShowAllFilterOption*)
50+
51+#endif // SHOWALLFILTEROPTION_H
plugins/Unity/unityoptionsmodel.cpp+5−4
@@ -26,8 +26,9 @@
2626UnityOptionsModel::UnityOptionsModel(QObject *parent,
2727 const std::vector<unity::dash::FilterOption::Ptr> options,
2828 sigc::signal<void, unity::dash::FilterOption::Ptr> optionAdded,
29− sigc::signal<void, unity::dash::FilterOption::Ptr> optionRemoved) :
30− GenericOptionsModel(parent)
29+ sigc::signal<void, unity::dash::FilterOption::Ptr> optionRemoved,
30+ bool showAllOption) :
31+ GenericOptionsModel(showAllOption, parent)
3132{
3233 setOptions(options, optionAdded, optionRemoved);
3334}
@@ -38,7 +39,7 @@ void UnityOptionsModel::setOptions(const std::vector<unity::dash::FilterOption::
3839{
3940 for (unsigned int i=0; i<options.size(); i++)
4041 {
41− addOption(new FilterOption(options[i], this), i);
42+ addOption(new FilterOption(options[i], this));
4243 }
4344 optionAdded.connect(sigc::mem_fun(this, &UnityOptionsModel::onOptionAdded));
4445 optionRemoved.connect(sigc::mem_fun(this, &UnityOptionsModel::onOptionRemoved));
@@ -50,7 +51,7 @@ void UnityOptionsModel::onOptionAdded(unity::dash::FilterOption::Ptr option)
5051 if (index >= 0)
5152 {
5253 beginInsertRows(QModelIndex(), index, index);
53− addOption(new FilterOption(option, this), index);
54+ addOption(new FilterOption(option, this));
5455 endInsertRows();
5556 }
5657}
plugins/Unity/unityoptionsmodel.h+2−1
@@ -35,7 +35,8 @@ public:
3535 UnityOptionsModel(QObject *parent,
3636 const std::vector<unity::dash::FilterOption::Ptr> options,
3737 sigc::signal<void, unity::dash::FilterOption::Ptr> optionAdded,
38− sigc::signal<void, unity::dash::FilterOption::Ptr> optionRemoved);
38+ sigc::signal<void, unity::dash::FilterOption::Ptr> optionRemoved,
39+ bool showAllOption);
3940
4041private:
4142 void setOptions(const std::vector<unity::dash::FilterOption::Ptr> options,
po/ar.po+2−29
@@ -16,8 +16,8 @@ msgstr ""
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
1818"3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
19−"X-Launchpad-Export-Date: 2013-08-29 05:41+0000\n"
20−"X-Generator: Launchpad (build 16738)\n"
19+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"
20+"X-Generator: Launchpad (build 16750)\n"
2121
2222#: Applications/applications.js:23
2323msgid "Phone"
@@ -254,30 +254,3 @@ msgstr "عذراً، لا يوجد ما يطابق بحثك."
254254#, qt-format
255255msgid "Please enter %1"
256256msgstr ""
257−
258−#~ msgid "Running apps"
259−#~ msgstr "البرامج المُشغّلة"
260−
261−#~ msgid "Frequently used"
262−#~ msgstr "مُستخدمة بكثرة"
263−
264−#~ msgid "Installed"
265−#~ msgstr "مُثبّتة"
266−
267−#~ msgid "Available for download"
268−#~ msgstr "متوفرة للتنزيل"
269−
270−#~ msgid "Apps"
271−#~ msgstr "تطبيقات"
272−
273−#~ msgid "Frequent Apps"
274−#~ msgstr "تطبيقات مألوفة"
275−
276−#~ msgid "Recent Music"
277−#~ msgstr "آخر الصوتيات المشغلة"
278−
279−#~ msgid "Videos Popular Online"
280−#~ msgstr "فيديوهات رائجة على الإنترنت"
281−
282−#~ msgid "Home"
283−#~ msgstr "الرئيسية"
po/az.po+2−8
@@ -15,8 +15,8 @@ msgstr ""
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2013-08-29 05:41+0000\n"
19−"X-Generator: Launchpad (build 16738)\n"
18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"
19+"X-Generator: Launchpad (build 16750)\n"
2020
2121#: Applications/applications.js:23
2222msgid "Phone"
@@ -253,9 +253,3 @@ msgstr "Bağışlayın, amma axtarışınıza heç bir nəticə uyğun gəlmir."
253253#, qt-format
254254msgid "Please enter %1"
255255msgstr ""
256−
257−#~ msgid "Apps"
258−#~ msgstr "Tətbiqlər"
259−
260−#~ msgid "Home"
261−#~ msgstr "Ev"
po/bg.po+2−11
@@ -16,8 +16,8 @@ msgstr ""
1616"Content-Type: text/plain; charset=UTF-8\n"
1717"Content-Transfer-Encoding: 8bit\n"
1818"Plural-Forms: nplurals=2; plural=n != 1;\n"
19−"X-Launchpad-Export-Date: 2013-08-29 05:41+0000\n"
20−"X-Generator: Launchpad (build 16738)\n"
19+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"
20+"X-Generator: Launchpad (build 16750)\n"
2121
2222#: Applications/applications.js:23
2323msgid "Phone"
@@ -254,12 +254,3 @@ msgstr "Съжаляваме, няма нищо, което да отговар
254254#, qt-format
255255msgid "Please enter %1"
256256msgstr ""
257−
258−#~ msgid "Installed"
259−#~ msgstr "Инсталирани"
260−
261−#~ msgid "Apps"
262−#~ msgstr "Приложения"
263−
264−#~ msgid "Home"
265−#~ msgstr "Начало"
po/ca.po+2−29
@@ -15,8 +15,8 @@ msgstr ""
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2013-08-29 05:41+0000\n"
19−"X-Generator: Launchpad (build 16738)\n"
18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"
19+"X-Generator: Launchpad (build 16750)\n"
2020
2121#: Applications/applications.js:23
2222msgid "Phone"
@@ -253,30 +253,3 @@ msgstr "No hi ha res que coincideixi amb la cerca"
253253#, qt-format
254254msgid "Please enter %1"
255255msgstr ""
256−
257−#~ msgid "Running apps"
258−#~ msgstr "Aplications actives"
259−
260−#~ msgid "Frequently used"
261−#~ msgstr "Les més freqüents"
262−
263−#~ msgid "Installed"
264−#~ msgstr "Instal·lades"
265−
266−#~ msgid "Available for download"
267−#~ msgstr "Disponibles per baixar"
268−
269−#~ msgid "Apps"
270−#~ msgstr "Aplicacions"
271−
272−#~ msgid "Frequent Apps"
273−#~ msgstr "Aplicacions freqüents"
274−
275−#~ msgid "Recent Music"
276−#~ msgstr "Música recent"
277−
278−#~ msgid "Videos Popular Online"
279−#~ msgstr "Vídeos populars en línia"
280−
281−#~ msgid "Home"
282−#~ msgstr "Inici"
po/de.po+2−29
@@ -15,8 +15,8 @@ msgstr ""
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2013-08-29 05:41+0000\n"
19−"X-Generator: Launchpad (build 16738)\n"
18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"
19+"X-Generator: Launchpad (build 16750)\n"
2020
2121#: Applications/applications.js:23
2222msgid "Phone"
@@ -253,30 +253,3 @@ msgstr "Entschuldigung, es wurden keine Treffer erzielt."
253253#, qt-format
254254msgid "Please enter %1"
255255msgstr ""
256−
257−#~ msgid "Running apps"
258−#~ msgstr "Aktive Anwendungen"
259−
260−#~ msgid "Frequently used"
261−#~ msgstr "Häufig verwendet"
262−
263−#~ msgid "Installed"
264−#~ msgstr "Installiert"
265−
266−#~ msgid "Available for download"
267−#~ msgstr "Zum Herunterladen verfügbar"
268−
269−#~ msgid "Apps"
270−#~ msgstr "Anwendungen"
271−
272−#~ msgid "Frequent Apps"
273−#~ msgstr "Häufig genutzte Anwendungen"
274−
275−#~ msgid "Recent Music"
276−#~ msgstr "Zuletzt gehörte Musik"
277−
278−#~ msgid "Videos Popular Online"
279−#~ msgstr "Beliebte Online-Videos"
280−
281−#~ msgid "Home"
282−#~ msgstr "Start"
po/el.po+2−8
@@ -15,8 +15,8 @@ msgstr ""
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2013-08-29 05:41+0000\n"
19−"X-Generator: Launchpad (build 16738)\n"
18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"
19+"X-Generator: Launchpad (build 16750)\n"
2020
2121#: Applications/applications.js:23
2222msgid "Phone"
@@ -253,9 +253,3 @@ msgstr "Λυπούμαστε, δεν υπάρχει τίποτα που να τ
253253#, qt-format
254254msgid "Please enter %1"
255255msgstr ""
256−
257−#~ msgid "Apps"
258−#~ msgstr "Εφαρμογές"
259−
260−#~ msgid "Home"
261−#~ msgstr "Αρχή"
po/en_AU.po+2−29
@@ -15,8 +15,8 @@ msgstr ""
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2013-08-29 05:41+0000\n"
19−"X-Generator: Launchpad (build 16738)\n"
18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"
19+"X-Generator: Launchpad (build 16750)\n"
2020
2121#: Applications/applications.js:23
2222msgid "Phone"
@@ -253,30 +253,3 @@ msgstr "Sorry, there is nothing that matches your search."
253253#, qt-format
254254msgid "Please enter %1"
255255msgstr ""
256−
257−#~ msgid "Running apps"
258−#~ msgstr "Running apps"
259−
260−#~ msgid "Frequently used"
261−#~ msgstr "Frequently used"
262−
263−#~ msgid "Installed"
264−#~ msgstr "Installed"
265−
266−#~ msgid "Available for download"
267−#~ msgstr "Available for download"
268−
269−#~ msgid "Apps"
270−#~ msgstr "Apps"
271−
272−#~ msgid "Frequent Apps"
273−#~ msgstr "Frequent Apps"
274−
275−#~ msgid "Recent Music"
276−#~ msgstr "Recent Music"
277−
278−#~ msgid "Videos Popular Online"
279−#~ msgstr "Videos Popular Online"
280−
281−#~ msgid "Home"
282−#~ msgstr "Home"
po/en_GB.po+2−29
@@ -15,8 +15,8 @@ msgstr ""
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2013-08-29 05:41+0000\n"
19−"X-Generator: Launchpad (build 16738)\n"
18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"
19+"X-Generator: Launchpad (build 16750)\n"
2020
2121#: Applications/applications.js:23
2222msgid "Phone"
@@ -253,30 +253,3 @@ msgstr "Sorry, there is nothing that matches your search."
253253#, qt-format
254254msgid "Please enter %1"
255255msgstr "Please enter %1"
256−
257−#~ msgid "Running apps"
258−#~ msgstr "Running apps"
259−
260−#~ msgid "Frequently used"
261−#~ msgstr "Frequently used"
262−
263−#~ msgid "Installed"
264−#~ msgstr "Installed"
265−
266−#~ msgid "Available for download"
267−#~ msgstr "Available for download"
268−
269−#~ msgid "Apps"
270−#~ msgstr "Apps"
271−
272−#~ msgid "Frequent Apps"
273−#~ msgstr "Frequent Apps"
274−
275−#~ msgid "Recent Music"
276−#~ msgstr "Recent Music"
277−
278−#~ msgid "Videos Popular Online"
279−#~ msgstr "Videos Popular Online"
280−
281−#~ msgid "Home"
282−#~ msgstr "Home"
po/eo.po+2−2
@@ -15,8 +15,8 @@ msgstr ""
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2013-08-29 05:41+0000\n"
19−"X-Generator: Launchpad (build 16738)\n"
18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"
19+"X-Generator: Launchpad (build 16750)\n"
2020
2121#: Applications/applications.js:23
2222msgid "Phone"
po/es.po+2−29
@@ -15,8 +15,8 @@ msgstr ""
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2013-08-29 05:41+0000\n"
19−"X-Generator: Launchpad (build 16738)\n"
18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"
19+"X-Generator: Launchpad (build 16750)\n"
2020
2121#: Applications/applications.js:23
2222msgid "Phone"
@@ -253,30 +253,3 @@ msgstr "No hay nada que coincida con su búsqueda."
253253#, qt-format
254254msgid "Please enter %1"
255255msgstr "Introduzca %1"
256−
257−#~ msgid "Running apps"
258−#~ msgstr "Aplicaciones en ejecución"
259−
260−#~ msgid "Frequently used"
261−#~ msgstr "Usadas frecuentemente"
262−
263−#~ msgid "Installed"
264−#~ msgstr "Instaladas"
265−
266−#~ msgid "Available for download"
267−#~ msgstr "Disponibles para descargar"
268−
269−#~ msgid "Apps"
270−#~ msgstr "Aplicaciones"
271−
272−#~ msgid "Frequent Apps"
273−#~ msgstr "Aplicaciones frecuentes"
274−
275−#~ msgid "Recent Music"
276−#~ msgstr "Música reciente"
277−
278−#~ msgid "Videos Popular Online"
279−#~ msgstr "Vídeos populares en línea"
280−
281−#~ msgid "Home"
282−#~ msgstr "Inicio"
po/fi.po+2−29
@@ -15,8 +15,8 @@ msgstr ""
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2013-08-29 05:41+0000\n"
19−"X-Generator: Launchpad (build 16738)\n"
18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"
19+"X-Generator: Launchpad (build 16750)\n"
2020
2121#: Applications/applications.js:23
2222msgid "Phone"
@@ -253,30 +253,3 @@ msgstr "Hakuun täsmääviä tuloksia ei löydy."
253253#, qt-format
254254msgid "Please enter %1"
255255msgstr "Kirjoita %1"
256−
257−#~ msgid "Running apps"
258−#~ msgstr "Käynnissä olevat sovellukset"
259−
260−#~ msgid "Frequently used"
261−#~ msgstr "Usein käytetyt"
262−
263−#~ msgid "Installed"
264−#~ msgstr "Asennetut"
265−
266−#~ msgid "Available for download"
267−#~ msgstr "Ladattavissa"
268−
269−#~ msgid "Apps"
270−#~ msgstr "Sovellukset"
271−
272−#~ msgid "Frequent Apps"
273−#~ msgstr "Yleisimmät sovellukset"
274−
275−#~ msgid "Recent Music"
276−#~ msgstr "Viimeisin musiikki"
277−
278−#~ msgid "Videos Popular Online"
279−#~ msgstr "Suositut verkkovideot"
280−
281−#~ msgid "Home"
282−#~ msgstr "Kotinäyttö"
po/fo.po+2−8
@@ -15,8 +15,8 @@ msgstr ""
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2013-08-29 05:41+0000\n"
19−"X-Generator: Launchpad (build 16738)\n"
18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"
19+"X-Generator: Launchpad (build 16750)\n"
2020
2121#: Applications/applications.js:23
2222msgid "Phone"
@@ -253,9 +253,3 @@ msgstr "Tíanverri er tað einki sum hóskar til tína leiting."
253253#, qt-format
254254msgid "Please enter %1"
255255msgstr ""
256−
257−#~ msgid "Apps"
258−#~ msgstr "Nýtsluskipanir"
259−
260−#~ msgid "Home"
261−#~ msgstr "Heim"
po/fr.po+2−5
@@ -15,8 +15,8 @@ msgstr ""
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n > 1;\n"
18−"X-Launchpad-Export-Date: 2013-08-29 05:41+0000\n"
19−"X-Generator: Launchpad (build 16738)\n"
18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"
19+"X-Generator: Launchpad (build 16750)\n"
2020
2121#: Applications/applications.js:23
2222msgid "Phone"
@@ -253,6 +253,3 @@ msgstr ""
253253#, qt-format
254254msgid "Please enter %1"
255255msgstr ""
256−
257−#~ msgid "Apps"
258−#~ msgstr "Applications"
po/gl.po+2−29
@@ -15,8 +15,8 @@ msgstr ""
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2013-08-29 05:41+0000\n"
19−"X-Generator: Launchpad (build 16738)\n"
18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"
19+"X-Generator: Launchpad (build 16750)\n"
2020
2121#: Applications/applications.js:23
2222msgid "Phone"
@@ -253,30 +253,3 @@ msgstr "Sentímolo, non hai nada que coincida con esta busca."
253253#, qt-format
254254msgid "Please enter %1"
255255msgstr ""
256−
257−#~ msgid "Running apps"
258−#~ msgstr "Aplicativos en execución"
259−
260−#~ msgid "Frequently used"
261−#~ msgstr "Usadas frecuentemente"
262−
263−#~ msgid "Installed"
264−#~ msgstr "Instalado"
265−
266−#~ msgid "Available for download"
267−#~ msgstr "Dispoñíbel para descargar"
268−
269−#~ msgid "Apps"
270−#~ msgstr "Aplicativos"
271−
272−#~ msgid "Frequent Apps"
273−#~ msgstr "Aplicativos frecuentes"
274−
275−#~ msgid "Recent Music"
276−#~ msgstr "Música recente"
277−
278−#~ msgid "Videos Popular Online"
279−#~ msgstr "Vídeos populares en liña"
280−
281−#~ msgid "Home"
282−#~ msgstr "Cartafol persoal"
po/he.po+2−8
@@ -15,8 +15,8 @@ msgstr ""
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2013-08-29 05:41+0000\n"
19−"X-Generator: Launchpad (build 16738)\n"
18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"
19+"X-Generator: Launchpad (build 16750)\n"
2020
2121#: Applications/applications.js:23
2222msgid "Phone"
@@ -253,9 +253,3 @@ msgstr "שום דבר אינו תואם לחיפוש שלך, עמך הסליחה
253253#, qt-format
254254msgid "Please enter %1"
255255msgstr ""
256−
257−#~ msgid "Apps"
258−#~ msgstr "יישומים"
259−
260−#~ msgid "Home"
261−#~ msgstr "בית"
po/hr.po+2−8
@@ -16,8 +16,8 @@ msgstr ""
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
1818"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
19−"X-Launchpad-Export-Date: 2013-08-29 05:41+0000\n"
20−"X-Generator: Launchpad (build 16738)\n"
19+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"
20+"X-Generator: Launchpad (build 16750)\n"
2121
2222#: Applications/applications.js:23
2323msgid "Phone"
@@ -254,9 +254,3 @@ msgstr "Nažalost, ne postoji ništa što odgovara vašoj pretrazi."
254254#, qt-format
255255msgid "Please enter %1"
256256msgstr ""
257−
258−#~ msgid "Apps"
259−#~ msgstr "Aplikacije"
260−
261−#~ msgid "Home"
262−#~ msgstr "Početna"
po/hu.po+2−17
@@ -15,8 +15,8 @@ msgstr ""
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2013-08-29 05:41+0000\n"
19−"X-Generator: Launchpad (build 16738)\n"
18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"
19+"X-Generator: Launchpad (build 16750)\n"
2020
2121#: Applications/applications.js:23
2222msgid "Phone"
@@ -253,18 +253,3 @@ msgstr "Elnézést, nincs találat a keresésre."
253253#, qt-format
254254msgid "Please enter %1"
255255msgstr ""
256−
257−#~ msgid "Running apps"
258−#~ msgstr "Futó alkalmazások"
259−
260−#~ msgid "Frequently used"
261−#~ msgstr "Gyakran használt"
262−
263−#~ msgid "Installed"
264−#~ msgstr "Telepített"
265−
266−#~ msgid "Apps"
267−#~ msgstr "Alkalmazások"
268−
269−#~ msgid "Home"
270−#~ msgstr "Kezdőoldal"
po/hy.po+2−29
@@ -15,8 +15,8 @@ msgstr ""
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=1; plural=0;\n"
18−"X-Launchpad-Export-Date: 2013-08-29 05:41+0000\n"
19−"X-Generator: Launchpad (build 16738)\n"
18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"
19+"X-Generator: Launchpad (build 16750)\n"
2020
2121#: Applications/applications.js:23
2222msgid "Phone"
@@ -253,30 +253,3 @@ msgstr "Կներերք, բայց Ձեր հարցումով ոչինչ չկար"
253253#, qt-format
254254msgid "Please enter %1"
255255msgstr ""
256−
257−#~ msgid "Running apps"
258−#~ msgstr "Բացած ծրագրեր"
259−
260−#~ msgid "Frequently used"
261−#~ msgstr "Վերջին բացածները"
262−
263−#~ msgid "Installed"
264−#~ msgstr "Տեղադրված"
265−
266−#~ msgid "Available for download"
267−#~ msgstr "Հասանելի ծրագրեր"
268−
269−#~ msgid "Apps"
270−#~ msgstr "Ծրագրեր"
271−
272−#~ msgid "Frequent Apps"
273−#~ msgstr "Հաճախակի ծրագրերը"
274−
275−#~ msgid "Recent Music"
276−#~ msgstr "Վերջին երգերը"
277−
278−#~ msgid "Videos Popular Online"
279−#~ msgstr "Հայտնի օնլայն վիդեոներ"
280−
281−#~ msgid "Home"
282−#~ msgstr "Տուն"
po/id.po+2−2
@@ -15,8 +15,8 @@ msgstr ""
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=1; plural=0;\n"
18−"X-Launchpad-Export-Date: 2013-08-29 05:41+0000\n"
19−"X-Generator: Launchpad (build 16738)\n"
18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"
19+"X-Generator: Launchpad (build 16750)\n"
2020
2121#: Applications/applications.js:23
2222msgid "Phone"
po/it.po+2−8
@@ -15,8 +15,8 @@ msgstr ""
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2013-08-29 05:41+0000\n"
19−"X-Generator: Launchpad (build 16738)\n"
18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"
19+"X-Generator: Launchpad (build 16750)\n"
2020
2121#: Applications/applications.js:23
2222msgid "Phone"
@@ -253,9 +253,3 @@ msgstr "Nessun risultato corrispondente alla ricerca."
253253#, qt-format
254254msgid "Please enter %1"
255255msgstr ""
256−
257−#~ msgid "Apps"
258−#~ msgstr "Applicazioni"
259−
260−#~ msgid "Home"
261−#~ msgstr "Home"
po/ja.po+2−2
@@ -15,8 +15,8 @@ msgstr ""
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=1; plural=0;\n"
18−"X-Launchpad-Export-Date: 2013-08-29 05:41+0000\n"
19−"X-Generator: Launchpad (build 16738)\n"
18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"
19+"X-Generator: Launchpad (build 16750)\n"
2020
2121#: Applications/applications.js:23
2222msgid "Phone"
po/kn.po+2−8
@@ -15,8 +15,8 @@ msgstr ""
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2013-08-29 05:41+0000\n"
19−"X-Generator: Launchpad (build 16738)\n"
18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"
19+"X-Generator: Launchpad (build 16750)\n"
2020
2121#: Applications/applications.js:23
2222msgid "Phone"
@@ -253,9 +253,3 @@ msgstr "ಕ್ಷಮಿಸಿ ನಿಮ್ಮ ಶೋಧನೆಗೆ ಸರಿಯ
253253#, qt-format
254254msgid "Please enter %1"
255255msgstr ""
256−
257−#~ msgid "Apps"
258−#~ msgstr "ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"
259−
260−#~ msgid "Home"
261−#~ msgstr "ಮನೆ (Home)"
po/ko.po+2−23
@@ -15,8 +15,8 @@ msgstr ""
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=1; plural=0;\n"
18−"X-Launchpad-Export-Date: 2013-08-29 05:41+0000\n"
19−"X-Generator: Launchpad (build 16738)\n"
18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"
19+"X-Generator: Launchpad (build 16750)\n"
2020
2121#: Applications/applications.js:23
2222msgid "Phone"
@@ -253,24 +253,3 @@ msgstr ""
253253#, qt-format
254254msgid "Please enter %1"
255255msgstr ""
256−
257−#~ msgid "Running apps"
258−#~ msgstr "돌아가고 있는 앱"
259−
260−#~ msgid "Frequently used"
261−#~ msgstr "자주 쓰는 것들"
262−
263−#~ msgid "Installed"
264−#~ msgstr "깔림"
265−
266−#~ msgid "Available for download"
267−#~ msgstr "내려받을 수 있음"
268−
269−#~ msgid "Apps"
270−#~ msgstr "앱"
271−
272−#~ msgid "Frequent Apps"
273−#~ msgstr "자주 쓰는 앱"
274−
275−#~ msgid "Recent Music"
276−#~ msgstr "요즈음 찾는 음악"
po/ky.po+2−8
@@ -15,8 +15,8 @@ msgstr ""
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=1; plural=0;\n"
18−"X-Launchpad-Export-Date: 2013-08-29 05:41+0000\n"
19−"X-Generator: Launchpad (build 16738)\n"
18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"
19+"X-Generator: Launchpad (build 16750)\n"
2020
2121#: Applications/applications.js:23
2222msgid "Phone"
@@ -253,9 +253,3 @@ msgstr "Тилекке каршы, сиздин издөөңүзгө эч нер
253253#, qt-format
254254msgid "Please enter %1"
255255msgstr ""
256−
257−#~ msgid "Apps"
258−#~ msgstr "Тиркемелер"
259−
260−#~ msgid "Home"
261−#~ msgstr "Үй папкасы"
po/lv.po+2−8
@@ -15,8 +15,8 @@ msgstr ""
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2;\n"
18−"X-Launchpad-Export-Date: 2013-08-29 05:41+0000\n"
19−"X-Generator: Launchpad (build 16738)\n"
18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"
19+"X-Generator: Launchpad (build 16750)\n"
2020
2121#: Applications/applications.js:23
2222msgid "Phone"
@@ -253,9 +253,3 @@ msgstr "Diemžēl nekas neatbilst jūsu meklētajam."
253253#, qt-format
254254msgid "Please enter %1"
255255msgstr ""
256−
257−#~ msgid "Apps"
258−#~ msgstr "Lietotnes"
259−
260−#~ msgid "Home"
261−#~ msgstr "Mājas"
po/my.po+2−8
@@ -15,8 +15,8 @@ msgstr ""
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=1; plural=0;\n"
18−"X-Launchpad-Export-Date: 2013-08-29 05:41+0000\n"
19−"X-Generator: Launchpad (build 16738)\n"
18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"
19+"X-Generator: Launchpad (build 16750)\n"
2020
2121#: Applications/applications.js:23
2222msgid "Phone"
@@ -253,9 +253,3 @@ msgstr "ဆောရီး၊ သင်၏ရှာဖွေမူနှင့
253253#, qt-format
254254msgid "Please enter %1"
255255msgstr ""
256−
257−#~ msgid "Apps"
258−#~ msgstr "Apps"
259−
260−#~ msgid "Home"
261−#~ msgstr "ပင်မ"
po/nb.po+2−17
@@ -15,8 +15,8 @@ msgstr ""
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2013-08-29 05:41+0000\n"
19−"X-Generator: Launchpad (build 16738)\n"
18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"
19+"X-Generator: Launchpad (build 16750)\n"
2020
2121#: Applications/applications.js:23
2222msgid "Phone"
@@ -253,18 +253,3 @@ msgstr "Søket ga ingen treff."
253253#, qt-format
254254msgid "Please enter %1"
255255msgstr ""
256−
257−#~ msgid "Frequently used"
258−#~ msgstr "Ofte brukt"
259−
260−#~ msgid "Installed"
261−#~ msgstr "Installert"
262−
263−#~ msgid "Available for download"
264−#~ msgstr "Tilgjengelig for nedlasting"
265−
266−#~ msgid "Apps"
267−#~ msgstr "Programmer"
268−
269−#~ msgid "Home"
270−#~ msgstr "Hjem"
po/nl.po+2−8
@@ -15,8 +15,8 @@ msgstr ""
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2013-08-29 05:41+0000\n"
19−"X-Generator: Launchpad (build 16738)\n"
18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"
19+"X-Generator: Launchpad (build 16750)\n"
2020
2121#: Applications/applications.js:23
2222msgid "Phone"
@@ -253,9 +253,3 @@ msgstr "Er is helaas niets dat met uw zoekopdracht overeenkomt."
253253#, qt-format
254254msgid "Please enter %1"
255255msgstr ""
256−
257−#~ msgid "Apps"
258−#~ msgstr "Apps"
259−
260−#~ msgid "Home"
261−#~ msgstr "Hoofdvenster"
po/pl.po+2−29
@@ -16,8 +16,8 @@ msgstr ""
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
1818"|| n%100>=20) ? 1 : 2;\n"
19−"X-Launchpad-Export-Date: 2013-08-29 05:41+0000\n"
20−"X-Generator: Launchpad (build 16738)\n"
19+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"
20+"X-Generator: Launchpad (build 16750)\n"
2121
2222#: Applications/applications.js:23
2323msgid "Phone"
@@ -254,30 +254,3 @@ msgstr "Nie znaleziono pasujących wyników."
254254#, qt-format
255255msgid "Please enter %1"
256256msgstr "Wprowadź %1"
257−
258−#~ msgid "Running apps"
259−#~ msgstr "Uruchomione aplikacje"
260−
261−#~ msgid "Frequently used"
262−#~ msgstr "Najczęściej używane"
263−
264−#~ msgid "Installed"
265−#~ msgstr "Zainstalowane"
266−
267−#~ msgid "Available for download"
268−#~ msgstr "Dostępne do pobrania"
269−
270−#~ msgid "Apps"
271−#~ msgstr "Aplikacje"
272−
273−#~ msgid "Frequent Apps"
274−#~ msgstr "Często używane aplikacje"
275−
276−#~ msgid "Recent Music"
277−#~ msgstr "Najnowsza muzyka"
278−
279−#~ msgid "Videos Popular Online"
280−#~ msgstr "Wideo popularne online"
281−
282−#~ msgid "Home"
283−#~ msgstr "Dom"
po/pt_BR.po+2−8
@@ -15,8 +15,8 @@ msgstr ""
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n > 1;\n"
18−"X-Launchpad-Export-Date: 2013-08-29 05:41+0000\n"
19−"X-Generator: Launchpad (build 16738)\n"
18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"
19+"X-Generator: Launchpad (build 16750)\n"
2020
2121#: Applications/applications.js:23
2222msgid "Phone"
@@ -253,9 +253,3 @@ msgstr "Desculpe, não há nada que corresponda à sua pesquisa."
253253#, qt-format
254254msgid "Please enter %1"
255255msgstr ""
256−
257−#~ msgid "Apps"
258−#~ msgstr "Aplicativos"
259−
260−#~ msgid "Home"
261−#~ msgstr "Início"
po/ro.po+2−8
@@ -16,8 +16,8 @@ msgstr ""
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "
1818"== 0) && (n != 0))) ? 2: 1));\n"
19−"X-Launchpad-Export-Date: 2013-08-29 05:41+0000\n"
20−"X-Generator: Launchpad (build 16738)\n"
19+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"
20+"X-Generator: Launchpad (build 16750)\n"
2121
2222#: Applications/applications.js:23
2323msgid "Phone"
@@ -255,9 +255,3 @@ msgstr ""
255255#, qt-format
256256msgid "Please enter %1"
257257msgstr ""
258−
259−#~ msgid "Apps"
260−#~ msgstr "Aplicații"
261−
262−#~ msgid "Home"
263−#~ msgstr "Acasă"
po/ru.po+2−29
@@ -16,8 +16,8 @@ msgstr ""
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
1818"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
19−"X-Launchpad-Export-Date: 2013-08-29 05:41+0000\n"
20−"X-Generator: Launchpad (build 16738)\n"
19+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"
20+"X-Generator: Launchpad (build 16750)\n"
2121
2222#: Applications/applications.js:23
2323msgid "Phone"
@@ -254,30 +254,3 @@ msgstr "Извините, поиск не дал результатов."
254254#, qt-format
255255msgid "Please enter %1"
256256msgstr "Пожалуйста, введите %1"
257−
258−#~ msgid "Running apps"
259−#~ msgstr "Запущенные приложения"
260−
261−#~ msgid "Frequently used"
262−#~ msgstr "Часто используемые"
263−
264−#~ msgid "Installed"
265−#~ msgstr "Установленные"
266−
267−#~ msgid "Available for download"
268−#~ msgstr "Доступно для загрузки"
269−
270−#~ msgid "Apps"
271−#~ msgstr "Приложения"
272−
273−#~ msgid "Frequent Apps"
274−#~ msgstr "Часто используемые приложения"
275−
276−#~ msgid "Recent Music"
277−#~ msgstr "Недавно прослушанная музыка"
278−
279−#~ msgid "Videos Popular Online"
280−#~ msgstr "Популярные видео из сети"
281−
282−#~ msgid "Home"
283−#~ msgstr "Главная"
po/si.po+2−2
@@ -15,8 +15,8 @@ msgstr ""
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2013-08-29 05:41+0000\n"
19−"X-Generator: Launchpad (build 16738)\n"
18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"
19+"X-Generator: Launchpad (build 16750)\n"
2020
2121#: Applications/applications.js:23
2222msgid "Phone"
po/sl.po+2−23
@@ -16,8 +16,8 @@ msgstr ""
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || "
1818"n%100==4 ? 3 : 0);\n"
19−"X-Launchpad-Export-Date: 2013-08-29 05:41+0000\n"
20−"X-Generator: Launchpad (build 16738)\n"
19+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"
20+"X-Generator: Launchpad (build 16750)\n"
2121
2222#: Applications/applications.js:23
2323msgid "Phone"
@@ -254,24 +254,3 @@ msgstr "Nič se ne ujema z vašim iskalnim nizom."
254254#, qt-format
255255msgid "Please enter %1"
256256msgstr ""
257−
258−#~ msgid "Frequently used"
259−#~ msgstr "Pogosto uporabljano"
260−
261−#~ msgid "Installed"
262−#~ msgstr "Nameščeno"
263−
264−#~ msgid "Available for download"
265−#~ msgstr "Na voljo za prejem"
266−
267−#~ msgid "Apps"
268−#~ msgstr "Programi"
269−
270−#~ msgid "Recent Music"
271−#~ msgstr "Nedavna glasba"
272−
273−#~ msgid "Home"
274−#~ msgstr "Domov"
275−
276−#~ msgid "Frequent Apps"
277−#~ msgstr "Pogosto uporabljani programi"
po/sr.po+2−8
@@ -16,8 +16,8 @@ msgstr ""
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
1818"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
19−"X-Launchpad-Export-Date: 2013-08-29 05:41+0000\n"
20−"X-Generator: Launchpad (build 16738)\n"
19+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"
20+"X-Generator: Launchpad (build 16750)\n"
2121
2222#: Applications/applications.js:23
2323msgid "Phone"
@@ -254,9 +254,3 @@ msgstr "Нажалост, претрага није наишла на икакв
254254#, qt-format
255255msgid "Please enter %1"
256256msgstr ""
257−
258−#~ msgid "Apps"
259−#~ msgstr "Програми"
260−
261−#~ msgid "Home"
262−#~ msgstr "Почетна"
po/sv.po+2−2
@@ -15,8 +15,8 @@ msgstr ""
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2013-08-29 05:41+0000\n"
19−"X-Generator: Launchpad (build 16738)\n"
18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"
19+"X-Generator: Launchpad (build 16750)\n"
2020
2121#: Applications/applications.js:23
2222msgid "Phone"
po/te.po+2−5
@@ -15,8 +15,8 @@ msgstr ""
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2013-08-29 05:41+0000\n"
19−"X-Generator: Launchpad (build 16738)\n"
18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"
19+"X-Generator: Launchpad (build 16750)\n"
2020
2121#: Applications/applications.js:23
2222msgid "Phone"
@@ -253,6 +253,3 @@ msgstr ""
253253#, qt-format
254254msgid "Please enter %1"
255255msgstr ""
256−
257−#~ msgid "Home"
258−#~ msgstr "నివాసం"
po/tr.po+2−29
@@ -15,8 +15,8 @@ msgstr ""
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2013-08-29 05:41+0000\n"
19−"X-Generator: Launchpad (build 16738)\n"
18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"
19+"X-Generator: Launchpad (build 16750)\n"
2020
2121#: Applications/applications.js:23
2222msgid "Phone"
@@ -253,30 +253,3 @@ msgstr "Üzgünüz, aramanızla eşleşen hiçbir şey yok."
253253#, qt-format
254254msgid "Please enter %1"
255255msgstr ""
256−
257−#~ msgid "Running apps"
258−#~ msgstr "Çalışan uygulamalar"
259−
260−#~ msgid "Frequently used"
261−#~ msgstr "Sıkça kullanılanlar"
262−
263−#~ msgid "Installed"
264−#~ msgstr "Yüklenenler"
265−
266−#~ msgid "Available for download"
267−#~ msgstr "İndirilebilir durumda"
268−
269−#~ msgid "Apps"
270−#~ msgstr "Uygulamalar"
271−
272−#~ msgid "Frequent Apps"
273−#~ msgstr "Sıkça Kullanılan Uygulamalar"
274−
275−#~ msgid "Recent Music"
276−#~ msgstr "En Son Müzik"
277−
278−#~ msgid "Videos Popular Online"
279−#~ msgstr "Çevrimiçi Yaygın Videolar"
280−
281−#~ msgid "Home"
282−#~ msgstr "Ana Sayfa"
po/ug.po+2−29
@@ -15,8 +15,8 @@ msgstr ""
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=1; plural=0;\n"
18−"X-Launchpad-Export-Date: 2013-08-29 05:41+0000\n"
19−"X-Generator: Launchpad (build 16738)\n"
18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"
19+"X-Generator: Launchpad (build 16750)\n"
2020
2121#: Applications/applications.js:23
2222msgid "Phone"
@@ -253,30 +253,3 @@ msgstr "كەچۈرۈڭ، ئىزدىگىنىڭىزگە ماس نەتىجە تېپ
253253#, qt-format
254254msgid "Please enter %1"
255255msgstr ""
256−
257−#~ msgid "Running apps"
258−#~ msgstr "ئىجرا بولۇۋاتقان ئەپلەر"
259−
260−#~ msgid "Frequently used"
261−#~ msgstr "كوپ ئىشلىتىلگەنلىرى"
262−
263−#~ msgid "Installed"
264−#~ msgstr "ئورنىتىلغانلىرى"
265−
266−#~ msgid "Available for download"
267−#~ msgstr "چۈشۈرگىلى بولىدىغانلىرى"
268−
269−#~ msgid "Apps"
270−#~ msgstr "ئەپلەر"
271−
272−#~ msgid "Frequent Apps"
273−#~ msgstr "دائىم ئىشلىتىلىدىغان ئەپلەر"
274−
275−#~ msgid "Recent Music"
276−#~ msgstr "يېقىندا ئاڭلىغان مۇزىكىلار"
277−
278−#~ msgid "Videos Popular Online"
279−#~ msgstr "توردىكى ئالقىشقا ئېرىشكەن سىنلار"
280−
281−#~ msgid "Home"
282−#~ msgstr "ماكان"
po/uk.po+2−29
@@ -16,8 +16,8 @@ msgstr ""
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
1818"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
19−"X-Launchpad-Export-Date: 2013-08-29 05:41+0000\n"
20−"X-Generator: Launchpad (build 16738)\n"
19+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"
20+"X-Generator: Launchpad (build 16750)\n"
2121
2222#: Applications/applications.js:23
2323msgid "Phone"
@@ -254,30 +254,3 @@ msgstr "Вибачте, для вказаних вами ключових слі
254254#, qt-format
255255msgid "Please enter %1"
256256msgstr "Будь ласка, введіть %1"
257−
258−#~ msgid "Running apps"
259−#~ msgstr "Запущені програми"
260−
261−#~ msgid "Frequently used"
262−#~ msgstr "Найчастіше використовувані"
263−
264−#~ msgid "Installed"
265−#~ msgstr "Встановлені"
266−
267−#~ msgid "Available for download"
268−#~ msgstr "Доступно до завантаження"
269−
270−#~ msgid "Apps"
271−#~ msgstr "Програми"
272−
273−#~ msgid "Frequent Apps"
274−#~ msgstr "Часто використовувані програми"
275−
276−#~ msgid "Recent Music"
277−#~ msgstr "Нещодавно прослухана музика"
278−
279−#~ msgid "Videos Popular Online"
280−#~ msgstr "Популярні в мережі відео"
281−
282−#~ msgid "Home"
283−#~ msgstr "Домівка"
po/zh_CN.po+2−29
@@ -15,8 +15,8 @@ msgstr ""
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=1; plural=0;\n"
18−"X-Launchpad-Export-Date: 2013-08-29 05:41+0000\n"
19−"X-Generator: Launchpad (build 16738)\n"
18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"
19+"X-Generator: Launchpad (build 16750)\n"
2020
2121#: Applications/applications.js:23
2222msgid "Phone"
@@ -253,30 +253,3 @@ msgstr "对不起，没有找到您想要的结果。"
253253#, qt-format
254254msgid "Please enter %1"
255255msgstr ""
256−
257−#~ msgid "Running apps"
258−#~ msgstr "正在运行的应用程序"
259−
260−#~ msgid "Frequently used"
261−#~ msgstr "常用"
262−
263−#~ msgid "Installed"
264−#~ msgstr "已安装"
265−
266−#~ msgid "Available for download"
267−#~ msgstr "可供下载"
268−
269−#~ msgid "Apps"
270−#~ msgstr "应用程序"
271−
272−#~ msgid "Frequent Apps"
273−#~ msgstr "常用软件"
274−
275−#~ msgid "Recent Music"
276−#~ msgstr "近期听过的音乐"
277−
278−#~ msgid "Videos Popular Online"
279−#~ msgstr "热门在线视频"
280−
281−#~ msgid "Home"
282−#~ msgstr "主页"
po/zh_TW.po+2−29
@@ -15,8 +15,8 @@ msgstr ""
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=1; plural=0;\n"
18−"X-Launchpad-Export-Date: 2013-08-29 05:41+0000\n"
19−"X-Generator: Launchpad (build 16738)\n"
18+"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"
19+"X-Generator: Launchpad (build 16750)\n"
2020
2121#: Applications/applications.js:23
2222msgid "Phone"
@@ -253,30 +253,3 @@ msgstr "很抱歉，找不到符合您想搜尋的結果。"
253253#, qt-format
254254msgid "Please enter %1"
255255msgstr ""
256−
257−#~ msgid "Running apps"
258−#~ msgstr "執行中的程式"
259−
260−#~ msgid "Frequently used"
261−#~ msgstr "最常使用"
262−
263−#~ msgid "Installed"
264−#~ msgstr "已安裝"
265−
266−#~ msgid "Available for download"
267−#~ msgstr "可供下載"
268−
269−#~ msgid "Apps"
270−#~ msgstr "程式"
271−
272−#~ msgid "Frequent Apps"
273−#~ msgstr "常用的程式"
274−
275−#~ msgid "Recent Music"
276−#~ msgstr "最近聽過的音樂"
277−
278−#~ msgid "Videos Popular Online"
279−#~ msgstr "線上熱門的影片"
280−
281−#~ msgid "Home"
282−#~ msgstr "家屋"
tests/mocks/Unity/fake_categories.cpp−3
@@ -36,7 +36,6 @@ Categories::Categories(QObject* parent)
3636 m_roles[Categories::RoleHints] = "hints";
3737 m_roles[Categories::RoleResults] = "results";
3838 m_roles[Categories::RoleCount] = "count";
39− m_roles[Categories::RoleCategoryIndex] = "categoryIndex";
4039
4140 // TODO This should not be needed but accumulatting the count changes
4241 // makes the visualization more stable and also makes crashes on fast
@@ -173,8 +172,6 @@ Categories::data(const QModelIndex& index, int role) const
173172 return QVariant::fromValue(getFilter(index.row()));
174173 case RoleCount:
175174 return QVariant::fromValue(getFilter(index.row())->rowCount());
176− case RoleCategoryIndex:
177− return QVariant::fromValue(index.row());
178175 default:
179176 return QVariant();
180177 }
tests/mocks/Unity/fake_categories.h+1−2
@@ -41,8 +41,7 @@ public:
4141 RoleContentType,
4242 RoleHints,
4343 RoleResults,
44− RoleCount,
45− RoleCategoryIndex
44+ RoleCount
4645 };
4746
4847 QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
tests/plugins/Unity/Launcher/CMakeLists.txt+4
@@ -1,8 +1,11 @@
1+pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
2+
13include_directories(
24 ${CMAKE_CURRENT_BINARY_DIR}
35 ${CMAKE_SOURCE_DIR}/plugins/AccountsService
46 ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher
57 ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/backend
8+ ${GSETTINGS_QT_INCLUDE_DIRS}
69 )
710
811add_definitions(-DSM_BUSNAME=sessionBus)
@@ -19,4 +22,5 @@ add_executable(launcherbackendtestExec
1922 ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/backend/launcherbackend.cpp
2023 ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/common/quicklistentry.cpp
2124 )
25+target_link_libraries(launcherbackendtestExec ${GSETTINGS_QT_LDFLAGS})
2226qt5_use_modules(launcherbackendtestExec Test Core DBus)
tests/plugins/Unity/Launcher/launcherbackendtest.cpp+1−34
@@ -32,46 +32,13 @@ private Q_SLOTS:
3232 LauncherBackend backend(false);
3333
3434 backend.setStoredApplications(QStringList() << "relative.path" << "/full/path");
35− QCOMPARE(backend.storedApplications(), QStringList() << "/usr/share/applications/relative.path" << "/full/path");
36−
37− QCOMPARE(backend.desktopFile("one.desktop"), QString("/usr/share/applications/one.desktop"));
38− QCOMPARE(backend.desktopFile("two"), QString("/usr/share/applications/two"));
39− QCOMPARE(backend.desktopFile("/full"), QString("/full"));
40−
41− QCOMPARE(backend.desktopFile("/usr/share/applications/one.desktop"), QString("/usr/share/applications/one.desktop"));
42− }
43−
44− void testDesktopReading()
45− {
46− LauncherBackend backend(false);
47−
48− QCOMPARE(backend.displayName(SRCDIR "/rel-icon.desktop"), QString("Relative Icon"));
49− QCOMPARE(backend.icon(SRCDIR "/rel-icon.desktop"), QString("image://gicon/rel-icon"));
50−
51− QCOMPARE(backend.displayName(SRCDIR "/abs-icon.desktop"), QString("Absolute Icon"));
52− QCOMPARE(backend.icon(SRCDIR "/abs-icon.desktop"), QString("/path/to/icon.png"));
53−
54− QCOMPARE(backend.displayName(SRCDIR "/no-icon.desktop"), QString("No Icon"));
55− QCOMPARE(backend.icon(SRCDIR "/no-icon.desktop"), QString(""));
56−
57− QCOMPARE(backend.displayName(SRCDIR "/no-name.desktop"), QString(""));
58− QCOMPARE(backend.icon(SRCDIR "/no-name.desktop"), QString("image://gicon/no-name"));
59−
60− QCOMPARE(backend.displayName(SRCDIR "/no-exist.desktop"), QString(""));
61− QCOMPARE(backend.icon(SRCDIR "/no-exist.desktop"), QString(""));
35+ QCOMPARE(backend.storedApplications(), QStringList() << "relative.path" << "/full/path");
6236 }
6337
6438 void testPinning()
6539 {
6640 LauncherBackend backend(false);
6741
68− // Confirm that default entries are all pinned
69− auto defaultApps = backend.storedApplications();
70− QVERIFY(defaultApps.size() > 0);
71− for (auto app: defaultApps) {
72− QCOMPARE(backend.isPinned(app), true);
73− }
74−
7542 backend.setStoredApplications(QStringList() << "one" << "two");
7643 QCOMPARE(backend.isPinned("one"), false);
7744 QCOMPARE(backend.isPinned("two"), false);
tests/plugins/Unity/filtersbindingstest.cpp+61−30
@@ -65,17 +65,17 @@ DeeModel* FiltersBindingsTest::createFilterModel()
6565
6666void FiltersBindingsTest::createMultiRangeFilter(DeeModel *model, const std::string &id, const std::string &name, int optionCount)
6767{
68− createFilter(model, "filter-multirange", id, name, optionCount);
68+ createFilter(model, "filter-multirange", id, name, optionCount, true);
6969}
7070
7171void FiltersBindingsTest::createRadioOptionFilter(DeeModel *model, const std::string &id, const std::string &name, int optionCount)
7272{
73− createFilter(model, "filter-radiooption", id, name, optionCount);
73+ createFilter(model, "filter-radiooption", id, name, optionCount, true);
7474}
7575
7676void FiltersBindingsTest::createCheckOptionFilter(DeeModel *model, const std::string &id, const std::string &name, int optionCount)
7777{
78− createFilter(model, "filter-checkoption", id, name, optionCount);
78+ createFilter(model, "filter-checkoption", id, name, optionCount, true);
7979}
8080
8181void FiltersBindingsTest::createRatingsFilter(DeeModel *model, const std::string &id, const std::string &name)
@@ -90,7 +90,7 @@ void FiltersBindingsTest::createRatingsFilter(DeeModel *model, const std::string
9090 GVariant *children[2];
9191 GVariant *key1 = g_variant_new_string("show-all-button");
9292 GVariant *key2 = g_variant_new_string("rating");
93− children[0] = g_variant_new_dict_entry(key1, g_variant_new_variant(g_variant_new_boolean(false)));
93+ children[0] = g_variant_new_dict_entry(key1, g_variant_new_variant(g_variant_new_boolean(true)));
9494 children[1] = g_variant_new_dict_entry(key2, g_variant_new_variant(g_variant_new_double(0.0f)));
9595 auto fhints = g_variant_new_array(G_VARIANT_TYPE("{sv}"), children, 2);
9696
@@ -102,7 +102,7 @@ void FiltersBindingsTest::createRatingsFilter(DeeModel *model, const std::string
102102 dee_model_append_row(model, row);
103103}
104104
105−void FiltersBindingsTest::createFilter(DeeModel *model, const std::string &renderer, const std::string &id, const std::string &name, int optionCount)
105+void FiltersBindingsTest::createFilter(DeeModel *model, const std::string &renderer, const std::string &id, const std::string &name, int optionCount, bool showAll)
106106{
107107 GVariant* row[8];
108108
@@ -114,7 +114,7 @@ void FiltersBindingsTest::createFilter(DeeModel *model, const std::string &rende
114114 GVariant *children[2];
115115 GVariant *key1 = g_variant_new_string("show-all-button");
116116 GVariant *key2 = g_variant_new_string("options");
117− children[0] = g_variant_new_dict_entry(key1, g_variant_new_variant(g_variant_new_boolean(false)));
117+ children[0] = g_variant_new_dict_entry(key1, g_variant_new_variant(g_variant_new_boolean(showAll)));
118118 children[1] = g_variant_new_dict_entry(key2, g_variant_new_variant(createOptions(optionCount)));
119119 auto fhints = g_variant_new_array(G_VARIANT_TYPE("{sv}"), children, 2);
120120
@@ -143,9 +143,9 @@ void FiltersBindingsTest::testMultiRangeFilter()
143143 auto multi_filter = dynamic_cast<MultiRangeFilter*>(bind_filter);
144144 QVERIFY(multi_filter != nullptr);
145145 auto options = multi_filter->options();
146− QCOMPARE(options->rowCount(), 1);
146+ QCOMPARE(options->rowCount(), 2);
147147
148− auto idx = options->index(0);
148+ auto idx = options->index(1);
149149 QVariant id_var = options->data(idx, GenericOptionsModel::RoleId);
150150 QVariant name_var = options->data(idx, GenericOptionsModel::RoleName);
151151 QVariant icon_var = options->data(idx, GenericOptionsModel::RoleIconHint);
@@ -168,9 +168,9 @@ void FiltersBindingsTest::testMultiRangeFilter()
168168 auto multi_filter = dynamic_cast<MultiRangeFilter*>(bind_filter);
169169 QVERIFY(multi_filter != nullptr);
170170 auto options = multi_filter->options();
171− QCOMPARE(options->rowCount(), 2);
171+ QCOMPARE(options->rowCount(), 3);
172172
173− auto idx = options->index(0);
173+ auto idx = options->index(1);
174174 QVariant id_var = options->data(idx, GenericOptionsModel::RoleId);
175175 QVariant name_var = options->data(idx, GenericOptionsModel::RoleName);
176176 QVariant icon_var = options->data(idx, GenericOptionsModel::RoleIconHint);
@@ -181,10 +181,10 @@ void FiltersBindingsTest::testMultiRangeFilter()
181181 QCOMPARE(icon_var.toString(), QString(""));
182182 QCOMPARE(active_var.toBool(), false);
183183
184− AbstractFilterOption* opt1 = options->getRawOption(0);
184+ AbstractFilterOption* opt1 = options->getRawOption(1);
185185 QCOMPARE(opt1->id(), QString("opt0"));
186186
187− AbstractFilterOption* opt2 = options->getRawOption(1);
187+ AbstractFilterOption* opt2 = options->getRawOption(2);
188188 QCOMPARE(opt2->id(), QString("opt1"));
189189
190190 delete multi_filter;
@@ -199,18 +199,21 @@ void FiltersBindingsTest::testMultiRangeFilter()
199199 auto multi_filter = dynamic_cast<MultiRangeFilter*>(bind_filter);
200200 QVERIFY(multi_filter != nullptr);
201201 auto options = multi_filter->options();
202− QCOMPARE(options->rowCount(), 3);
202+ QCOMPARE(options->rowCount(), 4);
203+
204+ AbstractFilterOption* showAll = options->getRawOption(0);
205+ QVERIFY(showAll->id().startsWith("show_all::"));
203206
204− AbstractFilterOption* opt0 = options->getRawOption(0);
207+ AbstractFilterOption* opt0 = options->getRawOption(1);
205208 QCOMPARE(opt0->id(), QString("opt0"));
206209
207− AbstractFilterOption* opt1 = options->getRawOption(1);
210+ AbstractFilterOption* opt1 = options->getRawOption(2);
208211 QCOMPARE(opt1->id(), QString("opt1"));
209212
210− AbstractFilterOption* opt2 = options->getRawOption(2);
213+ AbstractFilterOption* opt2 = options->getRawOption(3);
211214 QCOMPARE(opt2->id(), QString("opt2"));
212215
213− // verify combined filter options are bound to correct underlying unity options
216+ // verify filter options are bound to correct underlying unity options
214217 auto core_multi_filter = std::dynamic_pointer_cast<unity::dash::MultiRangeFilter>(core_filter);
215218 QCOMPARE(QString::fromStdString(core_multi_filter->options()[0]->id()), QString("opt0"));
216219 QCOMPARE(QString::fromStdString(core_multi_filter->options()[1]->id()), QString("opt1"));
@@ -274,7 +277,7 @@ void FiltersBindingsTest::testCheckOptionFilter()
274277 auto check_filter = dynamic_cast<CheckOptionFilter*>(bind_filter);
275278 QVERIFY(check_filter != nullptr);
276279 auto options = check_filter->options();
277− QCOMPARE(options->rowCount(), 3);
280+ QCOMPARE(options->rowCount(), 4);
278281
279282 QCOMPARE(check_filter->id(), QString("f1"));
280283 QCOMPARE(check_filter->name(), QString("Filter1"));
@@ -284,7 +287,7 @@ void FiltersBindingsTest::testCheckOptionFilter()
284287 QCOMPARE(check_filter->collapsed(), false);
285288 QCOMPARE(check_filter->filtering(), false);
286289
287− auto idx = options->index(0);
290+ auto idx = options->index(1);
288291 QVariant id_var = options->data(idx, GenericOptionsModel::RoleId);
289292 QVariant name_var = options->data(idx, GenericOptionsModel::RoleName);
290293 QVariant icon_var = options->data(idx, GenericOptionsModel::RoleIconHint);
@@ -295,7 +298,7 @@ void FiltersBindingsTest::testCheckOptionFilter()
295298 QCOMPARE(icon_var.toString(), QString(""));
296299 QCOMPARE(active_var.toBool(), false);
297300
298− idx = options->index(1);
301+ idx = options->index(2);
299302 id_var = options->data(idx, GenericOptionsModel::RoleId);
300303 name_var = options->data(idx, GenericOptionsModel::RoleName);
301304 icon_var = options->data(idx, GenericOptionsModel::RoleIconHint);
@@ -306,38 +309,55 @@ void FiltersBindingsTest::testCheckOptionFilter()
306309 QCOMPARE(icon_var.toString(), QString(""));
307310 QCOMPARE(active_var.toBool(), false);
308311
309− AbstractFilterOption* opt0 = options->getRawOption(0);
310− AbstractFilterOption* opt1 = options->getRawOption(1);
311− AbstractFilterOption* opt2 = options->getRawOption(2);
312+ AbstractFilterOption* showAll = options->getRawOption(0);
313+ AbstractFilterOption* opt0 = options->getRawOption(1);
314+ AbstractFilterOption* opt1 = options->getRawOption(2);
315+ AbstractFilterOption* opt2 = options->getRawOption(3);
312316
317+ QSignalSpy showAllSpy(showAll, SIGNAL(activeChanged(bool)));
313318 QSignalSpy opt0spy(opt0, SIGNAL(activeChanged(bool)));
314319 QSignalSpy opt1spy(opt1, SIGNAL(activeChanged(bool)));
315320 QSignalSpy opt2spy(opt2, SIGNAL(activeChanged(bool)));
316321 QSignalSpy dataChangedSpy(options, SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&, const QVector<int>&)));
317322
318323 // test active property changes
324+ QCOMPARE(showAll->active(), false);
319325 QCOMPARE(opt0->active(), false);
320326 QCOMPARE(opt1->active(), false);
321327 QCOMPARE(opt2->active(), false);
322328
323329 opt0->setActive(true);
330+ QCOMPARE(showAllSpy.count(), 0);
324331 QCOMPARE(opt0spy.count(), 1);
325332 QCOMPARE(opt1spy.count(), 0);
326333 QCOMPARE(opt2spy.count(), 0);
334+ QCOMPARE(showAll->active(), false);
327335 QCOMPARE(opt0->active(), true);
328336 QCOMPARE(opt1->active(), false);
329337 QCOMPARE(opt2->active(), false);
330338
331339 opt1->setActive(true);
340+ QCOMPARE(showAllSpy.count(), 0);
332341 QCOMPARE(opt0spy.count(), 2);
333342 QCOMPARE(opt1spy.count(), 1);
334343 QCOMPARE(opt2spy.count(), 0);
344+ QCOMPARE(showAll->active(), false);
335345 QCOMPARE(opt0->active(), false);
336346 QCOMPARE(opt1->active(), true);
337347 QCOMPARE(opt2->active(), false);
338348
339349 QCOMPARE(dataChangedSpy.count(), 3);
340350
351+ showAll->setActive(true);
352+ QCOMPARE(showAllSpy.count(), 1);
353+ QCOMPARE(opt0spy.count(), 2);
354+ QCOMPARE(opt1spy.count(), 2);
355+ QCOMPARE(opt2spy.count(), 0);
356+ QCOMPARE(showAll->active(), true);
357+ QCOMPARE(opt0->active(), false);
358+ QCOMPARE(opt1->active(), false);
359+ QCOMPARE(opt2->active(), false);
360+
341361 delete check_filter;
342362 }
343363}
@@ -357,7 +377,7 @@ void FiltersBindingsTest::testRadioOptionFilter()
357377 auto radio_filter = dynamic_cast<RadioOptionFilter*>(bind_filter);
358378 QVERIFY(radio_filter != nullptr);
359379 auto options = radio_filter->options();
360− QCOMPARE(options->rowCount(), 3);
380+ QCOMPARE(options->rowCount(), 4);
361381
362382 auto idx = options->index(0);
363383 QVariant id_var = options->data(idx, GenericOptionsModel::RoleId);
@@ -365,12 +385,23 @@ void FiltersBindingsTest::testRadioOptionFilter()
365385 QVariant icon_var = options->data(idx, GenericOptionsModel::RoleIconHint);
366386 QVariant active_var = options->data(idx, GenericOptionsModel::RoleActive);
367387
388+ QVERIFY(id_var.toString().startsWith("show_all::"));
389+ QVERIFY(name_var.toString().size() > 0);
390+ QCOMPARE(icon_var.toString(), QString(""));
391+ QCOMPARE(active_var.toBool(), false);
392+
393+ idx = options->index(1);
394+ id_var = options->data(idx, GenericOptionsModel::RoleId);
395+ name_var = options->data(idx, GenericOptionsModel::RoleName);
396+ icon_var = options->data(idx, GenericOptionsModel::RoleIconHint);
397+ active_var = options->data(idx, GenericOptionsModel::RoleActive);
398+
368399 QCOMPARE(id_var.toString(), QString("opt0"));
369400 QCOMPARE(name_var.toString(), QString("Option 0"));
370401 QCOMPARE(icon_var.toString(), QString(""));
371402 QCOMPARE(active_var.toBool(), false);
372403
373− idx = options->index(1);
404+ idx = options->index(2);
374405 id_var = options->data(idx, GenericOptionsModel::RoleId);
375406 name_var = options->data(idx, GenericOptionsModel::RoleName);
376407 icon_var = options->data(idx, GenericOptionsModel::RoleIconHint);
@@ -381,9 +412,9 @@ void FiltersBindingsTest::testRadioOptionFilter()
381412 QCOMPARE(icon_var.toString(), QString(""));
382413 QCOMPARE(active_var.toBool(), false);
383414
384− AbstractFilterOption* opt0 = options->getRawOption(0);
385− AbstractFilterOption* opt1 = options->getRawOption(1);
386− AbstractFilterOption* opt2 = options->getRawOption(2);
415+ AbstractFilterOption* opt0 = options->getRawOption(1);
416+ AbstractFilterOption* opt1 = options->getRawOption(2);
417+ AbstractFilterOption* opt2 = options->getRawOption(3);
387418
388419 QSignalSpy opt0spy(opt0, SIGNAL(activeChanged(bool)));
389420 QSignalSpy opt1spy(opt1, SIGNAL(activeChanged(bool)));
@@ -432,11 +463,11 @@ void FiltersBindingsTest::testRatingsFilter()
432463 auto rating_filter = dynamic_cast<RatingsFilter*>(bind_filter);
433464 QVERIFY(rating_filter != nullptr);
434465 auto options = rating_filter->options();
435− QCOMPARE(options->rowCount(), 5);
466+ QCOMPARE(options->rowCount(), 6);
436467
437468 RatingFilterOption* opt[5];
438469 for (int i = 0; i<5; i++) {
439− opt[i] = dynamic_cast<RatingFilterOption *>(options->getRawOption(i));
470+ opt[i] = dynamic_cast<RatingFilterOption *>(options->getRawOption(i+1));
440471 }
441472
442473 QSignalSpy opt0spy(opt[0], SIGNAL(activeChanged(bool)));
tests/plugins/Unity/filtersbindingstest.h+1−1
@@ -41,7 +41,7 @@ class FiltersBindingsTest : public QObject
4141 void createCheckOptionFilter(DeeModel *model, const std::string &id, const std::string &name, int optionCount);
4242 void createRadioOptionFilter(DeeModel *model, const std::string &id, const std::string &name, int optionCount);
4343 void createRatingsFilter(DeeModel *model, const std::string &id, const std::string &name);
44− void createFilter(DeeModel *model, const std::string &renderer, const std::string &id, const std::string &name, int optionCount);
44+ void createFilter(DeeModel *model, const std::string &renderer, const std::string &id, const std::string &name, int optionCount, bool showAll);
4545};
4646
4747#endif // FILTERSBINDINGSTEST_H