Upload 3.9.3-2 to unstable

[minitube] / src / regionsview.cpp

diff --git a/src/regionsview.cpp b/src/regionsview.cpp
index a6189aa3faaced75b0e4283a7de680210b8a8b7b..6694b88c2de40c876024b752fdd040e547ed1351 100644 (file)
--- a/src/regionsview.cpp
+++ b/src/regionsview.cpp
@@ -19,10 +19,10 @@ along with Minitube.  If not, see <http://www.gnu.org/licenses/>.
 $END_LICENSE */
 
 #include "regionsview.h"
-#include "ytregions.h"
 #include "mainwindow.h"
+#include "ytregions.h"
 
-RegionsView::RegionsView(QWidget *parent) : QWidget(parent) {
+RegionsView::RegionsView(QWidget *parent) : View(parent) {
     QBoxLayout *l = new QVBoxLayout(this);
     l->setMargin(30);
     l->setSpacing(30);
@@ -32,18 +32,20 @@ RegionsView::RegionsView(QWidget *parent) : QWidget(parent) {
     layout->setSpacing(0);
     l->addLayout(layout);
 
-    addRegion(YTRegions::worldwideRegion());
-    foreach(YTRegion region, YTRegions::list())
+    addRegion(YTRegions::defaultRegion());
+    foreach (YTRegion region, YTRegions::list())
         addRegion(region);
 
     doneButton = new QPushButton(tr("Done"));
     doneButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
     doneButton->setDefault(true);
+#ifndef APP_MAC
     doneButton->setProperty("custom", true);
     doneButton->setProperty("important", true);
     doneButton->setProperty("big", true);
+#endif
     connect(doneButton, SIGNAL(clicked()), MainWindow::instance(), SLOT(goBack()));
-    l->addWidget(doneButton, 0, Qt::AlignCenter);
+    l->addWidget(doneButton, 0, Qt::AlignHCenter | Qt::AlignTop);
 }
 
 void RegionsView::addRegion(const YTRegion &region) {
@@ -65,14 +67,27 @@ void RegionsView::appear() {
     QString currentRegionId = YTRegions::currentRegionId();
     for (int i = 0; i < layout->count(); i++) {
         QLayoutItem *item = layout->itemAt(i);
-        QPushButton *b = static_cast<QPushButton*>(item->widget());
+        QPushButton *b = static_cast<QPushButton *>(item->widget());
         QString regionId = b->property("regionId").toString();
         b->setChecked(currentRegionId == regionId);
     }
 }
 
+void RegionsView::paintEvent(QPaintEvent *e) {
+    QWidget::paintEvent(e);
+    QBrush brush;
+    if (window()->isActiveWindow()) {
+        brush = palette().base();
+    } else {
+        brush = palette().window();
+    }
+    QPainter painter(this);
+    painter.fillRect(0, 0, width(), height(), brush);
+    painter.end();
+}
+
 void RegionsView::buttonClicked() {
-    QObject* o = sender();
+    QObject *o = sender();
     QString regionId = o->property("regionId").toString();
     YTRegions::setRegion(regionId);
     emit regionChanged();