From f2d0d9f4f2e121cba024a286941a2a36dd5dcf28 Mon Sep 17 00:00:00 2001 From: Antenore Gatta Date: Sat, 17 Aug 2019 00:51:03 +0200 Subject: WIP: Moving to CMake --- .gitignore | 1 + CMakeLists.txt | 21 ++++++ QRema.pro | 6 +- data/ui/qremamain.ui | 201 --------------------------------------------------- src/CMakeLists.txt | 12 +++ src/qremamain.cpp | 2 +- src/qremamain.h | 4 +- src/qremamain.ui | 201 +++++++++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 243 insertions(+), 205 deletions(-) create mode 100644 CMakeLists.txt delete mode 100644 data/ui/qremamain.ui create mode 100644 src/CMakeLists.txt create mode 100644 src/qremamain.ui diff --git a/.gitignore b/.gitignore index 5c4d80f..63c1c75 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,4 @@ compile_commands.json # QtCreator local machine specific files for imported projects *creator.user* +build diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..9fa52b5 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,21 @@ +cmake_minimum_required(VERSION 3.1.0) + +set(CMAKE_COLOR_MAKEFILE ON) + +project(QRema C CXX) + +set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/) + +# Find includes in corresponding build directories +set(CMAKE_INCLUDE_CURRENT_DIR ON) +# Instruct CMake to run moc automatically when needed +set(CMAKE_AUTOMOC ON) +# Create code from a list of Qt designer ui files +set(CMAKE_AUTOUIC ON) + +# Find the QtWidgets library +find_package(Qt5 COMPONENTS Core Widgets Gui REQUIRED) + + +add_subdirectory(src) + diff --git a/QRema.pro b/QRema.pro index 827e376..36f191c 100644 --- a/QRema.pro +++ b/QRema.pro @@ -57,11 +57,15 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin !isEmpty(target.path): INSTALLS += target DISTFILES += \ + CMakeLists.txt \ + data/CMakeLists.txt \ data/icons/scalable/actions/add.svg \ data/icons/scalable/actions/copy.svg \ data/icons/scalable/actions/edit.svg \ data/icons/scalable/actions/remove.svg \ - data/icons/scalable/actions/settings.svg + data/icons/scalable/actions/settings.svg \ + data/ui/CMakeLists.txt \ + src/CMakeLists.txt RESOURCES += \ qremares.qrc diff --git a/data/ui/qremamain.ui b/data/ui/qremamain.ui deleted file mode 100644 index a724c56..0000000 --- a/data/ui/qremamain.ui +++ /dev/null @@ -1,201 +0,0 @@ - - - QRemaMain - - - - 0 - 0 - 800 - 400 - - - - - 800 - 400 - - - - QRemaMain - - - - :/data/desktop/scalable/apps/data/desktop/scalable/apps/org.remmina.QRema.svg:/data/desktop/scalable/apps/data/desktop/scalable/apps/org.remmina.QRema.svg - - - - - - - Qt::Horizontal - - - - - - - true - - - - - - - - - - - - - - - 0 - 0 - - - - true - - - - - - - QAbstractItemView::MultiSelection - - - true - - - - - - - - - - - - - 0 - 0 - 800 - 21 - - - - - &File - - - - - - - &Help - - - - - - - - - Qt::ToolButtonTextBesideIcon - - - TopToolBarArea - - - false - - - - - - - - - - - .. - - - &Add - - - - - - .. - - - &Delete - - - - - - .. - - - About - - - - - - - - - - treeView - clicked(QModelIndex) - listView - update(QModelIndex) - - - 171 - 163 - - - 486 - 192 - - - - - listView - doubleClicked(QModelIndex) - QRemaMain - update() - - - 565 - 311 - - - 399 - 199 - - - - - groupCombo - currentTextChanged(QString) - treeView - update() - - - 128 - 80 - - - 139 - 136 - - - - - diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 0000000..1fc7b1d --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,12 @@ + +set(qrema_SRCS + main.cpp + qremamain.cpp + qremamain.h + qremamain.ui + qremaprofileparser.cpp + qremaprofileparser.h + ) + +add_executable(qrema ${qrema_SRCS}) +target_link_libraries(qrema Qt5::Widgets) diff --git a/src/qremamain.cpp b/src/qremamain.cpp index f68b7d1..0bfe541 100644 --- a/src/qremamain.cpp +++ b/src/qremamain.cpp @@ -37,7 +37,7 @@ QRemaMain::QRemaMain(QWidget *parent) : // FILES - GKeyFile *keyFile = g_key_file_new(); + //GKeyFile *keyFile = g_key_file_new(); fileModel = new QFileSystemModel(this); diff --git a/src/qremamain.h b/src/qremamain.h index 2378546..ffdb730 100644 --- a/src/qremamain.h +++ b/src/qremamain.h @@ -7,8 +7,8 @@ #include #include #include -#include -#include +//#include +//#include diff --git a/src/qremamain.ui b/src/qremamain.ui new file mode 100644 index 0000000..a724c56 --- /dev/null +++ b/src/qremamain.ui @@ -0,0 +1,201 @@ + + + QRemaMain + + + + 0 + 0 + 800 + 400 + + + + + 800 + 400 + + + + QRemaMain + + + + :/data/desktop/scalable/apps/data/desktop/scalable/apps/org.remmina.QRema.svg:/data/desktop/scalable/apps/data/desktop/scalable/apps/org.remmina.QRema.svg + + + + + + + Qt::Horizontal + + + + + + + true + + + + + + + + + + + + + + + 0 + 0 + + + + true + + + + + + + QAbstractItemView::MultiSelection + + + true + + + + + + + + + + + + + 0 + 0 + 800 + 21 + + + + + &File + + + + + + + &Help + + + + + + + + + Qt::ToolButtonTextBesideIcon + + + TopToolBarArea + + + false + + + + + + + + + + + .. + + + &Add + + + + + + .. + + + &Delete + + + + + + .. + + + About + + + + + + + + + + treeView + clicked(QModelIndex) + listView + update(QModelIndex) + + + 171 + 163 + + + 486 + 192 + + + + + listView + doubleClicked(QModelIndex) + QRemaMain + update() + + + 565 + 311 + + + 399 + 199 + + + + + groupCombo + currentTextChanged(QString) + treeView + update() + + + 128 + 80 + + + 139 + 136 + + + + + -- cgit v1.2.3