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

refactor: ActionDialog, Only show Action relevent options

Browse Source
This commit is contained in:
sithlord48
2025-01-04 23:05:43 -05:00
committed by Nick Bolton
parent 29eaa19d95
commit 7152119014
2 changed files with 150 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,6 +25,8 @@
#include "KeySequence.h"
#include "ServerConfig.h"
#include <QTimer>
ActionDialog::ActionDialog(QWidget *parent, const ServerConfig &config, Hotkey &hotkey, Action &action)
: QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint),
ui{std::make_unique<Ui::ActionDialog>()},
@ -42,8 +44,8 @@ ActionDialog::ActionDialog(QWidget *parent, const ServerConfig &config, Hotkey &
ui->keySequenceWidget->setText(m_action.keySequence().toString());
ui->keySequenceWidget->setKeySequence(m_action.keySequence());
ui->m_pComboSwitchInDirection->setCurrentIndex(m_action.switchDirection());
ui->m_pComboLockCursorToScreen->setCurrentIndex(m_action.lockCursorMode());
ui->comboSwitchInDirection->setCurrentIndex(m_action.switchDirection());
ui->comboLockCursorToScreen->setCurrentIndex(m_action.lockCursorMode());
ui->comboActionType->setCurrentIndex(m_action.type());
ui->comboTriggerOn->setCurrentIndex(m_action.activeOnRelease());
@ -59,10 +61,19 @@ ActionDialog::ActionDialog(QWidget *parent, const ServerConfig &config, Hotkey &
ui->listScreens->addItem(newListItem);
ui->m_pComboSwitchToScreen->addItem(screen.name());
ui->comboSwitchToScreen->addItem(tr("Switch to %1").arg(screen.name()));
if (screen.name() == m_action.switchScreenName())
ui->m_pComboSwitchToScreen->setCurrentIndex(ui->m_pComboSwitchToScreen->count() - 1);
ui->comboSwitchToScreen->setCurrentIndex(ui->comboSwitchToScreen->count() - 1);
}
ui->keySequenceWidget->setVisible(false);
ui->groupScreens->setVisible(false);
ui->listScreens->setEnabled(!ui->keySequenceWidget->keySequence().isMouseButton());
ui->comboSwitchToScreen->setVisible(false);
ui->comboSwitchInDirection->setVisible(false);
ui->comboLockCursorToScreen->setVisible(false);
actionTypeChanged(ui->comboActionType->currentIndex());
}
void ActionDialog::accept()
@ -92,9 +103,9 @@ void ActionDialog::accept()
m_action.setHaveScreens(screenCount);
m_action.setSwitchScreenName(ui->m_pComboSwitchToScreen->currentText());
m_action.setSwitchDirection(ui->m_pComboSwitchInDirection->currentIndex());
m_action.setLockCursorMode(ui->m_pComboLockCursorToScreen->currentIndex());
m_action.setSwitchScreenName(ui->comboSwitchToScreen->currentText().remove(tr("Switch to ")));
m_action.setSwitchDirection(ui->comboSwitchInDirection->currentIndex());
m_action.setLockCursorMode(ui->comboLockCursorToScreen->currentIndex());
m_action.setActiveOnRelease(ui->comboTriggerOn->currentIndex());
m_action.setRestartServer(ui->comboActionType->currentIndex() == ActionTypes::RestartServer);
@ -103,16 +114,18 @@ void ActionDialog::accept()
void ActionDialog::keySequenceChanged()
{
ui->listScreens->setEnabled(ui->keySequenceWidget->valid() && !ui->keySequenceWidget->keySequence().isMouseButton());
ui->listScreens->setEnabled(!ui->keySequenceWidget->keySequence().isMouseButton());
}
void ActionDialog::actionTypeChanged(int index)
{
ui->keySequenceWidget->setEnabled(isKeyAction(index));
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);
ui->keySequenceWidget->setVisible(isKeyAction(index));
ui->groupScreens->setVisible(isKeyAction(index));
ui->listScreens->setEnabled(!ui->keySequenceWidget->keySequence().isMouseButton());
ui->comboSwitchToScreen->setVisible(index == ActionTypes::SwitchTo);
ui->comboSwitchInDirection->setVisible(index == ActionTypes::SwitchInDirection);
ui->comboLockCursorToScreen->setVisible(index == ActionTypes::ModifyCursorLock);
QTimer::singleShot(1, this, &ActionDialog::adjustSize);
}
bool ActionDialog::isKeyAction(int index)

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

@ -6,18 +6,33 @@
<rect>
<x>0</x>
<y>0</y>
<width>521</width>
<height>428</height>
<width>0</width>
<height>0</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="windowTitle">
<string>Configure Action</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>6</number>
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<widget class="QComboBox" name="comboTriggerOn">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<item>
<property name="text">
<string>When the hotkey is pressed</string>
@ -32,6 +47,12 @@
</item>
<item>
<widget class="QComboBox" name="comboActionType">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<item>
<property name="text">
<string>Press key(s)</string>
@ -44,7 +65,7 @@
</item>
<item>
<property name="text">
<string>Toggle key(s)</string>
<string>Press and release key(s)</string>
</property>
</item>
<item>
@ -72,184 +93,115 @@
</layout>
</item>
<item>
<widget class="QGroupBox" name="m_pGroupType">
<property name="title">
<string/>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QComboBox" name="comboSwitchToScreen">
<property name="enabled">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="comboSwitchInDirection">
<property name="enabled">
<bool>true</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<item>
<property name="text">
<string>Move to the screen on the left</string>
</property>
</item>
<item>
<property name="text">
<string>Move to the screen on the right</string>
</property>
</item>
<item>
<property name="text">
<string>Move to the screen above</string>
</property>
</item>
<item>
<property name="text">
<string>Move to the screen below</string>
</property>
</item>
</widget>
</item>
<item>
<widget class="QComboBox" name="comboLockCursorToScreen">
<property name="enabled">
<bool>true</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<item>
<property name="text">
<string>Toggle the cursor lock</string>
</property>
</item>
<item>
<property name="text">
<string>Enable the cursor lock</string>
</property>
</item>
<item>
<property name="text">
<string>Disable the cursor lock</string>
</property>
</item>
</widget>
</item>
<item>
<widget class="KeySequenceWidget" name="keySequenceWidget">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QGroupBox" name="groupScreens">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<layout class="QVBoxLayout">
<property name="title">
<string>Computers to recieve this event</string>
</property>
<layout class="QHBoxLayout">
<item>
<widget class="KeySequenceWidget" name="keySequenceWidget">
<widget class="QListWidget" name="listScreens">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>1</horstretch>
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>256</width>
<height>0</height>
</size>
</property>
<property name="text">
<string/>
<property name="sizeAdjustPolicy">
<enum>QAbstractScrollArea::AdjustToContents</enum>
</property>
</widget>
</item>
<item>
<widget class="QGroupBox" name="group_screens">
<property name="title">
<string>Computers to recieve this event</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QListWidget" name="listScreens">
<property name="sizeAdjustPolicy">
<enum>QAbstractScrollArea::AdjustToContents</enum>
</property>
<property name="selectionMode">
<enum>QAbstractItemView::NoSelection</enum>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Switch to</string>
</property>
</widget>
</item>
<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="QComboBox" name="m_pComboSwitchToScreen">
<property name="enabled">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout">
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string>Direction to move</string>
</property>
</widget>
</item>
<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="QComboBox" name="m_pComboSwitchInDirection">
<property name="enabled">
<bool>false</bool>
</property>
<item>
<property name="text">
<string>left</string>
</property>
</item>
<item>
<property name="text">
<string>right</string>
</property>
</item>
<item>
<property name="text">
<string>up</string>
</property>
</item>
<item>
<property name="text">
<string>down</string>
</property>
</item>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout">
<item>
<widget class="QLabel" name="label_3">
<property name="text">
<string>Cursor lock will</string>
</property>
</widget>
</item>
<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="QComboBox" name="m_pComboLockCursorToScreen">
<property name="enabled">
<bool>false</bool>
</property>
<item>
<property name="text">
<string>toggle</string>
</property>
</item>
<item>
<property name="text">
<string>on</string>
</property>
</item>
<item>
<property name="text">
<string>off</string>
</property>
</item>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>