Prevent shadowing
This commit is contained in:
@@ -46,7 +46,6 @@ QQC2.Control {
|
|||||||
}
|
}
|
||||||
|
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
id: column
|
|
||||||
width: scrollView.width
|
width: scrollView.width
|
||||||
spacing: 0
|
spacing: 0
|
||||||
|
|
||||||
|
|||||||
@@ -24,7 +24,6 @@ FormCard.FormCardPage {
|
|||||||
required property NeoChatConnection connection
|
required property NeoChatConnection connection
|
||||||
|
|
||||||
property DevicesModel devicesModel: DevicesModel {
|
property DevicesModel devicesModel: DevicesModel {
|
||||||
id: devicesModel
|
|
||||||
connection: root.connection
|
connection: root.connection
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -96,12 +96,10 @@ FormCard.FormCardPage {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
FormCard.FormTextFieldDelegate {
|
FormCard.FormTextFieldDelegate {
|
||||||
id: shortcode
|
|
||||||
label: i18n("Shortcode:")
|
label: i18n("Shortcode:")
|
||||||
text: root.shortcode
|
text: root.shortcode
|
||||||
}
|
}
|
||||||
FormCard.FormTextFieldDelegate {
|
FormCard.FormTextFieldDelegate {
|
||||||
id: description
|
|
||||||
label: i18n("Description:")
|
label: i18n("Description:")
|
||||||
text: root.description
|
text: root.description
|
||||||
}
|
}
|
||||||
@@ -109,19 +107,19 @@ FormCard.FormCardPage {
|
|||||||
id: save
|
id: save
|
||||||
text: i18n("Save")
|
text: i18n("Save")
|
||||||
icon.name: "document-save"
|
icon.name: "document-save"
|
||||||
enabled: !root.newEmoticon || (image.source.toString().length > 0 && shortcode.text && description.text)
|
enabled: !root.newEmoticon || (image.source.toString().length > 0 && root.shortcode && root.description)
|
||||||
onClicked: {
|
onClicked: {
|
||||||
if (root.newEmoticon) {
|
if (root.newEmoticon) {
|
||||||
model.addEmoticon(image.source, shortcode.text, description.text, emoticonType === EmoticonFormCard.Stickers ? "sticker" : "emoticon");
|
root.model.addEmoticon(image.source, root.shortcode, root.description, root.emoticonType === EmoticonFormCard.Stickers ? "sticker" : "emoticon");
|
||||||
} else {
|
} else {
|
||||||
if (description.text !== root.description) {
|
if (root.description !== root.description) {
|
||||||
root.model.setEmoticonBody(proxyModel.mapToSource(proxyModel.index(model.index, 0)).row, description.text);
|
root.model.setEmoticonBody(root.proxyModel.mapToSource(root.proxyModel.index(root.model.index, 0)).row, root.description);
|
||||||
}
|
}
|
||||||
if (shortcode.text !== root.shortcode) {
|
if (root.shortcode !== root.shortcode) {
|
||||||
root.model.setEmoticonShortcode(proxyModel.mapToSource(proxyModel.index(model.index, 0)).row, shortcode.text);
|
root.model.setEmoticonShortcode(root.proxyModel.mapToSource(root.proxyModel.index(root.model.index, 0)).row, root.shortcode);
|
||||||
}
|
}
|
||||||
if (image.source + "" !== root.url) {
|
if (image.source + "" !== root.url) {
|
||||||
root.model.setEmoticonImage(proxyModel.mapToSource(proxyModel.index(model.index, 0)).row, image.source);
|
root.model.setEmoticonImage(root.proxyModel.mapToSource(root.proxyModel.index(root.model.index, 0)).row, image.source);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
root.closeDialog();
|
root.closeDialog();
|
||||||
@@ -129,8 +127,6 @@ FormCard.FormCardPage {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
property Component openFileDialog: Component {
|
property Component openFileDialog: Component {
|
||||||
id: openFileDialog
|
|
||||||
|
|
||||||
OpenFileDialog {
|
OpenFileDialog {
|
||||||
currentFolder: Core.StandardPaths.standardLocations(Core.StandardPaths.PicturesLocation)[0]
|
currentFolder: Core.StandardPaths.standardLocations(Core.StandardPaths.PicturesLocation)[0]
|
||||||
parentWindow: root.Window.window
|
parentWindow: root.Window.window
|
||||||
|
|||||||
@@ -80,16 +80,11 @@ FormCard.FormCardPage {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
delegate: ruleDelegate
|
delegate: NotificationRuleItem {
|
||||||
|
onDeleteRule: {
|
||||||
Component {
|
root.pushRuleModel.removeKeyword(id);
|
||||||
id: ruleDelegate
|
|
||||||
NotificationRuleItem {
|
|
||||||
onDeleteRule: {
|
|
||||||
root.pushRuleModel.removeKeyword(id);
|
|
||||||
}
|
|
||||||
onNotificatonActionChanged: action => root.pushRuleModel.setPushRuleAction(id, action)
|
|
||||||
}
|
}
|
||||||
|
onNotificatonActionChanged: action => root.pushRuleModel.setPushRuleAction(id, action)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
FormCard.AbstractFormDelegate {
|
FormCard.AbstractFormDelegate {
|
||||||
|
|||||||
@@ -36,7 +36,6 @@ Kirigami.Dialog {
|
|||||||
clip: true
|
clip: true
|
||||||
|
|
||||||
ListView {
|
ListView {
|
||||||
id: listView
|
|
||||||
implicitHeight: contentHeight
|
implicitHeight: contentHeight
|
||||||
currentIndex: -1
|
currentIndex: -1
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user