Commit d41f3f91 authored by Sebastian Gottfried's avatar Sebastian Gottfried

Reorganize QML Files

Now they stored in topical subfolders.
parent a9b53f98
...@@ -10,7 +10,6 @@ add_feature_info("X11-Xkbfile" X11_Xkbfile_FOUND "required for automatic keyboar ...@@ -10,7 +10,6 @@ add_feature_info("X11-Xkbfile" X11_Xkbfile_FOUND "required for automatic keyboar
find_package(XCB OPTIONAL_COMPONENTS XCB XKB) find_package(XCB OPTIONAL_COMPONENTS XCB XKB)
add_feature_info("XCB-XKB" XCB_XKB_FOUND "required for automatic keyboard layout detection") add_feature_info("XCB-XKB" XCB_XKB_FOUND "required for automatic keyboard layout detection")
ecm_optional_add_subdirectory(qml)
ecm_optional_add_subdirectory(schemata) ecm_optional_add_subdirectory(schemata)
# set include directories # set include directories
...@@ -149,3 +148,5 @@ target_link_libraries(ktouch ...@@ -149,3 +148,5 @@ target_link_libraries(ktouch
install(TARGETS ktouch ${INSTALL_TARGETS_DEFAULT_ARGS}) install(TARGETS ktouch ${INSTALL_TARGETS_DEFAULT_ARGS})
install(FILES ktouch.kcfg DESTINATION ${KCFG_INSTALL_DIR}) install(FILES ktouch.kcfg DESTINATION ${KCFG_INSTALL_DIR})
install(DIRECTORY qml/ DESTINATION ${DATA_INSTALL_DIR}/ktouch/qml FILES_MATCHING PATTERN "*.qml")
...@@ -52,7 +52,7 @@ KeyboardLayoutEditor::KeyboardLayoutEditor(QWidget* parent): ...@@ -52,7 +52,7 @@ KeyboardLayoutEditor::KeyboardLayoutEditor(QWidget* parent):
Application::setupDeclarativeBindings(m_view->engine()); Application::setupDeclarativeBindings(m_view->engine());
m_view->rootContext()->setContextProperty("keyboardLayoutEditor", this); m_view->rootContext()->setContextProperty("keyboardLayoutEditor", this);
m_view->setSource(QUrl::fromLocalFile(QStandardPaths::locate(QStandardPaths::DataLocation, "qml/KeyboardLayoutEditor.qml"))); m_view->setSource(QUrl::fromLocalFile(QStandardPaths::locate(QStandardPaths::DataLocation, "qml/keyboard/KeyboardLayoutEditor.qml")));
connect(m_newKeyToolButton, SIGNAL(clicked()), SLOT(createNewKey())); connect(m_newKeyToolButton, SIGNAL(clicked()), SLOT(createNewKey()));
connect(m_newSpecialKeyToolButton, SIGNAL(clicked()), SLOT(createNewSpecialKey())); connect(m_newSpecialKeyToolButton, SIGNAL(clicked()), SLOT(createNewSpecialKey()));
......
set(ktouch_qml_files
main.qml
HomeScreen.qml
CourseSelector.qml
CoursePage.qml
CourseDescriptionItem.qml
ProfileSelector.qml
ProfileForm.qml
ProfileDetailsItem.qml
LessonSelectorBase.qml
LessonSelector.qml
CustomLessonSelector.qml
LessonPreview.qml
LessonLockedNotice.qml
InitialProfileForm.qml
TrainingScreen.qml
TrainingScreenToolbar.qml
TrainingScreenMenuOverlay.qml
TrainingWidget.qml
StatBox.qml
ElapsedTimeMeter.qml
CharactersPerMinuteMeter.qml
AccuracyMeter.qml
Meter.qml
Keyboard.qml
KeyItem.qml
KeyLabel.qml
KeyboardUnavailableNotice.qml
ScoreScreen.qml
LearningProgressChart.qml
DetailedRadioButton.qml
InformationTable.qml
InfoItem.qml
InlineToolbar.qml
MessageBox.qml
ListItem.qml
SheetDialog.qml
Balloon.qml
KeyboardLayoutEditor.qml
SelectionRectangle.qml
SelectionGrip.qml
)
install(FILES ${ktouch_qml_files} DESTINATION ${DATA_INSTALL_DIR}/ktouch/qml)
...@@ -21,6 +21,8 @@ import QtQuick.Controls 1.3 ...@@ -21,6 +21,8 @@ import QtQuick.Controls 1.3
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import ktouch 1.0 import ktouch 1.0
import "../common"
Item { Item {
id: root id: root
property Profile profile property Profile profile
......
...@@ -21,6 +21,8 @@ import QtQuick.Controls 1.3 ...@@ -21,6 +21,8 @@ import QtQuick.Controls 1.3
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import ktouch 1.0 import ktouch 1.0
import "../common"
FocusScope { FocusScope {
id: screen id: screen
......
...@@ -21,6 +21,8 @@ import QtQuick.Controls 1.3 ...@@ -21,6 +21,8 @@ import QtQuick.Controls 1.3
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import ktouch 1.0 import ktouch 1.0
import "../common"
Item { Item {
id: item id: item
property Profile profile property Profile profile
......
...@@ -23,6 +23,8 @@ import org.kde.kcoreaddons 1.0 ...@@ -23,6 +23,8 @@ import org.kde.kcoreaddons 1.0
import org.kde.charts 0.1 as Charts import org.kde.charts 0.1 as Charts
import ktouch 1.0 import ktouch 1.0
import "../common"
Item { Item {
id: root id: root
......
...@@ -21,6 +21,8 @@ import QtQuick.Controls 1.3 ...@@ -21,6 +21,8 @@ import QtQuick.Controls 1.3
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import ktouch 1.0 import ktouch 1.0
import "../common"
Column { Column {
id: root id: root
......
...@@ -21,6 +21,8 @@ import QtQuick.Controls 1.3 ...@@ -21,6 +21,8 @@ import QtQuick.Controls 1.3
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import ktouch 1.0 import ktouch 1.0
import "../common"
FocusScope { FocusScope {
id: root id: root
......
...@@ -18,6 +18,8 @@ ...@@ -18,6 +18,8 @@
import QtQuick 2.4 import QtQuick 2.4
import ktouch 1.0 import ktouch 1.0
import "../common"
Item { Item {
id: root id: root
......
...@@ -19,6 +19,12 @@ ...@@ -19,6 +19,12 @@
import QtQuick 2.4 import QtQuick 2.4
import ktouch 1.0 import ktouch 1.0
import "./common"
import "./meters"
import "./homescreen"
import "./trainingscreen"
import "./scorescreen"
Rectangle { Rectangle {
SystemPalette { SystemPalette {
id: activePallete id: activePallete
......
...@@ -23,6 +23,9 @@ import ktouch 1.0 ...@@ -23,6 +23,9 @@ import ktouch 1.0
import org.kde.kquickcontrolsaddons 2.0 import org.kde.kquickcontrolsaddons 2.0
import org.kde.charts 0.1 as Charts import org.kde.charts 0.1 as Charts
import "../common"
import "../meters"
FocusScope { FocusScope {
id: screen id: screen
......
...@@ -21,6 +21,9 @@ import QtQuick.Controls 1.3 ...@@ -21,6 +21,9 @@ import QtQuick.Controls 1.3
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import ktouch 1.0 import ktouch 1.0
import "../keyboard"
import "../meters"
FocusScope { FocusScope {
id: screen id: screen
......
...@@ -21,6 +21,8 @@ import QtQuick.Controls 1.3 ...@@ -21,6 +21,8 @@ import QtQuick.Controls 1.3
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import ktouch 1.0 import ktouch 1.0
import "../common"
Item { Item {
id: item id: item
......
...@@ -19,6 +19,8 @@ import QtQuick 2.4 ...@@ -19,6 +19,8 @@ import QtQuick 2.4
import QtQuick.Controls 1.3 import QtQuick.Controls 1.3
import ktouch 1.0 import ktouch 1.0
import "../keyboard"
FocusScope { FocusScope {
id: trainingWidget id: trainingWidget
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment