Categories, region selection, refactoring

flaviotordini · Jan 7, 2013 · 8a672c2 · 8a672c2
1 parent 333f655
commit 8a672c2
Show file tree

Hide file tree

Showing 309 changed files with 2,398 additions and 595 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,6 +1,16 @@
-2.0
+2.0 - January ?? 2013
+- YouTube categories and "standard feeds": "Most Popular", "Featured", etc
+- Country selection for YouTube categories and feeds
 - Autoupdate on Mac and Windows
+- Related videos are now appended to the video when pasting a YouTube link
+- "Show 10 More" with a single click
+- Play video in the playlist with a single click on its thumbnail
+- OS X Mountain Lion notifications on video start
+- Fixed some YouTube links not working when pasted in the searchbox
+- Fixed playlist drag'n'drop
+- Fixed system language settings detection
 - Fixed clicking on channel names not working in some cases
+- Fixed incorrect number of downloads in status bar
 
 1.9 - September 27, 2012
 - Adapted to YouTube changes

diff --git a/flags/aa.png b/flags/aa.png
diff --git a/flags/ad.png b/flags/ad.png
diff --git a/flags/ae.png b/flags/ae.png
diff --git a/flags/af.png b/flags/af.png
diff --git a/flags/ag.png b/flags/ag.png
diff --git a/flags/ai.png b/flags/ai.png
diff --git a/flags/al.png b/flags/al.png
diff --git a/flags/am.png b/flags/am.png
diff --git a/flags/ao.png b/flags/ao.png
diff --git a/flags/aq.png b/flags/aq.png
diff --git a/flags/ar.png b/flags/ar.png
diff --git a/flags/as.png b/flags/as.png
diff --git a/flags/at.png b/flags/at.png
diff --git a/flags/au.png b/flags/au.png
diff --git a/flags/aw.png b/flags/aw.png
diff --git a/flags/ax.png b/flags/ax.png
diff --git a/flags/az.png b/flags/az.png
diff --git a/flags/ba.png b/flags/ba.png
diff --git a/flags/bb.png b/flags/bb.png
diff --git a/flags/bd.png b/flags/bd.png
diff --git a/flags/be.png b/flags/be.png
diff --git a/flags/bf.png b/flags/bf.png
diff --git a/flags/bg.png b/flags/bg.png
diff --git a/flags/bh.png b/flags/bh.png
diff --git a/flags/bi.png b/flags/bi.png
diff --git a/flags/bj.png b/flags/bj.png
diff --git a/flags/bl.png b/flags/bl.png
diff --git a/flags/bm.png b/flags/bm.png
diff --git a/flags/bn.png b/flags/bn.png
diff --git a/flags/bo.png b/flags/bo.png
diff --git a/flags/bq.png b/flags/bq.png
diff --git a/flags/br.png b/flags/br.png
diff --git a/flags/bs.png b/flags/bs.png
diff --git a/flags/bt.png b/flags/bt.png
diff --git a/flags/bv.png b/flags/bv.png
diff --git a/flags/bw.png b/flags/bw.png
diff --git a/flags/by.png b/flags/by.png
diff --git a/flags/bz.png b/flags/bz.png
diff --git a/flags/ca.png b/flags/ca.png
diff --git a/flags/cc.png b/flags/cc.png
diff --git a/flags/cd.png b/flags/cd.png
diff --git a/flags/cf.png b/flags/cf.png
diff --git a/flags/cg.png b/flags/cg.png
diff --git a/flags/ch.png b/flags/ch.png
diff --git a/flags/ci.png b/flags/ci.png
diff --git a/flags/ck.png b/flags/ck.png
diff --git a/flags/cl.png b/flags/cl.png
diff --git a/flags/cm.png b/flags/cm.png
diff --git a/flags/cn.png b/flags/cn.png
diff --git a/flags/co.png b/flags/co.png
diff --git a/flags/cr.png b/flags/cr.png
diff --git a/flags/cu.png b/flags/cu.png
diff --git a/flags/cv.png b/flags/cv.png
diff --git a/flags/cw.png b/flags/cw.png
diff --git a/flags/cx.png b/flags/cx.png
diff --git a/flags/cy.png b/flags/cy.png
diff --git a/flags/cz.png b/flags/cz.png
diff --git a/flags/de.png b/flags/de.png
diff --git a/flags/dj.png b/flags/dj.png
diff --git a/flags/dk.png b/flags/dk.png
diff --git a/flags/dm.png b/flags/dm.png
diff --git a/flags/do.png b/flags/do.png
diff --git a/flags/dz.png b/flags/dz.png
diff --git a/flags/ec.png b/flags/ec.png
diff --git a/flags/ee.png b/flags/ee.png
diff --git a/flags/eg.png b/flags/eg.png
diff --git a/flags/eh.png b/flags/eh.png
diff --git a/flags/eo.png b/flags/eo.png
diff --git a/flags/er.png b/flags/er.png
diff --git a/flags/es.png b/flags/es.png
diff --git a/flags/et.png b/flags/et.png
diff --git a/flags/fi.png b/flags/fi.png
diff --git a/flags/fj.png b/flags/fj.png
diff --git a/flags/fk.png b/flags/fk.png
diff --git a/flags/fm.png b/flags/fm.png
diff --git a/flags/fo.png b/flags/fo.png
diff --git a/flags/fr.png b/flags/fr.png
diff --git a/flags/ga.png b/flags/ga.png
diff --git a/flags/gb.png b/flags/gb.png
diff --git a/flags/gd.png b/flags/gd.png
diff --git a/flags/ge.png b/flags/ge.png
diff --git a/flags/gf.png b/flags/gf.png
diff --git a/flags/gg.png b/flags/gg.png
diff --git a/flags/gh.png b/flags/gh.png
diff --git a/flags/gi.png b/flags/gi.png
diff --git a/flags/gl.png b/flags/gl.png
diff --git a/flags/gm.png b/flags/gm.png
diff --git a/flags/gn.png b/flags/gn.png
diff --git a/flags/gp.png b/flags/gp.png
diff --git a/flags/gq.png b/flags/gq.png
diff --git a/flags/gr.png b/flags/gr.png
diff --git a/flags/gs.png b/flags/gs.png
diff --git a/flags/gt.png b/flags/gt.png
diff --git a/flags/gu.png b/flags/gu.png
diff --git a/flags/gw.png b/flags/gw.png
diff --git a/flags/gy.png b/flags/gy.png
diff --git a/flags/hk.png b/flags/hk.png
diff --git a/flags/hm.png b/flags/hm.png
diff --git a/flags/hn.png b/flags/hn.png
diff --git a/flags/hr.png b/flags/hr.png
diff --git a/flags/ht.png b/flags/ht.png
diff --git a/flags/hu.png b/flags/hu.png
diff --git a/flags/id.png b/flags/id.png
diff --git a/flags/ie.png b/flags/ie.png
diff --git a/flags/il.png b/flags/il.png
diff --git a/flags/im.png b/flags/im.png
diff --git a/flags/in.png b/flags/in.png
diff --git a/flags/io.png b/flags/io.png
diff --git a/flags/iq.png b/flags/iq.png
diff --git a/flags/ir.png b/flags/ir.png
diff --git a/flags/is.png b/flags/is.png
diff --git a/flags/it.png b/flags/it.png
diff --git a/flags/je.png b/flags/je.png
diff --git a/flags/jm.png b/flags/jm.png
diff --git a/flags/jo.png b/flags/jo.png
diff --git a/flags/jp.png b/flags/jp.png
diff --git a/flags/ke.png b/flags/ke.png
diff --git a/flags/kg.png b/flags/kg.png
diff --git a/flags/kh.png b/flags/kh.png
diff --git a/flags/ki.png b/flags/ki.png
diff --git a/flags/km.png b/flags/km.png
diff --git a/flags/kn.png b/flags/kn.png
diff --git a/flags/kp.png b/flags/kp.png
diff --git a/flags/kr.png b/flags/kr.png
diff --git a/flags/kw.png b/flags/kw.png
diff --git a/flags/ky.png b/flags/ky.png
diff --git a/flags/kz.png b/flags/kz.png
diff --git a/flags/la.png b/flags/la.png
diff --git a/flags/lb.png b/flags/lb.png
diff --git a/flags/lc.png b/flags/lc.png
diff --git a/flags/li.png b/flags/li.png
diff --git a/flags/lk.png b/flags/lk.png
diff --git a/flags/lr.png b/flags/lr.png
diff --git a/flags/ls.png b/flags/ls.png
diff --git a/flags/lt.png b/flags/lt.png
diff --git a/flags/lu.png b/flags/lu.png
diff --git a/flags/lv.png b/flags/lv.png
diff --git a/flags/ly.png b/flags/ly.png
diff --git a/flags/ma.png b/flags/ma.png
diff --git a/flags/mc.png b/flags/mc.png
diff --git a/flags/md.png b/flags/md.png
diff --git a/flags/me.png b/flags/me.png
diff --git a/flags/mf.png b/flags/mf.png
diff --git a/flags/mg.png b/flags/mg.png
diff --git a/flags/mh.png b/flags/mh.png
diff --git a/flags/mk.png b/flags/mk.png
diff --git a/flags/ml.png b/flags/ml.png
diff --git a/flags/mm.png b/flags/mm.png
diff --git a/flags/mn.png b/flags/mn.png
diff --git a/flags/mo.png b/flags/mo.png
diff --git a/flags/mp.png b/flags/mp.png
diff --git a/flags/mq.png b/flags/mq.png
diff --git a/flags/mr.png b/flags/mr.png
diff --git a/flags/ms.png b/flags/ms.png
diff --git a/flags/mt.png b/flags/mt.png
diff --git a/flags/mu.png b/flags/mu.png
diff --git a/flags/mv.png b/flags/mv.png
diff --git a/flags/mw.png b/flags/mw.png
diff --git a/flags/mx.png b/flags/mx.png
diff --git a/flags/my.png b/flags/my.png
diff --git a/flags/mz.png b/flags/mz.png
diff --git a/flags/na.png b/flags/na.png
diff --git a/flags/nc.png b/flags/nc.png
diff --git a/flags/ne.png b/flags/ne.png
diff --git a/flags/nf.png b/flags/nf.png
diff --git a/flags/ng.png b/flags/ng.png
diff --git a/flags/ni.png b/flags/ni.png
diff --git a/flags/nl.png b/flags/nl.png
diff --git a/flags/no.png b/flags/no.png
diff --git a/flags/np.png b/flags/np.png
diff --git a/flags/nr.png b/flags/nr.png
diff --git a/flags/nu.png b/flags/nu.png
diff --git a/flags/nz.png b/flags/nz.png
diff --git a/flags/om.png b/flags/om.png
diff --git a/flags/pa.png b/flags/pa.png
diff --git a/flags/pe.png b/flags/pe.png
diff --git a/flags/pf.png b/flags/pf.png
diff --git a/flags/pg.png b/flags/pg.png
diff --git a/flags/ph.png b/flags/ph.png
diff --git a/flags/pk.png b/flags/pk.png
diff --git a/flags/pl.png b/flags/pl.png
diff --git a/flags/pm.png b/flags/pm.png
diff --git a/flags/pn.png b/flags/pn.png
diff --git a/flags/pr.png b/flags/pr.png
diff --git a/flags/ps.png b/flags/ps.png
diff --git a/flags/pt.png b/flags/pt.png
diff --git a/flags/pw.png b/flags/pw.png
diff --git a/flags/py.png b/flags/py.png
diff --git a/flags/qa.png b/flags/qa.png
diff --git a/flags/re.png b/flags/re.png
diff --git a/flags/ro.png b/flags/ro.png
diff --git a/flags/rs.png b/flags/rs.png
diff --git a/flags/ru.png b/flags/ru.png
diff --git a/flags/rw.png b/flags/rw.png
diff --git a/flags/sa.png b/flags/sa.png
diff --git a/flags/sb.png b/flags/sb.png
diff --git a/flags/sc.png b/flags/sc.png
diff --git a/flags/sd.png b/flags/sd.png
diff --git a/flags/se.png b/flags/se.png
diff --git a/flags/sg.png b/flags/sg.png
diff --git a/flags/sh.png b/flags/sh.png
diff --git a/flags/si.png b/flags/si.png
diff --git a/flags/sj.png b/flags/sj.png
diff --git a/flags/sk.png b/flags/sk.png
diff --git a/flags/sl.png b/flags/sl.png
diff --git a/flags/sm.png b/flags/sm.png
diff --git a/flags/sn.png b/flags/sn.png
diff --git a/flags/so.png b/flags/so.png
diff --git a/flags/sr.png b/flags/sr.png
diff --git a/flags/ss.png b/flags/ss.png
diff --git a/flags/st.png b/flags/st.png
diff --git a/flags/sv.png b/flags/sv.png
diff --git a/flags/sx.png b/flags/sx.png
diff --git a/flags/sy.png b/flags/sy.png
diff --git a/flags/sz.png b/flags/sz.png
diff --git a/flags/tc.png b/flags/tc.png
diff --git a/flags/td.png b/flags/td.png
diff --git a/flags/tf.png b/flags/tf.png
diff --git a/flags/tg.png b/flags/tg.png
diff --git a/flags/th.png b/flags/th.png
diff --git a/flags/tj.png b/flags/tj.png
diff --git a/flags/tk.png b/flags/tk.png
diff --git a/flags/tl.png b/flags/tl.png
diff --git a/flags/tm.png b/flags/tm.png
diff --git a/flags/tn.png b/flags/tn.png
diff --git a/flags/to.png b/flags/to.png
diff --git a/flags/tr.png b/flags/tr.png
diff --git a/flags/tt.png b/flags/tt.png
diff --git a/flags/tv.png b/flags/tv.png
diff --git a/flags/tw.png b/flags/tw.png
diff --git a/flags/tz.png b/flags/tz.png
diff --git a/flags/ua.png b/flags/ua.png
diff --git a/flags/ug.png b/flags/ug.png
diff --git a/flags/um.png b/flags/um.png
diff --git a/flags/us.png b/flags/us.png
diff --git a/flags/uy.png b/flags/uy.png
diff --git a/flags/uz.png b/flags/uz.png
diff --git a/flags/va.png b/flags/va.png
diff --git a/flags/vc.png b/flags/vc.png
diff --git a/flags/ve.png b/flags/ve.png
diff --git a/flags/vg.png b/flags/vg.png
diff --git a/flags/vi.png b/flags/vi.png
diff --git a/flags/vn.png b/flags/vn.png
diff --git a/flags/vu.png b/flags/vu.png
diff --git a/flags/wf.png b/flags/wf.png
diff --git a/flags/ws.png b/flags/ws.png
diff --git a/flags/ye.png b/flags/ye.png
diff --git a/flags/yt.png b/flags/yt.png
diff --git a/flags/za.png b/flags/za.png
diff --git a/flags/zm.png b/flags/zm.png
diff --git a/flags/zw.png b/flags/zw.png
diff --git a/minitube.pro b/minitube.pro
@@ -1,4 +1,4 @@
-CONFIG += release
+CONFIG += debug
 TEMPLATE = app
 VERSION = 2.0
 DEFINES += APP_VERSION="$$VERSION"
@@ -13,15 +13,11 @@ DEFINES += QT_USE_FAST_CONCATENATION
 DEFINES += QT_USE_FAST_OPERATOR_PLUS
 DEFINES += QT_STRICT_ITERATORS
 
-# TODO Saner string behaviour
-# DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII
 TARGET = minitube
-QT += network xml phonon declarative
+QT += network xml phonon
 include(src/qtsingleapplication/qtsingleapplication.pri)
 HEADERS += \
-    src/youtubesearch.h \
     src/video.h \
-    src/youtubestreamreader.h \
     src/searchlineedit.h \
     src/urllineedit.h \
     src/spacer.h \
@@ -32,7 +28,6 @@ HEADERS += \
     src/videomimedata.h \
     src/global.h \
     src/updatechecker.h \
-    src/playlistwidget.h \
     src/searchparams.h \
     src/minisplitter.h \
     src/loadingwidget.h \
@@ -48,7 +43,6 @@ HEADERS += \
     src/downloadmodel.h \
     src/downloadlistview.h \
     src/downloadsettings.h \
-    src/youtubesuggest.h \
     src/suggester.h \
     src/channelsuggest.h \
     src/temporary.h \
@@ -59,17 +53,25 @@ HEADERS += \
     src/sidebarwidget.h \
     src/homeview.h \
     src/aboutview.h \
-    src/listmodel.h \
     src/mainwindow.h \
     src/mediaview.h \
     src/searchview.h \
     src/view.h \
-    src/categoriesview.h \
     src/userview.h \
-    src/youtubecategories.h
+    src/playlistmodel.h \
+    src/videosource.h \
+    src/ytsearch.h \
+    src/ytstandardfeed.h \
+    src/standardfeedsview.h \
+    src/ytregions.h \
+    src/ytcategories.h \
+    src/ytfeedreader.h \
+    src/ytsuggester.h \
+    src/videosourcewidget.h \
+    src/regionsview.h \
+    src/ytsinglevideosource.h \
+    src/sidebarheader.h
 SOURCES += src/main.cpp \
-    src/youtubesearch.cpp \
-    src/youtubestreamreader.cpp \
     src/searchlineedit.cpp \
     src/urllineedit.cpp \
     src/spacer.cpp \
@@ -78,7 +80,6 @@ SOURCES += src/main.cpp \
     src/videomimedata.cpp \
     src/updatechecker.cpp \
     src/networkaccess.cpp \
-    src/playlistwidget.cpp \
     src/searchparams.cpp \
     src/minisplitter.cpp \
     src/loadingwidget.cpp \
@@ -95,7 +96,6 @@ SOURCES += src/main.cpp \
     src/downloadmodel.cpp \
     src/downloadlistview.cpp \
     src/downloadsettings.cpp \
-    src/youtubesuggest.cpp \
     src/channelsuggest.cpp \
     src/temporary.cpp \
     src/segmentedcontrol.cpp \
@@ -106,13 +106,23 @@ SOURCES += src/main.cpp \
     src/homeview.cpp \
     src/mainwindow.cpp \
     src/mediaview.cpp \
-    src/listmodel.cpp \
     src/aboutview.cpp \
     src/searchview.cpp \
-    src/categoriesview.cpp \
     src/userview.cpp \
     src/playlistitemdelegate.cpp \
-    src/youtubecategories.cpp
+    src/playlistmodel.cpp \
+    src/videosource.cpp \
+    src/ytsearch.cpp \
+    src/ytstandardfeed.cpp \
+    src/standardfeedsview.cpp \
+    src/ytregions.cpp \
+    src/ytcategories.cpp \
+    src/ytfeedreader.cpp \
+    src/ytsuggester.cpp \
+    src/videosourcewidget.cpp \
+    src/regionsview.cpp \
+    src/ytsinglevideosource.cpp \
+    src/sidebarheader.cpp
 RESOURCES += resources.qrc
 DESTDIR = build/target/
 OBJECTS_DIR = build/obj/
@@ -174,6 +184,3 @@ unix:!mac {
     icon512.files += data/512x512/minitube.png
 }
 mac|win32:include(local/local.pri)
-
-OTHER_FILES += \
-    qml/categories.qml
diff --git a/resources.qrc b/resources.qrc
@@ -6,6 +6,53 @@
         <file>images/search-sortBy.png</file>
         <file>images/search-quality.png</file>
         <file>images/search-duration.png</file>
-        <file>qml/categories.qml</file>
+        <file>flags/dz.png</file>
+        <file>flags/ar.png</file>
+        <file>flags/au.png</file>
+        <file>flags/be.png</file>
+        <file>flags/br.png</file>
+        <file>flags/ca.png</file>
+        <file>flags/cl.png</file>
+        <file>flags/co.png</file>
+        <file>flags/cz.png</file>
+        <file>flags/eg.png</file>
+        <file>flags/fr.png</file>
+        <file>flags/de.png</file>
+        <file>flags/gh.png</file>
+        <file>flags/gr.png</file>
+        <file>flags/hk.png</file>
+        <file>flags/hu.png</file>
+        <file>flags/in.png</file>
+        <file>flags/id.png</file>
+        <file>flags/ie.png</file>
+        <file>flags/il.png</file>
+        <file>flags/it.png</file>
+        <file>flags/jp.png</file>
+        <file>flags/jo.png</file>
+        <file>flags/ke.png</file>
+        <file>flags/my.png</file>
+        <file>flags/mx.png</file>
+        <file>flags/ma.png</file>
+        <file>flags/nl.png</file>
+        <file>flags/nz.png</file>
+        <file>flags/ng.png</file>
+        <file>flags/pe.png</file>
+        <file>flags/ph.png</file>
+        <file>flags/pl.png</file>
+        <file>flags/ru.png</file>
+        <file>flags/sa.png</file>
+        <file>flags/sg.png</file>
+        <file>flags/za.png</file>
+        <file>flags/kr.png</file>
+        <file>flags/es.png</file>
+        <file>flags/se.png</file>
+        <file>flags/tw.png</file>
+        <file>flags/tn.png</file>
+        <file>flags/tr.png</file>
+        <file>flags/ug.png</file>
+        <file>flags/ae.png</file>
+        <file>flags/gb.png</file>
+        <file>flags/ye.png</file>
+        <file>style.css</file>
     </qresource>
 </RCC>
diff --git a/src/downloadmodel.cpp b/src/downloadmodel.cpp
@@ -2,7 +2,7 @@
 #include "downloadmanager.h"
 #include "downloaditem.h"
 #include "video.h"
-#include "listmodel.h"
+#include "playlistmodel.h"
 
 DownloadModel::DownloadModel(DownloadManager *downloadManager, QObject *parent) :
         QAbstractListModel(parent),

diff --git a/src/downloadview.cpp b/src/downloadview.cpp
@@ -4,7 +4,7 @@
 #include "downloadlistview.h"
 #include "downloaditem.h"
 #include "downloadsettings.h"
-#include "listmodel.h"
+#include "playlistmodel.h"
 #include "playlistitemdelegate.h"
 #include "segmentedcontrol.h"
 

diff --git a/src/homeview.cpp b/src/homeview.cpp
@@ -0,0 +1,107 @@
+#include "homeview.h"
+#include "segmentedcontrol.h"
+#include "searchview.h"
+#include "standardfeedsview.h"
+#include "userview.h"
+#include "mainwindow.h"
+#include "mediaview.h"
+#include "ytstandardfeed.h"
+
+HomeView::HomeView(QWidget *parent) : QWidget(parent) {
+    standardFeedsView = 0;
+    userView = 0;
+
+    QBoxLayout *layout = new QVBoxLayout(this);
+    layout->setMargin(0);
+    layout->setSpacing(0);
+
+    setupBar();
+    layout->addWidget(bar);
+
+    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);
+
+    QAction *action = new QAction(tr("Search"), this);
+    action->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_1));
+    action->setStatusTip(tr("Find videos and channels by keyword"));
+    connect(action, SIGNAL(triggered()), SLOT(showSearch()));
+    bar->addAction(action);
+    bar->setCheckedAction(action);
+
+    action = new QAction(tr("Categories"), this);
+    action->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_2));
+    action->setStatusTip(tr("Browse videos by category"));
+    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);
+    */
+
+    foreach (QAction* action, bar->actions()) {
+        // action->setEnabled(false);
+        addAction(action);
+        action->setAutoRepeat(false);
+        if (!action->shortcut().isEmpty())
+            action->setStatusTip(
+                        action->statusTip() + " (" +
+                        action->shortcut().toString(QKeySequence::NativeText) + ")");
+    }
+}
+
+void HomeView::showWidget(QWidget *widget) {
+    QWidget* currentWidget = stackedWidget->currentWidget();
+    if (currentWidget == widget) return;
+    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();
+}
+
+void HomeView::appear() {
+    QMetaObject::invokeMethod(stackedWidget->currentWidget(), "appear");
+}
+
+void HomeView::disappear() {
+    QMetaObject::invokeMethod(stackedWidget->currentWidget(), "disappear");
+}
+
+void HomeView::showSearch() {
+    showWidget(searchView);
+}
+
+void HomeView::showStandardFeeds() {
+    if (!standardFeedsView) {
+        standardFeedsView = new StandardFeedsView();
+        connect(standardFeedsView, SIGNAL(activated(VideoSource*)),
+                MainWindow::instance(),
+                SLOT(showMedia(VideoSource*)));
+        stackedWidget->addWidget(standardFeedsView);
+    }
+    showWidget(standardFeedsView);
+}
+
+void HomeView::showUser() {
+    if (!userView) {
+        userView = new UserView(this);
+        stackedWidget->addWidget(userView);
+    }
+    showWidget(userView);
+}
diff --git a/src/homeview.h b/src/homeview.h
@@ -0,0 +1,40 @@
+#ifndef HOMEVIEW_H
+#define HOMEVIEW_H
+
+#include <QtGui>
+#include "view.h"
+
+class SegmentedControl;
+class SearchView;
+class StandardFeedsView;
+class UserView;
+
+class HomeView : public QWidget, public View  {
+
+    Q_OBJECT
+
+public:
+    HomeView(QWidget *parent = 0);
+    void appear();
+    void disappear();
+    void showWidget(QWidget *widget);
+    SearchView* getSearchView() { return searchView; }
+    StandardFeedsView* getStandardFeedsView() { return standardFeedsView; }
+
+public slots:
+    void showSearch();
+    void showStandardFeeds();
+    void showUser();
+
+private:
+    void setupBar();
+    SegmentedControl *bar;
+    QStackedWidget *stackedWidget;
+
+    SearchView *searchView;
+    StandardFeedsView *standardFeedsView;
+    UserView* userView;
+
+};
+
+#endif // HOMEVIEW_H
diff --git a/src/main.cpp b/src/main.cpp
@@ -36,13 +36,16 @@ int main(int argc, char **argv) {
 
 #ifndef Q_WS_X11
     Extra::appSetup(&app);
+#else
+    QFile cssFile(":/style.css");
+    cssFile.open(QFile::ReadOnly);
+    QString styleSheet = QLatin1String(cssFile.readAll());
+    app.setStyleSheet(styleSheet);
 #endif
 
-    const QString locale = QLocale::system().name();
-
     // qt translations
     QTranslator qtTranslator;
-    qtTranslator.load("qt_" + locale,
+    qtTranslator.load("qt_" + QLocale::system().name(),
                       QLibraryInfo::location(QLibraryInfo::TranslationsPath));
     app.installTranslator(&qtTranslator);
 
@@ -52,13 +55,13 @@ int main(int argc, char **argv) {
 #else
     QString dataDir = "";
 #endif
-    QString localeDir = qApp->applicationDirPath() + QDir::separator() + "locale";
+    QString localeDir = qApp->applicationDirPath() + "/locale";
     if (!QDir(localeDir).exists()) {
-        localeDir = dataDir + QDir::separator() + "locale";
+        localeDir = dataDir + "/locale";
     }
     // qDebug() << "Using locale dir" << localeDir << locale;
     QTranslator translator;
-    translator.load(locale, localeDir);
+    translator.load(QLocale::system(), localeDir);
     app.installTranslator(&translator);
     QTextCodec::setCodecForTr(QTextCodec::codecForName("utf8"));