Remove codeql symlink; show plain update message without link
Co-authored-by: wheaney <42350981+wheaney@users.noreply.github.com>
This commit is contained in:
parent
82d76bfd7f
commit
1a729ac98f
|
|
@ -1 +0,0 @@
|
|||
.
|
||||
|
|
@ -643,7 +643,7 @@ void BreezyDesktopEffectConfig::checkForUpdates() {
|
|||
|
||||
if (isNewer) {
|
||||
if (auto label = widget()->findChild<QLabel*>(QStringLiteral("labelUpdateAvailable"))) {
|
||||
label->setText(tr("<a href=\"https://github.com/wheaney/breezy-desktop/releases/latest\">A newer version (%1) is available</a>").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);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -56,9 +56,6 @@
|
|||
<property name="styleSheet">
|
||||
<string notr="true">color: rgb(0,100,200); font-weight: bold;</string>
|
||||
</property>
|
||||
<property name="openExternalLinks">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
|
|
|
|||
|
|
@ -90,18 +90,13 @@
|
|||
<child>
|
||||
<object class="GtkLabel">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes">A newer version is available</property>
|
||||
<property name="label" translatable="yes">A newer version is available. Please update using the same method you used to install.</property>
|
||||
<property name="hexpand">True</property>
|
||||
<property name="wrap">True</property>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkButton" id="update_available_button">
|
||||
<property name="label" translatable="yes">View release</property>
|
||||
<property name="visible">True</property>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
<child>
|
||||
|
|
|
|||
|
|
@ -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):
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue