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

remove fucking connector

Browse Source
This commit is contained in:
arcan1s 2015-01-31 07:20:22 +03:00
parent 4966a0a5bf
commit a61cff7caa
7 changed files with 72 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,6 +19,8 @@ import QtQuick 2.0
import QtQuick.Controls 1.3 as QtControls
import QtQuick.Layouts 1.0 as QtLayouts
import org.kde.plasma.private.awesomewidget 1.0
Item {
id: aboutPage
@ -27,8 +29,8 @@ Item {
implicitWidth: pageColumn.implicitWidth
implicitHeight: pageColumn.implicitHeight
Loader { id: connector; source: "connector.qml" }
property bool debug: connector.item.debug
property bool debug: AWKeys.isDebugEnabled()
Column {
id: pageColumn
@ -43,20 +45,20 @@ Item {
QtControls.Label {
QtLayouts.Layout.fillWidth: true
horizontalAlignment: Text.AlignHCenter
text: connector.item.getAboutText("header")
text: AWActions.getAboutText("header")
}
QtControls.Label {
QtLayouts.Layout.fillWidth: true
horizontalAlignment: Text.AlignJustify
text: connector.item.getAboutText("description")
text: AWActions.getAboutText("description")
}
QtControls.Label {
QtLayouts.Layout.fillWidth: true
horizontalAlignment: Text.AlignLeft
textFormat: Text.RichText
text: connector.item.getAboutText("links")
text: AWActions.getAboutText("links")
}
QtControls.Label {
@ -64,7 +66,7 @@ Item {
font.capitalization: Font.SmallCaps
horizontalAlignment: Text.AlignHCenter
textFormat: Text.RichText
text: connector.item.getAboutText("copy")
text: AWActions.getAboutText("copy")
}
}
}
@ -77,14 +79,14 @@ Item {
QtLayouts.Layout.fillWidth: true
wrapMode: Text.WordWrap
horizontalAlignment: Text.AlignJustify
text: connector.item.getAboutText("translators")
text: AWActions.getAboutText("translators")
}
QtControls.Label {
QtLayouts.Layout.fillWidth: true
horizontalAlignment: Text.AlignJustify
textFormat: Text.RichText
text: connector.item.getAboutText("3rdparty")
text: AWActions.getAboutText("3rdparty")
}
}
}

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

@ -20,6 +20,8 @@ import QtQuick.Controls 1.3 as QtControls
import QtQuick.Layouts 1.0 as QtLayouts
import QtQuick.Controls.Styles 1.3 as QtStyles
import org.kde.plasma.private.awesomewidget 1.0
Item {
id: advancedPage
@ -28,8 +30,7 @@ Item {
implicitWidth: pageColumn.implicitWidth
implicitHeight: pageColumn.implicitHeight
Loader { id: connector; source: "connector.qml" }
property bool debug: connector.item.debug
property bool debug: AWKeys.isDebugEnabled()
property alias cfg_background: background.checked
property alias cfg_customTime: customTime.text
@ -158,8 +159,8 @@ Item {
QtControls.Button {
width: parent.width * 3 / 5
text: i18n("Select devices")
onClicked: plasmoid.configuration.tempDevice = connector.item.selectDevices(
connector.item.getTempDevices(),
onClicked: plasmoid.configuration.tempDevice = AWActions.selectDevices(
AWActions.getTempDevices(),
plasmoid.configuration.tempDevice.split("@@")
)
}
@ -178,8 +179,8 @@ Item {
QtControls.Button {
width: parent.width * 3 / 5
text: i18n("Select devices")
onClicked: plasmoid.configuration.fanDevice = connector.item.selectDevice(
connector.item.getFanDevices(),
onClicked: plasmoid.configuration.fanDevice = AWActions.selectDevice(
AWActions.getFanDevices(),
plasmoid.configuration.fanDevice.split("@@")
)
}
@ -198,7 +199,8 @@ Item {
QtControls.Button {
width: parent.width * 3 / 5
text: i18n("Select devices")
onClicked: plasmoid.configuration.mount = connector.item.selectDevices(connector.item.getMountDevices(),
onClicked: plasmoid.configuration.mount = AWActions.selectDevices(
AWActions.getMountDevices(),
plasmoid.configuration.mount.split("@@")
)
}
@ -217,8 +219,8 @@ Item {
QtControls.Button {
width: parent.width * 3 / 5
text: i18n("Select devices")
onClicked: plasmoid.configuration.disk = connector.item.selectDevices(
connector.item.getDiskDevices(),
onClicked: plasmoid.configuration.disk = AWActions.selectDevices(
AWActions.getDiskDevices(),
plasmoid.configuration.disk.split("@@")
)
}
@ -237,8 +239,8 @@ Item {
QtControls.Button {
width: parent.width * 3 / 5
text: i18n("Select devices")
onClicked: plasmoid.configuration.hdd = connector.item.selectDevices(
connector.item.getHddDevices(),
onClicked: plasmoid.configuration.hdd = AWActions.selectDevices(
AWActions.getHddDevices(),
plasmoid.configuration.hdd.split("@@")
)
}
@ -257,8 +259,8 @@ Item {
QtControls.Button {
width: parent.width * 3 / 5
text: i18n("Select devices")
onClicked: plasmoid.configuration.customNetdev = connector.item.selectDevices(
connector.item.getNetworkDevices(),
onClicked: plasmoid.configuration.customNetdev = AWActions.selectDevices(
AWActions.getNetworkDevices(),
plasmoid.configuration.customNetdev.split("@@")
)
}
@ -311,7 +313,7 @@ Item {
QtControls.Button {
width: parent.width * 3 / 5
text: i18n("Edit bars")
onClicked: connector.item.editItem("graphicalitem")
onClicked: AWKeys.editItem("graphicalitem")
}
}
}
@ -319,5 +321,8 @@ Item {
Component.onCompleted: {
if (debug) console.log("[advanced::onCompleted]")
// init submodule
AWKeys.initKeys(pattern, settings, tooltipSettings)
}
}

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

@ -21,6 +21,9 @@ import QtQuick.Controls.Styles 1.3 as QtStyles
import QtQuick.Dialogs 1.1 as QtDialogs
import QtQuick.Layouts 1.0 as QtLayouts
import org.kde.plasma.private.awesomewidget 1.0
import "."
Item {
id: appearancePage
@ -29,8 +32,7 @@ Item {
implicitWidth: pageColumn.implicitWidth
implicitHeight: pageColumn.implicitHeight
Loader { id: connector; source: "connector.qml" }
property bool debug: connector.item.debug
property bool debug: AWKeys.isDebugEnabled()
property variant weight: {
25: 0,
50: 1,

96
sources/awesome-widget-kf5/package/contents/ui/connector.qml → sources/awesome-widget-kf5/package/contents/ui/general.qml
View File

@ -15,16 +15,11 @@
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
***************************************************************************/
pragma Singleton
import QtQuick 2.0
import org.kde.plasma.private.awesomewidget 1.0
QtObject {
id: connector
// variables
property bool debug: AWKeys.isDebugEnabled()
property variant fontWeight: {
"light": Font.Light,
"normal": Font.Normal,
@ -38,7 +33,6 @@ QtObject {
"right": Text.AlignRight,
"justify": Text.AlignJustify
}
// external
property variant settings: {
"customTime": plasmoid.configuration.customTime,
"customUptime": plasmoid.configuration.customUptime,
@ -72,92 +66,4 @@ QtObject {
"batteryTooltipColor": plasmoid.configuration.batteryTooltipColor,
"batteryInTooltipColor": plasmoid.configuration.batteryInTooltipColor
}
property string pattern: plasmoid.configuration.text
Component.onCompleted: {
if (debug) console.log("[connector::onCompleted]")
// init submodule
AWKeys.initKeys(pattern, settings, tooltipSettings)
}
function addDevice(source) {
AWActions.addDevice(source)
}
function checkKeys(data) {
return AWActions.checkKeys(data)
}
function checkUpdates() {
AWActions.checkUpdates()
}
function dictKeys() {
return AWKeys.dictKeys()
}
function editItem(type) {
AWKeys.editItem(type)
}
function getAboutText(type) {
AWActions.getAboutText(type)
}
function getDiskDevices() {
return AWActions.getDiskDevices()
}
function getFanDevices() {
return AWActions.getFanDevices()
}
function getFont(defaultFont) {
return AWActions.getFont(defaultFont)
}
function getHddDevices() {
return AWActions.getHddDevices()
}
function getMountDevices() {
return AWActions.getMountDevices()
}
function getNetworkDevices() {
return AWActions.getNetworkDevices()
}
function getTempDevices() {
return AWActions.getTempDevices()
}
function isReady() {
return AWKeys.isReady()
}
function parsePattern() {
return AWKeys.parsePattern(pattern)
}
function selectDevice(all, current) {
return AWActions.selectDevices(all, current)
}
function sendNotification(event, message) {
AWActions.sendNotification(event, message)
}
function setDataBySource(sourceName, data) {
AWKeys.setDataBySource(sourceName, data, settings)
}
function showValue(tag) {
return AWKeys.valueByKey(tag)
}
function showReadme() {
AWActions.showReadme()
}
}

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

@ -21,15 +21,18 @@ import org.kde.plasma.plasmoid 2.0
import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as PlasmaComponents
import org.kde.plasma.private.awesomewidget 1.0
import "."
Item {
id: main
Loader { id: connector; source: "connector.qml" }
property bool debug: connector.item.debug
property bool debug: AWKeys.isDebugEnabled()
signal needUpdate
// init
Plasmoid.icon: "utilities-system-monitor"
Plasmoid.backgroundHints: "DefaultBackground"
@ -45,14 +48,14 @@ Item {
onNewData: {
if (debug) console.log("[main::onNewData] : Update source " + sourceName)
if (!connector.item.checkKeys(data)) return
if (connector.item.isReady()) connector.item.setDataBySource(sourceName, data)
if (!AWActions.checkKeys(data)) return
if (AWKeys.isReady()) AWKeys.setDataBySource(sourceName, data, general.settings)
}
onSourceAdded: {
if (debug) console.log("[main::onSourceAdded] : Source " + source)
connector.item.addDevice(source)
AWActions.addDevice(source)
}
}
@ -65,8 +68,8 @@ Item {
onNewData: {
if (debug) console.log("[main::onNewData] : Update source " + sourceName)
if (!connector.item.checkKeys(data)) return
if (connector.item.isReady()) connector.item.setDataBySource(sourceName, data)
if (!AWActions.checkKeys(data)) return
if (AWKeys.isReady()) AWKeys.setDataBySource(sourceName, data, general.settings)
// update
if (sourceName == "update") needUpdate()
}
@ -81,8 +84,8 @@ Item {
onNewData: {
if (debug) console.log("[main::onNewData] : Update source " + sourceName)
if (!connector.item.checkKeys(data)) return
if (connector.item.isReady()) connector.item.setDataBySource(sourceName, data)
if (!AWActions.checkKeys(data)) return
if (AWKeys.isReady()) AWKeys.setDataBySource(sourceName, data, general.settings)
}
}
@ -97,8 +100,8 @@ Item {
font.family: plasmoid.configuration.fontFamily
font.italic: plasmoid.configuration.fontStyle == "italic" ? true : false
font.pointSize: plasmoid.configuration.fontSize
font.weight: connector.item.fontWeight[plasmoid.configuration.fontWeight]
horizontalAlignment: connector.item.align[plasmoid.configuration.textAlign]
font.weight: general.fontWeight[plasmoid.configuration.fontWeight]
horizontalAlignment: general.align[plasmoid.configuration.textAlign]
textFormat: Text.RichText
text: plasmoid.configuration.text
}
@ -107,6 +110,8 @@ Item {
Component.onCompleted: {
if (debug) console.log("[main::onCompleted]")
// init submodule
AWKeys.initKeys(plasmoid.configuration.text, general.settings, general.tooltipSettings)
// actions
plasmoid.setAction("showReadme", i18n("Show README"), "text-x-readme")
plasmoid.setAction("updateText", i18n("Update text"), "stock-refresh")
@ -116,7 +121,7 @@ Item {
onNeedUpdate: {
if (debug) console.log("[main::onNeedUpdate]")
text.text = connector.item.parsePattern()
text.text = AWKeys.parsePattern(plasmoid.configuration.text)
// update geometry
text.update()
height = text.contentHeight
@ -127,13 +132,13 @@ Item {
function action_checkUpdates() {
if (debug) console.log("[main::action_checkUpdates]")
connector.item.checkUpdates()
AWActions.checkUpdates()
}
function action_showReadme() {
if (debug) console.log("[main::action_showReadme]")
connector.item.showReadme()
AWActions.showReadme()
}
function action_updateText() {

1
sources/awesome-widget-kf5/package/contents/ui/qmldir Normal file
View File

@ -0,0 +1 @@
singleton general general.qml

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

@ -21,6 +21,9 @@ import QtQuick.Dialogs 1.1 as QtDialogs
import QtQuick.Layouts 1.0 as QtLayouts
import QtQuick.Controls.Styles 1.3 as QtStyles
import org.kde.plasma.private.awesomewidget 1.0
import "."
Item {
id: widgetPage
@ -29,8 +32,7 @@ Item {
implicitWidth: pageColumn.implicitWidth
implicitHeight: pageColumn.implicitHeight
Loader { id: connector; source: "connector.qml" }
property bool debug: connector.item.debug
property bool debug: AWKeys.isDebugEnabled()
property alias cfg_text: textPattern.text
@ -59,7 +61,7 @@ Item {
"family": plasmoid.configuration.fontFamily,
"size": plasmoid.configuration.fontSize
}
var font = connector.item.getFont(defaultFont)
var font = AWActions.getFont(defaultFont)
var pos = textPattern.cursorPosition
var selected = textPattern.selectedText
textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd)
@ -182,7 +184,7 @@ Item {
QtControls.ComboBox {
id: tags
model: connector.item.dictKeys()
model: AWKeys.dictKeys()
}
QtControls.Button {
text: i18n("Add")
@ -204,8 +206,8 @@ Item {
var message = i18n("Tag: %1", tags.currentText)
message += "<br>"
message += i18n("Value: %1", connector.item.showValue(tags.currentText))
connector.item.sendNotification("tag", message)
message += i18n("Value: %1", AWKeys.valueByKey(tags.currentText))
AWActions.sendNotification("tag", message)
}
}
}
@ -220,5 +222,8 @@ Item {
Component.onCompleted: {
if (debug) console.log("[widget::onCompleted]")
// init submodule
AWKeys.initKeys(plasmoid.configuration.text, general.settings, general.tooltipSettings)
}
}