jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-12 09:04:53 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Renamed file + reduced window size + resfresh on change

Browse source
This commit is contained in:
marco 2015-08-18 23:47:21 +02:00
parent d3d6f70496
commit c6aba5a6d0
22 changed files with 463 additions and 470 deletions
Download patch file Download diff file Expand all files Collapse all files

29
cockatrice/src/sequenceEdit/secuenceedit.cpp → cockatrice/src/sequenceEdit/sequenceedit.cpp
View file

@ -1,4 +1,4 @@
#include "secuenceedit.h"
#include "sequenceedit.h"
#include "../settingscache.h"
#include <QLineEdit>
#include <QPushButton>
@ -7,7 +7,7 @@
#include <QKeyEvent>
#include <QToolTip>
SecuenceEdit::SecuenceEdit(QString _shorcutName, QWidget *parent) : QWidget(parent)
SequenceEdit::SequenceEdit(QString _shorcutName, QWidget *parent) : QWidget(parent)
{
shorcutName = _shorcutName;
currentKey = 0;
@ -19,16 +19,21 @@ SecuenceEdit::SecuenceEdit(QString _shorcutName, QWidget *parent) : QWidget(pare
clearButton = new QPushButton("", this);
defaultButton = new QPushButton("", this);
lineEdit->setMinimumWidth(100);
lineEdit->setMinimumWidth(70);
clearButton->setMaximumWidth(lineEdit->height());
defaultButton->setMaximumWidth(lineEdit->height());
clearButton->setMaximumHeight(lineEdit->height());
defaultButton->setMaximumHeight(lineEdit->height());
clearButton->setIcon(QIcon(":/resources/icon_clearsearch.svg"));
defaultButton->setIcon(QIcon(":/resources/icon_update.png"));
clearButton->setAttribute(Qt::WA_LayoutUsesWidgetRect);
defaultButton->setAttribute(Qt::WA_LayoutUsesWidgetRect);
QHBoxLayout *layout = new QHBoxLayout(this);
layout->setContentsMargins(0,0,0,0);
layout->setSpacing(0);
layout->setSpacing(1);
layout->addWidget(lineEdit);
layout->addWidget(clearButton);
layout->addWidget(defaultButton);
@ -40,12 +45,12 @@ SecuenceEdit::SecuenceEdit(QString _shorcutName, QWidget *parent) : QWidget(pare
lineEdit->setText(settingsCache->shortcuts().getShortcutString(shorcutName));
}
QString SecuenceEdit::getSecuence()
QString SequenceEdit::getSecuence()
{
return lineEdit->text();
}
void SecuenceEdit::removeLastShortcut()
void SequenceEdit::removeLastShortcut()
{
QString secuences = lineEdit->text();
if(!secuences.isEmpty())
@ -60,13 +65,13 @@ void SecuenceEdit::removeLastShortcut()
}
}
void SecuenceEdit::restoreDefault()
void SequenceEdit::restoreDefault()
{
lineEdit->setText(settingsCache->shortcuts().getDefaultShortcutString(shorcutName));
updateSettings();
}
bool SecuenceEdit::eventFilter(QObject *, QEvent * event)
bool SequenceEdit::eventFilter(QObject *, QEvent * event)
{
if(event->type() == QEvent::KeyPress || event->type() == QEvent::KeyRelease)
{
@ -81,7 +86,7 @@ bool SecuenceEdit::eventFilter(QObject *, QEvent * event)
return false;
}
void SecuenceEdit::processKey(QKeyEvent* e)
void SequenceEdit::processKey(QKeyEvent* e)
{
int key = e->key();
if(key != Qt::Key_Control && key != Qt::Key_Shift
@ -96,7 +101,7 @@ void SecuenceEdit::processKey(QKeyEvent* e)
finishShortcut();
}
int SecuenceEdit::translateModifiers(Qt::KeyboardModifiers state, const QString &text)
int SequenceEdit::translateModifiers(Qt::KeyboardModifiers state, const QString &text)
{
int result = 0;
// The shift modifier only counts when it is not used to type a symbol
@ -116,7 +121,7 @@ int SecuenceEdit::translateModifiers(Qt::KeyboardModifiers state, const QString
return result;
}
void SecuenceEdit::finishShortcut()
void SequenceEdit::finishShortcut()
{
QKeySequence secuence(keys);
if(!secuence.isEmpty() && valid)
@ -143,7 +148,7 @@ void SecuenceEdit::finishShortcut()
updateSettings();
}
void SecuenceEdit::updateSettings()
void SequenceEdit::updateSettings()
{
settingsCache->shortcuts().setShortcuts(shorcutName,lineEdit->text());
}

4
cockatrice/src/sequenceEdit/secuenceedit.h → cockatrice/src/sequenceEdit/sequenceedit.h
View file

@ -8,11 +8,11 @@ class QLineEdit;
class QPushButton;
class QEvent;
class SecuenceEdit : public QWidget
class SequenceEdit : public QWidget
{
Q_OBJECT
public:
SecuenceEdit(QString _shorcutName, QWidget *parent = 0);
SequenceEdit(QString _shorcutName, QWidget *parent = 0);
QString getSecuence();
signals:

451
cockatrice/src/sequenceEdit/ui_shortcutstab.h
View file

File diff suppressed because it is too large Load diff