aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Customizable shorcuts

Browse source
This commit is contained in:
marco 2015-08-16 14:02:44 +02:00
commit 713a8148d3
3 changed files with 1574 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1567
cockatrice/src/sequenceEdit/ui_shortcutstab.h Normal file
View file

File diff suppressed because it is too large Load diff

6
cockatrice/src/shortcutssettings.cpp
View file

@ -16,7 +16,7 @@ ShortcutsSettings::ShortcutsSettings(QString settingsPath, QObject *parent) : QO
if(exists){ if(exists){
shortCutsFile.beginGroup("Custom"); shortCutsFile.beginGroup("Custom");
const QStringList customKeys = shortCutsFile.allKeys(); const QStringList customKeys = shortCutsFile.allKeys();
for(QStringList::const_iterator it = customKeys.cbegin(); it != customKeys.cend(); ++it) for(QStringList::const_iterator it = customKeys.constBegin(); it != customKeys.constEnd(); ++it)
{ {
QString stringSecuence = shortCutsFile.value(*it).toString(); QString stringSecuence = shortCutsFile.value(*it).toString();
QList<QKeySequence> secuenceList = parseSecuenceString(stringSecuence); QList<QKeySequence> secuenceList = parseSecuenceString(stringSecuence);
@ -26,7 +26,7 @@ ShortcutsSettings::ShortcutsSettings(QString settingsPath, QObject *parent) : QO
shortCutsFile.beginGroup("Defaults"); shortCutsFile.beginGroup("Defaults");
const QStringList defaultKeys = shortCutsFile.allKeys(); const QStringList defaultKeys = shortCutsFile.allKeys();
for(QStringList::const_iterator it = defaultKeys.cbegin(); it != defaultKeys.cend(); ++it) for(QStringList::const_iterator it = defaultKeys.constBegin(); it != defaultKeys.constEnd(); ++it)
{ {
QString stringSecuence = shortCutsFile.value(*it).toString(); QString stringSecuence = shortCutsFile.value(*it).toString();
QList<QKeySequence> secuenceList = parseSecuenceString(stringSecuence); QList<QKeySequence> secuenceList = parseSecuenceString(stringSecuence);
@ -89,7 +89,7 @@ QList<QKeySequence> ShortcutsSettings::parseSecuenceString(QString stringSecuenc
{ {
QStringList secuences = stringSecuence.split(";"); QStringList secuences = stringSecuence.split(";");
QList<QKeySequence> secuenceList; QList<QKeySequence> secuenceList;
for(QStringList::const_iterator ss = secuences.cbegin(); ss != secuences.cend(); ++ss) for(QStringList::const_iterator ss = secuences.constBegin(); ss != secuences.constEnd(); ++ss)
{ {
secuenceList.append(QKeySequence(*ss, QKeySequence::PortableText)); secuenceList.append(QKeySequence(*ss, QKeySequence::PortableText));
} }

5
cockatrice/src/tab_deck_editor.cpp
View file

@ -279,6 +279,9 @@ void TabDeckEditor::createMenus()
aSaveDeckAs->setShortcuts(settingsCache->shortcuts().getShortcut( aSaveDeckAs->setShortcuts(settingsCache->shortcuts().getShortcut(
"TabDeckEditor/aSaveDeckAs", QKeySequence())); "TabDeckEditor/aSaveDeckAs", QKeySequence()));
aOpenCustomsetsFolder = new QAction(QString(), this);
connect(aOpenCustomsetsFolder, SIGNAL(triggered()), this, SLOT(actOpenCustomsetsFolder()));
aLoadDeckFromClipboard = new QAction(QString(), this); aLoadDeckFromClipboard = new QAction(QString(), this);
connect(aLoadDeckFromClipboard, SIGNAL(triggered()), this, SLOT(actLoadDeckFromClipboard())); connect(aLoadDeckFromClipboard, SIGNAL(triggered()), this, SLOT(actLoadDeckFromClipboard()));
aLoadDeckFromClipboard->setShortcuts(settingsCache->shortcuts().getShortcut( aLoadDeckFromClipboard->setShortcuts(settingsCache->shortcuts().getShortcut(
@ -576,7 +579,7 @@ void TabDeckEditor::retranslateUi()
aPrintDeck->setText(tr("&Print deck...")); aPrintDeck->setText(tr("&Print deck..."));
aAnalyzeDeck->setText(tr("&Analyze deck on deckstats.net")); aAnalyzeDeck->setText(tr("&Analyze deck on deckstats.net"));
aOpenCustomFolder->setText(tr("Open custom image folder")); aOpenCustomFolder->setText(tr("Open custom image folder"));
aOpenCustomsetsFolder->setText(tr("Open custom sets folder")); aOpenCustomsetsFolder->setText(tr("Open custom sets folder"));
aClose->setText(tr("&Close")); aClose->setText(tr("&Close"));
aClose->setShortcuts(settingsCache->shortcuts().getShortcut( aClose->setShortcuts(settingsCache->shortcuts().getShortcut(
"TabDeckEditor/aClose", "TabDeckEditor/aClose",