aboutsummaryrefslogtreecommitdiff
path: root/src-qt5/desktop-utils
diff options
context:
space:
mode:
authorZackaryWelch <welch.zackary@gmail.com>2017-06-20 11:27:13 -0400
committerZackaryWelch <welch.zackary@gmail.com>2017-06-20 11:27:13 -0400
commitd8bc77394f650953947ace06f7743005bcf3f88f (patch)
tree90e8319fb8031ef23d7f5efb17313b20844deada /src-qt5/desktop-utils
parentQuick adjustment for when pianobar is not installed (diff)
downloadlumina-d8bc77394f650953947ace06f7743005bcf3f88f.tar.gz
lumina-d8bc77394f650953947ace06f7743005bcf3f88f.tar.bz2
lumina-d8bc77394f650953947ace06f7743005bcf3f88f.zip
Removed an error message caused by an object's name and QMetaObject
Diffstat (limited to 'src-qt5/desktop-utils')
-rw-r--r--src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp12
-rw-r--r--src-qt5/desktop-utils/lumina-screenshot/MainUI.h2
2 files changed, 7 insertions, 7 deletions
diff --git a/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp b/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp
index bdfbbfec..2bdd69ae 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp
+++ b/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp
@@ -29,7 +29,7 @@ MainUI::MainUI()
if(ui->spin_monitor->maximum()<2){
ui->spin_monitor->setEnabled(false);
ui->radio_monitor->setEnabled(false);
- }
+ }
scaleTimer = new QTimer(this);
scaleTimer->setSingleShot(true);
scaleTimer->setInterval(200); //~1/5 second
@@ -75,7 +75,7 @@ MainUI::MainUI()
// Shortcuts
quitShortcut = new QShortcut(Qt::CTRL + Qt::Key_Q, this);
- connect(quitShortcut, SIGNAL(activated()), this, SLOT(on_quitShortcut_Triggered()) );
+ connect(quitShortcut, SIGNAL(activated()), this, SLOT(quitShortcut_activated()) );
openShortcut = new QShortcut(Qt::CTRL + Qt::Key_O, this);
connect(openShortcut, SIGNAL(activated()), this, SLOT(quicksave()) );
@@ -293,12 +293,12 @@ void MainUI::mouseReleaseEvent(QMouseEvent *ev){
QList<WId> wins = XCB->WindowList();
QList<WId> stack = XCB->WM_Get_Client_List(true);
cwin = 0;
- //qDebug() << "Try to select window:" << ev->globalPos();
+ //qDebug() << "Try to select window:" << ev->globalPos();
for(int i=stack.length()-1; i>=0 && cwin==0; i--){ //work top->bottom in the stacking order
if(!wins.contains(stack[i])){ continue; }
- if( XCB->WindowGeometry(stack[i], true).contains(ev->globalPos()) && XCB->WindowState(stack[i])!=LXCB::INVISIBLE ){
+ if( XCB->WindowGeometry(stack[i], true).contains(ev->globalPos()) && XCB->WindowState(stack[i])!=LXCB::INVISIBLE ){
//qDebug() << "Found Window:" << i << XCB->WindowClass(stack[i]);
- cwin = stack[i];
+ cwin = stack[i];
}
}
//qDebug() << " - Got window:" << cwin;
@@ -338,6 +338,6 @@ void MainUI::closeEvent(QCloseEvent *ev){
QMainWindow::closeEvent(ev);
}
-void MainUI::on_quitShortcut_Triggered(){
+void MainUI::quitShortcut_activated(){
QApplication::quit();
}
diff --git a/src-qt5/desktop-utils/lumina-screenshot/MainUI.h b/src-qt5/desktop-utils/lumina-screenshot/MainUI.h
index 91d4966f..cd78dc3c 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/MainUI.h
+++ b/src-qt5/desktop-utils/lumina-screenshot/MainUI.h
@@ -85,7 +85,7 @@ private slots:
bool getWindow(); //set the "cwin" variable as appropriate
void getPixmap(); //set the "cpic" variable to the new screenshot
- void on_quitShortcut_Triggered();
+ void quitShortcut_activated();
protected:
void mousePressEvent(QMouseEvent *ev);
bgstack15