Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
BC
public
external
Qt
QtQuickControls
Commits
0d3edfa4
Commit
0d3edfa4
authored
13 years ago
by
Jens Bache-Wiig
Browse files
Options
Download
Patches
Plain Diff
Add ApplicationWindow to the API
parent
db4223ea
6.2
5.10
5.11
5.12
5.12.1
5.12.10
5.12.11
5.12.12
5.12.2
5.12.3
5.12.4
5.12.5
5.12.6
5.12.7
5.12.8
5.12.9
5.13
5.13.0
5.13.1
5.13.2
5.14
5.14.0
5.14.1
5.14.2
5.15
5.15.0
5.15.1
5.15.2
5.3
5.4
5.5
5.6
5.7
5.8
5.9
5.9.8
dev
old/5.1
old/5.2
old/qt4
wip/calendar
wip/qt5-nativetext
wip/tizen
v5.15.0-alpha1
v5.14.1
v5.14.0
v5.14.0-rc2
v5.14.0-rc1
v5.14.0-beta3
v5.14.0-beta2
v5.14.0-beta1
v5.14.0-alpha1
v5.13.2
v5.13.1
v5.13.0
v5.13.0-rc3
v5.13.0-rc2
v5.13.0-rc1
v5.13.0-beta4
v5.13.0-beta3
v5.13.0-beta2
v5.13.0-beta1
v5.13.0-alpha1
v5.12.7
v5.12.6
v5.12.5
v5.12.4
v5.12.3
v5.12.2
v5.12.1
v5.12.0
v5.12.0-rc2
v5.12.0-rc1
v5.12.0-beta4
v5.12.0-beta3
v5.12.0-beta2
v5.12.0-beta1
v5.12.0-alpha1
v5.11.3
v5.11.2
v5.11.1
v5.11.0
v5.11.0-rc2
v5.11.0-rc1
v5.11.0-beta4
v5.11.0-beta3
v5.11.0-beta2
v5.11.0-beta1
v5.11.0-alpha1
v5.10.1
v5.10.0
v5.10.0-rc3
v5.10.0-rc2
v5.10.0-rc1
v5.10.0-beta4
v5.10.0-beta3
v5.10.0-beta2
v5.10.0-beta1
v5.10.0-alpha1
v5.9.9
v5.9.8
v5.9.7
v5.9.6
v5.9.5
v5.9.4
v5.9.3
v5.9.2
v5.9.1
v5.9.0
v5.9.0-rc2
v5.9.0-rc1
v5.9.0-beta4
v5.9.0-beta3
v5.9.0-beta2
v5.9.0-beta1
v5.9.0-alpha1
v5.8.0
v5.8.0-rc1
v5.8.0-beta1
v5.8.0-alpha1
v5.7.1
v5.7.0
v5.7.0-rc1
v5.7.0-beta1
v5.7.0-alpha1
v5.6.3
v5.6.2
v5.6.1
v5.6.1-1
v5.6.0
v5.6.0-rc1
v5.6.0-beta1
v5.6.0-alpha1
v5.5.1
v5.5.0
v5.5.0-rc1
v5.5.0-beta1
v5.5.0-alpha1
v5.4.2
v5.4.1
v5.4.0
v5.4.0-rc1
v5.4.0-beta1
v5.4.0-alpha1
v5.3.2
v5.3.1
v5.3.0
v5.3.0-rc1
v5.3.0-beta1
v5.3.0-alpha1
v5.2.1
v5.2.0
v5.2.0-rc1
v5.2.0-beta1
v5.2.0-alpha1
v5.1.1
v5.1.0
v5.1.0-rc2
v5.1.0-rc1
v5.1.0-beta1
v5.1.0-alpha1
No related merge requests found
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
components/ApplicationWindow.qml
+32
-0
components/ApplicationWindow.qml
components/StatusBar.qml
+1
-1
components/StatusBar.qml
components/ToolBar.qml
+1
-2
components/ToolBar.qml
components/components.pro
+2
-1
components/components.pro
components/qmldir
+1
-0
components/qmldir
src/qtoplevelwindow.h
+1
-0
src/qtoplevelwindow.h
with
38 additions
and
4 deletions
components/ApplicationWindow.qml
0 → 100644
+
32
−
0
View file @
0d3edfa4
import
QtQuick
1.1
Window
{
width
:
320
height
:
240
property
alias
toolBar
:
toolBarArea
.
data
property
alias
statusBar
:
statusBarArea
.
data
default
property
alias
data
:
contentArea
.
data
Column
{
id
:
toolBarArea
anchors.top
:
parent
.
top
anchors.left
:
parent
.
left
anchors.right
:
parent
.
right
}
Item
{
id
:
contentArea
anchors.top
:
toolBarArea
.
bottom
anchors.left
:
parent
.
left
anchors.right
:
parent
.
right
anchors.bottom
:
statusBarArea
.
top
}
Column
{
id
:
statusBarArea
anchors.bottom
:
parent
.
bottom
anchors.left
:
parent
.
left
anchors.right
:
parent
.
right
}
}
This diff is collapsed.
Click to expand it.
components/StatusBar.qml
+
1
−
1
View file @
0d3edfa4
...
@@ -3,7 +3,7 @@ import "."
...
@@ -3,7 +3,7 @@ import "."
import
"
custom
"
as
Components
import
"
custom
"
as
Components
StyleItem
{
StyleItem
{
width
:
200
width
:
parent
?
parent
.
width
:
200
height
:
24
height
:
24
elementType
:
"
statusbar
"
elementType
:
"
statusbar
"
}
}
This diff is collapsed.
Click to expand it.
components/ToolBar.qml
+
1
−
2
View file @
0d3edfa4
...
@@ -4,8 +4,7 @@ import "custom" as Components
...
@@ -4,8 +4,7 @@ import "custom" as Components
StyleItem
{
StyleItem
{
id
:
toolbar
id
:
toolbar
width
:
200
width
:
parent
?
parent
.
width
:
200
height
:
40
height
:
40
elementType
:
"
toolbar
"
elementType
:
"
toolbar
"
}
}
This diff is collapsed.
Click to expand it.
components/components.pro
+
2
−
1
View file @
0d3edfa4
...
@@ -40,7 +40,8 @@ QML_FILES = \
...
@@ -40,7 +40,8 @@ QML_FILES = \
SplitterColumn
.
qml
\
SplitterColumn
.
qml
\
StatusBar
.
qml
\
StatusBar
.
qml
\
TableColumn
.
qml
\
TableColumn
.
qml
\
TextField
.
qml
TextField
.
qml
\
ApplicationWindow
.
qml
QML_DIRS
=
\
QML_DIRS
=
\
custom
\
custom
\
...
...
This diff is collapsed.
Click to expand it.
components/qmldir
+
1
−
0
View file @
0d3edfa4
...
@@ -30,3 +30,4 @@ MenuItem 0.1 MenuItem.qml
...
@@ -30,3 +30,4 @@ MenuItem 0.1 MenuItem.qml
Dialog 0.1 Dialog.qml
Dialog 0.1 Dialog.qml
StatusBar 0.1 StatusBar.qml
StatusBar 0.1 StatusBar.qml
SplitterItem 0.1 SplitterItem.qml
SplitterItem 0.1 SplitterItem.qml
ApplicationWindow 0.1 ApplicationWindow.qml
This diff is collapsed.
Click to expand it.
src/qtoplevelwindow.h
+
1
−
0
View file @
0d3edfa4
...
@@ -41,6 +41,7 @@ public:
...
@@ -41,6 +41,7 @@ public:
QGraphicsScene
*
scene
()
{
return
_view
->
scene
();
}
QGraphicsScene
*
scene
()
{
return
_view
->
scene
();
}
QDeclarativeView
*
view
()
{
return
_view
;
}
QDeclarativeView
*
view
()
{
return
_view
;
}
void
registerChildWindow
(
QTopLevelWindow
*
child
);
void
registerChildWindow
(
QTopLevelWindow
*
child
);
void
hideChildWindows
();
void
hideChildWindows
();
void
initPosition
();
void
initPosition
();
...
...
This diff is collapsed.
Click to expand it.
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets