From e55f69ee261f267bee2fc2fbfefea7bcd3eb1f07 Mon Sep 17 00:00:00 2001 From: Peter L Jones Date: Mon, 28 Aug 2023 12:37:50 +0100 Subject: [PATCH] Fixes #1421: Add "delete server" button to connect dialog --- src/connectdlg.cpp | 15 +++++++++++++++ src/connectdlg.h | 1 + src/connectdlgbase.ui | 3 +++ src/translation/translation_ko_KR.qm | Bin 87156 -> 87188 bytes 4 files changed, 19 insertions(+) diff --git a/src/connectdlg.cpp b/src/connectdlg.cpp index 9df63d5623..b5a0a8a82f 100644 --- a/src/connectdlg.cpp +++ b/src/connectdlg.cpp @@ -96,6 +96,12 @@ CConnectDlg::CConnectDlg ( CClientSettings* pNSetP, const bool bNewShowCompleteR cbxServerAddr->setAccessibleName ( tr ( "Server address edit box" ) ); cbxServerAddr->setAccessibleDescription ( tr ( "Holds the current server address. It also stores old addresses in the combo box list." ) ); + tbtDeleteServerAddr->setAccessibleName ( tr ( "Delete server address button" ) ); + tbtDeleteServerAddr->setWhatsThis ( "" + tr ( "Delete Server Address" ) + ": " + + tr ( "Click the button to clear the currently selected server address " + "and delete it from the list of stored servers." ) ); + tbtDeleteServerAddr->setText ( u8"\u232B" ); + UpdateDirectoryComboBox(); // init server address combo box (max MAX_NUM_SERVER_ADDR_ITEMS entries) @@ -179,6 +185,9 @@ CConnectDlg::CConnectDlg ( CClientSettings* pNSetP, const bool bNewShowCompleteR QObject::connect ( butConnect, &QPushButton::clicked, this, &CConnectDlg::OnConnectClicked ); + // tool buttons + QObject::connect ( tbtDeleteServerAddr, &QPushButton::clicked, this, &CConnectDlg::OnDeleteServerAddrClicked ); + // timers QObject::connect ( &TimerPing, &QTimer::timeout, this, &CConnectDlg::OnTimerPing ); @@ -731,6 +740,12 @@ void CConnectDlg::OnConnectClicked() done ( QDialog::Accepted ); } +void CConnectDlg::OnDeleteServerAddrClicked() +{ + pSettings->vstrIPAddress.erase ( pSettings->vstrIPAddress.begin() + cbxServerAddr->currentIndex() ); + showEvent ( nullptr ); +} + void CConnectDlg::OnTimerPing() { // send ping messages to the servers in the list diff --git a/src/connectdlg.h b/src/connectdlg.h index 078d9ba2ee..13f9ca81e1 100644 --- a/src/connectdlg.h +++ b/src/connectdlg.h @@ -101,6 +101,7 @@ public slots: void OnExpandAllStateChanged ( int value ) { ShowAllMusicians ( value == Qt::Checked ); } void OnCustomDirectoriesChanged(); void OnConnectClicked(); + void OnDeleteServerAddrClicked(); void OnTimerPing(); void OnTimerReRequestServList(); diff --git a/src/connectdlgbase.ui b/src/connectdlgbase.ui index 021d1663e5..279c76dc0b 100644 --- a/src/connectdlgbase.ui +++ b/src/connectdlgbase.ui @@ -107,6 +107,9 @@ + + + diff --git a/src/translation/translation_ko_KR.qm b/src/translation/translation_ko_KR.qm index d5238e0b90c5b5a740aeb3d2599a8865413dfa48..53fe1047f0f1d83cec8f7c957d3d520013883a06 100644 GIT binary patch delta 5469 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 OQEiGz*36Df;rd?^gy|pv delta 5422 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