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

refactor: ActionDialog, use checkable list for screen selection

Browse Source
This commit is contained in:
sithlord48
2025-01-04 22:34:53 -05:00
committed by Nick Bolton
parent 4db2b80d4e
commit 29eaa19d95
2 changed files with 33 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/apps/deskflow-gui/dialogs/ActionDialog.cpp
View File

@ -48,15 +48,16 @@ ActionDialog::ActionDialog(QWidget *parent, const ServerConfig &config, Hotkey &
ui->comboActionType->setCurrentIndex(m_action.type());
ui->comboTriggerOn->setCurrentIndex(m_action.activeOnRelease());
ui->m_pGroupBoxScreens->setChecked(m_action.haveScreens());
for (const Screen &screen : config.screens()) {
if (screen.isNull())
continue;
QListWidgetItem *pListItem = new QListWidgetItem(screen.name());
ui->m_pListScreens->addItem(pListItem);
if (m_action.typeScreenNames().indexOf(screen.name()) != -1)
ui->m_pListScreens->setCurrentItem(pListItem);
auto *newListItem = new QListWidgetItem(screen.name());
newListItem->setCheckState(Qt::Checked);
if ((m_action.typeScreenNames().indexOf(screen.name()) == -1) &&
(m_action.haveScreens() && !m_action.typeScreenNames().isEmpty()))
newListItem->setCheckState(Qt::Unchecked);
ui->listScreens->addItem(newListItem);
ui->m_pComboSwitchToScreen->addItem(screen.name());
if (screen.name() == m_action.switchScreenName())
@ -72,13 +73,24 @@ void ActionDialog::accept()
m_action.setKeySequence(ui->keySequenceWidget->keySequence());
m_action.setType(ui->comboActionType->currentIndex());
m_action.setHaveScreens(ui->m_pGroupBoxScreens->isChecked());
m_action.typeScreenNames().clear();
const auto &selection = ui->m_pListScreens->selectedItems();
for (const QListWidgetItem *pItem : selection)
m_action.typeScreenNames().append(pItem->text());
int screenCount = ui->listScreens->count();
for (int i = 0; i < ui->listScreens->count(); i++) {
const auto &item = ui->listScreens->item(i);
m_action.typeScreenNames().append(item->text());
if (item->checkState() == Qt::Unchecked) {
screenCount--;
m_action.typeScreenNames().removeLast();
}
}
if (screenCount == ui->listScreens->count())
m_action.typeScreenNames().clear();
m_action.setHaveScreens(screenCount);
m_action.setSwitchScreenName(ui->m_pComboSwitchToScreen->currentText());
m_action.setSwitchDirection(ui->m_pComboSwitchInDirection->currentIndex());
@ -91,14 +103,13 @@ void ActionDialog::accept()
void ActionDialog::keySequenceChanged()
{
ui->m_pGroupBoxScreens->setEnabled(!ui->keySequenceWidget->keySequence().isMouseButton());
ui->m_pListScreens->setEnabled(!ui->keySequenceWidget->keySequence().isMouseButton());
ui->listScreens->setEnabled(ui->keySequenceWidget->valid() && !ui->keySequenceWidget->keySequence().isMouseButton());
}
void ActionDialog::actionTypeChanged(int index)
{
ui->keySequenceWidget->setEnabled(isKeyAction(index));
ui->m_pListScreens->setEnabled(isKeyAction(index) && ui->m_pGroupBoxScreens->isChecked());
ui->listScreens->setEnabled(isKeyAction(index));
ui->m_pComboSwitchToScreen->setEnabled(index == ActionTypes::SwitchTo);
ui->m_pComboSwitchInDirection->setEnabled(index == ActionTypes::SwitchInDirection);
ui->m_pComboLockCursorToScreen->setEnabled(index == ActionTypes::ModifyCursorLock);

40
src/apps/deskflow-gui/dialogs/ActionDialog.ui
View File

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>375</width>
<height>528</height>
<width>521</width>
<height>428</height>
</rect>
</property>
<property name="windowTitle">
@ -97,40 +97,18 @@
</widget>
</item>
<item>
<widget class="QGroupBox" name="m_pGroupBoxScreens">
<widget class="QGroupBox" name="group_screens">
<property name="title">
<string>only on these screens</string>
<string>Computers to recieve this event</string>
</property>
<property name="flat">
<bool>true</bool>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<layout class="QHBoxLayout">
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<spacer>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QListWidget" name="m_pListScreens">
<property name="minimumSize">
<size>
<width>128</width>
<height>64</height>
</size>
<widget class="QListWidget" name="listScreens">
<property name="sizeAdjustPolicy">
<enum>QAbstractScrollArea::AdjustToContents</enum>
</property>
<property name="selectionMode">
<enum>QAbstractItemView::ExtendedSelection</enum>
<enum>QAbstractItemView::NoSelection</enum>
</property>
</widget>
</item>