Redesign user accounts dialog (#2286)

* Redesign user accounts dialog

* Disable channel bombobox instead of line edit

* Use one dialog to custom limits

* Improve custom commands limit handling

* Hide password fields for bearware accounts

* Check index validity for context menu actions

* Retrieve correct duration for custom limit

* Display last edition date in user dialog

* Change to combobox to choose user type

* Hide user rights tab for admins

* Rename UserDlg to UserAccountDlg

* Fix includes to speed up compilation

* Rename 'user' to 'useraccount'

* Move 'New User Account' button to bottom

* 'User Account' instead of 'User'

* Double click should default to 'Edit' account

* Replace OK and Cancel by Close if read_only

* Use enter to edit user

* Fix duplicate name moc warning

---------

Co-authored-by: Bjørn Damstedt Rasmussen <contact@bearware.dk>
Co-authored-by: Bjørn Damstedt Rasmussen <bear101@users.noreply.github.com>

ChangeLog.txt

@@ -4,7 +4,7 @@
 
 Version 5.17, unreleased
 Default Qt Client
-- "Connect to a Server" dialog simplied with multiple sub dialogs
+- "Connect to a Server" and "User Accounts" dialog simplified with multiple sub dialogs
 - Reset label of files list when disconnected from server
 - "Move Users" dialog
 - Locale file size now also use in "file transfer" dialog

Client/qtTeamTalk/CMakeLists.txt

@@ -89,7 +89,8 @@ if (Qt5_FOUND OR Qt6_FOUND)
     utilsound.h utilvideo.h utiltts.h utilui.h utilhotkey.h
     serverlogeventsmodel.h mytreeview.h textmessagecontainer.h
     useraccountsmodel.h encryptionsetupdlg.h utiltt.h utilxml.h
-    utilos.h serverdlg.h moveusersdlg.h
+    utilos.h serverdlg.h moveusersdlg.h useraccountdlg.h
+
     main.cpp mainwindow.cpp preferencesdlg.cpp uservideowidget.cpp
     channelstree.cpp channeldlg.cpp userinfodlg.cpp
     bannedusersdlg.cpp useraccountsdlg.cpp videogridwidget.cpp
@@ -108,7 +109,8 @@ if (Qt5_FOUND OR Qt6_FOUND)
     utilsound.cpp utilvideo.cpp utiltts.cpp utilui.cpp utilhotkey.cpp
     serverlogeventsmodel.cpp mytreeview.cpp textmessagecontainer.cpp
     useraccountsmodel.cpp encryptionsetupdlg.cpp utiltt.cpp utilxml.cpp
-    utilos.cpp serverdlg.cpp moveusersdlg.cpp
+    utilos.cpp serverdlg.cpp moveusersdlg.cpp useraccountdlg.cpp
+
     mainwindow.ui channel.ui preferences.ui
     serverlist.ui userinfo.ui bannedusers.ui useraccounts.ui
     serverproperties.ui uservideo.ui keycomp.ui textmessage.ui
@@ -117,7 +119,7 @@ if (Qt5_FOUND OR Qt6_FOUND)
     desktopshare.ui streammediafile.ui videotext.ui desktopaccess.ui
     generatettfile.ui customvideofmt.ui bearwarelogindlg.ui
     audiopreprocessor.ui statusbardlg.ui encryptionsetupdlg.ui
-    serverdlg.ui
+    serverdlg.ui useraccountdlg.ui
     resources.qrc mainwindow.rc
     )
 

Client/qtTeamTalk/mainwindow.cpp

@@ -46,6 +46,7 @@
 #include "utiltts.h"
 #include "utilxml.h"
 #include "moveusersdlg.h"
+#include "useraccountdlg.h"
 
 #include <QMessageBox>
 #include <QInputDialog>
@@ -1961,7 +1962,7 @@ void MainWindow::cmdCompleteListUserAccounts()
 {
     if (!m_useraccountsdlg)
     {
-        m_useraccountsdlg = new UserAccountsDlg(m_useraccounts, UAD_READWRITE);
+        m_useraccountsdlg = new UserAccountsDlg(m_useraccounts);
         connect(this, &MainWindow::cmdSuccess, m_useraccountsdlg,
             &UserAccountsDlg::slotCmdSuccess);
         connect(this, &MainWindow::cmdError, m_useraccountsdlg,
@@ -5623,20 +5624,8 @@ void MainWindow::slotServerUserAccounts(bool /*checked =false */)
     }
     else
     {
-        if(!m_useraccountsdlg)
-        {
-            useraccounts_t useraccounts(1);
-            TT_GetMyUserAccount(ttInst, &useraccounts[0]);
-
-            m_useraccountsdlg = new UserAccountsDlg(useraccounts, UAD_READONLY);
-            connect(m_useraccountsdlg, &QDialog::finished,
-                this, &MainWindow::slotClosedUserAccountsDlg);
-            m_useraccountsdlg->setAttribute(Qt::WA_DeleteOnClose);
-            m_useraccountsdlg->show();
-            m_useraccounts.clear();
-        }
-        else
-            m_useraccountsdlg->activateWindow();
+        UserAccountDlg dlg(UserAccountDlg::USER_READONLY, m_myuseraccount, this);
+        dlg.exec();
     }
 }
 

Client/qtTeamTalk/mainwindow.pri

@@ -23,7 +23,7 @@ HEADERS    = mainwindow.h preferencesdlg.h uservideowidget.h \
              utilsound.h utilvideo.h utiltts.h utilui.h utilhotkey.h \
              serverlogeventsmodel.h mytreeview.h textmessagecontainer.h \
              useraccountsmodel.h encryptionsetupdlg.h utiltt.h utilxml.h \
-             utilos.h serverdlg.h moveusersdlg.h
+             utilos.h serverdlg.h moveusersdlg.h useraccountdlg.h
 
 SOURCES    = main.cpp mainwindow.cpp preferencesdlg.cpp uservideowidget.cpp \
              channelstree.cpp channeldlg.cpp userinfodlg.cpp \
@@ -43,7 +43,7 @@ SOURCES    = main.cpp mainwindow.cpp preferencesdlg.cpp uservideowidget.cpp \
              utilsound.cpp utilvideo.cpp utiltts.cpp utilui.cpp utilhotkey.cpp \
              serverlogeventsmodel.cpp mytreeview.cpp textmessagecontainer.cpp \
              useraccountsmodel.cpp encryptionsetupdlg.cpp utiltt.cpp utilxml.cpp \
-             utilos.cpp serverdlg.cpp moveusersdlg.cpp
+             utilos.cpp serverdlg.cpp moveusersdlg.cpp useraccountdlg.cpp
 
 FORMS      = mainwindow.ui channel.ui preferences.ui \
              serverlist.ui userinfo.ui bannedusers.ui useraccounts.ui \
@@ -53,7 +53,7 @@ FORMS      = mainwindow.ui channel.ui preferences.ui \
              desktopshare.ui streammediafile.ui videotext.ui desktopaccess.ui \
              generatettfile.ui customvideofmt.ui bearwarelogindlg.ui \
              audiopreprocessor.ui statusbardlg.ui encryptionsetupdlg.ui \
-             serverdlg.ui
+             serverdlg.ui useraccountdlg.ui
 
 RESOURCES += resources.qrc
 

Client/qtTeamTalk/settings.h

@@ -165,6 +165,7 @@
 #define SETTINGS_DISPLAY_FILESLIST_SORT                            "display/files-list-sort"
 #define SETTINGS_DISPLAY_FILESLIST_SORT_DEFAULT                            "name"
 #define SETTINGS_DISPLAY_SERVERWINDOWPOS     "display/server-dialog-pos"
+#define SETTINGS_DISPLAY_USERWINDOWPOS     "display/user-dialog-pos"
 
 #define SETTINGS_CONNECTION_AUTOCONNECT             "connection/autoconnect"
 #define SETTINGS_CONNECTION_AUTOCONNECT_DEFAULT     false