1.1

diff --git a/CHANGES b/CHANGES
index 77d1e712b095b3dd65ef8719fa178931d4ad2c5b..3f03c5fa240e2ab2e2da86303d2674341a89474b 100644 (file)
--- 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 cba36bfa9e79e134a81f90bb712e26f43922c19e..de883f84adc7fcb749658954b307103a432482a1 100755 (executable)
--- 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 1da7c56c782e75e086e9f3c471fd7e2da7c9e339..dae434c7ebcffadb850b1980624c8b6491d4bb68 100755 (executable)
--- 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 f0137acc380a9739044b08b17fec27e6178b2457..66fec981feae4d80f268b21c894272d2f07cea87 100644 (file)
--- 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 1a3c102ddf868a00d32f2cd6eaad79964a0fe61d..36f5d91b7297f5d004aef43d07768eb3f3ab343e 100755 (executable)
--- 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";
     }