diff --git a/_codeql_detected_source_root b/_codeql_detected_source_root deleted file mode 120000 index 945c9b4..0000000 --- a/_codeql_detected_source_root +++ /dev/null @@ -1 +0,0 @@ -. \ No newline at end of file diff --git a/kwin/src/kcm/breezydesktopeffectkcm.cpp b/kwin/src/kcm/breezydesktopeffectkcm.cpp index eac10aa..5a788da 100644 --- a/kwin/src/kcm/breezydesktopeffectkcm.cpp +++ b/kwin/src/kcm/breezydesktopeffectkcm.cpp @@ -643,7 +643,7 @@ void BreezyDesktopEffectConfig::checkForUpdates() { if (isNewer) { if (auto label = widget()->findChild(QStringLiteral("labelUpdateAvailable"))) { - label->setText(tr("A newer version (%1) is available").arg(latest)); + label->setText(tr("A newer version (%1) is available. Please update using the same method you used to install.").arg(latest)); label->setVisible(true); } } diff --git a/kwin/src/kcm/breezydesktopeffectkcm.ui b/kwin/src/kcm/breezydesktopeffectkcm.ui index a562324..ae5997f 100644 --- a/kwin/src/kcm/breezydesktopeffectkcm.ui +++ b/kwin/src/kcm/breezydesktopeffectkcm.ui @@ -56,9 +56,6 @@ color: rgb(0,100,200); font-weight: bold; - - true - diff --git a/ui/src/gtk/window.ui b/ui/src/gtk/window.ui index d59ac1f..b8c1edd 100644 --- a/ui/src/gtk/window.ui +++ b/ui/src/gtk/window.ui @@ -90,18 +90,13 @@ True - A newer version is available + A newer version is available. Please update using the same method you used to install. True + True - - - View release - True - - diff --git a/ui/src/updatechecker.py b/ui/src/updatechecker.py index 3f6a755..5545b39 100644 --- a/ui/src/updatechecker.py +++ b/ui/src/updatechecker.py @@ -26,7 +26,6 @@ from urllib.error import URLError logger = logging.getLogger('breezy_ui') GITHUB_RELEASES_URL = 'https://api.github.com/repos/wheaney/breezy-desktop/releases/latest' -GITHUB_RELEASES_PAGE = 'https://github.com/wheaney/breezy-desktop/releases/latest' def _parse_version(version_str): diff --git a/ui/src/window.py b/ui/src/window.py index 2e031af..56fa815 100644 --- a/ui/src/window.py +++ b/ui/src/window.py @@ -29,7 +29,7 @@ from .nodevice import NoDevice from .nodriver import NoDriver from .noextension import NoExtension from .nolicense import NoLicense -from .updatechecker import check_for_update, GITHUB_RELEASES_PAGE +from .updatechecker import check_for_update from .verify import verify_installation @Gtk.Template(resource_path='/com/xronlinux/BreezyDesktop/gtk/window.ui') @@ -42,7 +42,6 @@ class BreezydesktopWindow(Gtk.ApplicationWindow): missing_breezy_features_banner = Gtk.Template.Child() missing_breezy_features_button = Gtk.Template.Child() update_available_banner = Gtk.Template.Child() - update_available_button = Gtk.Template.Child() def __init__(self, version, skip_verification, **kwargs): super().__init__(**kwargs) @@ -66,7 +65,6 @@ class BreezydesktopWindow(Gtk.ApplicationWindow): self.license_action_needed_button.connect('clicked', self._on_license_button_clicked) self.missing_breezy_features_button.connect('clicked', self._on_license_button_clicked) - self.update_available_button.connect('clicked', self._on_update_button_clicked) self._handle_state_update(self.state_manager, None) @@ -118,9 +116,6 @@ class BreezydesktopWindow(Gtk.ApplicationWindow): dialog.set_transient_for(widget.get_ancestor(Gtk.Window)) dialog.present() - def _on_update_button_clicked(self, widget): - Gtk.show_uri(self, GITHUB_RELEASES_PAGE, 0) - def _on_update_check_result(self, latest_version): GLib.idle_add(self.update_available_banner.set_revealed, latest_version is not None)