diff --git a/src/Example/CMakeLists.txt b/src/Example/CMakeLists.txt index 23eeedf..add1b44 100644 --- a/src/Example/CMakeLists.txt +++ b/src/Example/CMakeLists.txt @@ -29,7 +29,7 @@ else() endif() -target_link_libraries(${CURRENT_PROJECT} PUBLIC ${PROJECT_NAME}) +target_link_libraries(${CURRENT_PROJECT} PUBLIC ${PROJECT_NAME}GUI) target_include_directories(${CURRENT_PROJECT} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) if(QT_VERSION_MAJOR EQUAL 6) diff --git a/src/Example/main.cpp b/src/Example/main.cpp index 148d05d..5f5e6a8 100644 --- a/src/Example/main.cpp +++ b/src/Example/main.cpp @@ -8,7 +8,7 @@ #include <QGuiApplication> #include <QQmlApplicationEngine> #include <QQmlContext> -#include <doctorpill.h> +#include <doctorpillgui.h> #include <thread> class EmptyPill: public DP::iPill { diff --git a/src/GUI/DoctorPillModule/DoctorView.qml b/src/GUI/DoctorPillModule/DoctorView.qml index 5a3a8a8..b4aa81d 100644 --- a/src/GUI/DoctorPillModule/DoctorView.qml +++ b/src/GUI/DoctorPillModule/DoctorView.qml @@ -149,7 +149,7 @@ Page { rightMargin: 10 topMargin: 10 bottomMargin: 10 - + clip: true delegate: Component { RowLayout { diff --git a/src/GUI/languages/ru.ts b/src/GUI/languages/ru.ts index 47636a6..f76a3d7 100644 --- a/src/GUI/languages/ru.ts +++ b/src/GUI/languages/ru.ts @@ -25,7 +25,7 @@ </message> <message> <source>Enter: </source> - <translation>Ввод: </translation> + <translation>Введите: </translation> </message> <message> <source>Drop</source>