From f71380240d06d0e0cd7e743828fadb718b745fbc Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Tue, 18 Oct 2016 01:55:00 +0200 Subject: [PATCH] Cherry-picking new upstream version 0.11.0 * Synced debian foo with experimental * Bumped compat to 10 * Removed --parallel from rules, standard compat 10 * Bumped minimum version debhelper (>= 10) * Bumped minimum version liblxqt0-dev (>= 0.11.0) * Bumped minimum version libqt5xdg-dev (>= 2.0.0) * Added build dependency libqt5xdgiconloader-dev (>= 2.0.0) * Added build dependency libqt5svg5-dev * Removed build dependency liboobs-1-dev * Added recommends lxqt-admin-l10n * Added a lintian-override for lxqt-admin-user-helper * Exported LC_ALL=C.UTF-8 - define language settings for reproducible builds * Fixed VCS-Fields, use https * Bumped copyright years * Added hardening to rules * Added translation control to rules * Set CMAKE_BUILD_TYPE=RelWithDebInfo * Added README.md to docs --- .gitignore | 2 + AUTHORS | 2 +- CHANGELOG | 99 +++++ CMakeLists.txt | 6 - README.md | 67 +++ debian/.gitignore | 1 + debian/changelog | 25 ++ debian/compat | 2 +- debian/control | 16 +- debian/copyright | 6 +- debian/docs | 1 + debian/lintian-overrides | 1 + debian/rules | 12 +- debian/upstream/signing-key.asc | 107 +++-- debian/watch | 4 +- lxqt-admin-time.png | Bin 0 -> 48291 bytes lxqt-admin-time/CMakeLists.txt | 15 +- lxqt-admin-time/datetime.cpp | 66 ++- lxqt-admin-time/datetime.h | 28 +- lxqt-admin-time/datetime.ui | 71 +++- lxqt-admin-time/timeadmindialog.cpp | 118 +++--- lxqt-admin-time/timeadmindialog.h | 31 +- lxqt-admin-time/timedatectl.cpp | 112 +++++ lxqt-admin-time/timedatectl.h | 57 +++ lxqt-admin-time/timezone.cpp | 23 +- lxqt-admin-time/timezone.h | 10 +- lxqt-admin-time/timezone.ui | 16 - .../translations/lxqt-admin-time.ts | 78 ---- .../translations/lxqt-admin-time_ar.desktop | 4 + .../translations/lxqt-admin-time_ca.desktop | 3 + .../translations/lxqt-admin-time_de.ts | 79 ---- .../translations/lxqt-admin-time_el.ts | 78 ---- .../translations/lxqt-admin-time_hr.ts | 98 ----- .../translations/lxqt-admin-time_hu.ts | 98 ----- .../translations/lxqt-admin-time_it.ts | 100 ----- .../translations/lxqt-admin-time_ja.ts | 98 ----- .../translations/lxqt-admin-time_pl.ts | 98 ----- .../translations/lxqt-admin-time_pt.ts | 98 ----- .../translations/lxqt-admin-time_ru.ts | 83 ---- .../lxqt-admin-time_ru_RU.desktop | 6 - .../translations/lxqt-admin-time_ru_RU.ts | 83 ---- lxqt-admin-user.png | Bin 0 -> 45223 bytes lxqt-admin-user/CMakeLists.txt | 24 +- lxqt-admin-user/groupdialog.cpp | 107 ++--- lxqt-admin-user/groupdialog.h | 20 +- lxqt-admin-user/groupdialog.ui | 3 + lxqt-admin-user/lxqt-admin-user-helper | 13 + lxqt-admin-user/mainwindow.cpp | 257 ++++++------ lxqt-admin-user/mainwindow.h | 35 +- lxqt-admin-user/mainwindow.ui | 48 ++- .../org.lxqt.lxqt-admin-user.policy.in | 18 + .../translations/lxqt-admin-user.ts | 263 ------------ .../translations/lxqt-admin-user_ar.desktop | 4 + .../translations/lxqt-admin-user_ca.desktop | 3 + .../translations/lxqt-admin-user_de.ts | 263 ------------ .../translations/lxqt-admin-user_el.ts | 263 ------------ .../translations/lxqt-admin-user_hr.ts | 263 ------------ .../translations/lxqt-admin-user_hu.ts | 263 ------------ .../translations/lxqt-admin-user_it.ts | 264 ------------ .../translations/lxqt-admin-user_ja.ts | 263 ------------ .../translations/lxqt-admin-user_pl.ts | 263 ------------ .../translations/lxqt-admin-user_pt.ts | 263 ------------ .../translations/lxqt-admin-user_ru.ts | 263 ------------ .../lxqt-admin-user_ru_RU.desktop | 6 - .../translations/lxqt-admin-user_ru_RU.ts | 263 ------------ lxqt-admin-user/userdialog.cpp | 149 +++---- lxqt-admin-user/userdialog.h | 24 +- lxqt-admin-user/userdialog.ui | 80 ++-- lxqt-admin-user/usermanager.cpp | 393 ++++++++++++++++++ lxqt-admin-user/usermanager.h | 239 +++++++++++ lxqt-admin.kdev4 | 3 - 71 files changed, 1670 insertions(+), 4552 deletions(-) create mode 100644 CHANGELOG create mode 100644 README.md create mode 100644 lxqt-admin-time.png create mode 100644 lxqt-admin-time/timedatectl.cpp create mode 100644 lxqt-admin-time/timedatectl.h delete mode 100644 lxqt-admin-time/translations/lxqt-admin-time.ts create mode 100644 lxqt-admin-time/translations/lxqt-admin-time_ar.desktop create mode 100644 lxqt-admin-time/translations/lxqt-admin-time_ca.desktop delete mode 100644 lxqt-admin-time/translations/lxqt-admin-time_de.ts delete mode 100644 lxqt-admin-time/translations/lxqt-admin-time_el.ts delete mode 100644 lxqt-admin-time/translations/lxqt-admin-time_hr.ts delete mode 100644 lxqt-admin-time/translations/lxqt-admin-time_hu.ts delete mode 100644 lxqt-admin-time/translations/lxqt-admin-time_it.ts delete mode 100644 lxqt-admin-time/translations/lxqt-admin-time_ja.ts delete mode 100644 lxqt-admin-time/translations/lxqt-admin-time_pl.ts delete mode 100644 lxqt-admin-time/translations/lxqt-admin-time_pt.ts delete mode 100644 lxqt-admin-time/translations/lxqt-admin-time_ru.ts delete mode 100644 lxqt-admin-time/translations/lxqt-admin-time_ru_RU.desktop delete mode 100644 lxqt-admin-time/translations/lxqt-admin-time_ru_RU.ts create mode 100644 lxqt-admin-user.png create mode 100755 lxqt-admin-user/lxqt-admin-user-helper create mode 100644 lxqt-admin-user/org.lxqt.lxqt-admin-user.policy.in delete mode 100644 lxqt-admin-user/translations/lxqt-admin-user.ts create mode 100644 lxqt-admin-user/translations/lxqt-admin-user_ar.desktop create mode 100644 lxqt-admin-user/translations/lxqt-admin-user_ca.desktop delete mode 100644 lxqt-admin-user/translations/lxqt-admin-user_de.ts delete mode 100644 lxqt-admin-user/translations/lxqt-admin-user_el.ts delete mode 100644 lxqt-admin-user/translations/lxqt-admin-user_hr.ts delete mode 100644 lxqt-admin-user/translations/lxqt-admin-user_hu.ts delete mode 100644 lxqt-admin-user/translations/lxqt-admin-user_it.ts delete mode 100644 lxqt-admin-user/translations/lxqt-admin-user_ja.ts delete mode 100644 lxqt-admin-user/translations/lxqt-admin-user_pl.ts delete mode 100644 lxqt-admin-user/translations/lxqt-admin-user_pt.ts delete mode 100644 lxqt-admin-user/translations/lxqt-admin-user_ru.ts delete mode 100644 lxqt-admin-user/translations/lxqt-admin-user_ru_RU.desktop delete mode 100644 lxqt-admin-user/translations/lxqt-admin-user_ru_RU.ts create mode 100644 lxqt-admin-user/usermanager.cpp create mode 100644 lxqt-admin-user/usermanager.h delete mode 100644 lxqt-admin.kdev4 diff --git a/.gitignore b/.gitignore index 378eac2..3c23d28 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ build +lxqt-admin.kdev4 +*/translations/lxqt-admin diff --git a/AUTHORS b/AUTHORS index b633203..f200f7c 100644 --- a/AUTHORS +++ b/AUTHORS @@ -2,7 +2,7 @@ Upstream Authors: LXQt team: http://lxqt.org Copyright: - Copyright (c) 2014 LXQt team + Copyright (c) 2014-2016 LXQt team License: LGPL-2.1+ The full text of the licenses can be found in the 'COPYING' file. diff --git a/CHANGELOG b/CHANGELOG new file mode 100644 index 0000000..15f5264 --- /dev/null +++ b/CHANGELOG @@ -0,0 +1,99 @@ + +lxqt-admin-0.11.0 / 2016-09-24 +============================== + + * user: Add failure message box + * user: Provide icon name in polkit policy + * Update README.md + * Add Catalan translations + * Add copyright headers + * Add Arabic Translations for Desktop Files + * lxqt-admin-user: Fix a change password crash + * lxqt-admin-user: Makes the Refresh toolbar button visible + * lxqt-admin-time: Adjust dialog size on startup + * Update openSUSE section in README + * Update README.md + * Support NTP and Local RTC settings with timedated provided by systemd. Code cleanup. + * Replace calling timedatectl command with calling its dbus interface instead and provide proper error messages. + * Use dbus interface of timedate systemd daemon instead of timedatectl command. + * Add the ability to update group members. + * Support changing of user password. + * Show group members. + * Try to use a helper script and polkit policy configurations to do user admin. + * Remove liboobs dependency from lxqt-admin-time and use timedatectl to handle all time configurations. + * Try to handle timezones with timedatectl provided by systemd instead of liboobs. + * Add groupmod + * Try to remove liboobs dependency. + * Add README.md + * build: Use external translations + * ts-files removal (#32) + * Bump years to 2016 + * Don't track IDE settings + * Italian translation update + * Russian translations update Remove duplicated ru_RU translations + * updated: *_hu.ts + +0.10.0 / 2015-10-31 +=================== + + * Fix license file + * Add Greek (el) translation + * Rename LxQt to LXQt everywhere + * Removed invisible dialog titles. Updated template. Added german translation. + * Handles CMake policy CMP0063 + * Initialize in the same order of declaration in the class definition + * Use the LXQtCompilerSettings CMake module + * Updates the build system to use the Targets infrastructure + * Remove trailing whitespaces + * Create lxqt-admin-time_hr.ts + * Create lxqt-admin-user_hr.ts + * Hungarian translations added + * Create lxqt-admin-time_it.desktop + * Create lxqt-admin-user_it.desktop + * Initial Polish translation + * Create lxqt-admin-user_it.desktop + * lxqt-admin-user: set minimum default GID value for new group to 1000 + * Initial Polish translation + +0.9.0 / 2015-01-25 +================== + + * Create lxqt-admin-user_it.desktop + * Create lxqt-admin-user_it.ts + * Create lxqt-admin-time_it.ts + * Add Portuguese language + * Added Japanese translation + * Unify naming for a unique lxqt. No more suffixes + * Update Russian translation + * Updates translations sources + * Whole GUI of time/date setup has been rewritten from scratch the app has now style of LXQT config dialogs based on LxQt::ConfigDialog the time and date setting is divided into one configuration widget and timezone selection is divided into second config widget + * Add icon to config window + * Add .gitignore + * Make use of QApplication::exec() + * Use the new LxQt::SingleApplication + * CMakeLists.txt maintenance. + * Update translation a little more + * Add Russian translation + * updates Translations + * Updates the translations infrastructure + * Drop Qt4 support in CMakeLists.txt in subfolders + * Drop Qt4 support in code + * Clean up CMakeLists.txt and drop Qt 4 + +0.8.0 / 2014-06-21 +================== + + * simplify Qt version switching + * Support build with Qt5. + * Use new LXQt header files. + * Update copyright notice. + * Support changing group members. + * Support adding/removing/editing users and groups. + * Redesign the UI. + * Add a group configuration dialog. + * Improve user dialog. + * Add a user config dialog. + * Update time every seconds unless it's changed manually by the user. + * Add basic skeleton for lxqt-admin-user tool. + * Add a very basic time config tool, lxqt-admin-time. + * Initial commit. diff --git a/CMakeLists.txt b/CMakeLists.txt index cd1fcc7..eec38e0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,12 +11,6 @@ find_package(Qt5Widgets REQUIRED QUIET) find_package(lxqt REQUIRED QUIET) find_package(KF5WindowSystem REQUIRED QUIET) -find_package(PkgConfig) -pkg_check_modules(OOBS REQUIRED - glib-2.0 - liboobs-1 -) - include(LXQtCompilerSettings NO_POLICY_SCOPE) include(LXQtTranslate) diff --git a/README.md b/README.md new file mode 100644 index 0000000..ca9083b --- /dev/null +++ b/README.md @@ -0,0 +1,67 @@ +# lxqt-admin + +## Overview + +This repository is providing two GUI tools to adjust settings of the operating system LXQt is running on. + +Both are using [polkit](https://www.freedesktop.org/wiki/Software/polkit/) to handle permissions. +In contrast to the specific backends described below earlier versions of lxqt-admin were relying on [system-tools-backends](http://system-tools-backends.freedesktop.org) and their wrapper [liboobs](https://github.com/GNOME/liboobs). These were replaced as both go unmaintained for years and were hence dropped from many distributions heavily restricting the usage of lxqt-admin. As long as they can be built it should still be possible to compile lxqt-admin release ≤ 0.10 against them in order to make use of it on platforms lacking systemd like BSD. + +### Time and date configuration + +Adjusts time and date. Binary is `lxqt-admin-time`. + +![lxqt-admin-time](lxqt-admin-time.png) + +It is using `systemd-timedated` as backend which is accessed by its D-Bus interface. Among other this means the option +to sync the system time by NTP is relying on `systemd-timesyncd` as backend. + +### User and Group Settings + +Management of users and groups. Binary is `lxqt-admin-user`. + +![lxqt-admin-user](lxqt-admin-user.png) + +The backend is a script `lxqt-admin-user-helper`. By default it is in turn using the shadow tools to do the actual work. +The script can be modified to use different tools, though. + +## Installing + +### Compiling sources + +Runtime dependencies are polkit and [liblxqt](https://github.com/lxde/liblxqt). A polkit agent should be available with [lxqt-policykit](https://github.com/lxde/lxqt-policykit/) representing the first choice in LXQt. +Additional build dependencies are CMake and optionally Git to pull latest VCS checkouts. The localization files were outsourced to repository [lxqt-l10n](https://github.com/lxde/lxqt-l10n) so the corresponding dependencies are needed, too. Please refer to this repository's `README.md` for further information. + +Code configuration is handled by CMake. CMake variable `CMAKE_INSTALL_PREFIX` will normally have to be set to `/usr`. + +To build run `make`, to install `make install` which accepts variable `DESTDIR` as usual. + +### Binary packages + +#### Arch Linux + +[AUR](https://aur.archlinux.org) packages `lxqt-admin` and `lxqt-admin-git` are providing the current stable release and the +actual master checkout at compile time as usual. +Note that package `lxqt-admin` had to be kept in the AUR due to lack of the dependency liboobs as depicted [above](#overview). +So it will be transferred to community as of release 0.11. + +#### Debian + +Package `lxqt-admin` is available in the official repositories as of Debian stretch. + +#### Fedora + +Fedora doesn't provide lxqt-admin so far due to lack of the dependency liboobs as depicted [above](#overview). This will hopefully change +once release LXQt release 0.11 makes it into the Fedora repositories. + +#### openSUSE + +openSUSE does not ship with lxqt-admin in it's standard repositories since the functionality is covered by openSUSE's [YaST](http://yast.github.io/). +However it is still possible to install it on openSUSE. The package and its dependencies, like the [above](#overview) mentioned, outdated liboobs are available through the [X11:LXQt](https://build.opensuse.org/project/show/X11:LXQt) repository. + +## Usage + +Much like similar tools provided by [lxqt-config](https://github.com/lxde/lxqt-config) the tools of lxqt-admin can be launched from the [Configuration Center](https://github.com/lxde/lxqt-config#configuration-center) as well as from the panel's main menu - Preferences - LXQt settings. + +The actual usage should be self-explanatory. To apply settings the GUI of the polkit authentication agent that's in use is +launched to acquire the root password. diff --git a/debian/.gitignore b/debian/.gitignore index 9a4da58..dd3db13 100644 --- a/debian/.gitignore +++ b/debian/.gitignore @@ -1,6 +1,7 @@ /*.debhelper /*.log /*.substvars +/debhelper-build-stamp /files /lxqt-admin/ diff --git a/debian/changelog b/debian/changelog index 5e4ff3d..f99e014 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,28 @@ +lxqt-admin (0.11.0-2) unstable; urgency=medium + + * Cherry-picking new upstream version 0.11.0 + * Synced debian foo with experimental + * Bumped compat to 10 + * Removed --parallel from rules, standard compat 10 + * Bumped minimum version debhelper (>= 10) + * Bumped minimum version liblxqt0-dev (>= 0.11.0) + * Bumped minimum version libqt5xdg-dev (>= 2.0.0) + * Added build dependency libqt5xdgiconloader-dev (>= 2.0.0) + * Added build dependency libqt5svg5-dev + * Removed build dependency liboobs-1-dev + * Added recommends lxqt-admin-l10n + * Added a lintian-override for lxqt-admin-user-helper + * Exported LC_ALL=C.UTF-8 - define language settings for reproducible + builds + * Fixed VCS-Fields, use https + * Bumped copyright years + * Added hardening to rules + * Added translation control to rules + * Set CMAKE_BUILD_TYPE=RelWithDebInfo + * Added README.md to docs + + -- Alf Gaida Tue, 18 Oct 2016 01:54:42 +0200 + lxqt-admin (0.10.0-3) unstable; urgency=medium * Remove dbg package in favor of dbgsym. diff --git a/debian/compat b/debian/compat index ec63514..f599e28 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/control b/debian/control index 99f49fb..e14ff61 100644 --- a/debian/control +++ b/debian/control @@ -5,26 +5,28 @@ Uploaders: Alf Gaida , Andrew Lee (李健秋) Section: x11 Priority: optional -Build-Depends: debhelper (>= 9), +Build-Depends: debhelper (>= 10), cmake (>= 3.0.2), - liboobs-1-dev, libkf5windowsystem-dev, - liblxqt0-dev (>= 0.10.0), + liblxqt0-dev (>= 0.11.0), + libqt5svg5-dev, libqt5x11extras5-dev, - libqt5xdg-dev (>= 1.3.0), + libqt5xdg-dev (>= 2.0.0), + libqt5xdgiconloader-dev (>= 2.0.0), libx11-dev, pkg-config, qttools5-dev, qttools5-dev-tools -Standards-Version: 3.9.6 -Vcs-Browser: http://anonscm.debian.org/cgit/pkg-lxqt/lxqt-admin.git/?h=debian/sid -Vcs-Git: git://anonscm.debian.org/pkg-lxqt/lxqt-admin.git -b debian/sid +Standards-Version: 3.9.8 +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/lxqt-admin.git/?h=debian/sid +Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/lxqt-admin.git -b debian/sid Homepage: https://github.com/lxde/lxqt-admin Package: lxqt-admin Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} +Recommends: lxqt-admin-l10n Description: Admin tools for LXQt Admin tools for LXQt, as of now: * lxqt-admin-time diff --git a/debian/copyright b/debian/copyright index 22d4d2d..eb0eb7b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,14 +1,14 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: lxqt-admin Source: https://github.com/lxde/lxqt-admin Files: * -Copyright: 2014-2015 LXQt team +Copyright: 2014-2016 LXQt team 2014 Hong Jen Yee (PCMan) License: LGPL-2.1+ Files: debian/* -Copyright: 2014-2015 Alf Gaida +Copyright: 2014-2016 Alf Gaida 2015 Andrew Lee (李健秋) License: LGPL-2.1+ diff --git a/debian/docs b/debian/docs index 62deb04..9a30530 100644 --- a/debian/docs +++ b/debian/docs @@ -1 +1,2 @@ AUTHORS +README.md \ No newline at end of file diff --git a/debian/lintian-overrides b/debian/lintian-overrides index 0fddfc3..04bbfe7 100644 --- a/debian/lintian-overrides +++ b/debian/lintian-overrides @@ -1,6 +1,7 @@ # there will be no manual for a foreseable time lxqt-admin: binary-without-manpage usr/bin/lxqt-admin-time lxqt-admin: binary-without-manpage usr/bin/lxqt-admin-user +lxqt-admin: binary-without-manpage usr/bin/lxqt-admin-user-helper # the category is right, but not in freedesktop right now lxqt-admin: desktop-entry-invalid-category LXQt usr/share/applications/lxqt-admin-time.desktop diff --git a/debian/rules b/debian/rules index c250dd7..9dbedc2 100755 --- a/debian/rules +++ b/debian/rules @@ -1,9 +1,15 @@ #!/usr/bin/make -f -#export DH_VERBOSE=1 +# export DH_VERBOSE=1 +export LC_ALL=C.UTF-8 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed +export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: - dh ${@} --buildsystem cmake \ - --parallel + dh ${@} --buildsystem cmake +override_dh_auto_configure: + dh_auto_configure -- \ + -DPULL_TRANSLATIONS=OFF\ + -DUPDATE_TRANSLATIONS=OFF\ + -DCMAKE_BUILD_TYPE=RelWithDebInfo diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc index 05cd1df..4936633 100644 --- a/debian/upstream/signing-key.asc +++ b/debian/upstream/signing-key.asc @@ -1,63 +1,50 @@ -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v2.0.22 (GNU/Linux) -mQINBFJevCYBEACx+Hvy+Vsuf+V5jeLUnzjAmHoy8DfTeGWr3ts30IapLHrfi0+U -WpzNnISO77yTr4VNboVZH+GHM/rnPfieODfB4ZW6CZLlInMSKUXcgQsEqXpyBZhA -Ib/SPy2bOfHly1uRJes0uRDsH5+v/hD74sByfnjQlrvI68O6wvGZmDFMNNPVO8+/ -OWBSBNkBuVrrZOMSPsLwQGJ4UtUQ4whburaPJG4VZJc5DLbzJGbEuACc0IAEYJS3 -7AfXVXn4j4Gc9F3o1xTUnbOBnwGPquWwUIm3FM7Ec2OdkvMt3EwvnkMAfeVrq3iE -FDD/KZTxdL0BZH3QD8gB7Jm4v4f3Nkobg6JCvCbcH3wBdZW4mASbwWzfRaDC2zHb -ErTglD7PpShLKZZ0pr9okWZEGw4Ku3q8ALi1JXK/ePTmsBlvkVskOJ3Nnd0avgH4 -+Q/vZoKfH8EhNY745rI+8CE9iv6V9XiSUt4CKEWAENt4A8hq6U2vV+jZv3B6AgD7 -ZjiI59yD4YuYubu8rCnNizTgh1voVw3ietknn/x2H5yH8fByWZ5uL87C0ky/uma6 -ZGbiiAtM4kdkyDMrfRV5nlEG9EKAGPVu5mjeSCrfkETwZ9OFPz1AuDye4ZEXrrcC -iRQ7RX6/GtW18aHER0kzGnfwx5KJzkDrRBY8A2PdXLBcrsN4WpK9EX01PQARAQAB -tCNKZXJvbWUgTGVjbGFuY2hlIDxqZXJvbWVAbGVjbGFuLmNoPokCPwQTAQIAKQUC -Ul68JgIbAwUJAeEzgAcLCQgHAwIBBhUIAgkKCwQWAgMBAh4BAheAAAoJEDfgrx/a -SPNzSHIP/1ewXcC0TFBcvDD7MrIP7anyNfiWfW7cxkR8GSamkg6HTa6Ndyr1FFjJ -OoDFUP37jWhu59CsHxs2D0zRWJktezfvElscRgqbHcdpIznqsGdI8hXCZafhBGVb -sdAB2LRawcXGxnXt7XajPcSVwLWRE62caBqohznU2iWvI780WNjEbZoA0LhZwaFF -UUPJm8ea9v0IkZVKUyg9WONZ1U7FEG9SaEiSpI8kJdx1fvCwZVDV/NRO5GqnJaho -P1LCne4YdwS6pt1/fRgk32IHxxZfHlLzLHxb6v1JmIg72x28qCmGyK9oFBDbbnYu -6Aq8XbHogOrD5vJM2Pfm2IhV0+JHOjfQbddv8tsAH1M+LI+tToXmg5st1AU3wnTn -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 -=fF8P +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 +=h7ww -----END PGP PUBLIC KEY BLOCK----- diff --git a/debian/watch b/debian/watch index 4b09067..14dc696 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ -version=3 +version=4 opts="pgpsigurlmangle=s/$/.asc/" \ - https://github.com/lxde/lxqt-admin/releases .*/([\d\.]+).tar.gz + https://github.com/lxde/lxqt-admin/releases .*/lxqt-admin-([\d\.]+).tar.xz diff --git a/lxqt-admin-time.png b/lxqt-admin-time.png new file mode 100644 index 0000000000000000000000000000000000000000..b3e3a85e72cec6dc49e9fe0bfa532f25d40ce1cb GIT binary patch literal 48291 zcmXtA1yodByFR2Nf{r@C&>$_{DV?7J4vlnocQ?Y2lF}(DT>>J~A_CIVD&5l3cl)n( z$3+cHoW0-u#uG-pRF)^eBgKOth(J+6MiqiEGQh_x7$&%+TtemxYgQt8aNlp#N~0ng%BgO{WnjL_tB3 z-N9B4ZeNl35x)EF)2l9$FpNH^D=FF}=Ajfqwo~m|Ltb8f{fQK6;tj2QljG8`Q4Ga> zc}2y$QVJ-IICJX^2LttSUP-vBni>lWOK4|am6fota2f*MB|!~AdG`Fe78VxL($dpa z`Xws42CAyRodmlw!nxw&;xagYead;}Yn|b-@tp=;aJ(gwbfJNeMaaTvl*Wi)b*zTR+wYFj-k7(P zl||7wFoxCS<^8nMIsa~3tzYAmU%(_YijW-`8X6iHIA2LxwVitZ5F3N0XnNsp#NGf= zMFEq*qSrFk15r-P;jEMG>D>LcgJh!^J|*3cUe0=Y^F2|Ix3{*GYufH=8F;UbtB7A; zY**hNkE;a!!Fnh~yv868BOv9q`u3I!g+hgghaVgqn46n(bX?Vym#^z}eF>L_m6iJ( z4GE}Z2|Azd%#iWhePEh?zHY}(KT02=rwj!ZlykHTR_M3IE%(P8)|!O(FJnMReBAn( z-)=1;Yi{$6wv2rrYHJnG1iB*&{*DCRxc>Rs$!ND!W89s=XFFA?tA#>IQc@sfjbpg_ zjNPgKleByCD4Whl5SzkE8fJeK&SFw?Zz>gxvGC7e>qxb$eGlw%qt9(mX?B8I20AP zonl2H+B|k=CnjV9l>Z(xp~rY*3z)#h6sGy5eY8XtpXYR+NDrr9vBx-DSgesbeyp_| z$=Mt)k%q;S3qAT|u(G|<_RCi0nAdJ4k#?*3vyk@&KXI{I6Vq5}mq%-PIj_>|>nNu= zi!W^X)}-OJ)G&H_S=Q%EKHHUpX&jC=HvcIpIs4ArPFGQgdKvAD`3Kx=GAfN9S0E#b zH>*2te3m}>llL#UPwUsQ2Hu>n2TSCYm;aYo^!4k19ZMreS3?3zda9~VU{ZQ|dWwpQ zva+(dV*bd8nR-hV9UYQx&hqlpjZs=QHUd+@TO|otb*~?Wv4n z3PGp5nwpyPvc%%l)YPd@{=S(*YX@FU_H*Dfb(of(v#g6t9i8Iq`xIXX2Sefak(|^* zLPFx=9pK@(p~iDf_OY?C(y#A>&ji?*%*@Pisrdf!A3qe1>Dk$-fi@PS?@Z_k3w{9fns^6B7;K?I%^5#yFdpn1CG>zrAur zA@)Bk$6a5Zr6ngPTs#m@N&izH=@)DK7VFO8L%F09(Z8LS&)eJw-COlKC5%=}a*4>9 zjxYU6?sZ;`ylU}1+gqr&j32f7xZ5;`8T{FE$$#BVm`|w<{K%k`!Rvc!7vIn0FfUj= zt*fCiS*%2sHn{30thoR6=K3->@W%Uf_rc%g__OWl>iqoR;>}ElR_oCMS#YXhgJH$i zyR(hpTWuw!*aZhF9*b{iLKd;}mB%p$e-D<;brwN%feQi4u;5@=XEwkyBFba+of?Ix z{_qq@$k4Dl+o�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 #include -DateTime::DateTime(QWidget *parent) : +DateTimePage::DateTimePage(bool useNtp, bool localRtc, QWidget *parent) : QWidget(parent), - ui(new Ui::DateTime) + ui(new Ui::DateTime), + mUseNtp(useNtp), + mLocalRtc(localRtc) { ui->setupUi(this); mTimer = new QTimer(this); connect(mTimer,SIGNAL(timeout()),SLOT(timeout())); - //highlight today QDate date = QDate::currentDate(); QTextCharFormat format = ui->calendar->dateTextFormat(date); @@ -51,43 +52,56 @@ DateTime::DateTime(QWidget *parent) : reload(); } -DateTime::~DateTime() +DateTimePage::~DateTimePage() { delete ui; } -void DateTime::timeout() +void DateTimePage::timeout() { ui->edit_time->blockSignals(true); ui->edit_time->setTime(QTime::currentTime()); ui->edit_time->blockSignals(false); } -void DateTime::reload() +void DateTimePage::reload() { ui->calendar->setSelectedDate(QDate::currentDate()); ui->edit_time->setTime(QTime::currentTime()); + + ui->localRTC->setChecked(mLocalRtc); + ui->ntp->setChecked(mUseNtp); + mTimer->start(1000); mModified = 0; - emit changed(mModified); + emit changed(); } -void DateTime::on_edit_time_userTimeChanged(const QTime &time) +void DateTimePage::on_edit_time_userTimeChanged(const QTime &time) { mModified |= M_TIME; mTimer->stop(); - - emit changed(mModified); + emit changed(); } -QDateTime DateTime::dateTime() const +QDateTime DateTimePage::dateTime() const { QDateTime dt(ui->calendar->selectedDate(),ui->edit_time->time()); return dt; } -void DateTime::on_calendar_selectionChanged() +bool DateTimePage::useNtp() const +{ + return ui->ntp->isChecked(); +} + +bool DateTimePage::localRtc() const +{ + return ui->localRTC->isChecked(); +} + +void DateTimePage::on_calendar_selectionChanged() { QDate date = ui->calendar->selectedDate(); if (date != QDate::currentDate()) @@ -98,6 +112,32 @@ void DateTime::on_calendar_selectionChanged() { mModified &= ~M_DATE; } + emit changed(); +} + +void DateTimePage::on_ntp_toggled(bool toggled) +{ + if(toggled != mUseNtp) + { + mModified |= M_NTP; + } + else + { + mModified &= ~M_NTP; + } + emit changed(); +} - emit changed(mModified); +void DateTimePage::on_localRTC_toggled(bool toggled) +{ + if(toggled != mLocalRtc) + { + mModified |= M_LOCAL_RTC; + } + else + { + mModified &= ~M_LOCAL_RTC; + } + emit changed(); } + diff --git a/lxqt-admin-time/datetime.h b/lxqt-admin-time/datetime.h index 2913cda..81f39c3 100644 --- a/lxqt-admin-time/datetime.h +++ b/lxqt-admin-time/datetime.h @@ -34,38 +34,46 @@ namespace Ui { class DateTime; } -class DateTime : public QWidget +class DateTimePage : public QWidget { Q_OBJECT public: - explicit DateTime(QWidget *parent = 0); - ~DateTime(); + explicit DateTimePage(bool useNtp, bool localRtc, QWidget *parent = 0); + ~DateTimePage(); - enum modified_enum {M_DATE = 0x1, M_TIME = 0x2}; - Q_DECLARE_FLAGS(modified_t, modified_enum) + enum ModifiedFlag {M_DATE = (1 << 0), M_TIME = (1 << 1), M_NTP = (1 << 2), M_LOCAL_RTC = (1 << 3)}; + Q_DECLARE_FLAGS(ModifiedFlags,ModifiedFlag) + + ModifiedFlags modified() const + { + return mModified; + } QDateTime dateTime() const; - inline modified_t modified() const {return mModified;} + bool useNtp() const; + bool localRtc() const; public Q_SLOTS: void reload(); - private Q_SLOTS: void on_edit_time_userTimeChanged(const QTime &time); void timeout(); void on_calendar_selectionChanged(); + void on_ntp_toggled(bool toggled); + void on_localRTC_toggled(bool toggled); Q_SIGNALS: - void changed(bool); + void changed(); private: Ui::DateTime *ui; QTimer * mTimer; - modified_t mModified; + bool mUseNtp; + bool mLocalRtc; + ModifiedFlags mModified; }; -Q_DECLARE_OPERATORS_FOR_FLAGS(DateTime::modified_t) #endif // DATETIME_H diff --git a/lxqt-admin-time/datetime.ui b/lxqt-admin-time/datetime.ui index 781d761..c74fa3f 100644 --- a/lxqt-admin-time/datetime.ui +++ b/lxqt-admin-time/datetime.ui @@ -6,8 +6,8 @@ 0 0 - 354 - 308 + 365 + 323 @@ -16,7 +16,7 @@ 50 - + @@ -64,6 +64,20 @@ + + + + Enable network time synchronization (NTP) + + + + + + + RTC is in local time + + + @@ -77,24 +91,41 @@ - - - - - 75 - true - - - - <html><head/><body><p>Saving changes requires admin permissions.<br>You will be requested after clicking close button</p></body></html> - - - true - - - - + + + ntp + toggled(bool) + calendar + setDisabled(bool) + + + 221 + 269 + + + 228 + 162 + + + + + ntp + toggled(bool) + edit_time + setDisabled(bool) + + + 105 + 260 + + + 173 + 55 + + + + diff --git a/lxqt-admin-time/timeadmindialog.cpp b/lxqt-admin-time/timeadmindialog.cpp index e5d319d..af4f21d 100644 --- a/lxqt-admin-time/timeadmindialog.cpp +++ b/lxqt-admin-time/timeadmindialog.cpp @@ -31,82 +31,59 @@ #include #include #include +#include #include "datetime.h" #include "timezone.h" - #define ZONETAB_PATH "/usr/share/zoneinfo/zone.tab" TimeAdminDialog::TimeAdminDialog(QWidget *parent): - LXQt::ConfigDialog(tr("Time and date configuration"),new LXQt::Settings("TimeDate"), parent), - mTimeConfig(OOBS_TIME_CONFIG(oobs_time_config_get())), - mUserLogedIn(false) + LXQt::ConfigDialog(tr("Time and date configuration"),new LXQt::Settings("TimeDate"), parent) { - oobs_object_update(OOBS_OBJECT(mTimeConfig)); - setMinimumSize(QSize(400,400)); mWindowTitle = windowTitle(); - - mDateTimeWidget = new DateTime(this); + mDateTimeWidget = new DateTimePage(mTimeDateCtl.useNtp(), mTimeDateCtl.localRtc(), this); addPage(mDateTimeWidget,tr("Date and time")); connect(this,SIGNAL(reset()),mDateTimeWidget,SLOT(reload())); - connect(mDateTimeWidget,&DateTime::changed,this,&TimeAdminDialog::onChanged); - mDateTimeWidget->setProperty("pModified",M_TIMEDATE); + connect(mDateTimeWidget,&DateTimePage::changed,this,&TimeAdminDialog::onChanged); QStringList zones; QString currentZone; loadTimeZones(zones,currentZone); - mTimezoneWidget = new Timezone(zones,currentZone,this); + mTimezoneWidget = new TimezonePage(zones,currentZone,this); addPage(mTimezoneWidget,tr("Timezone")); - connect(this,&TimeAdminDialog::reset,mTimezoneWidget,&Timezone::reload); - connect(mTimezoneWidget,&Timezone::changed,this,&TimeAdminDialog::onChanged); - mTimezoneWidget->setProperty("pModified",M_TIMEZONE); + connect(this,&TimeAdminDialog::reset,mTimezoneWidget,&TimezonePage::reload); + connect(mTimezoneWidget,&TimezonePage::changed,this,&TimeAdminDialog::onChanged); + + setButtons(QDialogButtonBox::Ok|QDialogButtonBox::Cancel); + connect(this, &LXQt::ConfigDialog::clicked, this, &TimeAdminDialog::onButtonClicked); + adjustSize(); } TimeAdminDialog::~TimeAdminDialog() { - if(mTimeConfig) - g_object_unref(mTimeConfig); } -void TimeAdminDialog::onChanged(bool ch) +void TimeAdminDialog::onChanged() { - widgets_modified_enum flag = (widgets_modified_enum) - sender()->property("pModified").toUInt(); - ch ? mWidgetsModified |= flag : mWidgetsModified &= ~flag; showChangedStar(); } void TimeAdminDialog::showChangedStar() { - if (mWidgetsModified) + if(mTimezoneWidget->isChanged() || mDateTimeWidget->modified()) setWindowTitle(mWindowTitle + "*"); else setWindowTitle(mWindowTitle); } -void TimeAdminDialog::closeEvent(QCloseEvent *event) -{ - //save changes to system - if (mWidgetsModified) - { - if (logInUser()) - { - saveChangesToSystem(); - event->accept(); - } - else - { - event->ignore(); - } - } -} - void TimeAdminDialog::loadTimeZones(QStringList & timeZones, QString & currentTimezone) { + currentTimezone = mTimeDateCtl.timeZone(); + timeZones.clear(); QFile file(ZONETAB_PATH); if(file.open(QIODevice::ReadOnly)) @@ -124,44 +101,61 @@ void TimeAdminDialog::loadTimeZones(QStringList & timeZones, QString & currentTi } file.close(); } - currentTimezone = QString::fromLatin1(oobs_time_config_get_timezone(mTimeConfig)); } void TimeAdminDialog::saveChangesToSystem() { - QByteArray timeZone = mTimezoneWidget->timezone().toLatin1(); - // FIXME: currently timezone settings does not work. is this a bug of system-tools-backend? - if(!timeZone.isEmpty() && mWidgetsModified.testFlag(M_TIMEZONE)) - oobs_time_config_set_timezone(mTimeConfig, timeZone.constData()); + QString errorMessage; + if(mTimezoneWidget->isChanged()) + { + QString timeZone = mTimezoneWidget->timezone(); + if(!timeZone.isEmpty()) + { + if(false == mTimeDateCtl.setTimeZone(timeZone, errorMessage)) { + QMessageBox::critical(this, tr("Error"), errorMessage); + } + } + } + + auto modified = mDateTimeWidget->modified(); + bool useNtp = mDateTimeWidget->useNtp(); + if(modified.testFlag(DateTimePage::M_NTP)) + { + if(false == mTimeDateCtl.setUseNtp(useNtp, errorMessage)) { + QMessageBox::critical(this, tr("Error"), errorMessage); + } + } - if(mWidgetsModified.testFlag(M_TIMEDATE)) + if(modified.testFlag(DateTimePage::M_LOCAL_RTC)) { - QDate d = mDateTimeWidget->dateTime().date(); - QTime t = mDateTimeWidget->dateTime().time(); - // oobs seems to use 0 based month - oobs_time_config_set_time(mTimeConfig, d.year(), d.month() - 1, d.day(), t.hour(), t.minute(), t.second()); + if(false == mTimeDateCtl.setLocalRtc(mDateTimeWidget->localRtc(), errorMessage)) { + QMessageBox::critical(this, tr("Error"), errorMessage); + } + } + + // we can only change the date & time explicitly when NTP is disabled. + if(false == useNtp) + { + if(modified.testFlag(DateTimePage::M_DATE) || modified.testFlag(DateTimePage::M_TIME)) + { + if(false == mTimeDateCtl.setDateTime(mDateTimeWidget->dateTime(), errorMessage)) { + QMessageBox::critical(this, tr("Error"), errorMessage); + } + } } - oobs_object_commit(OOBS_OBJECT(mTimeConfig)); } -bool TimeAdminDialog::logInUser() +void TimeAdminDialog::onButtonClicked(QDialogButtonBox::StandardButton button) { - if (mUserLogedIn) - return true; - - GError* err = NULL; - if(oobs_object_authenticate(OOBS_OBJECT(mTimeConfig), &err)) + if(button == QDialogButtonBox::Ok) { - mUserLogedIn = true; - return true; + saveChangesToSystem(); + accept(); } - else if(err) + else if(button == QDialogButtonBox::Cancel) { - QMessageBox::critical(this, tr("Authentication Error"), QString::fromUtf8(err->message)); - g_error_free(err); + reject(); } - - return false; } diff --git a/lxqt-admin-time/timeadmindialog.h b/lxqt-admin-time/timeadmindialog.h index 2b0c2f5..a71d828 100644 --- a/lxqt-admin-time/timeadmindialog.h +++ b/lxqt-admin-time/timeadmindialog.h @@ -26,13 +26,10 @@ * END_COMMON_COPYRIGHT_HEADER */ #include -#include -#include -#include -#include +#include "timedatectl.h" -class DateTime; -class Timezone; +class DateTimePage; +class TimezonePage; class TimeAdminDialog: public LXQt::ConfigDialog { @@ -42,30 +39,18 @@ public: TimeAdminDialog(QWidget * parent = NULL) ; ~TimeAdminDialog(); - - typedef enum {M_TIMEDATE = 1 , M_TIMEZONE = 0x2} widgets_modified_enum; - Q_DECLARE_FLAGS(widgets_modified_t, widgets_modified_enum) - -protected: - virtual void closeEvent(QCloseEvent * event); - private Q_SLOTS: - void onChanged(bool); + void onChanged(); + void onButtonClicked(QDialogButtonBox::StandardButton button); private: - bool logInUser(); void saveChangesToSystem(); void loadTimeZones(QStringList & timeZones, QString & currentTimezone); void showChangedStar(); private: - OobsTimeConfig* mTimeConfig; - DateTime * mDateTimeWidget; - Timezone * mTimezoneWidget; - bool mUserLogedIn; + TimeDateCtl mTimeDateCtl; + DateTimePage * mDateTimeWidget; + TimezonePage * mTimezoneWidget; QString mWindowTitle; - widgets_modified_t mWidgetsModified; }; - -Q_DECLARE_METATYPE(TimeAdminDialog::widgets_modified_enum) -Q_DECLARE_OPERATORS_FOR_FLAGS(TimeAdminDialog::widgets_modified_t) diff --git a/lxqt-admin-time/timedatectl.cpp b/lxqt-admin-time/timedatectl.cpp new file mode 100644 index 0000000..adb8ff6 --- /dev/null +++ b/lxqt-admin-time/timedatectl.cpp @@ -0,0 +1,112 @@ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * (c)LGPL2+ + * + * LXQt - a lightweight, Qt based, desktop toolset + * http://lxqt.org + * + * Copyright: 2016 LXQt team + * Authors: + * Hong Jen Yee (PCMan) + * + * This program or library is free software; you can redistribute it + * and/or modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA + * + * END_COMMON_COPYRIGHT_HEADER */ + +#include "timedatectl.h" +#include +#include +#include +#include +#include + + +TimeDateCtl::TimeDateCtl() +{ + mIface = new QDBusInterface(QStringLiteral("org.freedesktop.timedate1"), + QStringLiteral("/org/freedesktop/timedate1"), + QStringLiteral("org.freedesktop.timedate1"), + QDBusConnection::systemBus()); +} + +TimeDateCtl::~TimeDateCtl() +{ + delete mIface; +} + +QString TimeDateCtl::timeZone() const +{ + return mIface->property("Timezone").toString(); +} + +bool TimeDateCtl::setTimeZone(QString timeZone, QString& errorMessage) +{ + mIface->call("SetTimezone", timeZone, true); + QDBusError err = mIface->lastError(); + if(err.isValid()) + { + errorMessage = err.message(); + return false; + } + return true; +} + +bool TimeDateCtl::setDateTime(QDateTime dateTime, QString& errorMessage) +{ + // the timedatectl dbus service accepts "usec" input. + // Qt can only get "msec" => convert to usec here. + mIface->call("SetTime", dateTime.toMSecsSinceEpoch() * 1000, false, true); + QDBusError err = mIface->lastError(); + if(err.isValid()) + { + errorMessage = err.message(); + return false; + } + return true; +} + +bool TimeDateCtl::useNtp() const +{ + return mIface->property("NTP").toBool(); +} + +bool TimeDateCtl::setUseNtp(bool value, QString& errorMessage) +{ + mIface->call("SetNTP", value, true); + QDBusError err = mIface->lastError(); + if(err.isValid()) + { + errorMessage = err.message(); + return false; + } + return true; +} + +bool TimeDateCtl::localRtc() const +{ + return mIface->property("LocalRTC").toBool(); +} + +bool TimeDateCtl::setLocalRtc(bool value, QString& errorMessage) +{ + mIface->call("SetLocalRTC", value, false, true); + QDBusError err = mIface->lastError(); + if(err.isValid()) + { + errorMessage = err.message(); + return false; + } + return true; +} diff --git a/lxqt-admin-time/timedatectl.h b/lxqt-admin-time/timedatectl.h new file mode 100644 index 0000000..2c25e88 --- /dev/null +++ b/lxqt-admin-time/timedatectl.h @@ -0,0 +1,57 @@ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * (c)LGPL2+ + * + * LXQt - a lightweight, Qt based, desktop toolset + * http://lxqt.org + * + * Copyright: 2016 LXQt team + * Authors: + * Hong Jen Yee (PCMan) + * + * This program or library is free software; you can redistribute it + * and/or modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA + * + * END_COMMON_COPYRIGHT_HEADER */ + +#ifndef TIMEDATECTL_H +#define TIMEDATECTL_H + +#include +#include + +class QDBusInterface; + +class TimeDateCtl +{ +public: + explicit TimeDateCtl(); + ~TimeDateCtl(); + + bool useNtp() const; + bool setUseNtp(bool value, QString& errorMessage); + + bool localRtc() const; + bool setLocalRtc(bool value, QString& errorMessage); + + QString timeZone() const; + bool setTimeZone(QString timeZone, QString& errorMessage); + + bool setDateTime(QDateTime dateTime, QString& errorMessage); + +private: + QDBusInterface* mIface; +}; + +#endif // TIMEDATECTL_H diff --git a/lxqt-admin-time/timezone.cpp b/lxqt-admin-time/timezone.cpp index 2be3778..d6c90c7 100644 --- a/lxqt-admin-time/timezone.cpp +++ b/lxqt-admin-time/timezone.cpp @@ -28,7 +28,7 @@ #include "timezone.h" #include "ui_timezone.h" -Timezone::Timezone(const QStringList & zones, const QString & currentimezone, QWidget *parent) : +TimezonePage::TimezonePage(const QStringList & zones, const QString & currentimezone, QWidget *parent) : QWidget(parent), ui(new Ui::Timezone), mZoneChanged(false), @@ -47,12 +47,12 @@ Timezone::Timezone(const QStringList & zones, const QString & currentimezone, QW reload(); } -Timezone::~Timezone() +TimezonePage::~TimezonePage() { delete ui; } -void Timezone::reload() +void TimezonePage::reload() { ui->list_zones->setCurrentRow(-1); mZoneChanged = false; @@ -60,10 +60,10 @@ void Timezone::reload() if (list.count()) ui->list_zones->setCurrentItem(list.at(0)); - emit changed(mZoneChanged); + emit changed(); } -QString Timezone::timezone() const +QString TimezonePage::timezone() const { if (ui->list_zones->currentItem()) return ui->list_zones->currentItem()->text(); @@ -71,16 +71,17 @@ QString Timezone::timezone() const return QString(); } -void Timezone::on_list_zones_itemActivated(QListWidgetItem * item) +void TimezonePage::on_list_zones_itemSelectionChanged() { - bool old = mZoneChanged; + QList selected = ui->list_zones->selectedItems(); + if(selected.empty()) + return; + QListWidgetItem *item = selected.first(); mZoneChanged = item->text() != ui->label_timezone->text(); - - if (mZoneChanged != old) - emit changed(mZoneChanged); + emit changed(); } -void Timezone::on_edit_filter_textChanged(const QString &arg1) +void TimezonePage::on_edit_filter_textChanged(const QString &arg1) { QRegExp reg(arg1, Qt::CaseInsensitive,QRegExp::Wildcard); ui->list_zones->clear(); diff --git a/lxqt-admin-time/timezone.h b/lxqt-admin-time/timezone.h index 072ecb6..8565b5d 100644 --- a/lxqt-admin-time/timezone.h +++ b/lxqt-admin-time/timezone.h @@ -35,13 +35,13 @@ class Timezone; } class QListWidgetItem; -class Timezone : public QWidget +class TimezonePage : public QWidget { Q_OBJECT public: - explicit Timezone(const QStringList & zones, const QString & currentimezone, QWidget *parent = 0); - ~Timezone(); + explicit TimezonePage(const QStringList & zones, const QString & currentimezone, QWidget *parent = 0); + ~TimezonePage(); QString timezone() const; inline bool isChanged() const {return mZoneChanged;} @@ -49,10 +49,10 @@ public slots: void reload(); Q_SIGNALS: - void changed(bool); + void changed(); private slots: - void on_list_zones_itemActivated(QListWidgetItem *item); + void on_list_zones_itemSelectionChanged(); void on_edit_filter_textChanged(const QString &arg1); private: diff --git a/lxqt-admin-time/timezone.ui b/lxqt-admin-time/timezone.ui index 21000fc..960735d 100644 --- a/lxqt-admin-time/timezone.ui +++ b/lxqt-admin-time/timezone.ui @@ -42,22 +42,6 @@ - - - - - 75 - true - - - - <html><head/><body><p>Saving changes requires admin permissions.<br>You will be requested after clicking close button</p></body></html> - - - true - - - diff --git a/lxqt-admin-time/translations/lxqt-admin-time.ts b/lxqt-admin-time/translations/lxqt-admin-time.ts deleted file mode 100644 index e5617de..0000000 --- a/lxqt-admin-time/translations/lxqt-admin-time.ts +++ /dev/null @@ -1,78 +0,0 @@ - - - - - DateTime - - - Time: - - - - - HH:mm:ss - - - - - Date: - - - - - <html><head/><body><p>Saving changes requires admin permissions.<br>You will be requested after clicking close button</p></body></html> - - - - - TimeAdminDialog - - - Time and date configuration - - - - - Date and time - - - - - Timezone - - - - - Authentication Error - - - - - Timezone - - - Your current timezone: - - - - - TextLabel - - - - - Filter - - - - - <html><head/><body><p>Saving changes requires admin permissions.<br>You will be requested after clicking close button</p></body></html> - - - - - None - - - - diff --git a/lxqt-admin-time/translations/lxqt-admin-time_ar.desktop b/lxqt-admin-time/translations/lxqt-admin-time_ar.desktop new file mode 100644 index 0000000..cb6847b --- /dev/null +++ b/lxqt-admin-time/translations/lxqt-admin-time_ar.desktop @@ -0,0 +1,4 @@ +#TRANSLATIONS +Name[ar]=التّاريخ والوقت +GenericName[ar]=إعدادات التّاريخ والوقت +Comment[ar]=اضبط تاريخ النّظام ووقته diff --git a/lxqt-admin-time/translations/lxqt-admin-time_ca.desktop b/lxqt-admin-time/translations/lxqt-admin-time_ca.desktop new file mode 100644 index 0000000..cb225de --- /dev/null +++ b/lxqt-admin-time/translations/lxqt-admin-time_ca.desktop @@ -0,0 +1,3 @@ +Name[ca]=Data i hora +GenericName[ca]=Ajusts de la data i l'hora +Comment[ca]=Configureu la data i l'hora del vostre sistema diff --git a/lxqt-admin-time/translations/lxqt-admin-time_de.ts b/lxqt-admin-time/translations/lxqt-admin-time_de.ts deleted file mode 100644 index 489b7b3..0000000 --- a/lxqt-admin-time/translations/lxqt-admin-time_de.ts +++ /dev/null @@ -1,79 +0,0 @@ - - - - - DateTime - - - Time: - Zeit: - - - - HH:mm:ss - No need to translate. - - - - - Date: - Datum: - - - - <html><head/><body><p>Saving changes requires admin permissions.<br>You will be requested after clicking close button</p></body></html> - <html><head/><body><p>Das Sichern der Einstellungen benötigt Administrator-Rechte.<br>Nach dem Betätigen der Schließen-Schaltfläche wird die Berechtigung eingeholt.</p></body></html> - - - - TimeAdminDialog - - - Time and date configuration - Zeit und Datum einstellen - - - - Date and time - Datum und Zeit - - - - Timezone - Zeitzone - - - - Authentication Error - Authentifizierungsfehler - - - - Timezone - - - Your current timezone: - Derzeitige Zeitzone: - - - - TextLabel - Textfeld - - - - Filter - Filter - - - - <html><head/><body><p>Saving changes requires admin permissions.<br>You will be requested after clicking close button</p></body></html> - <html><head/><body><p>Das Sichern der Einstellungen benötigt Administrator-Rechte.<br>Nach dem Betätigen der Schließen-Schaltfläche wird die Berechtigung eingeholt.</p></body></html> - - - - None - Keine - - - diff --git a/lxqt-admin-time/translations/lxqt-admin-time_el.ts b/lxqt-admin-time/translations/lxqt-admin-time_el.ts deleted file mode 100644 index 6680baf..0000000 --- a/lxqt-admin-time/translations/lxqt-admin-time_el.ts +++ /dev/null @@ -1,78 +0,0 @@ - - - - - DateTime - - - Time: - Ώρα: - - - - HH:mm:ss - HH:mm:ss - - - - Date: - Ημερομηνία: - - - - <html><head/><body><p>Saving changes requires admin permissions.<br>You will be requested after clicking close button</p></body></html> - <html><head/><body><p>Η αποθήκευση των αλλαγών απαιτεί δικαιώματα διαχειριστή.<br>Θα ερωτηθείτε αφού κάνετε κλικ στο κουμπί του κλεισίματος</p></body></html> - - - - TimeAdminDialog - - - Time and date configuration - Διαμόρφωση της ώρας και της ημερομηνίας - - - - Date and time - Ημερομηνία και ώρα - - - - Timezone - Ωρολογιακή ζώνη - - - - Authentication Error - Σφάλμα πιστοποίησης - - - - Timezone - - - Your current timezone: - Η τρέχουσα ζώνη ώρας: - - - - TextLabel - Ετικέτα κειμένου - - - - Filter - Φίλτρο - - - - <html><head/><body><p>Saving changes requires admin permissions.<br>You will be requested after clicking close button</p></body></html> - <html><head/><body><p>Η αποθήκευση των αλλαγών απαιτεί δικαιώματα διαχειριστή.<br>Θα ερωτηθείτε αφού κάνετε κλικ στο κουμπί του κλεισίματος</p></body></html> - - - - None - Καμία - - - diff --git a/lxqt-admin-time/translations/lxqt-admin-time_hr.ts b/lxqt-admin-time/translations/lxqt-admin-time_hr.ts deleted file mode 100644 index 07388a4..0000000 --- a/lxqt-admin-time/translations/lxqt-admin-time_hr.ts +++ /dev/null @@ -1,98 +0,0 @@ - - - - - DateTime - - - Form - - - - - Time and date setup - Postavke datuma i vremena - - - - Time: - Vrijeme: - - - - HH:mm:ss - HH:mm:ss - - - - Date: - Nadnevak - - - - <html><head/><body><p>Saving changes requires admin permissions.<br>You will be requested after clicking close button</p></body></html> - <html><head/><body><p>Spremanje pronjena zahtjeva adminstracijske dozvole.<br>Biti će zatražene nakon što kliknete na dugme zatvori</p></body></html> - - - - TimeAdminDialog - - - Time and date configuration - Konfiguracija vremena i nadnevka - - - - Date and time - Nadnevak i vrijeme - - - - Timezone - Vremenska zona - - - - Authentication Error - - - - - Timezone - - - Form - - - - - Timezone setup - Postavljanje vremenske zone - - - - Your current timezone: - Vaša trenutna vremenska zona - - - - TextLabel - - - - - Filter - - - - - <html><head/><body><p>Saving changes requires admin permissions.<br>You will be requested after clicking close button</p></body></html> - <html><head/><body><p>Spremanje pronjena zahtjeva adminstracijske dozvole.<br>Biti će zatražene nakon što kliknete na dugme zatvori</p></body></html> - - - - None - Nijedan - - - diff --git a/lxqt-admin-time/translations/lxqt-admin-time_hu.ts b/lxqt-admin-time/translations/lxqt-admin-time_hu.ts deleted file mode 100644 index 41f65c1..0000000 --- a/lxqt-admin-time/translations/lxqt-admin-time_hu.ts +++ /dev/null @@ -1,98 +0,0 @@ - - - - - DateTime - - - Form - Űrlap - - - - Time and date setup - Dátum és időbeállítás - - - - Time: - Idő: - - - - HH:mm:ss - - - - - Date: - Dátum: - - - - <html><head/><body><p>Saving changes requires admin permissions.<br>You will be requested after clicking close button</p></body></html> - <html><head/><body><p>Változtatások csak rendszergazdaként menthetők,<br>jelszóbekérés a kilépés után.</p></body></html> - - - - TimeAdminDialog - - - Time and date configuration - Dátum és időbeállítások - - - - Date and time - Dátum és idő - - - - Timezone - Időzóna - - - - Authentication Error - Hitelesítési hiba - - - - Timezone - - - Form - Űrlap - - - - Timezone setup - Időzóna beállítás - - - - Your current timezone: - Mostani időzóna: - - - - TextLabel - Szövegcím - - - - Filter - Szűrő - - - - <html><head/><body><p>Saving changes requires admin permissions.<br>You will be requested after clicking close button</p></body></html> - <html><head/><body><p>Változtatások csak rendszergazdaként menthetők,<br>jelszóbekérés a kilépés után.</p></body></html> - - - - None - Nincs - - - diff --git a/lxqt-admin-time/translations/lxqt-admin-time_it.ts b/lxqt-admin-time/translations/lxqt-admin-time_it.ts deleted file mode 100644 index a8c2224..0000000 --- a/lxqt-admin-time/translations/lxqt-admin-time_it.ts +++ /dev/null @@ -1,100 +0,0 @@ - - - - - DateTime - - - Form - - - - - Time and date setup - Imposta data e ora - - - - Time: - Ora: - - - - HH:mm:ss - - - - - Date: - Data: - - - - <html><head/><body><p>Saving changes requires admin permissions.<br>You will be requested after clicking close button</p></body></html> - Il salvataggio richiede privilegi di amministratore, -saranno chiesti dopo la chiusura di questa finestra. - - - - TimeAdminDialog - - - Time and date configuration - Configura data e ora - - - - Date and time - Data e ora - - - - Timezone - Fuso orario - - - - Authentication Error - Errore di autenticazione - - - - Timezone - - - Form - - - - - Timezone setup - Configura fuso orario - - - - Your current timezone: - Fuso orario attuale: - - - - TextLabel - nessuno - - - - Filter - Filtro - - - - <html><head/><body><p>Saving changes requires admin permissions.<br>You will be requested after clicking close button</p></body></html> - Il salvataggio richiede privilegi di amministratore, -saranno chiesti dopo la chiusura di questa finestra. - - - - None - - - - diff --git a/lxqt-admin-time/translations/lxqt-admin-time_ja.ts b/lxqt-admin-time/translations/lxqt-admin-time_ja.ts deleted file mode 100644 index d22a1a0..0000000 --- a/lxqt-admin-time/translations/lxqt-admin-time_ja.ts +++ /dev/null @@ -1,98 +0,0 @@ - - - - - DateTime - - - Form - フォーム - - - - Time and date setup - 日時設定 - - - - Time: - 時刻: - - - - HH:mm:ss - HH:mm:ss - - - - Date: - 日付 - - - - <html><head/><body><p>Saving changes requires admin permissions.<br>You will be requested after clicking close button</p></body></html> - <html><head/><body><p>変更の保存には管理権限が必要です。<br>閉じるボタンを押した直後に要求されるでしょう。</p></body></html> - - - - TimeAdminDialog - - - Time and date configuration - 日時設定 - - - - Date and time - 日時 - - - - Timezone - タイムゾーン - - - - Authentication Error - 認証エラー - - - - Timezone - - - Form - フォーム - - - - Timezone setup - タイムゾーン設定 - - - - Your current timezone: - 現在のタイムゾーン - - - - TextLabel - テキストラベル - - - - Filter - フィルター - - - - <html><head/><body><p>Saving changes requires admin permissions.<br>You will be requested after clicking close button</p></body></html> - <html><head/><body><p>変更の保存には管理権限が必要です。<br>閉じるボタンを押した直後に要求されるでしょう。</p></body></html> - - - - None - なし - - - diff --git a/lxqt-admin-time/translations/lxqt-admin-time_pl.ts b/lxqt-admin-time/translations/lxqt-admin-time_pl.ts deleted file mode 100644 index d56adac..0000000 --- a/lxqt-admin-time/translations/lxqt-admin-time_pl.ts +++ /dev/null @@ -1,98 +0,0 @@ - - - - - DateTime - - - Form - - - - - Time and date setup - Konfiguracja daty i czasu - - - - Time: - Czas: - - - - HH:mm:ss - - - - - Date: - Data: - - - - <html><head/><body><p>Saving changes requires admin permissions.<br>You will be requested after clicking close button</p></body></html> - <html><head/><body><p>Zapisywanie zmian wymaga uprawnień administratora.<br>Zostaniesz poproszony o hasło.</p></body></html> - - - - TimeAdminDialog - - - Time and date configuration - Konfiguracja daty i czasu - - - - Date and time - Data i czas - - - - Timezone - Strefa czasowa - - - - Authentication Error - Błąd autoryzacji - - - - Timezone - - - Form - - - - - Timezone setup - Ustawienia strefy czasowej - - - - Your current timezone: - Twoja aktualna strefa czasowa: - - - - TextLabel - - - - - Filter - Filtr - - - - <html><head/><body><p>Saving changes requires admin permissions.<br>You will be requested after clicking close button</p></body></html> - <html><head/><body><p>Zapisywanie zmian wymaga uprawnień administratora.<br>Zostaniesz poproszony o hasło.</p></body></html> - - - - None - Żadna - - - diff --git a/lxqt-admin-time/translations/lxqt-admin-time_pt.ts b/lxqt-admin-time/translations/lxqt-admin-time_pt.ts deleted file mode 100644 index b19df01..0000000 --- a/lxqt-admin-time/translations/lxqt-admin-time_pt.ts +++ /dev/null @@ -1,98 +0,0 @@ - - - - - DateTime - - - Form - Formulário - - - - Time and date setup - Configuração de data e hora - - - - Time: - Hora: - - - - HH:mm:ss - H:mm:ss - - - - Date: - Data: - - - - <html><head/><body><p>Saving changes requires admin permissions.<br>You will be requested after clicking close button</p></body></html> - <html><head/><body><p>A gravação de alterações requer permissões de administrador.<br>A senha será solicitada ao clicar em Fechar.</p></body></html> - - - - TimeAdminDialog - - - Time and date configuration - Configuração de data e hora - - - - Date and time - Data e hora - - - - Timezone - Fuso horário - - - - Authentication Error - Erro de autenticação - - - - Timezone - - - Form - Formulário - - - - Timezone setup - Configuração de fuso horário - - - - Your current timezone: - O seu fuso horário: - - - - TextLabel - Texto - - - - Filter - Filtrar - - - - <html><head/><body><p>Saving changes requires admin permissions.<br>You will be requested after clicking close button</p></body></html> - <html><head/><body><p>A gravação de alterações requer permissões de administrador.<br>A senha será solicitada ao clicar em Fechar.</p></body></html> - - - - None - Nenhum - - - diff --git a/lxqt-admin-time/translations/lxqt-admin-time_ru.ts b/lxqt-admin-time/translations/lxqt-admin-time_ru.ts deleted file mode 100644 index 943422a..0000000 --- a/lxqt-admin-time/translations/lxqt-admin-time_ru.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - DateTime - - - Time and date setup - Настройка даты и времени - - - - Time: - Время: - - - - HH:mm:ss - ЧЧ:мм:сс - - - - Date: - Дата: - - - - <html><head/><body><p>Saving changes requires admin permissions.<br>You will be requested after clicking close button</p></body></html> - <html><head/><body><p>Для сохранения изменений необходимы права администратора.<br>Пароль будет запрошен после нажатия на кнопку «Закрыть»</p></body></html> - - - - TimeAdminDialog - - - Time and date configuration - Настройки даты и времени - - - - Date and time - Дата и время - - - - Timezone - Часовой пояс - - - - Authentication Error - Ошибка аутентификации - - - - Timezone - - - Timezone setup - Настройки часового пояса - - - - Your current timezone: - Ваш текущий часовой пояс: - - - - Filter - Фильтр - - - - <html><head/><body><p>Saving changes requires admin permissions.<br>You will be requested after clicking close button</p></body></html> - <html><head/><body><p>Для сохранения изменений необходимы права администратора.<br>Пароль будет запрошен после нажатия на кнопку «Закрыть»</p></body></html> - - - - None - Нет - - - diff --git a/lxqt-admin-time/translations/lxqt-admin-time_ru_RU.desktop b/lxqt-admin-time/translations/lxqt-admin-time_ru_RU.desktop deleted file mode 100644 index fdf42d9..0000000 --- a/lxqt-admin-time/translations/lxqt-admin-time_ru_RU.desktop +++ /dev/null @@ -1,6 +0,0 @@ -[Desktop Entry] -Name[ru_RU]=Дата и время -GenericName[ru_RU]=Настройки даты и времени -Comment[ru_RU]=Настроить дату и время вашей системы - -#TRANSLATIONS_DIR=translations diff --git a/lxqt-admin-time/translations/lxqt-admin-time_ru_RU.ts b/lxqt-admin-time/translations/lxqt-admin-time_ru_RU.ts deleted file mode 100644 index e3c6e68..0000000 --- a/lxqt-admin-time/translations/lxqt-admin-time_ru_RU.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - DateTime - - - Time and date setup - Настройка даты и времени - - - - Time: - Время: - - - - HH:mm:ss - ЧЧ:мм:сс - - - - Date: - Дата: - - - - <html><head/><body><p>Saving changes requires admin permissions.<br>You will be requested after clicking close button</p></body></html> - <html><head/><body><p>Для сохранения изменений необходимы права администратора.<br>Пароль будет запрошен после нажатия на кнопку «Закрыть»</p></body></html> - - - - TimeAdminDialog - - - Time and date configuration - Настройки даты и времени - - - - Date and time - Дата и время - - - - Timezone - Часовой пояс - - - - Authentication Error - Ошибка аутентификации - - - - Timezone - - - Timezone setup - Настройки часового пояса - - - - Your current timezone: - Ваш текущий часовой пояс: - - - - Filter - Фильтр - - - - <html><head/><body><p>Saving changes requires admin permissions.<br>You will be requested after clicking close button</p></body></html> - <html><head/><body><p>Для сохранения изменений необходимы права администратора.<br>Пароль будет запрошен после нажатия на кнопку «Закрыть»</p></body></html> - - - - None - Нет - - - diff --git a/lxqt-admin-user.png b/lxqt-admin-user.png new file mode 100644 index 0000000000000000000000000000000000000000..12fd9726acfd7c8c3975b3ca45d924b4d792dbd3 GIT binary patch literal 45223 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 +#include "usermanager.h" +#include #define DEFAULT_GID_MIN 1000 #define DEFAULT_GID_MAX 32768 -GroupDialog::GroupDialog(OobsGroup *group, QWidget *parent, Qt::WindowFlags f): +GroupDialog::GroupDialog(UserManager* userManager, GroupInfo* group, QWidget *parent, Qt::WindowFlags f): QDialog(parent, f), - mGroup(group ? OOBS_GROUP(g_object_ref(group)) : NULL) + mUserManager(userManager), + mGroup(group) { ui.setupUi(this); + ui.groupName->setText(group->name()); + ui.gid->setValue(group->gid()); - OobsGroupsConfig* groupsConfig = OOBS_GROUPS_CONFIG(oobs_groups_config_get()); - if(group) // edit an exiting group - { - ui.groupName->setReadOnly(true); - ui.groupName->setText(oobs_group_get_name(group)); - mOldGId = oobs_group_get_gid(group); - ui.gid->setValue(mOldGId); - } - else // create a new group - { - mOldGId = -1; - ui.gid->setValue(oobs_groups_config_find_free_gid(groupsConfig, DEFAULT_GID_MIN, DEFAULT_GID_MAX)); - } - - GList* groupUsers = oobs_group_get_users(mGroup); // all users in this group + const QStringList& members = group->members(); // all users in this group // load all users - OobsUsersConfig* usersConfig = OOBS_USERS_CONFIG(oobs_users_config_get()); - OobsList* users = oobs_users_config_get_users(usersConfig); - if(users) + for(const UserInfo* user: userManager->users()) { - OobsListIter it; - gboolean valid = oobs_list_get_iter_first(users, &it); - while(valid) - { - OobsUser* user = OOBS_USER(oobs_list_get(users, &it)); - QListWidgetItem* item = new QListWidgetItem(); - item->setText(oobs_user_get_login_name(user)); - item->setFlags(Qt::ItemIsEnabled|Qt::ItemIsUserCheckable|Qt::ItemIsSelectable); - if(g_list_find(groupUsers, user)) // the user is in this group - item->setCheckState(Qt::Checked); - else - item->setCheckState(Qt::Unchecked); - QVariant obj = QVariant::fromValue(user); - item->setData(Qt::UserRole, obj); - ui.userList->addItem(item); - valid = oobs_list_iter_next(users, &it); - } + QListWidgetItem* item = new QListWidgetItem(); + item->setText(user->name()); + item->setFlags(Qt::ItemIsEnabled|Qt::ItemIsUserCheckable|Qt::ItemIsSelectable); + if(members.indexOf(user->name()) != -1) // the user is in this group + item->setCheckState(Qt::Checked); + else + item->setCheckState(Qt::Unchecked); + QVariant obj = QVariant::fromValue((void*)user); + item->setData(Qt::UserRole, obj); + ui.userList->addItem(item); } - g_list_free(groupUsers); } GroupDialog::~GroupDialog() { - if(mGroup) - g_object_unref(mGroup); } void GroupDialog::accept() { - OobsGroupsConfig* groupsConfig = OOBS_GROUPS_CONFIG(oobs_groups_config_get()); - gid_t gid = ui.gid->value(); - if(gid != mOldGId && oobs_groups_config_is_gid_used(groupsConfig, gid)) + QString groupName = ui.groupName->text(); + if(groupName.isEmpty()) { - QMessageBox::critical(this, tr("Error"), tr("The group ID is in use.")); + QMessageBox::critical(this, tr("Error"), tr("The group name cannot be empty.")); return; } - - if(!mGroup) // create a new group - { - QByteArray groupName = ui.groupName->text().toLatin1(); - if(groupName.isEmpty()) - { - QMessageBox::critical(this, tr("Error"), tr("The group name cannot be empty.")); - return; - } - if(oobs_groups_config_is_name_used(groupsConfig, groupName)) - { - QMessageBox::critical(this, tr("Error"), tr("The group name is in use.")); - return; - } - mGroup = oobs_group_new(groupName); - } - oobs_group_set_gid(mGroup, gid); + mGroup->setName(groupName); + mGroup->setGid(ui.gid->value()); // update users - GList* groupUsers = oobs_group_get_users(mGroup); // all users in this group - int rowCount = ui.userList->count(); - for(int row = 0; row < rowCount; ++row) - { + mGroup->removeAllMemberss(); + for(int row = 0; row < ui.userList->count(); ++row) { QListWidgetItem* item = ui.userList->item(row); - QVariant obj = item->data(Qt::UserRole); - OobsUser* user = OOBS_USER(obj.value()); - if(g_list_find(groupUsers, user)) // the user belongs to this group previously - { - if(item->checkState() == Qt::Unchecked) // it's unchecked, remove it - oobs_group_remove_user(mGroup, user); - } - else // the user does not belong to this group previously - { - if(item->checkState() == Qt::Checked) // it's checked, we want it! - oobs_group_add_user(mGroup, user); + if(item->checkState() == Qt::Checked) { + mGroup->addMember(item->text()); } } - g_list_free(groupUsers); - - oobs_object_commit(OOBS_OBJECT(mGroup)); QDialog::accept(); } diff --git a/lxqt-admin-user/groupdialog.h b/lxqt-admin-user/groupdialog.h index d8743a1..43e3dda 100644 --- a/lxqt-admin-user/groupdialog.h +++ b/lxqt-admin-user/groupdialog.h @@ -23,32 +23,24 @@ #include #include "ui_groupdialog.h" -#include -#include -#include + +class GroupInfo; +class UserManager; class GroupDialog : public QDialog { Q_OBJECT public: - GroupDialog(OobsGroup* group = NULL, QWidget *parent = NULL, Qt::WindowFlags f = 0); + GroupDialog(UserManager* userManager, GroupInfo* group, QWidget *parent = nullptr, Qt::WindowFlags f = 0); ~GroupDialog(); - OobsGroup* group() - { - return mGroup; - } - virtual void accept(); -private: - bool hasUser(OobsUser* user); - private: Ui::GroupDialog ui; - OobsGroup* mGroup; - gid_t mOldGId; + UserManager* mUserManager; + GroupInfo* mGroup; }; #endif // GROUPDIALOG_H diff --git a/lxqt-admin-user/groupdialog.ui b/lxqt-admin-user/groupdialog.ui index 3010c10..1bfe419 100644 --- a/lxqt-admin-user/groupdialog.ui +++ b/lxqt-admin-user/groupdialog.ui @@ -26,6 +26,9 @@ + + Default + 32768 diff --git a/lxqt-admin-user/lxqt-admin-user-helper b/lxqt-admin-user/lxqt-admin-user-helper new file mode 100755 index 0000000..24e4c39 --- /dev/null +++ b/lxqt-admin-user/lxqt-admin-user-helper @@ -0,0 +1,13 @@ +#!/bin/sh +case "$1" in +# we only allow executing these commands +useradd|usermod|userdel|groupadd|groupmod|groupdel|passwd|gpasswd) + # TODO: platforms using different commands can add wrapper scripts here. + export LC_ALL=C + exec "$@" + ;; +*) + echo "Command '$1' is not allowed!" + exit 1 + ;; +esac diff --git a/lxqt-admin-user/mainwindow.cpp b/lxqt-admin-user/mainwindow.cpp index 1cce210..62428f1 100644 --- a/lxqt-admin-user/mainwindow.cpp +++ b/lxqt-admin-user/mainwindow.cpp @@ -21,161 +21,125 @@ #include "mainwindow.h" #include #include +#include +#include +#include +#include #include "userdialog.h" #include "groupdialog.h" +#include "usermanager.h" MainWindow::MainWindow(): QMainWindow(), - mUsersConfig(OOBS_USERS_CONFIG(oobs_users_config_get())), - mGroupsConfig(OOBS_GROUPS_CONFIG(oobs_groups_config_get())) + mUserManager(new UserManager(this)) { ui.setupUi(this); connect(ui.actionAdd, SIGNAL(triggered(bool)), SLOT(onAdd())); connect(ui.actionDelete, SIGNAL(triggered(bool)), SLOT(onDelete())); connect(ui.actionProperties, SIGNAL(triggered(bool)), SLOT(onEditProperties())); - connect(ui.actionRefresh, SIGNAL(triggered(bool)), SLOT(onRefresh())); + connect(ui.actionChangePasswd, SIGNAL(triggered(bool)), SLOT(onChangePasswd())); + connect(ui.actionRefresh, SIGNAL(triggered(bool)), SLOT(reload())); - onRefresh(); // load the settings + connect(ui.userList, &QListWidget::activated, this, &MainWindow::onRowActivated); + connect(ui.groupList, &QListWidget::activated, this, &MainWindow::onRowActivated); - g_signal_connect(mUsersConfig, "changed" , G_CALLBACK(onUsersConfigChanged), this); - g_signal_connect(mGroupsConfig, "changed" , G_CALLBACK(onGroupsConfigChanged), this); + connect(mUserManager, &UserManager::changed, this, &MainWindow::reload); + reload(); } MainWindow::~MainWindow() { - if(mUsersConfig) - { - g_signal_handlers_disconnect_by_func(mUsersConfig, (void*)G_CALLBACK(onUsersConfigChanged), this); - g_object_unref(mUsersConfig); - } - if(mGroupsConfig) - g_object_unref(mGroupsConfig); } -void MainWindow::loadUsers() +void MainWindow::reloadUsers() { ui.userList->clear(); - OobsList* users = oobs_users_config_get_users(mUsersConfig); - if(users) + const auto& users = mUserManager->users(); + for(const UserInfo* user: users) { - OobsListIter it; - gboolean valid = oobs_list_get_iter_first(users, &it); - while(valid) + uid_t uid = user->uid(); + if(uid > 499 && !user->shell().isEmpty()) // exclude system users { - GObject* obj = oobs_list_get(users, &it); - OobsUser* user = OOBS_USER(obj); - uid_t uid = oobs_user_get_uid(user); - if(uid > 499 && oobs_user_get_shell(user)) // exclude system users - { - QString fullName = QString::fromUtf8(oobs_user_get_full_name(user)); - QString loginName = QString::fromLatin1(oobs_user_get_login_name(user)); - QString homeDir = QString::fromLocal8Bit(oobs_user_get_home_directory(user)); - QString groupName; - OobsGroup* group = oobs_user_get_main_group(user); - if(group) - groupName = QString::fromLatin1(oobs_group_get_name(group)); - - QTreeWidgetItem* item = new QTreeWidgetItem(); - item->setData(0, Qt::DisplayRole, loginName); - QVariant obj = QVariant::fromValue(user); - item->setData(0, Qt::UserRole, obj); - item->setData(1, Qt::DisplayRole, uid); - item->setData(2, Qt::DisplayRole, fullName); - item->setData(3, Qt::DisplayRole, groupName); - item->setData(4, Qt::DisplayRole, homeDir); - ui.userList->addTopLevelItem(item); + QTreeWidgetItem* item = new QTreeWidgetItem(); + item->setData(0, Qt::DisplayRole, user->name()); + QVariant obj = QVariant::fromValue((void*)user); + item->setData(0, Qt::UserRole, obj); + item->setData(1, Qt::DisplayRole, uid); + item->setData(2, Qt::DisplayRole, user->fullName()); + GroupInfo* group = mUserManager->findGroupInfo(user->gid()); + if(group != nullptr) { + item->setData(3, Qt::DisplayRole, group->name()); } - valid = oobs_list_iter_next(users, &it); + item->setData(4, Qt::DisplayRole, user->homeDir()); + ui.userList->addTopLevelItem(item); } } } -void MainWindow::loadGroups() +void MainWindow::reloadGroups() { ui.groupList->clear(); // load groups - OobsList* groups = oobs_groups_config_get_groups(mGroupsConfig); - if(groups) + const auto& groups = mUserManager->groups(); + for(const GroupInfo* group: groups) { - OobsListIter it; - gboolean valid = oobs_list_get_iter_first(groups, &it); - while(valid) - { - OobsGroup* group = OOBS_GROUP(oobs_list_get(groups, &it)); - QTreeWidgetItem* item = new QTreeWidgetItem(); - item->setData(0, Qt::DisplayRole, QString::fromLatin1(oobs_group_get_name(group))); - QVariant obj = QVariant::fromValue(group); - item->setData(0, Qt::UserRole, obj); - item->setData(1, Qt::DisplayRole, oobs_group_get_gid(group)); - ui.groupList->addTopLevelItem(item); - valid = oobs_list_iter_next(groups, &it); - } + QTreeWidgetItem* item = new QTreeWidgetItem(); + item->setData(0, Qt::DisplayRole, group->name()); + QVariant obj = QVariant::fromValue((void*)group); + item->setData(0, Qt::UserRole, obj); + item->setData(1, Qt::DisplayRole, group->gid()); + item->setData(2, Qt::DisplayRole, group->members().join(", ")); + ui.groupList->addTopLevelItem(item); } } -OobsUser *MainWindow::userFromItem(QTreeWidgetItem *item) -{ - if(item) - { - QVariant obj = item->data(0, Qt::UserRole); - OobsUser* user = OOBS_USER(obj.value()); - return user; - } - return NULL; +void MainWindow::reload() { + reloadUsers(); + reloadGroups(); } -OobsGroup* MainWindow::groupFromItem(QTreeWidgetItem *item) +UserInfo *MainWindow::userFromItem(QTreeWidgetItem *item) { if(item) { QVariant obj = item->data(0, Qt::UserRole); - return OOBS_GROUP(obj.value()); + return reinterpret_cast(obj.value()); } - return NULL; + return nullptr; } -template -bool MainWindow::authenticate(T *obj) +GroupInfo* MainWindow::groupFromItem(QTreeWidgetItem *item) { - GError* err = NULL; - if(!oobs_object_authenticate(OOBS_OBJECT(obj), &err)) + if(item) { - if(err) - { - QMessageBox::critical(this, tr("Error"), QString::fromUtf8(err->message)); - g_error_free(err); - } - return false; + QVariant obj = item->data(0, Qt::UserRole); + return reinterpret_cast(obj.value()); } - return true; + return nullptr; } void MainWindow::onAdd() { if(ui.tabWidget->currentIndex() == PageUsers) { - if(authenticate(mUsersConfig)) + UserInfo newUser; + UserDialog dlg(mUserManager, &newUser, this); + if(dlg.exec() == QDialog::Accepted) { - UserDialog dlg(NULL, this); - if(dlg.exec() == QDialog::Accepted) - { - OobsUser* user = dlg.user(); - oobs_users_config_add_user(mUsersConfig, user); - oobs_object_commit(OOBS_OBJECT(mUsersConfig)); + mUserManager->addUser(&newUser); + QByteArray newPasswd; + if(getNewPassword(newUser.name(), newPasswd)) { + mUserManager->changePassword(&newUser, newPasswd); } } } else if (ui.tabWidget->currentIndex() == PageGroups) { - if(authenticate(mGroupsConfig)) + GroupInfo newGroup; + GroupDialog dlg(mUserManager, &newGroup, this); + if(dlg.exec() == QDialog::Accepted) { - GroupDialog dlg(NULL, this); - if(dlg.exec() == QDialog::Accepted) - { - OobsGroup* group = dlg.group(); - oobs_groups_config_add_group(mGroupsConfig, group); - oobs_object_commit(OOBS_OBJECT(mGroupsConfig)); - } + mUserManager->addGroup(&newGroup); } } } @@ -185,65 +149,116 @@ void MainWindow::onDelete() if(ui.tabWidget->currentIndex() == PageUsers) { QTreeWidgetItem* item = ui.userList->currentItem(); - OobsUser* user = userFromItem(item); + UserInfo* user = userFromItem(item); if(user) { if(QMessageBox::question(this, tr("Confirm"), tr("Are you sure you want to delete the selected user?"), QMessageBox::Ok|QMessageBox::Cancel) == QMessageBox::Ok) { - oobs_users_config_delete_user(mUsersConfig, user); - oobs_object_commit(OOBS_OBJECT(mUsersConfig)); + mUserManager->deleteUser(user); } } } else if(ui.tabWidget->currentIndex() == PageGroups) { QTreeWidgetItem* item = ui.groupList->currentItem(); - OobsGroup* group = groupFromItem(item); + GroupInfo* group = groupFromItem(item); if(group) { if(QMessageBox::question(this, tr("Confirm"), tr("Are you sure you want to delete the selected group?"), QMessageBox::Ok|QMessageBox::Cancel) == QMessageBox::Ok) { - oobs_groups_config_delete_group(mGroupsConfig, group); - oobs_object_commit(OOBS_OBJECT(mGroupsConfig)); + mUserManager->deleteGroup(group); } } } } +bool MainWindow::getNewPassword(const QString& name, QByteArray& passwd) { + QInputDialog dlg(this); + dlg.setTextEchoMode(QLineEdit::Password); + dlg.setLabelText(tr("Input the new password for %1:").arg(name)); + QLineEdit* edit = dlg.findChild(QString()); + if(edit) { + // NOTE: do we need to add a validator to limit the input? + // QRegExpValidator* validator = new QRegExpValidator(QRegExp(QStringLiteral("\\w*")), edit); + // edit->setValidator(validator); + } + if(dlg.exec() == QDialog::Accepted) { + passwd = dlg.textValue().toUtf8(); + if(passwd.isEmpty()) { + if(QMessageBox::question(this, tr("Confirm"), tr("Are you sure you want to set a empty password?"), QMessageBox::Ok|QMessageBox::Cancel) != QMessageBox::Ok) + return false; + } + return true; + } + return false; +} + +void MainWindow::onChangePasswd() { + QString name; + UserInfo* user = nullptr; + GroupInfo* group = nullptr; + if(ui.tabWidget->currentIndex() == PageUsers) + { + QTreeWidgetItem* item = ui.userList->currentItem(); + user = userFromItem(item); + if (!user) + return; + + name = user->name(); + } + else if(ui.tabWidget->currentIndex() == PageGroups) + { + QTreeWidgetItem* item = ui.groupList->currentItem(); + group = groupFromItem(item); + if (!group) + return; + + name = group->name(); + } + + QByteArray newPasswd; + if(getNewPassword(name, newPasswd)) { + if(user) { + mUserManager->changePassword(user, newPasswd); + } + if(group) { + mUserManager->changePassword(group, newPasswd); + } + } +} + +void MainWindow::onRowActivated(const QModelIndex& index) +{ + onEditProperties(); +} + void MainWindow::onEditProperties() { if(ui.tabWidget->currentIndex() == PageUsers) { QTreeWidgetItem* item = ui.userList->currentItem(); - OobsUser* user = userFromItem(item); - if(user) - { - if(authenticate(mUsersConfig)) + UserInfo* user = userFromItem(item); + if(user) { + UserInfo newSettings(*user); + UserDialog dlg(mUserManager, &newSettings, this); + if(dlg.exec() == QDialog::Accepted) { - UserDialog dlg(user, this); - dlg.exec(); + mUserManager->modifyUser(user, &newSettings); } } } else if(ui.tabWidget->currentIndex() == PageGroups) { QTreeWidgetItem* item = ui.groupList->currentItem(); - OobsGroup* group = groupFromItem(item); - if(group) - { - if(authenticate(mGroupsConfig)) + GroupInfo* group = groupFromItem(item); + if(group) { + GroupInfo newSettings(*group); + GroupDialog dlg(mUserManager, &newSettings, this); + if(dlg.exec() == QDialog::Accepted) { - GroupDialog dlg(group, this); - dlg.exec(); + mUserManager->modifyGroup(group, &newSettings); } } } } -void MainWindow::onRefresh() -{ - oobs_object_update(OOBS_OBJECT(mUsersConfig)); - loadUsers(); - oobs_object_update(OOBS_OBJECT(mGroupsConfig)); - loadGroups(); -} diff --git a/lxqt-admin-user/mainwindow.h b/lxqt-admin-user/mainwindow.h index f3edd50..8e9d6e0 100644 --- a/lxqt-admin-user/mainwindow.h +++ b/lxqt-admin-user/mainwindow.h @@ -24,9 +24,9 @@ #include #include "ui_mainwindow.h" -#include -#include -#include +class UserInfo; +class GroupInfo; +class UserManager; class MainWindow : public QMainWindow { @@ -44,34 +44,23 @@ public: virtual ~MainWindow(); private: - void loadUsers(); - void loadGroups(); - OobsUser* userFromItem(QTreeWidgetItem* item); - OobsGroup* groupFromItem(QTreeWidgetItem *item); - - template - bool authenticate(T* obj); - - static void onUsersConfigChanged(OobsObject* obj, MainWindow* _this) - { - _this->loadUsers(); - } - - static void onGroupsConfigChanged(OobsObject* obj, MainWindow* _this) - { - _this->loadGroups(); - } + UserInfo* userFromItem(QTreeWidgetItem* item); + GroupInfo* groupFromItem(QTreeWidgetItem *item); + bool getNewPassword(const QString& name, QByteArray& passwd); + void reloadUsers(); + void reloadGroups(); private Q_SLOTS: void onAdd(); void onDelete(); void onEditProperties(); - void onRefresh(); + void onChangePasswd(); + void reload(); + void onRowActivated(const QModelIndex& index); private: Ui::MainWindow ui; - OobsUsersConfig* mUsersConfig; - OobsGroupsConfig* mGroupsConfig; + UserManager* mUserManager; }; #endif // MAINWINDOW_H diff --git a/lxqt-admin-user/mainwindow.ui b/lxqt-admin-user/mainwindow.ui index 37e505b..75a4ce7 100644 --- a/lxqt-admin-user/mainwindow.ui +++ b/lxqt-admin-user/mainwindow.ui @@ -6,8 +6,8 @@ 0 0 - 640 - 480 + 676 + 362 @@ -15,7 +15,16 @@ - + + 0 + + + 0 + + + 0 + + 0 @@ -42,9 +51,6 @@ false - - false - Login Name @@ -107,6 +113,11 @@ Group ID + + + Members + + @@ -134,14 +145,14 @@ + - - + .. Add @@ -153,8 +164,7 @@ - - + .. Delete @@ -166,8 +176,7 @@ - - + .. Properties @@ -179,8 +188,7 @@ - - + .. Refresh @@ -189,6 +197,18 @@ Refresh the lists + + + + .. + + + Change Password + + + Change password for the selected user or group + + diff --git a/lxqt-admin-user/org.lxqt.lxqt-admin-user.policy.in b/lxqt-admin-user/org.lxqt.lxqt-admin-user.policy.in new file mode 100644 index 0000000..b479b86 --- /dev/null +++ b/lxqt-admin-user/org.lxqt.lxqt-admin-user.policy.in @@ -0,0 +1,18 @@ + + + + + + Authentication is required for user administration + preferences-system + + auth_admin + auth_admin + auth_admin_keep + + @CMAKE_INSTALL_PREFIX@/bin/lxqt-admin-user-helper + + + diff --git a/lxqt-admin-user/translations/lxqt-admin-user.ts b/lxqt-admin-user/translations/lxqt-admin-user.ts deleted file mode 100644 index b21e617..0000000 --- a/lxqt-admin-user/translations/lxqt-admin-user.ts +++ /dev/null @@ -1,263 +0,0 @@ - - - - - GroupDialog - - - Group Settings - - - - - Group name: - - - - - Group ID: - - - - - Users belong to this group: - - - - - - - Error - - - - - The group ID is in use. - - - - - The group name cannot be empty. - - - - - The group name is in use. - - - - - MainWindow - - - User and Group Settings - - - - - &Users - - - - - Login Name - - - - - User ID - - - - - Full Name - - - - - Group - - - - - Home Directory - - - - - Show system users (for advanced users only) - - - - - &Groups - - - - - Name - - - - - Group ID - - - - - toolBar - - - - - Add - - - - - Add new users or groups - - - - - Delete - - - - - Delete selected item - - - - - Properties - - - - - edit properties of the selected item - - - - - Refresh - - - - - Refresh the lists - - - - - Error - - - - - - Confirm - - - - - Are you sure you want to delete the selected user? - - - - - Are you sure you want to delete the selected group? - - - - - UserDialog - - - User Settings - - - - - General - - - - - Full name: - - - - - Login name: - - - - - Set password: - - - - - User ID: - - - - - Main group: - - - - - Advanced - - - - - Login shell: - - - - - Home directory: - - - - - Change password: - - - - - - - Error - - - - - The user ID is in use. - - - - - The user name cannot be empty. - - - - - The user name is in use. - - - - - Confirm - - - - - Are you sure you want to use an "empty password" for the user? - - - - diff --git a/lxqt-admin-user/translations/lxqt-admin-user_ar.desktop b/lxqt-admin-user/translations/lxqt-admin-user_ar.desktop new file mode 100644 index 0000000..713e07e --- /dev/null +++ b/lxqt-admin-user/translations/lxqt-admin-user_ar.desktop @@ -0,0 +1,4 @@ +#TRANSLATIONS +Name[ar]=المستخدمون والمجموعات +GenericName[ar]=إعدادات المستخدمون والمجموعات +Comment[ar]=اضبط مستخدمو النّظام ومجموعاته diff --git a/lxqt-admin-user/translations/lxqt-admin-user_ca.desktop b/lxqt-admin-user/translations/lxqt-admin-user_ca.desktop new file mode 100644 index 0000000..e8ed741 --- /dev/null +++ b/lxqt-admin-user/translations/lxqt-admin-user_ca.desktop @@ -0,0 +1,3 @@ +Name[ca]=Usuaris i grups +GenericName[ca]=Ajusts dels usuaris i dels grups +Comment[ca]=Configureu els usuaris i els grups del vostre sistema diff --git a/lxqt-admin-user/translations/lxqt-admin-user_de.ts b/lxqt-admin-user/translations/lxqt-admin-user_de.ts deleted file mode 100644 index 7201449..0000000 --- a/lxqt-admin-user/translations/lxqt-admin-user_de.ts +++ /dev/null @@ -1,263 +0,0 @@ - - - - - GroupDialog - - - Group Settings - Gruppeneinstellungen - - - - Group name: - Gruppen-Name: - - - - Group ID: - Gruppen-ID: - - - - Users belong to this group: - Benutzer in dieser Gruppe: - - - - - - Error - Fehler - - - - The group ID is in use. - Die Gruppen-ID existiert bereits. - - - - The group name cannot be empty. - Der Gruppen-Name kann nicht leer sein. - - - - The group name is in use. - Der Gruppen-Name existiert bereits. - - - - MainWindow - - - User and Group Settings - Nutzer- und Gruppeneinstellungen - - - - &Users - &Nutzer - - - - Login Name - Anmeldename - - - - User ID - Nutzer-ID - - - - Full Name - Vollständiger Name - - - - Group - Gruppe - - - - Home Directory - Nutzerverzeichnis - - - - Show system users (for advanced users only) - Systemnutzer anzeigen (nur für erfahrene Nutzer) - - - - &Groups - &Gruppen - - - - Name - Name - - - - Group ID - Gruppen-ID - - - - toolBar - Werkzeugleiste - - - - Add - Hinzufügen - - - - Add new users or groups - Neue Nutzer oder Gruppen hinzufügen - - - - Delete - Entfernen - - - - Delete selected item - Ausgewähltes Element löschen - - - - Properties - Eigenschaften - - - - edit properties of the selected item - Eigenschaften des ausgewählten Elements editieren - - - - Refresh - Erneuern - - - - Refresh the lists - Listen erneuern - - - - Error - Fehler - - - - - Confirm - Bestätigen - - - - Are you sure you want to delete the selected user? - Wollen Sie den ausgewählten Nutzer wirklich löschen? - - - - Are you sure you want to delete the selected group? - Wollen Sie die ausgewählte Gruppe wirklich löschen? - - - - UserDialog - - - User Settings - Nutzereinstellungen - - - - General - Allgemein - - - - Full name: - Vollständiger Name: - - - - Login name: - Anmeldename: - - - - Set password: - Kennwort setzen: - - - - User ID: - Nutzer-ID: - - - - Main group: - Hauptgruppe: - - - - Advanced - Erweitert - - - - Login shell: - Befehlsinterpreter (shell): - - - - Home directory: - Nutzerverzeichnis: - - - - Change password: - Kennwort ändern: - - - - - - Error - Fehler - - - - The user ID is in use. - Die Nutzer-ID existiert bereits. - - - - The user name cannot be empty. - Der Nutzername kann nicht leer sein. - - - - The user name is in use. - Der Nutzername existiert bereits. - - - - Confirm - Bestätigen - - - - Are you sure you want to use an "empty password" for the user? - Wollen Sie wirklich ein "leeres Kennwort" für den Nutzer vergeben? - - - diff --git a/lxqt-admin-user/translations/lxqt-admin-user_el.ts b/lxqt-admin-user/translations/lxqt-admin-user_el.ts deleted file mode 100644 index a52e208..0000000 --- a/lxqt-admin-user/translations/lxqt-admin-user_el.ts +++ /dev/null @@ -1,263 +0,0 @@ - - - - - GroupDialog - - - Group Settings - Ρυθμίσεις ομάδας - - - - Group name: - Όνομα ομάδας: - - - - Group ID: - Αναγνωριστικό ομάδας: - - - - Users belong to this group: - Χρήστες που ανήκουν στην ομάδα: - - - - - - Error - Σφάλμα - - - - The group ID is in use. - Το αναγνωριστικό της ομάδας χρησιμοποιείται ήδη. - - - - The group name cannot be empty. - Το όνομα της ομάδας δεν μπορεί να είναι κενό. - - - - The group name is in use. - Το όνομα της ομάδας χρησιμοποιείται ήδη. - - - - MainWindow - - - User and Group Settings - Ρυθμίσεις χρηστών και ομάδων - - - - &Users - &Χρήστες - - - - Login Name - Όνομα χρήστη - - - - User ID - Αναγνωριστικό χρήστη - - - - Full Name - Πλήρες όνομα - - - - Group - Ομάδα - - - - Home Directory - Προσωπικός κατάλογος - - - - Show system users (for advanced users only) - Εμφάνιση των χρηστών του συστήματος (μόνο για προηγμένους χρήστες) - - - - &Groups - &Ομάδες - - - - Name - Όνομα - - - - Group ID - Αναγνωριστικό ομάδας - - - - toolBar - Γραμμή εργαλείων - - - - Add - Προσθήκη - - - - Add new users or groups - Προσθήκη νέων χρηστών ή ομάδων - - - - Delete - Διαγραφή - - - - Delete selected item - Διαγραφή του επιλεγμένου αντικειμένου - - - - Properties - Ιδιότητες - - - - edit properties of the selected item - Επεξεργασία των ιδιοτήτων για το επιλεγμένο αντικείμενο - - - - Refresh - Ανανέωση - - - - Refresh the lists - Ανανέωση της λίστας - - - - Error - Σφάλμα - - - - - Confirm - Επιβεβαίωση - - - - Are you sure you want to delete the selected user? - Είστε σίγουρος-η ότι θέλετε να διαγράψετε τον επιλεγμένο χρήστη; - - - - Are you sure you want to delete the selected group? - Είστε σίγουρος-η ότι θέλετε να διαγράψετε την επιλεγμένη ομάδα; - - - - UserDialog - - - User Settings - Ρυθμίσεις χρήστη - - - - General - Γενικά - - - - Full name: - Πλήρες όνομα: - - - - Login name: - Όνομα χρήστη: - - - - Set password: - Ορισμός του κωδικού πρόσβασης: - - - - User ID: - Αναγνωριστικό χρήστη: - - - - Main group: - Κύρια ομάδα: - - - - Advanced - Προηγμένο - - - - Login shell: - Κέλυφος σύνδεσης: - - - - Home directory: - Προσωπικός κατάλογος: - - - - Change password: - Αλλαγή του κωδικού πρόσβασης: - - - - - - Error - Σφάλμα - - - - The user ID is in use. - Το αναγνωριστικό του χρήστη χρησιμοποιείται ήδη. - - - - The user name cannot be empty. - Το όνομα χρήστη δεν μπορεί να είναι κενό. - - - - The user name is in use. - Το όνομα του χρήστη χρησιμοποιείται ήδη. - - - - Confirm - Επιβεβαίωση - - - - Are you sure you want to use an "empty password" for the user? - Είστε σίγουρος-η ότι θέλετε να χρησιμοποιήσετε έναν «κενό κωδικό πρόσβασης» για τον χρήστη; - - - diff --git a/lxqt-admin-user/translations/lxqt-admin-user_hr.ts b/lxqt-admin-user/translations/lxqt-admin-user_hr.ts deleted file mode 100644 index 13967d6..0000000 --- a/lxqt-admin-user/translations/lxqt-admin-user_hr.ts +++ /dev/null @@ -1,263 +0,0 @@ - - - - - GroupDialog - - - Group Settings - Postavke grupe - - - - Group name: - Ime grupe: - - - - Group ID: - ID grupe - - - - Users belong to this group: - Korisnici koji pripadaju ovoj grupi - - - - - - Error - Greška - - - - The group ID is in use. - ID grupe je u uporabi. - - - - The group name cannot be empty. - Ime grupe ne može biti prazno. - - - - The group name is in use. - Ime grupe je u uporabi. - - - - MainWindow - - - User and Group Settings - Postavke korisnika i grupe - - - - &Users - &Korisnici - - - - Login Name - Ime prijave - - - - User ID - ID korisnika - - - - Full Name - Puno ime - - - - Group - Grupa - - - - Home Directory - Osobna mapa - - - - Show system users (for advanced users only) - - - - - &Groups - &Grupe - - - - Name - Ime - - - - Group ID - ID grupe - - - - toolBar - alatna traka - - - - Add - Dodaj - - - - Add new users or groups - Dodaj nove korisnike ili grupe - - - - Delete - Izbriši - - - - Delete selected item - Izbriši odabranu stavku - - - - Properties - Svojstva - - - - edit properties of the selected item - uredi svojstva odabrane stavke - - - - Refresh - Osvježi - - - - Refresh the lists - Osvježi liste - - - - Error - Greška - - - - - Confirm - Potvrdi - - - - Are you sure you want to delete the selected user? - Jeste li sigurni da želite izbrisati odabranoga korisnika? - - - - Are you sure you want to delete the selected group? - Jeste li sigurni da želite izbrisati odabranu grupu? - - - - UserDialog - - - User Settings - Postavke korisnika - - - - General - Općenito - - - - Full name: - Puno ime: - - - - Login name: - Ime prijave: - - - - Set password: - Postavi lozinku: - - - - User ID: - ID korisnika: - - - - Main group: - Glavna grupa: - - - - Advanced - Napredno - - - - Login shell: - Ljuska prijave: - - - - Home directory: - Osobna mapa: - - - - Change password: - Promjeni lozinku: - - - - - - Error - Greška - - - - The user ID is in use. - ID korisnika je u uporabi. - - - - The user name cannot be empty. - Korisničko ime ne može biti prazno. - - - - The user name is in use. - Korisničko ime je u uoprabi. - - - - Confirm - Potvrdi - - - - Are you sure you want to use an "empty password" for the user? - Jeste li sigurni da želite koristiti "praznu lozinku" za korisnika? - - - diff --git a/lxqt-admin-user/translations/lxqt-admin-user_hu.ts b/lxqt-admin-user/translations/lxqt-admin-user_hu.ts deleted file mode 100644 index 24e4806..0000000 --- a/lxqt-admin-user/translations/lxqt-admin-user_hu.ts +++ /dev/null @@ -1,263 +0,0 @@ - - - - - GroupDialog - - - Group Settings - Csoportbeállítás - - - - Group name: - Csoportnév: - - - - Group ID: - Csoport ID - - - - Users belong to this group: - A csoport tagjai: - - - - - - Error - Hiba - - - - The group ID is in use. - Csoport ID foglalt. - - - - The group name cannot be empty. - Csoportnév nem lehet üres. - - - - The group name is in use. - Csoportnév foglalt. - - - - MainWindow - - - User and Group Settings - Felhasználók és csoportok - - - - &Users - &Felhasználók - - - - Login Name - Bejelenkezési név - - - - User ID - Felhasználó ID - - - - Full Name - Teljes név - - - - Group - Csoport - - - - Home Directory - Saját könyvtár - - - - Show system users (for advanced users only) - Rendszer felhasználók is látszanak (csak haladóknak) - - - - &Groups - &Csoportok - - - - Name - Név - - - - Group ID - Csoport ID - - - - toolBar - eszközsáv - - - - Add - Hozzáad - - - - Add new users or groups - Új felhasználó, vagy csoport hozzáadása - - - - Delete - Törlés - - - - Delete selected item - Kiválasztott törlése - - - - Properties - Tulajdonságok - - - - edit properties of the selected item - A választott elem módosítása - - - - Refresh - Frisítés - - - - Refresh the lists - Lista frissítése - - - - Error - Hiba - - - - - Confirm - Megerősítés - - - - Are you sure you want to delete the selected user? - Tényleg töröljük az illető felhasználót? - - - - Are you sure you want to delete the selected group? - Tényleg töröljük az illető csoportot? - - - - UserDialog - - - User Settings - Felhasználó beállítása - - - - General - Alap - - - - Full name: - Teljes név: - - - - Login name: - Bejelenkezési név: - - - - Set password: - Jelszóbeállítás: - - - - User ID: - Felhasználó ID: - - - - Main group: - Főcsoport - - - - Advanced - Bővített - - - - Login shell: - Parancsértelmező: - - - - Home directory: - Saját könyvtár: - - - - Change password: - Jelszóváltoztatás: - - - - - - Error - Hiba - - - - The user ID is in use. - Felhasználó ID foglalt. - - - - The user name cannot be empty. - Felhasználónév nem lehet üres. - - - - The user name is in use. - Felhasználónév foglalt. - - - - Confirm - Megerősítés - - - - Are you sure you want to use an "empty password" for the user? - Üres legyen a jelszava a felhasználónak? - - - diff --git a/lxqt-admin-user/translations/lxqt-admin-user_it.ts b/lxqt-admin-user/translations/lxqt-admin-user_it.ts deleted file mode 100644 index 5a71d1c..0000000 --- a/lxqt-admin-user/translations/lxqt-admin-user_it.ts +++ /dev/null @@ -1,264 +0,0 @@ - - - - - GroupDialog - - - Group Settings - Gestione gruppi - - - - Group name: - Nome del gruppo: - - - - Group ID: - ID gruppo: - - - - Users belong to this group: - Utenti appartenenti: - - - - - - Error - Errore - - - - The group ID is in use. - ID già in uso - - - - The group name cannot be empty. - Il nome non può essere vuoto. - - - - The group name is in use. - Il nome è già in uso. - - - - MainWindow - - - User and Group Settings - Impostazioni utenti e gruppi - - - - &Users - remove &_ in source - Utenti - - - - Login Name - Nome Login - - - - User ID - ID utente - - - - Full Name - Nome completo - - - - Group - Gruppo - - - - Home Directory - Cartella Home - - - - Show system users (for advanced users only) - Mostra utenti di sistema (avanzato) - - - - &Groups - Gruppi - - - - Name - Nome - - - - Group ID - ID gruppo - - - - toolBar - - - - - Add - Aggiungi - - - - Add new users or groups - Aggiungi utenti o gruppi nuovi - - - - Delete - Cancella - - - - Delete selected item - Cancella selezionato - - - - Properties - Proprietà - - - - edit properties of the selected item - Modifica proprietà - - - - Refresh - Aggiorna - - - - Refresh the lists - Aggiorna lista - - - - Error - Errore - - - - - Confirm - Conferma - - - - Are you sure you want to delete the selected user? - Si è sicuro di voler cancellare l'utente selezionato? - - - - Are you sure you want to delete the selected group? - Si è sicuro di voler cancellare il gruppo selezionato? - - - - UserDialog - - - User Settings - Impostazioni utente - - - - General - Generali - - - - Full name: - Nome completo: - - - - Login name: - Nome al Login: - - - - Set password: - Scegli il password: - - - - User ID: - ID utente - - - - Main group: - Gruppo principale: - - - - Advanced - Avanzate: - - - - Login shell: - Shell del login: - - - - Home directory: - Cartella home: - - - - Change password: - Cambia password: - - - - - - Error - Errore - - - - The user ID is in use. - ID già in uso. - - - - The user name cannot be empty. - Il nome non può essere vuoto. - - - - The user name is in use. - Il nome è già in uso. - - - - Confirm - Conferma - - - - Are you sure you want to use an "empty password" for the user? - Si è sicuro di volere un password vuoto per l'utente? - - - diff --git a/lxqt-admin-user/translations/lxqt-admin-user_ja.ts b/lxqt-admin-user/translations/lxqt-admin-user_ja.ts deleted file mode 100644 index c26805c..0000000 --- a/lxqt-admin-user/translations/lxqt-admin-user_ja.ts +++ /dev/null @@ -1,263 +0,0 @@ - - - - - GroupDialog - - - Group Settings - グループ設定 - - - - Group name: - グループ名: - - - - Group ID: - グループID: - - - - Users belong to this group: - このグループに属しているユーザー: - - - - - - Error - エラー - - - - The group ID is in use. - そのグループIDはすでに使われています - - - - The group name cannot be empty. - グループ名を入力する必要があります - - - - The group name is in use. - そのグループ名はすでに使われています - - - - MainWindow - - - User and Group Settings - ユーザーとグループの設定 - - - - &Users - ユーザー(&U) - - - - Login Name - ログイン名 - - - - User ID - ユーザーID - - - - Full Name - フルネーム - - - - Group - グループ - - - - Home Directory - ホームディレクトリー - - - - Show system users (for advanced users only) - システムユーザーを表示(上級者専用) - - - - &Groups - グループ(&G) - - - - Name - 名前 - - - - Group ID - グループID - - - - toolBar - ツールバー - - - - Add - 追加 - - - - Add new users or groups - 新しいユーザーまたはグループを追加 - - - - Delete - 削除 - - - - Delete selected item - 選択した項目を削除 - - - - Properties - プロパティー - - - - edit properties of the selected item - 選択した項目のプロパティーを編集 - - - - Refresh - 再読込み - - - - Refresh the lists - リストを再読込み - - - - Error - エラー - - - - - Confirm - 確認 - - - - Are you sure you want to delete the selected user? - 本当に、選択したユーザーを削除してよいですか？ - - - - Are you sure you want to delete the selected group? - 本当に、選択したグループを削除してよいですか？ - - - - UserDialog - - - User Settings - ユーザー設定 - - - - General - 一般 - - - - Full name: - フルネーム: - - - - Login name: - ログイン名: - - - - Set password: - パスワードを設定: - - - - User ID: - ユーザーID: - - - - Main group: - メイングループ: - - - - Advanced - 高度 - - - - Login shell: - ログインシェル: - - - - Home directory: - ホームディレクトリー: - - - - Change password: - パスワードを変更: - - - - - - Error - エラー - - - - The user ID is in use. - そのユーザーIDはすでに使われています - - - - The user name cannot be empty. - ユーザー名を入力する必要があります - - - - The user name is in use. - そのユーザー名はすでに使われています - - - - Confirm - 確認 - - - - Are you sure you want to use an "empty password" for the user? - 本当に、空のパスワードをそのユーザーに設定してよいですか？ - - - diff --git a/lxqt-admin-user/translations/lxqt-admin-user_pl.ts b/lxqt-admin-user/translations/lxqt-admin-user_pl.ts deleted file mode 100644 index 104584b..0000000 --- a/lxqt-admin-user/translations/lxqt-admin-user_pl.ts +++ /dev/null @@ -1,263 +0,0 @@ - - - - - GroupDialog - - - Group Settings - Ustawienia Grup - - - - Group name: - Nazwa grupy: - - - - Group ID: - ID grupy: - - - - Users belong to this group: - Użytkownicy należący do tej grupy: - - - - - - Error - Błąd - - - - The group ID is in use. - ID grupy jest już w użyciu. - - - - The group name cannot be empty. - Nazwa grupy nie może być pusta. - - - - The group name is in use. - Ta nazwa grupy jest już w użyciu. - - - - MainWindow - - - User and Group Settings - Ustawienia użytkowników i grup - - - - &Users - &Użytkownicy - - - - Login Name - Login - - - - User ID - ID użytkownika - - - - Full Name - Pełna nazwa - - - - Group - Grupa - - - - Home Directory - Katalog domowy - - - - Show system users (for advanced users only) - Pokaż użytkowników systemowych (dla zaawansowanych) - - - - &Groups - &Grupy - - - - Name - Nazwa - - - - Group ID - ID grupy - - - - toolBar - Pasek narzędzi - - - - Add - Dodaj - - - - Add new users or groups - Dodaj nowych użytkowników lub grupy - - - - Delete - Usuń - - - - Delete selected item - Usuń zaznaczoną pozycję - - - - Properties - Właściwości - - - - edit properties of the selected item - edytuj właściwości dla wybranej pozycji - - - - Refresh - Odśwież - - - - Refresh the lists - Odśwież listę - - - - Error - Błąd - - - - - Confirm - Potwierdzenie - - - - Are you sure you want to delete the selected user? - Czy na pewno chcesz usunąć wybranego użytkownika? - - - - Are you sure you want to delete the selected group? - Czy na pewno chcesz usunąć wybraną grupę? - - - - UserDialog - - - User Settings - Ustawienia użytkownika - - - - General - Ogólne - - - - Full name: - Pełna nazwa: - - - - Login name: - Login: - - - - Set password: - Ustaw hasło: - - - - User ID: - ID użytkownika: - - - - Main group: - Grupa główna: - - - - Advanced - Zaawansowane - - - - Login shell: - Powłoka: - - - - Home directory: - Katalog domowy: - - - - Change password: - Zmień hasło: - - - - - - Error - Błąd - - - - The user ID is in use. - To ID użytkownika jest już w użyciu. - - - - The user name cannot be empty. - Nazwa użytkownika nie może być pusta. - - - - The user name is in use. - Ta nazwa użytkownika jest już w użyciu. - - - - Confirm - Potwierdzenie - - - - Are you sure you want to use an "empty password" for the user? - Czy na pewno chcesz użyć "pustego hasła" dla tego użytkownika? - - - diff --git a/lxqt-admin-user/translations/lxqt-admin-user_pt.ts b/lxqt-admin-user/translations/lxqt-admin-user_pt.ts deleted file mode 100644 index c3eb94e..0000000 --- a/lxqt-admin-user/translations/lxqt-admin-user_pt.ts +++ /dev/null @@ -1,263 +0,0 @@ - - - - - GroupDialog - - - Group Settings - Definições de grupo - - - - Group name: - Nome do grupo: - - - - Group ID: - ID do grupo: - - - - Users belong to this group: - Utilizadores pertencentes a este grupo: - - - - - - Error - Erro - - - - The group ID is in use. - O ID do grupo já está em utilização. - - - - The group name cannot be empty. - O nome do grupo não pode estar vazio. - - - - The group name is in use. - O nome do grupo já está em utilização. - - - - MainWindow - - - User and Group Settings - Definições de grupo e utilizador - - - - &Users - &Utilizadores - - - - Login Name - Nome de acesso - - - - User ID - ID de utilizador - - - - Full Name - Nome completo - - - - Group - Grupo - - - - Home Directory - Pasta pessoal - - - - Show system users (for advanced users only) - Mostrar utilizadores de sistema - - - - &Groups - &Grupos - - - - Name - Nome - - - - Group ID - ID do grupo - - - - toolBar - Barra de ferramentas - - - - Add - Adicionar - - - - Add new users or groups - Adicionar utilizadores ou grupos - - - - Delete - Eliminar - - - - Delete selected item - Eliminar item selecionado - - - - Properties - Propriedades - - - - edit properties of the selected item - Editar propriedades do item selecionado - - - - Refresh - Atualizar - - - - Refresh the lists - Atualizar as listas - - - - Error - Erro - - - - - Confirm - Confirmação - - - - Are you sure you want to delete the selected user? - Tem a certeza que quer eliminar o utilizador selecionado? - - - - Are you sure you want to delete the selected group? - Tem a certeza que quer eliminar o grupo selecionado? - - - - UserDialog - - - User Settings - Definições de utilizador - - - - General - Geral - - - - Full name: - Nome completo: - - - - Login name: - Nome de acesso: - - - - Set password: - Definir senha: - - - - User ID: - ID de utilizador: - - - - Main group: - Grupo principal: - - - - Advanced - Avançado - - - - Login shell: - Consola de acesso: - - - - Home directory: - Pasta pessoal: - - - - Change password: - Mudar senha: - - - - - - Error - Erro - - - - The user ID is in use. - O ID do utilizador já está em utilização. - - - - The user name cannot be empty. - O nome de utilizador não pode estar vazio. - - - - The user name is in use. - O nome de utilizador já está em utilização. - - - - Confirm - Confirmação - - - - Are you sure you want to use an "empty password" for the user? - Tem a certeza que quer definir uma senha vazia para o utilizador? - - - diff --git a/lxqt-admin-user/translations/lxqt-admin-user_ru.ts b/lxqt-admin-user/translations/lxqt-admin-user_ru.ts deleted file mode 100644 index b20efea..0000000 --- a/lxqt-admin-user/translations/lxqt-admin-user_ru.ts +++ /dev/null @@ -1,263 +0,0 @@ - - - - - GroupDialog - - - Group Settings - Настройки группы - - - - Group name: - Имя группы: - - - - Group ID: - ID группы: - - - - Users belong to this group: - Пользователи, относящиеся к этой группе: - - - - - - Error - Ошибка - - - - The group ID is in use. - ID группы уже используется. - - - - The group name cannot be empty. - Имя группы не может быть пустым. - - - - The group name is in use. - Имя группы уже используется. - - - - MainWindow - - - User and Group Settings - Настройки пользователя и группы - - - - &Users - &Пользователи - - - - Login Name - Логин пользователя - - - - User ID - ID пользователя - - - - Full Name - Полное имя - - - - Group - Группа - - - - Home Directory - Домашний каталог - - - - Show system users (for advanced users only) - Показывать системных пользователей (только для продвинутых пользователей) - - - - &Groups - &Группы - - - - Name - Имя - - - - Group ID - ID группы - - - - toolBar - Панель - - - - Add - Добавить - - - - Add new users or groups - Добавить новых пользователей или группы - - - - Delete - Удалить - - - - Delete selected item - Удалить выбранный элемент - - - - Properties - Свойства - - - - edit properties of the selected item - Редактировать свойства выделенного элемента - - - - Refresh - Обновить - - - - Refresh the lists - Обновить список - - - - Error - Ошибка - - - - - Confirm - Подтвердить - - - - Are you sure you want to delete the selected user? - Вы действительно хотите удалить выбранного пользователя? - - - - Are you sure you want to delete the selected group? - Вы действительно хотите удалить выбранную группу? - - - - UserDialog - - - User Settings - Настройки пользователя - - - - General - Общие - - - - Full name: - Полное имя: - - - - Login name: - Логин пользователя: - - - - Set password: - Установить пароль: - - - - User ID: - ID пользователя: - - - - Main group: - Главная группа: - - - - Advanced - Расширенные - - - - Login shell: - Оболочка: - - - - Home directory: - Домашний каталог: - - - - Change password: - Изменить пароль: - - - - - - Error - Ошибка - - - - The user ID is in use. - Пользовательский ID уже используется. - - - - The user name cannot be empty. - Имя пользователя не может быть пустым. - - - - The user name is in use. - Имя пользователя уже используется. - - - - Confirm - Подтвердить - - - - Are you sure you want to use an "empty password" for the user? - Вы действительно хотите использовать пустой пароль для этого пользователя? - - - diff --git a/lxqt-admin-user/translations/lxqt-admin-user_ru_RU.desktop b/lxqt-admin-user/translations/lxqt-admin-user_ru_RU.desktop deleted file mode 100644 index 372cdf4..0000000 --- a/lxqt-admin-user/translations/lxqt-admin-user_ru_RU.desktop +++ /dev/null @@ -1,6 +0,0 @@ -[Desktop Entry] -Name[ru_RU]=Пользователи и группы -GenericName[ru_RU]=Настройки пользователей и групп -Comment[ru_RU]=Настроить пользователей и группы вашей системы - -#TRANSLATIONS_DIR=translations diff --git a/lxqt-admin-user/translations/lxqt-admin-user_ru_RU.ts b/lxqt-admin-user/translations/lxqt-admin-user_ru_RU.ts deleted file mode 100644 index 6cfc4da..0000000 --- a/lxqt-admin-user/translations/lxqt-admin-user_ru_RU.ts +++ /dev/null @@ -1,263 +0,0 @@ - - - - - GroupDialog - - - Group Settings - Настройки группы - - - - Group name: - Имя группы: - - - - Group ID: - ID группы: - - - - Users belong to this group: - Пользователи, относящиеся к этой группе: - - - - - - Error - Ошибка - - - - The group ID is in use. - ID группы уже используется. - - - - The group name cannot be empty. - Имя группы не может быть пустым. - - - - The group name is in use. - Имя группы уже используется. - - - - MainWindow - - - User and Group Settings - Настройки пользователя и группы - - - - &Users - &Пользователи - - - - Login Name - Логин пользователя - - - - User ID - ID пользователя - - - - Full Name - Полное имя - - - - Group - Группа - - - - Home Directory - Домашний каталог - - - - Show system users (for advanced users only) - Показывать системных пользователей (только для продвинутых пользователей) - - - - &Groups - &Группы - - - - Name - Имя - - - - Group ID - ID группы - - - - toolBar - Панель - - - - Add - Добавить - - - - Add new users or groups - Добавить новых пользователей или группы - - - - Delete - Удалить - - - - Delete selected item - Удалить выбранный элемент - - - - Properties - Свойства - - - - edit properties of the selected item - Редактировать свойства выделенного элемента - - - - Refresh - Обновить - - - - Refresh the lists - Обновить список - - - - Error - Ошибка - - - - - Confirm - Подтвердить - - - - Are you sure you want to delete the selected user? - Вы действительно хотите удалить выбранного пользователя? - - - - Are you sure you want to delete the selected group? - Вы действительно хотите удалить выбранную группу? - - - - UserDialog - - - User Settings - Настройки пользователя - - - - General - Общие - - - - Full name: - Полное имя: - - - - Login name: - Логин пользователя: - - - - Set password: - Установить пароль: - - - - User ID: - ID пользователя: - - - - Main group: - Главная группа: - - - - Advanced - Расширенные - - - - Login shell: - Оболочка: - - - - Home directory: - Домашний каталог: - - - - Change password: - Изменить пароль: - - - - - - Error - Ошибка - - - - The user ID is in use. - Пользовательский ID уже используется. - - - - The user name cannot be empty. - Имя пользователя не может быть пустым. - - - - The user name is in use. - Имя пользователя уже используется. - - - - Confirm - Подтвердить - - - - Are you sure you want to use an "empty password" for the user? - Вы действительно хотите использовать пустой пароль для этого пользователя? - - - diff --git a/lxqt-admin-user/userdialog.cpp b/lxqt-admin-user/userdialog.cpp index 292df06..7dbd770 100644 --- a/lxqt-admin-user/userdialog.cpp +++ b/lxqt-admin-user/userdialog.cpp @@ -20,76 +20,65 @@ #include "userdialog.h" #include +#include +#include +#include "usermanager.h" #define DEFAULT_UID_MIN 1000 #define DEFAULT_UID_MAX 32768 -UserDialog::UserDialog(OobsUser* user, QWidget* parent): - QDialog(), - mUser(user ? OOBS_USER(g_object_ref(user)) : NULL), +UserDialog::UserDialog(UserManager* userManager, UserInfo* user, QWidget* parent): + QDialog(parent), + mUserManager(userManager), + mUser(user), mFullNameChanged(false), mHomeDirChanged(false) { ui.setupUi(this); - + bool isNewUser = (user->uid() == 0 && user->name().isEmpty()); // load all groups - OobsGroupsConfig* groupsConfig = OOBS_GROUPS_CONFIG(oobs_groups_config_get()); - OobsList* groups = oobs_groups_config_get_groups(groupsConfig); - if(groups) + for(const GroupInfo* group: mUserManager->groups()) { - OobsListIter it; - gboolean valid = oobs_list_get_iter_first(groups, &it); - while(valid) + ui.mainGroup->addItem(group->name()); + + QListWidgetItem* item = new QListWidgetItem(); + item->setText(group->name()); + item->setFlags(Qt::ItemIsEnabled|Qt::ItemIsUserCheckable|Qt::ItemIsSelectable); + if(!isNewUser) { - OobsGroup* group = OOBS_GROUP(oobs_list_get(groups, &it)); - ui.mainGroup->addItem(oobs_group_get_name(group)); - valid = oobs_list_iter_next(groups, &it); + if(group->hasMember(user->name()) || user->gid() == group->gid()) // the user is in this group + item->setCheckState(Qt::Checked); + else + item->setCheckState(Qt::Unchecked); } + else + item->setCheckState(Qt::Unchecked); + ui.groupList->addItem(item); } - connect(ui.loginName, SIGNAL(textChanged(QString)), SLOT(onLoginNameChanged(QString))); - OobsUsersConfig* userConfig = OOBS_USERS_CONFIG(oobs_users_config_get()); - - // add known shells to the combo box for selection - GList* shells = oobs_users_config_get_available_shells(userConfig); - for(GList* l = shells; l; l = l->next) - { - const char* shell = (const char*)l->data; - ui.loginShell->addItem(QLatin1String(shell)); - } + ui.loginShell->addItems(mUserManager->availableShells()); - if(user) // edit an existing user + if(isNewUser) // new user { - mOldUid = oobs_user_get_uid(user); - ui.loginName->setReadOnly(true); - ui.loginName->setText(oobs_user_get_login_name(user)); - ui.changePasswd->setText(tr("Change password:")); - ui.uid->setValue(mOldUid); - ui.fullName->setText(oobs_user_get_full_name(user)); - ui.loginShell->setEditText(oobs_user_get_shell(user)); - ui.homeDir->setText(QString::fromLocal8Bit(oobs_user_get_home_directory(user))); - - OobsGroup* group = oobs_user_get_main_group(user); - ui.mainGroup->setEditText(oobs_group_get_name(group)); + ui.mainGroup->setCurrentIndex(-1); + ui.loginShell->setCurrentIndex(-1); } - else // create a new user + else // edit an existing user { - mOldUid = -1; - ui.loginName->setReadOnly(false); - ui.loginName->setFocus(); - ui.changePasswd->setChecked(true); - ui.uid->setValue(oobs_users_config_find_free_uid(userConfig, DEFAULT_UID_MIN, DEFAULT_UID_MAX)); - ui.loginShell->setEditText(oobs_users_config_get_default_shell(userConfig)); - ui.mainGroup->setCurrentIndex(-1); + ui.loginName->setText(user->name()); + ui.uid->setValue(user->uid()); + ui.fullName->setText(user->fullName()); + ui.loginShell->setEditText(user->shell()); + ui.homeDir->setText(user->homeDir()); + GroupInfo* group = userManager->findGroupInfo(user->gid()); + if(group) + ui.mainGroup->setEditText(group->name()); } - } UserDialog::~UserDialog() { - if(mUser) - g_object_unref(mUser); } void UserDialog::onLoginNameChanged(const QString& text) @@ -121,61 +110,33 @@ void UserDialog::onHomeDirChanged(const QString& text) void UserDialog::accept() { - OobsUsersConfig* usersConfig = OOBS_USERS_CONFIG(oobs_users_config_get()); - uid_t uid = ui.uid->value(); - if(uid != mOldUid && oobs_users_config_is_uid_used(usersConfig, uid)) + mUser->setUid(ui.uid->value()); + QString loginName = ui.loginName->text(); + if(loginName.isEmpty()) { - QMessageBox::critical(this, tr("Error"), tr("The user ID is in use.")); + QMessageBox::critical(this, tr("Error"), tr("The user name cannot be empty.")); return; } + mUser->setName(loginName); + mUser->setFullName(ui.fullName->text()); - bool createNew; - if(mUser) - createNew = false; - else - { - createNew = true; - QByteArray loginName = ui.loginName->text().toLatin1(); - if(loginName.isEmpty()) - { - QMessageBox::critical(this, tr("Error"), tr("The user name cannot be empty.")); - return; - } - if(oobs_users_config_is_login_used(usersConfig, loginName)) - { - QMessageBox::critical(this, tr("Error"), tr("The user name is in use.")); - return; - } - mUser = oobs_user_new(loginName); - } - oobs_user_set_uid(mUser, uid); + mUser->setHomeDir(ui.homeDir->text()); - QByteArray fullName = ui.fullName->text().toUtf8(); - oobs_user_set_full_name(mUser, fullName); + // main group + QString groupName = ui.mainGroup->currentText(); + if(!groupName.isEmpty()) { + GroupInfo* group = mUserManager->findGroupInfo(groupName); + if(group) + mUser->setGid(group->gid()); + } - // change password - if(ui.changePasswd->isChecked()) - { - QByteArray passwd = ui.passwd->text().toLatin1(); - if(passwd.isEmpty()) // show warnings if the password is empty - { - if(QMessageBox::warning(this, tr("Confirm"), tr("Are you sure you want to use an \"empty password\" for the user?"), QMessageBox::Yes|QMessageBox::No) == QMessageBox::Yes) - oobs_user_set_password_empty(mUser, true); + // other groups + mUser->removeAllGroups(); + for(int row = 0; row < ui.groupList->count(); ++row) { + QListWidgetItem* item = ui.groupList->item(row); + if(item->checkState() == Qt::Checked) { + mUser->addGroup(item->text()); } - else - oobs_user_set_password(mUser, passwd); } - - QByteArray homeDir = ui.homeDir->text().toLocal8Bit(); - oobs_user_set_home_directory(mUser, homeDir); - - // main group - OobsGroupsConfig* groupsConfig = OOBS_GROUPS_CONFIG(oobs_groups_config_get()); - QByteArray groupName = ui.mainGroup->currentText().toLatin1(); - OobsGroup* group = oobs_groups_config_get_from_name(groupsConfig, groupName); - oobs_user_set_main_group(mUser, group); - - if(!createNew) - oobs_object_commit_async(OOBS_OBJECT(mUser), NULL, NULL); QDialog::accept(); } diff --git a/lxqt-admin-user/userdialog.h b/lxqt-admin-user/userdialog.h index 23bb8ee..368787d 100644 --- a/lxqt-admin-user/userdialog.h +++ b/lxqt-admin-user/userdialog.h @@ -23,23 +23,19 @@ #include #include "ui_userdialog.h" -#include -#include -#include +#include "usermanager.h" + +class UserManager; +class UserInfo; class UserDialog : public QDialog { Q_OBJECT public: - UserDialog(OobsUser* user = NULL, QWidget* parent = NULL); + UserDialog(UserManager* userManager, UserInfo* user, QWidget* parent = nullptr); ~UserDialog(); - OobsUser* user() - { - return mUser; - } - virtual void accept(); private Q_SLOTS: @@ -49,14 +45,8 @@ private Q_SLOTS: private: Ui::UserDialog ui; - OobsUser* mUser; - uid_t mOldUid; -#if 0 - QByteArray mOldLoginName; - QByteArray mOldFullName; - QByteArray mOldGroupName; - QByteArray mOldHomeDir; -#endif + UserManager* mUserManager; + UserInfo* mUser; bool mFullNameChanged; bool mHomeDirChanged; diff --git a/lxqt-admin-user/userdialog.ui b/lxqt-admin-user/userdialog.ui index 4e349cc..7e226c7 100644 --- a/lxqt-admin-user/userdialog.ui +++ b/lxqt-admin-user/userdialog.ui @@ -27,16 +27,6 @@ QFormLayout::AllNonFixedFieldsGrow - - - - Full name: - - - - - - @@ -48,44 +38,40 @@ - + - Set password: + Full name: - - - false - - - QLineEdit::Password + + + + + + User ID: - + + + Default + 32768 - - - User ID: - - - - Main group: - + true @@ -94,6 +80,30 @@ + + + Groups + + + + + + The user belongs to the following groups: + + + + + + + + 0 + 1 + + + + + + Advanced @@ -173,21 +183,5 @@ - - changePasswd - toggled(bool) - passwd - setEnabled(bool) - - - 71 - 125 - - - 192 - 129 - - - diff --git a/lxqt-admin-user/usermanager.cpp b/lxqt-admin-user/usermanager.cpp new file mode 100644 index 0000000..0238948 --- /dev/null +++ b/lxqt-admin-user/usermanager.cpp @@ -0,0 +1,393 @@ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * (c)LGPL2+ + * + * LXQt - a lightweight, Qt based, desktop toolset + * http://lxqt.org + * + * Copyright: 2016 LXQt team + * Authors: + * Hong Jen Yee (PCMan) + * + * This program or library is free software; you can redistribute it + * and/or modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA + * + * END_COMMON_COPYRIGHT_HEADER */ + +#include "usermanager.h" +#include +#include +#include +#include +#include +#include +#include +#include + +static const QString PASSWD_FILE = QStringLiteral("/etc/passwd"); +static const QString GROUP_FILE = QStringLiteral("/etc/group"); +static const QString LOGIN_DEFS_FILE = QStringLiteral("/etc/login.defs"); + +UserManager::UserManager(QObject *parent): + QObject(parent), + mWatcher(new QFileSystemWatcher(QStringList() << PASSWD_FILE << GROUP_FILE, this)) +{ + loadUsersAndGroups(); + connect(mWatcher, &QFileSystemWatcher::fileChanged, this, &UserManager::onFileChanged); +} + +UserManager::~UserManager() { + qDeleteAll(mUsers); + qDeleteAll(mGroups); +} + +void UserManager::loadUsersAndGroups() +{ + // load groups + setgrent(); + struct group * grp; + while((grp = getgrent())) { + GroupInfo* group = new GroupInfo(grp); + mGroups.append(group); + // add members of this group + for(char** member_name = grp->gr_mem; *member_name; ++member_name) { + group->addMember(QString::fromLatin1(*member_name)); + } + } + endgrent(); + std::sort(mGroups.begin(), mGroups.end(), [](GroupInfo* g1, GroupInfo* g2) { + return g1->name() < g2->name(); + }); + + // load users + setpwent(); + struct passwd * pw; + while((pw = getpwent())) { + UserInfo* user = new UserInfo(pw); + mUsers.append(user); + // add groups to this user + for(const GroupInfo* group: mGroups) { + if(group->hasMember(user->name())) { + user->addGroup(group->name()); + } + } + } + endpwent(); + std::sort(mUsers.begin(), mUsers.end(), [](UserInfo*& u1, UserInfo*& u2) { + return u1->name() < u2->name(); + }); +} + +// load settings from /etc/login.defs +void UserManager::loadLoginDefs() { + // FIXME: parse /etc/login.defs to get max UID, max system UID...etc. + QFile file(LOGIN_DEFS_FILE); + if(file.open(QIODevice::ReadOnly)) { + while(!file.atEnd()) { + QByteArray line = file.readLine().trimmed(); + if(line.isEmpty() || line.startsWith('#')) + continue; + QStringList parts = QString::fromUtf8(line).split(QRegExp("\\s"), QString::SkipEmptyParts); + if(parts.length() >= 2) { + QString& key = parts[0]; + QString& val = parts[1]; + if(key == QLatin1Literal("SYS_UID_MIN")) { + } + else if(key == QLatin1Literal("SYS_UID_MAX")) { + } + else if(key == QLatin1Literal("UID_MIN")) { + } + else if(key == QLatin1Literal("UID_MAX")) { + } + else if(key == QLatin1Literal("SYS_GID_MIN")) { + } + else if(key == QLatin1Literal("SYS_GID_MAX")) { + } + else if(key == QLatin1Literal("GID_MIN")) { + } + else if(key == QLatin1Literal("GID_MAX")) { + } + } + } + file.close(); + } +} + + +UserInfo* UserManager::findUserInfo(const char* name) { + auto it = std::find_if(mUsers.begin(), mUsers.end(), [name](const UserInfo* user) { + return user->name() == name; + }); + return it != mUsers.end() ? *it : nullptr; +} + +UserInfo* UserManager::findUserInfo(QString name) { + auto it = std::find_if(mUsers.begin(), mUsers.end(), [name](const UserInfo* user) { + return user->name() == name; + }); + return it != mUsers.end() ? *it : nullptr; +} + +UserInfo* UserManager::findUserInfo(uid_t uid) { + auto it = std::find_if(mUsers.begin(), mUsers.end(), [uid](const UserInfo* user) { + return user->uid() == uid; + }); + return it != mUsers.end() ? *it : nullptr; +} + +GroupInfo* UserManager::findGroupInfo(const char* name) { + auto it = std::find_if(mGroups.begin(), mGroups.end(), [name](const GroupInfo* group) { + return group->name() == name; + }); + return it != mGroups.end() ? *it : nullptr; +} + +GroupInfo* UserManager::findGroupInfo(QString name) { + auto it = std::find_if(mGroups.begin(), mGroups.end(), [name](const GroupInfo* group) { + return group->name() == name; + }); + return it != mGroups.end() ? *it : nullptr; +} + +GroupInfo* UserManager::findGroupInfo(gid_t gid) { + auto it = std::find_if(mGroups.begin(), mGroups.end(), [gid](const GroupInfo* group) { + return group->gid() == gid; + }); + return it != mGroups.end() ? *it : nullptr; +} + +void UserManager::reload() { + mWatcher->addPath(PASSWD_FILE); + mWatcher->addPath(GROUP_FILE); + + qDeleteAll(mUsers); // free the old UserInfo objects + mUsers.clear(); + + qDeleteAll(mGroups); // free the old GroupInfo objects + mGroups.clear(); + + loadUsersAndGroups(); + Q_EMIT changed(); +} + +void UserManager::onFileChanged(const QString &path) { + // QFileSystemWatcher is very broken and has a ridiculous design. + // we get "fileChanged()" when the file is deleted or modified, + // but there is no way to distinguish them. If the file is deleted, + // the QFileSystemWatcher stop working silently. Hence we workaround + // this by remove the paths from the watcher and add them back again + // to force the creation of new notifiers. + mWatcher->removePath(PASSWD_FILE); + mWatcher->removePath(GROUP_FILE); + QTimer::singleShot(500, this, &UserManager::reload); +} + +bool UserManager::pkexec(const QStringList& command, const QByteArray& stdinData) { + Q_ASSERT(!command.isEmpty()); + QProcess process; + qDebug() << command; + QStringList args; + args << QStringLiteral("--disable-internal-agent") + << QStringLiteral("lxqt-admin-user-helper") + << command; + process.start(QStringLiteral("pkexec"), args); + if(!stdinData.isEmpty()) { + process.waitForStarted(); + process.write(stdinData); + process.waitForBytesWritten(); + process.closeWriteChannel(); + } + process.waitForFinished(-1); + QByteArray pkexec_error = process.readAllStandardError(); + qDebug() << pkexec_error; + const bool succeeded = process.exitCode() == 0; + if (!succeeded) + { + QMessageBox * msg = new QMessageBox{QMessageBox::Critical, tr("lxqt-admin-user") + , tr("Action (%1) failed:
%2
").arg(command[0]).arg(pkexec_error.constData())}; + msg->setAttribute(Qt::WA_DeleteOnClose, true); + msg->show(); + } + return succeeded; +} + +bool UserManager::addUser(UserInfo* user) { + if(!user || user->name().isEmpty()) + return false; + QStringList command; + command << QStringLiteral("useradd"); + if(user->uid() != 0) { + command << QStringLiteral("-u") << QString::number(user->uid()); + } + if(!user->homeDir().isEmpty()) { + command << QStringLiteral("-d") << user->homeDir(); + command << QStringLiteral("-m"); // create the user's home directory if it does not exist. + } + if(!user->shell().isEmpty()) { + command << QStringLiteral("-s") << user->shell(); + } + if(!user->fullName().isEmpty()) { + command << QStringLiteral("-c") << user->fullName(); + } + if(user->gid() != 0) { + command << QStringLiteral("-g") << QString::number(user->gid()); + } + if(!user->groups().isEmpty()) { // set group membership + command << QStringLiteral("-G") << user->groups().join(','); + } + command << user->name(); + return pkexec(command); +} + +bool UserManager::modifyUser(UserInfo* user, UserInfo* newSettings) { + if(!user || user->name().isEmpty() || !newSettings) + return false; + + QStringList command; + command << QStringLiteral("usermod"); + if(newSettings->uid() != user->uid()) + command << QStringLiteral("-u") << QString::number(newSettings->uid()); + + if(newSettings->homeDir() != user->homeDir()) { + command << QStringLiteral("-d") << newSettings->homeDir(); + // command << QStringLiteral("-m"); // create the user's home directory if it does not exist. + } + if(newSettings->shell() != user->shell()) { + command << QStringLiteral("-s") << newSettings->shell(); + } + + if(newSettings->fullName() != user->fullName()) + command << QStringLiteral("-c") << newSettings->fullName(); + if(newSettings->gid() != user->gid()) + command << QStringLiteral("-g") << QString::number(newSettings->gid()); + + if(newSettings->name() != user->name()) // change login name + command << QStringLiteral("-l") << newSettings->name(); + + if(newSettings->groups() != user->groups()) { // change group membership + command << QStringLiteral("-G") << newSettings->groups().join(','); + } + + command << user->name(); + return pkexec(command); +} + +bool UserManager::deleteUser(UserInfo* user) { + if(!user || user->name().isEmpty()) + return false; + + QStringList command; + command << QStringLiteral("userdel"); + command << user->name(); + return pkexec(command); +} + +bool UserManager::changePassword(UserInfo* user, QByteArray newPasswd) { + // In theory, the current user should be able to use "passwd" to + // reset his/her own password without root permission, but... + // /usr/bin/passwd is a setuid program running as root and QProcess + // does not seem to capture its stdout... So... requires root for now. + if(geteuid() == user->uid()) { + // FIXME: there needs to be a way to let a user change his/her own password. + // Maybe we can use our pkexec helper script to achieve this. + } + QStringList command; + command << QStringLiteral("passwd"); + command << user->name(); + + // we need to type the new password for two times. + QByteArray stdinData; + stdinData += newPasswd; + stdinData += "\n"; + stdinData += newPasswd; + stdinData += "\n"; + return pkexec(command, stdinData); +} + +bool UserManager::addGroup(GroupInfo* group) { + if(!group || group->name().isEmpty()) + return false; + + QStringList command; + command << QStringLiteral("groupadd"); + if(group->gid() != 0) { + command << QStringLiteral("-g") << QString::number(group->gid()); + } + command << group->name(); + return pkexec(command); +} + +bool UserManager::modifyGroup(GroupInfo* group, GroupInfo* newSettings) { + if(!group || group->name().isEmpty() || !newSettings) + return false; + QStringList command; + command << QStringLiteral("groupmod"); + if(newSettings->gid() != group->gid()) + command << QStringLiteral("-g") << QString::number(newSettings->gid()); + if(newSettings->name() != group->name()) + command << QStringLiteral("-n") << newSettings->name(); + command << group->name(); + if(!pkexec(command)) + return false; + + // if group members are changed, use gpasswd to reset members + if(newSettings->members() != group->members()) { + command.clear(); + command << QStringLiteral("gpasswd"); + command << QStringLiteral("-M"); // Set the list of group members. + command << newSettings->members().join(','); + command << group->name(); + return pkexec(command); + } + return true; +} + +bool UserManager::deleteGroup(GroupInfo* group) { + if(!group || group->name().isEmpty()) + return false; + QStringList command; + command << QStringLiteral("groupdel"); + command << group->name(); + return pkexec(command); +} + +bool UserManager::changePassword(GroupInfo* group, QByteArray newPasswd) { + QStringList command; + command << QStringLiteral("gpasswd"); + command << group->name(); + + // we need to type the new password for two times. + QByteArray stdinData = newPasswd; + stdinData += "\n"; + stdinData += newPasswd; + stdinData += "\n"; + return pkexec(command, stdinData); +} + +const QStringList& UserManager::availableShells() { + if(mAvailableShells.isEmpty()) { + QFile file("/etc/shells"); + if(file.open(QIODevice::ReadOnly)) { + while(!file.atEnd()) { + QByteArray line = file.readLine().trimmed(); + if(line.isEmpty() || line.startsWith('#')) + continue; + mAvailableShells.append(QString::fromLocal8Bit(line)); + } + file.close(); + } + } + return mAvailableShells; +} + diff --git a/lxqt-admin-user/usermanager.h b/lxqt-admin-user/usermanager.h new file mode 100644 index 0000000..648a609 --- /dev/null +++ b/lxqt-admin-user/usermanager.h @@ -0,0 +1,239 @@ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * (c)LGPL2+ + * + * LXQt - a lightweight, Qt based, desktop toolset + * http://lxqt.org + * + * Copyright: 2016 LXQt team + * Authors: + * Hong Jen Yee (PCMan) + * + * This program or library is free software; you can redistribute it + * and/or modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA + * + * END_COMMON_COPYRIGHT_HEADER */ + +#ifndef USERMANAGER_H +#define USERMANAGER_H + +#include +#include +#include +#include +#include + +class QFileSystemWatcher; + +class UserInfo +{ +public: + explicit UserInfo():mUid(0), mGid(0) { + } + explicit UserInfo(struct passwd* pw): + mUid(pw->pw_uid), + mGid(pw->pw_gid), + mName(QString::fromLatin1(pw->pw_name)), + mFullName(QString::fromUtf8(pw->pw_gecos)), + mShell(QString::fromLocal8Bit(pw->pw_shell)), + mHomeDir(QString::fromLocal8Bit(pw->pw_dir)) + { + } + + uid_t uid()const { + return mUid; + } + void setUid(uid_t uid) { + mUid = uid; + } + + gid_t gid() const { + return mGid; + } + + void setGid(gid_t gid) { + mGid = gid; + } + + QString name() const { + return mName; + } + + void setName(const QString& name) { + mName = name; + } + + QString fullName() const { + return mFullName; + } + void setFullName(const QString& fullName) { + mFullName = fullName; + } + + QString shell() const { + return mShell; + } + void setShell(const QString& shell) { + mShell = shell; + } + + QString homeDir() const { + return mHomeDir; + } + void setHomeDir(const QString& homeDir) { + mHomeDir = homeDir; + } + + const QStringList& groups() const { + return mGroups; + } + + void addGroup(const QString& group) { + mGroups.append(group); + } + + void removeGroup(const QString& group) { + mGroups.removeOne(group); + } + + void removeAllGroups() { + mGroups.clear(); + } + + bool hasGroup(const QString& group) { + return mGroups.contains(group); + } + +private: + uid_t mUid; + gid_t mGid; + QString mName; + QString mFullName; + QString mShell; + QString mHomeDir; + QStringList mGroups; +}; + +class GroupInfo +{ +public: + explicit GroupInfo(): mGid(0) { + } + explicit GroupInfo(struct group* grp): + mGid(grp->gr_gid), + mName(grp->gr_name) + { + } + + gid_t gid() const { + return mGid; + } + void setGid(gid_t gid) { + mGid = gid; + } + + QString name() const { + return mName; + } + void setName(const QString& name) { + mName = name; + } + + const QStringList& members() const { + return mMembers; + } + + void setMembers(const QStringList& members) { + mMembers = members; + } + + void addMember(const QString& userName) { + mMembers.append(userName); + } + + void removeMember(const QString& userName) { + mMembers.removeOne(userName); + } + + void removeAllMemberss() { + mMembers.clear(); + } + + bool hasMember(const QString& userName) const { + return mMembers.contains(userName); + } + +private: + gid_t mGid; + QString mName; + QStringList mMembers; +}; + +class UserManager : public QObject +{ + Q_OBJECT +public: + explicit UserManager(QObject *parent = 0); + ~UserManager(); + + const QList& users() const { + return mUsers; + } + + const QList& groups() const { + return mGroups; + } + + const QStringList& availableShells(); + + bool addUser(UserInfo* user); + bool modifyUser(UserInfo* user, UserInfo* newSettings); + bool deleteUser(UserInfo* user); + bool changePassword(UserInfo* user, QByteArray newPasswd); + + bool addGroup(GroupInfo* group); + bool modifyGroup(GroupInfo* group, GroupInfo* newSettings); + bool deleteGroup(GroupInfo* group); + bool changePassword(GroupInfo* group, QByteArray newPasswd); + + // FIXME: add APIs to change group membership with "gpasswd" + + UserInfo* findUserInfo(const char* name); + UserInfo* findUserInfo(QString name); + UserInfo* findUserInfo(uid_t uid); + + GroupInfo* findGroupInfo(const char* name); + GroupInfo* findGroupInfo(QString name); + GroupInfo* findGroupInfo(gid_t gid); + +private: + void loadUsersAndGroups(); + void loadLoginDefs(); + bool pkexec(const QStringList &command, const QByteArray &stdinData = QByteArray()); + +Q_SIGNALS: + void changed(); + +protected Q_SLOTS: + void onFileChanged(const QString &path); + void reload(); + +private: + QList mUsers; + QList mGroups; + QFileSystemWatcher* mWatcher; + QStringList mAvailableShells; +}; + +#endif // USERMANAGER_H diff --git a/lxqt-admin.kdev4 b/lxqt-admin.kdev4 deleted file mode 100644 index 4115283..0000000 --- a/lxqt-admin.kdev4 +++ /dev/null @@ -1,3 +0,0 @@ -[Project] -Manager=KDevCMakeManager -Name=lxqt-admin