diff --git a/testclient/CMakeLists.txt b/testclient/CMakeLists.txt --- a/testclient/CMakeLists.txt +++ b/testclient/CMakeLists.txt @@ -16,15 +16,9 @@ SerialPort ) -find_package(KF5 REQUIRED COMPONENTS - I18n - XmlGui - ConfigWidgets -) - add_executable(AtCoreTest ${AtCoreTestClient_SRCS}) -target_link_libraries(AtCoreTest AtCoreTestWidgets KF5::AtCore Qt5::Widgets Qt5::Charts KF5::XmlGui KF5::ConfigWidgets KF5::I18n) +target_link_libraries(AtCoreTest AtCoreTestWidgets KF5::AtCore Qt5::Widgets Qt5::Charts) install(TARGETS AtCoreTest RUNTIME DESTINATION bin) @@ -40,5 +34,3 @@ install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/AtCoreTest.desktop" DESTINATION share/applications) - -install(FILES atcoreui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/atcore) diff --git a/testclient/atcoreui.rc b/testclient/atcoreui.rc deleted file mode 100644 --- a/testclient/atcoreui.rc +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/testclient/main.cpp b/testclient/main.cpp --- a/testclient/main.cpp +++ b/testclient/main.cpp @@ -21,8 +21,6 @@ */ #include #include -#include -#include #include "mainwindow.h" @@ -34,38 +32,8 @@ QCoreApplication::setOrganizationDomain(QStringLiteral("kde.org")); QCoreApplication::setApplicationName(QStringLiteral("AtCore - KDE Print Service")); - KAboutData aboutData( - // The program name used internally. (componentName) - QStringLiteral("atcore"), - // A displayable program name string. (displayName) - i18n("Atcore"), - // The program version string. (version) - QStringLiteral("1.0"), - // Short description of what the app does. (shortDescription) - i18n("Test Client of AtCore"), - // The license this code is released under - KAboutLicense::GPL, - // Copyright Statement (copyrightStatement = QString()) - i18n("(c) 2017"), - // Optional text shown in the About box. - // Can contain any information desired. (otherText) - i18n(""), - // The program homepage string. (homePageAddress = QString()) - QStringLiteral("http://atelier.kde.org"), - // The bug report email address - // (bugsEmailAddress = QLatin1String("submit@bugs.kde.org") - QStringLiteral("atelier@bugs.kde.org")); - aboutData.addAuthor(i18n("Lays Rodrigues"), i18n("Developer"), QStringLiteral("laysrodriguessilva@gmail.com"), - QStringLiteral("http://laysrodriguesdev.wordpress.com")); - aboutData.addAuthor(i18n("Chris Rizzitello"), i18n("Developer"), QStringLiteral("sithlord48@gmail.com"), - QStringLiteral("http://rizzitello.wordpress.com")); - aboutData.addAuthor(i18n("Patrick Pereira"), i18n("Developer"), QStringLiteral("patrickelectric@gmail.com"), - QStringLiteral("http://patrickjp.com")); - aboutData.addAuthor(i18n("Tomaz Canabrava"), i18n("Contributor"), QStringLiteral("tomaz@kde.com"), - QStringLiteral("http://angrycane.com.br")); - KAboutData::setApplicationData(aboutData); + MainWindow window; + window.show(); - MainWindow *m = new MainWindow(); - m->show(); return app.exec(); } diff --git a/testclient/mainwindow.h b/testclient/mainwindow.h --- a/testclient/mainwindow.h +++ b/testclient/mainwindow.h @@ -27,13 +27,11 @@ #include #include -#include - #include "atcore.h" class SerialLayer; -class MainWindow: public KXmlGuiWindow +class MainWindow: public QMainWindow { Q_OBJECT diff --git a/testclient/mainwindow.cpp b/testclient/mainwindow.cpp --- a/testclient/mainwindow.cpp +++ b/testclient/mainwindow.cpp @@ -25,9 +25,6 @@ #include #include #include -#include -#include -#include #include "mainwindow.h" #include "seriallayer.h" @@ -38,13 +35,12 @@ int MainWindow::fanCount = 4; MainWindow::MainWindow(QWidget *parent) : - KXmlGuiWindow(parent), + QMainWindow(parent), ui(new Ui::MainWindow), core(new AtCore(this)), logFile(new QTemporaryFile(QDir::tempPath() + QStringLiteral("/AtCore_"))) { ui->setupUi(this); - setupActions(); ui->serialPortCB->setEditable(true); QValidator *validator = new QIntValidator(); ui->baudRateLE->setValidator(validator); @@ -122,6 +118,17 @@ ui->plotWidget->update(); }); + connect(ui->actionQuit, &QAction::triggered, this, &MainWindow::close); + connect(ui->actionShowDockTitles, &QAction::toggled, this, &MainWindow::toggleDockTitles); + + ui->menuView->insertAction(NULL, ui->connectDock->toggleViewAction()); + ui->menuView->insertAction(NULL, ui->tempControlsDock->toggleViewAction()); + ui->menuView->insertAction(NULL, ui->commandDock->toggleViewAction()); + ui->menuView->insertAction(NULL, ui->printDock->toggleViewAction()); + ui->menuView->insertAction(NULL, ui->moveDock->toggleViewAction()); + ui->menuView->insertAction(NULL, ui->tempTimelineDock->toggleViewAction()); + ui->menuView->insertAction(NULL, ui->logDock->toggleViewAction()); + //more dock stuff. setTabPosition(Qt::LeftDockWidgetArea, QTabWidget::North); setTabPosition(Qt::RightDockWidgetArea, QTabWidget::North); @@ -146,28 +153,6 @@ delete ui; } -void MainWindow::setupActions() -{ - KStandardAction::quit(qApp, SLOT(quit()), actionCollection()); - - actionCollection()->addAction(QStringLiteral("actionShowDockTitles"), this, &MainWindow::toggleDockTitles); - actionCollection()->action(QStringLiteral("actionShowDockTitles"))->setCheckable(true); - actionCollection()->action(QStringLiteral("actionShowDockTitles"))->setChecked(true); - actionCollection()->action(QStringLiteral("actionShowDockTitles"))->setText(i18n("Show Dock Titles")); - - //connect the view actions to their docks. - actionCollection()->addAction(QStringLiteral("actionConnection_Settings"), ui->connectDock->toggleViewAction()); - actionCollection()->addAction(QStringLiteral("actionSession_Log"), ui->logDock->toggleViewAction()); - actionCollection()->addAction(QStringLiteral("actionTemperature_Plot"), ui->tempTimelineDock->toggleViewAction()); - actionCollection()->addAction(QStringLiteral("actionTest_Commands"), ui->commandDock->toggleViewAction()); - actionCollection()->addAction(QStringLiteral("actionMovement"), ui->moveDock->toggleViewAction()); - actionCollection()->addAction(QStringLiteral("actionTemp_Controls"), ui->tempControlsDock->toggleViewAction()); - actionCollection()->addAction(QStringLiteral("actionPrint"), ui->printDock->toggleViewAction()); - - setupGUI(Save | Create, QStringLiteral("atcoreui.rc")); - -} - QString MainWindow::getTime() { return QTime::currentTime().toString(QStringLiteral("hh:mm:ss:zzz")); @@ -559,7 +544,7 @@ } void MainWindow::toggleDockTitles() { - if (actionCollection()->action(QStringLiteral("actionShowDockTitles"))->isChecked()) { + if (ui->actionShowDockTitles->isChecked()) { delete ui->connectDock->titleBarWidget(); delete ui->logDock->titleBarWidget(); delete ui->tempTimelineDock->titleBarWidget(); diff --git a/testclient/mainwindow.ui b/testclient/mainwindow.ui --- a/testclient/mainwindow.ui +++ b/testclient/mainwindow.ui @@ -172,8 +172,8 @@ - 0 - 0 + 362 + 243 @@ -326,8 +326,8 @@ - 0 - 0 + 137 + 146 @@ -378,8 +378,8 @@ - 0 - 0 + 100 + 64 @@ -412,8 +412,8 @@ - 0 - 0 + 285 + 246 @@ -535,8 +535,8 @@ - 0 - 0 + 266 + 176 @@ -618,8 +618,8 @@ - 0 - 0 + 473 + 192 @@ -769,8 +769,8 @@ - 0 - 0 + 336 + 195 @@ -901,51 +901,49 @@ - - - true + + + + 0 + 0 + 767 + 37 + - - &Connection Settings - - - - - true + + + File + + + + + + View + + + + + + + + + + + .. - Ma&nual + &Quit - + true - - &Session Log - - - - + true - T&emperature Plot - - - - - &Movement - - - - - &Print - - - - - &Temperatures + &Show Dock Titles