Add sparkle
This commit is contained in:
@@ -18,6 +18,7 @@
|
||||
#cmakedefine HAVE_AUDIOCD
|
||||
#cmakedefine HAVE_MTP
|
||||
#cmakedefine HAVE_GPOD
|
||||
#cmakedefine HAVE_SPARKLE
|
||||
#cmakedefine HAVE_QTSPARKLE
|
||||
#cmakedefine HAVE_SONGFINGERPRINTING
|
||||
#cmakedefine HAVE_MUSICBRAINZ
|
||||
|
||||
@@ -220,6 +220,10 @@
|
||||
# include "systemtrayicon/qtsystemtrayicon.h"
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_SPARKLE
|
||||
#include "core/sparkleupdater.h"
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_QTSPARKLE
|
||||
# include <qtsparkle-qt6/Updater>
|
||||
#endif // HAVE_QTSPARKLE
|
||||
@@ -833,9 +837,9 @@ MainWindow::MainWindow(Application *app, SharedPtr<SystemTrayIcon> tray_icon, OS
|
||||
thumbbar_->SetActions(QList<QAction*>() << ui_->action_previous_track << ui_->action_play_pause << ui_->action_stop << ui_->action_next_track << nullptr << ui_->action_love);
|
||||
#endif
|
||||
|
||||
#if defined(HAVE_QTSPARKLE)
|
||||
QAction *check_updates = ui_->menu_tools->addAction(tr("Check for updates..."));
|
||||
check_updates->setMenuRole(QAction::ApplicationSpecificRole);
|
||||
#if defined(HAVE_SPARKLE) || defined(HAVE_QTSPARKLE)
|
||||
QAction *action_check_updates = ui_->menu_tools->addAction(tr("Check for updates..."));
|
||||
action_check_updates->setMenuRole(QAction::ApplicationSpecificRole);
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_GLOBALSHORTCUTS
|
||||
@@ -1046,13 +1050,18 @@ MainWindow::MainWindow(Application *app, SharedPtr<SystemTrayIcon> tray_icon, OS
|
||||
app_->scrobbler()->Submit();
|
||||
}
|
||||
|
||||
#ifdef HAVE_SPARKLE
|
||||
SparkleUpdater *sparkle_updater = new SparkleUpdater(action_check_updates, this);
|
||||
QObject::connect(action_check_updates, &QAction::triggered, sparkle_updater, &SparkleUpdater::CheckForUpdates);
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_QTSPARKLE
|
||||
QUrl sparkle_url(QString::fromLatin1(QTSPARKLE_URL));
|
||||
if (!sparkle_url.isEmpty()) {
|
||||
qLog(Debug) << "Creating Qt Sparkle updater";
|
||||
qtsparkle::Updater *updater = new qtsparkle::Updater(sparkle_url, this);
|
||||
updater->SetVersion(QStringLiteral(STRAWBERRY_VERSION_PACKAGE));
|
||||
QObject::connect(check_updates, &QAction::triggered, updater, &qtsparkle::Updater::CheckNow);
|
||||
QObject::connect(action_check_updates, &QAction::triggered, updater, &qtsparkle::Updater::CheckNow);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
48
src/core/sparkleupdater.h
Normal file
48
src/core/sparkleupdater.h
Normal file
@@ -0,0 +1,48 @@
|
||||
/*
|
||||
* Strawberry Music Player
|
||||
* Copyright 2025, Jonas Kvinge <jonas@jkvinge.net>
|
||||
*
|
||||
* Strawberry is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* Strawberry is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with Strawberry. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef SPARKLEUPDATER_H
|
||||
#define SPARKLEUPDATER_H
|
||||
|
||||
#include <QObject>
|
||||
|
||||
class QAction;
|
||||
|
||||
#ifdef __OBJC__
|
||||
@class AppUpdaterDelegate;
|
||||
#endif
|
||||
|
||||
class SparkleUpdater : public QObject {
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit SparkleUpdater(QAction *action_check_updates, QObject *parent = nullptr);
|
||||
|
||||
public Q_SLOTS:
|
||||
void CheckForUpdates();
|
||||
|
||||
private:
|
||||
#ifdef __OBJC__
|
||||
AppUpdaterDelegate *updater_delegate_;
|
||||
#else
|
||||
void *updater_delegate_;
|
||||
#endif
|
||||
};
|
||||
|
||||
#endif // SPARKLEUPDATER_H
|
||||
79
src/core/sparkleupdater.mm
Normal file
79
src/core/sparkleupdater.mm
Normal file
@@ -0,0 +1,79 @@
|
||||
/*
|
||||
* Strawberry Music Player
|
||||
* Copyright 2025, Jonas Kvinge <jonas@jkvinge.net>
|
||||
*
|
||||
* Strawberry is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* Strawberry is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with Strawberry. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
#import <Sparkle/Sparkle.h>
|
||||
|
||||
#include <QObject>
|
||||
#include <QAction>
|
||||
|
||||
#include "sparkleupdater.h"
|
||||
|
||||
@interface AppUpdaterDelegate : NSObject <SPUUpdaterDelegate>
|
||||
|
||||
@property(nonatomic, assign) SPUStandardUpdaterController *updater_controller;
|
||||
|
||||
@end
|
||||
|
||||
@implementation AppUpdaterDelegate
|
||||
|
||||
- (void)observeCanCheckForUpdatesWithAction:(QAction*)action_check_updates {
|
||||
[_updater_controller.updater addObserver:self forKeyPath:NSStringFromSelector(@selector(canCheckForUpdates)) options:(NSKeyValueObservingOptionInitial | NSKeyValueObservingOptionNew) context:(void*)action_check_updates];
|
||||
}
|
||||
|
||||
- (void)observeValueForKeyPath:(NSString*)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey, id>*)change context:(void*)context {
|
||||
|
||||
if ([keyPath isEqualToString:NSStringFromSelector(@selector(canCheckForUpdates))]) {
|
||||
QAction *action = reinterpret_cast<QAction*>(context);
|
||||
action->setEnabled(_updater_controller.updater.canCheckForUpdates);
|
||||
}
|
||||
else {
|
||||
[super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
- (void)dealloc {
|
||||
|
||||
@autoreleasepool {
|
||||
[_updater_controller.updater removeObserver:self forKeyPath:NSStringFromSelector(@selector(canCheckForUpdates))];
|
||||
}
|
||||
|
||||
[super dealloc];
|
||||
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
SparkleUpdater::SparkleUpdater(QAction *action_check_updates, QObject *parent) : QObject(parent) {
|
||||
|
||||
@autoreleasepool {
|
||||
updater_delegate_ = [[AppUpdaterDelegate alloc] init];
|
||||
updater_delegate_.updater_controller = [[SPUStandardUpdaterController alloc] initWithStartingUpdater:YES updaterDelegate:updater_delegate_ userDriverDelegate:nil];
|
||||
[updater_delegate_ observeCanCheckForUpdatesWithAction:action_check_updates];
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void SparkleUpdater::CheckForUpdates() {
|
||||
|
||||
@autoreleasepool {
|
||||
[updater_delegate_.updater_controller checkForUpdates:nil];
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user