Swiftdiff options
| author | Richard Maudsley <richard.maudsley@isode.com> | 2014-01-21 09:01:45 (GMT) |
|---|---|---|
| committer | Richard Maudsley <richard.maudsley@isode.com> | 2014-01-21 09:01:45 (GMT) |
| commit | 1a08c7c69f46455d131362003b7a4fbdb6642510 (patch) | |
| tree | 313c1702a98f42a41c55b34494c9aa35beb2c9b5 | |
| parent | 3937d55f556c7e817638c6ff259754e29262f38b (diff) | |
| download | swift-1a08c7c69f46455d131362003b7a4fbdb6642510.zip swift-1a08c7c69f46455d131362003b7a4fbdb6642510.tar.bz2 | |
Fixed sound file selection.
Change-Id: I47f2382c0165ff69cadab5e91c6ce75d6a0d8139
| -rw-r--r-- | Swift/QtUI/QtHighlightEditor.cpp | 6 | ||||
| -rw-r--r-- | Swift/QtUI/QtHighlightEditor.ui | 9 |
2 files changed, 9 insertions, 6 deletions
diff --git a/Swift/QtUI/QtHighlightEditor.cpp b/Swift/QtUI/QtHighlightEditor.cpp index cb5f058..aabe7d2 100644 --- a/Swift/QtUI/QtHighlightEditor.cpp +++ b/Swift/QtUI/QtHighlightEditor.cpp @@ -512,11 +512,17 @@ void QtHighlightEditor::ruleToDialog(const HighlightRule& rule) ui_.noSoundRadio->setEnabled(true); ui_.defaultSoundRadio->setEnabled(true); ui_.customSoundRadio->setEnabled(true); + ui_.soundFile->setText(""); + ui_.soundFile->setEnabled(false); + ui_.soundFileButton->setEnabled(false); if (action.playSound()) { if (action.getSoundFile().empty()) { ui_.defaultSoundRadio->setChecked(true); } else { ui_.customSoundRadio->setChecked(true); + ui_.soundFile->setText(P2QSTRING(action.getSoundFile())); + ui_.soundFile->setEnabled(true); + ui_.soundFileButton->setEnabled(true); } } else { ui_.noSoundRadio->setChecked(true); diff --git a/Swift/QtUI/QtHighlightEditor.ui b/Swift/QtUI/QtHighlightEditor.ui index 5976331..5f45d4a 100644 --- a/Swift/QtUI/QtHighlightEditor.ui +++ b/Swift/QtUI/QtHighlightEditor.ui @@ -437,7 +437,7 @@ p, li { white-space: pre-wrap; } <bool>false</bool> </property> <property name="readOnly"> - <bool>true</bool> + <bool>false</bool> </property> </widget> </item> @@ -492,13 +492,10 @@ p, li { white-space: pre-wrap; } </layout> </item> </layout> + <zorder>listWidget</zorder> <zorder>line_2</zorder> <zorder>line_3</zorder> - <zorder>groupBox_6</zorder> - <zorder>verticalSpacer_2</zorder> - <zorder>horizontalSpacer_7</zorder> - <zorder>horizontalSpacer_8</zorder> - <zorder></zorder> + <zorder>label_5</zorder> </widget> <customwidgets> <customwidget> |