Adding upstream version 0.11.1.

Signed-off-by: Alf Gaida <agaida@siduction.org>

.gitignore

@@ -1 +0,0 @@
-build

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.

CHANGELOG

@@ -0,0 +1,108 @@
+
+lxqt-admin-0.11.1 / 2017-01-01
+==============================
+
+  * lxqt-admin-user: Add FreeBSD support
+  * Added *da.desktop
+  * Add French translation
+  * Remove cpack (#40)
+
+0.11.0 / 2016-09-24
+===================
+
+  * Release 0.11.0: Add changelog
+  * 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.

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.11)
+cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR)
 
 project(lxqt-admin)
 
@@ -10,25 +10,17 @@ set(LIB_INSTALL_DIR "lib${LIB_SUFFIX}" CACHE PATH "Installation path for librari
 find_package(Qt5Widgets REQUIRED QUIET)
 find_package(lxqt REQUIRED QUIET)
 find_package(KF5WindowSystem REQUIRED QUIET)
-include(${LXQT_USE_FILE})
-
-find_package(PkgConfig)
-pkg_check_modules(OOBS REQUIRED
-    glib-2.0
-    liboobs-1
-)
 
+include(LXQtCompilerSettings NO_POLICY_SCOPE)
 include(LXQtTranslate)
 
-add_subdirectory(lxqt-admin-time)
+if(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
-add_subdirectory(lxqt-admin-user)
+    message(WARNING "${CMAKE_SYSTEM_NAME} is not supported by lxqt-admin-user")
-
+    message(WARNING "${CMAKE_SYSTEM_NAME} is not supported by lxqt-admin-time")
-# building tarball with CPack -------------------------------------------------
+elseif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
-include(InstallRequiredSystemLibraries)
+    add_subdirectory(lxqt-admin-user)
-set(CPACK_PACKAGE_VERSION_MAJOR ${LXQT_MAJOR_VERSION})
+    message(WARNING "${CMAKE_SYSTEM_NAME} is not supported by lxqt-admin-time")
-set(CPACK_PACKAGE_VERSION_MINOR ${LXQT_MINOR_VERSION})
+else()
-set(CPACK_PACKAGE_VERSION_PATCH ${LXQT_PATCH_VERSION})
+    add_subdirectory(lxqt-admin-user)
-set(CPACK_GENERATOR TBZ2)
+    add_subdirectory(lxqt-admin-time)
-set(CPACK_SOURCE_GENERATOR TBZ2)
+endif()
-set(CPACK_SOURCE_IGNORE_FILES /build/;.gitignore;.*~;.git;.kdev4;temp)
-include(CPack)

COPYING

@@ -1,9 +1,8 @@
-
                   GNU LESSER GENERAL PUBLIC LICENSE
                        Version 2.1, February 1999
 
  Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-	51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -23,8 +22,7 @@ specially designated software packages--typically libraries--of the
 Free Software Foundation and other authors who decide to use it.  You
 can use it too, but we suggest you first think carefully about whether
 this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations
+strategy to use in any particular case, based on the explanations below.
-below.
 
   When we speak of free software, we are referring to freedom of use,
 not price.  Our General Public Licenses are designed to make sure that
@@ -89,9 +87,9 @@ libraries.  However, the Lesser license provides advantages in certain
 special circumstances.
 
   For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it
+encourage the widest possible use of a certain library, so that it becomes
-becomes a de-facto standard.  To achieve this, non-free programs must
+a de-facto standard.  To achieve this, non-free programs must be
-be allowed to use the library.  A more frequent case is that a free
+allowed to use the library.  A more frequent case is that a free
 library does the same job as widely used non-free libraries.  In this
 case, there is little to gain by limiting the free library to free
 software only, so we use the Lesser General Public License.
@@ -138,8 +136,8 @@ included without limitation in the term "modification".)
   "Source code" for a work means the preferred form of the work for
 making modifications to it.  For a library, complete source code means
 all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control
+interface definition files, plus the scripts used to control compilation
-compilation and installation of the library.
+and installation of the library.
 
   Activities other than copying, distribution and modification are not
 covered by this License; they are outside its scope.  The act of
@@ -305,10 +303,10 @@ of these things:
     the user installs one, as long as the modified version is
     interface-compatible with the version that the work was made with.
 
-    c) Accompany the work with a written offer, valid for at least
+    c) Accompany the work with a written offer, valid for at
-    three years, to give the same user the materials specified in
+    least three years, to give the same user the materials
-    Subsection 6a, above, for a charge no more than the cost of
+    specified in Subsection 6a, above, for a charge no more
-    performing this distribution.
+    than the cost of performing this distribution.
 
     d) If distribution of the work is made by offering access to copy
     from a designated place, offer equivalent access to copy the above
@@ -386,10 +384,9 @@ all those who receive copies directly or indirectly through you, then
 the only way you could satisfy both it and this License would be to
 refrain entirely from distribution of the Library.
 
-If any portion of this section is held invalid or unenforceable under
+If any portion of this section is held invalid or unenforceable under any
-any particular circumstance, the balance of the section is intended to
+particular circumstance, the balance of the section is intended to apply,
-apply, and the section as a whole is intended to apply in other
+and the section as a whole is intended to apply in other circumstances.
-circumstances.
 
 It is not the purpose of this section to induce you to infringe any
 patents or other property right claims or to contest validity of any
@@ -407,11 +404,11 @@ be a consequence of the rest of this License.
 
   12. If the distribution and/or use of the Library is restricted in
 certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License
+original copyright holder who places the Library under this License may add
-may add an explicit geographical distribution limitation excluding those
+an explicit geographical distribution limitation excluding those countries,
-countries, so that distribution is permitted only in or among
+so that distribution is permitted only in or among countries not thus
-countries not thus excluded.  In such case, this License incorporates
+excluded.  In such case, this License incorporates the limitation as if
-the limitation as if written in the body of this License.
+written in the body of this License.
 
   13. The Free Software Foundation may publish revised and/or new
 versions of the Lesser General Public License from time to time.

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.

lxqt-admin-time/CMakeLists.txt

@@ -3,15 +3,13 @@ project(lxqt-admin-time)
 # build static helper class first
 include_directories (
     ${CMAKE_CURRENT_BINARY_DIR}
-    ${LXQT_INCLUDE_DIRS}
-    ${QTXDG_INCLUDE_DIRS}
-    ${OOBS_INCLUDE_DIRS}
 )
 
 set ( lxqt-admin-time_HDRS
     timeadmindialog.h
     datetime.h
     timezone.h
+    timedatectl.h
 )
 
 set ( lxqt-admin-time_SRCS
@@ -19,6 +17,7 @@ set ( lxqt-admin-time_SRCS
     timeadmindialog.cpp
     datetime.cpp
     timezone.cpp
+    timedatectl.cpp
 )
 
 set ( lxqt-admin-time_MOCS
@@ -44,6 +43,16 @@ lxqt_translate_ts(lxqt-admin-time_QM_FILES
     ${lxqt-admin-time_UIS}
     INSTALL_DIR
     "${LXQT_TRANSLATIONS_DIR}/${PROJECT_NAME}"
+    PULL_TRANSLATIONS
+        ${PULL_TRANSLATIONS}
+    CLEAN_TRANSLATIONS
+        ${CLEAN_TRANSLATIONS}
+    TRANSLATIONS_REPO
+        ${TRANSLATIONS_REPO}
+    TRANSLATIONS_REFSPEC
+        ${TRANSLATIONS_REFSPEC}
+    REPO_SUBDIR
+        "lxqt-admin/${PROJECT_NAME}"
 )
 
 lxqt_translate_desktop(DESKTOP_FILES
@@ -66,8 +75,8 @@ add_executable(lxqt-admin-time
 target_link_libraries(lxqt-admin-time
     KF5::WindowSystem
     Qt5::Widgets
-    ${LXQT_LIBRARIES}
+    Qt5::DBus
-    ${OOBS_LIBRARIES}
+    lxqt
 )
 
 install(TARGETS lxqt-admin-time RUNTIME DESTINATION bin)

lxqt-admin-time/datetime.cpp

@@ -31,15 +31,16 @@
 #include <QTimer>
 #include <QTextCharFormat>
 
-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();
-    emit changed(mModified);
 }
 
-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();
-    emit changed(mModified);
 }
+
+void DateTimePage::on_ntp_toggled(bool toggled)
+{
+    if(toggled != mUseNtp)
+    {
+        mModified |= M_NTP;
+    }
+    else
+    {
+        mModified &= ~M_NTP;
+    }
+    emit changed();
+}
+
+void DateTimePage::on_localRTC_toggled(bool toggled)
+{
+    if(toggled != mLocalRtc)
+    {
+        mModified |= M_LOCAL_RTC;
+    }
+    else
+    {
+        mModified &= ~M_LOCAL_RTC;
+    }
+    emit changed();
+}
+

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);
+    explicit DateTimePage(bool useNtp, bool localRtc, QWidget *parent = 0);
-    ~DateTime();
+    ~DateTimePage();
 
-    enum modified_enum {M_DATE = 0x1, M_TIME = 0x2};
+    enum ModifiedFlag {M_DATE = (1 << 0), M_TIME = (1 << 1), M_NTP = (1 << 2), M_LOCAL_RTC = (1 << 3)};
-    Q_DECLARE_FLAGS(modified_t, modified_enum)
+    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

lxqt-admin-time/datetime.ui

@@ -6,33 +6,17 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>354</width>
+    <width>365</width>
-    <height>308</height>
+    <height>323</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
-    <width>0</width>
+    <width>50</width>
-    <height>0</height>
+    <height>50</height>
    </size>
   </property>
-  <property name="windowTitle">
+  <layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,0,1,0,0,0">
-   <string>Form</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QLabel" name="label_3">
-     <property name="font">
-      <font>
-       <weight>75</weight>
-       <bold>true</bold>
-      </font>
-     </property>
-     <property name="text">
-      <string>Time and date setup</string>
-     </property>
-    </widget>
-   </item>
    <item>
     <widget class="QLabel" name="label_time">
      <property name="text">
@@ -80,6 +64,20 @@
      </property>
     </widget>
    </item>
+   <item>
+    <widget class="QCheckBox" name="ntp">
+     <property name="text">
+      <string>Enable network time synchronization (NTP)</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QCheckBox" name="localRTC">
+     <property name="text">
+      <string>RTC is in local time</string>
+     </property>
+    </widget>
+   </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
@@ -93,24 +91,41 @@
      </property>
     </spacer>
    </item>
-   <item>
-    <widget class="QLabel" name="label">
-     <property name="font">
-      <font>
-       <weight>75</weight>
-       <bold>true</bold>
-      </font>
-     </property>
-     <property name="text">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Saving changes requires admin permissions.&lt;br&gt;You will be requested after clicking close button&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-     </property>
-     <property name="wordWrap">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <resources/>
- <connections/>
+ <connections>
+  <connection>
+   <sender>ntp</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>calendar</receiver>
+   <slot>setDisabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>221</x>
+     <y>269</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>228</x>
+     <y>162</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>ntp</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>edit_time</receiver>
+   <slot>setDisabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>105</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>173</x>
+     <y>55</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
 </ui>

lxqt-admin-time/main.cpp

@@ -30,7 +30,7 @@
 
 int main(int argc, char **argv)
 {
-    LxQt::SingleApplication app(argc, argv);
+    LXQt::SingleApplication app(argc, argv);
     TimeAdminDialog dlg;
     dlg.setWindowIcon(QIcon::fromTheme("preferences-system"));
     app.setActivationWindow(&dlg);

lxqt-admin-time/timeadmindialog.cpp

@@ -31,82 +31,59 @@
 #include <QMessageBox>
 #include <QDateTime>
 #include <QMap>
+#include <QDebug>
 
 #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),
+    LXQt::ConfigDialog(tr("Time and date configuration"),new LXQt::Settings("TimeDate"), parent)
-    mTimeConfig(OOBS_TIME_CONFIG(oobs_time_config_get())),
-    mUserLogedIn(false)
 {
-    oobs_object_update(OOBS_OBJECT(mTimeConfig));
-
     setMinimumSize(QSize(400,400));
     mWindowTitle = windowTitle();
 
-
+    mDateTimeWidget = new DateTimePage(mTimeDateCtl.useNtp(), mTimeDateCtl.localRtc(), this);
-    mDateTimeWidget = new DateTime(this);
     addPage(mDateTimeWidget,tr("Date and time"));
     connect(this,SIGNAL(reset()),mDateTimeWidget,SLOT(reload()));
-    connect(mDateTimeWidget,&DateTime::changed,this,&TimeAdminDialog::onChanged);
+    connect(mDateTimeWidget,&DateTimePage::changed,this,&TimeAdminDialog::onChanged);
-    mDateTimeWidget->setProperty("pModified",M_TIMEDATE);
 
     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(this,&TimeAdminDialog::reset,mTimezoneWidget,&TimezonePage::reload);
-    connect(mTimezoneWidget,&Timezone::changed,this,&TimeAdminDialog::onChanged);
+    connect(mTimezoneWidget,&TimezonePage::changed,this,&TimeAdminDialog::onChanged);
-    mTimezoneWidget->setProperty("pModified",M_TIMEZONE);
+
+    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();
+    QString errorMessage;
-    // FIXME: currently timezone settings does not work. is this a bug of system-tools-backend?
+    if(mTimezoneWidget->isChanged())
-    if(!timeZone.isEmpty() && mWidgetsModified.testFlag(M_TIMEZONE))
-        oobs_time_config_set_timezone(mTimeConfig, timeZone.constData());
-
-    if(mWidgetsModified.testFlag(M_TIMEDATE))
     {
-        QDate d = mDateTimeWidget->dateTime().date();
+        QString timeZone = mTimezoneWidget->timezone();
-        QTime t = mDateTimeWidget->dateTime().time();
+        if(!timeZone.isEmpty())
-        // 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.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(modified.testFlag(DateTimePage::M_LOCAL_RTC))
+    {
+        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)
+    if(button == QDialogButtonBox::Ok)
-        return true;
-
-    GError* err = NULL;
-    if(oobs_object_authenticate(OOBS_OBJECT(mTimeConfig), &err))
     {
-        mUserLogedIn = true;
+        saveChangesToSystem();
-        return true;
+        accept();
     }
-    else if(err)
+    else if(button == QDialogButtonBox::Cancel)
     {
-        QMessageBox::critical(this, tr("Authentication Error"), QString::fromUtf8(err->message));
+        reject();
-        g_error_free(err);
     }
-
-    return false;
 }

lxqt-admin-time/timeadmindialog.h

@@ -26,15 +26,12 @@
  * END_COMMON_COPYRIGHT_HEADER */
 
 #include <LXQt/ConfigDialog>
-#include <glib.h>
+#include "timedatectl.h"
-#include <oobs/oobs-timeconfig.h>
-#include <oobs/oobs-ntpconfig.h>
-#include <oobs/oobs-ntpserver.h>
 
-class DateTime;
+class DateTimePage;
-class Timezone;
+class TimezonePage;
 
-class TimeAdminDialog: public LxQt::ConfigDialog
+class TimeAdminDialog: public LXQt::ConfigDialog
 {
     Q_OBJECT
 
@@ -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;
+    TimeDateCtl mTimeDateCtl;
-    DateTime * mDateTimeWidget;
+    DateTimePage * mDateTimeWidget;
-    Timezone * mTimezoneWidget;
+    TimezonePage * mTimezoneWidget;
-    bool mUserLogedIn;
     QString mWindowTitle;
-    widgets_modified_t mWidgetsModified;
 };
-
-Q_DECLARE_METATYPE(TimeAdminDialog::widgets_modified_enum)
-Q_DECLARE_OPERATORS_FOR_FLAGS(TimeAdminDialog::widgets_modified_t)

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) <pcman.tw@gmail.com>
+ *
+ * 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 <QProcess>
+#include <QDebug>
+#include <QDBusInterface>
+#include <QDBusConnection>
+#include <QMessageBox>
+
+
+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;
+}

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) <pcman.tw@gmail.com>
+ *
+ * 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 <QString>
+#include <QDateTime>
+
+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

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<QListWidgetItem*> selected = ui->list_zones->selectedItems();
+    if(selected.empty())
+        return;
+    QListWidgetItem *item = selected.first();
     mZoneChanged = item->text() != ui->label_timezone->text();
-
+    emit changed();
-    if (mZoneChanged != old)
-        emit changed(mZoneChanged);
 }
 
-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();

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);
+    explicit TimezonePage(const QStringList & zones, const QString & currentimezone, QWidget *parent = 0);
-    ~Timezone();
+    ~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:

lxqt-admin-time/timezone.ui

@@ -10,23 +10,7 @@
     <height>300</height>
    </rect>
   </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QLabel" name="label_3">
-     <property name="font">
-      <font>
-       <weight>75</weight>
-       <bold>true</bold>
-      </font>
-     </property>
-     <property name="text">
-      <string>Timezone setup</string>
-     </property>
-    </widget>
-   </item>
    <item>
     <layout class="QFormLayout" name="formLayout">
      <item row="0" column="0">
@@ -58,22 +42,6 @@
    <item>
     <widget class="QListWidget" name="list_zones"/>
    </item>
-   <item>
-    <widget class="QLabel" name="label">
-     <property name="font">
-      <font>
-       <weight>75</weight>
-       <bold>true</bold>
-      </font>
-     </property>
-     <property name="text">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Saving changes requires admin permissions.&lt;br&gt;You will be requested after clicking close button&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-     </property>
-     <property name="wordWrap">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <resources/>

lxqt-admin-time/translations/lxqt-admin-time.ts

@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1">
-<context>
-    <name>DateTime</name>
-    <message>
-        <location filename="../datetime.ui" line="20"/>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../datetime.ui" line="32"/>
-        <source>Time and date setup</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../datetime.ui" line="39"/>
-        <source>Time:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../datetime.ui" line="55"/>
-        <source>HH:mm:ss</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../datetime.ui" line="69"/>
-        <source>Date:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../datetime.ui" line="105"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Saving changes requires admin permissions.&lt;br&gt;You will be requested after clicking close button&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TimeAdminDialog</name>
-    <message>
-        <location filename="../timeadmindialog.cpp" line="42"/>
-        <source>Time and date configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../timeadmindialog.cpp" line="53"/>
-        <source>Date and time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../timeadmindialog.cpp" line="62"/>
-        <source>Timezone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../timeadmindialog.cpp" line="162"/>
-        <source>Authentication Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Timezone</name>
-    <message>
-        <location filename="../timezone.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../timezone.ui" line="26"/>
-        <source>Timezone setup</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../timezone.ui" line="35"/>
-        <source>Your current timezone:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../timezone.ui" line="42"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../timezone.ui" line="51"/>
-        <source>Filter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../timezone.ui" line="70"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Saving changes requires admin permissions.&lt;br&gt;You will be requested after clicking close button&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../timezone.cpp" line="42"/>
-        <source>None</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>

lxqt-admin-time/translations/lxqt-admin-time_ar.desktop

@@ -0,0 +1,4 @@
+#TRANSLATIONS
+Name[ar]=التّاريخ والوقت
+GenericName[ar]=إعدادات التّاريخ والوقت
+Comment[ar]=اضبط تاريخ النّظام ووقته

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

lxqt-admin-time/translations/lxqt-admin-time_da.desktop

@@ -0,0 +1,3 @@
+Name[da]=Dato og klokkeslæt
+GenericName[da]=Indstillinger for dato og klokkeslæt
+Comment[da]=Konfigurér datoen og klokkeslættet på dit system

lxqt-admin-time/translations/lxqt-admin-time_de.desktop

@@ -0,0 +1,4 @@
+#TRANSLATIONS
+Name[de]=Datum und Zeit
+GenericName[de]=Einstellungen für Datum und Zeit
+Comment[de]=Konfiguriert das Datum und die Zeit des Systems

lxqt-admin-time/translations/lxqt-admin-time_el.desktop

@@ -0,0 +1,3 @@
+Name[el]=Ημερομηνία και ώρα
+GenericName[el]=Ρυθμίσεις της ημερομηνίας και της ώρας
+Comment[el]=Διαμόρφωση της ημερομηνίας και της ώρας του συστήματός σας

lxqt-admin-time/translations/lxqt-admin-time_fr.desktop

@@ -0,0 +1,4 @@
+#TRANSLATIONS
+Name[fr]=Date et heure
+GenericName[fr]=Paramétrer la date et l'heure
+Comment[fr]=Paramétrer la date et l'heure du système

lxqt-admin-time/translations/lxqt-admin-time_hu.desktop

@@ -0,0 +1,4 @@
+#TRANSLATIONS
+Name[hu]=Dátum és idő
+GenericName[hu]=Dátum és időbeállítás
+Comment[hu]=A rendszeridő beállítása

lxqt-admin-time/translations/lxqt-admin-time_it.desktop

@@ -0,0 +1,3 @@
+#Translations
+Name[it]=Data e ora
+Comment[it]=Configura la data e l'ora del sistema

lxqt-admin-time/translations/lxqt-admin-time_it.ts

@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="it_IT" sourcelanguage="it_IT">
-<context>
-    <name>DateTime</name>
-    <message>
-        <location filename="../datetime.ui" line="20"/>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../datetime.ui" line="32"/>
-        <source>Time and date setup</source>
-        <translation>Imposta data e ora</translation>
-    </message>
-    <message>
-        <location filename="../datetime.ui" line="39"/>
-        <source>Time:</source>
-        <translation>Ora:</translation>
-    </message>
-    <message>
-        <location filename="../datetime.ui" line="55"/>
-        <source>HH:mm:ss</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../datetime.ui" line="69"/>
-        <source>Date:</source>
-        <translation>Data:</translation>
-    </message>
-    <message>
-        <location filename="../datetime.ui" line="105"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Saving changes requires admin permissions.&lt;br&gt;You will be requested after clicking close button&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>Il salvataggio richiede privilegi di amministratore, 
-saranno chiesti dopo la chiusura di questa finestra.</translation>
-    </message>
-</context>
-<context>
-    <name>TimeAdminDialog</name>
-    <message>
-        <location filename="../timeadmindialog.cpp" line="42"/>
-        <source>Time and date configuration</source>
-        <translation>Configura data e ora</translation>
-    </message>
-    <message>
-        <location filename="../timeadmindialog.cpp" line="53"/>
-        <source>Date and time</source>
-        <translation>Data e ora</translation>
-    </message>
-    <message>
-        <location filename="../timeadmindialog.cpp" line="62"/>
-        <source>Timezone</source>
-        <translation>Fuso orario</translation>
-    </message>
-    <message>
-        <location filename="../timeadmindialog.cpp" line="162"/>
-        <source>Authentication Error</source>
-        <translation>Errore di autenticazione</translation>
-    </message>
-</context>
-<context>
-    <name>Timezone</name>
-    <message>
-        <location filename="../timezone.ui" line="14"/>
-        <source>Form</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../timezone.ui" line="26"/>
-        <source>Timezone setup</source>
-        <translation>Configura fuso orario</translation>
-    </message>
-    <message>
-        <location filename="../timezone.ui" line="35"/>
-        <source>Your current timezone:</source>
-        <translation>Fuso orario attuale:</translation>
-    </message>
-    <message>
-        <location filename="../timezone.ui" line="42"/>
-        <source>TextLabel</source>
-        <translation>nessuno</translation>
-    </message>
-    <message>
-        <location filename="../timezone.ui" line="51"/>
-        <source>Filter</source>
-        <translation>Filtro</translation>
-    </message>
-    <message>
-        <location filename="../timezone.ui" line="70"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Saving changes requires admin permissions.&lt;br&gt;You will be requested after clicking close button&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished">Il salvataggio richiede privilegi di amministratore, 
-saranno chiesti dopo la chiusura di questa finestra.</translation>
-    </message>
-    <message>
-        <location filename="../timezone.cpp" line="42"/>
-        <source>None</source>
-        <translation></translation>
-    </message>
-</context>
-</TS>

lxqt-admin-time/translations/lxqt-admin-time_ja.ts

@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="ja">
-<context>
-    <name>DateTime</name>
-    <message>
-        <location filename="../datetime.ui" line="20"/>
-        <source>Form</source>
-        <translation>フォーム</translation>
-    </message>
-    <message>
-        <location filename="../datetime.ui" line="32"/>
-        <source>Time and date setup</source>
-        <translation>日時設定</translation>
-    </message>
-    <message>
-        <location filename="../datetime.ui" line="39"/>
-        <source>Time:</source>
-        <translation>時刻:</translation>
-    </message>
-    <message>
-        <location filename="../datetime.ui" line="55"/>
-        <source>HH:mm:ss</source>
-        <translation>HH:mm:ss</translation>
-    </message>
-    <message>
-        <location filename="../datetime.ui" line="69"/>
-        <source>Date:</source>
-        <translation>日付</translation>
-    </message>
-    <message>
-        <location filename="../datetime.ui" line="105"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Saving changes requires admin permissions.&lt;br&gt;You will be requested after clicking close button&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;変更の保存には管理権限が必要です。&lt;br&gt;閉じるボタンを押した直後に要求されるでしょう。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-</context>
-<context>
-    <name>TimeAdminDialog</name>
-    <message>
-        <location filename="../timeadmindialog.cpp" line="42"/>
-        <source>Time and date configuration</source>
-        <translation>日時設定</translation>
-    </message>
-    <message>
-        <location filename="../timeadmindialog.cpp" line="53"/>
-        <source>Date and time</source>
-        <translation>日時</translation>
-    </message>
-    <message>
-        <location filename="../timeadmindialog.cpp" line="62"/>
-        <source>Timezone</source>
-        <translation>タイムゾーン</translation>
-    </message>
-    <message>
-        <location filename="../timeadmindialog.cpp" line="162"/>
-        <source>Authentication Error</source>
-        <translation>認証エラー</translation>
-    </message>
-</context>
-<context>
-    <name>Timezone</name>
-    <message>
-        <location filename="../timezone.ui" line="14"/>
-        <source>Form</source>
-        <translation>フォーム</translation>
-    </message>
-    <message>
-        <location filename="../timezone.ui" line="26"/>
-        <source>Timezone setup</source>
-        <translation>タイムゾーン設定</translation>
-    </message>
-    <message>
-        <location filename="../timezone.ui" line="35"/>
-        <source>Your current timezone:</source>
-        <translation>現在のタイムゾーン</translation>
-    </message>
-    <message>
-        <location filename="../timezone.ui" line="42"/>
-        <source>TextLabel</source>
-        <translation>テキストラベル</translation>
-    </message>
-    <message>
-        <location filename="../timezone.ui" line="51"/>
-        <source>Filter</source>
-        <translation>フィルター</translation>
-    </message>
-    <message>
-        <location filename="../timezone.ui" line="70"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Saving changes requires admin permissions.&lt;br&gt;You will be requested after clicking close button&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;変更の保存には管理権限が必要です。&lt;br&gt;閉じるボタンを押した直後に要求されるでしょう。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location filename="../timezone.cpp" line="42"/>
-        <source>None</source>
-        <translation>なし</translation>
-    </message>
-</context>
-</TS>

lxqt-admin-time/translations/lxqt-admin-time_pl.desktop

@@ -0,0 +1,4 @@
+#TRANSLATIONS
+Name[pl]=Data i czas
+GenericName[pl]=Ustawienia daty i czasu
+

lxqt-admin-time/translations/lxqt-admin-time_pt.ts

@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="pt">
-<context>
-    <name>DateTime</name>
-    <message>
-        <location filename="../datetime.ui" line="20"/>
-        <source>Form</source>
-        <translation>Formulário</translation>
-    </message>
-    <message>
-        <location filename="../datetime.ui" line="32"/>
-        <source>Time and date setup</source>
-        <translation>Configuração de data e hora</translation>
-    </message>
-    <message>
-        <location filename="../datetime.ui" line="39"/>
-        <source>Time:</source>
-        <translation>Hora:</translation>
-    </message>
-    <message>
-        <location filename="../datetime.ui" line="55"/>
-        <source>HH:mm:ss</source>
-        <translation>H:mm:ss</translation>
-    </message>
-    <message>
-        <location filename="../datetime.ui" line="69"/>
-        <source>Date:</source>
-        <translation>Data:</translation>
-    </message>
-    <message>
-        <location filename="../datetime.ui" line="105"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Saving changes requires admin permissions.&lt;br&gt;You will be requested after clicking close button&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A gravação de alterações requer permissões de administrador.&lt;br&gt;A senha será solicitada ao clicar em Fechar.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-</context>
-<context>
-    <name>TimeAdminDialog</name>
-    <message>
-        <location filename="../timeadmindialog.cpp" line="42"/>
-        <source>Time and date configuration</source>
-        <translation>Configuração de data e hora</translation>
-    </message>
-    <message>
-        <location filename="../timeadmindialog.cpp" line="53"/>
-        <source>Date and time</source>
-        <translation>Data e hora</translation>
-    </message>
-    <message>
-        <location filename="../timeadmindialog.cpp" line="62"/>
-        <source>Timezone</source>
-        <translation>Fuso horário</translation>
-    </message>
-    <message>
-        <location filename="../timeadmindialog.cpp" line="162"/>
-        <source>Authentication Error</source>
-        <translation>Erro de autenticação</translation>
-    </message>
-</context>
-<context>
-    <name>Timezone</name>
-    <message>
-        <location filename="../timezone.ui" line="14"/>
-        <source>Form</source>
-        <translation>Formulário</translation>
-    </message>
-    <message>
-        <location filename="../timezone.ui" line="26"/>
-        <source>Timezone setup</source>
-        <translation>Configuração de fuso horário</translation>
-    </message>
-    <message>
-        <location filename="../timezone.ui" line="35"/>
-        <source>Your current timezone:</source>
-        <translation>O seu fuso horário:</translation>
-    </message>
-    <message>
-        <location filename="../timezone.ui" line="42"/>
-        <source>TextLabel</source>
-        <translation>Texto</translation>
-    </message>
-    <message>
-        <location filename="../timezone.ui" line="51"/>
-        <source>Filter</source>
-        <translation>Filtrar</translation>
-    </message>
-    <message>
-        <location filename="../timezone.ui" line="70"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Saving changes requires admin permissions.&lt;br&gt;You will be requested after clicking close button&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A gravação de alterações requer permissões de administrador.&lt;br&gt;A senha será solicitada ao clicar em Fechar.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location filename="../timezone.cpp" line="42"/>
-        <source>None</source>
-        <translation>Nenhum</translation>
-    </message>
-</context>
-</TS>

lxqt-admin-time/translations/lxqt-admin-time_ru.ts

@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="ru">
-<context>
-    <name>DateTime</name>
-    <message>
-        <location filename="../datetime.ui" line="32"/>
-        <source>Time and date setup</source>
-        <translation>Настройка даты и времени</translation>
-    </message>
-    <message>
-        <location filename="../datetime.ui" line="39"/>
-        <source>Time:</source>
-        <translation>Время:</translation>
-    </message>
-    <message>
-        <location filename="../datetime.ui" line="55"/>
-        <source>HH:mm:ss</source>
-        <translation>ЧЧ:мм:сс</translation>
-    </message>
-    <message>
-        <location filename="../datetime.ui" line="69"/>
-        <source>Date:</source>
-        <translation>Дата:</translation>
-    </message>
-    <message>
-        <location filename="../datetime.ui" line="105"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Saving changes requires admin permissions.&lt;br&gt;You will be requested after clicking close button&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Для сохранения изменений необходимы права администратора.&lt;br&gt;Пароль будет запрошен после нажатия на кнопку «Закрыть»&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-</context>
-<context>
-    <name>TimeAdminDialog</name>
-    <message>
-        <location filename="../timeadmindialog.cpp" line="42"/>
-        <source>Time and date configuration</source>
-        <translation>Настройки даты и времени</translation>
-    </message>
-    <message>
-        <location filename="../timeadmindialog.cpp" line="53"/>
-        <source>Date and time</source>
-        <translation>Дата и время</translation>
-    </message>
-    <message>
-        <location filename="../timeadmindialog.cpp" line="62"/>
-        <source>Timezone</source>
-        <translation>Часовой пояс</translation>
-    </message>
-    <message>
-        <location filename="../timeadmindialog.cpp" line="162"/>
-        <source>Authentication Error</source>
-        <translation>Ошибка аутентификации</translation>
-    </message>
-</context>
-<context>
-    <name>Timezone</name>
-    <message>
-        <location filename="../timezone.ui" line="26"/>
-        <source>Timezone setup</source>
-        <translation>Настройки часового пояса</translation>
-    </message>
-    <message>
-        <location filename="../timezone.ui" line="35"/>
-        <source>Your current timezone:</source>
-        <translation>Ваш текущий часовой пояс:</translation>
-    </message>
-    <message>
-        <location filename="../timezone.ui" line="51"/>
-        <source>Filter</source>
-        <translation>Фильтр</translation>
-    </message>
-    <message>
-        <location filename="../timezone.ui" line="70"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Saving changes requires admin permissions.&lt;br&gt;You will be requested after clicking close button&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Для сохранения изменений необходимы права администратора.&lt;br&gt;Пароль будет запрошен после нажатия на кнопку «Закрыть»&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location filename="../timezone.cpp" line="42"/>
-        <source>None</source>
-        <translation>Нет</translation>
-    </message>
-</context>
-</TS>

lxqt-admin-time/translations/lxqt-admin-time_ru_RU.desktop

@@ -1,6 +0,0 @@
-[Desktop Entry]
-Name[ru_RU]=Дата и время
-GenericName[ru_RU]=Настройки даты и времени
-Comment[ru_RU]=Настроить дату и время вашей системы
-
-#TRANSLATIONS_DIR=translations

lxqt-admin-time/translations/lxqt-admin-time_ru_RU.ts

@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="ru_RU">
-<context>
-    <name>DateTime</name>
-    <message>
-        <location filename="../datetime.ui" line="32"/>
-        <source>Time and date setup</source>
-        <translation>Настройка даты и времени</translation>
-    </message>
-    <message>
-        <location filename="../datetime.ui" line="39"/>
-        <source>Time:</source>
-        <translation>Время:</translation>
-    </message>
-    <message>
-        <location filename="../datetime.ui" line="55"/>
-        <source>HH:mm:ss</source>
-        <translation>ЧЧ:мм:сс</translation>
-    </message>
-    <message>
-        <location filename="../datetime.ui" line="69"/>
-        <source>Date:</source>
-        <translation>Дата:</translation>
-    </message>
-    <message>
-        <location filename="../datetime.ui" line="105"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Saving changes requires admin permissions.&lt;br&gt;You will be requested after clicking close button&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Для сохранения изменений необходимы права администратора.&lt;br&gt;Пароль будет запрошен после нажатия на кнопку «Закрыть»&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-</context>
-<context>
-    <name>TimeAdminDialog</name>
-    <message>
-        <location filename="../timeadmindialog.cpp" line="42"/>
-        <source>Time and date configuration</source>
-        <translation>Настройки даты и времени</translation>
-    </message>
-    <message>
-        <location filename="../timeadmindialog.cpp" line="53"/>
-        <source>Date and time</source>
-        <translation>Дата и время</translation>
-    </message>
-    <message>
-        <location filename="../timeadmindialog.cpp" line="62"/>
-        <source>Timezone</source>
-        <translation>Часовой пояс</translation>
-    </message>
-    <message>
-        <location filename="../timeadmindialog.cpp" line="162"/>
-        <source>Authentication Error</source>
-        <translation>Ошибка аутентификации</translation>
-    </message>
-</context>
-<context>
-    <name>Timezone</name>
-    <message>
-        <location filename="../timezone.ui" line="26"/>
-        <source>Timezone setup</source>
-        <translation>Настройки часового пояса</translation>
-    </message>
-    <message>
-        <location filename="../timezone.ui" line="35"/>
-        <source>Your current timezone:</source>
-        <translation>Ваш текущий часовой пояс:</translation>
-    </message>
-    <message>
-        <location filename="../timezone.ui" line="51"/>
-        <source>Filter</source>
-        <translation>Фильтр</translation>
-    </message>
-    <message>
-        <location filename="../timezone.ui" line="70"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Saving changes requires admin permissions.&lt;br&gt;You will be requested after clicking close button&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Для сохранения изменений необходимы права администратора.&lt;br&gt;Пароль будет запрошен после нажатия на кнопку «Закрыть»&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location filename="../timezone.cpp" line="42"/>
-        <source>None</source>
-        <translation>Нет</translation>
-    </message>
-</context>
-</TS>

lxqt-admin-time/translations/lxqt-admin-user_it.desktop

@@ -1,13 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Users and Groups
-GenericName=User and Group Settings
-Comment=Configure the users and groups of your system
-Exec=lxqt-admin-user
-Icon=preferences-system
-Categories=Settings;System;DesktopSettings;Qt;LXQt;
-OnlyShowIn=LXQt;
-
-Name[it]=Utenti e gruppi
-GenericName[it]=Impostazioni utenti e gruppi
-Comment[it]=Configura utenti e gruppi del sistema

lxqt-admin-user/CMakeLists.txt

@@ -3,9 +3,6 @@ project(lxqt-admin-user)
 # build static helper class first
 include_directories (
     ${CMAKE_CURRENT_BINARY_DIR}
-    ${LXQT_INCLUDE_DIRS}
-    ${QTXDG_INCLUDE_DIRS}
-    ${OOBS_INCLUDE_DIRS}
 )
 
 set ( lxqt-admin-user_SRCS
@@ -13,12 +10,14 @@ set ( lxqt-admin-user_SRCS
     mainwindow.cpp
     userdialog.cpp
     groupdialog.cpp
+    usermanager.cpp
 )
 
 set ( lxqt-admin-user_MOCS
     mainwindow.h
     userdialog.h
     groupdialog.h
+    usermanager.h
 )
 
 set( lxqt-admin-user_UIS
@@ -39,6 +38,16 @@ lxqt_translate_ts(lxqt-admin-user_QM_FILES
     ${lxqt-admin-user_UIS}
     INSTALL_DIR
     "${LXQT_TRANSLATIONS_DIR}/${PROJECT_NAME}"
+    PULL_TRANSLATIONS
+        ${PULL_TRANSLATIONS}
+    CLEAN_TRANSLATIONS
+        ${CLEAN_TRANSLATIONS}
+    TRANSLATIONS_REPO
+        ${TRANSLATIONS_REPO}
+    TRANSLATIONS_REFSPEC
+        ${TRANSLATIONS_REFSPEC}
+    REPO_SUBDIR
+        "lxqt-admin/${PROJECT_NAME}"
 )
 
 lxqt_translate_desktop(DESKTOP_FILES
@@ -60,9 +69,23 @@ add_executable(lxqt-admin-user
 target_link_libraries(lxqt-admin-user
     KF5::WindowSystem
     Qt5::Widgets
-    ${LXQT_LIBRARIES}
+    lxqt
-    ${OOBS_LIBRARIES}
 )
 
 install(TARGETS lxqt-admin-user RUNTIME DESTINATION bin)
 install(FILES ${DESKTOP_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
+
+# for policykit
+# manpage for pcmanfm-qt
+configure_file(
+    "org.lxqt.lxqt-admin-user.policy.in"
+    "${CMAKE_CURRENT_BINARY_DIR}/org.lxqt.lxqt-admin-user.policy"
+    @ONLY
+)
+
+if(${CMAKE_SYSTEM_NAME} MATCHES  "FreeBSD")
+    install(PROGRAMS "lxqt-admin-user-helper.freebsd" DESTINATION bin RENAME lxqt-admin-user-helper)
+else()
+    install(PROGRAMS "lxqt-admin-user-helper.default" DESTINATION bin RENAME lxqt-admin-user-helper)
+endif()
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/org.lxqt.lxqt-admin-user.policy" DESTINATION "share/polkit-1/actions")

lxqt-admin-user/groupdialog.cpp

@@ -20,108 +20,60 @@
 
 #include "groupdialog.h"
 #include <QMessageBox>
+#include "usermanager.h"
+#include <QDebug>
 
-GroupDialog::GroupDialog(OobsGroup *group, QWidget *parent, Qt::WindowFlags f):
+#define DEFAULT_GID_MIN 1000
+#define DEFAULT_GID_MAX 32768
+
+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());
+    const QStringList& members = group->members(); // all users in this group
-    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, 0, 32768));
-    }
-
-    GList* groupUsers = oobs_group_get_users(mGroup); // all users in this group
     // load all users
-    OobsUsersConfig* usersConfig = OOBS_USERS_CONFIG(oobs_users_config_get());
+    for(const UserInfo* user: userManager->users())
-    OobsList* users = oobs_users_config_get_users(usersConfig);
-    if(users)
     {
-        OobsListIter it;
+        QListWidgetItem* item = new QListWidgetItem();
-        gboolean valid = oobs_list_get_iter_first(users, &it);
+        item->setText(user->name());
-        while(valid)
+        item->setFlags(Qt::ItemIsEnabled|Qt::ItemIsUserCheckable|Qt::ItemIsSelectable);
-        {
+        if(members.indexOf(user->name()) != -1) // the user is in this group
-            OobsUser* user = OOBS_USER(oobs_list_get(users, &it));
+            item->setCheckState(Qt::Checked);
-            QListWidgetItem* item = new QListWidgetItem();
+        else
-            item->setText(oobs_user_get_login_name(user));
+            item->setCheckState(Qt::Unchecked);
-            item->setFlags(Qt::ItemIsEnabled|Qt::ItemIsUserCheckable|Qt::ItemIsSelectable);
+        QVariant obj = QVariant::fromValue<void*>((void*)user);
-            if(g_list_find(groupUsers, user)) // the user is in this group
+        item->setData(Qt::UserRole, obj);
-                item->setCheckState(Qt::Checked);
+        ui.userList->addItem(item);
-            else
-                item->setCheckState(Qt::Unchecked);
-            QVariant obj = QVariant::fromValue<void*>(user);
-            item->setData(Qt::UserRole, obj);
-            ui.userList->addItem(item);
-            valid = oobs_list_iter_next(users, &it);
-        }
     }
-    g_list_free(groupUsers);
 }
 
 GroupDialog::~GroupDialog()
 {
-    if(mGroup)
-        g_object_unref(mGroup);
 }
 
 void GroupDialog::accept()
 {
-    OobsGroupsConfig* groupsConfig = OOBS_GROUPS_CONFIG(oobs_groups_config_get());
+    QString groupName = ui.groupName->text();
-    gid_t gid = ui.gid->value();
+    if(groupName.isEmpty())
-    if(gid != mOldGId && oobs_groups_config_is_gid_used(groupsConfig, gid))
     {
-        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;
     }
-
+    mGroup->setName(groupName);
-    if(!mGroup) // create a new group
+    mGroup->setGid(ui.gid->value());
-    {
-        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);
 
     // update users
-    GList* groupUsers = oobs_group_get_users(mGroup); // all users in this group
+    mGroup->removeAllMemberss();
-    int rowCount = ui.userList->count();
+    for(int row = 0; row < ui.userList->count(); ++row) {
-    for(int row = 0; row < rowCount; ++row)
-    {
         QListWidgetItem* item = ui.userList->item(row);
-        QVariant obj = item->data(Qt::UserRole);
+        if(item->checkState() == Qt::Checked) {
-        OobsUser* user = OOBS_USER(obj.value<void*>());
+            mGroup->addMember(item->text());
-        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);
         }
     }
-    g_list_free(groupUsers);
-
-    oobs_object_commit(OOBS_OBJECT(mGroup));
     QDialog::accept();
 }

lxqt-admin-user/groupdialog.h

@@ -23,32 +23,24 @@
 
 #include <QDialog>
 #include "ui_groupdialog.h"
-#include <glib.h>
+
-#include <oobs/oobs-usersconfig.h>
+class GroupInfo;
-#include <oobs/oobs-groupsconfig.h>
+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;
+    UserManager* mUserManager;
-    gid_t mOldGId;
+    GroupInfo* mGroup;
 };
 
 #endif // GROUPDIALOG_H

lxqt-admin-user/groupdialog.ui

@@ -26,6 +26,9 @@
    </item>
    <item row="1" column="1">
     <widget class="QSpinBox" name="gid">
+     <property name="specialValueText">
+      <string>Default</string>
+     </property>
      <property name="maximum">
       <number>32768</number>
      </property>

lxqt-admin-user/lxqt-admin-user-helper.default

@@ -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

lxqt-admin-user/lxqt-admin-user-helper.freebsd

@@ -0,0 +1,15 @@
+#!/bin/sh
+case "$1" in
+useradd|usermod|userdel|groupadd|groupmod|groupdel)
+    export LC_ALL=C
+    exec "pw" "${@}"
+    ;;
+passwd)
+    export LC_ALL=C
+    exec "$@"
+    ;;
+*)
+    echo "Command '$1' is not allowed!"
+    exit 1
+    ;;
+esac

lxqt-admin-user/main.cpp

@@ -30,7 +30,7 @@
 
 int main(int argc, char **argv)
 {
-    LxQt::SingleApplication app(argc, argv);
+    LXQt::SingleApplication app(argc, argv);
     MainWindow window;
     window.setWindowIcon(QIcon::fromTheme("preferences-system"));
     app.setActivationWindow(&window);

lxqt-admin-user/mainwindow.cpp

@@ -21,161 +21,134 @@
 #include "mainwindow.h"
 #include <QDebug>
 #include <QMessageBox>
+#include <QInputDialog>
+#include <QLineEdit>
+#include <QRegExpValidator>
+#include <QRegExp>
 #include "userdialog.h"
 #include "groupdialog.h"
+#include "usermanager.h"
 
 MainWindow::MainWindow():
     QMainWindow(),
-    mUsersConfig(OOBS_USERS_CONFIG(oobs_users_config_get())),
+    mUserManager(new UserManager(this))
-    mGroupsConfig(OOBS_GROUPS_CONFIG(oobs_groups_config_get()))
 {
     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
+#ifdef Q_OS_FREEBSD //Disable group gpasswd for FreeBSD
+    connect(ui.tabWidget, &QTabWidget::currentChanged, [this](int index) {
+        if(index==1) {
+            ui.actionChangePasswd->setEnabled(false);
+        } else {
+            ui.actionChangePasswd->setEnabled(true);
+        }
+    });
+#endif
+    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);
+    connect(mUserManager, &UserManager::changed, this, &MainWindow::reload);
-    g_signal_connect(mGroupsConfig, "changed" , G_CALLBACK(onGroupsConfigChanged), this);
+    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);
+    const auto& users = mUserManager->users();
-    if(users)
+    for(const UserInfo* user: users)
     {
-        OobsListIter it;
+        uid_t uid = user->uid();
-        gboolean valid = oobs_list_get_iter_first(users, &it);
+        if(uid > 499 && !user->shell().isEmpty()) // exclude system users
-        while(valid)
         {
-            GObject* obj = oobs_list_get(users, &it);
+            QTreeWidgetItem* item = new QTreeWidgetItem();
-            OobsUser* user = OOBS_USER(obj);
+            item->setData(0, Qt::DisplayRole, user->name());
-            uid_t uid = oobs_user_get_uid(user);
+            QVariant obj = QVariant::fromValue<void*>((void*)user);
-            if(uid > 499 && oobs_user_get_shell(user)) // exclude system users
+            item->setData(0, Qt::UserRole, obj);
-            {
+            item->setData(1, Qt::DisplayRole, uid);
-                QString fullName = QString::fromUtf8(oobs_user_get_full_name(user));
+            item->setData(2, Qt::DisplayRole, user->fullName());
-                QString loginName = QString::fromLatin1(oobs_user_get_login_name(user));
+            GroupInfo* group = mUserManager->findGroupInfo(user->gid());
-                QString homeDir = QString::fromLocal8Bit(oobs_user_get_home_directory(user));
+            if(group != nullptr) {
-                QString groupName;
+                item->setData(3, Qt::DisplayRole, group->name());
-                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<void*>(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);
             }
-            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);
+    const auto& groups = mUserManager->groups();
-    if(groups)
+    for(const GroupInfo* group: groups)
     {
-        OobsListIter it;
+        QTreeWidgetItem* item = new QTreeWidgetItem();
-        gboolean valid = oobs_list_get_iter_first(groups, &it);
+        item->setData(0, Qt::DisplayRole, group->name());
-        while(valid)
+        QVariant obj = QVariant::fromValue<void*>((void*)group);
-        {
+        item->setData(0, Qt::UserRole, obj);
-            OobsGroup* group = OOBS_GROUP(oobs_list_get(groups, &it));
+        item->setData(1, Qt::DisplayRole, group->gid());
-            QTreeWidgetItem* item = new QTreeWidgetItem();
+        item->setData(2, Qt::DisplayRole, group->members().join(", "));
-            item->setData(0, Qt::DisplayRole, QString::fromLatin1(oobs_group_get_name(group)));
+        ui.groupList->addTopLevelItem(item);
-            QVariant obj = QVariant::fromValue<void*>(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);
-        }
     }
 }
 
-OobsUser *MainWindow::userFromItem(QTreeWidgetItem *item)
+void MainWindow::reload() {
+    reloadUsers();
+    reloadGroups();
+}
+
+UserInfo *MainWindow::userFromItem(QTreeWidgetItem *item)
 {
     if(item)
     {
         QVariant obj = item->data(0, Qt::UserRole);
-        OobsUser* user = OOBS_USER(obj.value<void*>());
+        return reinterpret_cast<UserInfo*>(obj.value<void*>());
-        return user;
     }
-    return NULL;
+    return nullptr;
 }
 
-OobsGroup* MainWindow::groupFromItem(QTreeWidgetItem *item)
+GroupInfo* MainWindow::groupFromItem(QTreeWidgetItem *item)
 {
     if(item)
     {
         QVariant obj = item->data(0, Qt::UserRole);
-        return OOBS_GROUP(obj.value<void*>());
+        return reinterpret_cast<GroupInfo*>(obj.value<void*>());
     }
-    return NULL;
+    return nullptr;
-}
-
-template <class T>
-bool MainWindow::authenticate(T *obj)
-{
-    GError* err = NULL;
-    if(!oobs_object_authenticate(OOBS_OBJECT(obj), &err))
-    {
-        if(err)
-        {
-            QMessageBox::critical(this, tr("Error"), QString::fromUtf8(err->message));
-            g_error_free(err);
-        }
-        return false;
-    }
-    return true;
 }
 
 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);
+            mUserManager->addUser(&newUser);
-            if(dlg.exec() == QDialog::Accepted)
+            QByteArray newPasswd;
-            {
+            if(getNewPassword(newUser.name(), newPasswd)) {
-                OobsUser* user = dlg.user();
+                mUserManager->changePassword(&newUser, newPasswd);
-                oobs_users_config_add_user(mUsersConfig, user);
-                oobs_object_commit(OOBS_OBJECT(mUsersConfig));
             }
         }
     }
     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);
+            mUserManager->addGroup(&newGroup);
-            if(dlg.exec() == QDialog::Accepted)
-            {
-                OobsGroup* group = dlg.group();
-                oobs_groups_config_add_group(mGroupsConfig, group);
-                oobs_object_commit(OOBS_OBJECT(mGroupsConfig));
-            }
         }
     }
 }
@@ -185,65 +158,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);
+                mUserManager->deleteUser(user);
-                oobs_object_commit(OOBS_OBJECT(mUsersConfig));
             }
         }
     }
     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);
+                mUserManager->deleteGroup(group);
-                oobs_object_commit(OOBS_OBJECT(mGroupsConfig));
             }
         }
     }
 }
 
+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<QLineEdit*>(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);
+        UserInfo* user = userFromItem(item);
-        if(user)
+        if(user) {
-        {
+            UserInfo newSettings(*user);
-            if(authenticate(mUsersConfig))
+            UserDialog dlg(mUserManager, &newSettings, this);
+            if(dlg.exec() == QDialog::Accepted)
             {
-                UserDialog dlg(user, this);
+                mUserManager->modifyUser(user, &newSettings);
-                dlg.exec();
             }
         }
     }
     else if(ui.tabWidget->currentIndex() == PageGroups)
     {
         QTreeWidgetItem* item = ui.groupList->currentItem();
-        OobsGroup* group = groupFromItem(item);
+        GroupInfo* group = groupFromItem(item);
-        if(group)
+        if(group) {
-        {
+            GroupInfo newSettings(*group);
-            if(authenticate(mGroupsConfig))
+            GroupDialog dlg(mUserManager, &newSettings, this);
+            if(dlg.exec() == QDialog::Accepted)
             {
-                GroupDialog dlg(group, this);
+                mUserManager->modifyGroup(group, &newSettings);
-                dlg.exec();
             }
         }
     }
 }
 
-void MainWindow::onRefresh()
-{
-    oobs_object_update(OOBS_OBJECT(mUsersConfig));
-    loadUsers();
-    oobs_object_update(OOBS_OBJECT(mGroupsConfig));
-    loadGroups();
-}

lxqt-admin-user/mainwindow.h

@@ -24,9 +24,9 @@
 #include <QMainWindow>
 #include "ui_mainwindow.h"
 
-#include <glib.h>
+class UserInfo;
-#include <oobs/oobs-usersconfig.h>
+class GroupInfo;
-#include <oobs/oobs-groupsconfig.h>
+class UserManager;
 
 class MainWindow : public QMainWindow
 {
@@ -44,34 +44,23 @@ public:
     virtual ~MainWindow();
 
 private:
-    void loadUsers();
+    UserInfo* userFromItem(QTreeWidgetItem* item);
-    void loadGroups();
+    GroupInfo* groupFromItem(QTreeWidgetItem *item);
-    OobsUser* userFromItem(QTreeWidgetItem* item);
+    bool getNewPassword(const QString& name, QByteArray& passwd);
-    OobsGroup* groupFromItem(QTreeWidgetItem *item);
+    void reloadUsers();
-
+    void reloadGroups();
-    template <class T>
-    bool authenticate(T* obj);
-
-    static void onUsersConfigChanged(OobsObject* obj, MainWindow* _this)
-    {
-        _this->loadUsers();
-    }
-    
-    static void onGroupsConfigChanged(OobsObject* obj, MainWindow* _this)
-    {
-        _this->loadGroups();
-    }
 
 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;
+    UserManager* mUserManager;
-    OobsGroupsConfig* mGroupsConfig;
 };
 
 #endif // MAINWINDOW_H

lxqt-admin-user/mainwindow.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>640</width>
+    <width>676</width>
-    <height>480</height>
+    <height>362</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -15,7 +15,16 @@
   </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QVBoxLayout" name="verticalLayout">
-    <property name="margin">
+    <property name="leftMargin">
+     <number>0</number>
+    </property>
+    <property name="topMargin">
+     <number>0</number>
+    </property>
+    <property name="rightMargin">
+     <number>0</number>
+    </property>
+    <property name="bottomMargin">
      <number>0</number>
     </property>
     <item>
@@ -42,9 +51,6 @@
           <property name="expandsOnDoubleClick">
            <bool>false</bool>
           </property>
-          <attribute name="headerStretchLastSection">
-           <bool>false</bool>
-          </attribute>
           <column>
            <property name="text">
             <string>Login Name</string>
@@ -107,6 +113,11 @@
             <string>Group ID</string>
            </property>
           </column>
+          <column>
+           <property name="text">
+            <string>Members</string>
+           </property>
+          </column>
          </widget>
         </item>
        </layout>
@@ -134,14 +145,14 @@
    <addaction name="actionAdd"/>
    <addaction name="actionDelete"/>
    <addaction name="actionProperties"/>
+   <addaction name="actionChangePasswd"/>
    <addaction name="actionRefresh"/>
   </widget>
   <widget class="QStatusBar" name="statusbar"/>
   <action name="actionAdd">
    <property name="icon">
     <iconset theme="list-add">
-     <normaloff/>
+     <normaloff>.</normaloff>.</iconset>
-    </iconset>
    </property>
    <property name="text">
     <string>Add</string>
@@ -153,8 +164,7 @@
   <action name="actionDelete">
    <property name="icon">
     <iconset theme="list-remove">
-     <normaloff/>
+     <normaloff>.</normaloff>.</iconset>
-    </iconset>
    </property>
    <property name="text">
     <string>Delete</string>
@@ -166,8 +176,7 @@
   <action name="actionProperties">
    <property name="icon">
     <iconset theme="document-properties">
-     <normaloff/>
+     <normaloff>.</normaloff>.</iconset>
-    </iconset>
    </property>
    <property name="text">
     <string>Properties</string>
@@ -179,8 +188,7 @@
   <action name="actionRefresh">
    <property name="icon">
     <iconset theme="view-refresh">
-     <normaloff/>
+     <normaloff>.</normaloff>.</iconset>
-    </iconset>
    </property>
    <property name="text">
     <string>Refresh</string>
@@ -189,6 +197,18 @@
     <string>Refresh the lists</string>
    </property>
   </action>
+  <action name="actionChangePasswd">
+   <property name="icon">
+    <iconset theme="dialog-password">
+     <normaloff>.</normaloff>.</iconset>
+   </property>
+   <property name="text">
+    <string>Change Password</string>
+   </property>
+   <property name="toolTip">
+    <string>Change password for the selected user or group</string>
+   </property>
+  </action>
  </widget>
  <resources/>
  <connections/>

lxqt-admin-user/org.lxqt.lxqt-admin-user.policy.in

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC
+ "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
+<policyconfig>
+
+  <action id="org.lxqt.lxqt-admin-user">
+    <message>Authentication is required for user administration</message>
+    <icon_name>preferences-system</icon_name>
+    <defaults>
+      <allow_any>auth_admin</allow_any>
+      <allow_inactive>auth_admin</allow_inactive>
+      <allow_active>auth_admin_keep</allow_active>
+    </defaults>
+    <annotate key="org.freedesktop.policykit.exec.path">@CMAKE_INSTALL_PREFIX@/bin/lxqt-admin-user-helper</annotate>
+  </action>
+
+</policyconfig>

lxqt-admin-user/translations/lxqt-admin-user.ts

@@ -1,263 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1">
-<context>
-    <name>GroupDialog</name>
-    <message>
-        <location filename="../groupdialog.ui" line="14"/>
-        <source>Group Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../groupdialog.ui" line="20"/>
-        <source>Group name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../groupdialog.ui" line="37"/>
-        <source>Group ID:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../groupdialog.ui" line="44"/>
-        <source>Users belong to this group:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../groupdialog.cpp" line="83"/>
-        <location filename="../groupdialog.cpp" line="92"/>
-        <location filename="../groupdialog.cpp" line="97"/>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../groupdialog.cpp" line="83"/>
-        <source>The group ID is in use.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../groupdialog.cpp" line="92"/>
-        <source>The group name cannot be empty.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../groupdialog.cpp" line="97"/>
-        <source>The group name is in use.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <location filename="../mainwindow.ui" line="14"/>
-        <source>User and Group Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="31"/>
-        <source>&amp;Users</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="50"/>
-        <source>Login Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="55"/>
-        <source>User ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="60"/>
-        <source>Full Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="65"/>
-        <source>Group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="70"/>
-        <source>Home Directory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="81"/>
-        <source>Show system users (for advanced users only)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="89"/>
-        <source>&amp;Groups</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="102"/>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="107"/>
-        <source>Group ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="120"/>
-        <source>toolBar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="147"/>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="150"/>
-        <source>Add new users or groups</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="160"/>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="163"/>
-        <source>Delete selected item</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="173"/>
-        <source>Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="176"/>
-        <source>edit properties of the selected item</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="186"/>
-        <source>Refresh</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="189"/>
-        <source>Refresh the lists</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="145"/>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="191"/>
-        <location filename="../mainwindow.cpp" line="204"/>
-        <source>Confirm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="191"/>
-        <source>Are you sure you want to delete the selected user?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="204"/>
-        <source>Are you sure you want to delete the selected group?</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>UserDialog</name>
-    <message>
-        <location filename="../userdialog.ui" line="14"/>
-        <source>User Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../userdialog.ui" line="24"/>
-        <source>General</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../userdialog.ui" line="33"/>
-        <source>Full name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../userdialog.ui" line="43"/>
-        <source>Login name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../userdialog.ui" line="53"/>
-        <source>Set password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../userdialog.ui" line="77"/>
-        <source>User ID:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../userdialog.ui" line="84"/>
-        <source>Main group:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../userdialog.ui" line="99"/>
-        <source>Advanced</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../userdialog.ui" line="105"/>
-        <source>Login shell:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../userdialog.ui" line="122"/>
-        <source>Home directory:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../userdialog.cpp" line="64"/>
-        <source>Change password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../userdialog.cpp" line="125"/>
-        <location filename="../userdialog.cpp" line="138"/>
-        <location filename="../userdialog.cpp" line="143"/>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../userdialog.cpp" line="125"/>
-        <source>The user ID is in use.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../userdialog.cpp" line="138"/>
-        <source>The user name cannot be empty.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../userdialog.cpp" line="143"/>
-        <source>The user name is in use.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../userdialog.cpp" line="159"/>
-        <source>Confirm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../userdialog.cpp" line="159"/>
-        <source>Are you sure you want to use an &quot;empty password&quot; for the user?</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>

lxqt-admin-user/translations/lxqt-admin-user_ar.desktop

@@ -0,0 +1,4 @@
+#TRANSLATIONS
+Name[ar]=المستخدمون والمجموعات
+GenericName[ar]=إعدادات المستخدمون والمجموعات
+Comment[ar]=اضبط مستخدمو النّظام ومجموعاته

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

lxqt-admin-user/translations/lxqt-admin-user_da.desktop

@@ -0,0 +1,3 @@
+Name[da]=Brugere og grupper
+GenericName[da]=Indstillinger for brugere og grupper
+Comment[da]=Konfigurér systemets brugere og grupper

lxqt-admin-user/translations/lxqt-admin-user_de.desktop

@@ -0,0 +1,4 @@
+#TRANSLATIONS
+Name[de]=Benutzer und Gruppen
+GenericName[de]=Einstellungen für Benutzer und Gruppen
+Comment[de]=Konfiguriert die Benutzer und Gruppen des Systems

lxqt-admin-user/translations/lxqt-admin-user_el.desktop

@@ -0,0 +1,3 @@
+Name[el]=Χρήστες και ομάδες
+GenericName[el]=Ρυθμίσεις χρηστών και ομάδων
+Comment[el]=Διαμόρφωση των χρηστών και των ομάδων του συστήματός σας

lxqt-admin-user/translations/lxqt-admin-user_fr.desktop

@@ -0,0 +1,4 @@
+#TRANSLATIONS
+Name[fr]=Utilisateurs et groupes
+GenericName[fr]=Paramétrage des utilisateurs et des groupes
+Comment[fr]=Paramétrage des utilisateurs et des groupes du système

lxqt-admin-user/translations/lxqt-admin-user_hu.desktop

@@ -0,0 +1,4 @@
+#TRANSLATIONS
+Name[hu]=Felhasználók és csoportok
+GenericName[hu]=Felhasználó és csoportkezelés
+Comment[hu]=A rendszer felhasználóinak és csoportjainak kezeése

lxqt-admin-user/translations/lxqt-admin-user_it.desktop

@@ -0,0 +1,3 @@
+#Translations
+Name[it]=Utenti e gruppi
+Comment[it]=Configura utenti e gruppi del sistema

lxqt-admin-user/translations/lxqt-admin-user_it.ts

@@ -1,264 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="it_IT" sourcelanguage="it_IT">
-<context>
-    <name>GroupDialog</name>
-    <message>
-        <location filename="../groupdialog.ui" line="14"/>
-        <source>Group Settings</source>
-        <translation>Gestione gruppi</translation>
-    </message>
-    <message>
-        <location filename="../groupdialog.ui" line="20"/>
-        <source>Group name:</source>
-        <translation>Nome del gruppo:</translation>
-    </message>
-    <message>
-        <location filename="../groupdialog.ui" line="37"/>
-        <source>Group ID:</source>
-        <translation>ID gruppo:</translation>
-    </message>
-    <message>
-        <location filename="../groupdialog.ui" line="44"/>
-        <source>Users belong to this group:</source>
-        <translation>Utenti appartenenti:</translation>
-    </message>
-    <message>
-        <location filename="../groupdialog.cpp" line="83"/>
-        <location filename="../groupdialog.cpp" line="92"/>
-        <location filename="../groupdialog.cpp" line="97"/>
-        <source>Error</source>
-        <translation>Errore</translation>
-    </message>
-    <message>
-        <location filename="../groupdialog.cpp" line="83"/>
-        <source>The group ID is in use.</source>
-        <translation>ID già in uso</translation>
-    </message>
-    <message>
-        <location filename="../groupdialog.cpp" line="92"/>
-        <source>The group name cannot be empty.</source>
-        <translation>Il nome non può essere vuoto.</translation>
-    </message>
-    <message>
-        <location filename="../groupdialog.cpp" line="97"/>
-        <source>The group name is in use.</source>
-        <translation>Il nome è già in uso.</translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <location filename="../mainwindow.ui" line="14"/>
-        <source>User and Group Settings</source>
-        <translation>Impostazioni utenti e gruppi</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="31"/>
-        <source>&amp;Users</source>
-        <translatorcomment>remove &amp;_ in source</translatorcomment>
-        <translation type="unfinished">Utenti</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="50"/>
-        <source>Login Name</source>
-        <translation>Nome Login</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="55"/>
-        <source>User ID</source>
-        <translation>ID utente</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="60"/>
-        <source>Full Name</source>
-        <translation>Nome completo</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="65"/>
-        <source>Group</source>
-        <translation>Gruppo</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="70"/>
-        <source>Home Directory</source>
-        <translation>Cartella Home</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="81"/>
-        <source>Show system users (for advanced users only)</source>
-        <translation>Mostra utenti di sistema (avanzato)</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="89"/>
-        <source>&amp;Groups</source>
-        <translation>Gruppi</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="102"/>
-        <source>Name</source>
-        <translation>Nome</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="107"/>
-        <source>Group ID</source>
-        <translation>ID gruppo</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="120"/>
-        <source>toolBar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="147"/>
-        <source>Add</source>
-        <translation>Aggiungi</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="150"/>
-        <source>Add new users or groups</source>
-        <translation>Aggiungi utenti o gruppi nuovi</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="160"/>
-        <source>Delete</source>
-        <translation>Cancella</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="163"/>
-        <source>Delete selected item</source>
-        <translation>Cancella selezionato</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="173"/>
-        <source>Properties</source>
-        <translation>Proprietà</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="176"/>
-        <source>edit properties of the selected item</source>
-        <translation>Modifica proprietà</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="186"/>
-        <source>Refresh</source>
-        <translation>Aggiorna</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="189"/>
-        <source>Refresh the lists</source>
-        <translation>Aggiorna lista</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="145"/>
-        <source>Error</source>
-        <translation>Errore</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="191"/>
-        <location filename="../mainwindow.cpp" line="204"/>
-        <source>Confirm</source>
-        <translation>Conferma</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="191"/>
-        <source>Are you sure you want to delete the selected user?</source>
-        <translation>Si è sicuro di voler cancellare l&apos;utente selezionato?</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="204"/>
-        <source>Are you sure you want to delete the selected group?</source>
-        <translation>Si è sicuro di voler cancellare il gruppo selezionato?</translation>
-    </message>
-</context>
-<context>
-    <name>UserDialog</name>
-    <message>
-        <location filename="../userdialog.ui" line="14"/>
-        <source>User Settings</source>
-        <translation>Impostazioni utente</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.ui" line="24"/>
-        <source>General</source>
-        <translation>Generali</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.ui" line="33"/>
-        <source>Full name:</source>
-        <translation>Nome completo:</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.ui" line="43"/>
-        <source>Login name:</source>
-        <translation>Nome al Login:</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.ui" line="53"/>
-        <source>Set password:</source>
-        <translation>Scegli il password:</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.ui" line="77"/>
-        <source>User ID:</source>
-        <translation>ID utente</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.ui" line="84"/>
-        <source>Main group:</source>
-        <translation>Gruppo principale:</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.ui" line="99"/>
-        <source>Advanced</source>
-        <translation>Avanzate:</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.ui" line="105"/>
-        <source>Login shell:</source>
-        <translation>Shell del login:</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.ui" line="122"/>
-        <source>Home directory:</source>
-        <translation>Cartella home:</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.cpp" line="64"/>
-        <source>Change password:</source>
-        <translation>Cambia password:</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.cpp" line="125"/>
-        <location filename="../userdialog.cpp" line="138"/>
-        <location filename="../userdialog.cpp" line="143"/>
-        <source>Error</source>
-        <translation>Errore</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.cpp" line="125"/>
-        <source>The user ID is in use.</source>
-        <translation>ID già in uso.</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.cpp" line="138"/>
-        <source>The user name cannot be empty.</source>
-        <translation>Il nome non può essere vuoto.</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.cpp" line="143"/>
-        <source>The user name is in use.</source>
-        <translation>Il nome è già in uso.</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.cpp" line="159"/>
-        <source>Confirm</source>
-        <translation>Conferma</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.cpp" line="159"/>
-        <source>Are you sure you want to use an &quot;empty password&quot; for the user?</source>
-        <translation>Si è sicuro di volere un password vuoto per l&apos;utente?</translation>
-    </message>
-</context>
-</TS>

lxqt-admin-user/translations/lxqt-admin-user_ja.ts

@@ -1,263 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="ja">
-<context>
-    <name>GroupDialog</name>
-    <message>
-        <location filename="../groupdialog.ui" line="14"/>
-        <source>Group Settings</source>
-        <translation>グループ設定</translation>
-    </message>
-    <message>
-        <location filename="../groupdialog.ui" line="20"/>
-        <source>Group name:</source>
-        <translation>グループ名:</translation>
-    </message>
-    <message>
-        <location filename="../groupdialog.ui" line="37"/>
-        <source>Group ID:</source>
-        <translation>グループID:</translation>
-    </message>
-    <message>
-        <location filename="../groupdialog.ui" line="44"/>
-        <source>Users belong to this group:</source>
-        <translation>このグループに属しているユーザー:</translation>
-    </message>
-    <message>
-        <location filename="../groupdialog.cpp" line="83"/>
-        <location filename="../groupdialog.cpp" line="92"/>
-        <location filename="../groupdialog.cpp" line="97"/>
-        <source>Error</source>
-        <translation>エラー</translation>
-    </message>
-    <message>
-        <location filename="../groupdialog.cpp" line="83"/>
-        <source>The group ID is in use.</source>
-        <translation>そのグループIDはすでに使われています</translation>
-    </message>
-    <message>
-        <location filename="../groupdialog.cpp" line="92"/>
-        <source>The group name cannot be empty.</source>
-        <translation>グループ名を入力する必要があります</translation>
-    </message>
-    <message>
-        <location filename="../groupdialog.cpp" line="97"/>
-        <source>The group name is in use.</source>
-        <translation>そのグループ名はすでに使われています</translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <location filename="../mainwindow.ui" line="14"/>
-        <source>User and Group Settings</source>
-        <translation>ユーザーとグループの設定</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="31"/>
-        <source>&amp;Users</source>
-        <translation>ユーザー(&amp;U)</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="50"/>
-        <source>Login Name</source>
-        <translation>ログイン名</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="55"/>
-        <source>User ID</source>
-        <translation>ユーザーID</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="60"/>
-        <source>Full Name</source>
-        <translation>フルネーム</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="65"/>
-        <source>Group</source>
-        <translation>グループ</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="70"/>
-        <source>Home Directory</source>
-        <translation>ホームディレクトリー</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="81"/>
-        <source>Show system users (for advanced users only)</source>
-        <translation>システムユーザーを表示(上級者専用)</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="89"/>
-        <source>&amp;Groups</source>
-        <translation>グループ(&amp;G)</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="102"/>
-        <source>Name</source>
-        <translation>名前</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="107"/>
-        <source>Group ID</source>
-        <translation>グループID</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="120"/>
-        <source>toolBar</source>
-        <translation>ツールバー</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="147"/>
-        <source>Add</source>
-        <translation>追加</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="150"/>
-        <source>Add new users or groups</source>
-        <translation>新しいユーザーまたはグループを追加</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="160"/>
-        <source>Delete</source>
-        <translation>削除</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="163"/>
-        <source>Delete selected item</source>
-        <translation>選択した項目を削除</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="173"/>
-        <source>Properties</source>
-        <translation>プロパティー</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="176"/>
-        <source>edit properties of the selected item</source>
-        <translation>選択した項目のプロパティーを編集</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="186"/>
-        <source>Refresh</source>
-        <translation>再読込み</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="189"/>
-        <source>Refresh the lists</source>
-        <translation>リストを再読込み</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="145"/>
-        <source>Error</source>
-        <translation>エラー</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="191"/>
-        <location filename="../mainwindow.cpp" line="204"/>
-        <source>Confirm</source>
-        <translation>確認</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="191"/>
-        <source>Are you sure you want to delete the selected user?</source>
-        <translation>本当に、選択したユーザーを削除してよいですか？</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="204"/>
-        <source>Are you sure you want to delete the selected group?</source>
-        <translation>本当に、選択したグループを削除してよいですか？</translation>
-    </message>
-</context>
-<context>
-    <name>UserDialog</name>
-    <message>
-        <location filename="../userdialog.ui" line="14"/>
-        <source>User Settings</source>
-        <translation>ユーザー設定</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.ui" line="24"/>
-        <source>General</source>
-        <translation>一般</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.ui" line="33"/>
-        <source>Full name:</source>
-        <translation>フルネーム:</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.ui" line="43"/>
-        <source>Login name:</source>
-        <translation>ログイン名:</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.ui" line="53"/>
-        <source>Set password:</source>
-        <translation>パスワードを設定:</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.ui" line="77"/>
-        <source>User ID:</source>
-        <translation>ユーザーID:</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.ui" line="84"/>
-        <source>Main group:</source>
-        <translation>メイングループ:</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.ui" line="99"/>
-        <source>Advanced</source>
-        <translation>高度</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.ui" line="105"/>
-        <source>Login shell:</source>
-        <translation>ログインシェル:</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.ui" line="122"/>
-        <source>Home directory:</source>
-        <translation>ホームディレクトリー:</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.cpp" line="64"/>
-        <source>Change password:</source>
-        <translation>パスワードを変更:</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.cpp" line="125"/>
-        <location filename="../userdialog.cpp" line="138"/>
-        <location filename="../userdialog.cpp" line="143"/>
-        <source>Error</source>
-        <translation>エラー</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.cpp" line="125"/>
-        <source>The user ID is in use.</source>
-        <translation>そのユーザーIDはすでに使われています</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.cpp" line="138"/>
-        <source>The user name cannot be empty.</source>
-        <translation>ユーザー名を入力する必要があります</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.cpp" line="143"/>
-        <source>The user name is in use.</source>
-        <translation>そのユーザー名はすでに使われています</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.cpp" line="159"/>
-        <source>Confirm</source>
-        <translation>確認</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.cpp" line="159"/>
-        <source>Are you sure you want to use an &quot;empty password&quot; for the user?</source>
-        <translation>本当に、空のパスワードをそのユーザーに設定してよいですか？</translation>
-    </message>
-</context>
-</TS>

lxqt-admin-user/translations/lxqt-admin-user_pl.desktop

@@ -0,0 +1,4 @@
+#TRANSLATIONS
+Name[pl]=Użytkownicy i grupy
+GenericName[pl]=Zarządzanie użytkownikami i grupami
+

lxqt-admin-user/translations/lxqt-admin-user_pt.ts

@@ -1,263 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="pt">
-<context>
-    <name>GroupDialog</name>
-    <message>
-        <location filename="../groupdialog.ui" line="14"/>
-        <source>Group Settings</source>
-        <translation>Definições de grupo</translation>
-    </message>
-    <message>
-        <location filename="../groupdialog.ui" line="20"/>
-        <source>Group name:</source>
-        <translation>Nome do grupo:</translation>
-    </message>
-    <message>
-        <location filename="../groupdialog.ui" line="37"/>
-        <source>Group ID:</source>
-        <translation>ID do grupo:</translation>
-    </message>
-    <message>
-        <location filename="../groupdialog.ui" line="44"/>
-        <source>Users belong to this group:</source>
-        <translation>Utilizadores pertencentes a este grupo:</translation>
-    </message>
-    <message>
-        <location filename="../groupdialog.cpp" line="83"/>
-        <location filename="../groupdialog.cpp" line="92"/>
-        <location filename="../groupdialog.cpp" line="97"/>
-        <source>Error</source>
-        <translation>Erro</translation>
-    </message>
-    <message>
-        <location filename="../groupdialog.cpp" line="83"/>
-        <source>The group ID is in use.</source>
-        <translation>O ID do grupo já está em utilização.</translation>
-    </message>
-    <message>
-        <location filename="../groupdialog.cpp" line="92"/>
-        <source>The group name cannot be empty.</source>
-        <translation>O nome do grupo não pode estar vazio.</translation>
-    </message>
-    <message>
-        <location filename="../groupdialog.cpp" line="97"/>
-        <source>The group name is in use.</source>
-        <translation>O nome do grupo já está em utilização.</translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <location filename="../mainwindow.ui" line="14"/>
-        <source>User and Group Settings</source>
-        <translation>Definições de grupo e utilizador</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="31"/>
-        <source>&amp;Users</source>
-        <translation>&amp;Utilizadores</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="50"/>
-        <source>Login Name</source>
-        <translation>Nome de acesso</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="55"/>
-        <source>User ID</source>
-        <translation>ID de utilizador</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="60"/>
-        <source>Full Name</source>
-        <translation>Nome completo</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="65"/>
-        <source>Group</source>
-        <translation>Grupo</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="70"/>
-        <source>Home Directory</source>
-        <translation>Pasta pessoal</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="81"/>
-        <source>Show system users (for advanced users only)</source>
-        <translation>Mostrar utilizadores de sistema</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="89"/>
-        <source>&amp;Groups</source>
-        <translation>&amp;Grupos</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="102"/>
-        <source>Name</source>
-        <translation>Nome</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="107"/>
-        <source>Group ID</source>
-        <translation>ID do grupo</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="120"/>
-        <source>toolBar</source>
-        <translation>Barra de ferramentas</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="147"/>
-        <source>Add</source>
-        <translation>Adicionar</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="150"/>
-        <source>Add new users or groups</source>
-        <translation>Adicionar utilizadores ou grupos</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="160"/>
-        <source>Delete</source>
-        <translation>Eliminar</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="163"/>
-        <source>Delete selected item</source>
-        <translation>Eliminar item selecionado</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="173"/>
-        <source>Properties</source>
-        <translation>Propriedades</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="176"/>
-        <source>edit properties of the selected item</source>
-        <translation>Editar propriedades do item selecionado</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="186"/>
-        <source>Refresh</source>
-        <translation>Atualizar</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="189"/>
-        <source>Refresh the lists</source>
-        <translation>Atualizar as listas</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="145"/>
-        <source>Error</source>
-        <translation>Erro</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="191"/>
-        <location filename="../mainwindow.cpp" line="204"/>
-        <source>Confirm</source>
-        <translation>Confirmação</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="191"/>
-        <source>Are you sure you want to delete the selected user?</source>
-        <translation>Tem a certeza que quer eliminar o utilizador selecionado?</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="204"/>
-        <source>Are you sure you want to delete the selected group?</source>
-        <translation>Tem a certeza que quer eliminar o grupo selecionado?</translation>
-    </message>
-</context>
-<context>
-    <name>UserDialog</name>
-    <message>
-        <location filename="../userdialog.ui" line="14"/>
-        <source>User Settings</source>
-        <translation>Definições de utilizador</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.ui" line="24"/>
-        <source>General</source>
-        <translation>Geral</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.ui" line="33"/>
-        <source>Full name:</source>
-        <translation>Nome completo:</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.ui" line="43"/>
-        <source>Login name:</source>
-        <translation>Nome de acesso:</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.ui" line="53"/>
-        <source>Set password:</source>
-        <translation>Definir senha:</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.ui" line="77"/>
-        <source>User ID:</source>
-        <translation>ID de utilizador:</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.ui" line="84"/>
-        <source>Main group:</source>
-        <translation>Grupo principal:</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.ui" line="99"/>
-        <source>Advanced</source>
-        <translation>Avançado</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.ui" line="105"/>
-        <source>Login shell:</source>
-        <translation>Consola de acesso:</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.ui" line="122"/>
-        <source>Home directory:</source>
-        <translation>Pasta pessoal:</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.cpp" line="64"/>
-        <source>Change password:</source>
-        <translation>Mudar senha:</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.cpp" line="125"/>
-        <location filename="../userdialog.cpp" line="138"/>
-        <location filename="../userdialog.cpp" line="143"/>
-        <source>Error</source>
-        <translation>Erro</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.cpp" line="125"/>
-        <source>The user ID is in use.</source>
-        <translation>O ID do utilizador já está em utilização.</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.cpp" line="138"/>
-        <source>The user name cannot be empty.</source>
-        <translation>O nome de utilizador não pode estar vazio.</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.cpp" line="143"/>
-        <source>The user name is in use.</source>
-        <translation>O nome de utilizador já está em utilização.</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.cpp" line="159"/>
-        <source>Confirm</source>
-        <translation>Confirmação</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.cpp" line="159"/>
-        <source>Are you sure you want to use an &quot;empty password&quot; for the user?</source>
-        <translation>Tem a certeza que quer definir uma senha vazia para o utilizador?</translation>
-    </message>
-</context>
-</TS>

lxqt-admin-user/translations/lxqt-admin-user_ru.ts

@@ -1,263 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="ru">
-<context>
-    <name>GroupDialog</name>
-    <message>
-        <location filename="../groupdialog.ui" line="14"/>
-        <source>Group Settings</source>
-        <translation>Настройки группы</translation>
-    </message>
-    <message>
-        <location filename="../groupdialog.ui" line="20"/>
-        <source>Group name:</source>
-        <translation>Имя группы:</translation>
-    </message>
-    <message>
-        <location filename="../groupdialog.ui" line="37"/>
-        <source>Group ID:</source>
-        <translation>ID группы:</translation>
-    </message>
-    <message>
-        <location filename="../groupdialog.ui" line="44"/>
-        <source>Users belong to this group:</source>
-        <translation>Пользователи, относящиеся к этой группе:</translation>
-    </message>
-    <message>
-        <location filename="../groupdialog.cpp" line="83"/>
-        <location filename="../groupdialog.cpp" line="92"/>
-        <location filename="../groupdialog.cpp" line="97"/>
-        <source>Error</source>
-        <translation>Ошибка</translation>
-    </message>
-    <message>
-        <location filename="../groupdialog.cpp" line="83"/>
-        <source>The group ID is in use.</source>
-        <translation>ID группы уже используется.</translation>
-    </message>
-    <message>
-        <location filename="../groupdialog.cpp" line="92"/>
-        <source>The group name cannot be empty.</source>
-        <translation>Имя группы не может быть пустым.</translation>
-    </message>
-    <message>
-        <location filename="../groupdialog.cpp" line="97"/>
-        <source>The group name is in use.</source>
-        <translation>Имя группы уже используется.</translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <location filename="../mainwindow.ui" line="14"/>
-        <source>User and Group Settings</source>
-        <translation>Настройки пользователя и группы</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="31"/>
-        <source>&amp;Users</source>
-        <translation>&amp;Пользователи</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="50"/>
-        <source>Login Name</source>
-        <translation>Логин пользователя</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="55"/>
-        <source>User ID</source>
-        <translation>ID пользователя</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="60"/>
-        <source>Full Name</source>
-        <translation>Полное имя</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="65"/>
-        <source>Group</source>
-        <translation>Группа</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="70"/>
-        <source>Home Directory</source>
-        <translation>Домашний каталог</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="81"/>
-        <source>Show system users (for advanced users only)</source>
-        <translation>Показывать системных пользователей (только для продвинутых пользователей)</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="89"/>
-        <source>&amp;Groups</source>
-        <translation>&amp;Группы</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="102"/>
-        <source>Name</source>
-        <translation>Имя</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="107"/>
-        <source>Group ID</source>
-        <translation>ID группы</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="120"/>
-        <source>toolBar</source>
-        <translation>Панель</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="147"/>
-        <source>Add</source>
-        <translation>Добавить</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="150"/>
-        <source>Add new users or groups</source>
-        <translation>Добавить новых пользователей или группы</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="160"/>
-        <source>Delete</source>
-        <translation>Удалить</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="163"/>
-        <source>Delete selected item</source>
-        <translation>Удалить выбранный элемент</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="173"/>
-        <source>Properties</source>
-        <translation>Свойства</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="176"/>
-        <source>edit properties of the selected item</source>
-        <translation>Редактировать свойства выделенного элемента</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="186"/>
-        <source>Refresh</source>
-        <translation>Обновить</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="189"/>
-        <source>Refresh the lists</source>
-        <translation>Обновить список</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="145"/>
-        <source>Error</source>
-        <translation>Ошибка</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="191"/>
-        <location filename="../mainwindow.cpp" line="204"/>
-        <source>Confirm</source>
-        <translation>Подтвердить</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="191"/>
-        <source>Are you sure you want to delete the selected user?</source>
-        <translation>Вы действительно хотите удалить выбранного пользователя?</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="204"/>
-        <source>Are you sure you want to delete the selected group?</source>
-        <translation>Вы действительно хотите удалить выбранную группу?</translation>
-    </message>
-</context>
-<context>
-    <name>UserDialog</name>
-    <message>
-        <location filename="../userdialog.ui" line="14"/>
-        <source>User Settings</source>
-        <translation>Настройки пользователя</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.ui" line="24"/>
-        <source>General</source>
-        <translation>Общие</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.ui" line="33"/>
-        <source>Full name:</source>
-        <translation>Полное имя:</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.ui" line="43"/>
-        <source>Login name:</source>
-        <translation>Логин пользователя:</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.ui" line="53"/>
-        <source>Set password:</source>
-        <translation>Установить пароль:</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.ui" line="77"/>
-        <source>User ID:</source>
-        <translation>ID пользователя:</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.ui" line="84"/>
-        <source>Main group:</source>
-        <translation>Главная группа:</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.ui" line="99"/>
-        <source>Advanced</source>
-        <translation>Расширенные</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.ui" line="105"/>
-        <source>Login shell:</source>
-        <translation>Оболочка:</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.ui" line="122"/>
-        <source>Home directory:</source>
-        <translation>Домашний каталог:</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.cpp" line="64"/>
-        <source>Change password:</source>
-        <translation>Изменить пароль:</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.cpp" line="125"/>
-        <location filename="../userdialog.cpp" line="138"/>
-        <location filename="../userdialog.cpp" line="143"/>
-        <source>Error</source>
-        <translation>Ошибка</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.cpp" line="125"/>
-        <source>The user ID is in use.</source>
-        <translation>Пользовательский ID уже используется.</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.cpp" line="138"/>
-        <source>The user name cannot be empty.</source>
-        <translation>Имя пользователя не может быть пустым.</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.cpp" line="143"/>
-        <source>The user name is in use.</source>
-        <translation>Имя пользователя уже используется.</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.cpp" line="159"/>
-        <source>Confirm</source>
-        <translation>Подтвердить</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.cpp" line="159"/>
-        <source>Are you sure you want to use an &quot;empty password&quot; for the user?</source>
-        <translation>Вы действительно хотите использовать пустой пароль для этого пользователя?</translation>
-    </message>
-</context>
-</TS>

lxqt-admin-user/translations/lxqt-admin-user_ru_RU.desktop

@@ -1,6 +0,0 @@
-[Desktop Entry]
-Name[ru_RU]=Пользователи и группы
-GenericName[ru_RU]=Настройки пользователей и групп
-Comment[ru_RU]=Настроить пользователей и группы вашей системы
-
-#TRANSLATIONS_DIR=translations

lxqt-admin-user/translations/lxqt-admin-user_ru_RU.ts

@@ -1,263 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="ru_RU">
-<context>
-    <name>GroupDialog</name>
-    <message>
-        <location filename="../groupdialog.ui" line="14"/>
-        <source>Group Settings</source>
-        <translation>Настройки группы</translation>
-    </message>
-    <message>
-        <location filename="../groupdialog.ui" line="20"/>
-        <source>Group name:</source>
-        <translation>Имя группы:</translation>
-    </message>
-    <message>
-        <location filename="../groupdialog.ui" line="37"/>
-        <source>Group ID:</source>
-        <translation>ID группы:</translation>
-    </message>
-    <message>
-        <location filename="../groupdialog.ui" line="44"/>
-        <source>Users belong to this group:</source>
-        <translation>Пользователи, относящиеся к этой группе:</translation>
-    </message>
-    <message>
-        <location filename="../groupdialog.cpp" line="83"/>
-        <location filename="../groupdialog.cpp" line="92"/>
-        <location filename="../groupdialog.cpp" line="97"/>
-        <source>Error</source>
-        <translation>Ошибка</translation>
-    </message>
-    <message>
-        <location filename="../groupdialog.cpp" line="83"/>
-        <source>The group ID is in use.</source>
-        <translation>ID группы уже используется.</translation>
-    </message>
-    <message>
-        <location filename="../groupdialog.cpp" line="92"/>
-        <source>The group name cannot be empty.</source>
-        <translation>Имя группы не может быть пустым.</translation>
-    </message>
-    <message>
-        <location filename="../groupdialog.cpp" line="97"/>
-        <source>The group name is in use.</source>
-        <translation>Имя группы уже используется.</translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <location filename="../mainwindow.ui" line="14"/>
-        <source>User and Group Settings</source>
-        <translation>Настройки пользователя и группы</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="31"/>
-        <source>&amp;Users</source>
-        <translation>&amp;Пользователи</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="50"/>
-        <source>Login Name</source>
-        <translation>Логин пользователя</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="55"/>
-        <source>User ID</source>
-        <translation>ID пользователя</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="60"/>
-        <source>Full Name</source>
-        <translation>Полное имя</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="65"/>
-        <source>Group</source>
-        <translation>Группа</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="70"/>
-        <source>Home Directory</source>
-        <translation>Домашний каталог</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="81"/>
-        <source>Show system users (for advanced users only)</source>
-        <translation>Показывать системных пользователей (только для продвинутых пользователей)</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="89"/>
-        <source>&amp;Groups</source>
-        <translation>&amp;Группы</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="102"/>
-        <source>Name</source>
-        <translation>Имя</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="107"/>
-        <source>Group ID</source>
-        <translation>ID группы</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="120"/>
-        <source>toolBar</source>
-        <translation>Панель</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="147"/>
-        <source>Add</source>
-        <translation>Добавить</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="150"/>
-        <source>Add new users or groups</source>
-        <translation>Добавить новых пользователей или группы</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="160"/>
-        <source>Delete</source>
-        <translation>Удалить</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="163"/>
-        <source>Delete selected item</source>
-        <translation>Удалить выбранный элемент</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="173"/>
-        <source>Properties</source>
-        <translation>Свойства</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="176"/>
-        <source>edit properties of the selected item</source>
-        <translation>Редактировать свойства выделенного элемента</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="186"/>
-        <source>Refresh</source>
-        <translation>Обновить</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="189"/>
-        <source>Refresh the lists</source>
-        <translation>Обновить список</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="145"/>
-        <source>Error</source>
-        <translation>Ошибка</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="191"/>
-        <location filename="../mainwindow.cpp" line="204"/>
-        <source>Confirm</source>
-        <translation>Подтвердить</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="191"/>
-        <source>Are you sure you want to delete the selected user?</source>
-        <translation>Вы действительно хотите удалить выбранного пользователя?</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="204"/>
-        <source>Are you sure you want to delete the selected group?</source>
-        <translation>Вы действительно хотите удалить выбранную группу?</translation>
-    </message>
-</context>
-<context>
-    <name>UserDialog</name>
-    <message>
-        <location filename="../userdialog.ui" line="14"/>
-        <source>User Settings</source>
-        <translation>Настройки пользователя</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.ui" line="24"/>
-        <source>General</source>
-        <translation>Общие</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.ui" line="33"/>
-        <source>Full name:</source>
-        <translation>Полное имя:</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.ui" line="43"/>
-        <source>Login name:</source>
-        <translation>Логин пользователя:</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.ui" line="53"/>
-        <source>Set password:</source>
-        <translation>Установить пароль:</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.ui" line="77"/>
-        <source>User ID:</source>
-        <translation>ID пользователя:</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.ui" line="84"/>
-        <source>Main group:</source>
-        <translation>Главная группа:</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.ui" line="99"/>
-        <source>Advanced</source>
-        <translation>Расширенные</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.ui" line="105"/>
-        <source>Login shell:</source>
-        <translation>Оболочка:</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.ui" line="122"/>
-        <source>Home directory:</source>
-        <translation>Домашний каталог:</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.cpp" line="64"/>
-        <source>Change password:</source>
-        <translation>Изменить пароль:</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.cpp" line="125"/>
-        <location filename="../userdialog.cpp" line="138"/>
-        <location filename="../userdialog.cpp" line="143"/>
-        <source>Error</source>
-        <translation>Ошибка</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.cpp" line="125"/>
-        <source>The user ID is in use.</source>
-        <translation>Пользовательский ID уже используется.</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.cpp" line="138"/>
-        <source>The user name cannot be empty.</source>
-        <translation>Имя пользователя не может быть пустым.</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.cpp" line="143"/>
-        <source>The user name is in use.</source>
-        <translation>Имя пользователя уже используется.</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.cpp" line="159"/>
-        <source>Confirm</source>
-        <translation>Подтвердить</translation>
-    </message>
-    <message>
-        <location filename="../userdialog.cpp" line="159"/>
-        <source>Are you sure you want to use an &quot;empty password&quot; for the user?</source>
-        <translation>Вы действительно хотите использовать пустой пароль для этого пользователя?</translation>
-    </message>
-</context>
-</TS>

lxqt-admin-user/userdialog.cpp

@@ -20,73 +20,65 @@
 
 #include "userdialog.h"
 #include <QMessageBox>
+#include <QListWidgetItem>
+#include <QDebug>
+#include "usermanager.h"
 
-UserDialog::UserDialog(OobsUser* user, QWidget* parent):
+#define DEFAULT_UID_MIN 1000
-    QDialog(),
+#define DEFAULT_UID_MAX 32768
+
+UserDialog::UserDialog(UserManager* userManager, UserInfo* user, QWidget* parent):
+    QDialog(parent),
+    mUserManager(userManager),
+    mUser(user),
     mFullNameChanged(false),
-    mHomeDirChanged(false),
+    mHomeDirChanged(false)
-    mUser(user ? OOBS_USER(g_object_ref(user)) : NULL)
 {
     ui.setupUi(this);
-
+    bool isNewUser = (user->uid() == 0 && user->name().isEmpty());
     // load all groups
-    OobsGroupsConfig* groupsConfig = OOBS_GROUPS_CONFIG(oobs_groups_config_get());
+    for(const GroupInfo* group: mUserManager->groups())
-    OobsList* groups = oobs_groups_config_get_groups(groupsConfig);
-    if(groups)
     {
-        OobsListIter it;
+        ui.mainGroup->addItem(group->name());
-        gboolean valid = oobs_list_get_iter_first(groups, &it);
-        while(valid)
-        {
-            OobsGroup* group = OOBS_GROUP(oobs_list_get(groups, &it));
-            ui.mainGroup->addItem(oobs_group_get_name(group));
-            valid = oobs_list_iter_next(groups, &it);
-        }
-    }
 
+        QListWidgetItem* item = new QListWidgetItem();
+        item->setText(group->name());
+        item->setFlags(Qt::ItemIsEnabled|Qt::ItemIsUserCheckable|Qt::ItemIsSelectable);
+        if(!isNewUser)
+        {
+            if(group->hasMember(user->name())) // 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());
+    ui.loginShell->addItems(mUserManager->availableShells());
 
-    // add known shells to the combo box for selection
+    if(isNewUser) // new user
-    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));
-    }
-
-    if(user) // edit an existing 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));
-    }
-    else // create a new user
-    {
-        mOldUid = -1;
-        ui.loginName->setReadOnly(false);
-        ui.loginName->setFocus();
-        ui.changePasswd->setChecked(true);
-        ui.uid->setValue(oobs_users_config_find_free_uid(userConfig, 1000, 32768));
-        ui.loginShell->setEditText(oobs_users_config_get_default_shell(userConfig));
         ui.mainGroup->setCurrentIndex(-1);
+        ui.loginShell->setCurrentIndex(-1);
+    }
+    else  // edit an existing user
+    {
+        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)
@@ -118,61 +110,33 @@ void UserDialog::onHomeDirChanged(const QString& text)
 
 void UserDialog::accept()
 {
-    OobsUsersConfig* usersConfig = OOBS_USERS_CONFIG(oobs_users_config_get());
+    mUser->setUid(ui.uid->value());
-    uid_t uid = ui.uid->value();
+    QString loginName = ui.loginName->text();
-    if(uid != mOldUid && oobs_users_config_is_uid_used(usersConfig, uid))
+    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;
+    mUser->setHomeDir(ui.homeDir->text());
-    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);
-
-    QByteArray fullName = ui.fullName->text().toUtf8();
-    oobs_user_set_full_name(mUser, fullName);
-
-    // 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);
-        }
-        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());
+    QString groupName = ui.mainGroup->currentText();
-    QByteArray groupName = ui.mainGroup->currentText().toLatin1();
+    if(!groupName.isEmpty()) {
-    OobsGroup* group = oobs_groups_config_get_from_name(groupsConfig, groupName);
+        GroupInfo* group = mUserManager->findGroupInfo(groupName);
-    oobs_user_set_main_group(mUser, group);
+        if(group)
+            mUser->setGid(group->gid());
+    }
 
-    if(!createNew)
+    // other groups
-        oobs_object_commit_async(OOBS_OBJECT(mUser), NULL, NULL);
+    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());
+        }
+    }
     QDialog::accept();
 }

lxqt-admin-user/userdialog.h

@@ -23,23 +23,19 @@
 
 #include <QDialog>
 #include "ui_userdialog.h"
-#include <glib.h>
+#include "usermanager.h"
-#include <oobs/oobs-usersconfig.h>
+
-#include <oobs/oobs-groupsconfig.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;
+    UserManager* mUserManager;
-    uid_t mOldUid;
+    UserInfo* mUser;
-#if 0
-    QByteArray mOldLoginName;
-    QByteArray mOldFullName;
-    QByteArray mOldGroupName;
-    QByteArray mOldHomeDir;
-#endif
 
     bool mFullNameChanged;
     bool mHomeDirChanged;

lxqt-admin-user/userdialog.ui

@@ -27,16 +27,6 @@
        <property name="fieldGrowthPolicy">
         <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
        </property>
-       <item row="2" column="0">
-        <widget class="QLabel" name="label_3">
-         <property name="text">
-          <string>Full name:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="1">
-        <widget class="QLineEdit" name="fullName"/>
-       </item>
        <item row="0" column="0">
         <widget class="QLabel" name="label">
          <property name="text">
@@ -48,44 +38,40 @@
         <widget class="QLineEdit" name="loginName"/>
        </item>
        <item row="1" column="0">
-        <widget class="QCheckBox" name="changePasswd">
+        <widget class="QLabel" name="label_3">
          <property name="text">
-          <string>Set password:</string>
+          <string>Full name:</string>
          </property>
         </widget>
        </item>
        <item row="1" column="1">
-        <widget class="QLineEdit" name="passwd">
+        <widget class="QLineEdit" name="fullName"/>
-         <property name="enabled">
-          <bool>false</bool>
-         </property>
-         <property name="echoMode">
-          <enum>QLineEdit::Password</enum>
-         </property>
-        </widget>
        </item>
-       <item row="4" column="1">
+       <item row="3" column="0">
-        <widget class="QSpinBox" name="uid">
-         <property name="maximum">
-          <number>32768</number>
-         </property>
-        </widget>
-       </item>
-       <item row="4" column="0">
         <widget class="QLabel" name="label_2">
          <property name="text">
           <string>User ID:</string>
          </property>
         </widget>
        </item>
-       <item row="5" column="0">
+       <item row="3" column="1">
+        <widget class="QSpinBox" name="uid">
+         <property name="specialValueText">
+          <string>Default</string>
+         </property>
+         <property name="maximum">
+          <number>32768</number>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="0">
         <widget class="QLabel" name="label_5">
          <property name="text">
           <string>Main group:</string>
          </property>
         </widget>
        </item>
-       <item row="5" column="1">
+       <item row="4" column="1">
         <widget class="QComboBox" name="mainGroup">
          <property name="editable">
           <bool>true</bool>
@@ -94,6 +80,30 @@
        </item>
       </layout>
      </widget>
+     <widget class="QWidget" name="tab_3">
+      <attribute name="title">
+       <string>Groups</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_2">
+       <item>
+        <widget class="QLabel" name="label_6">
+         <property name="text">
+          <string>The user belongs to the following groups:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QListWidget" name="groupList">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+           <horstretch>0</horstretch>
+           <verstretch>1</verstretch>
+          </sizepolicy>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
      <widget class="QWidget" name="tab_2">
       <attribute name="title">
        <string>Advanced</string>
@@ -173,21 +183,5 @@
     </hint>
    </hints>
   </connection>
-  <connection>
-   <sender>changePasswd</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>passwd</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>71</x>
-     <y>125</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>192</x>
-     <y>129</y>
-    </hint>
-   </hints>
-  </connection>
  </connections>
 </ui>

lxqt-admin-user/usermanager.cpp

@@ -0,0 +1,436 @@
+/* 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) <pcman.tw@gmail.com>
+ *
+ * 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 <QDebug>
+#include <algorithm>
+#include <QFileSystemWatcher>
+#include <QTimer>
+#include <QProcess>
+#include <QFile>
+#include <QMessageBox>
+#include <unistd.h>
+
+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("<strong>Action (%1) failed:</strong><br/><pre>%2</pre>").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(',');
+    }
+#ifdef Q_OS_FREEBSD
+    command << QStringLiteral("-n");
+#endif
+    command << user->name();
+    return pkexec(command);
+}
+
+bool UserManager::modifyUser(UserInfo* user, UserInfo* newSettings) {
+    if(!user || user->name().isEmpty() || !newSettings)
+        return false;
+
+    bool isDirty = false;
+    QStringList command;
+    command << QStringLiteral("usermod");
+    if(newSettings->uid() != user->uid()) {
+        command << QStringLiteral("-u") << QString::number(newSettings->uid());
+	isDirty=true;
+    }
+    if(newSettings->homeDir() != user->homeDir()) {
+        command << QStringLiteral("-d") << newSettings->homeDir();
+	isDirty=true;
+    }
+    if(newSettings->shell() != user->shell()) {
+        command << QStringLiteral("-s") << newSettings->shell();
+	isDirty=true;
+    }
+
+    if(newSettings->fullName() != user->fullName()) {
+        command << QStringLiteral("-c") << newSettings->fullName();
+	isDirty=true;
+    }
+    if(newSettings->gid() != user->gid()) {
+        command << QStringLiteral("-g") << QString::number(newSettings->gid());
+	isDirty=true;
+    }
+    if(newSettings->name() != user->name()) {	  // change login name
+        command << QStringLiteral("-l") << newSettings->name();
+	isDirty=true;
+    }
+    if(newSettings->groups() != user->groups()) {  // change group membership
+        command << QStringLiteral("-G") << newSettings->groups().join(',');
+	isDirty=true;
+    }
+#ifdef Q_OS_FREEBSD
+    command << QStringLiteral("-n");
+#endif
+    command << user->name();
+    if(isDirty) {
+        return pkexec(command);
+    }
+    return true; //No changes
+}
+
+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;
+    bool isDirty = false;
+    command << QStringLiteral("groupmod");
+    if(newSettings->gid() != group->gid()) {
+        command << QStringLiteral("-g") << QString::number(newSettings->gid());
+        isDirty = true;
+       }
+    if(newSettings->name() != group->name()) {
+        isDirty = true;
+#ifdef Q_OS_FREEBSD
+        command << QStringLiteral("-l");
+#else
+        command << QStringLiteral("-n");
+#endif
+        command << newSettings->name();
+    }
+#ifdef Q_OS_FREEBSD
+    if(newSettings->members() != group->members()) {
+        isDirty = true;
+        command << QStringLiteral("-M");  // Set the list of group members.
+        command << newSettings->members().join(',');
+    }
+    command << QStringLiteral("-n");
+#endif
+    command << group->name();
+
+    if(isDirty && !pkexec(command))
+        return false;
+
+    // if group members are changed, use gpasswd to reset members on linux
+#ifndef Q_OS_FREEBSD //This is already done with pw groupmod -M earlier.
+    if(newSettings->members() != group->members()) {
+        command.clear();
+        command << QStringLiteral("gpasswd");
+        command << QStringLiteral("-M");  // Set the list of group members.
+        command << newSettings->members().join(',');
+        //if the group name changed the group->name() is still the old setting.
+        if(newSettings->name() != group->name()) {
+           command << newSettings->name();
+           } else {
+           command << group->name();
+        }
+
+        return pkexec(command);
+    }
+#endif
+    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;
+}
+

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) <pcman.tw@gmail.com>
+ *
+ * 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 <QObject>
+#include <QStringList>
+#include <sys/types.h>
+#include <pwd.h>
+#include <grp.h>
+
+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<UserInfo*>& users() const {
+        return mUsers;
+    }
+
+    const QList<GroupInfo*>& 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<UserInfo*> mUsers;
+    QList<GroupInfo*> mGroups;
+    QFileSystemWatcher* mWatcher;
+    QStringList mAvailableShells;
+};
+
+#endif // USERMANAGER_H

lxqt-admin.kdev4

@@ -1,3 +0,0 @@
-[Project]
-Manager=KDevCMakeManager
-Name=lxqt-admin