aboutsummaryrefslogtreecommitdiffstats
path: root/doc/qtdesignstudio
diff options
context:
space:
mode:
Diffstat (limited to 'doc/qtdesignstudio')
-rw-r--r--doc/qtdesignstudio/examples/ClusterTutorial/ClusterTutorial.qmlproject (renamed from doc/qtdesignstudio/examples/clustertutorial/ClusterTutorial.qmlproject)0
-rw-r--r--doc/qtdesignstudio/examples/CoffeeMachine/ApplicationFlow.qml (renamed from doc/qtdesignstudio/examples/coffeemachine/ApplicationFlow.qml)0
-rw-r--r--doc/qtdesignstudio/examples/CoffeeMachine/CoffeeButton.qml (renamed from doc/qtdesignstudio/examples/coffeemachine/CoffeeButton.qml)0
-rw-r--r--doc/qtdesignstudio/examples/CoffeeMachine/CoffeeMachine.qmlproject (renamed from doc/qtdesignstudio/examples/coffeemachine/CoffeeMachine.qmlproject)0
-rw-r--r--doc/qtdesignstudio/examples/CoffeeMachine/SideBar.qml (renamed from doc/qtdesignstudio/examples/coffeemachine/SideBar.qml)0
-rw-r--r--doc/qtdesignstudio/examples/EBikeDesign/EBikeDesign.qmlproject (renamed from doc/qtdesignstudio/examples/ebikedesign/EBikeDesign.qmlproject)0
-rw-r--r--doc/qtdesignstudio/examples/SideMenu/CustomButton.qml (renamed from doc/qtdesignstudio/examples/sidemenu/CustomButton.qml)0
-rw-r--r--doc/qtdesignstudio/examples/SideMenu/SideMenu.qml (renamed from doc/qtdesignstudio/examples/sidemenu/SideMenu.qml)0
-rw-r--r--doc/qtdesignstudio/examples/SideMenu/SideMenu.qmlproject (renamed from doc/qtdesignstudio/examples/sidemenu/SideMenu.qmlproject)0
-rw-r--r--doc/qtdesignstudio/examples/WebinarDemo/WebinarDemo.qmlproject (renamed from doc/qtdesignstudio/examples/webinardemo/WebinarDemo.qmlproject)0
-rw-r--r--doc/qtdesignstudio/examples/doc/progressbar.qdoc2
-rw-r--r--doc/qtdesignstudio/images/studio-3d-scenes.pngbin1670 -> 2411 bytes
-rw-r--r--doc/qtdesignstudio/images/studio-animation.pngbin6060 -> 4670 bytes
-rw-r--r--doc/qtdesignstudio/images/studio-animation.svg57
-rw-r--r--doc/qtdesignstudio/images/studio-components.pngbin3963 -> 0 bytes
-rw-r--r--doc/qtdesignstudio/images/studio-connections.pngbin3989 -> 0 bytes
-rw-r--r--doc/qtdesignstudio/images/studio-gs.pngbin1852 -> 0 bytes
-rw-r--r--doc/qtdesignstudio/images/studio-help.pngbin1577 -> 0 bytes
-rw-r--r--doc/qtdesignstudio/images/studio-preview.pngbin3532 -> 0 bytes
-rw-r--r--doc/qtdesignstudio/images/studio-projects.pngbin2380 -> 0 bytes
-rw-r--r--doc/qtdesignstudio/images/studio-settings.pngbin1945 -> 0 bytes
-rw-r--r--doc/qtdesignstudio/src/qtdesignstudio.qdoc12
22 files changed, 64 insertions, 7 deletions
diff --git a/doc/qtdesignstudio/examples/clustertutorial/ClusterTutorial.qmlproject b/doc/qtdesignstudio/examples/ClusterTutorial/ClusterTutorial.qmlproject
index 94dd80cfdc..94dd80cfdc 100644
--- a/doc/qtdesignstudio/examples/clustertutorial/ClusterTutorial.qmlproject
+++ b/doc/qtdesignstudio/examples/ClusterTutorial/ClusterTutorial.qmlproject
diff --git a/doc/qtdesignstudio/examples/coffeemachine/ApplicationFlow.qml b/doc/qtdesignstudio/examples/CoffeeMachine/ApplicationFlow.qml
index eaeffa83e7..eaeffa83e7 100644
--- a/doc/qtdesignstudio/examples/coffeemachine/ApplicationFlow.qml
+++ b/doc/qtdesignstudio/examples/CoffeeMachine/ApplicationFlow.qml
diff --git a/doc/qtdesignstudio/examples/coffeemachine/CoffeeButton.qml b/doc/qtdesignstudio/examples/CoffeeMachine/CoffeeButton.qml
index d2d9e85873..d2d9e85873 100644
--- a/doc/qtdesignstudio/examples/coffeemachine/CoffeeButton.qml
+++ b/doc/qtdesignstudio/examples/CoffeeMachine/CoffeeButton.qml
diff --git a/doc/qtdesignstudio/examples/coffeemachine/CoffeeMachine.qmlproject b/doc/qtdesignstudio/examples/CoffeeMachine/CoffeeMachine.qmlproject
index 8a2ecfb6af..8a2ecfb6af 100644
--- a/doc/qtdesignstudio/examples/coffeemachine/CoffeeMachine.qmlproject
+++ b/doc/qtdesignstudio/examples/CoffeeMachine/CoffeeMachine.qmlproject
diff --git a/doc/qtdesignstudio/examples/coffeemachine/SideBar.qml b/doc/qtdesignstudio/examples/CoffeeMachine/SideBar.qml
index 241f78fc47..241f78fc47 100644
--- a/doc/qtdesignstudio/examples/coffeemachine/SideBar.qml
+++ b/doc/qtdesignstudio/examples/CoffeeMachine/SideBar.qml
diff --git a/doc/qtdesignstudio/examples/ebikedesign/EBikeDesign.qmlproject b/doc/qtdesignstudio/examples/EBikeDesign/EBikeDesign.qmlproject
index 0165571771..0165571771 100644
--- a/doc/qtdesignstudio/examples/ebikedesign/EBikeDesign.qmlproject
+++ b/doc/qtdesignstudio/examples/EBikeDesign/EBikeDesign.qmlproject
diff --git a/doc/qtdesignstudio/examples/sidemenu/CustomButton.qml b/doc/qtdesignstudio/examples/SideMenu/CustomButton.qml
index 9f140b69a2..9f140b69a2 100644
--- a/doc/qtdesignstudio/examples/sidemenu/CustomButton.qml
+++ b/doc/qtdesignstudio/examples/SideMenu/CustomButton.qml
diff --git a/doc/qtdesignstudio/examples/sidemenu/SideMenu.qml b/doc/qtdesignstudio/examples/SideMenu/SideMenu.qml
index 4649d497e6..4649d497e6 100644
--- a/doc/qtdesignstudio/examples/sidemenu/SideMenu.qml
+++ b/doc/qtdesignstudio/examples/SideMenu/SideMenu.qml
diff --git a/doc/qtdesignstudio/examples/sidemenu/SideMenu.qmlproject b/doc/qtdesignstudio/examples/SideMenu/SideMenu.qmlproject
index 22969ff4d8..22969ff4d8 100644
--- a/doc/qtdesignstudio/examples/sidemenu/SideMenu.qmlproject
+++ b/doc/qtdesignstudio/examples/SideMenu/SideMenu.qmlproject
diff --git a/doc/qtdesignstudio/examples/webinardemo/WebinarDemo.qmlproject b/doc/qtdesignstudio/examples/WebinarDemo/WebinarDemo.qmlproject
index 5a19a305ab..5a19a305ab 100644
--- a/doc/qtdesignstudio/examples/webinardemo/WebinarDemo.qmlproject
+++ b/doc/qtdesignstudio/examples/WebinarDemo/WebinarDemo.qmlproject
diff --git a/doc/qtdesignstudio/examples/doc/progressbar.qdoc b/doc/qtdesignstudio/examples/doc/progressbar.qdoc
index 208e97bf8d..0dfb333e41 100644
--- a/doc/qtdesignstudio/examples/doc/progressbar.qdoc
+++ b/doc/qtdesignstudio/examples/doc/progressbar.qdoc
@@ -24,7 +24,7 @@
****************************************************************************/
/*!
- \example ProgressBar
+ \example progressbar
\ingroup studioexamples
\title Progress Bar
diff --git a/doc/qtdesignstudio/images/studio-3d-scenes.png b/doc/qtdesignstudio/images/studio-3d-scenes.png
index 94dbb54778..0dc2121f73 100644
--- a/doc/qtdesignstudio/images/studio-3d-scenes.png
+++ b/doc/qtdesignstudio/images/studio-3d-scenes.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/studio-animation.png b/doc/qtdesignstudio/images/studio-animation.png
index 1bcabc0a13..1365c2df96 100644
--- a/doc/qtdesignstudio/images/studio-animation.png
+++ b/doc/qtdesignstudio/images/studio-animation.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/studio-animation.svg b/doc/qtdesignstudio/images/studio-animation.svg
new file mode 100644
index 0000000000..7e4e93b0f2
--- /dev/null
+++ b/doc/qtdesignstudio/images/studio-animation.svg
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.1.2, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+<svg version="1.1" baseProfile="tiny" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+ x="0px" y="0px" viewBox="0 0 450 270" overflow="visible" xml:space="preserve">
+<g>
+ <g>
+ <path fill="#C9C7C7" d="M433.8,269.6H16.2c-7.8,0-14.2-6.4-14.2-14.2V14.2C2,6.4,8.4,0,16.2,0h417.6c7.8,0,14.2,6.4,14.2,14.2
+ v241.2C448,263.2,441.6,269.6,433.8,269.6z"/>
+ <path fill="#878686" d="M2.4,19.5L2,14.1C2,6.3,8.3,0,16.1,0h417.9c7.8,0,14.1,6.3,14.1,14.1v6.8"/>
+ <circle fill="#DD5858" cx="19.3" cy="10.6" r="5"/>
+ <circle fill="#DBC558" cx="36.1" cy="10.6" r="5"/>
+ <circle fill="#52B257" cx="52.9" cy="10.6" r="5"/>
+ </g>
+ <path fill="#FFFFFF" d="M437.1,262.2H13.4c-2.8,0-5-2.2-5-5V185c0-2.8,2.2-5,5-5h423.7c2.8,0,5,2.2,5,5v72.2
+ C442.1,260,439.9,262.2,437.1,262.2z"/>
+ <path fill="none" stroke="#FFFFFF" stroke-width="7.4167" stroke-linecap="round" stroke-miterlimit="10" d="M190.6,91.4
+ c0-24.3,19.7-44.1,44.1-44.1s44.1,19.7,44.1,44.1s-19.7,44.1-44.1,44.1"/>
+ <circle fill="#FFFFFF" cx="233.8" cy="91.1" r="19.7"/>
+ <polygon fill="#878686" points="258.9,158 256.2,193.9 267.4,180.3 284.4,183.1 "/>
+ <path fill="#878686" d="M228.2,195.9H19.4c-2.8,0-5-2.2-5-5V188c0-2.8,2.2-5,5-5h208.8c2.8,0,5,2.2,5,5v2.9
+ C233.2,193.6,231,195.9,228.2,195.9z"/>
+ <path fill="#878686" d="M348,223.6H206.5c-2.8,0-5-2.2-5-5v-2.9c0-2.8,2.2-5,5-5H348c2.8,0,5,2.2,5,5v2.9
+ C353,221.4,350.8,223.6,348,223.6z"/>
+ <path fill="#878686" d="M419.3,247.4h-86.1c-2.8,0-5-2.2-5-5v-2.9c0-2.8,2.2-5,5-5h86.1c2.8,0,5,2.2,5,5v2.9
+ C424.3,245.1,422.1,247.4,419.3,247.4z"/>
+
+ <rect x="222.4" y="199" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -77.0099 218.9356)" fill="#878686" width="6.8" height="6.8"/>
+
+ <rect x="18.4" y="199" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -136.7589 74.6888)" fill="#878686" width="6.8" height="6.8"/>
+
+ <rect x="117.4" y="199" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -107.7546 144.7115)" fill="#878686" width="6.8" height="6.8"/>
+
+ <rect x="210.5" y="226.7" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -100.0968 218.6541)" fill="#878686" width="6.8" height="6.8"/>
+
+ <rect x="307.5" y="226.7" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -71.6725 287.2764)" fill="#878686" width="6.8" height="6.8"/>
+
+ <rect x="338.2" y="251.5" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -80.1869 316.2345)" fill="#878686" width="6.8" height="6.8"/>
+
+ <rect x="410.5" y="251.5" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -59.0137 367.3511)" fill="#878686" width="6.8" height="6.8"/>
+ <g>
+ <path fill="#FFFFFF" d="M175.7,73.5v14h-2.9V76.8l-3,1.9l-1.3-2.2l4.6-3.1H175.7z"/>
+ </g>
+ <g>
+ <path fill="#FFFFFF" d="M290.4,59.2h-9.1v-2.5l3-3c1.1-1.1,1.8-1.9,2.2-2.5s0.6-1.2,0.6-1.9c0-0.7-0.2-1.1-0.5-1.4
+ c-0.3-0.3-0.8-0.4-1.5-0.4c-0.9,0-2,0.1-3.1,0.3l-0.5,0.1l-0.1-2.3c1.4-0.4,2.8-0.6,4.3-0.6c3,0,4.4,1.3,4.4,4
+ c0,1-0.2,1.9-0.7,2.7s-1.3,1.7-2.5,2.8l-2.4,2.2h5.8V59.2z"/>
+ </g>
+ <g>
+ <path fill="#8389A8" d="M238.9,145.1c1.6-0.6,3.5-1,5.5-1c2,0,3.5,0.4,4.4,1.2s1.4,2,1.4,3.7c0,1.7-0.7,3-2.1,3.9
+ c0.9,0.5,1.5,0.9,1.8,1.4s0.5,1.3,0.5,2.4c0,1.9-0.5,3.3-1.4,4.3c-1,0.9-2.5,1.4-4.6,1.4c-1.6,0-3.2-0.2-4.9-0.7l-0.9-0.2l0.2-2.8
+ c2,0.3,3.7,0.5,5,0.5c1.8,0,2.8-0.8,2.8-2.4c0-0.7-0.2-1.2-0.7-1.6c-0.5-0.4-1.1-0.6-1.9-0.6h-3.6v-3h3.6c0.6,0,1.1-0.2,1.6-0.7
+ c0.5-0.5,0.7-1.1,0.7-1.7c0-1.3-0.9-1.9-2.6-1.9c-1.2,0-2.5,0.1-3.9,0.4l-0.7,0.1L238.9,145.1z"/>
+ </g>
+ <line fill="none" stroke="#F9D953" stroke-width="3" stroke-miterlimit="10" x1="103.5" y1="269.2" x2="103.5" y2="165.2"/>
+ <polygon fill="#F9D953" points="103.4,178.2 111.2,164.7 95.6,164.7 "/>
+</g>
+</svg>
diff --git a/doc/qtdesignstudio/images/studio-components.png b/doc/qtdesignstudio/images/studio-components.png
deleted file mode 100644
index d72388e53b..0000000000
--- a/doc/qtdesignstudio/images/studio-components.png
+++ /dev/null
Binary files differ
diff --git a/doc/qtdesignstudio/images/studio-connections.png b/doc/qtdesignstudio/images/studio-connections.png
deleted file mode 100644
index 787bfbdc95..0000000000
--- a/doc/qtdesignstudio/images/studio-connections.png
+++ /dev/null
Binary files differ
diff --git a/doc/qtdesignstudio/images/studio-gs.png b/doc/qtdesignstudio/images/studio-gs.png
deleted file mode 100644
index 898826e83d..0000000000
--- a/doc/qtdesignstudio/images/studio-gs.png
+++ /dev/null
Binary files differ
diff --git a/doc/qtdesignstudio/images/studio-help.png b/doc/qtdesignstudio/images/studio-help.png
deleted file mode 100644
index 3cee0bf635..0000000000
--- a/doc/qtdesignstudio/images/studio-help.png
+++ /dev/null
Binary files differ
diff --git a/doc/qtdesignstudio/images/studio-preview.png b/doc/qtdesignstudio/images/studio-preview.png
deleted file mode 100644
index 4f943f3f8d..0000000000
--- a/doc/qtdesignstudio/images/studio-preview.png
+++ /dev/null
Binary files differ
diff --git a/doc/qtdesignstudio/images/studio-projects.png b/doc/qtdesignstudio/images/studio-projects.png
deleted file mode 100644
index 623bc1f872..0000000000
--- a/doc/qtdesignstudio/images/studio-projects.png
+++ /dev/null
Binary files differ
diff --git a/doc/qtdesignstudio/images/studio-settings.png b/doc/qtdesignstudio/images/studio-settings.png
deleted file mode 100644
index 2ac37ea853..0000000000
--- a/doc/qtdesignstudio/images/studio-settings.png
+++ /dev/null
Binary files differ
diff --git a/doc/qtdesignstudio/src/qtdesignstudio.qdoc b/doc/qtdesignstudio/src/qtdesignstudio.qdoc
index 74081404dd..5425477f9e 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio.qdoc
@@ -36,9 +36,9 @@
\table
\row
- \li \inlineimage studio-gs.png
- \li \inlineimage studio-projects.png
- \li \inlineimage studio-components.png
+ \li \inlineimage front-gs.png
+ \li \inlineimage front-projects.png
+ \li \inlineimage front-ui.png
\li \inlineimage studio-animation.png
\row
\li \l{Getting Started}
@@ -72,9 +72,9 @@
\endlist
\row
\li \inlineimage studio-3d-scenes.png
- \li \inlineimage studio-preview.png
- \li \inlineimage studio-settings.png
- \li \inlineimage studio-help.png
+ \li \inlineimage front-preview.png
+ \li \inlineimage front-advanced.png
+ \li \inlineimage front-help.png
\row
\li \b {\l{Editing 3D Scenes}}
\list