Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #6977 from symless/SYNERGY-799-Server-configuratio…
…n-main-window

SYNERGY-799 Server configuration main window
  • Loading branch information
abatyiev committed Apr 14, 2021
2 parents d73ce7c + e2c3360 commit 39c1514
Show file tree
Hide file tree
Showing 17 changed files with 1,549 additions and 892 deletions.
1 change: 1 addition & 0 deletions ChangeLog
Expand Up @@ -15,6 +15,7 @@ Enhancements:
- #6959 Update synergy UI. Setup wizard
- #6969 Update synergy UI. Validation for aliases.
- #6973 Update synergy UI. Main window
- #6977 Update synergy UI. Configure server
- #6962 | #6965 Add macOS 10.13 builder
===========

Expand Down
48 changes: 0 additions & 48 deletions src/gui/src/NewScreenWidget.cpp

This file was deleted.

40 changes: 0 additions & 40 deletions src/gui/src/NewScreenWidget.h

This file was deleted.

10 changes: 6 additions & 4 deletions src/gui/src/ScreenSettingsDialog.cpp
Expand Up @@ -16,6 +16,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#include "validators/ScreenNameValidator.h"
#include "validators/AliasValidator.h"
#include "ScreenSettingsDialog.h"
#include "Screen.h"

Expand All @@ -31,12 +33,10 @@ ScreenSettingsDialog::ScreenSettingsDialog(QWidget* parent, Screen* pScreen,cons
setupUi(this);

m_pLineEditName->setText(m_pScreen->name());
m_NameValidator = std::make_unique<validators::ScreenNameValidator>(m_pLineEditName, m_pLabelNameError, pScreens);
m_pLineEditName->setValidator(m_NameValidator.get());
m_pLineEditName->setValidator(new validators::ScreenNameValidator(m_pLineEditName, m_pLabelNameError, pScreens));
m_pLineEditName->selectAll();

m_AliasValidator = std::make_unique<validators::AliasValidator>(m_pLineEditAlias, m_pLabelAliasError);
m_pLineEditAlias->setValidator(m_AliasValidator.get());
m_pLineEditAlias->setValidator(new validators::AliasValidator(m_pLineEditAlias, m_pLabelAliasError));

for (int i = 0; i < m_pScreen->aliases().count(); i++)
new QListWidgetItem(m_pScreen->aliases()[i], m_pListAliases);
Expand All @@ -57,6 +57,8 @@ ScreenSettingsDialog::ScreenSettingsDialog(QWidget* parent, Screen* pScreen,cons
m_pCheckBoxNumLock->setChecked(m_pScreen->fix(Screen::NumLock));
m_pCheckBoxScrollLock->setChecked(m_pScreen->fix(Screen::ScrollLock));
m_pCheckBoxXTest->setChecked(m_pScreen->fix(Screen::XTest));

resize(400, 625);
}

void ScreenSettingsDialog::accept()
Expand Down
4 changes: 0 additions & 4 deletions src/gui/src/ScreenSettingsDialog.h
Expand Up @@ -22,8 +22,6 @@
#include <memory>

#include <QDialog>
#include "validators/ScreenNameValidator.h"
#include "validators/AliasValidator.h"

#include "ui_ScreenSettingsDialogBase.h"

Expand Down Expand Up @@ -51,8 +49,6 @@ class ScreenSettingsDialog : public QDialog, public Ui::ScreenSettingsDialogBase

private:
Screen* m_pScreen;
std::unique_ptr<validators::ScreenNameValidator> m_NameValidator;
std::unique_ptr<validators::AliasValidator> m_AliasValidator;

};

Expand Down

0 comments on commit 39c1514

Please sign in to comment.