fix: ensure correct screen name is set for switchToScreen
This commit is contained in:
parent
10027ecc1c
commit
7b614215a1
7 changed files with 2 additions and 26 deletions
|
|
@ -51,7 +51,7 @@ ActionDialog::ActionDialog(QWidget *parent, const ServerConfig &config, Hotkey &
|
||||||
|
|
||||||
ui->listScreens->addItem(newListItem);
|
ui->listScreens->addItem(newListItem);
|
||||||
|
|
||||||
ui->comboSwitchToScreen->addItem(tr("Switch to %1").arg(screen.name()));
|
ui->comboSwitchToScreen->addItem(tr("Switch to %1").arg(screen.name()), screen.name());
|
||||||
if (screen.name() == m_action.switchScreenName())
|
if (screen.name() == m_action.switchScreenName())
|
||||||
ui->comboSwitchToScreen->setCurrentIndex(ui->comboSwitchToScreen->count() - 1);
|
ui->comboSwitchToScreen->setCurrentIndex(ui->comboSwitchToScreen->count() - 1);
|
||||||
}
|
}
|
||||||
|
|
@ -92,7 +92,7 @@ void ActionDialog::accept()
|
||||||
|
|
||||||
m_action.setHaveScreens(screenCount);
|
m_action.setHaveScreens(screenCount);
|
||||||
|
|
||||||
m_action.setSwitchScreenName(ui->comboSwitchToScreen->currentText().remove(tr("Switch to ")));
|
m_action.setSwitchScreenName(ui->comboSwitchToScreen->currentData().toString());
|
||||||
m_action.setSwitchDirection(ui->comboSwitchInDirection->currentIndex());
|
m_action.setSwitchDirection(ui->comboSwitchInDirection->currentIndex());
|
||||||
m_action.setLockCursorMode(ui->comboLockCursorToScreen->currentIndex());
|
m_action.setLockCursorMode(ui->comboLockCursorToScreen->currentIndex());
|
||||||
m_action.setActiveOnRelease(ui->comboTriggerOn->currentIndex());
|
m_action.setActiveOnRelease(ui->comboTriggerOn->currentIndex());
|
||||||
|
|
|
||||||
|
|
@ -134,10 +134,6 @@ p, li { white-space: pre-wrap; }
|
||||||
<source>Switch to %1</source>
|
<source>Switch to %1</source>
|
||||||
<translation type="unfinished">Cambiar a %1</translation>
|
<translation type="unfinished">Cambiar a %1</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
|
||||||
<source>Switch to </source>
|
|
||||||
<translation type="unfinished">Cambiar a </translation>
|
|
||||||
</message>
|
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>ClientConfigDialog</name>
|
<name>ClientConfigDialog</name>
|
||||||
|
|
|
||||||
|
|
@ -134,10 +134,6 @@ p, li { white-space: pre-wrap; }
|
||||||
<source>Switch to %1</source>
|
<source>Switch to %1</source>
|
||||||
<translation>Passa a %1</translation>
|
<translation>Passa a %1</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
|
||||||
<source>Switch to </source>
|
|
||||||
<translation>Passa a </translation>
|
|
||||||
</message>
|
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>ClientConfigDialog</name>
|
<name>ClientConfigDialog</name>
|
||||||
|
|
|
||||||
|
|
@ -134,10 +134,6 @@ p, li { white-space: pre-wrap; }
|
||||||
<source>Switch to %1</source>
|
<source>Switch to %1</source>
|
||||||
<translation>%1 に切り替える</translation>
|
<translation>%1 に切り替える</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
|
||||||
<source>Switch to </source>
|
|
||||||
<translation>に切り替える</translation>
|
|
||||||
</message>
|
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>ClientConfigDialog</name>
|
<name>ClientConfigDialog</name>
|
||||||
|
|
|
||||||
|
|
@ -134,10 +134,6 @@ p, li { white-space: pre-wrap; }
|
||||||
<source>Switch to %1</source>
|
<source>Switch to %1</source>
|
||||||
<translation>%1(으)로 전환</translation>
|
<translation>%1(으)로 전환</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
|
||||||
<source>Switch to </source>
|
|
||||||
<translation>전환: </translation>
|
|
||||||
</message>
|
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>ClientConfigDialog</name>
|
<name>ClientConfigDialog</name>
|
||||||
|
|
|
||||||
|
|
@ -134,10 +134,6 @@ p, li { white-space: pre-wrap; }
|
||||||
<source>Switch to %1</source>
|
<source>Switch to %1</source>
|
||||||
<translation>Переключиться на %1</translation>
|
<translation>Переключиться на %1</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
|
||||||
<source>Switch to </source>
|
|
||||||
<translation>Переключиться на </translation>
|
|
||||||
</message>
|
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>ClientConfigDialog</name>
|
<name>ClientConfigDialog</name>
|
||||||
|
|
|
||||||
|
|
@ -134,10 +134,6 @@ p, li { white-space: pre-wrap; }
|
||||||
<source>Switch to %1</source>
|
<source>Switch to %1</source>
|
||||||
<translation>切换到 %1</translation>
|
<translation>切换到 %1</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
|
||||||
<source>Switch to </source>
|
|
||||||
<translation>切换到 </translation>
|
|
||||||
</message>
|
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>ClientConfigDialog</name>
|
<name>ClientConfigDialog</name>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue