Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-08 20:56:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Tidying

Browse source
This commit is contained in:
David Rowe 2017-03-16 18:27:13 +13:00
parent 89eb073855
commit 1080e21afd
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/resources/qml/dialogs/CustomQueryDialog.qml
View file

@ -107,10 +107,10 @@ ModalWindow {
QtObject { QtObject {
id: d; id: d;
readonly property int minWidth: 480; readonly property int minWidth: 480
readonly property int maxWdith: 1280; readonly property int maxWdith: 1280
readonly property int minHeight: 120; readonly property int minHeight: 120
readonly property int maxHeight: 720; readonly property int maxHeight: 720
function resize() { function resize() {
var targetWidth = Math.max(titleWidth, pane.width); var targetWidth = Math.max(titleWidth, pane.width);

14
interface/resources/qml/dialogs/TabletCustomQueryDialog.qml
View file

@ -12,7 +12,7 @@ import QtQuick 2.5
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Dialogs 1.2 as OriginalDialogs import QtQuick.Dialogs 1.2 as OriginalDialogs
import "../controls-uit" as ControlsUIT import "../controls-uit"
import "../styles-uit" import "../styles-uit"
import "../windows" import "../windows"
@ -160,7 +160,7 @@ TabletModalWindow {
} }
// FIXME make a text field type that can be bound to a history for autocompletion // FIXME make a text field type that can be bound to a history for autocompletion
ControlsUIT.TextField { TextField {
id: textField; id: textField;
label: root.textInput.label; label: root.textInput.label;
focus: root.textInput ? true : false; focus: root.textInput ? true : false;
@ -176,7 +176,7 @@ TabletModalWindow {
property alias keyboardOverride: root.keyboardOverride property alias keyboardOverride: root.keyboardOverride
property alias keyboardRaised: root.keyboardRaised property alias keyboardRaised: root.keyboardRaised
property alias punctuationMode: root.punctuationMode property alias punctuationMode: root.punctuationMode
ControlsUIT.Keyboard { Keyboard {
id: keyboard id: keyboard
raised: keyboardEnabled && keyboardRaised raised: keyboardEnabled && keyboardRaised
numeric: punctuationMode numeric: punctuationMode
@ -205,7 +205,7 @@ TabletModalWindow {
onWidthChanged: d.resize(); onWidthChanged: d.resize();
z: 20 z: 20
ControlsUIT.CheckBox { CheckBox {
id: checkBoxField; id: checkBoxField;
text: root.checkBox.label; text: root.checkBox.label;
focus: Boolean(root.checkBox); focus: Boolean(root.checkBox);
@ -218,7 +218,7 @@ TabletModalWindow {
} }
} }
ControlsUIT.ComboBox { ComboBox {
id: comboBoxField; id: comboBoxField;
label: root.comboBox.label; label: root.comboBox.label;
focus: Boolean(root.comboBox); focus: Boolean(root.comboBox);
@ -263,12 +263,12 @@ TabletModalWindow {
warningText.width = rowWidth - buttonsWidth - warningIconWidth; warningText.width = rowWidth - buttonsWidth - warningIconWidth;
} }
ControlsUIT.Button { Button {
id: cancelButton; id: cancelButton;
action: cancelAction; action: cancelAction;
} }
ControlsUIT.Button { Button {
id: acceptButton; id: acceptButton;
action: acceptAction; action: acceptAction;
} }