New upstream version 3.8

[minitube] / src / searchview.cpp

diff --git a/src/searchview.cpp b/src/searchview.cpp
index b504ac800e7a5c7365855b41b6089e75193bd018..5315ca3e32632b9cef5b8531cac699d69678485d 100644 (file)
--- a/src/searchview.cpp
+++ b/src/searchview.cpp
@@ -407,11 +407,7 @@ void SearchView::watchChannel(const QString &channelId) {
     }
 
     QString id = channelId;
-
-    // Fix old settings
-    const QLatin1String uc("UC");
-    if (!id.startsWith(uc)) id = uc + id;
-
+    qDebug() << "Channel" << id;
     SearchParams *searchParams = new SearchParams();
     searchParams->setChannelId(id);
     searchParams->setSortBy(SearchParams::SortByNewest);
@@ -472,7 +468,7 @@ void SearchView::maybeShowMessage() {
     if (showMessages && !settings.contains(key = "sofa")) {
         QString msg = tr("Need a remote control for %1? Try %2!").arg(Constants::NAME).arg("Sofa");
         msg = "<a href='https://" + QLatin1String(Constants::ORG_DOMAIN) + '/' + key +
-              "' style = 'text-decoration:none;color:palette(windowText)'>" + msg + "</a>";
+              "' style='text-decoration:none;color:palette(windowText)'>" + msg + "</a>";
         messageBar->setMessage(msg);
         messageBar->setOpenExternalLinks(true);
         disconnect(messageBar);
@@ -492,13 +488,15 @@ void SearchView::maybeShowMessage() {
 #ifdef APP_ACTIVATION
             oneYearUsage = (QDateTime::currentSecsSinceEpoch() -
                             Activation::instance().getLicenseTimestamp()) > 86400 * 365;
+#elif APP_MAC_STORE
+            oneYearUsage = false;
 #endif
             if (oneYearUsage) {
                 QString msg =
                         tr("I keep improving %1 to make it the best I can. Support this work!")
                                 .arg(Constants::NAME);
                 msg = "<a href='https://" + QLatin1String(Constants::ORG_DOMAIN) + "/donate" +
-                      "' style = 'text-decoration:none;color:palette(windowText)'>" + msg + "</a>";
+                      "' style='text-decoration:none;color:palette(windowText)'>" + msg + "</a>";
                 messageBar->setMessage(msg);
                 messageBar->setOpenExternalLinks(true);
                 disconnect(messageBar);
@@ -515,13 +513,15 @@ void SearchView::maybeShowMessage() {
     connect(&Updater::instance(), &Updater::statusChanged, this, [this](auto status) {
         if (status == Updater::Status::UpdateDownloaded) {
             QString msg = tr("An update is ready to be installed. Quit and install update.");
-            msg = "<a href='http://quit' style = "
-                  "'text-decoration:none;color:palette(windowText)'>" +
+            msg = "<a href='http://quit' style='text-decoration:none;color:palette(windowText)'>" +
                   msg + "</a>";
             messageBar->setMessage(msg);
             messageBar->setOpenExternalLinks(false);
             disconnect(messageBar);
-            connect(messageBar, &MessageBar::linkActivated, this, [] { qApp->quit(); });
+            connect(messageBar, &MessageBar::linkActivated, this, [] {
+                Updater::instance().setRelaunchAfterInstall(true);
+                qApp->quit();
+            });
             messageBar->show();
         }
     });