89e178b · unity8 · git.iko.soy

git.iko.soy/unity8

Removed some commented code.

commit89e178b94ca70c94ffdaf9f75b9c9023d4922e44 authorPawel Stolowski <pawel.stolowski@canonical.com> dateThu 6 Jun 2013, 12:37 (13 years ago) parent063b956

2 files changed+7−89

compare with xenial

unifiedsplit

plugins/Unity/lens.cpp+5−70 plugins/Unity/lens.h+2−19

plugins/Unity/lens.cpp+5−70

@@ -32,11 +32,9 @@ Lens::Lens(QObject *parent) :

3232 QObject(parent)

3333{

3434 m_results = new DeeListModel(this);

35− //m_globalResults = new DeeListModel(this);

3635 m_categories = new Categories(this);

3736

3837 m_categories->setResultModel(m_results);

39−// m_categories->setGlobalResultModel(m_globalResults);

4038}

4139

4240QString Lens::id() const

@@ -44,16 +42,6 @@ QString Lens::id() const

4442 return QString::fromStdString(m_unityLens->id());

4543}

4644

47−/*QString Lens::dbusName() const

48−{

49− return QString::fromStdString(m_unityLens->dbus_name());

50−}

51−

52−QString Lens::dbusPath() const

53−{

54− return QString::fromStdString(m_unityLens->dbus_path());

55− }*/

56−

5745QString Lens::name() const

5846{

5947 return QString::fromStdString(m_unityLens->name());

@@ -79,11 +67,6 @@ bool Lens::visible() const

7967 return m_unityLens->visible();

8068}

8169

82−/*bool Lens::searchInGlobal() const

83−{

84− return m_unityLens->search_in_global();

85− }*/

86−

8770QString Lens::shortcut() const

8871{

8972 return QString::fromStdString(m_unityLens->shortcut());

@@ -99,11 +82,6 @@ DeeListModel* Lens::results() const

9982 return m_results;

10083}

10184

102−/*DeeListModel* Lens::globalResults() const

103−{

104− return m_globalResults;

105−}*/

106−

10785Categories* Lens::categories() const

10886{

10987 return m_categories;

@@ -119,11 +97,6 @@ QString Lens::searchQuery() const

11997 return m_searchQuery;

12098}

12199

122−/*QString Lens::globalSearchQuery() const

123−{

124− return m_globalSearchQuery;

125−}*/

126−

127100QString Lens::noResultsHint() const

128101{

129102 return m_noResultsHint;

@@ -148,20 +121,6 @@ void Lens::setSearchQuery(const QString& search_query)

148121 }

149122}

150123

151−//void Lens::setGlobalSearchQuery(const QString& search_query)

152−//{

153− /* Checking for m_globalSearchQuery.isNull() which returns true only when the string

154− has never been set is necessary because when search_query is the empty

155− string ("") and m_globalSearchQuery is the null string,

156− search_query != m_globalSearchQuery is still true.

157− */

158−/* if (m_globalSearchQuery.isNull() || search_query != m_globalSearchQuery) {

159− m_globalSearchQuery = search_query;

160− m_unityLens->GlobalSearch(search_query.toStdString(), sigc::mem_fun(this, &Lens::globalSearchFinished));

161− Q_EMIT globalSearchQueryChanged();

162− }

163−}*/

164−

165124void Lens::setNoResultsHint(const QString& hint) {

166125 if (hint != m_noResultsHint) {

167126 m_noResultsHint = hint;

@@ -171,13 +130,13 @@ void Lens::setNoResultsHint(const QString& hint) {

171130

172131void Lens::activate(const QString& uri)

173132{

174− // m_unityLens->Activate(QByteArray::fromPercentEncoding(uri.toUtf8()).constData()); FIXME pawel

133+// m_unityLens->Activate(QByteArray::fromPercentEncoding(uri.toUtf8()).constData()); FIXME pawel

175134}

176135

177−void Lens::onActivated(std::string const& uri, unity::dash::ScopeHandledType type, unity::glib::HintsMap const&)

136+void Lens::onActivated(unity::dash::LocalResult const& result, unity::dash::ScopeHandledType type, unity::glib::HintsMap const&)

178137{

179138 if (type == unity::dash::NOT_HANDLED) {

180− fallbackActivate(QString::fromStdString(uri));

139+ fallbackActivate(QString::fromStdString(result.uri));

181140 }

182141}

183142

@@ -218,19 +177,13 @@ void Lens::fallbackActivate(const QString& uri)

218177void Lens::setUnityLens(const unity::dash::Scope::Ptr& lens)

219178{

220179 m_unityLens = lens;

221−// m_results->setModel(m_unityLens->results()->model());

222180

223181 if (QString::fromStdString(m_unityLens->results()->swarm_name) == QString(":local")) {

224182 m_results->setModel(m_unityLens->results()->model());

225183 } else {

226184 m_results->setName(QString::fromStdString(m_unityLens->results()->swarm_name));

227185 }

228−/* if (QString::fromStdString(m_unityLens->global_results()->swarm_name) == QString(":local")) {

229− m_globalResults->setModel(m_unityLens->global_results()->model());

230− } else {

231− m_globalResults->setName(QString::fromStdString(m_unityLens->global_results()->swarm_name));

232− }*/

233−

186+

234187 if (QString::fromStdString(m_unityLens->categories()->swarm_name) == QString(":local")) {

235188 m_categories->setModel(m_unityLens->categories()->model());

236189 } else {

@@ -239,21 +192,16 @@ void Lens::setUnityLens(const unity::dash::Scope::Ptr& lens)

239192

240193 /* Property change signals */

241194 m_unityLens->id.changed.connect(sigc::mem_fun(this, &Lens::idChanged));

242−// m_unityLens->dbus_name.changed.connect(sigc::mem_fun(this, &Lens::dbusNameChanged));

243−// m_unityLens->dbus_path.changed.connect(sigc::mem_fun(this, &Lens::dbusPathChanged));

244195 m_unityLens->name.changed.connect(sigc::mem_fun(this, &Lens::nameChanged));

245196 m_unityLens->icon_hint.changed.connect(sigc::mem_fun(this, &Lens::iconHintChanged));

246197 m_unityLens->description.changed.connect(sigc::mem_fun(this, &Lens::descriptionChanged));

247198 m_unityLens->search_hint.changed.connect(sigc::mem_fun(this, &Lens::searchHintChanged));

248199 m_unityLens->visible.changed.connect(sigc::mem_fun(this, &Lens::visibleChanged));

249−// m_unityLens->search_in_global.changed.connect(sigc::mem_fun(this, &Lens::searchInGlobalChanged));

250200 m_unityLens->shortcut.changed.connect(sigc::mem_fun(this, &Lens::shortcutChanged));

251201 m_unityLens->connected.changed.connect(sigc::mem_fun(this, &Lens::connectedChanged));

252202 m_unityLens->results.changed.connect(sigc::mem_fun(this, &Lens::onResultsChanged));

253203 m_unityLens->results()->swarm_name.changed.connect(sigc::mem_fun(this, &Lens::onResultsSwarmNameChanged));

254204 m_unityLens->results()->model.changed.connect(sigc::mem_fun(this, &Lens::onResultsModelChanged));

255−// m_unityLens->global_results.changed.connect(sigc::mem_fun(this, &Lens::onGlobalResultsChanged));

256−// m_unityLens->global_results()->swarm_name.changed.connect(sigc::mem_fun(this, &Lens::onGlobalResultsSwarmNameChanged));

257205 m_unityLens->categories()->model.changed.connect(sigc::mem_fun(this, &Lens::onCategoriesModelChanged));

258206 m_unityLens->categories.changed.connect(sigc::mem_fun(this, &Lens::onCategoriesChanged));

259207 m_unityLens->categories()->swarm_name.changed.connect(sigc::mem_fun(this, &Lens::onCategoriesSwarmNameChanged));

@@ -263,7 +211,7 @@ void Lens::setUnityLens(const unity::dash::Scope::Ptr& lens)

263211 connect(this, SIGNAL(searchFinished(const std::string &, unity::glib::HintsMap const &, unity::glib::Error const &)), SLOT(onSearchFinished(const std::string &, unity::glib::HintsMap const &)));

264212

265213 /* FIXME: signal should be forwarded instead of calling the handler directly */

266− //unityLens->activated.connect(sigc::mem_fun(this, &Lens::onActivated)); //FIXME pawel

214+ m_unityLens->activated.connect(sigc::mem_fun(this, &Lens::onActivated));

267215

268216 /* Synchronize local states with m_unityLens right now and whenever

269217 m_unityLens becomes connected */

@@ -284,9 +232,6 @@ void Lens::synchronizeStates()

284232 if (!m_searchQuery.isNull()) {

285233 m_unityLens->Search(m_searchQuery.toStdString());

286234 }

287− /*if (!m_globalSearchQuery.isNull()) {

288− m_unityLens->GlobalSearch(m_globalSearchQuery.toStdString());

289− }*/

290235 }

291236}

292237

@@ -305,16 +250,6 @@ void Lens::onResultsModelChanged(unity::glib::Object<DeeModel> model)

305250 m_results->setModel(m_unityLens->results()->model());

306251}

307252

308−//void Lens::onGlobalResultsSwarmNameChanged(const std::string& /* swarm_name */)

309−//{

310−// m_globalResults->setName(QString::fromStdString(m_unityLens->global_results()->swarm_name));

311−//

312−

313−//id Lens::onGlobalResultsChanged(const unity::dash::Results::Ptr& /* global_results */)

314−//

315−// m_globalResults->setName(QString::fromStdString(m_unityLens->global_results()->swarm_name));

316−//}

317−

318253void Lens::onCategoriesSwarmNameChanged(const std::string& /* swarm_name */)

319254{

320255 m_categories->setName(QString::fromStdString(m_unityLens->categories()->swarm_name));

plugins/Unity/lens.h+2−19

@@ -28,6 +28,7 @@

2828// libunity-core

2929#include <UnityCore/Scope.h>

3030#include <UnityCore/Variant.h>

31+#include <UnityCore/Results.h>

3132

3233// dee-qt

3334#include "deelistmodel.h"

@@ -40,23 +41,18 @@ class Lens : public QObject

4041 Q_ENUMS(ViewType)

4142

4243 Q_PROPERTY(QString id READ id NOTIFY idChanged)

43−// Q_PROPERTY(QString dbusName READ dbusName NOTIFY dbusNameChanged)

44−// Q_PROPERTY(QString dbusPath READ dbusPath NOTIFY dbusPathChanged)

4544 Q_PROPERTY(QString name READ name NOTIFY nameChanged)

4645 Q_PROPERTY(QString iconHint READ iconHint NOTIFY iconHintChanged)

4746 Q_PROPERTY(QString description READ description NOTIFY descriptionChanged)

4847 Q_PROPERTY(QString searchHint READ searchHint NOTIFY searchHintChanged)

4948 Q_PROPERTY(bool visible READ visible NOTIFY visibleChanged)

50−// Q_PROPERTY(bool searchInGlobal READ searchInGlobal NOTIFY searchInGlobalChanged)

5149 Q_PROPERTY(QString shortcut READ shortcut NOTIFY shortcutChanged)

5250 Q_PROPERTY(bool connected READ connected NOTIFY connectedChanged)

5351 Q_PROPERTY(DeeListModel* results READ results NOTIFY resultsChanged)

54−// Q_PROPERTY(DeeListModel* globalResults READ globalResults NOTIFY globalResultsChanged)

5552 Q_PROPERTY(Categories* categories READ categories NOTIFY categoriesChanged)

5653 Q_PROPERTY(ViewType viewType READ viewType WRITE setViewType NOTIFY viewTypeChanged)

5754

5855 Q_PROPERTY(QString searchQuery READ searchQuery WRITE setSearchQuery NOTIFY searchQueryChanged)

59−// Q_PROPERTY(QString globalSearchQuery READ globalSearchQuery WRITE setGlobalSearchQuery NOTIFY globalSearchQueryChanged)

6056 Q_PROPERTY(QString noResultsHint READ noResultsHint WRITE setNoResultsHint NOTIFY noResultsHintChanged)

6157

6258public:

@@ -70,14 +66,11 @@ public:

7066

7167 /* getters */

7268 QString id() const;

73−// QString dbusName() const;

74−// QString dbusPath() const;

7569 QString name() const;

7670 QString iconHint() const;

7771 QString description() const;

7872 QString searchHint() const;

7973 bool visible() const;

80−// bool searchInGlobal() const;

8174 QString shortcut() const;

8275 bool connected() const;

8376 DeeListModel* results() const;

@@ -85,13 +78,11 @@ public:

8578 Categories* categories() const;

8679 ViewType viewType() const;

8780 QString searchQuery() const;

88−// QString globalSearchQuery() const;

8981 QString noResultsHint() const;

9082

9183 /* setters */

9284 void setViewType(const ViewType& viewType);

9385 void setSearchQuery(const QString& search_query);

94−// void setGlobalSearchQuery(const QString& search_query);

9586 void setNoResultsHint(const QString& hint);

9687

9788 Q_INVOKABLE void activate(const QString& uri);

@@ -107,17 +98,13 @@ Q_SIGNALS:

10798 void descriptionChanged(const std::string&);

10899 void searchHintChanged(const std::string&);

109100 void visibleChanged(bool);

110−// void searchInGlobalChanged(bool);

111101 void shortcutChanged(const std::string&);

112102 void connectedChanged(bool);

113103 void resultsChanged();

114−// void globalResultsChanged();

115104 void categoriesChanged();

116105 void viewTypeChanged(ViewType);

117106 void searchFinished(const std::string&, unity::glib::HintsMap const&, unity::glib::Error const&);

118−// void globalSearchFinished(unity::dash::Lens::Hints const&, unity::glib::Error const&); FIXME pawel

119107 void searchQueryChanged();

120−// void globalSearchQueryChanged();

121108 void noResultsHintChanged();

122109

123110private Q_SLOTS:

@@ -128,22 +115,18 @@ private:

128115 void onResultsSwarmNameChanged(const std::string&);

129116 void onResultsChanged(const unity::dash::Results::Ptr&);

130117 void onResultsModelChanged(unity::glib::Object<DeeModel>);

131−// void onGlobalResultsSwarmNameChanged(const std::string&);

132−// void onGlobalResultsChanged(const unity::dash::Results::Ptr&);

133118 void onCategoriesSwarmNameChanged(const std::string&);

134119 void onCategoriesModelChanged(unity::glib::Object<DeeModel>);

135120 void onCategoriesChanged(const unity::dash::Categories::Ptr&);

136121 void onViewTypeChanged(unity::dash::ScopeViewType);

137122

138− void onActivated(std::string const& uri, unity::dash::ScopeHandledType type, unity::glib::HintsMap const&);

123+ void onActivated(unity::dash::LocalResult const& result, unity::dash::ScopeHandledType type, unity::glib::HintsMap const&);

139124 void fallbackActivate(const QString& uri);

140125

141126 unity::dash::Scope::Ptr m_unityLens;

142127 DeeListModel* m_results;

143−// DeeListModel* m_globalResults;

144128 Categories* m_categories;

145129 QString m_searchQuery;

146−// QString m_globalSearchQuery;

147130 QString m_noResultsHint;

148131};

149132