openclaw/deskflow
1
0
Fork 0
Code Issues Pull Requests Actions 17 Packages Projects Releases Wiki Activity

refactor: ServerConfigDialog/tabComputers, no autoconnect slots, use new names

Browse Source
This commit is contained in:
sithlord48
2025-02-01 09:13:39 -05:00
committed by Nick Bolton
parent 816d66b703
commit 76fd40a3ec
2 changed files with 27 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/apps/deskflow-gui/dialogs/ServerConfigDialog.cpp
View File

@ -34,17 +34,20 @@ ServerConfigDialog::ServerConfigDialog(QWidget *parent, ServerConfig &config, Ap
m_appConfig(appConfig)
{
ui->setupUi(this);
connect(ui->buttonBox, &QDialogButtonBox::accepted, this, &ServerConfigDialog::accept);
connect(ui->buttonBox, &QDialogButtonBox::rejected, this, &ServerConfigDialog::reject);
ui->m_pButtonBrowseConfigFile->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::DocumentOpen));
ui->m_pTrashScreenWidget->setPixmap(QIcon::fromTheme("user-trash").pixmap(QSize(64, 64)));
ui->lblNewScreen->setPixmap(QIcon::fromTheme("video-display").pixmap(QSize(64, 64)));
ui->lblNewScreen->setToolTip(tr("Drag to the grid to add a new computer."));
ui->lblRemoveScreen->setPixmap(QIcon::fromTheme("user-trash").pixmap(QSize(64, 64)));
connect(ui->lblRemoveScreen, &TrashScreenWidget::screenRemoved, this, &ServerConfigDialog::onScreenRemoved);
ui->lblNewScreen->setEnabled(!model().isFull());
ui->lblNewScreen->setPixmap(QIcon::fromTheme("video-display").pixmap(QSize(64, 64)));
ui->m_pButtonBrowseConfigFile->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::DocumentOpen));
// force the first tab, since qt creator sets the active tab as the last one
// the developer was looking at, and it's easy to accidentally save that.
ui->m_pTabWidget->setCurrentIndex(0);
ui->tabWidget->setCurrentIndex(0);
ui->m_pEditConfigFile->setText(serverConfig().configFile());
ui->m_pCheckBoxUseExternalConfig->setChecked(serverConfig().useExternalConfig());
@ -77,7 +80,7 @@ ServerConfigDialog::ServerConfigDialog(QWidget *parent, ServerConfig &config, Ap
for (const Hotkey &hotkey : std::as_const(serverConfig().hotkeys()))
ui->m_pListHotkeys->addItem(hotkey.text());
ui->m_pScreenSetupView->setModel(&m_ScreenSetupModel);
ui->screenSetupView->setModel(&m_ScreenSetupModel);
auto &screens = serverConfig().screens();
auto server = std::find_if(screens.begin(), screens.end(), [this](const Screen &screen) {
@ -92,9 +95,6 @@ ServerConfigDialog::ServerConfigDialog(QWidget *parent, ServerConfig &config, Ap
server->markAsServer();
}
ui->lblNewScreen->setEnabled(!model().isFull());
connect(ui->m_pTrashScreenWidget, &TrashScreenWidget::screenRemoved, this, &ServerConfigDialog::onScreenRemoved);
onChange();
// computers
@ -433,9 +433,9 @@ void ServerConfigDialog::on_m_pCheckBoxUseExternalConfig_toggled(bool checked)
ui->m_pEditConfigFile->setEnabled(checked);
ui->m_pButtonBrowseConfigFile->setEnabled(checked);
ui->m_pTabWidget->setTabEnabled(0, !checked);
ui->m_pTabWidget->setTabEnabled(1, !checked);
ui->m_pTabWidget->setTabEnabled(2, !checked);
ui->tabWidget->setTabEnabled(0, !checked);
ui->tabWidget->setTabEnabled(1, !checked);
ui->tabWidget->setTabEnabled(2, !checked);
}
bool ServerConfigDialog::on_m_pButtonBrowseConfigFile_clicked()

61
src/apps/deskflow-gui/dialogs/ServerConfigDialog.ui
View File

@ -21,17 +21,11 @@
</property>
<layout class="QVBoxLayout">
<item>
<widget class="QTabWidget" name="m_pTabWidget">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
<number>0</number>
</property>
<widget class="QWidget" name="m_pTabScreens">
<widget class="QWidget" name="tabComputers">
<attribute name="title">
<string>Computers</string>
</attribute>
@ -49,12 +43,12 @@
<number>5</number>
</property>
<item>
<layout class="QHBoxLayout" name="m_pLayoutScreens">
<layout class="QHBoxLayout" name="layoutComputers">
<property name="spacing">
<number>6</number>
</property>
<item>
<widget class="TrashScreenWidget" name="m_pTrashScreenWidget">
<widget class="TrashScreenWidget" name="lblRemoveScreen">
<property name="acceptDrops">
<bool>true</bool>
</property>
@ -67,9 +61,6 @@
<property name="frameShadow">
<enum>QFrame::Shadow::Raised</enum>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
@ -128,21 +119,17 @@
</item>
<item>
<widget class="NewScreenWidget" name="lblNewScreen">
<property name="text">
<string/>
<property name="toolTip">
<string>Drag to the grid to add a new computer.</string>
</property>
<property name="frameShape">
<enum>QFrame::Shape::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Shadow::Raised</enum>
</property>
</widget>
</item>
<item>
<layout class="QVBoxLayout" name="m_pLayoutAddComputer">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
</layout>
</item>
</layout>
</item>
<item>
@ -162,37 +149,19 @@
</spacer>
</item>
<item>
<widget class="ScreenSetupView" name="m_pScreenSetupView">
<widget class="ScreenSetupView" name="screenSetupView">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>273</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="acceptDrops">
<bool>true</bool>
</property>
<property name="autoFillBackground">
<bool>false</bool>
</property>
<property name="frameShape">
<enum>QFrame::Shape::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Shadow::Sunken</enum>
</property>
</widget>
</item>
</layout>
@ -1164,7 +1133,7 @@ Enabling this setting will disable the server config GUI.</string>
</customwidgets>
<tabstops>
<tabstop>m_pButtonBrowseConfigFile</tabstop>
<tabstop>m_pScreenSetupView</tabstop>
<tabstop>screenSetupView</tabstop>
<tabstop>m_pListHotkeys</tabstop>
<tabstop>m_pButtonNewHotkey</tabstop>
<tabstop>m_pButtonEditHotkey</tabstop>
@ -1185,7 +1154,7 @@ Enabling this setting will disable the server config GUI.</string>
<tabstop>m_pSpinBoxSwitchCornerSize</tabstop>
<tabstop>m_pCheckBoxUseExternalConfig</tabstop>
<tabstop>m_pEditConfigFile</tabstop>
<tabstop>m_pTabWidget</tabstop>
<tabstop>tabWidget</tabstop>
</tabstops>
<resources/>
<connections>