Commit 69261c13 authored by Andreas Cord-Landwehr's avatar Andreas Cord-Landwehr
Browse files

Port QML files to be provided by Qt Resources.

REVIEW: 126317
parent fb565e66
......@@ -121,6 +121,7 @@ qt5_wrap_ui (artikulate_SRCS
ui/sounddevicedialogpage.ui
ui/appearencedialogpage.ui
)
qt5_add_resources(artikulate_SRCS qml/qml.qrc)
kconfig_add_kcfg_files (artikulate_SRCS settings.kcfgc)
set(artikulate_editor_SRCS
......@@ -156,6 +157,7 @@ qt5_wrap_ui (artikulate_editor_SRCS
ui/appearencedialogpage.ui
ui/exportghnsdialog.ui
)
qt5_add_resources(artikulate_editor_SRCS qml/qml.qrc)
kconfig_add_kcfg_files (artikulate_editor_SRCS settings.kcfgc)
# executables
......
......@@ -91,7 +91,7 @@ MainWindow::MainWindow()
rootContext()->setContextProperty("kcfg_ShowMenuBar", Settings::showMenuBar());
// set starting screen
load(QUrl::fromLocalFile(QStandardPaths::locate(QStandardPaths::DataLocation, "qml/Main.qml")));
load(QUrl("qrc:/artikulate/qml/Main.qml"));
// settings from kcfg values
// updateTrainingPhraseFont(); //FIXME deactivated while porting
......
......@@ -92,7 +92,7 @@ MainWindowEditor::MainWindowEditor()
m_widget->rootContext()->setContextProperty("editorSession", m_editorSession);
// set starting screen
m_widget->setSource(QUrl::fromLocalFile(QStandardPaths::locate(QStandardPaths::GenericDataLocation, "artikulate/qml/Editor.qml")));
m_widget->setSource(QUrl("qrc:/artikulate/qml/Editor.qml"));
m_widget->setResizeMode(QQuickWidget::SizeRootObjectToView);
QAction *newAct = KStandardAction::save(this, SLOT(save()), actionCollection());
......
###
# Copyright 2013-2015 Andreas Cord-Landwehr <cordlandwehr@kde.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
###
set(artikulate_qml_files
Main.qml
TrainerSessionScreen.qml
TrainerProgressBar.qml
TrainerCourseStatistics.qml
Editor.qml
CourseSwitcher.qml
LanguageSwitcher.qml
FlatButton.qml
MainMenuBar.qml
MainToolBar.qml
NewUserWelcome.qml
PhraseEditor.qml
PhraseEditorSoundComponent.qml
PhraseEditorTypeComponent.qml
PhraseEditorEditStateComponent.qml
PhonemeUnitSelector.qml
ProfileDetailsItem.qml
ProfileDetailsViewUser.qml
ProfileDetailsViewFavorites.qml
ProfileSelector.qml
SoundPlayer.qml
SoundRecorder.qml
UnitEditor.qml
CheckListItem.qml
ListItem.qml
SheetDialog.qml
)
install(FILES ${artikulate_qml_files} DESTINATION ${DATA_INSTALL_DIR}/artikulate/qml)
<RCC>
<qresource prefix="/artikulate/qml">
<file>Main.qml</file>
<file>CheckListItem.qml</file>
<file>CourseSwitcher.qml</file>
<file>Editor.qml</file>
<file>FlatButton.qml</file>
<file>LanguageSwitcher.qml</file>
<file>ListItem.qml</file>
<file>MainMenuBar.qml</file>
<file>MainToolBar.qml</file>
<file>NewUserWelcome.qml</file>
<file>PhonemeUnitSelector.qml</file>
<file>PhraseEditor.qml</file>
<file>PhraseEditorEditStateComponent.qml</file>
<file>PhraseEditorSoundComponent.qml</file>
<file>PhraseEditorTypeComponent.qml</file>
<file>ProfileDetailsItem.qml</file>
<file>ProfileDetailsViewFavorites.qml</file>
<file>ProfileDetailsViewUser.qml</file>
<file>ProfileSelector.qml</file>
<file>SheetDialog.qml</file>
<file>SoundPlayer.qml</file>
<file>SoundRecorder.qml</file>
<file>TrainerCourseStatistics.qml</file>
<file>TrainerProgressBar.qml</file>
<file>TrainerSessionScreen.qml</file>
<file>UnitEditor.qml</file>
</qresource>
</RCC>
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