diff options
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | NEWS | 4 | ||||
-rw-r--r-- | qml/mageiawelcome.py | 10 | ||||
-rw-r--r-- | qml/mw-ui.qml | 4 |
4 files changed, 12 insertions, 8 deletions
@@ -1,5 +1,5 @@ PACKAGE = mageiawelcome -VERSION = 1.96 +VERSION = 1.96mga6 GITPATH = git://git.mageia.org/software/mageiawelcome TEXT_FILES = Makefile @@ -1,3 +1,7 @@ +1.96mga6 + Correction of a link + Release for Mageia 6 + 1.96 Adapt again the window size to Gnome Wayland settings (mga#24200) Reduce the default size (mga#24572) diff --git a/qml/mageiawelcome.py b/qml/mageiawelcome.py index 8986333..a76d8aa 100644 --- a/qml/mageiawelcome.py +++ b/qml/mageiawelcome.py @@ -47,10 +47,10 @@ class ConfList(QAbstractListModel): if desktop == 'Gnome Wayland': import gi gi.require_version('Gdk', '3.0') - from gi.repository.Gdk import Display + from gi.repository.Gdk import Screen # pre-3.22, otherwise deprecated - #factor = Gdk.Screen.get_default().get_monitor_scale_factor(0) - self.screen_factor = Display.get_default().get_monitor(0).get_scale_factor() + self.screen_factor = Gdk.Screen.get_default().get_monitor_scale_factor(0) + #self.screen_factor = Display.get_default().get_monitor(0).get_scale_factor() # Search active network connections net = QNetworkConfigurationManager() @@ -128,7 +128,7 @@ class Norun(QObject): def __init__(self): QObject.__init__(self) self.home = os.getenv("HOME") - self.conffile = self.home + "/.config/mageiawelcome/norun.flag" + self.conffile = self.home + "/.mageiawelcome/norun.flag" @pyqtSlot(bool) def setRunAtLaunch(self, checked): @@ -137,7 +137,7 @@ class Norun(QObject): if os.path.exists(self.conffile): os.remove( self.conffile) else: - os.makedirs(self.home + "/.config/mageiawelcome", exist_ok=True) + os.makedirs(self.home + "/.mageiawelcome", exist_ok=True) with open( self.conffile, 'w') : pass diff --git a/qml/mw-ui.qml b/qml/mw-ui.qml index ed1623f..40fa2e4 100644 --- a/qml/mw-ui.qml +++ b/qml/mw-ui.qml @@ -807,14 +807,14 @@ This is a background process and you will be able to use your computer normally Repeater{ model: [{'name': qsTr("Release notes"), 'url': //: Translate only if the link is to a specific page for your language - qsTr("https://wiki.mageia.org/en/Mageia_7_Release_Notes")}, + qsTr("https://wiki.mageia.org/en/Mageia_6_Release_Notes")}, {'name': qsTr("Forums"),'url': //: Translate only if the link is to a specific page for your language qsTr("https://forums.mageia.org/en/")}, {'name': qsTr("Community Center"),'url': "https://www.mageia.org/community/"}, {'name': qsTr("Errata"), 'url': //: Translate only if the link is to a specific page for your language - qsTr("https://wiki.mageia.org/en/Mageia_7_Errata")}, + qsTr("https://wiki.mageia.org/en/Mageia_6_Errata")}, {'name': qsTr("Wiki"), 'url': //: Translate only if the link is to a specific page for your language qsTr("https://wiki.mageia.org/en/Documentation")}, |