Added new stuff.

cuzbog · Nov 28, 2014 · ee2e5d3 · ee2e5d3
1 parent ee3783e
commit ee2e5d3
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 17 deletions.
diff --git a/CMakeLists.txt.user b/CMakeLists.txt.user
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.1.1, 2014-11-20T19:31:31. -->
+<!-- Written by QtCreator 3.1.1, 2014-11-26T21:48:15. -->
 <qtcreator>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>
-  <value type="int">0</value>
+  <value type="int">1</value>
  </data>
  <data>
   <variable>ProjectExplorer.Project.EditorSettings</variable>
@@ -252,8 +252,8 @@
        <value type="QString">/var/lib/schroot/chroots/click-ubuntu-sdk-14.10-armhf</value>
       </valuelist>
       <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedTimes">
-       <value type="QDateTime">2014-11-19T18:08:12</value>
-       <value type="QDateTime">2014-11-19T18:08:12</value>
+       <value type="QDateTime">2014-11-26T21:27:42</value>
+       <value type="QDateTime">2014-11-26T21:27:42</value>
       </valuelist>
      </valuemap>
      <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
@@ -15,7 +15,7 @@ install(
   FILES
     "art.png"
     "logo.svg"
-    "mixcloud.svg"
+    "screenshot.png"
   DESTINATION
     "${SCOPE_INSTALL_DIR}"
 )

diff --git a/data/art.png b/data/art.png
diff --git a/data/com.ubuntu.developer.boghison.mixcloud_mixcloudscope.ini b/data/com.ubuntu.developer.boghison.mixcloud_mixcloudscope.ini
@@ -1,9 +1,9 @@
 [ScopeConfig]
-DisplayName = MixCloud Scope
+DisplayName = MixCloud
 Description = This is a MixCloud scope
-Art = art.png
+Art = screenshot.png
 Author = Firstname Lastname
-Icon = icon.png
+Icon = art.png
 
 [Appearance]
 PageHeader.Logo = logo.svg

diff --git a/data/screenshot.png b/data/screenshot.png
diff --git a/include/api/config.h b/include/api/config.h
@@ -12,7 +12,6 @@ struct Config {
     /*
      * The root of all API request URLs
      */
-    std::string installdir { "" };
     std::string apiroot { "http://api.mixcloud.com" };
 
     /*

diff --git a/include/scope/query.h b/include/scope/query.h
@@ -28,7 +28,6 @@ class Query: public unity::scopes::SearchQueryBase {
     void parseCasts(unity::scopes::CategorisedResult &hotRes, const api::Client::CloudCast &hotCast);
 
 private:
-    std::string installdir;
     api::Client client_;
     void initScope();
     bool showNew;

diff --git a/src/api/client.cpp b/src/api/client.cpp
@@ -7,7 +7,6 @@
 #include <unity/scopes/QueryMetadata.h>
 #include <QVariantMap>
 #include <math.h>
-#include <QDebug>
 #include <boost/algorithm/string/replace.hpp>
 
 
@@ -56,7 +55,6 @@ void Client::get(const net::Uri::Path &path,
     net::Uri uri = net::make_uri(config_->apiroot, path, parameters);
     std::string temporaryUri = client->uri_to_string(uri);
     configuration.uri = boost::replace_all_copy(temporaryUri, "%20", "+");
-    qDebug(configuration.uri.c_str());
     // Give out a user agent string
     configuration.header.add("User-Agent", config_->user_agent);
 

diff --git a/src/scope/query.cpp b/src/scope/query.cpp
@@ -30,12 +30,11 @@ using namespace scope;
  *
  * The icons are larger.
  */
-const static string TRACKS_TEMPLATE = "{\"schema-version\":1,\"template\":{\"category-layout\":\"grid\",\"card-layout\":\"horizontal\",\"card-size\":\"medium\"},\"components\":{\"title\":\"title\",\"art\":{\"field\":\"art\"},\"subtitle\":\"subtitle\",\"attributes\":\"attributes\",\"emblem\":\"emblem\"}}";
+const static string TRACKS_TEMPLATE = "{\"schema-version\":1,\"template\":{\"category-layout\":\"grid\",\"card-layout\":\"horizontal\",\"card-size\":\"medium\"},\"components\":{\"title\":\"title\",\"art\":{\"field\":\"art\"},\"subtitle\":\"subtitle\",\"attributes\":\"attributes\"}}";
 const static string USERS_TEMPLATE = "{\"schema-version\":1,\"components\":{\"title\":\"title\",\"art\":{\"field\":\"art\"}, \"subtitle\": \"subtitle\", \"attributes\": \"attributes\", \"emblem\": \"emblem\"}}";
 Query::Query(const sc::CannedQuery &query, const sc::SearchMetadata &metadata,
              Config::Ptr config) :
     sc::SearchQueryBase(query, metadata), client_(config) {
-    Query::installdir = config->installdir;
 }
 
 void Query::cancelled() {
@@ -115,7 +114,6 @@ void Query::run(sc::SearchReplyProxy const& reply) {
 }
 
 void Query::parseCasts(sc::CategorisedResult &hotRes, const api::Client::CloudCast &hotCast){
-    string emblemPath = Query::installdir + "/mixcloud.svg";
     hotRes.set_uri(hotCast.url);
     hotRes.set_title(hotCast.name);
     hotRes.set_art(hotCast.thumbnail);
@@ -140,7 +138,6 @@ void Query::parseCasts(sc::CategorisedResult &hotRes, const api::Client::CloudCa
     builder.add_tuple({{"value", sc::Variant("⌚ " + hotCast.audio_length)}});
     builder.add_tuple({{"value", sc::Variant(myValue)}});
     hotRes["attributes"] = builder.end();
-    hotRes["emblem"] = emblemPath;
 }
 
 
diff --git a/src/scope/scope.cpp b/src/scope/scope.cpp
@@ -10,7 +10,6 @@ using namespace scope;
 
 void Scope::start(string const&) {
     config_ = make_shared<Config>();
-    config_->installdir = ScopeBase::scope_directory();
 
     setlocale(LC_ALL, "");
     string translation_directory = ScopeBase::scope_directory()
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,7 +12,6 @@ struct Config { @@
         /*
          * The root of all API request URLs
          */
-        std::string installdir { "" };
         std::string apiroot { "http://api.mixcloud.com" };
         /*
@@ Expand Down @@