arcanis/awesome-widgets
1
0
Fork 0
mirror of https://github.com/arcan1s/awesome-widgets.git synced 2025-04-24 15:37:23 +00:00
Code Issues Projects Releases Wiki Activity

refactor: use default qml library paths

Browse Source 
previous implementation stores data in share instead of lib (I guess, I
had issues with using default paths?). Let's use normal paths instead
This commit is contained in:
Evgenii Alekseev 2024-03-31 15:17:50 +03:00
parent a35b57e5d2
commit ac52888b0d
18 changed files with 51 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sources/awesome-widget/package/contents/ui/about.qml
View File

@ -18,7 +18,8 @@
import QtQuick 2.15 import QtQuick 2.15
import org.kde.kcmutils as KCM import org.kde.kcmutils as KCM
import org.kde.plasma.private.awesomewidget 1.0 import org.kde.plasma.awesomewidgets
import org.kde.plasma.private.awesomewidget
KCM.SimpleKCM { KCM.SimpleKCM {

3
sources/awesome-widget/package/contents/ui/advanced.qml
View File

@ -19,7 +19,8 @@ import QtQuick 2.15
import QtQuick.Controls import QtQuick.Controls
import org.kde.kcmutils as KCM import org.kde.kcmutils as KCM
import org.kde.plasma.private.awesomewidget 1.0 import org.kde.plasma.awesomewidgets
import org.kde.plasma.private.awesomewidget
KCM.SimpleKCM { KCM.SimpleKCM {

4
sources/awesome-widget/package/contents/ui/appearance.qml
View File

@ -18,8 +18,8 @@
import QtQuick 2.15 import QtQuick 2.15
import org.kde.kcmutils as KCM import org.kde.kcmutils as KCM
import org.kde.plasma.private.awesomewidget 1.0 import org.kde.plasma.awesomewidgets
import "." import org.kde.plasma.private.awesomewidget
KCM.SimpleKCM { KCM.SimpleKCM {

3
sources/awesome-widget/package/contents/ui/dataengine.qml
View File

@ -19,7 +19,8 @@ import QtQuick 2.15
import QtQuick.Controls import QtQuick.Controls
import org.kde.kcmutils as KCM import org.kde.kcmutils as KCM
import org.kde.plasma.private.awesomewidget 1.0 import org.kde.plasma.awesomewidgets
import org.kde.plasma.private.awesomewidget
KCM.SimpleKCM { KCM.SimpleKCM {

4
sources/awesome-widget/package/contents/ui/main.qml
View File

@ -22,8 +22,8 @@ import QtQuick.Layouts
import org.kde.plasma.core as PlasmaCore import org.kde.plasma.core as PlasmaCore
import org.kde.plasma.plasmoid 2.0 import org.kde.plasma.plasmoid 2.0
import org.kde.plasma.private.awesomewidget 1.0 import org.kde.plasma.awesomewidgets
import "." import org.kde.plasma.private.awesomewidget
PlasmoidItem { PlasmoidItem {

27
sources/awesome-widget/package/contents/ui/qmldir
View File

@ -1,27 +0,0 @@
# Do not edit qmldir directly it will be overrided during compilation,
# edit qml/qmldir.in file instead.
# common QML constants
singleton General 1.0 file:///usr/share/awesomewidgets/qml/General.qml
# custom QML UI classes
AboutTab file:///usr/share/awesomewidgets/qml/AboutTab.qml
AWExtensions file:///usr/share/awesomewidgets/qml/AWExtensions.qml
AWInfoLabel file:///usr/share/awesomewidgets/qml/AWInfoLabel.qml
AWTagSelector file:///usr/share/awesomewidgets/qml/AWTagSelector.qml
AWTextEditor file:///usr/share/awesomewidgets/qml/AWTextEditor.qml
BugReport file:///usr/share/awesomewidgets/qml/BugReport.qml
ButtonSelector file:///usr/share/awesomewidgets/qml/ButtonSelector.qml
CheckBoxSelector file:///usr/share/awesomewidgets/qml/CheckBoxSelector.qml
ColorSelector file:///usr/share/awesomewidgets/qml/ColorSelector.qml
ComboBoxSelector file:///usr/share/awesomewidgets/qml/ComboBoxSelector.qml
ExportDialog file:///usr/share/awesomewidgets/qml/ExportDialog.qml
FontSelector file:///usr/share/awesomewidgets/qml/FontSelector.qml
HtmlDefaultFunctionsBar file:///usr/share/awesomewidgets/qml/HtmlDefaultFunctionsBar.qml
HtmlEditorButton file:///usr/share/awesomewidgets/qml/HtmlEditorButton.qml
HtmlEditorColor file:///usr/share/awesomewidgets/qml/HtmlEditorColor.qml
HtmlEditorFont file:///usr/share/awesomewidgets/qml/HtmlEditorFont.qml
ImportDialog file:///usr/share/awesomewidgets/qml/ImportDialog.qml
IntegerSelector file:///usr/share/awesomewidgets/qml/IntegerSelector.qml
LineSelector file:///usr/share/awesomewidgets/qml/LineSelector.qml

3
sources/awesome-widget/package/contents/ui/tooltip.qml
View File

@ -19,7 +19,8 @@ import QtQuick 2.15
import QtQuick.Controls import QtQuick.Controls
import org.kde.kcmutils as KCM import org.kde.kcmutils as KCM
import org.kde.plasma.private.awesomewidget 1.0 import org.kde.plasma.awesomewidgets
import org.kde.plasma.private.awesomewidget
KCM.SimpleKCM { KCM.SimpleKCM {

4
sources/awesome-widget/package/contents/ui/widget.qml
View File

@ -19,8 +19,8 @@ import QtQuick 2.15
import QtQuick.Controls import QtQuick.Controls
import org.kde.kcmutils as KCM import org.kde.kcmutils as KCM
import org.kde.plasma.private.awesomewidget 1.0 import org.kde.plasma.awesomewidgets
import "." import org.kde.plasma.private.awesomewidget
KCM.SimpleKCM { KCM.SimpleKCM {

3
sources/desktop-panel/package/contents/ui/about.qml
View File

@ -18,7 +18,8 @@
import QtQuick 2.15 import QtQuick 2.15
import org.kde.kcmutils as KCM import org.kde.kcmutils as KCM
import org.kde.plasma.private.desktoppanel 1.0 import org.kde.plasma.awesomewidgets
import org.kde.plasma.private.desktoppanel
KCM.SimpleKCM { KCM.SimpleKCM {

4
sources/desktop-panel/package/contents/ui/activeapp.qml
View File

@ -18,8 +18,8 @@
import QtQuick 2.15 import QtQuick 2.15
import org.kde.kcmutils as KCM import org.kde.kcmutils as KCM
import org.kde.plasma.private.desktoppanel 1.0 import org.kde.plasma.awesomewidgets
import "." import org.kde.plasma.private.desktoppanel
KCM.SimpleKCM { KCM.SimpleKCM {

3
sources/desktop-panel/package/contents/ui/advanced.qml
View File

@ -19,7 +19,8 @@ import QtQuick 2.15
import QtQuick.Controls import QtQuick.Controls
import org.kde.kcmutils as KCM import org.kde.kcmutils as KCM
import org.kde.plasma.private.desktoppanel 1.0 import org.kde.plasma.awesomewidgets
import org.kde.plasma.private.desktoppanel
KCM.SimpleKCM { KCM.SimpleKCM {

4
sources/desktop-panel/package/contents/ui/inactiveapp.qml
View File

@ -18,8 +18,8 @@
import QtQuick 2.15 import QtQuick 2.15
import org.kde.kcmutils as KCM import org.kde.kcmutils as KCM
import org.kde.plasma.private.desktoppanel 1.0 import org.kde.plasma.awesomewidgets
import "." import org.kde.plasma.private.desktoppanel
KCM.SimpleKCM { KCM.SimpleKCM {

4
sources/desktop-panel/package/contents/ui/main.qml
View File

@ -21,8 +21,8 @@ import QtQuick.Layouts
import org.kde.plasma.core as PlasmaCore import org.kde.plasma.core as PlasmaCore
import org.kde.plasma.plasmoid 2.0 import org.kde.plasma.plasmoid 2.0
import org.kde.plasma.private.desktoppanel 1.0 import org.kde.plasma.awesomewidgets
import "." import org.kde.plasma.private.desktoppanel
PlasmoidItem { PlasmoidItem {

27
sources/desktop-panel/package/contents/ui/qmldir
View File

@ -1,27 +0,0 @@
# Do not edit qmldir directly it will be overrided during compilation,
# edit qml/qmldir.in file instead.
# common QML constants
singleton General 1.0 file:///usr/share/awesomewidgets/qml/General.qml
# custom QML UI classes
AboutTab file:///usr/share/awesomewidgets/qml/AboutTab.qml
AWExtensions file:///usr/share/awesomewidgets/qml/AWExtensions.qml
AWInfoLabel file:///usr/share/awesomewidgets/qml/AWInfoLabel.qml
AWTagSelector file:///usr/share/awesomewidgets/qml/AWTagSelector.qml
AWTextEditor file:///usr/share/awesomewidgets/qml/AWTextEditor.qml
BugReport file:///usr/share/awesomewidgets/qml/BugReport.qml
ButtonSelector file:///usr/share/awesomewidgets/qml/ButtonSelector.qml
CheckBoxSelector file:///usr/share/awesomewidgets/qml/CheckBoxSelector.qml
ColorSelector file:///usr/share/awesomewidgets/qml/ColorSelector.qml
ComboBoxSelector file:///usr/share/awesomewidgets/qml/ComboBoxSelector.qml
ExportDialog file:///usr/share/awesomewidgets/qml/ExportDialog.qml
FontSelector file:///usr/share/awesomewidgets/qml/FontSelector.qml
HtmlDefaultFunctionsBar file:///usr/share/awesomewidgets/qml/HtmlDefaultFunctionsBar.qml
HtmlEditorButton file:///usr/share/awesomewidgets/qml/HtmlEditorButton.qml
HtmlEditorColor file:///usr/share/awesomewidgets/qml/HtmlEditorColor.qml
HtmlEditorFont file:///usr/share/awesomewidgets/qml/HtmlEditorFont.qml
ImportDialog file:///usr/share/awesomewidgets/qml/ImportDialog.qml
IntegerSelector file:///usr/share/awesomewidgets/qml/IntegerSelector.qml
LineSelector file:///usr/share/awesomewidgets/qml/LineSelector.qml

4
sources/desktop-panel/package/contents/ui/widget.qml
View File

@ -18,8 +18,8 @@
import QtQuick 2.15 import QtQuick 2.15
import org.kde.kcmutils as KCM import org.kde.kcmutils as KCM
import org.kde.plasma.private.desktoppanel 1.0 import org.kde.plasma.awesomewidgets
import "." import org.kde.plasma.private.desktoppanel
KCM.SimpleKCM { KCM.SimpleKCM {

9
sources/qml/CMakeLists.txt
View File

@ -1,12 +1,7 @@
set(SUBPROJECT awesomewidgets-qml) set(SUBPROJECT awesomewidgets-qml)
message(STATUS "Subproject ${SUBPROJECT}") message(STATUS "Subproject ${SUBPROJECT}")
file(GLOB SUBPROJECT_SOURCE *.qml) file(GLOB SUBPROJECT_SOURCE *.qml qmldir)
file(GLOB SUBPROJECT_QMLDIR_IN qmldir.in)
# prepare
configure_file(${SUBPROJECT_QMLDIR_IN} ${CMAKE_CURRENT_SOURCE_DIR}/../awesome-widget/package/contents/ui/qmldir)
configure_file(${SUBPROJECT_QMLDIR_IN} ${CMAKE_CURRENT_SOURCE_DIR}/../desktop-panel/package/contents/ui/qmldir)
# install # install
install(FILES ${SUBPROJECT_SOURCE} DESTINATION ${KDE_INSTALL_FULL_DATADIR}/${PROJECT_NAME}/qml) install(FILES ${SUBPROJECT_SOURCE} DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/${PROJECT_NAME})

23
sources/qml/qmldir Normal file
View File

@ -0,0 +1,23 @@
# common QML constants
singleton General 1.0 General.qml
# custom QML UI classes
AboutTab AboutTab.qml
AWExtensions AWExtensions.qml
AWInfoLabel AWInfoLabel.qml
AWTagSelector AWTagSelector.qml
AWTextEditor AWTextEditor.qml
BugReport BugReport.qml
ButtonSelector ButtonSelector.qml
CheckBoxSelector CheckBoxSelector.qml
ColorSelector ColorSelector.qml
ComboBoxSelector ComboBoxSelector.qml
ExportDialog ExportDialog.qml
FontSelector FontSelector.qml
HtmlDefaultFunctionsBar HtmlDefaultFunctionsBar.qml
HtmlEditorButton HtmlEditorButton.qml
HtmlEditorColor HtmlEditorColor.qml
HtmlEditorFont HtmlEditorFont.qml
ImportDialog ImportDialog.qml
IntegerSelector IntegerSelector.qml
LineSelector LineSelector.qml

27
sources/qml/qmldir.in
View File

@ -1,27 +0,0 @@
# Do not edit qmldir directly it will be overrided during compilation,
# edit qml/qmldir.in file instead.
# common QML constants
singleton General 1.0 file://@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/qml/General.qml
# custom QML UI classes
AboutTab file://@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/qml/AboutTab.qml
AWExtensions file://@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/qml/AWExtensions.qml
AWInfoLabel file://@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/qml/AWInfoLabel.qml
AWTagSelector file://@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/qml/AWTagSelector.qml
AWTextEditor file://@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/qml/AWTextEditor.qml
BugReport file://@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/qml/BugReport.qml
ButtonSelector file://@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/qml/ButtonSelector.qml
CheckBoxSelector file://@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/qml/CheckBoxSelector.qml
ColorSelector file://@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/qml/ColorSelector.qml
ComboBoxSelector file://@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/qml/ComboBoxSelector.qml
ExportDialog file://@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/qml/ExportDialog.qml
FontSelector file://@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/qml/FontSelector.qml
HtmlDefaultFunctionsBar file://@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/qml/HtmlDefaultFunctionsBar.qml
HtmlEditorButton file://@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/qml/HtmlEditorButton.qml
HtmlEditorColor file://@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/qml/HtmlEditorColor.qml
HtmlEditorFont file://@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/qml/HtmlEditorFont.qml
ImportDialog file://@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/qml/ImportDialog.qml
IntegerSelector file://@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/qml/IntegerSelector.qml
LineSelector file://@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/qml/LineSelector.qml