forked from qt-creator/qt-creator
QmlDesigner: Remove custom controls 1 styles
Change-Id: I695813e7b97caf7355211550856e51a398566ae9 Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Thomas Hartmann
@@ -1,54 +0,0 @@
|
|||||||
/****************************************************************************
|
|
||||||
**
|
|
||||||
** Copyright (C) 2016 The Qt Company Ltd.
|
|
||||||
** Contact: https://www.qt.io/licensing/
|
|
||||||
**
|
|
||||||
** This file is part of Qt Creator.
|
|
||||||
**
|
|
||||||
** Commercial License Usage
|
|
||||||
** Licensees holding valid commercial Qt licenses may use this file in
|
|
||||||
** accordance with the commercial license agreement provided with the
|
|
||||||
** Software or, alternatively, in accordance with the terms contained in
|
|
||||||
** a written agreement between you and The Qt Company. For licensing terms
|
|
||||||
** and conditions see https://www.qt.io/terms-conditions. For further
|
|
||||||
** information use the contact form at https://www.qt.io/contact-us.
|
|
||||||
**
|
|
||||||
** GNU General Public License Usage
|
|
||||||
** Alternatively, this file may be used under the terms of the GNU
|
|
||||||
** General Public License version 3 as published by the Free Software
|
|
||||||
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
|
|
||||||
** included in the packaging of this file. Please review the following
|
|
||||||
** information to ensure the GNU General Public License requirements will
|
|
||||||
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
|
||||||
**
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
import QtQuick 2.1
|
|
||||||
import QtQuick.Controls 1.1 as Controls
|
|
||||||
import QtQuick.Controls.Styles 1.1
|
|
||||||
import QtQuickDesignerTheme 1.0
|
|
||||||
|
|
||||||
CheckBoxStyle {
|
|
||||||
spacing: 24
|
|
||||||
label: Controls.Label { text: control.text ; color: checkBox.textColor }
|
|
||||||
indicator: Item {
|
|
||||||
implicitWidth: 16
|
|
||||||
implicitHeight: 16
|
|
||||||
Rectangle {
|
|
||||||
anchors.fill: parent
|
|
||||||
color: control.pressed
|
|
||||||
? Theme.color(Theme.FancyToolButtonHoverColor)
|
|
||||||
: Theme.color(Theme.FancyToolButtonSelectedColor)
|
|
||||||
border.color: Theme.qmlDesignerBorderColor()
|
|
||||||
anchors.margins: 1
|
|
||||||
}
|
|
||||||
Image {
|
|
||||||
x: 2
|
|
||||||
y: 2
|
|
||||||
width: 14
|
|
||||||
height: 13
|
|
||||||
source: "image://icons/checkbox-indicator"
|
|
||||||
visible: control.checked
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,86 +0,0 @@
|
|||||||
/****************************************************************************
|
|
||||||
**
|
|
||||||
** Copyright (C) 2016 The Qt Company Ltd.
|
|
||||||
** Contact: https://www.qt.io/licensing/
|
|
||||||
**
|
|
||||||
** This file is part of Qt Creator.
|
|
||||||
**
|
|
||||||
** Commercial License Usage
|
|
||||||
** Licensees holding valid commercial Qt licenses may use this file in
|
|
||||||
** accordance with the commercial license agreement provided with the
|
|
||||||
** Software or, alternatively, in accordance with the terms contained in
|
|
||||||
** a written agreement between you and The Qt Company. For licensing terms
|
|
||||||
** and conditions see https://www.qt.io/terms-conditions. For further
|
|
||||||
** information use the contact form at https://www.qt.io/contact-us.
|
|
||||||
**
|
|
||||||
** GNU General Public License Usage
|
|
||||||
** Alternatively, this file may be used under the terms of the GNU
|
|
||||||
** General Public License version 3 as published by the Free Software
|
|
||||||
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
|
|
||||||
** included in the packaging of this file. Please review the following
|
|
||||||
** information to ensure the GNU General Public License requirements will
|
|
||||||
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
|
||||||
**
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
import QtQuick 2.1
|
|
||||||
import QtQuick.Controls 1.1 as Controls
|
|
||||||
import QtQuick.Controls.Styles 1.2
|
|
||||||
import QtQuickDesignerTheme 1.0
|
|
||||||
|
|
||||||
ComboBoxStyle {
|
|
||||||
property color textColor: Theme.color(Theme.PanelTextColorLight)
|
|
||||||
__editor: Item {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
padding.left: 20
|
|
||||||
|
|
||||||
background: Item {
|
|
||||||
implicitWidth: 120
|
|
||||||
implicitHeight: 24
|
|
||||||
|
|
||||||
Rectangle {
|
|
||||||
anchors.fill: parent
|
|
||||||
visible: !control.pressed
|
|
||||||
color: Theme.qmlDesignerButtonColor()
|
|
||||||
border.color: Theme.qmlDesignerBorderColor()
|
|
||||||
border.width: 1
|
|
||||||
}
|
|
||||||
|
|
||||||
Rectangle {
|
|
||||||
color: Theme.qmlDesignerBackgroundColorDarker()
|
|
||||||
anchors.fill: parent
|
|
||||||
visible: control.pressed
|
|
||||||
border.color: Theme.qmlDesignerBorderColor()
|
|
||||||
border.width: 1
|
|
||||||
}
|
|
||||||
|
|
||||||
Image {
|
|
||||||
id: imageItem
|
|
||||||
width: 8
|
|
||||||
height: 4
|
|
||||||
source: "image://icons/down-arrow"
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
anchors.right: parent.right
|
|
||||||
anchors.rightMargin: 8
|
|
||||||
opacity: control.enabled ? 1 : 0.5
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
label: Text {
|
|
||||||
id: textitem
|
|
||||||
anchors.left: parent.left
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
text: control.currentText
|
|
||||||
renderType: Text.NativeRendering
|
|
||||||
color: control.textColor
|
|
||||||
}
|
|
||||||
|
|
||||||
__dropDownStyle: MenuStyle {
|
|
||||||
__maxPopupHeight: 600
|
|
||||||
__menuItemType: "comboboxitem"
|
|
||||||
frame: Rectangle {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,74 +0,0 @@
|
|||||||
/****************************************************************************
|
|
||||||
**
|
|
||||||
** Copyright (C) 2016 The Qt Company Ltd.
|
|
||||||
** Contact: https://www.qt.io/licensing/
|
|
||||||
**
|
|
||||||
** This file is part of Qt Creator.
|
|
||||||
**
|
|
||||||
** Commercial License Usage
|
|
||||||
** Licensees holding valid commercial Qt licenses may use this file in
|
|
||||||
** accordance with the commercial license agreement provided with the
|
|
||||||
** Software or, alternatively, in accordance with the terms contained in
|
|
||||||
** a written agreement between you and The Qt Company. For licensing terms
|
|
||||||
** and conditions see https://www.qt.io/terms-conditions. For further
|
|
||||||
** information use the contact form at https://www.qt.io/contact-us.
|
|
||||||
**
|
|
||||||
** GNU General Public License Usage
|
|
||||||
** Alternatively, this file may be used under the terms of the GNU
|
|
||||||
** General Public License version 3 as published by the Free Software
|
|
||||||
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
|
|
||||||
** included in the packaging of this file. Please review the following
|
|
||||||
** information to ensure the GNU General Public License requirements will
|
|
||||||
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
|
||||||
**
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
import QtQuick 2.1
|
|
||||||
import QtQuick.Controls 1.1 as Controls
|
|
||||||
import QtQuick.Controls.Styles 1.1
|
|
||||||
import QtQuickDesignerTheme 1.0
|
|
||||||
|
|
||||||
SpinBoxStyle {
|
|
||||||
selectionColor: Theme.color(Theme.PanelTextColorLight)
|
|
||||||
selectedTextColor: Theme.color(Theme.PanelTextColorMid)
|
|
||||||
textColor: spinBox.textColor
|
|
||||||
|
|
||||||
|
|
||||||
padding.top: 2
|
|
||||||
padding.bottom: 2
|
|
||||||
padding.right: 18
|
|
||||||
padding.left: 12
|
|
||||||
|
|
||||||
incrementControl: Item {
|
|
||||||
implicitWidth: 14
|
|
||||||
implicitHeight: parent.height/2
|
|
||||||
opacity: styleData.upEnabled ? styleData.upPressed ? 0.5 : 1 : 0.5
|
|
||||||
Image {
|
|
||||||
width: 8
|
|
||||||
height: 4
|
|
||||||
source: "image://icons/up-arrow"
|
|
||||||
x: 1
|
|
||||||
y: 5
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
decrementControl: Item {
|
|
||||||
implicitWidth: 14
|
|
||||||
implicitHeight: parent.height/2
|
|
||||||
opacity: styleData.downEnabled ? styleData.downPressed ? 0.5 : 1 : 0.5
|
|
||||||
Image {
|
|
||||||
width: 8
|
|
||||||
height: 4
|
|
||||||
source: "image://icons/down-arrow"
|
|
||||||
x: 1
|
|
||||||
y: 3
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
background: Rectangle {
|
|
||||||
implicitWidth: Math.max(64, styleData.contentWidth)
|
|
||||||
implicitHeight: 24
|
|
||||||
color: Theme.qmlDesignerBackgroundColorDarker()
|
|
||||||
border.color: Theme.qmlDesignerBorderColor()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -14,9 +14,6 @@ ColorEditor 2.0 ColorEditor.qml
|
|||||||
ColorLine 2.0 ColorLine.qml
|
ColorLine 2.0 ColorLine.qml
|
||||||
ColorLogic 2.0 ColorLogic.qml
|
ColorLogic 2.0 ColorLogic.qml
|
||||||
ComboBox 2.0 ComboBox.qml
|
ComboBox 2.0 ComboBox.qml
|
||||||
CustomCheckBoxStyle 2.0 CustomCheckBoxStyle.qml
|
|
||||||
CustomComboBoxStyle 2.0 CustomComboBoxStyle.qml
|
|
||||||
CustomSpinBoxStyle 2.0 CustomSpinBoxStyle.qml
|
|
||||||
EditableListView 2.0 EditableListView.qml
|
EditableListView 2.0 EditableListView.qml
|
||||||
ExpandingSpacer 2.0 ExpandingSpacer.qml
|
ExpandingSpacer 2.0 ExpandingSpacer.qml
|
||||||
ExtendedFunctionButton 2.0 ExtendedFunctionButton.qml
|
ExtendedFunctionButton 2.0 ExtendedFunctionButton.qml
|
||||||
|
|||||||
Reference in New Issue
Block a user