Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
3e4e0f80
Commit
3e4e0f80
authored
Jul 30, 2010
by
Thomas Hartmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
QuickToolBar: integrate BorderImage
parent
7c67c2be
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
0 deletions
+24
-0
src/plugins/qmldesigner/components/propertyeditor/contextpanewidget.cpp
...ldesigner/components/propertyeditor/contextpanewidget.cpp
+22
-0
src/plugins/qmldesigner/components/propertyeditor/contextpanewidget.h
...qmldesigner/components/propertyeditor/contextpanewidget.h
+2
-0
No files found.
src/plugins/qmldesigner/components/propertyeditor/contextpanewidget.cpp
View file @
3e4e0f80
...
...
@@ -110,11 +110,13 @@ ContextPaneWidget::ContextPaneWidget(QWidget *parent) : DragWidget(parent), m_cu
QWidget
*
fontWidget
=
createFontWidget
();
m_currentWidget
=
fontWidget
;
QWidget
*
imageWidget
=
createImageWidget
();
QWidget
*
borderImageWidget
=
createBorderImageWidget
();
QWidget
*
rectangleWidget
=
createRectangleWidget
();
QWidget
*
easingWidget
=
createEasingWidget
();
layout
->
addWidget
(
fontWidget
,
0
,
1
,
2
,
1
);
layout
->
addWidget
(
easingWidget
,
0
,
1
,
2
,
1
);
layout
->
addWidget
(
imageWidget
,
0
,
1
,
2
,
1
);
layout
->
addWidget
(
borderImageWidget
,
0
,
1
,
2
,
1
);
layout
->
addWidget
(
rectangleWidget
,
0
,
1
,
2
,
1
);
setAutoFillBackground
(
true
);
...
...
@@ -219,6 +221,7 @@ void ContextPaneWidget::setPath(const QString &path)
bool
ContextPaneWidget
::
setType
(
const
QString
&
typeName
)
{
m_imageWidget
->
hide
();
m_borderImageWidget
->
hide
();
m_textWidget
->
hide
();
m_rectangleWidget
->
hide
();
m_easingWidget
->
hide
();
...
...
@@ -250,6 +253,14 @@ bool ContextPaneWidget::setType(const QString &typeName)
resize
(
sizeHint
());
return
true
;
}
if
(
typeName
.
contains
(
"BorderImage"
))
{
m_currentWidget
=
m_borderImageWidget
;
m_borderImageWidget
->
show
();
resize
(
sizeHint
());
return
true
;
}
if
(
typeName
.
contains
(
"Image"
))
{
m_currentWidget
=
m_imageWidget
;
m_imageWidget
->
show
();
...
...
@@ -330,6 +341,17 @@ QWidget *ContextPaneWidget::createImageWidget()
return
m_imageWidget
;
}
QWidget
*
ContextPaneWidget
::
createBorderImageWidget
()
{
m_borderImageWidget
=
new
ContextPaneWidgetImage
(
this
,
true
);
connect
(
m_borderImageWidget
,
SIGNAL
(
propertyChanged
(
QString
,
QVariant
)),
this
,
SIGNAL
(
propertyChanged
(
QString
,
QVariant
)));
connect
(
m_borderImageWidget
,
SIGNAL
(
removeProperty
(
QString
)),
this
,
SIGNAL
(
removeProperty
(
QString
)));
connect
(
m_borderImageWidget
,
SIGNAL
(
removeAndChangeProperty
(
QString
,
QString
,
QVariant
,
bool
)),
this
,
SIGNAL
(
removeAndChangeProperty
(
QString
,
QString
,
QVariant
,
bool
)));
return
m_borderImageWidget
;
}
QWidget
*
ContextPaneWidget
::
createRectangleWidget
()
{
m_rectangleWidget
=
new
ContextPaneWidgetRectangle
(
this
);
...
...
src/plugins/qmldesigner/components/propertyeditor/contextpanewidget.h
View file @
3e4e0f80
...
...
@@ -74,6 +74,7 @@ protected:
QWidget
*
createFontWidget
();
QWidget
*
createEasingWidget
();
QWidget
*
createImageWidget
();
QWidget
*
createBorderImageWidget
();
QWidget
*
createRectangleWidget
();
private:
...
...
@@ -81,6 +82,7 @@ private:
ContextPaneTextWidget
*
m_textWidget
;
EasingContextPane
*
m_easingWidget
;
ContextPaneWidgetImage
*
m_imageWidget
;
ContextPaneWidgetImage
*
m_borderImageWidget
;
ContextPaneWidgetRectangle
*
m_rectangleWidget
;
QWeakPointer
<
BauhausColorDialog
>
m_bauhausColorDialog
;
QString
m_colorName
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment