gui: use wxCredentialEntryDialog over custom implementation

bk138 · Jan 6, 2025 · 3a7f5ee · 3a7f5ee
1 parent 2dea779
commit 3a7f5ee
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 118 deletions.
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -21,8 +21,6 @@ SET(MultiVNCgui_SRCS
    DialogSettings.h
    MyDialogSettings.cpp
    MyDialogSettings.h
-   DialogLogin.cpp
-   DialogLogin.h
    evtids.h
    bitmapFromMem.h
    res/multivnc.xpm

diff --git a/src/gui/DialogLogin.cpp b/src/gui/DialogLogin.cpp
diff --git a/src/gui/DialogLogin.h b/src/gui/DialogLogin.h
diff --git a/src/gui/MyFrameMain.cpp b/src/gui/MyFrameMain.cpp
@@ -3,6 +3,8 @@
 #include "gui/evtids.h"
 #include <fstream>
 #include <wx/aboutdlg.h>
+#include <wx/textctrl.h>
+#include <wx/creddlg.h>
 #include <wx/socket.h>
 #include <wx/clipbrd.h>
 #include <wx/imaglist.h>
@@ -12,7 +14,6 @@
 
 #include "MyFrameMain.h"
 #include "MyDialogSettings.h"
-#include "DialogLogin.h"
 #include "../dfltcfg.h"
 #include "../MultiVNCApp.h"
 
@@ -734,13 +735,13 @@ void MyFrameMain::onVNCConnGetCredentialsNotify(wxCommandEvent &event)
 #endif
     } else {
 	// with user prompt
-        DialogLogin formLogin(0, wxID_ANY, _("Credentials required..."));
+        wxCredentialEntryDialog formLogin(this, wxEmptyString, _("Credentials required..."));
         if (formLogin.ShowModal() == wxID_OK) {
-            conn->setUserName(formLogin.getUserName());
+            conn->setUserName(formLogin.GetCredentials().GetUser());
 #if wxUSE_SECRETSTORE
-            conn->setPassword(wxSecretValue(formLogin.getPassword()));
+            conn->setPassword(formLogin.GetCredentials().GetPassword());
 #else
-            conn->setPassword(formLogin.getPassword());
+            conn->setPassword(formLogin.GetCredentials().GetPassword().GetAsString());
 #endif
         } else {
 	    // canceled