# # # delete "src/util/CocoaUtil.h" # # delete "src/util/CocoaUtil.mm" # # patch "guitone.pro" # from [a6dbc4a1407b361ceca493d7da62b210152212c6] # to [2837f1d27731f4f24199c1c1c35ccce0d19842a9] # # patch "res/forms/dialogs/application_update.ui" # from [5258144de27b682d19ea5cf5e9edf2a506cf419c] # to [324e4ede735cc93710f92943af2482a79e8abcde] # # patch "res/osx/Info.plist.in" # from [8b4ad5a3c7bbc65bb49a2ff44f2df70ea88da41b] # to [65f721faa2e13da6d159b3a8170604df134fc474] # # patch "src/GuitoneCore.cpp" # from [76aa94168e2be1d4ef6c3cde7fd4ffcc0e265fc4] # to [ca78bc05db6fd829fb1e5459e7784f813353ca7e] # # patch "src/GuitoneCore.h" # from [66e66e79013745a1f1f25057c6ce89dcf0fe96c2] # to [f864aa5b661a4f374fe46404cca99d54b9f183b4] # # patch "src/view/dialogs/ApplicationUpdate.cpp" # from [02a631ba7c688265cb9bdb45867f6bd8f9f44b3e] # to [c8fe5f17c273b93ae1806f8f2986cc60883b6fae] # ============================================================ --- guitone.pro a6dbc4a1407b361ceca493d7da62b210152212c6 +++ guitone.pro 2837f1d27731f4f24199c1c1c35ccce0d19842a9 @@ -12,12 +12,10 @@ APPCAST_URL = "https://guitone.t # # common configuration # -TEMPLATE = app -TARGET = guitone -QT += xml svg -!macx { - QT += xml network -} +TEMPLATE = app +TARGET = guitone +QT += xml svg network + INCLUDEPATH = src/ \ src/view/widgets \ src/view/mainwindows \ @@ -38,6 +36,7 @@ HEADERS = src/view/widgets/TreeView.h \ src/view/widgets/DatabaseMenuBar.h \ src/view/widgets/WorkspaceMenuBar.h \ src/view/widgets/ToolBox.h \ + src/view/widgets/BranchView.h \ src/view/widgets/SearchInput.h \ src/view/mainwindows/MainWindow.h \ src/view/mainwindows/WorkspaceWindow.h \ @@ -46,6 +45,7 @@ HEADERS = src/view/widgets/TreeView.h \ src/view/dialogs/DialogManager.h \ src/view/dialogs/WorkspaceDialogManager.h \ src/view/dialogs/DatabaseDialogManager.h \ + src/view/dialogs/ApplicationUpdate.h \ src/view/dialogs/SelectRevision.h \ src/view/dialogs/UpdateWorkspace.h \ src/view/dialogs/CheckoutRevision.h \ @@ -124,6 +124,7 @@ SOURCES += src/view/widgets/TreeView.cpp src/view/widgets/DatabaseMenuBar.cpp \ src/view/widgets/WorkspaceMenuBar.cpp \ src/view/widgets/ToolBox.cpp \ + src/view/widgets/BranchView.cpp \ src/view/widgets/SearchInput.cpp \ src/view/mainwindows/MainWindow.cpp \ src/view/mainwindows/WorkspaceWindow.cpp \ @@ -132,6 +133,7 @@ SOURCES += src/view/widgets/TreeView.cpp src/view/dialogs/DialogManager.cpp \ src/view/dialogs/WorkspaceDialogManager.cpp \ src/view/dialogs/DatabaseDialogManager.cpp \ + src/view/dialogs/ApplicationUpdate.cpp \ src/view/dialogs/SelectRevision.cpp \ src/view/dialogs/UpdateWorkspace.cpp \ src/view/dialogs/CheckoutRevision.cpp \ @@ -245,34 +247,20 @@ DEFINES += GUITONE_VERSION=\\\"$${GU DEFINES += GUITONE_VERSION=\\\"$${GUITONE_VERSION}\\\" \ GUITONE_REVISION=\\\"$${GUITONE_REVISION}\\\" \ MIN_MTN_INT_VERSION=\\\"$${MIN_MTN_INT_VERSION}\\\" \ - MAX_MTN_INT_VERSION=\\\"$${MAX_MTN_INT_VERSION}\\\" + MAX_MTN_INT_VERSION=\\\"$${MAX_MTN_INT_VERSION}\\\" \ + APPCAST_URL=\\\"$${APPCAST_URL}\\\" # add guitone ico resource win32:RC_FILE = res/win32/guitone.rc -!macx { - HEADERS += src/view/dialogs/ApplicationUpdate.h - SOURCES += src/view/dialogs/ApplicationUpdate.cpp - DEFINES += APPCAST_URL=\\\"$${APPCAST_URL}\\\" -} - # # MacOS X specific configuration # - macx { - # add specific Mac sources - HEADERS += src/util/CocoaUtil.h - SOURCES += src/util/CocoaUtil.mm - - # add the Sparkle and the Carbon framework - QMAKE_LFLAGS += -framework Sparkle -framework Carbon - # copy i18n resources into the final app bundle and # put the current version number into Info.plist QMAKE_POST_LINK = cp -R res/osx/Resources bin/guitone.app/Contents && \ - sed -e \'s|@@version@@|$${GUITONE_VERSION}|g\' \ - -e \'s|@@appcast_url@@|$${APPCAST_URL}|g\' \ + sed -e \'s|@@version@@|$${GUITONE_VERSION}|g\' \ < res/osx/Info.plist.in > bin/guitone.app/Contents/Info.plist # add x86, ppc archs for universal release builds ============================================================ --- res/forms/dialogs/application_update.ui 5258144de27b682d19ea5cf5e9edf2a506cf419c +++ res/forms/dialogs/application_update.ui 324e4ede735cc93710f92943af2482a79e8abcde @@ -1,93 +1,130 @@ - + + ApplicationUpdateDialog - - + + 0 0 - 541 - 376 + 671 + 458 - - A new version of guitone is available! + + Software Update - - :/icons/guitone.png + + + :/icons/guitone.png:/icons/guitone.png - - - 6 - - - 9 - - - 9 - - - 9 - - - 9 - + - - - 6 - - - 0 - - - 0 - - - 0 - - - 0 - + - + + + + + + :/icons/guitone.png + + - - - 6 + + + Qt::Vertical - - 0 + + + 20 + 40 + - - 0 + + + + + + + + + + + 14 + 75 + true + - - 0 + + A new version of guitone is available! - + + + + + + guitone %1 is now available - you're using %2. Would you like to download now? + + + true + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 10 + + + + + + + + + 13 + 75 + true + + + + Release Notes: + + + + + + + + + + 6 + + 0 - - - Skip this version + + + Skip This Version - - - Visit website - - - - - + Qt::Horizontal - + 40 20 @@ -96,11 +133,21 @@ - - - Close + + + Remind Me Later - + + false + + + + + + + Visit Website + + true @@ -112,7 +159,8 @@ - + + @@ -121,11 +169,11 @@ ApplicationUpdateDialog accept() - + 222 263 - + 199 149 ============================================================ --- res/osx/Info.plist.in 8b4ad5a3c7bbc65bb49a2ff44f2df70ea88da41b +++ res/osx/Info.plist.in 65f721faa2e13da6d159b3a8170604df134fc474 @@ -26,12 +26,6 @@ @@version@@ LSMinimumSystemVersion 10.4.0 - SUCheckAtStartup - - SUFeedURL - @@appcast_url@@ - SUScheduledCheckInterval - 86400 CFBundleDocumentTypes ============================================================ --- src/GuitoneCore.cpp 76aa94168e2be1d4ef6c3cde7fd4ffcc0e265fc4 +++ src/GuitoneCore.cpp ca78bc05db6fd829fb1e5459e7784f813353ca7e @@ -24,22 +24,12 @@ #include -#ifdef Q_WS_MACX -#include "CocoaUtil.h" -#endif - #include #include GuitoneCore::GuitoneCore(int & argc, char ** argv) - : QApplication(argc, argv), monotoneManager(0) + : QApplication(argc, argv), monotoneManager(0), updateDialog(0) { -#ifndef Q_WS_MACX - updateDialog = 0; -#else - CocoaUtil::initialize(); -#endif - // check for updates immediatly on launch if (Settings::getBool("CheckForUpdates", true)) { @@ -59,9 +49,7 @@ GuitoneCore::~GuitoneCore() GuitoneCore::~GuitoneCore() { delete monotoneManager; -#ifndef Q_WS_MACX if (updateDialog) delete updateDialog; -#endif } void GuitoneCore::setMonotoneBinaryPath() @@ -114,15 +102,11 @@ void GuitoneCore::checkForApplicationUpd void GuitoneCore::checkForApplicationUpdates(bool silent) { -#ifdef Q_WS_MACX - CocoaUtil::checkForUpdates(silent); -#else if (!updateDialog) { updateDialog = new ApplicationUpdate(NULL); } updateDialog->checkForUpdates(silent); -#endif } void GuitoneCore::threadAborted(const QString & message) @@ -156,3 +140,4 @@ bool GuitoneCore::notify(QObject * objec return false; } + ============================================================ --- src/GuitoneCore.h 66e66e79013745a1f1f25057c6ce89dcf0fe96c2 +++ src/GuitoneCore.h f864aa5b661a4f374fe46404cca99d54b9f183b4 @@ -22,9 +22,7 @@ #define GUITONE_CORE_H #include "MonotoneManager.h" -#ifndef Q_WS_MACX #include "ApplicationUpdate.h" -#endif #include @@ -53,9 +51,7 @@ private: bool notify (QObject *, QEvent *); MonotoneManager * monotoneManager; -#ifndef Q_WS_MACX ApplicationUpdate * updateDialog; -#endif }; #endif ============================================================ --- src/view/dialogs/ApplicationUpdate.cpp 02a631ba7c688265cb9bdb45867f6bd8f9f44b3e +++ src/view/dialogs/ApplicationUpdate.cpp c8fe5f17c273b93ae1806f8f2986cc60883b6fae @@ -204,6 +204,9 @@ void ApplicationUpdate::processHttpResul skipVersion->setVisible(false); } + versionLabel->setText(versionLabel->text() + .arg(latestVersion) + .arg(GUITONE_VERSION)); show(); } else @@ -223,7 +226,7 @@ void ApplicationUpdate::openWebsite() void ApplicationUpdate::openWebsite() { - Platform::openFile("https://guitone.thomaskeller.biz"); + Platform::openFile("https://guitone.thomaskeller.biz/g/download"); accept(); }