forked from qt-creator/qt-creator
Merge remote-tracking branch 'origin/3.0'
This commit is contained in:
Eike Ziller
Binary file not shown.
|
Before Width: | Height: | Size: 5.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 7.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 7.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 7.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 6.9 KiB |
@@ -60,11 +60,12 @@
|
||||
\section1 Viewing Function Tooltips
|
||||
|
||||
To hide function tooltips by default, select \gui {Tools > Options >
|
||||
Text Editor > Show help tooltips > On Shift+Mouseover}. You can still view
|
||||
the tooltips by pressing and holding down the \key Shift key.
|
||||
Text Editor > Show help tooltips using the mouse > On Shift+Mouseover}. You
|
||||
can still view the tooltips by pressing and holding down the \key Shift
|
||||
key.
|
||||
|
||||
To use a keyboard shortcut for viewing help tooltips, select
|
||||
\gui {Using keyboard shortcut (Alt)}.
|
||||
\gui {Show help tooltips using keyboard shortcut (Alt)}.
|
||||
|
||||
\section1 Finding Information in Qt Documentation
|
||||
|
||||
|
||||
@@ -190,10 +190,7 @@
|
||||
\li \l {Creating Buttons}
|
||||
\li \l {Creating Scalable Buttons and Borders}
|
||||
\li \l {Creating Screens}
|
||||
\li \l {Animating Screens}
|
||||
\li \l {Adding User Interaction Methods}
|
||||
\li \l {Exporting Designs from Graphics Software}
|
||||
\li \l {Implementing Application Logic}
|
||||
\li \l {Using QML Modules with Plugins}
|
||||
\endlist
|
||||
\li \l{Developing Widget Based Applications}
|
||||
|
||||
@@ -31,67 +31,40 @@
|
||||
|
||||
\title Developing Qt Quick Applications
|
||||
|
||||
You can either create Qt Quick projects from scratch or import existing
|
||||
projects to \QC.
|
||||
|
||||
You can use the code editor (\l{Working in Edit Mode}{Edit mode}) or the
|
||||
visual editor (\l{Using Qt Quick Designer}{Design mode}) to develop Qt Quick
|
||||
applications.
|
||||
|
||||
Typically, application development proceeds as follows:
|
||||
|
||||
\table
|
||||
\row
|
||||
\li \inlineimage creator_createproject.png
|
||||
\li \inlineimage creator_createcomponents.png
|
||||
\li \inlineimage creator_createscreen.png
|
||||
\row
|
||||
\li \l {Creating Qt Quick Projects}{Create or import projects.}
|
||||
\li \l {Creating Components}{Create components.}
|
||||
\li \l {Creating Screens}{Create screens.}
|
||||
\row
|
||||
\li \inlineimage creator_createanimation.png
|
||||
\li \inlineimage creator_createuserinter.png
|
||||
\li \inlineimage creator_createcode.png
|
||||
\row
|
||||
\li \l {Animating Screens}{Add animation to screens.}
|
||||
\li \l {Adding User Interaction Methods}
|
||||
{Add user interaction methods.}
|
||||
\li \l {Implementing Application Logic}
|
||||
{Implement the application logic.}
|
||||
\endtable
|
||||
|
||||
\section1 Related Topics
|
||||
|
||||
\list
|
||||
|
||||
\li \l {Creating Qt Quick Projects}
|
||||
|
||||
You can either create Qt Quick projects from scratch or import
|
||||
existing projects to \QC.
|
||||
\li \l {Using Qt Quick Designer}
|
||||
\li \l {Creating Buttons}
|
||||
\li \l {Creating Scalable Buttons and Borders}
|
||||
|
||||
You can use the code editor (Edit mode) or the visual editor (Design
|
||||
mode) to develop Qt Quick applications.
|
||||
|
||||
\li \l {Creating Components}
|
||||
|
||||
You can use predefined QML types to create components or use a set
|
||||
of Qt Quick Controls for creating classic desktop-style user
|
||||
interfaces using Qt Quick 2.1 (available since Qt 5.1).
|
||||
\li \l {Creating Screens}
|
||||
|
||||
You can use predefined QML types, Qt Quick Controls, and your own
|
||||
components to create screens. You can use states and transitions to
|
||||
navigate between screens.
|
||||
\li \l {Exporting Designs from Graphics Software}
|
||||
|
||||
You can export designs from graphics software, such as Adobe
|
||||
Photoshop and GIMP, to QML files. You can then edit QML files in
|
||||
\QC.
|
||||
\li \l {Using QML Modules with Plugins}
|
||||
|
||||
QML modules may use plugins to expose components defined in C++ to
|
||||
QML applications. \QC cannot load the plugins to determine the
|
||||
details of the contained components, and therefore, the modules must
|
||||
provide extra type information for code completion and the semantic
|
||||
checks to work correctly.
|
||||
|
||||
\endlist
|
||||
|
||||
*/
|
||||
|
||||
|
||||
/*!
|
||||
|
||||
\contentspage index.html
|
||||
\previouspage quick-export-to-qml.html
|
||||
\page quick-application-logic.html
|
||||
\nextpage creator-qml-modules-with-plugins.html
|
||||
|
||||
\title Implementing Application Logic
|
||||
|
||||
A user interface is only a part of an application, and not really useful by itself.
|
||||
You can use Qt or JavaScript to implement the application logic. For more information on
|
||||
using JavaScript, see
|
||||
\l{http://qt-project.org/doc/qt-5.0/qtqml/qtqml-javascript-topic.html}
|
||||
{Integrating QML and JavaScript}.
|
||||
|
||||
For an example of how to use JavaScript to develop a game, see the
|
||||
\l{http://qt-project.org/doc/qt-5.0/qtquick/qtquick2-qml-advtutorial.html}
|
||||
{QML Advanced Tutorial}.
|
||||
|
||||
*/
|
||||
|
||||
@@ -25,9 +25,9 @@
|
||||
/*!
|
||||
|
||||
\contentspage index.html
|
||||
\previouspage quick-user-interaction.html
|
||||
\previouspage quick-screens.html
|
||||
\page quick-export-to-qml.html
|
||||
\nextpage quick-application-logic.html
|
||||
\nextpage creator-qml-modules-with-plugins.html
|
||||
|
||||
\title Exporting Designs from Graphics Software
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
/*!
|
||||
\contentspage index.html
|
||||
\previouspage quick-application-logic.html
|
||||
\previouspage quick-export-to-qml.html
|
||||
\page creator-qml-modules-with-plugins.html
|
||||
\nextpage creator-using-qt-designer.html
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
\contentspage index.html
|
||||
\previouspage quick-scalable-image.html
|
||||
\page quick-screens.html
|
||||
\nextpage quick-animations.html
|
||||
\nextpage quick-export-to-qml.html
|
||||
|
||||
\title Creating Screens
|
||||
|
||||
@@ -183,17 +183,7 @@
|
||||
|
||||
\endlist
|
||||
|
||||
*/
|
||||
|
||||
|
||||
/*!
|
||||
|
||||
\contentspage index.html
|
||||
\previouspage quick-screens.html
|
||||
\page quick-animations.html
|
||||
\nextpage quick-user-interaction.html
|
||||
|
||||
\title Animating Screens
|
||||
\section1 Animating Screens
|
||||
|
||||
To make movement between states smooth, you can specify transitions. You can
|
||||
use different types of animated transitions. For example, you can animate
|
||||
@@ -210,17 +200,7 @@
|
||||
see \l{http://qt-project.org/doc/qt-5.0/qtquick/qml-qtquick2-transition.html}
|
||||
{Transition}.
|
||||
|
||||
*/
|
||||
|
||||
|
||||
/*!
|
||||
|
||||
\contentspage index.html
|
||||
\previouspage quick-animations.html
|
||||
\page quick-user-interaction.html
|
||||
\nextpage quick-export-to-qml.html
|
||||
|
||||
\title Adding User Interaction Methods
|
||||
\section1 Adding User Interaction Methods
|
||||
|
||||
You can add the following basic interaction methods to scenes:
|
||||
|
||||
@@ -242,4 +222,16 @@
|
||||
|
||||
\endlist
|
||||
|
||||
\section1 Implementing Application Logic
|
||||
|
||||
A user interface is only a part of an application, and not really useful by itself.
|
||||
You can use Qt or JavaScript to implement the application logic. For more information on
|
||||
using JavaScript, see
|
||||
\l{http://qt-project.org/doc/qt-5.0/qtqml/qtqml-javascript-topic.html}
|
||||
{Integrating QML and JavaScript}.
|
||||
|
||||
For an example of how to use JavaScript to develop a game, see the
|
||||
\l{http://qt-project.org/doc/qt-5.0/qtquick/qtquick2-qml-advtutorial.html}
|
||||
{QML Advanced Tutorial}.
|
||||
|
||||
*/
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import qbs.base 1.0
|
||||
import "../../qbs/functions.js" as QtcFunctions
|
||||
import QtcFunctions
|
||||
|
||||
DynamicLibrary {
|
||||
Depends { name: "cpp" }
|
||||
@@ -22,11 +22,12 @@ DynamicLibrary {
|
||||
cpp.rpaths: qbs.targetOS.contains("osx")
|
||||
? ["@loader_path/..", "@executable_path/.."]
|
||||
: ["$ORIGIN", "$ORIGIN/.."]
|
||||
cpp.includePaths: [path]
|
||||
property string libIncludeBase: ".." // #include <lib/header.h>
|
||||
cpp.includePaths: [libIncludeBase]
|
||||
|
||||
Export {
|
||||
Depends { name: "cpp" }
|
||||
cpp.includePaths: [path]
|
||||
cpp.includePaths: [libIncludeBase]
|
||||
}
|
||||
|
||||
Group {
|
||||
@@ -1,6 +1,6 @@
|
||||
import qbs.base 1.0
|
||||
import qbs.FileInfo
|
||||
import "../../qbs/functions.js" as QtcFunctions
|
||||
import QtcFunctions
|
||||
|
||||
Product {
|
||||
type: ["dynamiclibrary", "pluginSpec"]
|
||||
@@ -33,7 +33,9 @@ Product {
|
||||
else if (qbs.buildVariant == "debug" && qbs.toolchain.contains("msvc"))
|
||||
return ["/INCREMENTAL:NO"] // Speed up startup time when debugging with cdb
|
||||
}
|
||||
cpp.includePaths: [path]
|
||||
|
||||
property string pluginIncludeBase: ".." // #include <plugin/header.h>
|
||||
cpp.includePaths: [pluginIncludeBase]
|
||||
|
||||
Group {
|
||||
name: "PluginSpec"
|
||||
@@ -55,6 +57,6 @@ Product {
|
||||
Export {
|
||||
Depends { name: "ExtensionSystem" }
|
||||
Depends { name: "cpp" }
|
||||
cpp.includePaths: [path]
|
||||
cpp.includePaths: [pluginIncludeBase]
|
||||
}
|
||||
}
|
||||
@@ -104,7 +104,7 @@ macx {
|
||||
copy_menu_nib_installer.commands = cp -R \"$$MENU_NIB\" \"$${INSTALLER_NAME}.app/Contents/Resources\"
|
||||
|
||||
codesign_installer.commands = codesign -s \"$(SIGNING_IDENTITY)\" $(SIGNING_FLAGS) \"$${INSTALLER_NAME}.app\"
|
||||
dmg_installer.commands = hdiutil create -srcfolder "$${INSTALLER_NAME}.app" -volname \"Qt Creator\" -format UDBZ "$${BASENAME}-installer.dmg" -ov -scrub -stretch 2g
|
||||
dmg_installer.commands = hdiutil create -srcfolder "$${INSTALLER_NAME}.app" -volname \"Qt Creator\" -format UDBZ "$${BASENAME}-installer.dmg" -ov -scrub -size 1g -verbose
|
||||
QMAKE_EXTRA_TARGETS += codesign_installer dmg_installer copy_menu_nib_installer
|
||||
}
|
||||
|
||||
|
||||
@@ -52,7 +52,7 @@ Project {
|
||||
"QT_NO_CAST_TO_ASCII",
|
||||
"QT_NO_CAST_FROM_ASCII"
|
||||
].concat(testsEnabled ? ["WITH_TESTS"] : [])
|
||||
moduleSearchPaths: "qbs"
|
||||
qbsSearchPaths: "qbs"
|
||||
|
||||
references: [
|
||||
"src/src.qbs",
|
||||
|
||||
@@ -12,7 +12,9 @@ cp -a "${sourceFolder}/" "${intermediateFolder}"
|
||||
ln -s /Applications "${intermediateFolder}"
|
||||
cp "$(dirname "${BASH_SOURCE[0]}")/../LICENSE.LGPL" "${intermediateFolder}/LICENSE_LGPL.txt"
|
||||
echo Creating image...
|
||||
hdiutil create -srcfolder "${intermediateFolder}" -volname "${title}" -format UDBZ "${finalDMGName}" -ov -scrub -stretch 2g
|
||||
hdiutil create -srcfolder "${intermediateFolder}" -volname "${title}" -format UDBZ "${finalDMGName}" -ov -scrub -size 1g -verbose
|
||||
# make sure that the image is umounted etc
|
||||
sleep 4
|
||||
|
||||
# clean up
|
||||
rm -rf "${intermediateFolder}"
|
||||
|
||||
@@ -44,10 +44,10 @@ import HelperWidgets 2.0
|
||||
Row {
|
||||
id: alignmentHorizontalButtons
|
||||
|
||||
Rectangle {
|
||||
RoundedPanel {
|
||||
width: 14
|
||||
height: parent.height
|
||||
color: "gray"
|
||||
roundLeft: true
|
||||
ExtendedFunctionButton {
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
backendValue: alignmentHorizontalButtons.backendValue
|
||||
@@ -106,6 +106,7 @@ Row {
|
||||
exclusive: true
|
||||
|
||||
ButtonRowButton {
|
||||
roundLeftButton: false
|
||||
iconSource: blueHighlight ? "images/alignmentleft-h-icon.png" : "images/alignmentleft-icon.png"
|
||||
onClicked: {
|
||||
if (checked)
|
||||
|
||||
@@ -44,10 +44,11 @@ import HelperWidgets 2.0
|
||||
Row {
|
||||
id: alignmentVerticalButtons
|
||||
|
||||
Rectangle {
|
||||
RoundedPanel {
|
||||
width: 14
|
||||
height: parent.height
|
||||
color: "gray"
|
||||
roundLeft: true
|
||||
|
||||
ExtendedFunctionButton {
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
backendValue: alignmentVerticalButtons.backendValue
|
||||
@@ -106,6 +107,7 @@ Row {
|
||||
exclusive: true
|
||||
|
||||
ButtonRowButton {
|
||||
roundLeftButton: false
|
||||
iconSource: blueHighlight ? "images/alignmenttop-h-icon.png" : "images/alignmenttop-icon.png"
|
||||
onClicked: {
|
||||
if (checked)
|
||||
|
||||
@@ -99,6 +99,6 @@ ButtonRowButton {
|
||||
ExtendedFunctionButton {
|
||||
backendValue: boolButtonRowButton.backendValue
|
||||
x: 0
|
||||
y: 2
|
||||
y: 4
|
||||
}
|
||||
}
|
||||
|
||||
@@ -35,12 +35,14 @@ Item {
|
||||
id: buttonRowButton
|
||||
property bool checked: false
|
||||
|
||||
property bool roundLeftButton: true
|
||||
|
||||
property alias iconSource: image.source
|
||||
|
||||
signal clicked()
|
||||
|
||||
width: 20 + leftPadding
|
||||
height: 20
|
||||
width: 24 + leftPadding
|
||||
height: 24
|
||||
|
||||
property int leftPadding: 0
|
||||
|
||||
@@ -52,9 +54,33 @@ Item {
|
||||
return -1;
|
||||
}
|
||||
|
||||
Rectangle {
|
||||
color: checked ? "black" : "gray"
|
||||
function isFirst() {
|
||||
return index() === 0;
|
||||
}
|
||||
|
||||
function isLast() {
|
||||
return index() === (parent.children.length - 1);
|
||||
}
|
||||
|
||||
RoundedPanel {
|
||||
roundLeft: isFirst() && roundLeftButton
|
||||
roundRight: isLast()
|
||||
|
||||
anchors.fill: parent
|
||||
visible: checked
|
||||
|
||||
gradient: Gradient {
|
||||
GradientStop {color: '#444' ; position: 0}
|
||||
GradientStop {color: '#333' ; position: 1}
|
||||
}
|
||||
}
|
||||
|
||||
RoundedPanel {
|
||||
roundLeft: isFirst()
|
||||
roundRight: isLast()
|
||||
|
||||
anchors.fill: parent
|
||||
visible: !checked
|
||||
}
|
||||
|
||||
Image {
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
****************************************************************************/
|
||||
|
||||
import QtQuick 2.1
|
||||
import QtQuick.Controls 1.0
|
||||
import QtQuick.Controls 1.0 as Controls
|
||||
|
||||
Item {
|
||||
id: colorButton
|
||||
@@ -271,6 +271,9 @@ Item {
|
||||
Label {
|
||||
text: "H:"
|
||||
width: 16
|
||||
color: "#eee"
|
||||
elide: Text.ElideRight
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
}
|
||||
SliderSpinBox {
|
||||
id: hueSlider2
|
||||
@@ -289,9 +292,12 @@ Item {
|
||||
Row {
|
||||
z: 2
|
||||
spacing: 4
|
||||
Label {
|
||||
Controls.Label {
|
||||
text: "S:"
|
||||
width: 16
|
||||
color: "#eee"
|
||||
elide: Text.ElideRight
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
}
|
||||
|
||||
SliderSpinBox {
|
||||
@@ -311,9 +317,12 @@ Item {
|
||||
Row {
|
||||
z: 1
|
||||
spacing: 4
|
||||
Label {
|
||||
Controls.Label {
|
||||
text: "L:"
|
||||
width: 16
|
||||
color: "#eee"
|
||||
elide: Text.ElideRight
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
}
|
||||
SliderSpinBox {
|
||||
id: lightnessSlider
|
||||
@@ -332,9 +341,12 @@ Item {
|
||||
Row {
|
||||
z: 0
|
||||
spacing: 4
|
||||
Label {
|
||||
Controls.Label {
|
||||
text: "A:"
|
||||
width: 16
|
||||
color: "#eee"
|
||||
elide: Text.ElideRight
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
}
|
||||
|
||||
SliderSpinBox {
|
||||
@@ -348,7 +360,6 @@ Item {
|
||||
if (colorButton.alpha !== value)
|
||||
colorButton.alpha = value
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -29,9 +29,11 @@
|
||||
|
||||
import QtQuick 2.1
|
||||
import QtQuick.Controls 1.1 as Controls
|
||||
import QtQuick.Controls.Styles 1.1
|
||||
|
||||
Controls.ComboBox {
|
||||
id: comboBox
|
||||
|
||||
property variant backendValue
|
||||
|
||||
QtObject {
|
||||
@@ -46,7 +48,6 @@ Controls.ComboBox {
|
||||
backendValue.value = currentText;
|
||||
}
|
||||
|
||||
|
||||
onFocusChanged: {
|
||||
if (focus) {
|
||||
transaction.start();
|
||||
@@ -55,5 +56,6 @@ Controls.ComboBox {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
style: CustomComboBoxStyle {
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,92 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
|
||||
** Contact: http://www.qt-project.org/legal
|
||||
**
|
||||
** 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 Digia. For licensing terms and
|
||||
** conditions see http://qt.digia.com/licensing. For further information
|
||||
** use the contact form at http://qt.digia.com/contact-us.
|
||||
**
|
||||
** GNU Lesser General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
** General Public License version 2.1 as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.LGPL included in the
|
||||
** packaging of this file. Please review the following information to
|
||||
** ensure the GNU Lesser General Public License version 2.1 requirements
|
||||
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
**
|
||||
** In addition, as a special exception, Digia gives you certain additional
|
||||
** rights. These rights are described in the Digia Qt LGPL Exception
|
||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
import QtQuick 2.1
|
||||
import QtQuick.Controls 1.1 as Controls
|
||||
import QtQuick.Controls.Styles 1.1
|
||||
|
||||
ComboBoxStyle {
|
||||
property color borderColor: "#222"
|
||||
property color highlightColor: "orange"
|
||||
property color textColor: "#eee"
|
||||
|
||||
background: Item {
|
||||
implicitWidth: 100
|
||||
implicitHeight: 25
|
||||
|
||||
RoundedPanel {
|
||||
anchors.fill: parent
|
||||
roundLeft: true
|
||||
roundRight: true
|
||||
visible: !control.pressed
|
||||
}
|
||||
|
||||
RoundedPanel {
|
||||
gradient: Gradient {
|
||||
GradientStop {color: '#444' ; position: 0}
|
||||
GradientStop {color: '#333' ; position: 1}
|
||||
}
|
||||
anchors.fill: parent
|
||||
roundLeft: true
|
||||
roundRight: true
|
||||
visible: control.pressed
|
||||
}
|
||||
|
||||
Rectangle {
|
||||
border.color: highlightColor
|
||||
anchors.fill: parent
|
||||
anchors.margins: -1
|
||||
color: "transparent"
|
||||
radius: 4
|
||||
opacity: 0.3
|
||||
visible: control.activeFocus
|
||||
}
|
||||
Image {
|
||||
id: imageItem
|
||||
source: "images/down-arrow.png"
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
anchors.right: parent.right
|
||||
anchors.rightMargin: 8
|
||||
opacity: control.enabled ? 0.7 : 0.5
|
||||
}
|
||||
}
|
||||
|
||||
label: Item {
|
||||
implicitWidth: textitem.implicitWidth + 20
|
||||
Text {
|
||||
id: textitem
|
||||
anchors.left: parent.left
|
||||
anchors.leftMargin: 4
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
text: control.currentText
|
||||
renderType: Text.NativeRendering
|
||||
color: textColor
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,86 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
|
||||
** Contact: http://www.qt-project.org/legal
|
||||
**
|
||||
** 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 Digia. For licensing terms and
|
||||
** conditions see http://qt.digia.com/licensing. For further information
|
||||
** use the contact form at http://qt.digia.com/contact-us.
|
||||
**
|
||||
** GNU Lesser General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
** General Public License version 2.1 as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.LGPL included in the
|
||||
** packaging of this file. Please review the following information to
|
||||
** ensure the GNU Lesser General Public License version 2.1 requirements
|
||||
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
**
|
||||
** In addition, as a special exception, Digia gives you certain additional
|
||||
** rights. These rights are described in the Digia Qt LGPL Exception
|
||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
import QtQuick 2.1
|
||||
import QtQuick.Controls 1.1 as Controls
|
||||
import QtQuick.Controls.Styles 1.1
|
||||
|
||||
SpinBoxStyle {
|
||||
|
||||
selectionColor: spinBox.textColor
|
||||
selectedTextColor: "black"
|
||||
textColor: spinBox.textColor
|
||||
padding.top: 3
|
||||
padding.bottom: 1
|
||||
|
||||
incrementControl: Item {
|
||||
implicitWidth: 14
|
||||
implicitHeight: parent.height/2
|
||||
opacity: styleData.upEnabled ? styleData.upPressed ? 0.5 : 1 : 0.5
|
||||
Image {
|
||||
source: "images/up-arrow.png"
|
||||
anchors.centerIn: parent
|
||||
anchors.verticalCenterOffset: 2
|
||||
anchors.horizontalCenterOffset: -4
|
||||
}
|
||||
}
|
||||
|
||||
decrementControl: Item {
|
||||
implicitWidth: 14
|
||||
implicitHeight: parent.height/2
|
||||
opacity: styleData.downEnabled ? styleData.downPressed ? 0.5 : 1 : 0.5
|
||||
Image {
|
||||
source: "images/down-arrow.png"
|
||||
anchors.centerIn: parent
|
||||
anchors.verticalCenterOffset: -1
|
||||
anchors.horizontalCenterOffset: -4
|
||||
}
|
||||
}
|
||||
|
||||
background: Rectangle {
|
||||
implicitWidth: Math.max(60, styleData.contentWidth)
|
||||
implicitHeight: 23
|
||||
border.color: borderColor
|
||||
radius: 3
|
||||
gradient: Gradient {
|
||||
GradientStop {color: "#2c2c2c" ; position: 0}
|
||||
GradientStop {color: "#343434" ; position: 0.15}
|
||||
GradientStop {color: "#373737" ; position: 1}
|
||||
}
|
||||
Rectangle {
|
||||
border.color: highlightColor
|
||||
anchors.fill: parent
|
||||
anchors.margins: -1
|
||||
color: "transparent"
|
||||
radius: 4
|
||||
opacity: 0.3
|
||||
visible: control.activeFocus
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,177 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
|
||||
** Contact: http://www.qt-project.org/legal
|
||||
**
|
||||
** This file is part of the Qt Quick Controls module of the Qt Toolkit.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:BSD$
|
||||
** You may use this file under the terms of the BSD license as follows:
|
||||
**
|
||||
** "Redistribution and use in source and binary forms, with or without
|
||||
** modification, are permitted provided that the following conditions are
|
||||
** met:
|
||||
** * Redistributions of source code must retain the above copyright
|
||||
** notice, this list of conditions and the following disclaimer.
|
||||
** * Redistributions in binary form must reproduce the above copyright
|
||||
** notice, this list of conditions and the following disclaimer in
|
||||
** the documentation and/or other materials provided with the
|
||||
** distribution.
|
||||
** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
|
||||
** of its contributors may be used to endorse or promote products derived
|
||||
** from this software without specific prior written permission.
|
||||
**
|
||||
**
|
||||
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
import QtQuick 2.1
|
||||
import HelperWidgets 2.0
|
||||
import QtQuick.Layouts 1.0
|
||||
|
||||
Section {
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
caption: qsTr("Flickable")
|
||||
|
||||
SectionLayout {
|
||||
Label {
|
||||
text: qsTr("Content size")
|
||||
}
|
||||
|
||||
SecondColumnLayout {
|
||||
|
||||
Label {
|
||||
text: "W"
|
||||
width: 12
|
||||
}
|
||||
|
||||
SpinBox {
|
||||
backendValue: backendValues.contentWidth
|
||||
minimumValue: 0
|
||||
maximumValue: 8000
|
||||
}
|
||||
|
||||
Label {
|
||||
text: "W"
|
||||
width: 12
|
||||
}
|
||||
|
||||
SpinBox {
|
||||
backendValue: backendValues.contentHeight
|
||||
minimumValue: 0
|
||||
maximumValue: 8000
|
||||
|
||||
}
|
||||
|
||||
ExpandingSpacer {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Label {
|
||||
text: qsTr("Flick direction")
|
||||
}
|
||||
|
||||
SecondColumnLayout {
|
||||
ComboBox {
|
||||
backendValue: backendValues.flickableDirection
|
||||
model: ["AutoFlickDirection", "HorizontalFlick", "VerticalFlick", "HorizontalAndVerticalFlick"]
|
||||
}
|
||||
|
||||
ExpandingSpacer {
|
||||
}
|
||||
}
|
||||
|
||||
Label {
|
||||
text: qsTr("Behavior")
|
||||
toolTip: qsTr("Bounds behavior")
|
||||
}
|
||||
|
||||
SecondColumnLayout {
|
||||
ComboBox {
|
||||
backendValue: backendValues.boundsBehavior
|
||||
model: ["StopAtBounds", "DragOverBounds", "DragAndOvershootBounds"]
|
||||
}
|
||||
|
||||
ExpandingSpacer {
|
||||
}
|
||||
}
|
||||
|
||||
Label {
|
||||
text: qsTr("Behavior")
|
||||
toolTip: qsTr("Bounds behavior")
|
||||
}
|
||||
|
||||
SecondColumnLayout {
|
||||
ComboBox {
|
||||
backendValue: backendValues.boundsBehavior
|
||||
model: ["StopAtBounds", "DragOverBounds", "DragAndOvershootBounds"]
|
||||
}
|
||||
|
||||
ExpandingSpacer {
|
||||
}
|
||||
}
|
||||
|
||||
Label {
|
||||
text:qsTr("Interactive")
|
||||
}
|
||||
|
||||
SecondColumnLayout {
|
||||
CheckBox {
|
||||
backendValue: backendValues.interactive
|
||||
}
|
||||
|
||||
ExpandingSpacer {
|
||||
}
|
||||
}
|
||||
|
||||
Label {
|
||||
text: qsTr("Max. velocity")
|
||||
toolTip: qsTr("Maximum flick velocity")
|
||||
}
|
||||
|
||||
SecondColumnLayout {
|
||||
SpinBox {
|
||||
backendValue: backendValues.maximumFlickVelocity
|
||||
minimumValue: 0
|
||||
maximumValue: 8000
|
||||
decimals: 0
|
||||
}
|
||||
|
||||
ExpandingSpacer {
|
||||
}
|
||||
}
|
||||
|
||||
Label {
|
||||
text: qsTr("Deceleration")
|
||||
toolTip: qsTr("Flick deceleration")
|
||||
}
|
||||
|
||||
SecondColumnLayout {
|
||||
SpinBox {
|
||||
backendValue: backendValues.flickDeceleration
|
||||
minimumValue: 0
|
||||
maximumValue: 8000
|
||||
decimals: 0
|
||||
}
|
||||
|
||||
ExpandingSpacer {
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@@ -119,6 +119,10 @@ Section {
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
style: CustomComboBoxStyle {
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -34,6 +34,8 @@ import QtQuick.Layouts 1.0
|
||||
Controls.Label {
|
||||
id: label
|
||||
|
||||
property string toolTip: ""
|
||||
|
||||
width: parent.width < 300 ? 80 : Math.min(140, parent.width - 220)
|
||||
color: "#eee"
|
||||
elide: Text.ElideRight
|
||||
|
||||
@@ -0,0 +1,97 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
|
||||
** Contact: http://www.qt-project.org/legal
|
||||
**
|
||||
** This file is part of the Qt Quick Controls module of the Qt Toolkit.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:BSD$
|
||||
** You may use this file under the terms of the BSD license as follows:
|
||||
**
|
||||
** "Redistribution and use in source and binary forms, with or without
|
||||
** modification, are permitted provided that the following conditions are
|
||||
** met:
|
||||
** * Redistributions of source code must retain the above copyright
|
||||
** notice, this list of conditions and the following disclaimer.
|
||||
** * Redistributions in binary form must reproduce the above copyright
|
||||
** notice, this list of conditions and the following disclaimer in
|
||||
** the documentation and/or other materials provided with the
|
||||
** distribution.
|
||||
** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
|
||||
** of its contributors may be used to endorse or promote products derived
|
||||
** from this software without specific prior written permission.
|
||||
**
|
||||
**
|
||||
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
import QtQuick 2.1
|
||||
import QtQuick.Controls 1.0 as Controls
|
||||
import QtQuick.Layouts 1.0
|
||||
|
||||
Rectangle {
|
||||
|
||||
property bool roundLeft: false
|
||||
property bool roundRight: false
|
||||
|
||||
|
||||
radius: roundLeft || roundRight ? 4 : 0
|
||||
gradient: Gradient {
|
||||
GradientStop {color: '#555' ; position: 0}
|
||||
GradientStop {color: '#444' ; position: 1}
|
||||
}
|
||||
|
||||
border.width: roundLeft || roundRight ? 1 : 0
|
||||
border.color: roundLeft ? "#7f7f7f" : "#2e2e2e"
|
||||
|
||||
Rectangle {
|
||||
gradient: parent.gradient
|
||||
anchors.fill: parent
|
||||
visible: roundLeft
|
||||
anchors.leftMargin: 10
|
||||
anchors.topMargin: 1
|
||||
anchors.bottomMargin: 1
|
||||
}
|
||||
|
||||
Rectangle {
|
||||
gradient: parent.gradient
|
||||
anchors.fill: parent
|
||||
visible: roundRight
|
||||
anchors.rightMargin: 10
|
||||
anchors.topMargin: 1
|
||||
anchors.bottomMargin: 1
|
||||
}
|
||||
|
||||
Rectangle {
|
||||
color: "#7f7f7f"
|
||||
anchors.top: parent.top
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
height: 1
|
||||
anchors.leftMargin: roundLeft ? 3 : 0
|
||||
anchors.rightMargin: roundRight ? 3 : 0
|
||||
}
|
||||
|
||||
Rectangle {
|
||||
color: "#2e2e2e"
|
||||
anchors.bottom: parent.bottom
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
height: 1
|
||||
anchors.leftMargin: roundLeft ? 2 : 0
|
||||
anchors.rightMargin: roundRight ? 2 : 0
|
||||
}
|
||||
}
|
||||
@@ -34,6 +34,10 @@ SpinBox {
|
||||
id: spinBox
|
||||
width: 76
|
||||
|
||||
property color borderColor: "#222"
|
||||
property color highlightColor: "orange"
|
||||
property color textColor: "#eee"
|
||||
|
||||
function showSlider() {
|
||||
timer.stop()
|
||||
timer2.start()
|
||||
@@ -106,4 +110,8 @@ SpinBox {
|
||||
slider.opacity = 0;
|
||||
}
|
||||
}
|
||||
|
||||
style: CustomSpinBoxStyle {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -90,57 +90,6 @@ Controls.SpinBox {
|
||||
}
|
||||
}
|
||||
|
||||
style: SpinBoxStyle {
|
||||
|
||||
selectionColor: spinBox.textColor
|
||||
selectedTextColor: "black"
|
||||
textColor: spinBox.textColor
|
||||
padding.top: 3
|
||||
padding.bottom: 1
|
||||
|
||||
incrementControl: Item {
|
||||
implicitWidth: 14
|
||||
implicitHeight: parent.height/2
|
||||
opacity: styleData.upEnabled ? styleData.upPressed ? 0.5 : 1 : 0.5
|
||||
Image {
|
||||
source: "images/up-arrow.png"
|
||||
anchors.centerIn: parent
|
||||
anchors.verticalCenterOffset: 2
|
||||
anchors.horizontalCenterOffset: -4
|
||||
}
|
||||
}
|
||||
|
||||
decrementControl: Item {
|
||||
implicitWidth: 14
|
||||
implicitHeight: parent.height/2
|
||||
opacity: styleData.downEnabled ? styleData.downPressed ? 0.5 : 1 : 0.5
|
||||
Image {
|
||||
source: "images/down-arrow.png"
|
||||
anchors.centerIn: parent
|
||||
anchors.verticalCenterOffset: -1
|
||||
anchors.horizontalCenterOffset: -4
|
||||
}
|
||||
}
|
||||
|
||||
background: Rectangle {
|
||||
implicitWidth: Math.max(60, styleData.contentWidth)
|
||||
implicitHeight: 23
|
||||
border.color: borderColor
|
||||
radius: 3
|
||||
gradient: Gradient {
|
||||
GradientStop {color: "#2c2c2c" ; position: 0}
|
||||
GradientStop {color: "#343434" ; position: 0.15}
|
||||
GradientStop {color: "#373737" ; position: 1}
|
||||
}
|
||||
Rectangle {
|
||||
border.color: highlightColor
|
||||
anchors.fill: parent
|
||||
anchors.margins: -1
|
||||
color: "transparent"
|
||||
radius: 4
|
||||
opacity: 0.3
|
||||
visible: control.activeFocus
|
||||
}
|
||||
}
|
||||
style: CustomSpinBoxStyle {
|
||||
}
|
||||
}
|
||||
|
||||
@@ -29,3 +29,4 @@ AligmentHorizontalButtons 2.0 AligmentHorizontalButtons.qml
|
||||
AligmentVerticalButtons 2.0 AligmentVerticalButtons.qml
|
||||
StandardTextSection 2.0 StandardTextSection.qml
|
||||
FontSection 2.0 FontSection.qml
|
||||
FlickableSection 2.0 FlickableSection.qml
|
||||
|
||||
@@ -34,13 +34,13 @@ import QtQuick.Layouts 1.0
|
||||
Section {
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
caption: "Advanced"
|
||||
caption: qsTr("Advanced")
|
||||
|
||||
SectionLayout {
|
||||
rows: 3
|
||||
|
||||
Label {
|
||||
text: "Scale"
|
||||
text: qsTr("Scale")
|
||||
}
|
||||
|
||||
SecondColumnLayout {
|
||||
@@ -57,7 +57,7 @@ Section {
|
||||
}
|
||||
}
|
||||
Label {
|
||||
text: "Rotation"
|
||||
text: qsTr("Rotation")
|
||||
}
|
||||
SecondColumnLayout {
|
||||
SpinBox {
|
||||
|
||||
@@ -0,0 +1,198 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
|
||||
** Contact: http://www.qt-project.org/legal
|
||||
**
|
||||
** 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 Digia. For licensing terms and
|
||||
** conditions see http://qt.digia.com/licensing. For further information
|
||||
** use the contact form at http://qt.digia.com/contact-us.
|
||||
**
|
||||
** GNU Lesser General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
** General Public License version 2.1 as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.LGPL included in the
|
||||
** packaging of this file. Please review the following information to
|
||||
** ensure the GNU Lesser General Public License version 2.1 requirements
|
||||
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
**
|
||||
** In addition, as a special exception, Digia gives you certain additional
|
||||
** rights. These rights are described in the Digia Qt LGPL Exception
|
||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
import QtQuick 2.1
|
||||
import HelperWidgets 2.0
|
||||
import QtQuick.Layouts 1.0
|
||||
|
||||
Column {
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
|
||||
Section {
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
caption: qsTr("Border Image")
|
||||
|
||||
SectionLayout {
|
||||
Label {
|
||||
text: qsTr("Source")
|
||||
}
|
||||
|
||||
SecondColumnLayout {
|
||||
LineEdit {
|
||||
backendValue: backendValues.source
|
||||
implicitWidth: 180
|
||||
}
|
||||
ExpandingSpacer {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Label {
|
||||
text: qsTr("Border Left")
|
||||
}
|
||||
|
||||
SecondColumnLayout {
|
||||
|
||||
SpinBox {
|
||||
backendValue: backendValues.border_left
|
||||
minimumValue: -2000
|
||||
maximumValue: 2000
|
||||
decimals: 0
|
||||
}
|
||||
|
||||
ExpandingSpacer {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Label {
|
||||
text: qsTr("Border Right")
|
||||
}
|
||||
|
||||
SecondColumnLayout {
|
||||
|
||||
SpinBox {
|
||||
backendValue: backendValues.border_right
|
||||
minimumValue: -2000
|
||||
maximumValue: 2000
|
||||
decimals: 0
|
||||
}
|
||||
|
||||
ExpandingSpacer {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Label {
|
||||
text: qsTr("Border Top")
|
||||
}
|
||||
|
||||
SecondColumnLayout {
|
||||
|
||||
SpinBox {
|
||||
backendValue: backendValues.border_top
|
||||
minimumValue: -2000
|
||||
maximumValue: 2000
|
||||
decimals: 0
|
||||
}
|
||||
|
||||
ExpandingSpacer {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Label {
|
||||
text: qsTr("Border Bottom")
|
||||
}
|
||||
|
||||
SecondColumnLayout {
|
||||
|
||||
SpinBox {
|
||||
backendValue: backendValues.border_bottom
|
||||
minimumValue: -2000
|
||||
maximumValue: 2000
|
||||
decimals: 0
|
||||
}
|
||||
|
||||
ExpandingSpacer {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Label {
|
||||
text: qsTr("Horizontal Fill mode")
|
||||
}
|
||||
|
||||
SecondColumnLayout {
|
||||
ComboBox {
|
||||
model: ["Stretch", "Repeat", "Round"]
|
||||
backendValue: backendValues.horizontalTileMode
|
||||
implicitWidth: 180
|
||||
}
|
||||
|
||||
ExpandingSpacer {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Label {
|
||||
text: qsTr("Vertical Fill mode")
|
||||
}
|
||||
|
||||
SecondColumnLayout {
|
||||
ComboBox {
|
||||
model: ["Stretch", "Repeat", "Round"]
|
||||
backendValue: backendValues.verticalTileMode
|
||||
implicitWidth: 180
|
||||
}
|
||||
|
||||
ExpandingSpacer {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Label {
|
||||
text: qsTr("Source size")
|
||||
}
|
||||
|
||||
SecondColumnLayout {
|
||||
Label {
|
||||
text: "W"
|
||||
width: 12
|
||||
}
|
||||
|
||||
SpinBox {
|
||||
backendValue: backendValues.sourceSize_width
|
||||
minimumValue: -2000
|
||||
maximumValue: 2000
|
||||
decimals: 0
|
||||
}
|
||||
|
||||
Label {
|
||||
text: "H"
|
||||
width: 12
|
||||
}
|
||||
|
||||
SpinBox {
|
||||
backendValue: backendValues.sourceSize_height
|
||||
minimumValue: -2000
|
||||
maximumValue: 2000
|
||||
decimals: 0
|
||||
}
|
||||
|
||||
ExpandingSpacer {
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,60 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
|
||||
** Contact: http://www.qt-project.org/legal
|
||||
**
|
||||
** 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 Digia. For licensing terms and
|
||||
** conditions see http://qt.digia.com/licensing. For further information
|
||||
** use the contact form at http://qt.digia.com/contact-us.
|
||||
**
|
||||
** GNU Lesser General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
** General Public License version 2.1 as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.LGPL included in the
|
||||
** packaging of this file. Please review the following information to
|
||||
** ensure the GNU Lesser General Public License version 2.1 requirements
|
||||
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
**
|
||||
** In addition, as a special exception, Digia gives you certain additional
|
||||
** rights. These rights are described in the Digia Qt LGPL Exception
|
||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
import QtQuick 2.1
|
||||
import HelperWidgets 2.0
|
||||
import QtQuick.Layouts 1.0
|
||||
|
||||
Column {
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
|
||||
Section {
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
caption: qsTr("Column")
|
||||
|
||||
Label {
|
||||
text: qsTr("Spacing")
|
||||
}
|
||||
|
||||
SecondColumnLayout {
|
||||
SpinBox {
|
||||
backendValue: backendValues.spacing
|
||||
minimumValue: 0
|
||||
maximumValue: 2000
|
||||
decimals: 0
|
||||
}
|
||||
|
||||
ExpandingSpacer {
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
|
||||
** Contact: http://www.qt-project.org/legal
|
||||
**
|
||||
** 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 Digia. For licensing terms and
|
||||
** conditions see http://qt.digia.com/licensing. For further information
|
||||
** use the contact form at http://qt.digia.com/contact-us.
|
||||
**
|
||||
** GNU Lesser General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
** General Public License version 2.1 as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.LGPL included in the
|
||||
** packaging of this file. Please review the following information to
|
||||
** ensure the GNU Lesser General Public License version 2.1 requirements
|
||||
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
**
|
||||
** In addition, as a special exception, Digia gives you certain additional
|
||||
** rights. These rights are described in the Digia Qt LGPL Exception
|
||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
import QtQuick 2.1
|
||||
import HelperWidgets 2.0
|
||||
import QtQuick.Layouts 1.0
|
||||
|
||||
Column {
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
|
||||
FlickableSection {
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,43 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
|
||||
** Contact: http://www.qt-project.org/legal
|
||||
**
|
||||
** 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 Digia. For licensing terms and
|
||||
** conditions see http://qt.digia.com/licensing. For further information
|
||||
** use the contact form at http://qt.digia.com/contact-us.
|
||||
**
|
||||
** GNU Lesser General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
** General Public License version 2.1 as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.LGPL included in the
|
||||
** packaging of this file. Please review the following information to
|
||||
** ensure the GNU Lesser General Public License version 2.1 requirements
|
||||
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
**
|
||||
** In addition, as a special exception, Digia gives you certain additional
|
||||
** rights. These rights are described in the Digia Qt LGPL Exception
|
||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
import QtQuick 2.1
|
||||
import HelperWidgets 2.0
|
||||
import QtQuick.Layouts 1.0
|
||||
|
||||
Column {
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
|
||||
Section {
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
caption: qsTr("Flipable")
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,91 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
|
||||
** Contact: http://www.qt-project.org/legal
|
||||
**
|
||||
** 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 Digia. For licensing terms and
|
||||
** conditions see http://qt.digia.com/licensing. For further information
|
||||
** use the contact form at http://qt.digia.com/contact-us.
|
||||
**
|
||||
** GNU Lesser General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
** General Public License version 2.1 as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.LGPL included in the
|
||||
** packaging of this file. Please review the following information to
|
||||
** ensure the GNU Lesser General Public License version 2.1 requirements
|
||||
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
**
|
||||
** In addition, as a special exception, Digia gives you certain additional
|
||||
** rights. These rights are described in the Digia Qt LGPL Exception
|
||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
import QtQuick 2.1
|
||||
import HelperWidgets 2.0
|
||||
import QtQuick.Layouts 1.0
|
||||
|
||||
Column {
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
|
||||
Section {
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
caption: qsTr("Flow")
|
||||
|
||||
SectionLayout {
|
||||
Label {
|
||||
text: qsTr("Flow")
|
||||
}
|
||||
|
||||
SecondColumnLayout {
|
||||
ComboBox {
|
||||
model: ["LeftToRight", "TopToBottom"]
|
||||
backendValue: backendValues.flow
|
||||
}
|
||||
|
||||
ExpandingSpacer {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Label {
|
||||
text: qsTr("Layout Direction")
|
||||
}
|
||||
|
||||
SecondColumnLayout {
|
||||
ComboBox {
|
||||
model: ["LeftToRight", "RightToLeft"]
|
||||
backendValue: backendValues.layoutDirection
|
||||
}
|
||||
|
||||
ExpandingSpacer {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Label {
|
||||
text: qsTr("Spacing")
|
||||
}
|
||||
|
||||
SecondColumnLayout {
|
||||
SpinBox {
|
||||
backendValue: backendValues.spacing
|
||||
minimumValue: 0
|
||||
maximumValue: 2000
|
||||
decimals: 0
|
||||
}
|
||||
|
||||
ExpandingSpacer {
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -43,7 +43,7 @@ import HelperWidgets 2.0
|
||||
import QtQuick.Layouts 1.0
|
||||
|
||||
Section {
|
||||
caption: "Geometry"
|
||||
caption: qsTr("Geometry")
|
||||
|
||||
SectionLayout {
|
||||
columnSpacing: 6
|
||||
@@ -51,7 +51,7 @@ Section {
|
||||
rows: 2
|
||||
|
||||
Label {
|
||||
text: "Position"
|
||||
text: qsTr("Position")
|
||||
}
|
||||
|
||||
SecondColumnLayout {
|
||||
@@ -81,7 +81,7 @@ Section {
|
||||
ExpandingSpacer{}
|
||||
}
|
||||
Label {
|
||||
text: "Size"
|
||||
text: qsTr("Size")
|
||||
}
|
||||
|
||||
SecondColumnLayout {
|
||||
|
||||
@@ -0,0 +1,125 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
|
||||
** Contact: http://www.qt-project.org/legal
|
||||
**
|
||||
** 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 Digia. For licensing terms and
|
||||
** conditions see http://qt.digia.com/licensing. For further information
|
||||
** use the contact form at http://qt.digia.com/contact-us.
|
||||
**
|
||||
** GNU Lesser General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
** General Public License version 2.1 as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.LGPL included in the
|
||||
** packaging of this file. Please review the following information to
|
||||
** ensure the GNU Lesser General Public License version 2.1 requirements
|
||||
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
**
|
||||
** In addition, as a special exception, Digia gives you certain additional
|
||||
** rights. These rights are described in the Digia Qt LGPL Exception
|
||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
import QtQuick 2.1
|
||||
import HelperWidgets 2.0
|
||||
import QtQuick.Layouts 1.0
|
||||
|
||||
Column {
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
|
||||
Section {
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
caption: qsTr("Grid")
|
||||
|
||||
|
||||
SectionLayout {
|
||||
|
||||
Label {
|
||||
text: qsTr("Columns")
|
||||
}
|
||||
|
||||
SecondColumnLayout {
|
||||
SpinBox {
|
||||
backendValue: backendValues.columns
|
||||
minimumValue: 0
|
||||
maximumValue: 2000
|
||||
decimals: 0
|
||||
}
|
||||
|
||||
ExpandingSpacer {
|
||||
}
|
||||
}
|
||||
|
||||
Label {
|
||||
text: qsTr("Rows")
|
||||
}
|
||||
|
||||
SecondColumnLayout {
|
||||
SpinBox {
|
||||
backendValue: backendValues.rows
|
||||
minimumValue: 0
|
||||
maximumValue: 2000
|
||||
decimals: 0
|
||||
}
|
||||
|
||||
ExpandingSpacer {
|
||||
}
|
||||
}
|
||||
|
||||
Label {
|
||||
text: qsTr("Flow")
|
||||
}
|
||||
|
||||
SecondColumnLayout {
|
||||
ComboBox {
|
||||
model: ["LeftToRight", "TopToBottom"]
|
||||
backendValue: backendValues.flow
|
||||
}
|
||||
|
||||
ExpandingSpacer {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Label {
|
||||
text: qsTr("Layout Direction")
|
||||
}
|
||||
|
||||
SecondColumnLayout {
|
||||
ComboBox {
|
||||
model: ["LeftToRight", "RightToLeft"]
|
||||
backendValue: backendValues.layoutDirection
|
||||
}
|
||||
|
||||
ExpandingSpacer {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Label {
|
||||
text: qsTr("Spacing")
|
||||
}
|
||||
|
||||
SecondColumnLayout {
|
||||
SpinBox {
|
||||
backendValue: backendValues.spacing
|
||||
minimumValue: 0
|
||||
maximumValue: 2000
|
||||
decimals: 0
|
||||
}
|
||||
|
||||
ExpandingSpacer {
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,281 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
|
||||
** Contact: http://www.qt-project.org/legal
|
||||
**
|
||||
** 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 Digia. For licensing terms and
|
||||
** conditions see http://qt.digia.com/licensing. For further information
|
||||
** use the contact form at http://qt.digia.com/contact-us.
|
||||
**
|
||||
** GNU Lesser General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
** General Public License version 2.1 as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.LGPL included in the
|
||||
** packaging of this file. Please review the following information to
|
||||
** ensure the GNU Lesser General Public License version 2.1 requirements
|
||||
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
**
|
||||
** In addition, as a special exception, Digia gives you certain additional
|
||||
** rights. These rights are described in the Digia Qt LGPL Exception
|
||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
import QtQuick 2.1
|
||||
import HelperWidgets 2.0
|
||||
import QtQuick.Layouts 1.0
|
||||
|
||||
Column {
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
|
||||
FlickableSection {
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
}
|
||||
|
||||
Section {
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
caption: qsTr("Grid View")
|
||||
|
||||
SectionLayout {
|
||||
|
||||
Label {
|
||||
text: qsTr("Cache")
|
||||
toolTip: qsTr("Cache buffer")
|
||||
}
|
||||
|
||||
SectionLayout {
|
||||
SpinBox {
|
||||
backendValue: backendValues.cacheBuffer
|
||||
minimumValue: 0;
|
||||
maximumValue: 1000;
|
||||
decimals: 0
|
||||
}
|
||||
|
||||
ExpandingSpacer {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Label {
|
||||
text: qsTr("Cell Size")
|
||||
}
|
||||
|
||||
SecondColumnLayout {
|
||||
|
||||
Label {
|
||||
text: "W"
|
||||
width: 12
|
||||
}
|
||||
|
||||
SpinBox {
|
||||
backendValue: backendValues.cellWidth
|
||||
minimumValue: 0;
|
||||
maximumValue: 1000;
|
||||
decimals: 0
|
||||
}
|
||||
|
||||
Label {
|
||||
text: "H"
|
||||
width: 12
|
||||
}
|
||||
|
||||
SpinBox {
|
||||
backendValue: backendValues.cellHeight
|
||||
minimumValue: 0;
|
||||
maximumValue: 1000;
|
||||
decimals: 0
|
||||
}
|
||||
|
||||
ExpandingSpacer {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Label {
|
||||
text: qsTr("Flow")
|
||||
}
|
||||
|
||||
SecondColumnLayout {
|
||||
ComboBox {
|
||||
model: ["LeftToRight", "TopToBottom"]
|
||||
backendValue: backendValues.flow
|
||||
}
|
||||
|
||||
ExpandingSpacer {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Label {
|
||||
text: qsTr("Navigation wraps")
|
||||
toolTip: qsTr("Determines whether the grid wraps key navigation.")
|
||||
}
|
||||
|
||||
SectionLayout {
|
||||
CheckBox {
|
||||
backendValue: backendValues.keyNavigationWraps
|
||||
}
|
||||
|
||||
ExpandingSpacer {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Label {
|
||||
text: qsTr("Layout Direction")
|
||||
}
|
||||
|
||||
SecondColumnLayout {
|
||||
ComboBox {
|
||||
model: ["LeftToRight", "RightToLeft"]
|
||||
backendValue: backendValues.layoutDirection
|
||||
}
|
||||
|
||||
ExpandingSpacer {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Label {
|
||||
text: qsTr("Snap mode")
|
||||
toolTip: qsTr("Determines how the view scrolling will settle following a drag or flick.")
|
||||
}
|
||||
|
||||
SecondColumnLayout {
|
||||
ComboBox {
|
||||
model: ["NoSnap", "SnapToRow", "SnapOneRow"]
|
||||
backendValue: backendValues.snapMode
|
||||
}
|
||||
|
||||
ExpandingSpacer {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Section {
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
caption: qsTr("Grid View Highlight")
|
||||
|
||||
SectionLayout {
|
||||
|
||||
Label {
|
||||
text: qsTr("Range")
|
||||
toolTip: qsTr("Highlight range")
|
||||
}
|
||||
|
||||
SecondColumnLayout {
|
||||
ComboBox {
|
||||
model: ["NoHighlightRange", "ApplyRange", "StrictlyEnforceRange"]
|
||||
backendValue: backendValues.highlightRangeMode
|
||||
}
|
||||
|
||||
ExpandingSpacer {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Label {
|
||||
text: qsTr("Move duration")
|
||||
toolTip: qsTr("Move animation duration of the highlight delegate.")
|
||||
}
|
||||
|
||||
SectionLayout {
|
||||
SpinBox {
|
||||
backendValue: backendValues.highlightMoveDuration
|
||||
minimumValue: 0;
|
||||
maximumValue: 1000;
|
||||
decimals: 0
|
||||
}
|
||||
|
||||
ExpandingSpacer {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Label {
|
||||
text: qsTr("Move speed")
|
||||
toolTip: qsTr("Move animation speed of the highlight delegate.")
|
||||
}
|
||||
|
||||
SectionLayout {
|
||||
SpinBox {
|
||||
backendValue: backendValues.highlightMoveSpeed
|
||||
minimumValue: 0;
|
||||
maximumValue: 1000;
|
||||
decimals: 0
|
||||
}
|
||||
|
||||
ExpandingSpacer {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Label {
|
||||
text: qsTr("Preferred begin")
|
||||
toolTip: qsTr("Preferred highlight begin - must be smaller than Preferred end.")
|
||||
}
|
||||
|
||||
SectionLayout {
|
||||
SpinBox {
|
||||
backendValue: backendValues.preferredHighlightBegin
|
||||
minimumValue: 0;
|
||||
maximumValue: 1000;
|
||||
decimals: 0
|
||||
}
|
||||
|
||||
ExpandingSpacer {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Label {
|
||||
text: qsTr("Preferred end")
|
||||
toolTip: qsTr("Preferred highlight end - must be larger than Preferred begin.")
|
||||
}
|
||||
|
||||
SectionLayout {
|
||||
SpinBox {
|
||||
backendValue: backendValues.preferredHighlightEnd
|
||||
minimumValue: 0;
|
||||
maximumValue: 1000;
|
||||
decimals: 0
|
||||
}
|
||||
|
||||
ExpandingSpacer {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Label {
|
||||
text: qsTr("Follows current")
|
||||
toolTip: qsTr("Determines whether the highlight is managed by the view.")
|
||||
}
|
||||
|
||||
SectionLayout {
|
||||
CheckBox {
|
||||
backendValue: backendValues.highlightFollowsCurrentItem
|
||||
}
|
||||
|
||||
ExpandingSpacer {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,109 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
|
||||
** Contact: http://www.qt-project.org/legal
|
||||
**
|
||||
** 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 Digia. For licensing terms and
|
||||
** conditions see http://qt.digia.com/licensing. For further information
|
||||
** use the contact form at http://qt.digia.com/contact-us.
|
||||
**
|
||||
** GNU Lesser General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
** General Public License version 2.1 as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.LGPL included in the
|
||||
** packaging of this file. Please review the following information to
|
||||
** ensure the GNU Lesser General Public License version 2.1 requirements
|
||||
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
**
|
||||
** In addition, as a special exception, Digia gives you certain additional
|
||||
** rights. These rights are described in the Digia Qt LGPL Exception
|
||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
import QtQuick 2.1
|
||||
import HelperWidgets 2.0
|
||||
import QtQuick.Layouts 1.0
|
||||
|
||||
Column {
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
|
||||
Section {
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
caption: qsTr("Image")
|
||||
|
||||
SectionLayout {
|
||||
Label {
|
||||
text: qsTr("Source")
|
||||
}
|
||||
|
||||
SecondColumnLayout {
|
||||
LineEdit {
|
||||
backendValue: backendValues.source
|
||||
implicitWidth: 180
|
||||
}
|
||||
ExpandingSpacer {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Label {
|
||||
text: qsTr("Fill mode")
|
||||
}
|
||||
|
||||
SecondColumnLayout {
|
||||
ComboBox {
|
||||
model: ["Stretch", "PreserveAspectFit", "PreserveAspectCrop", "Tile", "TileVertically", "TileHorizontally"]
|
||||
backendValue: backendValues.fillMode
|
||||
implicitWidth: 180
|
||||
}
|
||||
|
||||
ExpandingSpacer {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Label {
|
||||
text: qsTr("Source size")
|
||||
}
|
||||
|
||||
SecondColumnLayout {
|
||||
Label {
|
||||
text: "W"
|
||||
width: 12
|
||||
}
|
||||
|
||||
SpinBox {
|
||||
backendValue: backendValues.sourceSize_width
|
||||
minimumValue: -2000
|
||||
maximumValue: 2000
|
||||
decimals: 0
|
||||
}
|
||||
|
||||
Label {
|
||||
text: "H"
|
||||
width: 12
|
||||
}
|
||||
|
||||
SpinBox {
|
||||
backendValue: backendValues.sourceSize_height
|
||||
minimumValue: -2000
|
||||
maximumValue: 2000
|
||||
decimals: 0
|
||||
}
|
||||
|
||||
ExpandingSpacer {
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -43,14 +43,14 @@ Rectangle {
|
||||
Column {
|
||||
width: itemPane.width
|
||||
Section {
|
||||
caption: "Type"
|
||||
caption: qsTr("Type")
|
||||
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
|
||||
SectionLayout {
|
||||
Label {
|
||||
text: "Type"
|
||||
text: qsTr("Type")
|
||||
|
||||
}
|
||||
|
||||
@@ -60,7 +60,7 @@ Rectangle {
|
||||
}
|
||||
|
||||
Label {
|
||||
text: "id"
|
||||
text: qsTr("id")
|
||||
|
||||
}
|
||||
|
||||
@@ -69,7 +69,7 @@ Rectangle {
|
||||
id: lineEdit
|
||||
enabled: isBaseState
|
||||
backendValue: backendValues.id
|
||||
placeholderText: "id"
|
||||
placeholderText: qsTr("id")
|
||||
text: backendValues.id.value
|
||||
Layout.fillWidth: true
|
||||
Layout.maximumWidth: 320
|
||||
@@ -93,18 +93,18 @@ Rectangle {
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
|
||||
caption: "Visibilty"
|
||||
caption: qsTr("Visibilty")
|
||||
|
||||
SectionLayout {
|
||||
rows: 2
|
||||
Label {
|
||||
text: "Visibilty"
|
||||
text: qsTr("Visibilty")
|
||||
}
|
||||
|
||||
SecondColumnLayout {
|
||||
|
||||
CheckBox {
|
||||
text: "Is Visible"
|
||||
text: qsTr("Is Visible")
|
||||
backendValue: backendValues.visible
|
||||
}
|
||||
|
||||
@@ -115,7 +115,7 @@ Rectangle {
|
||||
}
|
||||
|
||||
CheckBox {
|
||||
text: "Clip"
|
||||
text: qsTr("Clip")
|
||||
backendValue: backendValues.clip
|
||||
}
|
||||
Item {
|
||||
@@ -124,7 +124,7 @@ Rectangle {
|
||||
}
|
||||
|
||||
Label {
|
||||
text: "Opacity"
|
||||
text: qsTr("Opacity")
|
||||
}
|
||||
|
||||
SecondColumnLayout {
|
||||
@@ -171,7 +171,7 @@ Rectangle {
|
||||
}
|
||||
|
||||
Tab {
|
||||
title: "Layout"
|
||||
title: qsTr("Layout")
|
||||
component: Column {
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
@@ -183,7 +183,7 @@ Rectangle {
|
||||
|
||||
Tab {
|
||||
anchors.fill: parent
|
||||
title: "Advanced"
|
||||
title: qsTr("Advanced")
|
||||
component: Column {
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
|
||||
@@ -45,12 +45,12 @@ import QtQuick.Layouts 1.0
|
||||
Section {
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
caption: "Layout"
|
||||
caption: qsTr("Layout")
|
||||
|
||||
ColumnLayout {
|
||||
width: parent.width
|
||||
Label {
|
||||
text: "Anchors"
|
||||
text: qsTr("Anchors")
|
||||
}
|
||||
|
||||
AnchorButtons {
|
||||
@@ -74,7 +74,9 @@ Section {
|
||||
|
||||
|
||||
Text {
|
||||
text: "Target"
|
||||
text: qsTr("Target")
|
||||
color: "#eee"
|
||||
elide: Text.ElideRight
|
||||
}
|
||||
|
||||
ComboBox {
|
||||
@@ -84,6 +86,8 @@ Section {
|
||||
|
||||
Text {
|
||||
text: "Margin"
|
||||
color: "#eee"
|
||||
elide: Text.ElideRight
|
||||
}
|
||||
|
||||
RowLayout {
|
||||
@@ -128,7 +132,9 @@ Section {
|
||||
|
||||
|
||||
Text {
|
||||
text: "Target"
|
||||
text: qsTr("Target")
|
||||
color: "#eee"
|
||||
elide: Text.ElideRight
|
||||
}
|
||||
|
||||
ComboBox {
|
||||
@@ -137,7 +143,9 @@ Section {
|
||||
|
||||
|
||||
Text {
|
||||
text: "Margin"
|
||||
text: qsTr("Margin")
|
||||
color: "#eee"
|
||||
elide: Text.ElideRight
|
||||
}
|
||||
|
||||
RowLayout {
|
||||
@@ -182,7 +190,10 @@ Section {
|
||||
|
||||
|
||||
Text {
|
||||
text: "Target"
|
||||
text: qsTr("Target")
|
||||
color: "#eee"
|
||||
elide: Text.ElideRight
|
||||
|
||||
}
|
||||
|
||||
ComboBox {
|
||||
@@ -191,7 +202,10 @@ Section {
|
||||
|
||||
|
||||
Text {
|
||||
text: "Margin"
|
||||
text: qsTr("Margin")
|
||||
color: "#eee"
|
||||
elide: Text.ElideRight
|
||||
|
||||
}
|
||||
|
||||
RowLayout {
|
||||
@@ -236,7 +250,10 @@ Section {
|
||||
|
||||
|
||||
Text {
|
||||
text: "Target"
|
||||
text: qsTr("Target")
|
||||
color: "#eee"
|
||||
elide: Text.ElideRight
|
||||
|
||||
}
|
||||
|
||||
ComboBox {
|
||||
@@ -245,7 +262,10 @@ Section {
|
||||
|
||||
|
||||
Text {
|
||||
text: "Margin"
|
||||
text: qsTr("Margin")
|
||||
color: "#eee"
|
||||
elide: Text.ElideRight
|
||||
|
||||
}
|
||||
|
||||
RowLayout {
|
||||
|
||||
@@ -0,0 +1,282 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
|
||||
** Contact: http://www.qt-project.org/legal
|
||||
**
|
||||
** 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 Digia. For licensing terms and
|
||||
** conditions see http://qt.digia.com/licensing. For further information
|
||||
** use the contact form at http://qt.digia.com/contact-us.
|
||||
**
|
||||
** GNU Lesser General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
** General Public License version 2.1 as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.LGPL included in the
|
||||
** packaging of this file. Please review the following information to
|
||||
** ensure the GNU Lesser General Public License version 2.1 requirements
|
||||
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
**
|
||||
** In addition, as a special exception, Digia gives you certain additional
|
||||
** rights. These rights are described in the Digia Qt LGPL Exception
|
||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
import QtQuick 2.1
|
||||
import HelperWidgets 2.0
|
||||
import QtQuick.Layouts 1.0
|
||||
|
||||
Column {
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
|
||||
FlickableSection {
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
}
|
||||
|
||||
Section {
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
caption: qsTr("List View")
|
||||
|
||||
SectionLayout {
|
||||
|
||||
Label {
|
||||
text: qsTr("Cache")
|
||||
toolTip: qsTr("Cache buffer")
|
||||
}
|
||||
|
||||
SectionLayout {
|
||||
SpinBox {
|
||||
backendValue: backendValues.cacheBuffer
|
||||
minimumValue: 0;
|
||||
maximumValue: 1000;
|
||||
decimals: 0
|
||||
}
|
||||
|
||||
ExpandingSpacer {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Label {
|
||||
text: qsTr("Navigation wraps")
|
||||
toolTip: qsTr("Determines whether the grid wraps key navigation.")
|
||||
}
|
||||
|
||||
SectionLayout {
|
||||
CheckBox {
|
||||
backendValue: backendValues.keyNavigationWraps
|
||||
}
|
||||
|
||||
ExpandingSpacer {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Label {
|
||||
text: qsTr("Orientation")
|
||||
toolTip: qsTr("Orientation of the list.")
|
||||
}
|
||||
|
||||
SecondColumnLayout {
|
||||
ComboBox {
|
||||
model: ["Horizontal", "Vertical"]
|
||||
backendValue: backendValues.orientation
|
||||
}
|
||||
|
||||
ExpandingSpacer {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Label {
|
||||
text: qsTr("Layout Direction")
|
||||
}
|
||||
|
||||
SecondColumnLayout {
|
||||
ComboBox {
|
||||
model: ["LeftToRight", "RightToLeft"]
|
||||
backendValue: backendValues.layoutDirection
|
||||
}
|
||||
|
||||
ExpandingSpacer {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Label {
|
||||
text: qsTr("Snap mode")
|
||||
toolTip: qsTr("Determines how the view scrolling will settle following a drag or flick.")
|
||||
}
|
||||
|
||||
SecondColumnLayout {
|
||||
ComboBox {
|
||||
model: ["NoSnap", "SnapToRow", "SnapOneRow"]
|
||||
backendValue: backendValues.snapMode
|
||||
}
|
||||
|
||||
ExpandingSpacer {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Label {
|
||||
text: qsTr("Spacing")
|
||||
toolTip: qsTr("Spacing between items.")
|
||||
}
|
||||
|
||||
SectionLayout {
|
||||
SpinBox {
|
||||
backendValue: backendValues.spacing
|
||||
minimumValue: 0;
|
||||
maximumValue: 1000;
|
||||
decimals: 0
|
||||
}
|
||||
|
||||
ExpandingSpacer {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Section {
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
caption: qsTr("List View Highlight")
|
||||
|
||||
SectionLayout {
|
||||
|
||||
Label {
|
||||
text: qsTr("Range")
|
||||
toolTip: qsTr("Highlight range")
|
||||
}
|
||||
|
||||
SecondColumnLayout {
|
||||
ComboBox {
|
||||
model: ["NoHighlightRange", "ApplyRange", "StrictlyEnforceRange"]
|
||||
backendValue: backendValues.highlightRangeMode
|
||||
}
|
||||
|
||||
ExpandingSpacer {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Label {
|
||||
text: qsTr("Move duration")
|
||||
toolTip: qsTr("Move animation duration of the highlight delegate.")
|
||||
}
|
||||
|
||||
SectionLayout {
|
||||
SpinBox {
|
||||
backendValue: backendValues.highlightMoveDuration
|
||||
minimumValue: 0;
|
||||
maximumValue: 1000;
|
||||
decimals: 0
|
||||
}
|
||||
|
||||
ExpandingSpacer {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Label {
|
||||
text: qsTr("Move speed")
|
||||
toolTip: qsTr("Move animation speed of the highlight delegate.")
|
||||
}
|
||||
|
||||
SectionLayout {
|
||||
SpinBox {
|
||||
backendValue: backendValues.highlightMoveSpeed
|
||||
minimumValue: 0;
|
||||
maximumValue: 1000;
|
||||
decimals: 0
|
||||
}
|
||||
|
||||
ExpandingSpacer {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Label {
|
||||
text: qsTr("Resize duration")
|
||||
toolTip: qsTr("Resize animation duration of the highlight delegate.")
|
||||
}
|
||||
|
||||
SectionLayout {
|
||||
SpinBox {
|
||||
backendValue: backendValues.highlightResizeDuration
|
||||
minimumValue: 0;
|
||||
maximumValue: 1000;
|
||||
decimals: 0
|
||||
}
|
||||
|
||||
ExpandingSpacer {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Label {
|
||||
text: qsTr("Preferred begin")
|
||||
toolTip: qsTr("Preferred highlight begin - must be smaller than Preferred end.")
|
||||
}
|
||||
|
||||
SectionLayout {
|
||||
SpinBox {
|
||||
backendValue: backendValues.preferredHighlightBegin
|
||||
minimumValue: 0;
|
||||
maximumValue: 1000;
|
||||
decimals: 0
|
||||
}
|
||||
|
||||
ExpandingSpacer {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Label {
|
||||
text: qsTr("Preferred end")
|
||||
toolTip: qsTr("Preferred highlight end - must be larger than Preferred begin.")
|
||||
}
|
||||
|
||||
SectionLayout {
|
||||
SpinBox {
|
||||
backendValue: backendValues.preferredHighlightEnd
|
||||
minimumValue: 0;
|
||||
maximumValue: 1000;
|
||||
decimals: 0
|
||||
}
|
||||
|
||||
ExpandingSpacer {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Label {
|
||||
text: qsTr("Follows current")
|
||||
toolTip: qsTr("Determines whether the highlight is managed by the view.")
|
||||
}
|
||||
|
||||
SectionLayout {
|
||||
CheckBox {
|
||||
backendValue: backendValues.highlightFollowsCurrentItem
|
||||
}
|
||||
|
||||
ExpandingSpacer {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,74 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
|
||||
** Contact: http://www.qt-project.org/legal
|
||||
**
|
||||
** 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 Digia. For licensing terms and
|
||||
** conditions see http://qt.digia.com/licensing. For further information
|
||||
** use the contact form at http://qt.digia.com/contact-us.
|
||||
**
|
||||
** GNU Lesser General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
** General Public License version 2.1 as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.LGPL included in the
|
||||
** packaging of this file. Please review the following information to
|
||||
** ensure the GNU Lesser General Public License version 2.1 requirements
|
||||
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
**
|
||||
** In addition, as a special exception, Digia gives you certain additional
|
||||
** rights. These rights are described in the Digia Qt LGPL Exception
|
||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
import QtQuick 2.1
|
||||
import HelperWidgets 2.0
|
||||
import QtQuick.Layouts 1.0
|
||||
|
||||
Column {
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
|
||||
Section {
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
caption: qsTr("Mouse Area")
|
||||
|
||||
SectionLayout {
|
||||
Label {
|
||||
text: qsTr("Enabled")
|
||||
toolTip: qsTr("This property holds whether the item accepts mouse events.")
|
||||
}
|
||||
|
||||
SecondColumnLayout {
|
||||
CheckBox {
|
||||
backendValue: backendValues.enabled
|
||||
}
|
||||
|
||||
ExpandingSpacer {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Label {
|
||||
text: qsTr("Hover Enabled")
|
||||
toolTip: qsTr("This property holds whether hover events are handled.")
|
||||
}
|
||||
|
||||
SecondColumnLayout {
|
||||
CheckBox {
|
||||
backendValue: backendValues.hoverEnabled
|
||||
}
|
||||
|
||||
ExpandingSpacer {
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -71,7 +71,7 @@ Column {
|
||||
SectionLayout {
|
||||
rows: 2
|
||||
Label {
|
||||
text: "Border"
|
||||
text: qsTr("Border")
|
||||
}
|
||||
SecondColumnLayout {
|
||||
SpinBox {
|
||||
@@ -84,7 +84,7 @@ Column {
|
||||
}
|
||||
}
|
||||
Label {
|
||||
text: "Radius"
|
||||
text: qsTr("Radius")
|
||||
}
|
||||
SecondColumnLayout {
|
||||
SpinBox {
|
||||
|
||||
@@ -0,0 +1,76 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
|
||||
** Contact: http://www.qt-project.org/legal
|
||||
**
|
||||
** 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 Digia. For licensing terms and
|
||||
** conditions see http://qt.digia.com/licensing. For further information
|
||||
** use the contact form at http://qt.digia.com/contact-us.
|
||||
**
|
||||
** GNU Lesser General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
** General Public License version 2.1 as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.LGPL included in the
|
||||
** packaging of this file. Please review the following information to
|
||||
** ensure the GNU Lesser General Public License version 2.1 requirements
|
||||
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
**
|
||||
** In addition, as a special exception, Digia gives you certain additional
|
||||
** rights. These rights are described in the Digia Qt LGPL Exception
|
||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
import QtQuick 2.1
|
||||
import HelperWidgets 2.0
|
||||
import QtQuick.Layouts 1.0
|
||||
|
||||
Column {
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
|
||||
Section {
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
caption: qsTr("Row")
|
||||
|
||||
SectionLayout {
|
||||
Label {
|
||||
text: qsTr("Layout Direction")
|
||||
}
|
||||
|
||||
SecondColumnLayout {
|
||||
ComboBox {
|
||||
model: ["LeftToRight", "RightToLeft"]
|
||||
backendValue: backendValues.layoutDirection
|
||||
}
|
||||
|
||||
ExpandingSpacer {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Label {
|
||||
text: qsTr("Spacing")
|
||||
}
|
||||
|
||||
SecondColumnLayout {
|
||||
SpinBox {
|
||||
backendValue: backendValues.spacing
|
||||
minimumValue: 0
|
||||
maximumValue: 2000
|
||||
decimals: 0
|
||||
}
|
||||
|
||||
ExpandingSpacer {
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -43,7 +43,7 @@ Column {
|
||||
ColorEditor {
|
||||
caption: qsTr(" Text Color")
|
||||
backendendValue: backendValues.color
|
||||
supportGradient: true
|
||||
supportGradient: false
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -43,7 +43,7 @@ Column {
|
||||
ColorEditor {
|
||||
caption: qsTr(" Text Color")
|
||||
backendendValue: backendValues.color
|
||||
supportGradient: true
|
||||
supportGradient: false
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -31,7 +31,6 @@ import QtQuick 2.1
|
||||
import HelperWidgets 2.0
|
||||
import QtQuick.Layouts 1.0
|
||||
|
||||
|
||||
Column {
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
@@ -44,7 +43,7 @@ Column {
|
||||
ColorEditor {
|
||||
caption: qsTr(" Text Color")
|
||||
backendendValue: backendValues.color
|
||||
supportGradient: true
|
||||
supportGradient: false
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -28,15 +28,25 @@
|
||||
****************************************************************************/
|
||||
|
||||
import QtQuick 2.1
|
||||
import HelperWidgets 2.0
|
||||
|
||||
Rectangle {
|
||||
width: 100
|
||||
height: 200
|
||||
color: "#ff2323"
|
||||
id: itemPane
|
||||
width: 320
|
||||
height: 400
|
||||
color: "#404040"
|
||||
|
||||
Text {
|
||||
id: test
|
||||
text: "empty"
|
||||
anchors.fill: parent
|
||||
Section {
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
|
||||
SectionLayout {
|
||||
|
||||
Label {
|
||||
id: test
|
||||
text: qsTr("None or multiple items selected.");
|
||||
anchors.fill: parent
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,21 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8" standalone="no"?>
|
||||
<qnx xmlns="http://www.qnx.com/schemas/application/1.0">
|
||||
<id>com.example.%ProjectName%</id>
|
||||
<name>%ProjectName%</name>
|
||||
<versionNumber>1.0.0</versionNumber>
|
||||
<description>DESCRIPTION</description>
|
||||
|
||||
<initialWindow>
|
||||
<systemChrome>none</systemChrome>
|
||||
<transparent>false</transparent>
|
||||
<autoOrients>true</autoOrients>
|
||||
<aspectRatio>landscape</aspectRatio>
|
||||
</initialWindow>
|
||||
|
||||
<env var="QML_IMPORT_PATH" value="app/native/imports:/usr/lib/qt4/imports"/>
|
||||
<env var="QT_PLUGIN_PATH" value="app/native/plugins:/usr/lib/qt4/plugins"/>
|
||||
<env var="LD_LIBRARY_PATH" value="app/native/lib:/usr/lib/qt4/lib/"/>
|
||||
|
||||
<action system="true">run_native</action>
|
||||
<asset entry="true" path="%ProjectName%" type="Qnx/Elf">%ProjectName%</asset>
|
||||
</qnx>
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 10 KiB |
@@ -1,14 +0,0 @@
|
||||
#include <QApplication>
|
||||
#include "mainwidget.h"
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
QApplication a(argc, argv);
|
||||
// Set default BB10 style. You can also use bb10dark style
|
||||
a.setStyle(QLatin1String("bb10bright"));
|
||||
|
||||
MainWidget w;
|
||||
w.showMaximized();
|
||||
|
||||
return a.exec();
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
#include "mainwidget.h"
|
||||
#include "ui_mainwidget.h"
|
||||
|
||||
MainWidget::MainWidget(QWidget *parent) :
|
||||
QWidget(parent),
|
||||
ui(new Ui::MainWidget)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
}
|
||||
|
||||
MainWidget::~MainWidget()
|
||||
{
|
||||
delete ui;
|
||||
}
|
||||
@@ -1,22 +0,0 @@
|
||||
#ifndef MAINWIDGET_H
|
||||
#define MAINWIDGET_H
|
||||
|
||||
#include <QWidget>
|
||||
|
||||
namespace Ui {
|
||||
class MainWidget;
|
||||
}
|
||||
|
||||
class MainWidget : public QWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit MainWidget(QWidget *parent = 0);
|
||||
~MainWidget();
|
||||
|
||||
private:
|
||||
Ui::MainWidget *ui;
|
||||
};
|
||||
|
||||
#endif // MAINWIDGET_H
|
||||
@@ -1,31 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>MainWidget</class>
|
||||
<widget class="QWidget" name="MainWidget">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>400</width>
|
||||
<height>300</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Form</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<item>
|
||||
<widget class="QLabel" name="label">
|
||||
<property name="text">
|
||||
<string>Hello World</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<resources/>
|
||||
<connections/>
|
||||
</ui>
|
||||
@@ -1,7 +0,0 @@
|
||||
TEMPLATE = app
|
||||
|
||||
SOURCES += main.cpp mainwidget.cpp
|
||||
HEADERS += mainwidget.h
|
||||
FORMS += mainwidget.ui
|
||||
|
||||
OTHER_FILES += bar-descriptor.xml
|
||||
@@ -1,48 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!--
|
||||
/**************************************************************************
|
||||
**
|
||||
** This file is part of Qt Creator
|
||||
**
|
||||
** Copyright (C) 2011 - 2013 Research In Motion
|
||||
**
|
||||
** Contact: Research In Motion (blackberry-qt@qnx.com)
|
||||
** Contact: KDAB (info@kdab.com)
|
||||
**
|
||||
**
|
||||
** GNU Lesser General Public License Usage
|
||||
**
|
||||
** This file may be used under the terms of the GNU Lesser General Public
|
||||
** License version 2.1 as published by the Free Software Foundation and
|
||||
** appearing in the file LICENSE.LGPL included in the packaging of this file.
|
||||
** Please review the following information to ensure the GNU Lesser General
|
||||
** Public License version 2.1 requirements will be met:
|
||||
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
**
|
||||
** In addition, as a special exception, Digia gives you certain additional
|
||||
** rights. These rights are described in the Digia Qt LGPL Exception
|
||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
** Other Usage
|
||||
**
|
||||
** Alternatively, this file may be used in accordance with the terms and
|
||||
** conditions contained in a signed written agreement between you and Digia.
|
||||
**
|
||||
**************************************************************************/
|
||||
-->
|
||||
<wizard version="1" kind="project"
|
||||
class="qt4project" firstpage="10"
|
||||
id="Q.QnxBlackBerryGuiApp" category="F.QtApplications"
|
||||
featuresRequired="QtSupport.Wizards.FeatureBlackBerry">
|
||||
<icon>icon.png</icon>
|
||||
<displayname>BlackBerry Qt Gui Application</displayname>;
|
||||
<description>Creates a Qt Gui application for BlackBerry.</description>
|
||||
<files>
|
||||
<file source="main.cpp" openeditor="true"/>
|
||||
<file source="mainwidget.cpp" openeditor="true"/>
|
||||
<file source="mainwidget.h" openeditor="true"/>
|
||||
<file source="mainwidget.ui" openeditor="true"/>
|
||||
<file source="bar-descriptor.xml" openeditor="true"/>
|
||||
<file source="project.pro" target="%ProjectName%.pro" openproject="true"/>
|
||||
</files>
|
||||
</wizard>
|
||||
@@ -1,42 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8" standalone="no"?>
|
||||
<qnx xmlns="http://www.qnx.com/schemas/application/1.0">
|
||||
<id>com.example.%ProjectName%</id>
|
||||
<name>%ProjectName%</name>
|
||||
<versionNumber>1.0.0</versionNumber>
|
||||
<description>DESCRIPTION</description>
|
||||
<publisher>PUBLISHER</publisher>
|
||||
<copyright>COPYRIGHT</copyright>
|
||||
|
||||
<initialWindow>
|
||||
<systemChrome>none</systemChrome>
|
||||
<transparent>false</transparent>
|
||||
<autoOrients>true</autoOrients>
|
||||
<aspectRatio>landscape</aspectRatio>
|
||||
</initialWindow>
|
||||
|
||||
<env var="QML2_IMPORT_PATH" value="app/native/imports"/>
|
||||
<env var="QT_PLUGIN_PATH" value="app/native/plugins"/>
|
||||
<env var="LD_LIBRARY_PATH" value="app/native/lib"/>
|
||||
|
||||
<arg>-platform</arg>
|
||||
<arg>qnx</arg>
|
||||
|
||||
<action system="true">run_native</action>
|
||||
|
||||
<asset entry="true" path="%ProjectName%" type="Qnx/Elf">%ProjectName%</asset>
|
||||
|
||||
<!--
|
||||
%QT_INSTALL_LIBS%, %QT_INSTALL_PLUGINS, %QT_INSTALL_QML% and %SRC_DIR%
|
||||
tags are replaced on-the-fly when deploying the app. in Qt Creator.
|
||||
-->
|
||||
<asset path="%QT_INSTALL_LIBS%">lib</asset>
|
||||
<asset path="%QT_INSTALL_PLUGINS%">plugins</asset>
|
||||
<asset path="%QT_INSTALL_QML%">imports</asset>
|
||||
|
||||
<!--
|
||||
By default this bar-descriptor.xml embeds Qt5 runtime
|
||||
into the application itself. See the following document
|
||||
for various deployments of Qt runtime to a device:
|
||||
http://qt-project.org/wiki/Qt-on-BlackBerry-devices
|
||||
-->
|
||||
</qnx>
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 10 KiB |
@@ -1,15 +0,0 @@
|
||||
#include <QtGui/QGuiApplication>
|
||||
#include "mainwidget.h"
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
QApplication a(argc, argv);
|
||||
// Set default BB10 style. You can also use bb10dark style
|
||||
a.setStyle(QLatin1String("bb10bright"));
|
||||
|
||||
MainWidget w;
|
||||
w.showFullScreen();
|
||||
|
||||
|
||||
return a.exec();
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
#include "mainwidget.h"
|
||||
#include "ui_mainwidget.h"
|
||||
|
||||
MainWidget::MainWidget(QWidget *parent) :
|
||||
QWidget(parent),
|
||||
ui(new Ui::MainWidget)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
}
|
||||
|
||||
MainWidget::~MainWidget()
|
||||
{
|
||||
delete ui;
|
||||
}
|
||||
@@ -1,22 +0,0 @@
|
||||
#ifndef MAINWIDGET_H
|
||||
#define MAINWIDGET_H
|
||||
|
||||
#include <QtWidgets>
|
||||
|
||||
namespace Ui {
|
||||
class MainWidget;
|
||||
}
|
||||
|
||||
class MainWidget : public QWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit MainWidget(QWidget *parent = 0);
|
||||
~MainWidget();
|
||||
|
||||
private:
|
||||
Ui::MainWidget *ui;
|
||||
};
|
||||
|
||||
#endif // MAINWIDGET_H
|
||||
@@ -1,31 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>MainWidget</class>
|
||||
<widget class="QWidget" name="MainWidget">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>400</width>
|
||||
<height>300</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Form</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<item>
|
||||
<widget class="QLabel" name="label">
|
||||
<property name="text">
|
||||
<string>Hello World</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<resources/>
|
||||
<connections/>
|
||||
</ui>
|
||||
@@ -1,11 +0,0 @@
|
||||
TEMPLATE = app
|
||||
|
||||
QT += widgets
|
||||
|
||||
SOURCES += main.cpp mainwidget.cpp
|
||||
HEADERS += mainwidget.h
|
||||
FORMS += mainwidget.ui
|
||||
|
||||
OTHER_FILES += bar-descriptor.xml
|
||||
|
||||
|
||||
@@ -1,48 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!--
|
||||
/**************************************************************************
|
||||
**
|
||||
** This file is part of Qt Creator
|
||||
**
|
||||
** Copyright (C) 2011 - 2013 Research In Motion
|
||||
**
|
||||
** Contact: Research In Motion (blackberry-qt@qnx.com)
|
||||
** Contact: KDAB (info@kdab.com)
|
||||
**
|
||||
**
|
||||
** GNU Lesser General Public License Usage
|
||||
**
|
||||
** This file may be used under the terms of the GNU Lesser General Public
|
||||
** License version 2.1 as published by the Free Software Foundation and
|
||||
** appearing in the file LICENSE.LGPL included in the packaging of this file.
|
||||
** Please review the following information to ensure the GNU Lesser General
|
||||
** Public License version 2.1 requirements will be met:
|
||||
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
**
|
||||
** In addition, as a special exception, Digia gives you certain additional
|
||||
** rights. These rights are described in the Digia Qt LGPL Exception
|
||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
** Other Usage
|
||||
**
|
||||
** Alternatively, this file may be used in accordance with the terms and
|
||||
** conditions contained in a signed written agreement between you and Digia.
|
||||
**
|
||||
**************************************************************************/
|
||||
-->
|
||||
<wizard version="1" kind="project"
|
||||
class="qt4project" firstpage="10"
|
||||
id="Q.QnxBlackBerryGuiApp" category="F.QtApplications"
|
||||
featuresRequired="QtSupport.Wizards.FeatureBlackBerry">
|
||||
<icon>icon.png</icon>
|
||||
<displayname>BlackBerry Qt 5 GUI Application</displayname>;
|
||||
<description>Creates an experimental Qt 5 GUI application for BlackBerry 10. You need to provide your own build of Qt 5 for BlackBerry 10 since Qt 5 is not provided in the current BlackBerry 10 NDK and is not included in DevAlpha devices.</description>
|
||||
<files>
|
||||
<file source="main.cpp" openeditor="true"/>
|
||||
<file source="mainwidget.cpp" openeditor="true"/>
|
||||
<file source="mainwidget.h" openeditor="true"/>
|
||||
<file source="mainwidget.ui" openeditor="true"/>
|
||||
<file source="bar-descriptor.xml" openeditor="true"/>
|
||||
<file source="project.pro" target="%ProjectName%.pro" openproject="true"/>
|
||||
</files>
|
||||
</wizard>
|
||||
@@ -10,7 +10,7 @@ SOURCES += main.cpp ../tools/qtcreatorcrashhandler/crashhandlersetup.cpp
|
||||
|
||||
include(../rpath.pri)
|
||||
|
||||
LIBS *= -l$$qtLibraryName(ExtensionSystem) -l$$qtLibraryName(Aggregation)
|
||||
LIBS *= -l$$qtLibraryName(ExtensionSystem) -l$$qtLibraryName(Aggregation) -l$$qtLibraryName(Utils)
|
||||
|
||||
QT_BREAKPAD_ROOT_PATH = $$(QT_BREAKPAD_ROOT_PATH)
|
||||
!isEmpty(QT_BREAKPAD_ROOT_PATH) {
|
||||
|
||||
2
src/libs/3rdparty/cplusplus/Bind.cpp
vendored
2
src/libs/3rdparty/cplusplus/Bind.cpp
vendored
@@ -2002,6 +2002,8 @@ bool Bind::visit(QtPropertyDeclarationAST *ast)
|
||||
flags |= QtPropertyDeclaration::ReadFunction;
|
||||
} else if (name == "WRITE") {
|
||||
flags |= QtPropertyDeclaration::WriteFunction;
|
||||
} else if (name == "MEMBER") {
|
||||
flags |= QtPropertyDeclaration::MemberVariable;
|
||||
} else if (name == "RESET") {
|
||||
flags |= QtPropertyDeclaration::ResetFunction;
|
||||
} else if (name == "NOTIFY") {
|
||||
|
||||
25
src/libs/3rdparty/cplusplus/Parser.cpp
vendored
25
src/libs/3rdparty/cplusplus/Parser.cpp
vendored
@@ -2138,16 +2138,17 @@ bool Parser::parseAccessDeclaration(DeclarationAST *&node)
|
||||
|
||||
/*
|
||||
Q_PROPERTY(type name
|
||||
READ getFunction
|
||||
[WRITE setFunction]
|
||||
[RESET resetFunction]
|
||||
[NOTIFY notifySignal]
|
||||
[DESIGNABLE bool]
|
||||
[SCRIPTABLE bool]
|
||||
[STORED bool]
|
||||
[USER bool]
|
||||
[CONSTANT]
|
||||
[FINAL])
|
||||
(READ getFunction [WRITE setFunction]
|
||||
| MEMBER memberName [(READ getFunction | WRITE setFunction)])
|
||||
[RESET resetFunction]
|
||||
[NOTIFY notifySignal]
|
||||
[REVISION int]
|
||||
[DESIGNABLE bool]
|
||||
[SCRIPTABLE bool]
|
||||
[STORED bool]
|
||||
[USER bool]
|
||||
[CONSTANT]
|
||||
[FINAL])
|
||||
|
||||
Note that "type" appears to be any valid type. So these are valid:
|
||||
Q_PROPERTY(const char *zoo READ zoo)
|
||||
@@ -2155,7 +2156,8 @@ bool Parser::parseAccessDeclaration(DeclarationAST *&node)
|
||||
|
||||
Furthermore, the only restriction on the order of the items in between the
|
||||
parenthesis is that the type is the first parameter and the name comes after
|
||||
the type.
|
||||
the type. Especially, there seems to be no restriction on the READ/WRITE/MEMBER
|
||||
order.
|
||||
*/
|
||||
bool Parser::parseQtPropertyDeclaration(DeclarationAST *&node)
|
||||
{
|
||||
@@ -2201,6 +2203,7 @@ bool Parser::parseQtPropertyDeclaration(DeclarationAST *&node)
|
||||
switch (peekAtQtContextKeyword()) {
|
||||
case Token_READ:
|
||||
case Token_WRITE:
|
||||
case Token_MEMBER:
|
||||
case Token_RESET:
|
||||
case Token_NOTIFY:
|
||||
case Token_REVISION:
|
||||
|
||||
@@ -63,7 +63,20 @@ static inline int classify5(const char *s) {
|
||||
}
|
||||
|
||||
static inline int classify6(const char *s) {
|
||||
if (s[0] == 'N') {
|
||||
if (s[0] == 'M') {
|
||||
if (s[1] == 'E') {
|
||||
if (s[2] == 'M') {
|
||||
if (s[3] == 'B') {
|
||||
if (s[4] == 'E') {
|
||||
if (s[5] == 'R') {
|
||||
return Token_MEMBER;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (s[0] == 'N') {
|
||||
if (s[1] == 'O') {
|
||||
if (s[2] == 'T') {
|
||||
if (s[3] == 'I') {
|
||||
|
||||
@@ -18,7 +18,8 @@ enum {
|
||||
Token_CONSTANT,
|
||||
Token_DESIGNABLE,
|
||||
Token_SCRIPTABLE,
|
||||
Token_REVISION
|
||||
Token_REVISION,
|
||||
Token_MEMBER
|
||||
};
|
||||
|
||||
CPLUSPLUS_EXPORT int classifyQtContextKeyword(const char *s, int n);
|
||||
|
||||
25
src/libs/3rdparty/cplusplus/Symbols.h
vendored
25
src/libs/3rdparty/cplusplus/Symbols.h
vendored
@@ -556,18 +556,19 @@ public:
|
||||
NoFlags = 0,
|
||||
ReadFunction = 1 << 0,
|
||||
WriteFunction = 1 << 1,
|
||||
ResetFunction = 1 << 2,
|
||||
NotifyFunction = 1 << 3,
|
||||
DesignableFlag = 1 << 4,
|
||||
DesignableFunction = 1 << 5,
|
||||
ScriptableFlag = 1 << 6,
|
||||
ScriptableFunction = 1 << 7,
|
||||
StoredFlag = 1 << 8,
|
||||
StoredFunction = 1 << 9,
|
||||
UserFlag = 1 << 10,
|
||||
UserFunction = 1 << 11,
|
||||
ConstantFlag = 1 << 12,
|
||||
FinalFlag = 1 << 13
|
||||
MemberVariable = 1 << 2,
|
||||
ResetFunction = 1 << 3,
|
||||
NotifyFunction = 1 << 4,
|
||||
DesignableFlag = 1 << 5,
|
||||
DesignableFunction = 1 << 6,
|
||||
ScriptableFlag = 1 << 7,
|
||||
ScriptableFunction = 1 << 8,
|
||||
StoredFlag = 1 << 9,
|
||||
StoredFunction = 1 << 10,
|
||||
UserFlag = 1 << 11,
|
||||
UserFunction = 1 << 12,
|
||||
ConstantFlag = 1 << 13,
|
||||
FinalFlag = 1 << 14
|
||||
};
|
||||
|
||||
public:
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import qbs.base 1.0
|
||||
import "../QtcLibrary.qbs" as QtcLibrary
|
||||
import QtcLibrary
|
||||
|
||||
QtcLibrary {
|
||||
name: "Aggregation"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import qbs.base 1.0
|
||||
import "../QtcLibrary.qbs" as QtcLibrary
|
||||
import QtcLibrary
|
||||
|
||||
QtcLibrary {
|
||||
name: "CPlusPlus"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import qbs.base 1.0
|
||||
import "../QtcLibrary.qbs" as QtcLibrary
|
||||
import QtcLibrary
|
||||
|
||||
QtcLibrary {
|
||||
name: "ExtensionSystem"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import qbs.base 1.0
|
||||
import "../QtcLibrary.qbs" as QtcLibrary
|
||||
import QtcLibrary
|
||||
|
||||
QtcLibrary {
|
||||
name: "GLSL"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import qbs.base 1.0
|
||||
import "../QtcLibrary.qbs" as QtcLibrary
|
||||
import QtcLibrary
|
||||
|
||||
QtcLibrary {
|
||||
name: "LanguageUtils"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import qbs.base 1.0
|
||||
import "../QtcLibrary.qbs" as QtcLibrary
|
||||
import QtcLibrary
|
||||
|
||||
QtcLibrary {
|
||||
name: "QmlDebug"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import qbs.base 1.0
|
||||
import "../QtcLibrary.qbs" as QtcLibrary
|
||||
import QtcLibrary
|
||||
|
||||
QtcLibrary {
|
||||
name: "QmlEditorWidgets"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import qbs.base 1.0
|
||||
import "../QtcLibrary.qbs" as QtcLibrary
|
||||
import QtcLibrary
|
||||
|
||||
QtcLibrary {
|
||||
name: "QmlJS"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import qbs.base 1.0
|
||||
import "../QtcLibrary.qbs" as QtcLibrary
|
||||
import QtcLibrary
|
||||
|
||||
QtcLibrary {
|
||||
name: "QtcSsh"
|
||||
|
||||
@@ -44,6 +44,7 @@ bool BuildableHelperLibrary::isQtChooser(const QFileInfo &info)
|
||||
|
||||
QString BuildableHelperLibrary::qtChooserToQmakePath(const QString &path)
|
||||
{
|
||||
const char toolDir[] = "QTTOOLDIR=\"";
|
||||
QProcess proc;
|
||||
proc.start(path, QStringList(QLatin1String("-print-env")));
|
||||
if (!proc.waitForStarted(1000))
|
||||
@@ -51,10 +52,10 @@ QString BuildableHelperLibrary::qtChooserToQmakePath(const QString &path)
|
||||
if (!proc.waitForFinished(1000))
|
||||
return QString();
|
||||
QByteArray output = proc.readAllStandardOutput();
|
||||
int pos = output.indexOf("QTTOOLDIR=");
|
||||
int pos = output.indexOf(toolDir);
|
||||
if (pos == -1)
|
||||
return QString();
|
||||
pos += strlen("QTTOOLDIR=\"");
|
||||
pos += int(sizeof(toolDir)) - 1;
|
||||
int end = output.indexOf('\"', pos);
|
||||
if (end == -1)
|
||||
return QString();
|
||||
|
||||
@@ -30,8 +30,6 @@
|
||||
#include "filewizarddialog.h"
|
||||
#include "filewizardpage.h"
|
||||
|
||||
#include "hostosinfo.h"
|
||||
|
||||
#include <QAbstractButton>
|
||||
|
||||
/*!
|
||||
@@ -49,18 +47,6 @@ FileWizardDialog::FileWizardDialog(QWidget *parent) :
|
||||
Wizard(parent),
|
||||
m_filePage(new FileWizardPage)
|
||||
{
|
||||
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
|
||||
setOption(QWizard::NoCancelButton, false);
|
||||
setOption(QWizard::NoDefaultButton, false);
|
||||
if (HostOsInfo::isMacHost()) {
|
||||
setButtonLayout(QList<QWizard::WizardButton>()
|
||||
<< QWizard::CancelButton
|
||||
<< QWizard::Stretch
|
||||
<< QWizard::BackButton
|
||||
<< QWizard::NextButton
|
||||
<< QWizard::CommitButton
|
||||
<< QWizard::FinishButton);
|
||||
}
|
||||
const int filePageId = addPage(m_filePage);
|
||||
wizardProgress()->item(filePageId)->setTitle(tr("Location"));
|
||||
connect(m_filePage, SIGNAL(activated()), button(QWizard::FinishButton), SLOT(animateClick()));
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import qbs.base 1.0
|
||||
import "../../tools/QtcTool.qbs" as QtcTool
|
||||
import QtcTool
|
||||
|
||||
QtcTool {
|
||||
name: "qtcreator_ctrlc_stub"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import qbs.base 1.0
|
||||
import "../../tools/QtcTool.qbs" as QtcTool
|
||||
import QtcTool
|
||||
|
||||
QtcTool {
|
||||
name: "qtcreator_process_stub"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import qbs.base 1.0
|
||||
import "../QtcLibrary.qbs" as QtcLibrary
|
||||
import QtcLibrary
|
||||
|
||||
QtcLibrary {
|
||||
name: "Utils"
|
||||
|
||||
@@ -28,6 +28,7 @@
|
||||
****************************************************************************/
|
||||
|
||||
#include "wizard.h"
|
||||
#include "hostosinfo.h"
|
||||
|
||||
#include <QMap>
|
||||
#include <QHash>
|
||||
@@ -318,6 +319,20 @@ Wizard::Wizard(QWidget *parent, Qt::WindowFlags flags) :
|
||||
connect(this, SIGNAL(pageAdded(int)), this, SLOT(_q_pageAdded(int)));
|
||||
connect(this, SIGNAL(pageRemoved(int)), this, SLOT(_q_pageRemoved(int)));
|
||||
setSideWidget(new LinearProgressWidget(d_ptr->m_wizardProgress, this));
|
||||
setOption(QWizard::NoCancelButton, false);
|
||||
setOption(QWizard::NoDefaultButton, false);
|
||||
setOption(QWizard::NoBackButtonOnStartPage, true);
|
||||
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
|
||||
|
||||
if (Utils::HostOsInfo::isMacHost()) {
|
||||
setButtonLayout(QList<QWizard::WizardButton>()
|
||||
<< QWizard::CancelButton
|
||||
<< QWizard::Stretch
|
||||
<< QWizard::BackButton
|
||||
<< QWizard::NextButton
|
||||
<< QWizard::CommitButton
|
||||
<< QWizard::FinishButton);
|
||||
}
|
||||
}
|
||||
|
||||
Wizard::~Wizard()
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import qbs.base 1.0
|
||||
import "../QtcLibrary.qbs" as QtcLibrary
|
||||
import QtcLibrary
|
||||
|
||||
QtcLibrary {
|
||||
name: "zeroconf"
|
||||
|
||||
@@ -1,144 +0,0 @@
|
||||
From d39debcd0e4ce78df47597cea7e27df1964a1820 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Hartmann <Thomas.Hartmann@digia.com>
|
||||
Date: Wed, 12 Jun 2013 15:43:47 +0200
|
||||
Subject: [PATCH] WelcomePage: fixes for the filter combobox for examples
|
||||
|
||||
"All Versions" did not work correctly and just contributed to
|
||||
confusion. So it is removed. Since we need a sensible default
|
||||
setting we now search for the Qt with the highest version that has
|
||||
examples and demos.
|
||||
|
||||
Change-Id: I495252a99753ebe511b598c61a79bbb0cd293e40
|
||||
---
|
||||
src/plugins/qtsupport/exampleslistmodel.cpp | 73 ++++++++++++++++++++-------
|
||||
1 files changed, 54 insertions(+), 19 deletions(-)
|
||||
|
||||
diff --git a/src/plugins/qtsupport/exampleslistmodel.cpp b/src/plugins/qtsupport/exampleslistmodel.cpp
|
||||
index baad189..d6603c1 100644
|
||||
--- a/src/plugins/qtsupport/exampleslistmodel.cpp
|
||||
+++ b/src/plugins/qtsupport/exampleslistmodel.cpp
|
||||
@@ -48,13 +48,13 @@
|
||||
namespace QtSupport {
|
||||
namespace Internal {
|
||||
|
||||
-const int allQtVersionsId = -0xff;
|
||||
+const int noQtVersionsId = -0xff;
|
||||
static const char currentQtVersionFilterSettingsKeyC[] = "WelcomePageQtVersionFilter";
|
||||
|
||||
int uniqueQtVersionIdSetting()
|
||||
{
|
||||
QSettings *settings = Core::ICore::settings();
|
||||
- int id = settings->value(QLatin1String(currentQtVersionFilterSettingsKeyC), allQtVersionsId).toInt();
|
||||
+ int id = settings->value(QLatin1String(currentQtVersionFilterSettingsKeyC), noQtVersionsId).toInt();
|
||||
return id;
|
||||
}
|
||||
|
||||
@@ -77,6 +77,38 @@ public:
|
||||
setRoleNames(roleNames);
|
||||
}
|
||||
|
||||
+ int findHightestQtVersion()
|
||||
+ {
|
||||
+ QtVersionManager *versionManager = QtVersionManager::instance();
|
||||
+ QList <BaseQtVersion *> qtVersions = versionManager->validVersions();
|
||||
+
|
||||
+ BaseQtVersion *newVersion = 0;
|
||||
+
|
||||
+ foreach (BaseQtVersion *version, qtVersions) {
|
||||
+
|
||||
+ if (version->isValid() && version->hasDemos() && version->hasExamples()) {
|
||||
+ if (!newVersion) {
|
||||
+ newVersion = version;
|
||||
+ } else {
|
||||
+ if (version->qtVersion() > newVersion->qtVersion()) {
|
||||
+ newVersion = version;
|
||||
+ } else if (version->qtVersion() == newVersion->qtVersion()
|
||||
+ && version->uniqueId() < newVersion->uniqueId()) {
|
||||
+ newVersion = version;
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ if (!newVersion && !qtVersions.isEmpty())
|
||||
+ newVersion = qtVersions.first();
|
||||
+
|
||||
+ if (!newVersion)
|
||||
+ return noQtVersionsId;
|
||||
+
|
||||
+ return newVersion->uniqueId();
|
||||
+ }
|
||||
+
|
||||
void setupQtVersions()
|
||||
{
|
||||
beginResetModel();
|
||||
@@ -90,30 +122,33 @@ public:
|
||||
if (defaultVersion && qtVersions.contains(defaultVersion))
|
||||
qtVersions.move(qtVersions.indexOf(defaultVersion), 0);
|
||||
|
||||
- QStandardItem *newItem = new QStandardItem();
|
||||
- newItem->setData(tr("All Versions"), Qt::UserRole + 1);
|
||||
- newItem->setData(allQtVersionsId, Qt::UserRole + 2);
|
||||
- appendRow(newItem);
|
||||
-
|
||||
int qtVersionSetting = uniqueQtVersionIdSetting();
|
||||
- if (qtVersionSetting != allQtVersionsId) {
|
||||
+ int newQtVersionSetting = noQtVersionsId;
|
||||
+ if (qtVersionSetting != noQtVersionsId) {
|
||||
//ensure that the unique Qt id is valid
|
||||
- int newQtVersionSetting = allQtVersionsId;
|
||||
foreach (BaseQtVersion *version, qtVersions) {
|
||||
- if (version->uniqueId() == qtVersionSetting)
|
||||
+ if (version->uniqueId() == qtVersionSetting) {
|
||||
newQtVersionSetting = qtVersionSetting;
|
||||
+ }
|
||||
}
|
||||
+ }
|
||||
|
||||
- if (newQtVersionSetting != qtVersionSetting) {
|
||||
- setUniqueQtVersionIdSetting(newQtVersionSetting);
|
||||
- }
|
||||
+ if (newQtVersionSetting == noQtVersionsId) {
|
||||
+ newQtVersionSetting = findHightestQtVersion();
|
||||
+ }
|
||||
+
|
||||
+ if (newQtVersionSetting != qtVersionSetting) {
|
||||
+ setUniqueQtVersionIdSetting(newQtVersionSetting);
|
||||
}
|
||||
|
||||
+
|
||||
foreach (BaseQtVersion *version, qtVersions) {
|
||||
- QStandardItem *newItem = new QStandardItem();
|
||||
- newItem->setData(version->displayName(), Qt::UserRole + 1);
|
||||
- newItem->setData(version->uniqueId(), Qt::UserRole + 2);
|
||||
- appendRow(newItem);
|
||||
+ if (version->hasDemos() || version->hasExamples()) {
|
||||
+ QStandardItem *newItem = new QStandardItem();
|
||||
+ newItem->setData(version->displayName(), Qt::UserRole + 1);
|
||||
+ newItem->setData(version->uniqueId(), Qt::UserRole + 2);
|
||||
+ appendRow(newItem);
|
||||
+ }
|
||||
}
|
||||
endResetModel();
|
||||
}
|
||||
@@ -147,7 +182,7 @@ ExamplesListModel::ExamplesListModel(QObject *parent) :
|
||||
m_updateOnQtVersionsChanged(false),
|
||||
m_initialized(false),
|
||||
m_helpInitialized(false),
|
||||
- m_uniqueQtId(allQtVersionsId)
|
||||
+ m_uniqueQtId(noQtVersionsId)
|
||||
{
|
||||
QHash<int, QByteArray> roleNames;
|
||||
roleNames[Name] = "name";
|
||||
@@ -517,7 +552,7 @@ QStringList ExamplesListModel::exampleSources(QString *examplesInstallPath, QStr
|
||||
foreach (BaseQtVersion *version, qtVersions) {
|
||||
|
||||
//filter for qt versions
|
||||
- if (version->uniqueId() != m_uniqueQtId && m_uniqueQtId != allQtVersionsId)
|
||||
+ if (version->uniqueId() != m_uniqueQtId && m_uniqueQtId != noQtVersionsId)
|
||||
continue;
|
||||
|
||||
// qt5 with examples OR demos manifest
|
||||
--
|
||||
1.7.6.msysgit.0
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import qbs.base 1.0
|
||||
|
||||
import "../QtcPlugin.qbs" as QtcPlugin
|
||||
import QtcPlugin
|
||||
|
||||
QtcPlugin {
|
||||
name: "AnalyzerBase"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import qbs.base 1.0
|
||||
|
||||
import "../QtcPlugin.qbs" as QtcPlugin
|
||||
import QtcPlugin
|
||||
|
||||
QtcPlugin {
|
||||
name: "Android"
|
||||
|
||||
@@ -822,7 +822,9 @@ void AndroidConfigurations::updateAutomaticKitList()
|
||||
|
||||
foreach (Kit *k, existingKits) {
|
||||
ProjectExplorer::ToolChain *tc = ToolChainKitInformation::toolChain(k);
|
||||
if (tc && tc->type() == QLatin1String(Constants::ANDROID_TOOLCHAIN_TYPE)) {
|
||||
QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitInformation::qtVersion(k);
|
||||
if (tc && tc->type() == QLatin1String(Constants::ANDROID_TOOLCHAIN_TYPE)
|
||||
&& qtVersion && qtVersion->type() == QLatin1String(Constants::ANDROIDQT)) {
|
||||
k->makeUnSticky();
|
||||
k->setAutoDetected(false);
|
||||
} else {
|
||||
|
||||
@@ -79,6 +79,9 @@ QList<Core::Id> AndroidDeployQtStepFactory::availableCreationIds(ProjectExplorer
|
||||
return QList<Core::Id>();
|
||||
if (parent->contains(AndroidDeployQtStep::Id))
|
||||
return QList<Core::Id>();
|
||||
QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitInformation::qtVersion(parent->target()->kit());
|
||||
if (!qtVersion || qtVersion->qtVersion() < QtSupport::QtVersionNumber(5, 2, 0))
|
||||
return QList<Core::Id>();
|
||||
return QList<Core::Id>() << AndroidDeployQtStep::Id;
|
||||
}
|
||||
|
||||
@@ -164,9 +167,13 @@ void AndroidDeployQtStep::ctor()
|
||||
bool AndroidDeployQtStep::init()
|
||||
{
|
||||
if (AndroidManager::checkForQt51Files(project()->projectDirectory()))
|
||||
emit addOutput(tr("Found old android folder in source directory. Qt 5.2 does not use that folder by default."), ErrorOutput);
|
||||
emit addOutput(tr("Found old Android folder in source directory. Qt 5.2 does not use that folder by default."), ErrorOutput);
|
||||
|
||||
m_targetArch = AndroidManager::targetArch(target());
|
||||
if (m_targetArch.isEmpty()) {
|
||||
emit addOutput(tr("No Android arch set by the .pro file."), ErrorOutput);
|
||||
return false;
|
||||
}
|
||||
m_deviceAPILevel = AndroidManager::minimumSDK(target());
|
||||
AndroidDeviceInfo info = AndroidConfigurations::instance().showDeviceDialog(project(), m_deviceAPILevel, m_targetArch);
|
||||
if (info.serialNumber.isEmpty()) // aborted
|
||||
@@ -511,13 +518,13 @@ QAbstractItemModel *AndroidDeployQtStep::keystoreCertificates()
|
||||
keytoolProc.start(AndroidConfigurations::instance().keytoolPath().toString(), params);
|
||||
if (!keytoolProc.waitForStarted() || !keytoolProc.waitForFinished()) {
|
||||
QMessageBox::critical(0, tr("Error"),
|
||||
tr("Failed to run keytool"));
|
||||
tr("Failed to run keytool."));
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (keytoolProc.exitCode()) {
|
||||
QMessageBox::critical(0, tr("Error"),
|
||||
tr("Invalid password"));
|
||||
tr("Invalid password."));
|
||||
m_keystorePasswd.clear();
|
||||
}
|
||||
rawCerts = QString::fromLatin1(keytoolProc.readAllStandardOutput());
|
||||
|
||||
@@ -174,7 +174,7 @@
|
||||
<item row="1" column="0">
|
||||
<widget class="QCheckBox" name="verboseOutputCheckBox">
|
||||
<property name="text">
|
||||
<string>Verbose Output</string>
|
||||
<string>Verbose output</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@@ -210,7 +210,7 @@
|
||||
<item row="0" column="0">
|
||||
<widget class="QLabel" name="inputFileLabel">
|
||||
<property name="text">
|
||||
<string>Android deploy Qt Input File:</string>
|
||||
<string>Android deploy Qt input file:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@@ -309,7 +309,7 @@ The APK will not be usable on any other device.</string>
|
||||
<item row="4" column="0" colspan="2">
|
||||
<widget class="QGroupBox" name="additionalLibrariesGroupBox">
|
||||
<property name="title">
|
||||
<string>Additional libraries</string>
|
||||
<string>Additional Libraries</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_3">
|
||||
<item>
|
||||
@@ -317,7 +317,7 @@ The APK will not be usable on any other device.</string>
|
||||
<item>
|
||||
<widget class="QListView" name="androidExtraLibsListView">
|
||||
<property name="toolTip">
|
||||
<string>List of extra libraries to include in Android package and load on start-up.</string>
|
||||
<string>List of extra libraries to include in Android package and load on startup.</string>
|
||||
</property>
|
||||
<property name="selectionMode">
|
||||
<enum>QAbstractItemView::ExtendedSelection</enum>
|
||||
@@ -335,7 +335,7 @@ The APK will not be usable on any other device.</string>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Select a library to include in package</string>
|
||||
<string>Select library to include in package.</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Add</string>
|
||||
@@ -348,7 +348,7 @@ The APK will not be usable on any other device.</string>
|
||||
<item>
|
||||
<widget class="QToolButton" name="removeAndroidExtraLibButton">
|
||||
<property name="toolTip">
|
||||
<string>Remove currently selected library from list</string>
|
||||
<string>Remove currently selected library from list.</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Remove</string>
|
||||
|
||||
@@ -58,6 +58,9 @@ QList<Core::Id> AndroidDeployStepFactory::availableCreationIds(BuildStepList *pa
|
||||
return QList<Core::Id>();
|
||||
if (parent->contains(AndroidDeployStep::Id))
|
||||
return QList<Core::Id>();
|
||||
QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitInformation::qtVersion(parent->target()->kit());
|
||||
if (qtVersion && qtVersion->qtVersion() >= QtSupport::QtVersionNumber(5, 2, 0))
|
||||
return QList<Core::Id>();
|
||||
return QList<Core::Id>() << AndroidDeployStep::Id;
|
||||
}
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user