Updated version to 0.5.1

Author: Kurtis Nusbaum

CMakeLists.txt

@@ -20,7 +20,7 @@ cmake_minimum_required(VERSION 2.8.7)
 PROJECT(UDJ)
 SET(PROJECT_VERSION_MAJOR 0)
 SET(PROJECT_VERSION_MINOR 5)
-SET(PROJECT_VERSION_PATCH 0)
+SET(PROJECT_VERSION_PATCH 1)
 SET(PROJECT_COPYRIGHT_YEAR 2011)
 SET(PROJECT_VERNDOR "Bazaar Solutions")
 set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")

ChangeLog

@@ -1,2 +1,5 @@
 Version 0.5.0
-Initial version of the UDJ Player.
+Initial version of the UDJ Player
+
+Version 0.5.1
+Fixed playback issues for Windows player. Windows player now has an updater. 

cmake/modules/NSIS.template.in

@@ -330,6 +330,8 @@ Section "UDJ Player" SEC_UDJ_PLAYER
    File "${MING_BIN}\libpng15-15.dll"
    File "${MING_BIN}\libjpeg-8.dll"
    File "${MING_BIN}\zlib1.dll"
+   File "${MING_BIN}\libqtsparkle.dll"
+
 
 
    ; Jabber

src/MetaWindow.cpp

@@ -45,9 +45,6 @@
 #include <QInputDialog>
 #include <QDesktopServices>
 
-#if IS_WINDOWS_BUILD
-#include <qtsparkle/Updater>
-#endif
 
 
 namespace UDJ{
@@ -64,6 +61,11 @@ MetaWindow::MetaWindow(
   isQuiting(false)
 {
   dataStore = new DataStore(username, password, ticketHash, userId, this);
+  #if IS_WINDOWS_BUILD
+  updater = new qtsparkle::Updater(
+  QUrl(UDJ_WINDOWS_UPDATE_URL), this);
+  #endif
+
   createActions();
   setupUi();
   setupMenus();
@@ -106,11 +108,6 @@ MetaWindow::MetaWindow(
     this,
     SLOT(checkForITunes()));
 
-  #if IS_WINDOWS_BUILD
-  qtsparkle::Updater*  updater = new qtsparkle::Updater(
-   QUrl(UDJ_WINDOWS_UPDATE_URL), this);
-  #endif
-
 }
 
 void MetaWindow::closeEvent(QCloseEvent *event){
@@ -276,6 +273,10 @@ void MetaWindow::createActions(){
   viewLogAction = new QAction(tr("View &Log"), this);
   viewLogAction->setShortcut(tr("Ctrl+L"));
   viewAboutAction = new QAction(tr("About"), this);
+  #if IS_WINDOWS_BUILD
+  checkUpdateAction = new QAction(tr("Check For Updates"), this);
+  connect(checkUpdateAction, SIGNAL(triggerd()), updater, SLOT(CheckNow()));
+  #endif
   connect(addMusicAction, SIGNAL(triggered()), this, SLOT(addMusicToLibrary()));
   connect(quitAction, SIGNAL(triggered()), this, SLOT(close()));
   connect(addSongAction, SIGNAL(triggered()), this, SLOT(addSongToLibrary()));
@@ -295,6 +296,9 @@ void MetaWindow::setupMenus(){
   QMenu *helpMenu = menuBar()->addMenu(tr("&Help"));
   helpMenu->addAction(viewLogAction);
   helpMenu->addAction(viewAboutAction);
+  #if IS_WINDOWS_BUILD
+  helpMenu->addAction(checkUpdateAction);
+  #endif
 
 }
 

src/MetaWindow.hpp

@@ -25,6 +25,9 @@
 #include <QSqlTableModel>
 #include "UDJServerConnection.hpp"
 #include "PlaybackWidget.hpp"
+#if IS_WINDOWS_BUILD
+#include <qtsparkle/Updater>
+#endif
 
 class QTabWidget;
 class QPushButton;
@@ -243,6 +246,13 @@ private slots:
    */
   QAction *removePasswordAction;
 
+  #if IS_WINDOWS_BUILD
+  /**
+   * \brief Checks to se if there is an update available for the player.
+   */
+  QAction* checkUpdateAction;
+  #endif
+
 //  QFileSystemWatcher* fileWatcher;
 
 
@@ -273,6 +283,8 @@ private slots:
   /** \brief A flag indicating whether or not the client is in the process of quitting. */
   bool isQuiting;
 
+  qtsparkle::Updater* updater;
+   
   //@}
 
   /** @name Private Functions */