X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fhomeview.cpp;h=8ee32410f5641ed7428acca3cfabe3a403d5f29c;hb=HEAD;hp=4ac091dbba8abc6bedbecc701e00d7832c32210d;hpb=b72bf3da6f5f05a1c161799c1e0b46892dcc18ba;p=minitube

diff --git a/src/homeview.cpp b/src/homeview.cpp
index 4ac091d..8ee3241 100644
--- a/src/homeview.cpp
+++ b/src/homeview.cpp
@@ -1,16 +1,39 @@
+/* $BEGIN_LICENSE
+
+This file is part of Minitube.
+Copyright 2009, Flavio Tordini <flavio.tordini@gmail.com>
+
+Minitube is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Minitube is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Minitube.  If not, see <http://www.gnu.org/licenses/>.
+
+$END_LICENSE */
+
 #include "homeview.h"
-#include "segmentedcontrol.h"
-#include "searchview.h"
-#include "standardfeedsview.h"
-#include "userview.h"
+#include "channelaggregator.h"
+#include "channelview.h"
+#include "iconutils.h"
 #include "mainwindow.h"
 #include "mediaview.h"
+#include "searchview.h"
+#include "segmentedcontrol.h"
+#include "standardfeedsview.h"
 #include "ytstandardfeed.h"
+#ifdef APP_MAC
+#include "macutils.h"
+#endif
 
-HomeView::HomeView(QWidget *parent) : QWidget(parent) {
-    standardFeedsView = 0;
-    userView = 0;
-
+HomeView::HomeView(QWidget *parent)
+    : View(parent), searchView(nullptr), standardFeedsView(nullptr), channelsView(nullptr) {
     QBoxLayout *layout = new QVBoxLayout(this);
     layout->setMargin(0);
     layout->setSpacing(0);
@@ -20,15 +43,10 @@ HomeView::HomeView(QWidget *parent) : QWidget(parent) {
 
     stackedWidget = new QStackedWidget();
     layout->addWidget(stackedWidget);
-
-    searchView = new SearchView();
-    connect(searchView, SIGNAL(search(SearchParams*)),
-            MainWindow::instance(), SLOT(showMedia(SearchParams*)));
-    stackedWidget->addWidget(searchView);
 }
 
 void HomeView::setupBar() {
-    bar = new SegmentedControl(this);
+    bar = new SegmentedControl();
 
     QAction *action = new QAction(tr("Search"), this);
     action->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_1));
@@ -43,40 +61,37 @@ void HomeView::setupBar() {
     connect(action, SIGNAL(triggered()), SLOT(showStandardFeeds()));
     bar->addAction(action);
 
-    /*
-    action = new QAction(tr("User"), this);
-    action->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_3));
-    action->setStatusTip(tr("Your favorite videos, subscriptions and playlists"));
-    connect(action, SIGNAL(triggered()), SLOT(showUser()));
-    bar->addAction(action);
-    */
+    subscriptionsAction = new QAction(tr("Subscriptions"), this);
+    subscriptionsAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_3));
+    subscriptionsAction->setStatusTip(tr("Channel subscriptions"));
+    connect(subscriptionsAction, SIGNAL(triggered()), SLOT(showChannels()));
+    bar->addAction(subscriptionsAction);
+    connect(ChannelAggregator::instance(), SIGNAL(unwatchedCountChanged(int)),
+            SLOT(unwatchedCountChanged(int)));
 
-    foreach (QAction* action, bar->actions()) {
-        // action->setEnabled(false);
+    const auto &a = bar->actions();
+    for (QAction *action : a) {
         addAction(action);
-        action->setAutoRepeat(false);
-        if (!action->shortcut().isEmpty())
-            action->setStatusTip(
-                        action->statusTip() + " (" +
-                        action->shortcut().toString(QKeySequence::NativeText) + ")");
+        MainWindow::instance()->setupAction(action);
     }
 }
 
 void HomeView::showWidget(QWidget *widget) {
-    QWidget* currentWidget = stackedWidget->currentWidget();
-    if (currentWidget == widget) return;
-    QMetaObject::invokeMethod(currentWidget, "disappear");
-    currentWidget->setEnabled(false);
+    QWidget *currentWidget = stackedWidget->currentWidget();
+    if (currentWidget && currentWidget != widget) {
+        QMetaObject::invokeMethod(currentWidget, "disappear");
+        currentWidget->setEnabled(false);
+    }
     stackedWidget->setCurrentWidget(widget);
     widget->setEnabled(true);
-    QMetaObject::invokeMethod(widget, "appear");
-    bar->setCheckedAction(stackedWidget->currentIndex());
-    // autoChosenView = false;
-    widget->setFocus();
+    QMetaObject::invokeMethod(widget, "appear", Qt::QueuedConnection);
 }
 
 void HomeView::appear() {
-    QMetaObject::invokeMethod(stackedWidget->currentWidget(), "appear");
+    if (stackedWidget->count() == 0)
+        showSearch();
+    else
+        QMetaObject::invokeMethod(stackedWidget->currentWidget(), "appear", Qt::QueuedConnection);
 }
 
 void HomeView::disappear() {
@@ -84,24 +99,48 @@ void HomeView::disappear() {
 }
 
 void HomeView::showSearch() {
+    if (!searchView) {
+        searchView = new SearchView(this);
+        connect(searchView, SIGNAL(search(SearchParams *)), MainWindow::instance(),
+                SLOT(showMedia(SearchParams *)));
+        stackedWidget->addWidget(searchView);
+    }
     showWidget(searchView);
+    bar->setCheckedAction(0);
 }
 
 void HomeView::showStandardFeeds() {
     if (!standardFeedsView) {
         standardFeedsView = new StandardFeedsView();
-        connect(standardFeedsView, SIGNAL(activated(VideoSource*)),
-                MainWindow::instance(),
-                SLOT(showMedia(VideoSource*)));
+        connect(standardFeedsView, SIGNAL(activated(VideoSource *)), MainWindow::instance(),
+                SLOT(showMedia(VideoSource *)));
         stackedWidget->addWidget(standardFeedsView);
     }
     showWidget(standardFeedsView);
+    bar->setCheckedAction(1);
+}
+
+void HomeView::showChannels() {
+    if (!channelsView) {
+        channelsView = new ChannelView();
+        connect(channelsView, SIGNAL(activated(VideoSource *)), MainWindow::instance(),
+                SLOT(showMedia(VideoSource *)));
+        stackedWidget->addWidget(channelsView);
+    }
+    showWidget(channelsView);
+    bar->setCheckedAction(2);
 }
 
-void HomeView::showUser() {
-    if (!userView) {
-        userView = new UserView(this);
-        stackedWidget->addWidget(userView);
+void HomeView::unwatchedCountChanged(int count) {
+    QVariant v;
+    QString s;
+    if (count > 0) {
+        s = QString::number(count);
+        v = s;
     }
-    showWidget(userView);
+    subscriptionsAction->setProperty("notifyCount", v);
+    bar->update();
+#ifdef APP_MAC
+    mac::dockBadge(s);
+#endif
 }