diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index deb6337..8c0dd44 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -42,6 +42,7 @@ target_link_libraries(${PROJECT_NAME} VerbEnd Plural Genus + ResultWidget Qt5::Widgets ) @@ -51,3 +52,5 @@ add_subdirectory(CheckableTestModel) add_subdirectory(MetaData) add_subdirectory(SubTests) + +add_subdirectory(ResultWidget) diff --git a/source/ResultWidget/CMakeLists.txt b/source/ResultWidget/CMakeLists.txt new file mode 100644 index 0000000..a61e2de --- /dev/null +++ b/source/ResultWidget/CMakeLists.txt @@ -0,0 +1,33 @@ +cmake_minimum_required(VERSION 3.6) + +project(ResultWidget LANGUAGES CXX) + +find_package(Qt5Widgets REQUIRED) + +set(CMAKE_AUTOMOC ON) + +qt5_wrap_ui(GENUS_UI + ResultWidget.ui +) + +add_library(${PROJECT_NAME} + ResultWidget.cpp + #ResultModel.cpp + ${GENUS_UI} +) + +set_target_properties(${PROJECT_NAME} + PROPERTIES CXX_STANDARD 14 +) + +target_include_directories(${PROJECT_NAME} + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} + PRIVATE + ${CMAKE_CURRENT_BINARY_DIR} +) + +target_link_libraries(${PROJECT_NAME} + PRIVATE + Qt5::Widgets +) diff --git a/source/ResultWidget/ResultWidget.cpp b/source/ResultWidget/ResultWidget.cpp new file mode 100644 index 0000000..6175b7a --- /dev/null +++ b/source/ResultWidget/ResultWidget.cpp @@ -0,0 +1,14 @@ +#include "ResultWidget.h" +#include "ui_ResultWidget.h" + +ResultWidget::ResultWidget(QWidget *parent) + : QWidget(parent) + , ui(new Ui::ResultWidget) +{ + ui->setupUi(this); +} + +ResultWidget::~ResultWidget() +{ + delete ui; +} diff --git a/source/ResultWidget/ResultWidget.h b/source/ResultWidget/ResultWidget.h new file mode 100644 index 0000000..c88af42 --- /dev/null +++ b/source/ResultWidget/ResultWidget.h @@ -0,0 +1,19 @@ +#pragma once + +#include + +namespace Ui { +class ResultWidget; +}; + +class ResultWidget : public QWidget +{ + Q_OBJECT + +private: + Ui::ResultWidget *ui; + +public: + ResultWidget(QWidget *parent = nullptr); + ~ResultWidget(); +}; diff --git a/source/ResultWidget/ResultWidget.ui b/source/ResultWidget/ResultWidget.ui new file mode 100644 index 0000000..7402888 --- /dev/null +++ b/source/ResultWidget/ResultWidget.ui @@ -0,0 +1,20 @@ + + + ResultWidget + + + + 0 + 0 + 556 + 210 + + + + Form + + + + + + diff --git a/source/mainwindow.ui b/source/mainwindow.ui index 81ef8de..0ad92fc 100644 --- a/source/mainwindow.ui +++ b/source/mainwindow.ui @@ -62,6 +62,9 @@ + + + @@ -70,7 +73,7 @@ 0 0 905 - 19 + 17 @@ -185,6 +188,12 @@
PluralWidget.h
1 + + ResultWidget + QWidget +
ResultWidget.h
+ 1 +