Update upstream source from tag 'upstream/3.8'

[minitube] / src / sidebarwidget.cpp

diff --git a/src/sidebarwidget.cpp b/src/sidebarwidget.cpp
index 676cf4fcbb15c1778c4f81a5efd08a919817538c..2b1d546e1ab3aaa6df3e66f16713b8799af63b22 100644 (file)
--- a/src/sidebarwidget.cpp
+++ b/src/sidebarwidget.cpp
@@ -19,6 +19,7 @@ along with Minitube.  If not, see <http://www.gnu.org/licenses/>.
 $END_LICENSE */
 
 #include "sidebarwidget.h"
+#include "mainwindow.h"
 #include "refinesearchbutton.h"
 #include "refinesearchwidget.h"
 #include "sidebarheader.h"
@@ -26,18 +27,16 @@ $END_LICENSE */
 #include "extra.h"
 #endif
 
-namespace The {
-QHash<QString, QAction*>* globalActions();
-}
-
-SidebarWidget::SidebarWidget(QWidget *parent) :
-    QWidget(parent), playlistWidth(0) {
-    playlist = 0;
+SidebarWidget::SidebarWidget(QWidget *parent) : QWidget(parent), playlistWidth(0) {
+    playlist = nullptr;
 
     QBoxLayout *layout = new QVBoxLayout(this);
     layout->setSpacing(0);
     layout->setMargin(0);
 
+    setBackgroundRole(QPalette::Base);
+    setAutoFillBackground(true);
+
     sidebarHeader = new SidebarHeader();
     layout->addWidget(sidebarHeader);
 
@@ -49,11 +48,9 @@ SidebarWidget::SidebarWidget(QWidget *parent) :
     messageLabel->setAutoFillBackground(true);
     messageLabel->setWordWrap(true);
     messageLabel->setTextFormat(Qt::RichText);
-    messageLabel->setTextInteractionFlags(
-                Qt::LinksAccessibleByKeyboard |
-                Qt::LinksAccessibleByMouse);
-    connect(messageLabel, SIGNAL(linkActivated(QString)),
-            SIGNAL(suggestionAccepted(QString)));
+    messageLabel->setTextInteractionFlags(Qt::LinksAccessibleByKeyboard |
+                                          Qt::LinksAccessibleByMouse);
+    connect(messageLabel, SIGNAL(linkActivated(QString)), SIGNAL(suggestionAccepted(QString)));
     messageLabel->hide();
     layout->addWidget(messageLabel);
 
@@ -65,8 +62,9 @@ SidebarWidget::SidebarWidget(QWidget *parent) :
 
 void SidebarWidget::setup() {
     refineSearchButton = new RefineSearchButton(this);
-    refineSearchButton->setStatusTip(tr("Refine Search")
-                                     + " (" + QKeySequence(Qt::CTRL + Qt::Key_R).toString(QKeySequence::NativeText) + ")");
+    refineSearchButton->setStatusTip(
+            tr("Refine Search") + " (" +
+            QKeySequence(Qt::CTRL + Qt::Key_R).toString(QKeySequence::NativeText) + ")");
     refineSearchButton->hide();
     connect(refineSearchButton, SIGNAL(clicked()), SLOT(showRefineSearchWidget()));
 
@@ -89,7 +87,7 @@ void SidebarWidget::setPlaylist(QListView *playlist) {
 
 void SidebarWidget::showPlaylist() {
     stackedWidget->setCurrentWidget(playlist);
-    The::globalActions()->value("refine-search")->setChecked(false);
+    MainWindow::instance()->getAction("refineSearch")->setChecked(false);
 }
 
 void SidebarWidget::showRefineSearchWidget() {
@@ -103,7 +101,7 @@ void SidebarWidget::showRefineSearchWidget() {
     Extra::fadeInWidget(playlist, refineSearchWidget);
 #endif
     refineSearchButton->hide();
-    The::globalActions()->value("refine-search")->setChecked(true);
+    MainWindow::instance()->getAction("refineSearch")->setChecked(true);
 }
 
 void SidebarWidget::hideRefineSearchWidget() {
@@ -114,24 +112,24 @@ void SidebarWidget::hideRefineSearchWidget() {
 #ifdef APP_EXTRA
     Extra::fadeInWidget(refineSearchWidget, playlist);
 #endif
-    The::globalActions()->value("refine-search")->setChecked(false);
+    MainWindow::instance()->getAction("refineSearch")->setChecked(false);
 }
 
 void SidebarWidget::toggleRefineSearch(bool show) {
-    if (show) showRefineSearchWidget();
-    else hideRefineSearchWidget();
+    if (show)
+        showRefineSearchWidget();
+    else
+        hideRefineSearchWidget();
 }
 
 void SidebarWidget::resizeEvent(QResizeEvent *event) {
     QWidget::resizeEvent(event);
-    refineSearchButton->move(
-                playlist->viewport()->width() - refineSearchButton->minimumWidth(),
-                height() - refineSearchButton->minimumHeight());
+    refineSearchButton->move(playlist->viewport()->width() - refineSearchButton->minimumWidth(),
+                             height() - refineSearchButton->minimumHeight());
 }
 
 void SidebarWidget::enterEvent(QEvent *) {
-    if (stackedWidget->currentWidget() != refineSearchWidget)
-        showRefineSearchButton();
+    if (stackedWidget->currentWidget() != refineSearchWidget) showRefineSearchButton();
 }
 
 void SidebarWidget::leaveEvent(QEvent *) {
@@ -157,9 +155,8 @@ void SidebarWidget::handleMouseMove() {
 
 void SidebarWidget::showRefineSearchButton() {
     if (!refineSearchWidget->isEnabled()) return;
-    refineSearchButton->move(
-                playlist->viewport()->width() - refineSearchButton->minimumWidth(),
-                height() - refineSearchButton->minimumHeight());
+    refineSearchButton->move(playlist->viewport()->width() - refineSearchButton->minimumWidth(),
+                             height() - refineSearchButton->minimumHeight());
     refineSearchButton->show();
 }
 
@@ -167,18 +164,17 @@ void SidebarWidget::showSuggestions(const QStringList &suggestions) {
     QString message = tr("Did you mean: %1");
 
     QString suggestionLinks;
-    foreach (const QString &suggestion, suggestions) {
+    for (const QString &suggestion : suggestions) {
         suggestionLinks += "<a href='" + suggestion + "'>" + suggestion + "</a> ";
     }
     message = message.arg(suggestionLinks);
 
-    QString html =
-            "<html>"
-            "<style>"
-            "a { color: palette(text); text-decoration: none; font-weight: bold }"
-            "</style>"
-            "<body>%1</body>"
-            "</html>";
+    QString html = "<html>"
+                   "<style>"
+                   "a { color: palette(text); text-decoration: none; font-weight: bold }"
+                   "</style>"
+                   "<body>%1</body>"
+                   "</html>";
     html = html.arg(message);
     messageLabel->setText(html);
     messageLabel->show();