From 1080e21afd707eea654d976e3a21e659e4680f90 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Thu, 16 Mar 2017 18:27:13 +1300 Subject: [PATCH] Tidying --- .../resources/qml/dialogs/CustomQueryDialog.qml | 8 ++++---- .../qml/dialogs/TabletCustomQueryDialog.qml | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/interface/resources/qml/dialogs/CustomQueryDialog.qml b/interface/resources/qml/dialogs/CustomQueryDialog.qml index 98aa158b1c..4d6fe74bca 100644 --- a/interface/resources/qml/dialogs/CustomQueryDialog.qml +++ b/interface/resources/qml/dialogs/CustomQueryDialog.qml @@ -107,10 +107,10 @@ ModalWindow { QtObject { id: d; - readonly property int minWidth: 480; - readonly property int maxWdith: 1280; - readonly property int minHeight: 120; - readonly property int maxHeight: 720; + readonly property int minWidth: 480 + readonly property int maxWdith: 1280 + readonly property int minHeight: 120 + readonly property int maxHeight: 720 function resize() { var targetWidth = Math.max(titleWidth, pane.width); diff --git a/interface/resources/qml/dialogs/TabletCustomQueryDialog.qml b/interface/resources/qml/dialogs/TabletCustomQueryDialog.qml index 8da2150c9a..7965006b8b 100644 --- a/interface/resources/qml/dialogs/TabletCustomQueryDialog.qml +++ b/interface/resources/qml/dialogs/TabletCustomQueryDialog.qml @@ -12,7 +12,7 @@ import QtQuick 2.5 import QtQuick.Controls 1.4 import QtQuick.Dialogs 1.2 as OriginalDialogs -import "../controls-uit" as ControlsUIT +import "../controls-uit" import "../styles-uit" import "../windows" @@ -160,7 +160,7 @@ TabletModalWindow { } // FIXME make a text field type that can be bound to a history for autocompletion - ControlsUIT.TextField { + TextField { id: textField; label: root.textInput.label; focus: root.textInput ? true : false; @@ -176,7 +176,7 @@ TabletModalWindow { property alias keyboardOverride: root.keyboardOverride property alias keyboardRaised: root.keyboardRaised property alias punctuationMode: root.punctuationMode - ControlsUIT.Keyboard { + Keyboard { id: keyboard raised: keyboardEnabled && keyboardRaised numeric: punctuationMode @@ -205,7 +205,7 @@ TabletModalWindow { onWidthChanged: d.resize(); z: 20 - ControlsUIT.CheckBox { + CheckBox { id: checkBoxField; text: root.checkBox.label; focus: Boolean(root.checkBox); @@ -218,7 +218,7 @@ TabletModalWindow { } } - ControlsUIT.ComboBox { + ComboBox { id: comboBoxField; label: root.comboBox.label; focus: Boolean(root.comboBox); @@ -263,12 +263,12 @@ TabletModalWindow { warningText.width = rowWidth - buttonsWidth - warningIconWidth; } - ControlsUIT.Button { + Button { id: cancelButton; action: cancelAction; } - ControlsUIT.Button { + Button { id: acceptButton; action: acceptAction; }