diff --git a/src/prefs.js b/src/prefs.js index 9ba95f3..24f087e 100644 --- a/src/prefs.js +++ b/src/prefs.js @@ -3648,9 +3648,7 @@ const Preferences = class { // Donation panel - let revealDonateTimeout = 0 let donationIconSwitch = this._builder.get_object('donation_icon_switch') - let donationSpinner = this._builder.get_object('donation_spinner') let hiddenDonateIcon = !!this._settings.get_string( 'hide-donate-icon-unixtime', ) @@ -3669,8 +3667,6 @@ const Preferences = class { .set_from_file(`${this._path}/img/kofi.png`) donationIconSwitch.set_active(hiddenDonateIcon) - donationIconSwitch.set_sensitive(hiddenDonateIcon) - donationSpinner.set_visible(!hiddenDonateIcon) donationIconSwitch.connect('notify::active', (widget) => this._settings.set_string( @@ -3678,33 +3674,6 @@ const Preferences = class { widget.get_active() ? Date.now().toString() : '', ), ) - - this.notebook.connect('notify::visible-page', () => { - if (revealDonateTimeout) { - GLib.Source.remove(revealDonateTimeout) - revealDonateTimeout = 0 - } - - if (this.notebook.visible_page_name == 'donation' && !hiddenDonateIcon) { - let secs = 5 - - revealDonateTimeout = GLib.timeout_add( - GLib.PRIORITY_DEFAULT, - 1000, - () => { - if (--secs < 1) { - donationIconSwitch.set_sensitive(true) - donationSpinner.set_visible(false) - revealDonateTimeout = 0 - - return GLib.SOURCE_REMOVE - } - - return GLib.SOURCE_CONTINUE - }, - ) - } - }) } _setPreviewTitlePosition() { diff --git a/src/taskbar.js b/src/taskbar.js index 5b72c1c..f54e8bc 100644 --- a/src/taskbar.js +++ b/src/taskbar.js @@ -1099,12 +1099,12 @@ export const Taskbar = class extends EventEmitter { if (this._donateApp) appInfos = [ + ...appInfos, { app: this._donateApp, isLauncher: true, windows: [], }, - ...appInfos, ] return appInfos diff --git a/ui/SettingsDonation.ui b/ui/SettingsDonation.ui index 0d94ffb..48e01ab 100644 --- a/ui/SettingsDonation.ui +++ b/ui/SettingsDonation.ui @@ -158,18 +158,9 @@ If you like, you can now hide the donate icon</span> end - False center - - - end - 10 - 0.3 - True - -