diff --git a/sources/awesome-widget/package/contents/ui/appearance.qml b/sources/awesome-widget/package/contents/ui/appearance.qml index 620ec9b..f4c9b2e 100644 --- a/sources/awesome-widget/package/contents/ui/appearance.qml +++ b/sources/awesome-widget/package/contents/ui/appearance.qml @@ -72,7 +72,7 @@ Item { ComboBoxSelector { id: fontWeight - model: general.fontWeightModel + model: General.fontWeightModel text: i18n("Font weight") value: plasmoid.configuration.fontWeight onValueEdited: cfg_fontWeight = newValue @@ -80,7 +80,7 @@ Item { ComboBoxSelector { id: fontStyle - model: general.fontStyleModel + model: General.fontStyleModel text: i18n("Font style") value: plasmoid.configuration.fontStyle onValueEdited: cfg_fontStyle = newValue @@ -94,7 +94,7 @@ Item { ComboBoxSelector { id: textStyle - model: general.textStyleModel + model: General.textStyleModel text: i18n("Style") value: plasmoid.configuration.textStyle onValueEdited: cfg_textStyle = newValue diff --git a/sources/awesome-widget/package/contents/ui/main.qml b/sources/awesome-widget/package/contents/ui/main.qml index ca0ab71..83422c2 100644 --- a/sources/awesome-widget/package/contents/ui/main.qml +++ b/sources/awesome-widget/package/contents/ui/main.qml @@ -95,16 +95,16 @@ Item { textFormat: Text.RichText wrapMode: plasmoid.configuration.wrapText ? Text.WordWrap : Text.NoWrap - horizontalAlignment: general.align[plasmoid.configuration.textAlign] + horizontalAlignment: General.align[plasmoid.configuration.textAlign] verticalAlignment: Text.AlignVCenter color: plasmoid.configuration.fontColor font.family: plasmoid.configuration.fontFamily font.italic: plasmoid.configuration.fontStyle == "italic" ? true : false font.pointSize: plasmoid.configuration.fontSize - font.weight: general.fontWeight[plasmoid.configuration.fontWeight] + font.weight: General.fontWeight[plasmoid.configuration.fontWeight] - style: general.textStyle[plasmoid.configuration.textStyle] + style: General.textStyle[plasmoid.configuration.textStyle] styleColor: plasmoid.configuration.textStyleColor PlasmaCore.ToolTipArea { diff --git a/sources/awesome-widget/package/contents/ui/qmldir b/sources/awesome-widget/package/contents/ui/qmldir index e64b8f0..2f19ff4 100644 --- a/sources/awesome-widget/package/contents/ui/qmldir +++ b/sources/awesome-widget/package/contents/ui/qmldir @@ -3,7 +3,7 @@ # common QML constants -singleton general 1.0 file:///usr/share/awesomewidgets/qml/general.qml +singleton General 1.0 file:///usr/share/awesomewidgets/qml/General.qml # custom QML UI classes AboutTab file:///usr/share/awesomewidgets/qml/AboutTab.qml diff --git a/sources/awesome-widget/package/contents/ui/widget.qml b/sources/awesome-widget/package/contents/ui/widget.qml index ad5b083..d46a827 100644 --- a/sources/awesome-widget/package/contents/ui/widget.qml +++ b/sources/awesome-widget/package/contents/ui/widget.qml @@ -58,7 +58,7 @@ Item { backend: awKeys notifyBackend: awActions textArea: textPattern - groups: general.awTagRegexp + groups: General.awTagRegexp } AWExtensions { diff --git a/sources/desktop-panel/package/contents/ui/activeapp.qml b/sources/desktop-panel/package/contents/ui/activeapp.qml index da070a8..0c51790 100644 --- a/sources/desktop-panel/package/contents/ui/activeapp.qml +++ b/sources/desktop-panel/package/contents/ui/activeapp.qml @@ -39,8 +39,8 @@ Item { property alias cfg_currentFontSize: fontSize.value property string cfg_currentFontWeight: fontWeight.value property string cfg_currentFontStyle: fontStyle.value - property alias cfg_currentFontColor: selectColor.text - property alias cfg_currentTextStyleColor: selectStyleColor.text + property alias cfg_currentFontColor: selectColor.value + property alias cfg_currentTextStyleColor: selectStyleColor.value property string cfg_currentTextStyle: textStyle.value @@ -65,7 +65,7 @@ Item { ComboBoxSelector { id: fontWeight - model: general.fontWeightModel + model: General.fontWeightModel text: i18n("Font weight") value: plasmoid.configuration.currentFontWeight onValueEdited: cfg_currentFontWeight = newValue @@ -73,7 +73,7 @@ Item { ComboBoxSelector { id: fontStyle - model: general.fontStyleModel + model: General.fontStyleModel text: i18n("Font style") value: plasmoid.configuration.currentFontStyle onValueEdited: cfg_currentFontStyle = newValue @@ -87,7 +87,7 @@ Item { ComboBoxSelector { id: textStyle - model: general.textStyleModel + model: General.textStyleModel text: i18n("Style") value: plasmoid.configuration.currentTextStyle onValueEdited: cfg_currentTextStyle = newValue diff --git a/sources/desktop-panel/package/contents/ui/inactiveapp.qml b/sources/desktop-panel/package/contents/ui/inactiveapp.qml index 7174d9a..6e04fed 100644 --- a/sources/desktop-panel/package/contents/ui/inactiveapp.qml +++ b/sources/desktop-panel/package/contents/ui/inactiveapp.qml @@ -65,7 +65,7 @@ Item { ComboBoxSelector { id: fontWeight - model: general.fontWeightModel + model: General.fontWeightModel text: i18n("Font weight") value: plasmoid.configuration.fontWeight onValueEdited: cfg_fontWeight = newValue @@ -73,7 +73,7 @@ Item { ComboBoxSelector { id: fontStyle - model: general.fontStyleModel + model: General.fontStyleModel text: i18n("Font style") value: plasmoid.configuration.fontStyle onValueEdited: cfg_fontStyle = newValue @@ -87,7 +87,7 @@ Item { ComboBoxSelector { id: textStyle - model: general.textStyleModel + model: General.textStyleModel text: i18n("Style") value: plasmoid.configuration.textStyle onValueEdited: cfg_textStyle = newValue diff --git a/sources/desktop-panel/package/contents/ui/main.qml b/sources/desktop-panel/package/contents/ui/main.qml index 8847dfe..fcdf154 100644 --- a/sources/desktop-panel/package/contents/ui/main.qml +++ b/sources/desktop-panel/package/contents/ui/main.qml @@ -123,16 +123,16 @@ Item { repeater.itemAt(i).font.family = plasmoid.configuration.currentFontFamily repeater.itemAt(i).font.italic = plasmoid.configuration.currentFontStyle == "italic" ? true : false repeater.itemAt(i).font.pointSize = plasmoid.configuration.currentFontSize - repeater.itemAt(i).font.weight = general.fontWeight[plasmoid.configuration.currentFontWeight] - repeater.itemAt(i).style = general.textStyle[plasmoid.configuration.currentTextStyle] + repeater.itemAt(i).font.weight = General.fontWeight[plasmoid.configuration.currentFontWeight] + repeater.itemAt(i).style = General.textStyle[plasmoid.configuration.currentTextStyle] repeater.itemAt(i).styleColor = plasmoid.configuration.currentTextStyleColor } else { repeater.itemAt(i).color = plasmoid.configuration.fontColor repeater.itemAt(i).font.family = plasmoid.configuration.fontFamily repeater.itemAt(i).font.italic = plasmoid.configuration.fontStyle == "italic" ? true : false repeater.itemAt(i).font.pointSize = plasmoid.configuration.fontSize - repeater.itemAt(i).font.weight = general.fontWeight[plasmoid.configuration.fontWeight] - repeater.itemAt(i).style = general.textStyle[plasmoid.configuration.textStyle] + repeater.itemAt(i).font.weight = General.fontWeight[plasmoid.configuration.fontWeight] + repeater.itemAt(i).style = General.textStyle[plasmoid.configuration.textStyle] repeater.itemAt(i).styleColor = plasmoid.configuration.textStyleColor } repeater.itemAt(i).update() diff --git a/sources/desktop-panel/package/contents/ui/qmldir b/sources/desktop-panel/package/contents/ui/qmldir index e64b8f0..2f19ff4 100644 --- a/sources/desktop-panel/package/contents/ui/qmldir +++ b/sources/desktop-panel/package/contents/ui/qmldir @@ -3,7 +3,7 @@ # common QML constants -singleton general 1.0 file:///usr/share/awesomewidgets/qml/general.qml +singleton General 1.0 file:///usr/share/awesomewidgets/qml/General.qml # custom QML UI classes AboutTab file:///usr/share/awesomewidgets/qml/AboutTab.qml diff --git a/sources/desktop-panel/package/contents/ui/widget.qml b/sources/desktop-panel/package/contents/ui/widget.qml index 66ab15b..683419e 100644 --- a/sources/desktop-panel/package/contents/ui/widget.qml +++ b/sources/desktop-panel/package/contents/ui/widget.qml @@ -52,7 +52,7 @@ Item { backend: dpAdds notifyBackend: dpAdds textArea: textPattern - groups: general.dpTagRegexp + groups: General.dpTagRegexp } AWTextEditor { diff --git a/sources/qml/AWTextEditor.qml b/sources/qml/AWTextEditor.qml index 793b326..568391b 100644 --- a/sources/qml/AWTextEditor.qml +++ b/sources/qml/AWTextEditor.qml @@ -90,6 +90,14 @@ Item { function insert(text) { textArea.insert(textArea.cursorPosition, text) } + + function removeSelection() { + textArea.remove(textArea.selectionStart, textArea.selectionEnd) + } + + function selectedText() { + return textArea.selectedText + } } diff --git a/sources/qml/general.qml b/sources/qml/General.qml similarity index 100% rename from sources/qml/general.qml rename to sources/qml/General.qml diff --git a/sources/qml/HtmlEditorButton.qml b/sources/qml/HtmlEditorButton.qml index 588d73d..b5c17ed 100644 --- a/sources/qml/HtmlEditorButton.qml +++ b/sources/qml/HtmlEditorButton.qml @@ -31,10 +31,10 @@ QtControls.Button { function updateText() { // get selected text - var selected = textField.selectedText + var selected = textField.selectedText() // remove it from widget - textField.remove(textField.selectionStart, textField.selectionEnd) + textField.removeSelection() // insert edited text - textField.insert(textField.cursorPosition, start + selected + end) + textField.insert(start + selected + end) } } diff --git a/sources/qml/qmldir.in b/sources/qml/qmldir.in index ab26eb6..ea537a8 100644 --- a/sources/qml/qmldir.in +++ b/sources/qml/qmldir.in @@ -3,7 +3,7 @@ # common QML constants -singleton general 1.0 file://@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/qml/general.qml +singleton General 1.0 file://@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/qml/General.qml # custom QML UI classes AboutTab file://@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/qml/AboutTab.qml