diff --git a/CMakeLists.txt b/CMakeLists.txt index f1c694d..d1c1276 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required (VERSION 3.6) project (whyblocked - VERSION 0.7.0 + VERSION 0.7.1 LANGUAGES CXX ) @@ -88,7 +88,11 @@ if (WITH_RPM) set(CPACK_SOURCE_GENERATOR "RPM") set(CPACK_RPM_PACKAGE_LICENSE "GPL-3") set(CPACK_RPM_PACKAGE_URL "https://schlomp.space/tastytea/whyblocked") - set(CPACK_RPM_PACKAGE_REQUIRES "vsqlite++ >= 0.3.13 libxdg-basedir, >= 1.2.0") + if(NOT WITHOUT_QT) + set(CPACK_RPM_PACKAGE_REQUIRES "vsqlite++ >= 0.3.13, libxdg-basedir >= 1.2.0, qt >= 5.0") + else() + set(CPACK_RPM_PACKAGE_REQUIRES "vsqlite++ >= 0.3.13, libxdg-basedir >= 1.2.0") + endif() set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-0.${CPACK_PACKAGE_ARCHITECTURE}") set(CPACK_SOURCE_PACKAGE_FILE_NAME diff --git a/src/interface_qt.cpp b/src/interface_qt.cpp index 5b4fe41..c0064e3 100644 --- a/src/interface_qt.cpp +++ b/src/interface_qt.cpp @@ -35,6 +35,7 @@ MainWindow::MainWindow(QMainWindow *parent) : QMainWindow(parent) connect(action_remove, &QAction::triggered, this, &MainWindow::remove); connect(action_reload, &QAction::triggered, this, &MainWindow::populate_tableview); connect(action_about, &QAction::triggered, this, &MainWindow::about); + connect(action_quit, &QAction::triggered, this, &MainWindow::close); connect(tableview, &QTableView::clicked, this, &MainWindow::show_details); connect(tableview, &QTableView::activated, this, &MainWindow::show_details); diff --git a/src/whyblocked.ui b/src/whyblocked.ui index 5c9df72..5e3b544 100644 --- a/src/whyblocked.ui +++ b/src/whyblocked.ui @@ -73,6 +73,7 @@ + @@ -118,7 +119,8 @@ - + + .. Reload @@ -130,6 +132,20 @@ Ctrl+R + + + + + + Quit + + + Quit application + + + Ctrl+Q + + diff --git a/src/whyblocked_add.ui b/src/whyblocked_add.ui index 298daf3..229522d 100644 --- a/src/whyblocked_add.ui +++ b/src/whyblocked_add.ui @@ -15,7 +15,7 @@ - + @@ -90,18 +90,18 @@ + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - -