diff -Nru lxqt-admin-1.3.0/CHANGELOG lxqt-admin-1.4.0/CHANGELOG --- lxqt-admin-1.3.0/CHANGELOG 2023-04-15 16:24:52.000000000 +0000 +++ lxqt-admin-1.4.0/CHANGELOG 2023-11-05 12:23:24.000000000 +0000 @@ -1,3 +1,8 @@ +lxqt-admin-1.4.0 / 2023-11-05 +============================== + * Set the default shell to bash if available. + * Removed KWindowSystem as a direct dependency and made some code improvements. + lxqt-admin-1.3.0 / 2023-04-15 ============================== * Used more specific icons for lxqt-admin-time and lxqt-admin-user. diff -Nru lxqt-admin-1.3.0/CMakeLists.txt lxqt-admin-1.4.0/CMakeLists.txt --- lxqt-admin-1.3.0/CMakeLists.txt 2023-04-15 16:24:52.000000000 +0000 +++ lxqt-admin-1.4.0/CMakeLists.txt 2023-11-05 12:23:24.000000000 +0000 @@ -12,13 +12,11 @@ set(LIB_INSTALL_DIR "lib${LIB_SUFFIX}" CACHE PATH "Installation path for libraries") # Minimum Versions -set(KF5_MINIMUM_VERSION "5.36.0") -set(LXQT_MINIMUM_VERSION "1.3.0") +set(LXQT_MINIMUM_VERSION "1.4.0") set(QT_MINIMUM_VERSION "5.15.0") find_package(Qt5Widgets ${QT_MINIMUM_VERSION} REQUIRED) find_package(lxqt ${LXQT_MINIMUM_VERSION} REQUIRED) -find_package(KF5WindowSystem ${KF5_MINIMUM_VERSION} REQUIRED) find_package(PolkitQt5-1 REQUIRED) # Patch Version diff -Nru lxqt-admin-1.3.0/debian/changelog lxqt-admin-1.4.0/debian/changelog --- lxqt-admin-1.3.0/debian/changelog 2023-08-11 18:01:50.000000000 +0000 +++ lxqt-admin-1.4.0/debian/changelog 2023-11-13 00:01:42.000000000 +0000 @@ -1,8 +1,16 @@ -lxqt-admin (1.3.0-0ubuntu1~ppa1) jammy; urgency=medium +lxqt-admin (1.4.0-0ubuntu1~ppa1) jammy; urgency=medium * Backport to Jammy. - -- Simon Quigley Fri, 11 Aug 2023 13:01:50 -0500 + -- Simon Quigley Sun, 12 Nov 2023 18:01:42 -0600 + +lxqt-admin (1.4.0-0ubuntu1) noble; urgency=medium + + * New upstream release. + * Bump build dependencies. + * Update copyright years. + + -- Simon Quigley Sun, 12 Nov 2023 18:00:48 -0600 lxqt-admin (1.3.0-0ubuntu1) mantic; urgency=medium diff -Nru lxqt-admin-1.3.0/debian/control lxqt-admin-1.4.0/debian/control --- lxqt-admin-1.3.0/debian/control 2023-08-11 18:01:48.000000000 +0000 +++ lxqt-admin-1.4.0/debian/control 2023-11-12 23:58:23.000000000 +0000 @@ -10,7 +10,7 @@ Priority: optional Build-Depends: debhelper-compat (= 13), libkf5windowsystem-dev, - liblxqt1-dev (>= 1.3.0), + liblxqt1-dev (>= 1.4.0), libpolkit-qt5-1-dev, libqt5svg5-dev, libqt5x11extras5-dev, diff -Nru lxqt-admin-1.3.0/debian/copyright lxqt-admin-1.4.0/debian/copyright --- lxqt-admin-1.3.0/debian/copyright 2023-08-11 18:01:48.000000000 +0000 +++ lxqt-admin-1.4.0/debian/copyright 2023-11-12 23:58:41.000000000 +0000 @@ -3,7 +3,7 @@ Source: https://github.com/lxqt/lxqt-admin Files: * -Copyright: 2014-2022 LXQt team +Copyright: 2014-2023 LXQt team 2014-2016 Hong Jen Yee (PCMan) License: LGPL-2.1+ diff -Nru lxqt-admin-1.3.0/lxqt-admin-time/CMakeLists.txt lxqt-admin-1.4.0/lxqt-admin-time/CMakeLists.txt --- lxqt-admin-1.3.0/lxqt-admin-time/CMakeLists.txt 2023-04-15 16:24:52.000000000 +0000 +++ lxqt-admin-1.4.0/lxqt-admin-time/CMakeLists.txt 2023-11-05 12:23:24.000000000 +0000 @@ -75,7 +75,6 @@ ) target_link_libraries(lxqt-admin-time - KF5::WindowSystem Qt5::Widgets Qt5::DBus lxqt diff -Nru lxqt-admin-1.3.0/lxqt-admin-time/fbsdtimedatectl.cpp lxqt-admin-1.4.0/lxqt-admin-time/fbsdtimedatectl.cpp --- lxqt-admin-1.3.0/lxqt-admin-time/fbsdtimedatectl.cpp 2023-04-15 16:24:52.000000000 +0000 +++ lxqt-admin-1.4.0/lxqt-admin-time/fbsdtimedatectl.cpp 2023-11-05 12:23:24.000000000 +0000 @@ -46,11 +46,12 @@ QString FBSDTimeDateCtl::timeZone() const { QFile tzFile(QSL("/var/db/zoneinfo")); - if (!tzFile.open(QFile::ReadOnly | QFile::Text)) return QSL("Unknown"); - QTextStream in(&tzFile); - QString lastTZone = in.readLine(); - return lastTZone; + if (!tzFile.open(QFile::ReadOnly | QFile::Text)) + return QSL("Unknown"); + QTextStream in(&tzFile); + QString lastTZone = in.readLine(); + return lastTZone; } bool FBSDTimeDateCtl::setTimeZone(QString timeZone, QString& /*errorMessage*/) @@ -76,8 +77,7 @@ process.waitForFinished(-1); QString t = QString::fromLatin1(process.readAllStandardOutput()); QStringList o = t.split(QSL("\n")); - for (QStringList::iterator it = o.begin(); - it != o.end(); ++it) { + for (QStringList::iterator it = o.begin(); it != o.end(); ++it) { QString current = *it; if(!current.startsWith(QSL("#")) && current.contains(QSL("ntpd_enable"),Qt::CaseInsensitive) && current.contains(QSL("yes"),Qt::CaseInsensitive)) { return true; diff -Nru lxqt-admin-1.3.0/lxqt-admin-time/nosdtimedatectl.cpp lxqt-admin-1.4.0/lxqt-admin-time/nosdtimedatectl.cpp --- lxqt-admin-1.3.0/lxqt-admin-time/nosdtimedatectl.cpp 2023-04-15 16:24:52.000000000 +0000 +++ lxqt-admin-1.4.0/lxqt-admin-time/nosdtimedatectl.cpp 2023-11-05 12:23:24.000000000 +0000 @@ -46,10 +46,12 @@ QString NOSDTimeDateCtl::timeZone() const { QFile tzFile(QSL("/etc/timezone")); - if (!tzFile.open(QFile::ReadOnly | QFile::Text)) return QSL("Unknown"); - QTextStream in(&tzFile); - QString lastTZone = in.readLine(); - return lastTZone; + if (!tzFile.open(QFile::ReadOnly | QFile::Text)) + return QSL("Unknown"); + + QTextStream in(&tzFile); + QString lastTZone = in.readLine(); + return lastTZone; } bool NOSDTimeDateCtl::setTimeZone(QString timeZone, QString& /*errorMessage*/) @@ -99,18 +101,19 @@ { QFile tzFile(QSL("/etc/sysconfig/clock")); if (!tzFile.open(QFile::ReadOnly | QFile::Text)) - return false; + return false; + QTextStream in(&tzFile); QString all = in.readAll(); QStringList sl = all.split(QSL("\n")); - for (QStringList::iterator it = sl.begin(); it != sl.end(); it++) { - QString current = *it; - if(current.startsWith(QSL("#"))) - continue; - if(current.startsWith(QSL("UTC=1")) || current.startsWith(QSL("UTC=true"))) - return false; - if(current.startsWith(QSL("UTC=0")) || current.startsWith(QSL("UTC=false"))) - return true; + for (QStringList::iterator it = sl.begin(); it != sl.end(); ++it) { + QString current = *it; + if(current.startsWith(QSL("#"))) + continue; + if(current.startsWith(QSL("UTC=1")) || current.startsWith(QSL("UTC=true"))) + return false; + if(current.startsWith(QSL("UTC=0")) || current.startsWith(QSL("UTC=false"))) + return true; } return false; } diff -Nru lxqt-admin-1.3.0/lxqt-admin-time/translations/lxqt-admin-time_fi.desktop.yaml lxqt-admin-1.4.0/lxqt-admin-time/translations/lxqt-admin-time_fi.desktop.yaml --- lxqt-admin-1.3.0/lxqt-admin-time/translations/lxqt-admin-time_fi.desktop.yaml 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-admin-1.4.0/lxqt-admin-time/translations/lxqt-admin-time_fi.desktop.yaml 2023-11-05 12:23:24.000000000 +0000 @@ -0,0 +1,3 @@ +Desktop Entry/Name: "Aika ja päiväys" +Desktop Entry/GenericName: "Aika- ja päiväasetukset" +Desktop Entry/Comment: "Määritä järjestelmäsi aika ja päiväys" diff -Nru lxqt-admin-1.3.0/lxqt-admin-time/translations/lxqt-admin-time_fi.ts lxqt-admin-1.4.0/lxqt-admin-time/translations/lxqt-admin-time_fi.ts --- lxqt-admin-1.3.0/lxqt-admin-time/translations/lxqt-admin-time_fi.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-admin-1.4.0/lxqt-admin-time/translations/lxqt-admin-time_fi.ts 2023-11-05 12:23:24.000000000 +0000 @@ -0,0 +1,109 @@ + + + + + DateTime + + + Time: + Kello: + + + + HH:mm:ss + HH:mm:ss + + + + Date: + Päiväys: + + + + Enable network time synchronization (NTP) + Päivitä kellonaika verkosta (NTP) + + + + RTC is in local time + Reaaliaikakello (RTC) on paikallisessa ajassa + + + + QObject + + + + lxqt-admin-time-helper + lxqt-admin-time-helper + + + + + <strong>Action (%1) failed:</strong><br/><pre>%2</pre> + <strong>Toiminto (%1) epäonnistui:</strong><br/><pre>%2</pre> + + + + TimeAdminDialog + + + Time and date configuration + Aika-asetukset + + + + Date and time + Aika ja päivä + + + + Timezone + Aikavyöhyke + + + + + + + Error + Virhe + + + + Change RTC to be in localtime requires a reboot + Reaaliaikakellon (RTC) muuttaminen paikalliseen aikaan vaatii uudelleenkäynnistyksen + + + + Change RTC to be in UTC requires a reboot + Reaaliaikakellon (RTC) muuttaminen UTC-aikaan vaatii uudelleenkäynnistyksen + + + + Reboot required + Uudelleenkäynnistys vaaditaan + + + + Timezone + + + Your current timezone: + Nykyinen aikavyöhyke: + + + + Filter + Suodata + + + + TimezonePage + + + None + - + + + diff -Nru lxqt-admin-1.3.0/lxqt-admin-user/CMakeLists.txt lxqt-admin-1.4.0/lxqt-admin-user/CMakeLists.txt --- lxqt-admin-1.3.0/lxqt-admin-user/CMakeLists.txt 2023-04-15 16:24:52.000000000 +0000 +++ lxqt-admin-1.4.0/lxqt-admin-user/CMakeLists.txt 2023-11-05 12:23:24.000000000 +0000 @@ -58,7 +58,6 @@ ) target_link_libraries(lxqt-admin-user - KF5::WindowSystem Qt5::Widgets lxqt ) diff -Nru lxqt-admin-1.3.0/lxqt-admin-user/translations/lxqt-admin-user_fi.desktop.yaml lxqt-admin-1.4.0/lxqt-admin-user/translations/lxqt-admin-user_fi.desktop.yaml --- lxqt-admin-1.3.0/lxqt-admin-user/translations/lxqt-admin-user_fi.desktop.yaml 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-admin-1.4.0/lxqt-admin-user/translations/lxqt-admin-user_fi.desktop.yaml 2023-11-05 12:23:24.000000000 +0000 @@ -0,0 +1,3 @@ +Desktop Entry/Name: "Käyttäjät ja ryhmät" +Desktop Entry/GenericName: "Käyttäjä- ja ryhmäasetukset" +Desktop Entry/Comment: "Määritä järjestelmäsi käyttäjät ja ryhmät" diff -Nru lxqt-admin-1.3.0/lxqt-admin-user/translations/lxqt-admin-user_fi.ts lxqt-admin-1.4.0/lxqt-admin-user/translations/lxqt-admin-user_fi.ts --- lxqt-admin-1.3.0/lxqt-admin-user/translations/lxqt-admin-user_fi.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-admin-1.4.0/lxqt-admin-user/translations/lxqt-admin-user_fi.ts 2023-11-05 12:23:24.000000000 +0000 @@ -0,0 +1,268 @@ + + + + + GroupDialog + + + Group Settings + Ryhmän asetukset + + + + Group name: + Ryhmän nimi: + + + + Default + Oletus + + + + Group ID: + Ryhmätunniste: + + + + Users belong to this group: + Ryhmään kuuluvat käyttäjät: + + + + Error + Virhe + + + + The group name cannot be empty. + Ryhmän nimi ei voi olla tyhjä. + + + + MainWindow + + + User and Group Settings + Käyttäjä- ja ryhmäasetukset + + + + &Users + &Käyttäjät + + + + Login Name + Käyttäjätunnus + + + + User ID + Käyttäjätunniste + + + + Full Name + Koko nimi + + + + Group + Ryhmä + + + + Home Directory + Kotihakemisto + + + + Show system users (for advanced users only) + Näytä järjestelmäkäyttäjät (edistyneille käyttäjille) + + + + &Groups + &Ryhmät + + + + Name + Nimi + + + + Group ID + Ryhmätunniste + + + + Members + Jäsenet + + + + Edit properties of the selected item + Muokkaa valitun kohteen ominaisuuksia + + + + Add + Lisää + + + + Add new users or groups + Lisää uusia käyttäjiä tai ryhmiä + + + + Delete + Poista + + + + Delete selected item + Poista valittu kohde + + + + Properties + Ominaisuudet + + + + Refresh + Päivitä + + + + Refresh the lists + Päivitä luettelot + + + + Change Password + Vaihda salasana + + + + Change password for the selected user or group + Vaihda valitun käyttäjän tai ryhmän salasana + + + + + + Confirm + Kyllä + + + + Are you sure you want to delete the selected user? + Haluatko varmasti poistaa valitun käyttäjän? + + + + Are you sure you want to delete the selected group? + Haluatko varmasti poistaa valitun ryhmän? + + + + Input the new password for %1: + Uusi salasana (%1): + + + + Are you sure you want to set a empty password? + Haluatko varmasti asettaa tyhjän salasanan? + + + + UserDialog + + + User Settings + Käyttäjän asetukset + + + + General + Yleiset + + + + Full name: + Koko nimi: + + + + Login name: + Käyttäjätunnus: + + + + User ID: + Käyttäjätunniste: + + + + Default + Oletus + + + + Main group: + Pääryhmä: + + + + Groups + Ryhmät + + + + The user belongs to the following groups: + Käyttäjä on jäsen seuraavissa ryhmissä: + + + + Advanced + Lisäasetukset + + + + Login shell: + Komentotulkki: + + + + Home directory: + Kotihakemisto: + + + + Error + Virhe + + + + The user name cannot be empty. + Käyttäjätunnus vaaditaan. + + + + UserManager + + + lxqt-admin-user + lxqt-admin-user + + + + <strong>Action (%1) failed:</strong><br/><pre>%2</pre> + <strong>-Toiminto (%1) epäonnistui:</strong><br/><pre>%2</pre> + + + diff -Nru lxqt-admin-1.3.0/lxqt-admin-user/usermanager.cpp lxqt-admin-1.4.0/lxqt-admin-user/usermanager.cpp --- lxqt-admin-1.3.0/lxqt-admin-user/usermanager.cpp 2023-04-15 16:24:52.000000000 +0000 +++ lxqt-admin-1.4.0/lxqt-admin-user/usermanager.cpp 2023-11-05 12:23:24.000000000 +0000 @@ -436,7 +436,12 @@ QByteArray line = file.readLine().trimmed(); if(line.isEmpty() || line.startsWith('#')) continue; - mAvailableShells.append(QString::fromLocal8Bit(line)); + QString shell = QString::fromLocal8Bit(line); + if (shell.endsWith(QLatin1String("/bash")) ) { + mAvailableShells.prepend(shell); + } else { + mAvailableShells.append(shell); + } } file.close(); } @@ -444,3 +449,4 @@ return mAvailableShells; } +