From d81679cd29d1b5a163313acb5d75eda3f4562415 Mon Sep 17 00:00:00 2001
From: Flavio Tordini <flavio.tordini@gmail.com>
Date: Mon, 26 Jul 2010 23:52:34 +0200
Subject: [PATCH] 1.1

---
 CHANGES            |  7 ++++++-
 minitube.pro       |  3 +--
 src/MainWindow.cpp | 14 +++++++-------
 src/MediaView.cpp  |  4 ++--
 src/main.cpp       |  4 ++--
 5 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/CHANGES b/CHANGES
index 77d1e71..3f03c5f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,9 @@
-1.0 - April ?, 2010
+1.1 - Jul 27, 2010
+- Minitube now correctly plays cat and mouse with YouTube
+- Toolbar restyling
+- Simplified Chinese translation by Changtai Liang
+
+1.0 - May 3, 2010
 - Ability to play Full HD (1080p) videos
 - Ability to copy the YouTube link and the video stream URL to the clipboard
 - Fixed videos failing to play
diff --git a/minitube.pro b/minitube.pro
index cba36bf..de883f8 100755
--- a/minitube.pro
+++ b/minitube.pro
@@ -1,6 +1,6 @@
 CONFIG += release
 TEMPLATE = app
-VERSION = 1.0.1
+VERSION = 1.1
 DEFINES += APP_VERSION="$$VERSION"
 INCLUDEPATH += /usr/include/phonon
 
@@ -10,7 +10,6 @@ TARGET = minitube
 QT += network \
     xml \
     phonon
-unix:!mac:QT += dbus
 include(src/qtsingleapplication/qtsingleapplication.pri)
 include(src/thlibrary/thlibrary.pri)
 HEADERS += src/MainWindow.h \
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 1da7c56..dae434c 100755
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -268,7 +268,7 @@ void MainWindow::createMenus() {
     fileMenu = menuBar()->addMenu(tr("&Application"));
     // menus->insert("file", fileMenu);
     fileMenu->addAction(clearAct);
-#ifndef Q_WS_MAC
+#ifndef APP_MAC
     fileMenu->addSeparator();
 #endif
     fileMenu->addAction(quitAct);
@@ -302,7 +302,7 @@ void MainWindow::createMenus() {
 void MainWindow::createToolBars() {
 
     mainToolBar = new QToolBar(this);
-#if QT_VERSION < 0x040600 | defined(Q_WS_MAC)
+#if QT_VERSION < 0x040600 | defined(APP_MAC)
     mainToolBar->setToolButtonStyle(Qt::ToolButtonIconOnly);
 #else
     mainToolBar->setToolButtonStyle(Qt::ToolButtonFollowStyle);
@@ -310,7 +310,7 @@ void MainWindow::createToolBars() {
     mainToolBar->setFloatable(false);
     mainToolBar->setMovable(false);
 
-#ifdef Q_WS_MAC
+#ifdef APP_MAC
     mainToolBar->setIconSize(QSize(32, 32));
 #endif
 
@@ -444,7 +444,7 @@ void MainWindow::showWidget ( QWidget* widget ) {
     QWidget *oldWidget = views->currentWidget();
     views->setCurrentWidget(widget);
 
-#ifdef Q_WS_MAC
+#ifdef APP_MAC
     // crossfade only on OSX
     // where we can be sure of video performance
     fadeInWidget(oldWidget, widget);
@@ -591,11 +591,11 @@ void MainWindow::fullscreen() {
     mediaView->setPlaylistVisible(m_fullscreen);
     statusBar()->setVisible(m_fullscreen);
 
-#ifndef Q_WS_MAC
+#ifndef APP_MAC
     menuBar()->setVisible(m_fullscreen);
 #endif
 
-#ifdef Q_WS_MAC
+#ifdef APP_MAC
     // make the actions work when video is fullscreen (on the Mac)
     QMap<QString, QAction*> *actions = The::globalActions();
     foreach (QAction *action, actions->values()) {
@@ -649,7 +649,7 @@ void MainWindow::compactView(bool enable) {
     mediaView->setPlaylistVisible(!enable);
     statusBar()->setVisible(!enable);
 
-#ifndef Q_WS_MAC
+#ifndef APP_MAC
     menuBar()->setVisible(!enable);
 #endif
 
diff --git a/src/MediaView.cpp b/src/MediaView.cpp
index f0137ac..66fec98 100644
--- a/src/MediaView.cpp
+++ b/src/MediaView.cpp
@@ -86,7 +86,7 @@ MediaView::MediaView(QWidget *parent) : QWidget(parent) {
     videoAreaWidget = new VideoAreaWidget(this);
     videoAreaWidget->setMinimumSize(320,240);
 
-#ifdef Q_WS_MAC
+#ifdef APP_MAC
     // mouse autohide does not work on the Mac (no mouseMoveEvent)
     videoWidget = new Phonon::VideoWidget(this);
 #else
@@ -203,7 +203,7 @@ void MediaView::stateChanged(Phonon::State newState, Phonon::State /*oldState*/)
         // but Phonon on Linux needs a little more help to start playback
         if (!reallyStopped) mediaObject->play();
 
-#ifdef Q_WS_MAC
+#ifdef APP_MAC
         // Workaround for Mac playback start problem
         if (!timerPlayFlag) {
             workaroundTimer->start();
diff --git a/src/main.cpp b/src/main.cpp
index 1a3c102..36f5d91 100755
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -12,7 +12,7 @@ int main(int argc, char **argv) {
     app.setApplicationName(Constants::APP_NAME);
     app.setOrganizationName(Constants::ORG_NAME);
     app.setOrganizationDomain(Constants::ORG_DOMAIN);
-#ifndef Q_WS_MAC
+#ifndef APP_MAC
     app.setWheelScrollLines(1);
 #endif
 
@@ -45,7 +45,7 @@ int main(int argc, char **argv) {
     mainWin.setWindowTitle(Constants::APP_NAME);
 
 // no window icon on Mac
-#ifndef Q_WS_MAC
+#ifndef APP_MAC
     if (!QFile::exists(dataDir)) {
         dataDir = qApp->applicationDirPath() + "/data";
     }
-- 
2.39.5