Fix bug when adding already exist shortcut in WiimotedevShortcutsConfig

2010-09-01 15:46:22 +00:00 · 2010-09-01 15:46:22 +00:00 · d70887c776
parent ed8f87af0b
commit d70887c776
35 changed files with 146 additions and 1 deletions
--- a/src/translations/ar.po
+++ b/src/translations/ar.po
@ -1536,6 +1536,10 @@ msgstr ""
 msgid "Shortcut for %1"
 msgstr ""

+#, qt-format
+msgid "Shortcut for %1 already exists"
+msgstr ""
+
 msgid "Show"
 msgstr "عرض"

--- a/src/translations/bg.po
+++ b/src/translations/bg.po
@ -1536,6 +1536,10 @@ msgstr ""
 msgid "Shortcut for %1"
 msgstr ""

+#, qt-format
+msgid "Shortcut for %1 already exists"
+msgstr ""
+
 msgid "Show"
 msgstr ""

--- a/src/translations/ca.po
+++ b/src/translations/ca.po
@ -1557,6 +1557,10 @@ msgstr "Drecera"
 msgid "Shortcut for %1"
 msgstr ""

+#, qt-format
+msgid "Shortcut for %1 already exists"
+msgstr ""
+
 msgid "Show"
 msgstr "Mostrar"

--- a/src/translations/cs.po
+++ b/src/translations/cs.po
@ -1540,6 +1540,10 @@ msgstr "Zkratka"
 msgid "Shortcut for %1"
 msgstr ""

+#, qt-format
+msgid "Shortcut for %1 already exists"
+msgstr ""
+
 msgid "Show"
 msgstr "Zobrazit"

--- a/src/translations/da.po
+++ b/src/translations/da.po
@ -1543,6 +1543,10 @@ msgstr ""
 msgid "Shortcut for %1"
 msgstr ""

+#, qt-format
+msgid "Shortcut for %1 already exists"
+msgstr ""
+
 msgid "Show"
 msgstr ""

--- a/src/translations/de.po
+++ b/src/translations/de.po
@ -1557,6 +1557,10 @@ msgstr "Tastenkürzel"
 msgid "Shortcut for %1"
 msgstr "Tastenkürzel für %1"

+#, qt-format
+msgid "Shortcut for %1 already exists"
+msgstr ""
+
 msgid "Show"
 msgstr "Anzeigen"

--- a/src/translations/el.po
+++ b/src/translations/el.po
@ -1558,6 +1558,10 @@ msgstr "Συντόμευση"
 msgid "Shortcut for %1"
 msgstr "Συντόμευση για %1"

+#, qt-format
+msgid "Shortcut for %1 already exists"
+msgstr ""
+
 msgid "Show"
 msgstr "Εμφάνιση"

--- a/src/translations/en_CA.po
+++ b/src/translations/en_CA.po
@ -1541,6 +1541,10 @@ msgstr "Shortcut"
 msgid "Shortcut for %1"
 msgstr "Shortcut for %1"

+#, qt-format
+msgid "Shortcut for %1 already exists"
+msgstr ""
+
 msgid "Show"
 msgstr "Show"

--- a/src/translations/en_GB.po
+++ b/src/translations/en_GB.po
@ -1538,6 +1538,10 @@ msgstr ""
 msgid "Shortcut for %1"
 msgstr ""

+#, qt-format
+msgid "Shortcut for %1 already exists"
+msgstr ""
+
 msgid "Show"
 msgstr ""

--- a/src/translations/es.po
+++ b/src/translations/es.po
@ -1561,6 +1561,10 @@ msgstr "Acceso rápido"
 msgid "Shortcut for %1"
 msgstr "Combinación de teclas para %1"

+#, qt-format
+msgid "Shortcut for %1 already exists"
+msgstr ""
+
 msgid "Show"
 msgstr "Mostrar"

--- a/src/translations/fi.po
+++ b/src/translations/fi.po
@ -1538,6 +1538,10 @@ msgstr ""
 msgid "Shortcut for %1"
 msgstr ""

+#, qt-format
+msgid "Shortcut for %1 already exists"
+msgstr ""
+
 msgid "Show"
 msgstr ""

--- a/src/translations/fr.po
+++ b/src/translations/fr.po
@ -1550,6 +1550,10 @@ msgstr ""
 msgid "Shortcut for %1"
 msgstr ""

+#, qt-format
+msgid "Shortcut for %1 already exists"
+msgstr ""
+
 msgid "Show"
 msgstr "Afficher"

--- a/src/translations/gl.po
+++ b/src/translations/gl.po
@ -1538,6 +1538,10 @@ msgstr ""
 msgid "Shortcut for %1"
 msgstr ""

+#, qt-format
+msgid "Shortcut for %1 already exists"
+msgstr ""
+
 msgid "Show"
 msgstr ""

--- a/src/translations/hu.po
+++ b/src/translations/hu.po
@ -1553,6 +1553,10 @@ msgstr "Billentyűparancs"
 msgid "Shortcut for %1"
 msgstr "Billentyűparancs %1-hoz/hez"

+#, qt-format
+msgid "Shortcut for %1 already exists"
+msgstr ""
+
 msgid "Show"
 msgstr "Megjelenít"

--- a/src/translations/it.po
+++ b/src/translations/it.po
@ -1565,6 +1565,10 @@ msgstr "Scorciatoia"
 msgid "Shortcut for %1"
 msgstr "Scorciatoia per %1"

+#, qt-format
+msgid "Shortcut for %1 already exists"
+msgstr ""
+
 msgid "Show"
 msgstr "Mostra"

--- a/src/translations/kk.po
+++ b/src/translations/kk.po
@ -1538,6 +1538,10 @@ msgstr ""
 msgid "Shortcut for %1"
 msgstr ""

+#, qt-format
+msgid "Shortcut for %1 already exists"
+msgstr ""
+
 msgid "Show"
 msgstr ""

--- a/src/translations/lt.po
+++ b/src/translations/lt.po
@ -1536,6 +1536,10 @@ msgstr ""
 msgid "Shortcut for %1"
 msgstr ""

+#, qt-format
+msgid "Shortcut for %1 already exists"
+msgstr ""
+
 msgid "Show"
 msgstr ""

--- a/src/translations/nb.po
+++ b/src/translations/nb.po
@ -1539,6 +1539,10 @@ msgstr ""
 msgid "Shortcut for %1"
 msgstr ""

+#, qt-format
+msgid "Shortcut for %1 already exists"
+msgstr ""
+
 msgid "Show"
 msgstr ""

--- a/src/translations/nl.po
+++ b/src/translations/nl.po
@ -1555,6 +1555,10 @@ msgstr "Sneltoets"
 msgid "Shortcut for %1"
 msgstr "Sneltoets voor %1"

+#, qt-format
+msgid "Shortcut for %1 already exists"
+msgstr ""
+
 msgid "Show"
 msgstr "Weergeven"

--- a/src/translations/oc.po
+++ b/src/translations/oc.po
@ -1536,6 +1536,10 @@ msgstr "Acorchi"
 msgid "Shortcut for %1"
 msgstr ""

+#, qt-format
+msgid "Shortcut for %1 already exists"
+msgstr ""
+
 msgid "Show"
 msgstr "Afichar"

--- a/src/translations/pl.po
+++ b/src/translations/pl.po
@ -1547,6 +1547,10 @@ msgstr "Skrót"
 msgid "Shortcut for %1"
 msgstr "Skrót do %1"

+#, qt-format
+msgid "Shortcut for %1 already exists"
+msgstr "Skrót dla %1 już istnieje"
+
 msgid "Show"
 msgstr "Pokaż"

--- a/src/translations/pt.po
+++ b/src/translations/pt.po
@ -1553,6 +1553,10 @@ msgstr "Atalho"
 msgid "Shortcut for %1"
 msgstr "Atalho para %1"

+#, qt-format
+msgid "Shortcut for %1 already exists"
+msgstr ""
+
 msgid "Show"
 msgstr "Mostrar"

--- a/src/translations/pt_BR.po
+++ b/src/translations/pt_BR.po
@ -1548,6 +1548,10 @@ msgstr "Atalho"
 msgid "Shortcut for %1"
 msgstr "Atalho para %1"

+#, qt-format
+msgid "Shortcut for %1 already exists"
+msgstr ""
+
 msgid "Show"
 msgstr "Exibir"

--- a/src/translations/ro.po
+++ b/src/translations/ro.po
@ -1537,6 +1537,10 @@ msgstr ""
 msgid "Shortcut for %1"
 msgstr ""

+#, qt-format
+msgid "Shortcut for %1 already exists"
+msgstr ""
+
 msgid "Show"
 msgstr ""

--- a/src/translations/ru.po
+++ b/src/translations/ru.po
@ -1550,6 +1550,10 @@ msgstr "Горячая клавиша"
 msgid "Shortcut for %1"
 msgstr "Ярлык для %1"

+#, qt-format
+msgid "Shortcut for %1 already exists"
+msgstr ""
+
 msgid "Show"
 msgstr "Показать"

--- a/src/translations/sk.po
+++ b/src/translations/sk.po
@ -1551,6 +1551,10 @@ msgstr "Skratka"
 msgid "Shortcut for %1"
 msgstr "Skratka pre %1"

+#, qt-format
+msgid "Shortcut for %1 already exists"
+msgstr ""
+
 msgid "Show"
 msgstr "Zobraziť"

--- a/src/translations/sl.po
+++ b/src/translations/sl.po
@ -1553,6 +1553,10 @@ msgstr "Bližnjica"
 msgid "Shortcut for %1"
 msgstr "Bližnjica za %1"

+#, qt-format
+msgid "Shortcut for %1 already exists"
+msgstr ""
+
 msgid "Show"
 msgstr "Pokaži"

--- a/src/translations/sr.po
+++ b/src/translations/sr.po
@ -1541,6 +1541,10 @@ msgstr "Пречица"
 msgid "Shortcut for %1"
 msgstr "Пречица за %1"

+#, qt-format
+msgid "Shortcut for %1 already exists"
+msgstr ""
+
 msgid "Show"
 msgstr ""

--- a/src/translations/sv.po
+++ b/src/translations/sv.po
@ -1545,6 +1545,10 @@ msgstr "Genväg"
 msgid "Shortcut for %1"
 msgstr "Genväg för %1"

+#, qt-format
+msgid "Shortcut for %1 already exists"
+msgstr ""
+
 msgid "Show"
 msgstr "Visa"

--- a/src/translations/tr.po
+++ b/src/translations/tr.po
@ -1542,6 +1542,10 @@ msgstr "Kısayol"
 msgid "Shortcut for %1"
 msgstr "%1 için kısayol"

+#, qt-format
+msgid "Shortcut for %1 already exists"
+msgstr ""
+
 msgid "Show"
 msgstr "Göster"

--- a/src/translations/translations.pot
+++ b/src/translations/translations.pot
@ -1526,6 +1526,10 @@ msgstr ""
 msgid "Shortcut for %1"
 msgstr ""

+#, qt-format
+msgid "Shortcut for %1 already exists"
+msgstr ""
+
 msgid "Show"
 msgstr ""

--- a/src/translations/uk.po
+++ b/src/translations/uk.po
@ -1551,6 +1551,10 @@ msgstr "Комбінація клавіш"
 msgid "Shortcut for %1"
 msgstr "Комбінація клавіш для %1"

+#, qt-format
+msgid "Shortcut for %1 already exists"
+msgstr ""
+
 msgid "Show"
 msgstr "Показати"

--- a/src/translations/zh_CN.po
+++ b/src/translations/zh_CN.po
@ -1536,6 +1536,10 @@ msgstr ""
 msgid "Shortcut for %1"
 msgstr ""

+#, qt-format
+msgid "Shortcut for %1 already exists"
+msgstr ""
+
 msgid "Show"
 msgstr "显示"

--- a/src/translations/zh_TW.po
+++ b/src/translations/zh_TW.po
@ -1541,6 +1541,10 @@ msgstr ""
 msgid "Shortcut for %1"
 msgstr "%1的捷徑"

+#, qt-format
+msgid "Shortcut for %1 already exists"
+msgstr ""
+
 msgid "Show"
 msgstr "顯示"

--- a/src/ui/wiimotedevshortcutsconfig.cpp
+++ b/src/ui/wiimotedevshortcutsconfig.cpp
@ -21,6 +21,8 @@
 #include "wiimotedev/shortcuts.h"
 #include "wiimotedev/consts.h"

+#include <QMessageBox>
+
 WiimotedevShortcutsConfig::WiimotedevShortcutsConfig(QWidget* parent)
  : QWidget(parent),
    ui_(new Ui_WiimotedevShortcutsConfig)
@ -128,6 +130,13 @@ WiimotedevShortcutsConfig::WiimotedevShortcutsConfig(QWidget* parent)


 void WiimotedevShortcutsConfig::AddShortcut(quint64 button, quint32 action) {
+  foreach (const Shortcut& shortcut, actions_) {
+    if (shortcut.button == button) {
+      QMessageBox::information(this, tr("Information"), QString(tr("Shortcut for %1 already exists")).arg(GetReadableWiiremoteSequence(button)), QMessageBox::Ok);
+      return;
+    }
+  }
+
  Shortcut s;
  s.object = new QTreeWidgetItem(ui_->list, QStringList() << GetReadableWiiremoteSequence(button) << text_actions_[action]);
  s.button = button;
@ -215,7 +224,7 @@ QString WiimotedevShortcutsConfig::GetReadableWiiremoteSequence(quint64 value) {
 void WiimotedevShortcutsConfig::AddAction() {
  emit SetWiimotedevInterfaceActived(false);
  WiimotedevShortcutGrabber grabber(0, this);
-  connect(&grabber, SIGNAL(AddShortcut(quint64,quint32)), this, SLOT(AddShortcut(quint64,quint32)));
+  connect(&grabber, SIGNAL(AddShortcut(quint64,quint32)), this, SLOT(AddShortcut(quint64,quint32)), Qt::QueuedConnection);
  grabber.exec();
  emit SetWiimotedevInterfaceActived(true);