updated to new qxtglobal shortcut version; fixed bug with reloading config disables buttons
This commit is contained in:
parent
41c83ffbaf
commit
83eaed56c1
|
@ -1 +1 @@
|
||||||
Subproject commit 66d741954d224eb3835cb84b682a50760aa4d1ee
|
Subproject commit 0b6f10adc8355555d25e85469a5d713012a414ee
|
|
@ -22,14 +22,7 @@ MainWindow::MainWindow(const std::string& binary, QWidget* parent) : QMainWindow
|
||||||
QObject::connect(ui->actionSaveConfig, SIGNAL( triggered() ), this, SLOT( saveConfig() ));
|
QObject::connect(ui->actionSaveConfig, SIGNAL( triggered() ), this, SLOT( saveConfig() ));
|
||||||
QObject::connect(ui->actionButtonManager, SIGNAL( triggered() ), this, SLOT( openButtonManager() ));
|
QObject::connect(ui->actionButtonManager, SIGNAL( triggered() ), this, SLOT( openButtonManager() ));
|
||||||
QObject::connect(ui->alwaysOnTop, SIGNAL( stateChanged(int) ), this, SLOT( alwaysOnTopSettingChange(int) ));
|
QObject::connect(ui->alwaysOnTop, SIGNAL( stateChanged(int) ), this, SLOT( alwaysOnTopSettingChange(int) ));
|
||||||
QObject::connect(stopGlobal, SIGNAL( activated() ), this, SLOT( stop() ));
|
|
||||||
QObject::connect(this, SIGNAL(newStatusMessage(const QString&)), ui->statusbar, SLOT(showMessage(const QString&)));
|
QObject::connect(this, SIGNAL(newStatusMessage(const QString&)), ui->statusbar, SLOT(showMessage(const QString&)));
|
||||||
|
|
||||||
QObject::connect(up, SIGNAL( activated() ), this, SLOT( moveUp() ));
|
|
||||||
QObject::connect(down, SIGNAL( activated() ), this, SLOT( moveDown() ));
|
|
||||||
QObject::connect(left, SIGNAL( activated() ), this, SLOT( moveLeft() ));
|
|
||||||
QObject::connect(right, SIGNAL( activated() ), this, SLOT( moveRight() ));
|
|
||||||
QObject::connect(play, SIGNAL( activated() ), this, SLOT( playCurrent() ));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
MainWindow::~MainWindow() {
|
MainWindow::~MainWindow() {
|
||||||
|
@ -177,6 +170,13 @@ void MainWindow::loadShortcuts() {
|
||||||
right = loadShortcut(sc.right);
|
right = loadShortcut(sc.right);
|
||||||
play = loadShortcut(sc.play);
|
play = loadShortcut(sc.play);
|
||||||
stopGlobal = loadShortcut(sc.stop);
|
stopGlobal = loadShortcut(sc.stop);
|
||||||
|
|
||||||
|
QObject::connect(up, SIGNAL( activated() ), this, SLOT( moveUp() ));
|
||||||
|
QObject::connect(down, SIGNAL( activated() ), this, SLOT( moveDown() ));
|
||||||
|
QObject::connect(left, SIGNAL( activated() ), this, SLOT( moveLeft() ));
|
||||||
|
QObject::connect(right, SIGNAL( activated() ), this, SLOT( moveRight() ));
|
||||||
|
QObject::connect(play, SIGNAL( activated() ), this, SLOT( playCurrent() ));
|
||||||
|
QObject::connect(stopGlobal, SIGNAL( activated() ), this, SLOT( stop() ));
|
||||||
}
|
}
|
||||||
|
|
||||||
void MainWindow::removeAllButtons() {
|
void MainWindow::removeAllButtons() {
|
||||||
|
|
Loading…
Reference in New Issue