Funkwhale/strawberry-audio-player-windows-mac-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove use of sparkle

Browse Source
This commit is contained in:
Jonas Kvinge 2022-01-15 02:19:43 +01:00
parent 203228bd05
commit fbd2993239
4 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/core/mac_startup.h
View File

@ -29,7 +29,6 @@ namespace mac {
void MacMain(); void MacMain();
void SetShortcutHandler(GlobalShortcutsBackendMacOS *handler); void SetShortcutHandler(GlobalShortcutsBackendMacOS *handler);
void SetApplicationHandler(PlatformInterface *handler); void SetApplicationHandler(PlatformInterface *handler);
void CheckForUpdates();
void EnableFullScreen(const QWidget &main_window); void EnableFullScreen(const QWidget &main_window);

14
src/core/mac_startup.mm
View File

@ -55,10 +55,6 @@
#include "globalshortcuts/globalshortcutsmanager.h" #include "globalshortcuts/globalshortcutsmanager.h"
#include "globalshortcuts/globalshortcutsbackend-macos.h" #include "globalshortcuts/globalshortcutsbackend-macos.h"
#ifdef HAVE_SPARKLE
# import <SPUStandardUpdaterController.h>
#endif
#include <QApplication> #include <QApplication>
#include <QCoreApplication> #include <QCoreApplication>
#include <QWidget> #include <QWidget>
@ -288,10 +284,6 @@ void MacMain() {
ScopedNSAutoreleasePool pool; ScopedNSAutoreleasePool pool;
// Creates and sets the magic global variable so QApplication will find it. // Creates and sets the magic global variable so QApplication will find it.
[MacApplication sharedApplication]; [MacApplication sharedApplication];
#ifdef HAVE_SPARKLE
// Creates and sets the magic global variable for Sparkle.
[ [SPUStandardUpdaterController sharedUpdater] setDelegate:NSApp];
#endif
} }
@ -303,12 +295,6 @@ void SetApplicationHandler(PlatformInterface *handler) {
[NSApp SetApplicationHandler:handler]; [NSApp SetApplicationHandler:handler];
} }
void CheckForUpdates() {
#ifdef HAVE_SPARKLE
[ [SPUStandardUpdaterController sharedUpdater] checkForUpdates:NSApp];
#endif
}
static int MapFunctionKey(int keycode) { static int MapFunctionKey(int keycode) {
switch (keycode) { switch (keycode) {

9
src/core/mainwindow.cpp
View File

@ -779,10 +779,9 @@ MainWindow::MainWindow(Application *app, std::shared_ptr<SystemTrayIcon> tray_ic
thumbbar_->SetActions(QList<QAction*>() << ui_->action_previous_track << ui_->action_play_pause << ui_->action_stop << ui_->action_next_track << nullptr << ui_->action_love); thumbbar_->SetActions(QList<QAction*>() << ui_->action_previous_track << ui_->action_play_pause << ui_->action_stop << ui_->action_next_track << nullptr << ui_->action_love);
#endif #endif
#if defined(HAVE_SPARKLE) || defined(HAVE_QTSPARKLE) #if defined(HAVE_QTSPARKLE)
QAction *check_updates = ui_->menu_tools->addAction(tr("Check for updates...")); QAction *check_updates = ui_->menu_tools->addAction(tr("Check for updates..."));
check_updates->setMenuRole(QAction::ApplicationSpecificRole); check_updates->setMenuRole(QAction::ApplicationSpecificRole);
QObject::connect(check_updates, &QAction::triggered, this, &MainWindow::CheckForUpdates);
#endif #endif
#ifdef HAVE_GLOBALSHORTCUTS #ifdef HAVE_GLOBALSHORTCUTS
@ -2492,12 +2491,6 @@ bool MainWindow::LoadUrl(const QString &url) {
} }
void MainWindow::CheckForUpdates() {
#if defined(Q_OS_MACOS)
mac::CheckForUpdates();
#endif
}
void MainWindow::PlaylistUndoRedoChanged(QAction *undo, QAction *redo) { void MainWindow::PlaylistUndoRedoChanged(QAction *undo, QAction *redo) {
playlist_menu_->insertAction(playlist_undoredo_, undo); playlist_menu_->insertAction(playlist_undoredo_, undo);

2
src/core/mainwindow.h
View File

@ -219,8 +219,6 @@ class MainWindow : public QMainWindow, public PlatformInterface {
void AddStream(); void AddStream();
void AddStreamAccepted(); void AddStreamAccepted();
void CheckForUpdates();
void PlayingWidgetPositionChanged(const bool above_status_bar); void PlayingWidgetPositionChanged(const bool above_status_bar);
void SongSaveComplete(TagReaderReply *reply, const QPersistentModelIndex &idx); void SongSaveComplete(TagReaderReply *reply, const QPersistentModelIndex &idx);