Imported Upstream version 1.9

[minitube] / src / SearchView.cpp

diff --git a/src/SearchView.cpp b/src/SearchView.cpp
index 411d952cb36af912ee3762f38c14280c292c78d8..723ad724f7e1c81545f752bbc945549e20aa2ea8 100644 (file)
--- a/src/SearchView.cpp
+++ b/src/SearchView.cpp
@@ -9,6 +9,9 @@
 #else
 #include "searchlineedit.h"
 #endif
+#ifndef Q_WS_X11
+#include "extra.h"
+#endif
 
 namespace The {
     QMap<QString, QAction*>* globalActions();
@@ -66,7 +69,13 @@ SearchView::SearchView(QWidget *parent) : QWidget(parent) {
     mainLayout->addLayout(hLayout);
 
     QLabel *logo = new QLabel(this);
-    logo->setPixmap(QPixmap(":/images/app.png"));
+    QString resource = "app";
+#ifndef Q_WS_X11
+    resource = Extra::resourceName(resource);
+    logo->setMaximumSize(128, 128);
+    logo->setScaledContents(true);
+#endif
+    logo->setPixmap(QPixmap(":/images/" + resource + ".png"));
     hLayout->addWidget(logo, 0, Qt::AlignTop);
     hLayout->addSpacing(PADDING);
 
@@ -335,6 +344,11 @@ void SearchView::watchKeywords(QString query) {
         return;
     }
 
+    if (typeCombo->currentIndex() == 0) {
+        queryEdit->setText(query);
+        watchButton->setEnabled(true);
+    }
+
     SearchParams *searchParams = new SearchParams();
     searchParams->setKeywords(query);
 
@@ -361,5 +375,6 @@ void SearchView::searchTypeChanged(int index) {
     } else {
         queryEdit->setSuggester(channelSuggest);
     }
+    queryEdit->selectAll();
     queryEdit->setFocus();
 }