Differential D7469 Diff 18562 applets/kicker/package/contents/ui/ConfigGeneral.qml

Changeset View

Standalone View

applets/kicker/package/contents/ui/ConfigGeneral.qml

Context not available.
22	import QtQuick.Dialogs 1.2	22		import QtQuick.Dialogs 1.2
23	import QtQuick.Layouts 1.0	23		import QtQuick.Layouts 1.0
24		24
		25		import org.kde.plasma.core 2.0 as PlasmaCore
		26		import org.kde.plasma.components 2.0 as PlasmaComponents
			davidedmundsonUnsubmitted Not Done this shouldn't be used in a config module. Use QtQuick.Controls 1.x instead davidedmundson: this shouldn't be used in a config module. Use QtQuick.Controls 1.x instead
			broulikUnsubmitted Not Done That's fine. Fwict this code is from Kickoff and there we have a QQC Button for the icon which inside has a Plasma panel SVG background and IconItem on top, so you get a "live preview" of how it looks with your current Plasma theme. We do not end up with white icon on white background. broulik: That's fine. Fwict this code is from Kickoff and there we have a QQC Button for the icon which…
		27
		28		import org.kde.kquickcontrolsaddons 2.0 as KQuickAddons
		29
25	import org.kde.plasma.private.kicker 0.1 as Kicker	30		import org.kde.plasma.private.kicker 0.1 as Kicker
26		31
27	Item {	32		Item {
Context not available.
32		37
33	property bool isDash: (plasmoid.pluginName == "org.kde.plasma.kickerdash")	38		property bool isDash: (plasmoid.pluginName == "org.kde.plasma.kickerdash")
34		39
35	property alias cfg_useCustomButtonImage: useCustomButtonImage.checked	40		property string cfg_icon: plasmoid.configuration.icon
36	property alias cfg_customButtonImage: customButtonImage.text	41		property bool cfg_useCustomButtonImage: plasmoid.configuration.useCustomButtonImage
		42		property string cfg_customButtonImage: plasmoid.configuration.customButtonImage
37		43
38	property alias cfg_appNameFormat: appNameFormat.currentIndex	44		property alias cfg_appNameFormat: appNameFormat.currentIndex
39	property alias cfg_limitDepth: limitDepth.checked	45		property alias cfg_limitDepth: limitDepth.checked
Context not available.
49		55
50	ColumnLayout {	56		ColumnLayout {
51	anchors.left: parent.left	57		anchors.left: parent.left
52	GroupBox {
53	Layout.fillWidth: true
54
55	title: i18n("Icon")
56		58
57	flat: true	59		RowLayout {
		60		spacing: units.smallSpacing
58		61
59	RowLayout {	62		Label {
60	CheckBox {	63		text: i18n("Icon:")
61	id: useCustomButtonImage	64		}
62		65
63	text: i18n("Use custom image:")	66		Button {
		67		id: iconButton
		68		Layout.minimumWidth: previewFrame.width + units.smallSpacing * 2
		69		Layout.maximumWidth: Layout.minimumWidth
		70		Layout.minimumHeight: previewFrame.height + units.smallSpacing * 2
		71		Layout.maximumHeight: Layout.minimumWidth
		72
		73		KQuickAddons.IconDialog {
		74		id: iconDialog
		75		onIconNameChanged: {
		76		cfg_icon = iconName \|\| "start-here-kde"; // TODO use actual default
		77		cfg_useCustomButtonImage = false;
		78		}
64	}	79		}
65		80
66	TextField {	81		// just to provide some visual feedback, cannot have checked without checkable enabled
67	id: customButtonImage	82		checkable: true
		83		onClicked: {
		84		checked = Qt.binding(function() { // never actually allow it being checked
		85		return iconMenu.status === PlasmaComponents.DialogStatus.Open
		86		})
68		87
69	enabled: useCustomButtonImage.checked	88		iconMenu.open(0, height)
70
71	Layout.fillWidth: true
72	}	89		}
73		90
74	Button {	91		PlasmaCore.FrameSvgItem {
75	iconName: "document-open"	92		id: previewFrame
76		93		anchors.centerIn: parent
77	enabled: useCustomButtonImage.checked	94		imagePath: plasmoid.location === PlasmaCore.Types.Vertical \|\| plasmoid.location === PlasmaCore.Types.Horizontal
78		95		? "widgets/panel-background" : "widgets/background"
79	onClicked: {	96		width: units.iconSizes.large + fixedMargins.left + fixedMargins.right
80	imagePicker.folder = systemSettings.picturesLocation();	97		height: units.iconSizes.large + fixedMargins.top + fixedMargins.bottom
81	imagePicker.open();	98
		99		PlasmaCore.IconItem {
		100		anchors.centerIn: parent
		101		width: units.iconSizes.large
		102		height: width
		103		source: cfg_useCustomButtonImage ? cfg_customButtonImage : cfg_icon
82	}	104		}
83	}	105		}
		106		}
84		107
85	FileDialog {	108		// QQC Menu can only be opened at cursor position, not a random one
86	id: imagePicker	109		PlasmaComponents.ContextMenu {
87		110		id: iconMenu
88	title: i18n("Choose an image")	111		visualParent: iconButton
89
90	selectFolder: false
91	selectMultiple: false
92
93	nameFilters: [ i18n("Image Files (.png .jpg .jpeg .bmp .svg .svgz)") ]
94		112
95	onFileUrlChanged: {	113		PlasmaComponents.MenuItem {
96	customButtonImage.text = fileUrl;	114		text: i18nc("@item:inmenu Open icon chooser dialog", "Choose...")
97	}	115		icon: "document-open-folder"
		116		onClicked: iconDialog.open()
98	}	117		}
99		118		PlasmaComponents.MenuItem {
100	Kicker.SystemSettings {	119		text: i18nc("@item:inmenu Reset icon to default", "Clear Icon")
101	id: systemSettings	120		icon: "edit-clear"
		121		onClicked: {
		122		cfg_useCustomButtonImage = false;
		123		cfg_icon = "start-here-kde";
			heinUnsubmitted Not Done This isn't OK - it needs to revert to the actual config default. Some distros change it to their branded icon and are very keen on wanting to override specifically the default rather than pre-setting a deviation. That's one reason why the old config format had cfg_icon and otherwise used cfg_useCustomButtonImage (while your approach here is to migrate everyone to cfg_icon by setting cfg_useCustomButtonImage to false when the UI is used). hein: This isn't OK - it needs to revert to the actual config default. Some distros change it to…
			broulikUnsubmitted Not Done we could add a `Q_INVOKABLE QVariant defaultValue()` to KDeclarative `ConfigPropertyMap` so we could query this, like we already have an `bool isImmutable()` broulik: we could add a `Q_INVOKABLE QVariant defaultValue()` to KDeclarative `ConfigPropertyMap` so we…
		124		}
102	}	125		}
103	}	126		}
104	}	127		}
Context not available.