]> git.sur5r.net Git - minitube/commitdiff
projects / minitube / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f8e3b7c)
Style and font tweaks
authorFlavio Tordini <flavio.tordini@gmail.com>
Tue, 4 Aug 2015 15:38:49 +0000 (17:38 +0200)
committerFlavio Tordini <flavio.tordini@gmail.com>
Tue, 4 Aug 2015 15:38:49 +0000 (17:38 +0200)
src/aboutview.cpp patch | blob | history
src/aboutview.h patch | blob | history
src/searchview.cpp patch | blob | history

diff --git a/src/aboutview.cpp b/src/aboutview.cpp
index f817ade2b714ba1bc27a261e31a511b882d9598b..69e227f3be9be58965bea8d4ec7363b1744d8f2a 100644 (file)
--- a/src/aboutview.cpp
+++ b/src/aboutview.cpp
@@ -30,6 +30,7 @@ $END_LICENSE */
 #include "macutils.h"
 #include "mac_startup.h"
 #endif
+#include "fontutils.h"
 
 AboutView::AboutView(QWidget *parent) : QWidget(parent) {
 
@@ -47,8 +48,13 @@ AboutView::AboutView(QWidget *parent) : QWidget(parent) {
     layout->setSpacing(30);
     hLayout->addLayout(layout);
 
-    QString info = "<html><style>a { color: palette(text); text-decoration: none; font-weight: bold }</style><body>"
-            "<h1 style='font-weight:normal'>" + QString(Constants::NAME) + "</h1>"
+    QString css = "a { color: palette(text); text-decoration: none; font-weight: bold } h1 { font-weight: 100 }";
+#ifdef APP_MAC
+    css += " h1 { font-family: 'Helvetica Neue' }";
+#endif
+
+    QString info = "<html><style>" + css + "</style><body>"
+            "<h1>" + QString(Constants::NAME) + "</h1>"
             "<p>" + tr("There's life outside the browser!") + "</p>"
             "<p>" + tr("Version %1").arg(Constants::VERSION) + "</p>"
             + QString("<p><a href=\"%1/\">%1</a></p>").arg(Constants::WEBSITE);
@@ -119,3 +125,24 @@ void AboutView::appear() {
 #endif
     closeButton->setFocus();
 }
+
+void AboutView::paintEvent(QPaintEvent *event) {
+    QWidget::paintEvent(event);
+#if defined(APP_MAC) | defined(APP_WIN)
+    QBrush brush;
+    if (window()->isActiveWindow()) {
+        brush = Qt::white;
+    } else {
+        brush = palette().window();
+    }
+    QPainter painter(this);
+    painter.fillRect(0, 0, width(), height(), brush);
+    painter.end();
+#endif
+#ifdef APP_UBUNTU
+    QStyleOption o;
+    o.initFrom(this);
+    QPainter p(this);
+    style()->drawPrimitive(QStyle::PE_Widget, &o, &p, this);
+#endif
+}
diff --git a/src/aboutview.h b/src/aboutview.h
index 23ce9334125f49b4fde9333f7c28496b2b9c011f..a8e7572c668f6e8e9070e9c0c8c0abd04c0e177c 100644 (file)
--- a/src/aboutview.h
+++ b/src/aboutview.h
@@ -41,6 +41,9 @@ public:
         return metadata;
     }
 
+protected:
+    void paintEvent(QPaintEvent *e);
+
 private:
     QPushButton *closeButton;
 
diff --git a/src/searchview.cpp b/src/searchview.cpp
index e3cadcfd106dc713c5ff7cebf87a94e62b5e6987..60cc7a40e7f644bc0aba56a420602156787b9410 100644 (file)
--- a/src/searchview.cpp
+++ b/src/searchview.cpp
@@ -48,17 +48,12 @@ static const int PADDING = 30;
 
 SearchView::SearchView(QWidget *parent) : QWidget(parent) {
 
-    QFont biggerFont = FontUtils::big();
-    QFont smallerFont = FontUtils::small();
-
 #if defined(APP_MAC) | defined(APP_WIN)
     // speedup painting since we'll paint the whole background
     // by ourselves anyway in paintEvent()
     setAttribute(Qt::WA_OpaquePaintEvent);
 #endif
 
-    setAutoFillBackground(true);
-
     QBoxLayout *mainLayout = new QVBoxLayout(this);
     mainLayout->setMargin(PADDING);
     mainLayout->setSpacing(0);
@@ -112,6 +107,7 @@ SearchView::SearchView(QWidget *parent) : QWidget(parent) {
     //: "Enter", as in "type". The whole phrase says: "Enter a keyword to start watching videos"
     QLabel *tipLabel = new QLabel(tr("Enter"), this);
 #ifndef APP_MAC
+    const QFont &biggerFont = FontUtils::big();
     tipLabel->setFont(biggerFont);
 #endif
     tipLayout->addWidget(tipLabel);
@@ -170,11 +166,10 @@ SearchView::SearchView(QWidget *parent) : QWidget(parent) {
     recentKeywordsLayout = new QVBoxLayout();
     recentKeywordsLayout->setSpacing(5);
     recentKeywordsLayout->setAlignment(Qt::AlignTop | Qt::AlignLeft);
-    recentKeywordsLabel = new QLabel(tr("Recent keywords").toUpper(), this);
+    recentKeywordsLabel = new QLabel(tr("Recent keywords"), this);
     recentKeywordsLabel->setProperty("recentHeader", true);
     recentKeywordsLabel->setForegroundRole(QPalette::Dark);
     recentKeywordsLabel->hide();
-    recentKeywordsLabel->setFont(smallerFont);
     recentKeywordsLayout->addWidget(recentKeywordsLabel);
 
     otherLayout->addLayout(recentKeywordsLayout);
@@ -183,11 +178,10 @@ SearchView::SearchView(QWidget *parent) : QWidget(parent) {
     recentChannelsLayout = new QVBoxLayout();
     recentChannelsLayout->setSpacing(5);
     recentChannelsLayout->setAlignment(Qt::AlignTop | Qt::AlignLeft);
-    recentChannelsLabel = new QLabel(tr("Recent channels").toUpper(), this);
+    recentChannelsLabel = new QLabel(tr("Recent channels"), this);
     recentChannelsLabel->setProperty("recentHeader", true);
     recentChannelsLabel->setForegroundRole(QPalette::Dark);
     recentChannelsLabel->hide();
-    recentChannelsLabel->setFont(smallerFont);
     recentChannelsLayout->addWidget(recentChannelsLabel);
 
     otherLayout->addLayout(recentChannelsLayout);
@@ -212,8 +206,7 @@ void SearchView::appear() {
 
     MainWindow::instance()->showActionInStatusBar(The::globalActions()->value("definition"), true);
 
-    queryEdit->setFocus();
-    QTimer::singleShot(100, queryEdit, SLOT(setFocus()));
+    if (!queryEdit->hasFocus()) queryEdit->setFocus();
 }
 
 void SearchView::disappear() {
@@ -384,7 +377,6 @@ void SearchView::paintEvent(QPaintEvent *event) {
 #if defined(APP_MAC) | defined(APP_WIN)
     QBrush brush;
     if (window()->isActiveWindow()) {
-        // brush = QBrush(QColor(0xdd, 0xe4, 0xeb));
         brush = Qt::white;
     } else {
         brush = palette().window();
@@ -399,7 +391,6 @@ void SearchView::paintEvent(QPaintEvent *event) {
     QPainter p(this);
     style()->drawPrimitive(QStyle::PE_Widget, &o, &p, this);
 #endif
-    // PainterUtils::topShadow(this);
 }
 
 void SearchView::searchTypeChanged(int index) {
Minitube Debian packaging