From 12916161abf29fd5f703c5a950bb3e6fd7b9ba10 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Date: Thu, 12 Aug 2010 15:43:13 +0200
Subject: [PATCH] Creating lib: qmleditorwidgets
The library qmleditorwidgets contains widgets and image resources
what are shared between QuickToolBar and QmlDesigner
This library is created to make QuickToolBar independent from
QmlDesigner plugin.
All the widgets I moved to qmleditorwidgets are removed from
QmlDesigner in this patch
---
src/libs/libs.pro | 2 +
src/libs/qmleditorwidgets/colorbox.cpp | 240 ++++++++++++
src/libs/qmleditorwidgets/colorbox.h | 98 +++++
src/libs/qmleditorwidgets/colorbutton.cpp | 152 ++++++++
src/libs/qmleditorwidgets/colorbutton.h | 74 ++++
src/libs/qmleditorwidgets/colorwidget.cpp | 47 +++
src/libs/qmleditorwidgets/colorwidget.h | 58 +++
.../qmleditorwidgets}/contextpanetext.ui | 12 +-
.../contextpanetextwidget.cpp | 32 +-
.../qmleditorwidgets}/contextpanetextwidget.h | 36 +-
.../qmleditorwidgets}/contextpanewidget.cpp | 73 ++--
.../qmleditorwidgets}/contextpanewidget.h | 49 ++-
.../contextpanewidgetborderimage.ui | 4 +-
.../contextpanewidgetimage.cpp | 31 +-
.../contextpanewidgetimage.h | 37 +-
.../contextpanewidgetimage.ui | 4 +-
.../contextpanewidgetrectangle.cpp | 32 +-
.../contextpanewidgetrectangle.h | 34 +-
.../contextpanewidgetrectangle.ui | 14 +-
.../qmleditorwidgets/customcolordialog.cpp | 180 +++++++++
src/libs/qmleditorwidgets/customcolordialog.h | 110 ++++++
.../easingpane/easingcontextpane.cpp | 45 ++-
.../easingpane/easingcontextpane.h | 31 +-
.../easingpane/easingcontextpane.ui | 0
.../easingpane/easinggraph.cpp | 29 ++
.../easingpane/easinggraph.h | 29 ++
.../easingpane/easingpane.pri | 11 +
.../easingpane/easingpane.qrc | 0
.../qmleditorwidgets}/easingpane/playicon.png | Bin
.../qmleditorwidgets}/easingpane/qt_logo.png | Bin
.../qmleditorwidgets}/easingpane/stopicon.png | Bin
src/libs/qmleditorwidgets/filewidget.cpp | 142 +++++++
src/libs/qmleditorwidgets/filewidget.h | 123 ++++++
.../qmleditorwidgets}/fontsizespinbox.cpp | 31 +-
.../qmleditorwidgets}/fontsizespinbox.h | 34 +-
src/libs/qmleditorwidgets/gradientline.cpp | 354 ++++++++++++++++++
src/libs/qmleditorwidgets/gradientline.h | 101 +++++
src/libs/qmleditorwidgets/huecontrol.cpp | 127 +++++++
src/libs/qmleditorwidgets/huecontrol.h | 75 ++++
.../images/alignmentbottom-h-icon.png | Bin
.../images/alignmentbottom-icon.png | Bin
.../images/alignmentcenterh-h-icon.png | Bin
.../images/alignmentcenterh-icon.png | Bin
.../images/alignmentleft-h-icon.png | Bin
.../images/alignmentleft-icon.png | Bin
.../images/alignmentmiddle-h-icon.png | Bin
.../images/alignmentmiddle-icon.png | Bin
.../images/alignmentright-h-icon.png | Bin
.../images/alignmentright-icon.png | Bin
.../images/alignmenttop-h-icon.png | Bin
.../images/alignmenttop-icon.png | Bin
.../images/anchor-bottom-normal.png | Bin
.../images/anchor-bottom-pressed.png | Bin
.../images/anchor-fill-normal.png | Bin
.../images/anchor-fill-pressed.png | Bin
.../images/anchor-horizontal-normal.png | Bin
.../images/anchor-horizontal-pressed.png | Bin
.../images/anchor-left-normal.png | Bin
.../images/anchor-left-pressed.png | Bin
.../images/anchor-right-normal.png | Bin
.../images/anchor-right-pressed.png | Bin
.../images/anchor-spacer.png | Bin
.../images/anchor-top-normal.png | Bin
.../images/anchor-top-pressed.png | Bin
.../images/anchor-vertical-normal.png | Bin
.../images/anchor-vertical-pressed.png | Bin
.../qmleditorwidgets}/images/apply.png | Bin
.../qmleditorwidgets}/images/applybright.png | Bin
.../images/aspect-crop-icon.png | Bin
.../images/aspect-fit-icon.png | Bin
.../images/aspectlockoff.png | Bin
.../images/aspectlockset.png | Bin
.../qmleditorwidgets}/images/bold-h-icon.png | Bin
.../images/button-normal-left.png | Bin
.../images/button-normal-middle.png | Bin
.../images/button-normal-right.png | Bin
.../images/button-pressed-left.png | Bin
.../images/button-pressed-middle.png | Bin
.../images/button-pressed-right.png | Bin
.../images/button_alignment_bottom_normal.png | Bin
.../button_alignment_bottom_pressed.png | Bin
.../button_alignment_centerh_normal.png | Bin
.../button_alignment_centerh_pressed.png | Bin
.../button_alignment_centerv_normal.png | Bin
.../button_alignment_centerv_pressed.png | Bin
.../images/button_alignment_left_normal.png | Bin
.../images/button_alignment_left_pressed.png | Bin
.../images/button_alignment_right_normal.png | Bin
.../images/button_alignment_right_pressed.png | Bin
.../images/button_alignment_top_normal.png | Bin
.../images/button_alignment_top_pressed.png | Bin
.../images/button_color_gradient_normal.png | Bin
.../images/button_color_gradient_pressed.png | Bin
.../images/button_color_none_normal.png | Bin
.../images/button_color_none_pressed.png | Bin
.../images/button_color_solid_normal.png | Bin
.../images/button_color_solid_pressed.png | Bin
.../qmleditorwidgets}/images/cancel.png | Bin
.../qmleditorwidgets}/images/cancelbright.png | Bin
.../images/checkbox_checked.png | Bin
.../images/checkbox_checked_hover.png | Bin
.../images/checkbox_checked_pressed.png | Bin
.../images/checkbox_unchecked.png | Bin
.../images/checkbox_unchecked_hover.png | Bin
.../images/checkbox_unchecked_pressed.png | Bin
.../images/collapse-button-hover-mirrored.png | Bin
.../images/collapse-button-hover.png | Bin
.../collapse-button-normal-mirrored.png | Bin
.../images/collapse-button-normal.png | Bin
.../images/combobox-normal.png | Bin
.../images/combobox-pressed.png | Bin
.../qmleditorwidgets}/images/down_arrow.png | Bin
.../images/down_arrow_disabled.png | Bin
.../qmleditorwidgets}/images/eye_crossed.png | Bin
.../qmleditorwidgets}/images/eye_open.png | Bin
.../qmleditorwidgets}/images/frame.png | Bin
.../qmleditorwidgets}/images/hole.png | Bin
.../images/horizontal-scale-icon.png | Bin
.../qmleditorwidgets}/images/icon-bottom.png | Bin
.../images/icon-horizontal.png | Bin
.../qmleditorwidgets}/images/icon-left.png | Bin
.../qmleditorwidgets}/images/icon-right.png | Bin
.../qmleditorwidgets}/images/icon-top.png | Bin
.../images/icon-vertical.png | Bin
.../images/icon_color_gradient.png | Bin
.../images/icon_color_none.png | Bin
.../images/icon_color_solid.png | Bin
.../images/italic-h-icon.png | Bin
.../qmleditorwidgets}/images/lock.png | Bin
.../qmleditorwidgets}/images/placeholder.png | Bin
.../qmleditorwidgets}/images/pushbutton.png | Bin
.../images/pushbutton_hover.png | Bin
.../images/pushbutton_pressed.png | Bin
.../images/radiobutton_checked.png | Bin
.../images/radiobutton_checked_hover.png | Bin
.../images/radiobutton_checked_pressed.png | Bin
.../images/radiobutton_unchecked.png | Bin
.../images/radiobutton_unchecked_hover.png | Bin
.../images/radiobutton_unchecked_pressed.png | Bin
.../qmleditorwidgets}/images/scale-icon.png | Bin
.../scrollbar-borderimage-horizontal.png | Bin
.../images/scrollbar-borderimage-vertical.png | Bin
.../qmleditorwidgets}/images/sizegrip.png | Bin
.../images/slider_indikator.png | Bin
.../qmleditorwidgets}/images/slider_line.png | Bin
.../qmleditorwidgets}/images/spindown.png | Bin
.../images/spindown_hover.png | Bin
.../qmleditorwidgets}/images/spindown_off.png | Bin
.../images/spindown_pressed.png | Bin
.../qmleditorwidgets}/images/spinup.png | Bin
.../qmleditorwidgets}/images/spinup_hover.png | Bin
.../qmleditorwidgets}/images/spinup_off.png | Bin
.../images/spinup_pressed.png | Bin
.../images/strikeout-h-icon.png | Bin
.../images/tile-icon-hor - scale.png | Bin
.../images/tile-icon-hor-crop.png | Bin
.../images/tile-icon-vert-crop.png | Bin
.../images/tile-icon-vert-scale.png | Bin
.../qmleditorwidgets}/images/tile-icon.png | Bin
.../images/triangle_horz.png | Bin
.../images/triangle_vert.png | Bin
.../images/underline-h-icon.png | Bin
.../qmleditorwidgets}/images/up_arrow.png | Bin
.../images/up_arrow_disabled.png | Bin
.../images/vertical-scale-icon.png | Bin
.../qmleditorwidgets/qmleditorwidgets-lib.pri | 53 +++
.../qmleditorwidgets/qmleditorwidgets.pri | 7 +
.../qmleditorwidgets/qmleditorwidgets.pro | 12 +
.../qmleditorwidgets_global.h | 43 +++
src/libs/qmleditorwidgets/resources.qrc | 130 +++++++
.../components/easingpane/easingpane.pri | 12 -
.../propertyeditor/propertyeditor.pri | 15 +-
.../components/resources/resources.qrc | 130 +------
173 files changed, 2627 insertions(+), 226 deletions(-)
create mode 100644 src/libs/qmleditorwidgets/colorbox.cpp
create mode 100644 src/libs/qmleditorwidgets/colorbox.h
create mode 100644 src/libs/qmleditorwidgets/colorbutton.cpp
create mode 100644 src/libs/qmleditorwidgets/colorbutton.h
create mode 100644 src/libs/qmleditorwidgets/colorwidget.cpp
create mode 100644 src/libs/qmleditorwidgets/colorwidget.h
rename src/{plugins/qmldesigner/components/propertyeditor => libs/qmleditorwidgets}/contextpanetext.ui (96%)
rename src/{plugins/qmldesigner/components/propertyeditor => libs/qmleditorwidgets}/contextpanetextwidget.cpp (92%)
rename src/{plugins/qmldesigner/components/propertyeditor => libs/qmleditorwidgets}/contextpanetextwidget.h (53%)
rename src/{plugins/qmldesigner/components/propertyeditor => libs/qmleditorwidgets}/contextpanewidget.cpp (88%)
rename src/{plugins/qmldesigner/components/propertyeditor => libs/qmleditorwidgets}/contextpanewidget.h (59%)
rename src/{plugins/qmldesigner/components/propertyeditor => libs/qmleditorwidgets}/contextpanewidgetborderimage.ui (98%)
rename src/{plugins/qmldesigner/components/propertyeditor => libs/qmleditorwidgets}/contextpanewidgetimage.cpp (96%)
rename src/{plugins/qmldesigner/components/propertyeditor => libs/qmleditorwidgets}/contextpanewidgetimage.h (73%)
rename src/{plugins/qmldesigner/components/propertyeditor => libs/qmleditorwidgets}/contextpanewidgetimage.ui (98%)
rename src/{plugins/qmldesigner/components/propertyeditor => libs/qmleditorwidgets}/contextpanewidgetrectangle.cpp (87%)
rename src/{plugins/qmldesigner/components/propertyeditor => libs/qmleditorwidgets}/contextpanewidgetrectangle.h (50%)
rename src/{plugins/qmldesigner/components/propertyeditor => libs/qmleditorwidgets}/contextpanewidgetrectangle.ui (94%)
create mode 100644 src/libs/qmleditorwidgets/customcolordialog.cpp
create mode 100644 src/libs/qmleditorwidgets/customcolordialog.h
rename src/{plugins/qmldesigner/components => libs/qmleditorwidgets}/easingpane/easingcontextpane.cpp (85%)
rename src/{plugins/qmldesigner/components => libs/qmleditorwidgets}/easingpane/easingcontextpane.h (56%)
rename src/{plugins/qmldesigner/components => libs/qmleditorwidgets}/easingpane/easingcontextpane.ui (100%)
rename src/{plugins/qmldesigner/components => libs/qmleditorwidgets}/easingpane/easinggraph.cpp (87%)
rename src/{plugins/qmldesigner/components => libs/qmleditorwidgets}/easingpane/easinggraph.h (68%)
create mode 100644 src/libs/qmleditorwidgets/easingpane/easingpane.pri
rename src/{plugins/qmldesigner/components => libs/qmleditorwidgets}/easingpane/easingpane.qrc (100%)
rename src/{plugins/qmldesigner/components => libs/qmleditorwidgets}/easingpane/playicon.png (100%)
rename src/{plugins/qmldesigner/components => libs/qmleditorwidgets}/easingpane/qt_logo.png (100%)
rename src/{plugins/qmldesigner/components => libs/qmleditorwidgets}/easingpane/stopicon.png (100%)
create mode 100644 src/libs/qmleditorwidgets/filewidget.cpp
create mode 100644 src/libs/qmleditorwidgets/filewidget.h
rename src/{plugins/qmldesigner/components/propertyeditor => libs/qmleditorwidgets}/fontsizespinbox.cpp (53%)
rename src/{plugins/qmldesigner/components/propertyeditor => libs/qmleditorwidgets}/fontsizespinbox.h (50%)
create mode 100644 src/libs/qmleditorwidgets/gradientline.cpp
create mode 100644 src/libs/qmleditorwidgets/gradientline.h
create mode 100644 src/libs/qmleditorwidgets/huecontrol.cpp
create mode 100644 src/libs/qmleditorwidgets/huecontrol.h
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/alignmentbottom-h-icon.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/alignmentbottom-icon.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/alignmentcenterh-h-icon.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/alignmentcenterh-icon.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/alignmentleft-h-icon.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/alignmentleft-icon.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/alignmentmiddle-h-icon.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/alignmentmiddle-icon.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/alignmentright-h-icon.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/alignmentright-icon.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/alignmenttop-h-icon.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/alignmenttop-icon.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/anchor-bottom-normal.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/anchor-bottom-pressed.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/anchor-fill-normal.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/anchor-fill-pressed.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/anchor-horizontal-normal.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/anchor-horizontal-pressed.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/anchor-left-normal.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/anchor-left-pressed.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/anchor-right-normal.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/anchor-right-pressed.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/anchor-spacer.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/anchor-top-normal.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/anchor-top-pressed.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/anchor-vertical-normal.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/anchor-vertical-pressed.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/apply.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/applybright.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/aspect-crop-icon.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/aspect-fit-icon.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/aspectlockoff.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/aspectlockset.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/bold-h-icon.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/button-normal-left.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/button-normal-middle.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/button-normal-right.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/button-pressed-left.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/button-pressed-middle.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/button-pressed-right.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/button_alignment_bottom_normal.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/button_alignment_bottom_pressed.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/button_alignment_centerh_normal.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/button_alignment_centerh_pressed.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/button_alignment_centerv_normal.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/button_alignment_centerv_pressed.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/button_alignment_left_normal.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/button_alignment_left_pressed.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/button_alignment_right_normal.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/button_alignment_right_pressed.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/button_alignment_top_normal.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/button_alignment_top_pressed.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/button_color_gradient_normal.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/button_color_gradient_pressed.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/button_color_none_normal.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/button_color_none_pressed.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/button_color_solid_normal.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/button_color_solid_pressed.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/cancel.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/cancelbright.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/checkbox_checked.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/checkbox_checked_hover.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/checkbox_checked_pressed.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/checkbox_unchecked.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/checkbox_unchecked_hover.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/checkbox_unchecked_pressed.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/collapse-button-hover-mirrored.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/collapse-button-hover.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/collapse-button-normal-mirrored.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/collapse-button-normal.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/combobox-normal.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/combobox-pressed.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/down_arrow.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/down_arrow_disabled.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/eye_crossed.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/eye_open.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/frame.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/hole.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/horizontal-scale-icon.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/icon-bottom.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/icon-horizontal.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/icon-left.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/icon-right.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/icon-top.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/icon-vertical.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/icon_color_gradient.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/icon_color_none.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/icon_color_solid.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/italic-h-icon.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/lock.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/placeholder.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/pushbutton.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/pushbutton_hover.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/pushbutton_pressed.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/radiobutton_checked.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/radiobutton_checked_hover.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/radiobutton_checked_pressed.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/radiobutton_unchecked.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/radiobutton_unchecked_hover.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/radiobutton_unchecked_pressed.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/scale-icon.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/scrollbar-borderimage-horizontal.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/scrollbar-borderimage-vertical.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/sizegrip.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/slider_indikator.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/slider_line.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/spindown.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/spindown_hover.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/spindown_off.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/spindown_pressed.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/spinup.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/spinup_hover.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/spinup_off.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/spinup_pressed.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/strikeout-h-icon.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/tile-icon-hor - scale.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/tile-icon-hor-crop.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/tile-icon-vert-crop.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/tile-icon-vert-scale.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/tile-icon.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/triangle_horz.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/triangle_vert.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/underline-h-icon.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/up_arrow.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/up_arrow_disabled.png (100%)
rename src/{plugins/qmldesigner/components/resources => libs/qmleditorwidgets}/images/vertical-scale-icon.png (100%)
create mode 100644 src/libs/qmleditorwidgets/qmleditorwidgets-lib.pri
create mode 100644 src/libs/qmleditorwidgets/qmleditorwidgets.pri
create mode 100644 src/libs/qmleditorwidgets/qmleditorwidgets.pro
create mode 100644 src/libs/qmleditorwidgets/qmleditorwidgets_global.h
create mode 100644 src/libs/qmleditorwidgets/resources.qrc
delete mode 100644 src/plugins/qmldesigner/components/easingpane/easingpane.pri
diff --git a/src/libs/libs.pro b/src/libs/libs.pro
index 9b2c75bd05a..4c5a46fa50d 100644
--- a/src/libs/libs.pro
+++ b/src/libs/libs.pro
@@ -10,5 +10,7 @@ SUBDIRS = \
utils/process_stub.pro \
cplusplus \
qmljs \
+ qmljsdebugger \
+ qmleditorwidgets \
symbianutils \
3rdparty
diff --git a/src/libs/qmleditorwidgets/colorbox.cpp b/src/libs/qmleditorwidgets/colorbox.cpp
new file mode 100644
index 00000000000..e09cc033405
--- /dev/null
+++ b/src/libs/qmleditorwidgets/colorbox.cpp
@@ -0,0 +1,240 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+**
+**************************************************************************/
+
+#include "colorbox.h"
+#include <QPainter>
+#include <QMouseEvent>
+
+static inline QString properName(const QColor &color)
+{
+ QString s;
+ if (color.alpha() == 255)
+ s.sprintf("#%02x%02x%02x", color.red(), color.green(), color.blue());
+ else
+ s.sprintf("#%02x%02x%02x%02x", color.alpha(), color.red(), color.green(), color.blue());
+ return s;
+}
+
+static inline QColor properColor(const QString &str)
+{
+ if (str.isEmpty())
+ return QColor();
+ int lalpha = 255;
+ QString lcolorStr = str;
+ if (lcolorStr.at(0) == '#' && lcolorStr.length() == 9) {
+ QString alphaStr = lcolorStr;
+ alphaStr.truncate(3);
+ lcolorStr.remove(0, 3);
+ lcolorStr = "#" + lcolorStr;
+ alphaStr.remove(0,1);
+ bool v;
+ lalpha = alphaStr.toInt(&v, 16);
+ if (!v)
+ lalpha = 255;
+ }
+ QColor lcolor(lcolorStr);
+ if (lcolorStr.contains('#'))
+ lcolor.setAlpha(lalpha);
+ return lcolor;
+}
+
+static inline int clamp(int x, int lower, int upper)
+{
+ if (x < lower)
+ x = lower;
+ if (x > upper)
+ x = upper;
+ return x;
+}
+
+namespace QmlEditorWidgets {
+
+void ColorBox::setHue(int newHue)
+{
+ if (m_color.hsvHue() == newHue)
+ return;
+
+ int oldAlpha = m_color.alpha();
+ m_color.setHsv(newHue,m_color.hsvSaturation(),m_color.value());
+ m_color.setAlpha(oldAlpha);
+ update();
+ emit hueChanged();
+ emit colorChanged();
+}
+
+int ColorBox::hue() const
+{
+ int retval = m_color.hsvHue();
+ if (retval<0) retval=0;
+ if (retval>359) retval=359;
+ return retval;
+}
+
+void ColorBox::setAlpha(int newAlpha)
+{
+ if (m_color.alpha() == newAlpha)
+ return;
+
+ m_color.setAlpha(newAlpha);
+ update();
+ emit alphaChanged();
+ emit colorChanged();
+}
+
+QString ColorBox::strColor() const
+{
+ return properName(m_color);
+}
+
+void ColorBox::setStrColor(const QString &colorStr)
+{
+ if (properName(m_color) == colorStr)
+ return;
+
+ setColor(properColor(colorStr));
+}
+
+void ColorBox::setColor(const QColor &color)
+{
+ if (m_color == color)
+ return;
+
+ int oldsaturation = m_color.hsvSaturation();
+ int oldvalue = m_color.value();
+ int oldhue = m_color.hsvHue();
+ int oldAlpha = m_color.alpha();
+ m_color=color;
+ update();
+ if (oldhue != m_color.hsvHue()) emit hueChanged();
+ if (oldsaturation != saturation()) emit saturationChanged();
+ if (oldvalue != value()) emit valueChanged();
+ if (oldAlpha != alpha()) emit alphaChanged();
+}
+
+void ColorBox::setSaturation(int newsaturation)
+{
+ if (m_color.hsvSaturation()==newsaturation) return;
+ int oldAlpha = m_color.alpha();
+ m_color.setHsv(m_color.hsvHue(),newsaturation,m_color.value());
+ m_color.setAlpha(oldAlpha);
+ update();
+ emit saturationChanged();
+ emit colorChanged();
+}
+
+void ColorBox::setCurrent(int x, int y)
+{
+ QColor newColor;
+ x = clamp(x, 0, 120);
+ y = clamp(y, 0, 120);
+ int oldAlpha = m_color.alpha();
+ newColor.setHsv(hue(), (x*255) / 120, 255 - (y*255) / 120);
+ newColor.setAlpha(oldAlpha);
+ setColor(newColor);
+}
+
+void ColorBox::setValue(int newvalue)
+{
+ if (m_color.value()==newvalue) return;
+ int oldAlpha = m_color.alpha();
+ m_color.setHsv(m_color.hsvHue(),m_color.hsvSaturation(),newvalue);
+ m_color.setAlpha(oldAlpha);
+ update();
+ emit valueChanged();
+ emit colorChanged();
+}
+
+void ColorBox::paintEvent(QPaintEvent *event)
+{
+ QWidget::paintEvent(event);
+
+ QPainter p(this);
+
+ if ((m_color.saturation()>1) && (m_color.value()>1))
+ m_saturatedColor.setHsv(m_color.hsvHue(),255,255);
+
+ if ((hue() != m_lastHue) || (m_cache.isNull())) {
+ m_lastHue = hue();
+
+ int fixedHue = clamp(m_lastHue, 0, 359);
+
+ m_cache = QPixmap(120, 120);
+
+ int height = 120;
+ int width = 120;
+
+ QPainter chacheP(&m_cache);
+
+ for (int y = 0; y < height; y++)
+ for (int x = 0; x < width; x++)
+ {
+ QColor c;
+ c.setHsv(fixedHue, (x*255) / width, 255 - (y*255) / height);
+ chacheP.setPen(c);
+ chacheP.drawPoint(x ,y);
+ }
+ }
+ p.drawPixmap(5, 5, m_cache);
+
+ int x = clamp(m_color.hsvSaturationF() * 120, 0, 119) + 5;
+ int y = clamp(120 - m_color.valueF() * 120, 0, 119) + 5;
+
+ p.setPen(QColor(255, 255, 255, 50));
+ p.drawLine(5, y, x-1, y);
+ p.drawLine(x+1, y, width()-7, y);
+ p.drawLine(x, 5, x, y-1);
+ p.drawLine(x, y+1, x, height()-7);
+
+}
+
+void ColorBox::mousePressEvent(QMouseEvent *e)
+{
+ // The current cell marker is set to the cell the mouse is pressed in
+ QPoint pos = e->pos();
+ m_mousePressed = true;
+ setCurrent(pos.x() - 5, pos.y() - 5);
+}
+
+void ColorBox::mouseReleaseEvent(QMouseEvent * /* event */)
+{
+ if (m_mousePressed)
+ emit colorChanged();
+ m_mousePressed = false;
+}
+
+void ColorBox::mouseMoveEvent(QMouseEvent *e)
+{
+ if (!m_mousePressed)
+ return;
+ QPoint pos = e->pos();
+ setCurrent(pos.x() - 5, pos.y() - 5);
+}
+
+
+} //QmlEditorWidgets
diff --git a/src/libs/qmleditorwidgets/colorbox.h b/src/libs/qmleditorwidgets/colorbox.h
new file mode 100644
index 00000000000..d129ae4629f
--- /dev/null
+++ b/src/libs/qmleditorwidgets/colorbox.h
@@ -0,0 +1,98 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+**
+**************************************************************************/
+
+#ifndef COLORBOX_H
+#define COLORBOX_H
+
+#include <qmleditorwidgets_global.h>
+#include <QtGui/QWidget>
+#include <QToolButton>
+#include <qdeclarative.h>
+
+namespace QmlEditorWidgets {
+
+class QMLEDITORWIDGETS_EXPORT ColorBox : public QWidget
+{
+ Q_OBJECT
+
+ Q_PROPERTY(QString strColor READ strColor WRITE setStrColor NOTIFY colorChanged)
+ Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
+ Q_PROPERTY(int hue READ hue WRITE setHue NOTIFY hueChanged)
+ Q_PROPERTY(int saturation READ saturation WRITE setSaturation NOTIFY saturationChanged)
+ Q_PROPERTY(int value READ value WRITE setValue NOTIFY valueChanged)
+ Q_PROPERTY(int alpha READ alpha WRITE setAlpha NOTIFY alphaChanged)
+
+public:
+ ColorBox(QWidget *parent = 0) : QWidget(parent), m_color(Qt::white), m_saturatedColor(Qt::white), m_lastHue(0)
+ {
+ setFixedWidth(130);
+ setFixedHeight(130);
+ }
+
+ void setHue(int newHue);
+ int hue() const;
+ void setAlpha(int newAlpha);
+ int alpha() const { return m_color.alpha(); }
+ void setStrColor(const QString &colorStr);
+ void setColor(const QColor &color);
+ QString strColor() const;
+ QColor color() const { return m_color; }
+ int saturation() const { return m_color.hsvSaturation(); }
+ void setSaturation(int newsaturation);
+ int value() const { return m_color.value(); }
+ void setValue(int newvalue);
+
+signals:
+ void colorChanged();
+ void hueChanged();
+ void saturationChanged();
+ void valueChanged();
+ void alphaChanged();
+
+protected:
+ void paintEvent(QPaintEvent *event);
+
+ void mousePressEvent(QMouseEvent *);
+ void mouseReleaseEvent(QMouseEvent *);
+ void mouseMoveEvent(QMouseEvent *);
+ void setCurrent(int x, int y);
+
+private:
+ QColor m_color;
+ QColor m_saturatedColor;
+ bool m_mousePressed;
+ int m_lastHue;
+ QPixmap m_cache;
+};
+
+} //QmlEditorWidgets
+
+QML_DECLARE_TYPE(QmlEditorWidgets::ColorBox);
+
+#endif //COLORBOX_H
diff --git a/src/libs/qmleditorwidgets/colorbutton.cpp b/src/libs/qmleditorwidgets/colorbutton.cpp
new file mode 100644
index 00000000000..645f380e7f1
--- /dev/null
+++ b/src/libs/qmleditorwidgets/colorbutton.cpp
@@ -0,0 +1,152 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+**
+**************************************************************************/
+
+#include "colorbutton.h"
+#include <QPainter>
+
+static inline QPixmap tilePixMap(int size)
+{
+ const int checkerbordSize= size;
+ QPixmap tilePixmap(checkerbordSize * 2, checkerbordSize * 2);
+ tilePixmap.fill(Qt::white);
+ QPainter tilePainter(&tilePixmap);
+ QColor color(220, 220, 220);
+ tilePainter.fillRect(0, 0, checkerbordSize, checkerbordSize, color);
+ tilePainter.fillRect(checkerbordSize, checkerbordSize, checkerbordSize, checkerbordSize, color);
+ return tilePixmap;
+}
+
+static inline bool isColorString(const QString &colorString)
+{
+ bool ok = true;
+ if (colorString.size() == 9 && colorString.at(0) == QLatin1Char('#')) {
+ // #rgba
+ for (int i = 1; i < 9; ++i) {
+ const QChar c = colorString.at(i);
+ if ((c >= QLatin1Char('0') && c <= QLatin1Char('9'))
+ || (c >= QLatin1Char('a') && c <= QLatin1Char('f'))
+ || (c >= QLatin1Char('A') && c <= QLatin1Char('F')))
+ continue;
+ ok = false;
+ break;
+ }
+ } else {
+ ok = QColor::isValidColor(colorString);
+ }
+
+ return ok;
+}
+
+static inline QColor properColor(const QString &str)
+{
+ if (str.isEmpty())
+ return QColor();
+ int lalpha = 255;
+ QString lcolorStr = str;
+ if (lcolorStr.at(0) == '#' && lcolorStr.length() == 9) {
+ QString alphaStr = lcolorStr;
+ alphaStr.truncate(3);
+ lcolorStr.remove(0, 3);
+ lcolorStr = "#" + lcolorStr;
+ alphaStr.remove(0,1);
+ bool v;
+ lalpha = alphaStr.toInt(&v, 16);
+ if (!v)
+ lalpha = 255;
+ }
+ QColor lcolor(lcolorStr);
+ if (lcolorStr.contains('#'))
+ lcolor.setAlpha(lalpha);
+ return lcolor;
+}
+
+namespace QmlEditorWidgets {
+
+void ColorButton::setColor(const QString &colorStr)
+{
+ if (m_colorString == colorStr)
+ return;
+
+
+ setEnabled(isColorString(colorStr));
+
+ m_colorString = colorStr;
+ update();
+ emit colorChanged();
+}
+
+QColor ColorButton::convertedColor() const
+{
+ return properColor(m_colorString);
+}
+
+void ColorButton::paintEvent(QPaintEvent *event)
+{
+ QToolButton::paintEvent(event);
+ if (!isEnabled())
+ return;
+
+ QColor color = properColor(m_colorString);
+
+ QPainter p(this);
+
+
+ QRect r(0, 0, width() - 2, height() - 2);
+ p.drawTiledPixmap(r.adjusted(1, 1, -1, -1), tilePixMap(9));
+ if (isEnabled())
+ p.setBrush(color);
+ else
+ p.setBrush(Qt::transparent);
+
+ if (color.value() > 80)
+ p.setPen(QColor(0x444444));
+ else
+ p.setPen(QColor(0x9e9e9e));
+ p.drawRect(r.translated(1, 1));
+
+ if (m_showArrow) {
+ p.setRenderHint(QPainter::Antialiasing, true);
+ QVector<QPointF> points;
+ if (isChecked()) {
+ points.append(QPointF(2, 3));
+ points.append(QPointF(8, 3));
+ points.append(QPointF(5, 9));
+ } else {
+ points.append(QPointF(8, 6));
+ points.append(QPointF(2, 9));
+ points.append(QPointF(2, 3));
+ }
+ p.translate(0.5, 0.5);
+ p.setBrush(QColor(0xaaaaaa));
+ p.setPen(QColor(0x444444));
+ p.drawPolygon(points);
+ }
+}
+
+} //QmlEditorWidgets
diff --git a/src/libs/qmleditorwidgets/colorbutton.h b/src/libs/qmleditorwidgets/colorbutton.h
new file mode 100644
index 00000000000..4637e7e1267
--- /dev/null
+++ b/src/libs/qmleditorwidgets/colorbutton.h
@@ -0,0 +1,74 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+**
+**************************************************************************/
+
+#ifndef COLORBUTTON_H
+#define COLORBUTTON_H
+
+#include <qmleditorwidgets_global.h>
+#include <QtGui/QWidget>
+#include <QToolButton>
+#include <qdeclarative.h>
+
+namespace QmlEditorWidgets {
+
+class QMLEDITORWIDGETS_EXPORT ColorButton : public QToolButton {
+
+Q_OBJECT
+
+Q_PROPERTY(QString color READ color WRITE setColor NOTIFY colorChanged)
+Q_PROPERTY(bool noColor READ noColor WRITE setNoColor)
+Q_PROPERTY(bool showArrow READ showArrow WRITE setShowArrow)
+
+public:
+ ColorButton(QWidget *parent = 0) : QToolButton (parent), m_colorString("#ffffff"), m_noColor(false), m_showArrow(true) {}
+
+ void setColor(const QString &colorStr);
+ QString color() const { return m_colorString; }
+ QColor convertedColor() const;
+ bool noColor() const { return m_noColor; }
+ void setNoColor(bool f) { m_noColor = f; update(); }
+ bool showArrow() const { return m_showArrow; }
+ void setShowArrow(bool b) { m_showArrow = b; }
+
+signals:
+ void colorChanged();
+
+protected:
+ void paintEvent(QPaintEvent *event);
+private:
+ QString m_colorString;
+ bool m_noColor;
+ bool m_showArrow;
+};
+
+} //QmlEditorWidgets
+
+QML_DECLARE_TYPE(QmlEditorWidgets::ColorButton);
+
+#endif //COLORBUTTON_H
diff --git a/src/libs/qmleditorwidgets/colorwidget.cpp b/src/libs/qmleditorwidgets/colorwidget.cpp
new file mode 100644
index 00000000000..5a9f67d381a
--- /dev/null
+++ b/src/libs/qmleditorwidgets/colorwidget.cpp
@@ -0,0 +1,47 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+**
+**************************************************************************/
+
+#include "colorwidget.h"
+#include <qdeclarative.h>
+
+#include "colorbox.h"
+#include "colorbutton.h"
+#include "huecontrol.h"
+#include "gradientline.h"
+
+namespace QmlEditorWidgets {
+
+void ColorWidget::registerDeclarativeTypes() {
+ qmlRegisterType<QmlEditorWidgets::ColorButton>("Bauhaus",1,0,"ColorButton");
+ qmlRegisterType<QmlEditorWidgets::HueControl>("Bauhaus",1,0,"HueControl");
+ qmlRegisterType<QmlEditorWidgets::ColorBox>("Bauhaus",1,0,"ColorBox");
+ qmlRegisterType<QmlEditorWidgets::GradientLine>("Bauhaus",1,0,"GradientLine");
+}
+
+}
diff --git a/src/libs/qmleditorwidgets/colorwidget.h b/src/libs/qmleditorwidgets/colorwidget.h
new file mode 100644
index 00000000000..a79b21a67d7
--- /dev/null
+++ b/src/libs/qmleditorwidgets/colorwidget.h
@@ -0,0 +1,58 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+**
+**************************************************************************/
+
+#ifndef COLORWIDGET_H
+#define COLORWIDGET_H
+
+#include <qmleditorwidgets_global.h>
+#include <QWeakPointer>
+#include <QtGui/QWidget>
+#include <QLabel>
+#include <QToolButton>
+#include <QMouseEvent>
+
+
+QT_BEGIN_NAMESPACE
+class QToolButton;
+QT_END_NAMESPACE
+
+namespace QmlEditorWidgets {
+
+class ColorWidget {
+
+public:
+ static void registerDeclarativeTypes();
+
+
+};
+
+
+} //QmlDesigner
+
+#endif //COLORWIDGET_H
diff --git a/src/plugins/qmldesigner/components/propertyeditor/contextpanetext.ui b/src/libs/qmleditorwidgets/contextpanetext.ui
similarity index 96%
rename from src/plugins/qmldesigner/components/propertyeditor/contextpanetext.ui
rename to src/libs/qmleditorwidgets/contextpanetext.ui
index b89aa10c987..7c2d227ddc7 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/contextpanetext.ui
+++ b/src/libs/qmleditorwidgets/contextpanetext.ui
@@ -297,7 +297,7 @@
</widget>
</item>
<item row="0" column="6">
- <widget class="QmlDesigner::FontSizeSpinBox" name="fontSizeSpinBox">
+ <widget class="QmlEditorWidgets::FontSizeSpinBox" name="fontSizeSpinBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -337,7 +337,7 @@
</widget>
</item>
<item row="2" column="2">
- <widget class="QmlDesigner::ColorButton" name="textColorButton">
+ <widget class="QmlEditorWidgets::ColorButton" name="textColorButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>22</horstretch>
@@ -381,7 +381,7 @@
</spacer>
</item>
<item row="0" column="4">
- <widget class="QmlDesigner::ColorButton" name="colorButton">
+ <widget class="QmlEditorWidgets::ColorButton" name="colorButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>22</horstretch>
@@ -412,12 +412,12 @@
</widget>
<customwidgets>
<customwidget>
- <class>QmlDesigner::ColorButton</class>
+ <class>QmlEditorWidgets::ColorButton</class>
<extends>QToolButton</extends>
- <header location="global">colorwidget.h</header>
+ <header location="global">colorbutton.h</header>
</customwidget>
<customwidget>
- <class>QmlDesigner::FontSizeSpinBox</class>
+ <class>QmlEditorWidgets::FontSizeSpinBox</class>
<extends>QSpinBox</extends>
<header location="global">fontsizespinbox.h</header>
</customwidget>
diff --git a/src/plugins/qmldesigner/components/propertyeditor/contextpanetextwidget.cpp b/src/libs/qmleditorwidgets/contextpanetextwidget.cpp
similarity index 92%
rename from src/plugins/qmldesigner/components/propertyeditor/contextpanetextwidget.cpp
rename to src/libs/qmleditorwidgets/contextpanetextwidget.cpp
index 0d13372b02b..883a4ac23a5 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/contextpanetextwidget.cpp
+++ b/src/libs/qmleditorwidgets/contextpanetextwidget.cpp
@@ -1,10 +1,40 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+**
+**************************************************************************/
+
#include "contextpanetextwidget.h"
#include "contextpanewidget.h"
+#include "customcolordialog.h"
#include "ui_contextpanetext.h"
#include <qmljs/qmljspropertyreader.h>
#include <QTimerEvent>
-namespace QmlDesigner {
+namespace QmlEditorWidgets {
ContextPaneTextWidget::ContextPaneTextWidget(QWidget *parent) :
QWidget(parent),
diff --git a/src/plugins/qmldesigner/components/propertyeditor/contextpanetextwidget.h b/src/libs/qmleditorwidgets/contextpanetextwidget.h
similarity index 53%
rename from src/plugins/qmldesigner/components/propertyeditor/contextpanetextwidget.h
rename to src/libs/qmleditorwidgets/contextpanetextwidget.h
index 701f994540f..19f8684fa36 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/contextpanetextwidget.h
+++ b/src/libs/qmleditorwidgets/contextpanetextwidget.h
@@ -1,6 +1,36 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+**
+**************************************************************************/
+
#ifndef CONTEXTPANETEXTWIDGET_H
#define CONTEXTPANETEXTWIDGET_H
+#include <qmleditorwidgets_global.h>
#include <QWidget>
#include <QVariant>
@@ -14,11 +44,11 @@ namespace QmlJS {
class PropertyReader;
}
-namespace QmlDesigner {
+namespace QmlEditorWidgets {
-class BauhausColorDialog;
+class CustomColorDialog;
-class ContextPaneTextWidget : public QWidget
+class QMLEDITORWIDGETS_EXPORT ContextPaneTextWidget : public QWidget
{
Q_OBJECT
diff --git a/src/plugins/qmldesigner/components/propertyeditor/contextpanewidget.cpp b/src/libs/qmleditorwidgets/contextpanewidget.cpp
similarity index 88%
rename from src/plugins/qmldesigner/components/propertyeditor/contextpanewidget.cpp
rename to src/libs/qmleditorwidgets/contextpanewidget.cpp
index f42a97be84c..60e434f4667 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/contextpanewidget.cpp
+++ b/src/libs/qmleditorwidgets/contextpanewidget.cpp
@@ -1,5 +1,33 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+**
+**************************************************************************/
+
#include "contextpanewidget.h"
-#include <coreplugin/icore.h>
#include <QFontComboBox>
#include <QComboBox>
#include <QSpinBox>
@@ -11,14 +39,15 @@
#include <QGridLayout>
#include <QToolButton>
#include <QAction>
-#include <qmldesignerplugin.h>
#include "colorwidget.h"
#include "contextpanetextwidget.h"
#include "easingcontextpane.h"
#include "contextpanewidgetimage.h"
#include "contextpanewidgetrectangle.h"
+#include "customcolordialog.h"
+#include "colorbutton.h"
-namespace QmlDesigner {
+namespace QmlEditorWidgets {
/* XPM */
static const char * const line_xpm[] = {
@@ -137,11 +166,6 @@ ContextPaneWidget::ContextPaneWidget(QWidget *parent) : DragWidget(parent), m_cu
m_toolButton->setToolButtonStyle(Qt::ToolButtonIconOnly);
m_toolButton->setFixedSize(16, 16);
- if (Internal::BauhausPlugin::pluginInstance()->settings().pinContextPane)
- setPinButton();
- else
- setLineButton();
-
m_toolButton->setToolTip(tr("Hides this toolbar. This toolbar can be permantly disabled in the options or in the context menu."));
connect(m_toolButton, SIGNAL(clicked()), this, SLOT(onTogglePane()));
layout->addWidget(m_toolButton, 0, 0, 1, 1);
@@ -182,7 +206,7 @@ ContextPaneWidget::~ContextPaneWidget()
m_bauhausColorDialog.clear();
}
-void ContextPaneWidget::activate(const QPoint &pos, const QPoint &alternative, const QPoint &alternative2)
+void ContextPaneWidget::activate(const QPoint &pos, const QPoint &alternative, const QPoint &alternative2, bool pinned)
{
//uncheck all color buttons
foreach (ColorButton *colorButton, findChildren<ColorButton*>()) {
@@ -192,13 +216,11 @@ void ContextPaneWidget::activate(const QPoint &pos, const QPoint &alternative, c
update();
resize(sizeHint());
show();
- rePosition(pos, alternative, alternative2);
+ rePosition(pos, alternative, alternative2, pinned);
raise();
- m_resetAction->setChecked(Internal::BauhausPlugin::pluginInstance()->settings().pinContextPane);
- m_disableAction->setChecked(Internal::BauhausPlugin::pluginInstance()->settings().enableContextPane);
}
-void ContextPaneWidget::rePosition(const QPoint &position, const QPoint &alternative, const QPoint &alternative2)
+void ContextPaneWidget::rePosition(const QPoint &position, const QPoint &alternative, const QPoint &alternative2, bool pinned)
{
if ((position.x() + width()) < parentWidget()->width())
move(position);
@@ -212,7 +234,7 @@ void ContextPaneWidget::rePosition(const QPoint &position, const QPoint &alterna
m_originalPos = pos();
- if (m_pos.x() > 0 && (Internal::BauhausPlugin::pluginInstance()->settings().pinContextPane)) {
+ if (m_pos.x() > 0 && pinned) {
move(m_pos);
show();
setPinButton();
@@ -228,10 +250,17 @@ void ContextPaneWidget::deactivate()
m_bauhausColorDialog->hide();
}
-BauhausColorDialog *ContextPaneWidget::colorDialog()
+void ContextPaneWidget::setOptions(bool enabled, bool pinned)
+{
+
+ m_disableAction->setChecked(enabled);
+ m_resetAction->setChecked(pinned);
+}
+
+CustomColorDialog *ContextPaneWidget::colorDialog()
{
if (m_bauhausColorDialog.isNull()) {
- m_bauhausColorDialog = new BauhausColorDialog(parentWidget());
+ m_bauhausColorDialog = new CustomColorDialog(parentWidget());
m_bauhausColorDialog->hide();
setSecondaryTarget(m_bauhausColorDialog.data());
}
@@ -351,9 +380,7 @@ void ContextPaneWidget::onShowColorDialog(bool checked, const QPoint &p)
void ContextPaneWidget::onDisable(bool b)
{
- DesignerSettings designerSettings = Internal::BauhausPlugin::pluginInstance()->settings();
- designerSettings.enableContextPane = b;
- Internal::BauhausPlugin::pluginInstance()->setSettings(designerSettings);
+ enabledChanged(b);
if (!b) {
hide();
colorDialog()->hide();
@@ -438,9 +465,7 @@ void ContextPaneWidget::setPinButton()
m_toolButton->setFixedSize(20, 20);
m_toolButton->setToolTip(tr("Unpins the toolbar. The toolbar will be moved to its default position."));
- DesignerSettings designerSettings = Internal::BauhausPlugin::pluginInstance()->settings();
- designerSettings.pinContextPane = true;
- Internal::BauhausPlugin::pluginInstance()->setSettings(designerSettings);
+ pinnedChanged(true);
if (m_resetAction) {
m_resetAction->blockSignals(true);
m_resetAction->setChecked(true);
@@ -457,9 +482,7 @@ void ContextPaneWidget::setLineButton()
m_toolButton->setFixedSize(20, 20);
m_toolButton->setToolTip(tr("Hides this toolbar. This toolbar can be permantly disabled in the options or in the context menu."));
- DesignerSettings designerSettings = Internal::BauhausPlugin::pluginInstance()->settings();
- designerSettings.pinContextPane = false;
- Internal::BauhausPlugin::pluginInstance()->setSettings(designerSettings);
+ pinnedChanged(false);
if (m_resetAction) {
m_resetAction->blockSignals(true);
m_resetAction->setChecked(false);
diff --git a/src/plugins/qmldesigner/components/propertyeditor/contextpanewidget.h b/src/libs/qmleditorwidgets/contextpanewidget.h
similarity index 59%
rename from src/plugins/qmldesigner/components/propertyeditor/contextpanewidget.h
rename to src/libs/qmleditorwidgets/contextpanewidget.h
index 833bd9d9296..14a040f28ed 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/contextpanewidget.h
+++ b/src/libs/qmleditorwidgets/contextpanewidget.h
@@ -1,6 +1,36 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+**
+**************************************************************************/
+
#ifndef CONTEXTPANEWIDGET_H
#define CONTEXTPANEWIDGET_H
+#include <qmleditorwidgets_global.h>
#include <QFrame>
#include <QVariant>
#include <QGraphicsEffect>
@@ -11,15 +41,15 @@ namespace QmlJS {
class PropertyReader;
}
-namespace QmlDesigner {
+namespace QmlEditorWidgets {
-class BauhausColorDialog;
+class CustomColorDialog;
class ContextPaneTextWidget;
class EasingContextPane;
class ContextPaneWidgetRectangle;
class ContextPaneWidgetImage;
-class DragWidget : public QFrame
+class QMLEDITORWIDGETS_EXPORT DragWidget : public QFrame
{
Q_OBJECT
@@ -42,17 +72,18 @@ private:
QWeakPointer<QWidget> m_secondaryTarget;
};
-class ContextPaneWidget : public DragWidget
+class QMLEDITORWIDGETS_EXPORT ContextPaneWidget : public DragWidget
{
Q_OBJECT
public:
explicit ContextPaneWidget(QWidget *parent = 0);
~ContextPaneWidget();
- void activate(const QPoint &pos, const QPoint &alternative, const QPoint &alternative2);
- void rePosition(const QPoint &pos, const QPoint &alternative , const QPoint &alternative3);
+ void activate(const QPoint &pos, const QPoint &alternative, const QPoint &alternative2, bool pinned);
+ void rePosition(const QPoint &pos, const QPoint &alternative , const QPoint &alternative3, bool pinned);
void deactivate();
- BauhausColorDialog *colorDialog();
+ void setOptions(bool enabled, bool pinned);
+ CustomColorDialog *colorDialog();
void setProperties(QmlJS::PropertyReader *propertyReader);
void setPath(const QString &path);
bool setType(const QStringList &types);
@@ -67,6 +98,8 @@ signals:
void propertyChanged(const QString &, const QVariant &);
void removeProperty(const QString &);
void removeAndChangeProperty(const QString &, const QString &, const QVariant &, bool);
+ void pinnedChanged(bool);
+ void enabledChanged(bool);
private slots:
void onDisable(bool);
@@ -93,7 +126,7 @@ private:
ContextPaneWidgetImage *m_imageWidget;
ContextPaneWidgetImage *m_borderImageWidget;
ContextPaneWidgetRectangle *m_rectangleWidget;
- QWeakPointer<BauhausColorDialog> m_bauhausColorDialog;
+ QWeakPointer<CustomColorDialog> m_bauhausColorDialog;
QWeakPointer<QAction> m_resetAction;
QWeakPointer<QAction> m_disableAction;
QString m_colorName;
diff --git a/src/plugins/qmldesigner/components/propertyeditor/contextpanewidgetborderimage.ui b/src/libs/qmleditorwidgets/contextpanewidgetborderimage.ui
similarity index 98%
rename from src/plugins/qmldesigner/components/propertyeditor/contextpanewidgetborderimage.ui
rename to src/libs/qmleditorwidgets/contextpanewidgetborderimage.ui
index 756a3dcc2e9..801e1143f75 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/contextpanewidgetborderimage.ui
+++ b/src/libs/qmleditorwidgets/contextpanewidgetborderimage.ui
@@ -113,7 +113,7 @@
</widget>
</item>
<item row="0" column="1">
- <widget class="FileWidget" name="fileWidget">
+ <widget class="QmlEditorWidgets::FileWidget" name="fileWidget">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -298,7 +298,7 @@
</widget>
<customwidgets>
<customwidget>
- <class>FileWidget</class>
+ <class>QmlEditorWidgets::FileWidget</class>
<extends>QComboBox</extends>
<header location="global">filewidget.h</header>
</customwidget>
diff --git a/src/plugins/qmldesigner/components/propertyeditor/contextpanewidgetimage.cpp b/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp
similarity index 96%
rename from src/plugins/qmldesigner/components/propertyeditor/contextpanewidgetimage.cpp
rename to src/libs/qmleditorwidgets/contextpanewidgetimage.cpp
index 8cb795e0fbe..d5469a8b318 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/contextpanewidgetimage.cpp
+++ b/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp
@@ -1,3 +1,32 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+**
+**************************************************************************/
+
#include "contextpanewidgetimage.h"
#include "ui_contextpanewidgetimage.h"
#include "ui_contextpanewidgetborderimage.h"
@@ -11,7 +40,7 @@
#include <QSlider>
#include <QDebug>
-namespace QmlDesigner {
+namespace QmlEditorWidgets {
bool LabelFilter::eventFilter(QObject *obj, QEvent *event)
{
diff --git a/src/plugins/qmldesigner/components/propertyeditor/contextpanewidgetimage.h b/src/libs/qmleditorwidgets/contextpanewidgetimage.h
similarity index 73%
rename from src/plugins/qmldesigner/components/propertyeditor/contextpanewidgetimage.h
rename to src/libs/qmleditorwidgets/contextpanewidgetimage.h
index 90767ffae85..13783ac9333 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/contextpanewidgetimage.h
+++ b/src/libs/qmleditorwidgets/contextpanewidgetimage.h
@@ -1,6 +1,36 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+**
+**************************************************************************/
+
#ifndef CONTEXTPANEWIDGETIMAGE_H
#define CONTEXTPANEWIDGETIMAGE_H
+#include <qmleditorwidgets_global.h>
#include <QWidget>
#include <QFrame>
#include <QLabel>
@@ -14,14 +44,15 @@ namespace Ui {
}
class QLabel;
class QSlider;
-class FileWidget;
QT_END_NAMESPACE
namespace QmlJS {
class PropertyReader;
}
-namespace QmlDesigner {
+namespace QmlEditorWidgets {
+
+class FileWidget;
class PreviewLabel : public QLabel
{
@@ -90,7 +121,7 @@ private:
bool m_borderImage;
};
-class ContextPaneWidgetImage : public QWidget
+class QMLEDITORWIDGETS_EXPORT ContextPaneWidgetImage : public QWidget
{
Q_OBJECT
diff --git a/src/plugins/qmldesigner/components/propertyeditor/contextpanewidgetimage.ui b/src/libs/qmleditorwidgets/contextpanewidgetimage.ui
similarity index 98%
rename from src/plugins/qmldesigner/components/propertyeditor/contextpanewidgetimage.ui
rename to src/libs/qmleditorwidgets/contextpanewidgetimage.ui
index 9df6ad5c557..d58780d80ac 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/contextpanewidgetimage.ui
+++ b/src/libs/qmleditorwidgets/contextpanewidgetimage.ui
@@ -33,7 +33,7 @@
<number>0</number>
</property>
<item row="0" column="1" colspan="3">
- <widget class="FileWidget" name="fileWidget">
+ <widget class="QmlEditorWidgets::FileWidget" name="fileWidget">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -283,7 +283,7 @@
</widget>
<customwidgets>
<customwidget>
- <class>FileWidget</class>
+ <class>QmlEditorWidgets::FileWidget</class>
<extends>QComboBox</extends>
<header location="global">filewidget.h</header>
</customwidget>
diff --git a/src/plugins/qmldesigner/components/propertyeditor/contextpanewidgetrectangle.cpp b/src/libs/qmleditorwidgets/contextpanewidgetrectangle.cpp
similarity index 87%
rename from src/plugins/qmldesigner/components/propertyeditor/contextpanewidgetrectangle.cpp
rename to src/libs/qmleditorwidgets/contextpanewidgetrectangle.cpp
index 6bf6d8a013c..193d86903d3 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/contextpanewidgetrectangle.cpp
+++ b/src/libs/qmleditorwidgets/contextpanewidgetrectangle.cpp
@@ -1,10 +1,40 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+**
+**************************************************************************/
+
#include "contextpanewidgetrectangle.h"
#include "ui_contextpanewidgetrectangle.h"
#include "contextpanewidget.h"
#include <qmljs/qmljspropertyreader.h>
+#include <customcolordialog.h>
#include <QDebug>
-namespace QmlDesigner {
+namespace QmlEditorWidgets {
ContextPaneWidgetRectangle::ContextPaneWidgetRectangle(QWidget *parent) :
QWidget(parent),
diff --git a/src/plugins/qmldesigner/components/propertyeditor/contextpanewidgetrectangle.h b/src/libs/qmleditorwidgets/contextpanewidgetrectangle.h
similarity index 50%
rename from src/plugins/qmldesigner/components/propertyeditor/contextpanewidgetrectangle.h
rename to src/libs/qmleditorwidgets/contextpanewidgetrectangle.h
index c61de005700..372ff7a07ce 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/contextpanewidgetrectangle.h
+++ b/src/libs/qmleditorwidgets/contextpanewidgetrectangle.h
@@ -1,6 +1,36 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+**
+**************************************************************************/
+
#ifndef CONTEXTPANEWIDGETRECTANGLE_H
#define CONTEXTPANEWIDGETRECTANGLE_H
+#include <qmleditorwidgets_global.h>
#include <QWidget>
QT_BEGIN_NAMESPACE
@@ -13,9 +43,9 @@ namespace QmlJS {
class PropertyReader;
}
-namespace QmlDesigner {
+namespace QmlEditorWidgets {
-class ContextPaneWidgetRectangle : public QWidget
+class QMLEDITORWIDGETS_EXPORT ContextPaneWidgetRectangle : public QWidget
{
Q_OBJECT
diff --git a/src/plugins/qmldesigner/components/propertyeditor/contextpanewidgetrectangle.ui b/src/libs/qmleditorwidgets/contextpanewidgetrectangle.ui
similarity index 94%
rename from src/plugins/qmldesigner/components/propertyeditor/contextpanewidgetrectangle.ui
rename to src/libs/qmleditorwidgets/contextpanewidgetrectangle.ui
index 882a4ddc6b8..2b32e1588dd 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/contextpanewidgetrectangle.ui
+++ b/src/libs/qmleditorwidgets/contextpanewidgetrectangle.ui
@@ -49,7 +49,7 @@
</widget>
</item>
<item row="0" column="1" colspan="5">
- <widget class="QmlDesigner::GradientLine" name="gradientLine" native="true">
+ <widget class="QmlEditorWidgets::GradientLine" name="gradientLine" native="true">
<property name="minimumSize">
<size>
<width>160</width>
@@ -81,7 +81,7 @@
</widget>
</item>
<item row="1" column="2">
- <widget class="QmlDesigner::ColorButton" name="colorColorButton">
+ <widget class="QmlEditorWidgets::ColorButton" name="colorColorButton">
<property name="minimumSize">
<size>
<width>22</width>
@@ -213,7 +213,7 @@
</widget>
</item>
<item row="2" column="2">
- <widget class="QmlDesigner::ColorButton" name="borderColorButton">
+ <widget class="QmlEditorWidgets::ColorButton" name="borderColorButton">
<property name="minimumSize">
<size>
<width>22</width>
@@ -296,14 +296,14 @@
</widget>
<customwidgets>
<customwidget>
- <class>QmlDesigner::ColorButton</class>
+ <class>QmlEditorWidgets::ColorButton</class>
<extends>QToolButton</extends>
- <header location="global">colorwidget.h</header>
+ <header location="global">colorbutton.h</header>
</customwidget>
<customwidget>
- <class>QmlDesigner::GradientLine</class>
+ <class>QmlEditorWidgets::GradientLine</class>
<extends>QWidget</extends>
- <header location="global">colorwidget.h</header>
+ <header location="global">gradientline.h</header>
<container>1</container>
</customwidget>
</customwidgets>
diff --git a/src/libs/qmleditorwidgets/customcolordialog.cpp b/src/libs/qmleditorwidgets/customcolordialog.cpp
new file mode 100644
index 00000000000..a698f540ef5
--- /dev/null
+++ b/src/libs/qmleditorwidgets/customcolordialog.cpp
@@ -0,0 +1,180 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+**
+**************************************************************************/
+
+#include "customcolordialog.h"
+
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QPainter>
+#include <QDoubleSpinBox>
+#include <QGridLayout>
+#include <QPushButton>
+#include <QDialogButtonBox>
+#include <QGraphicsEffect>
+#include "huecontrol.h"
+#include "colorbox.h"
+
+namespace QmlEditorWidgets {
+
+CustomColorDialog::CustomColorDialog(QWidget *parent) : QFrame(parent )
+{
+
+ setFrameStyle(QFrame::NoFrame);
+ setFrameShape(QFrame::StyledPanel);
+ setFrameShadow(QFrame::Sunken);
+
+ QGraphicsDropShadowEffect *dropShadowEffect = new QGraphicsDropShadowEffect;
+ dropShadowEffect->setBlurRadius(6);
+ dropShadowEffect->setOffset(2, 2);
+ setGraphicsEffect(dropShadowEffect);
+ setAutoFillBackground(true);
+
+ m_hueControl = new HueControl(this);
+ m_colorBox = new ColorBox(this);
+
+ QWidget *colorFrameWidget = new QWidget(this);
+ QVBoxLayout* vBox = new QVBoxLayout(colorFrameWidget);
+ colorFrameWidget->setLayout(vBox);
+ vBox->setSpacing(0);
+ vBox->setMargin(0);
+ vBox->setContentsMargins(0,5,0,28);
+
+ m_beforeColorWidget = new QFrame(colorFrameWidget);
+ m_beforeColorWidget->setFixedSize(30, 18);
+ m_beforeColorWidget->setAutoFillBackground(true);
+
+ m_currentColorWidget = new QFrame(colorFrameWidget);
+ m_currentColorWidget->setFixedSize(30, 18);
+ m_currentColorWidget->setAutoFillBackground(true);
+
+ vBox->addWidget(m_beforeColorWidget);
+ vBox->addWidget(m_currentColorWidget);
+
+
+ m_rSpinBox = new QDoubleSpinBox(this);
+ m_gSpinBox = new QDoubleSpinBox(this);
+ m_bSpinBox = new QDoubleSpinBox(this);
+ m_alphaSpinBox = new QDoubleSpinBox(this);
+
+ QGridLayout *gridLayout = new QGridLayout(this);
+ gridLayout->setSpacing(4);
+ gridLayout->setVerticalSpacing(4);
+ gridLayout->setMargin(4);
+ setLayout(gridLayout);
+
+ gridLayout->addWidget(m_colorBox, 0, 0, 4, 1);
+ gridLayout->addWidget(m_hueControl, 0, 1, 4, 1);
+
+ gridLayout->addWidget(colorFrameWidget, 0, 2, 2, 1);
+
+ gridLayout->addWidget(new QLabel("R", this), 0, 3, 1, 1);
+ gridLayout->addWidget(new QLabel("G", this), 1, 3, 1, 1);
+ gridLayout->addWidget(new QLabel("B", this), 2, 3, 1, 1);
+ gridLayout->addWidget(new QLabel("A", this), 3, 3, 1, 1);
+
+ gridLayout->addWidget(m_rSpinBox, 0, 4, 1, 1);
+ gridLayout->addWidget(m_gSpinBox, 1, 4, 1, 1);
+ gridLayout->addWidget(m_bSpinBox, 2, 4, 1, 1);
+ gridLayout->addWidget(m_alphaSpinBox, 3, 4, 1, 1);
+
+ QDialogButtonBox *buttonBox = new QDialogButtonBox(this);
+
+ QPushButton *cancelButton = buttonBox->addButton(QDialogButtonBox::Cancel);
+ QPushButton *applyButton = buttonBox->addButton(QDialogButtonBox::Apply);
+
+ gridLayout->addWidget(buttonBox, 4, 0, 1, 2);
+
+ resize(sizeHint());
+
+ connect(m_colorBox, SIGNAL(colorChanged()), this, SLOT(onColorBoxChanged()));
+ connect(m_alphaSpinBox, SIGNAL(valueChanged(double)), this, SLOT(spinBoxChanged()));
+ connect(m_rSpinBox, SIGNAL(valueChanged(double)), this, SLOT(spinBoxChanged()));
+ connect(m_gSpinBox, SIGNAL(valueChanged(double)), this, SLOT(spinBoxChanged()));
+ connect(m_bSpinBox, SIGNAL(valueChanged(double)), this, SLOT(spinBoxChanged()));
+ connect(m_hueControl, SIGNAL(hueChanged(int)), this, SLOT(onHueChanged(int)));
+
+ connect(applyButton, SIGNAL(pressed()), this, SLOT(onAccept()));
+ connect(cancelButton, SIGNAL(pressed()), this, SIGNAL(rejected()));
+
+ m_alphaSpinBox->setMaximum(1);
+ m_rSpinBox->setMaximum(1);
+ m_gSpinBox->setMaximum(1);
+ m_bSpinBox->setMaximum(1);
+ m_alphaSpinBox->setSingleStep(0.1);
+ m_rSpinBox->setSingleStep(0.1);
+ m_gSpinBox->setSingleStep(0.1);
+ m_bSpinBox->setSingleStep(0.1);
+
+ m_blockUpdate = false;
+}
+
+void CustomColorDialog::setupColor(const QColor &color)
+{
+ QPalette pal = m_beforeColorWidget->palette();
+ pal.setColor(QPalette::Background, color);
+ m_beforeColorWidget->setPalette(pal);
+ setColor(color);
+}
+
+void CustomColorDialog::spinBoxChanged()
+{
+ if (m_blockUpdate)
+ return;
+ QColor newColor;
+ newColor.setAlphaF(m_alphaSpinBox->value());
+ newColor.setRedF(m_rSpinBox->value());
+ newColor.setGreenF(m_gSpinBox->value());
+ newColor.setBlueF(m_bSpinBox->value());
+ setColor(newColor);
+}
+
+void CustomColorDialog::onColorBoxChanged()
+{
+ if (m_blockUpdate)
+ return;
+
+ setColor(m_colorBox->color());
+}
+
+void CustomColorDialog::setupWidgets()
+{
+ m_blockUpdate = true;
+ m_hueControl->setHue(m_color.hsvHue());
+ m_alphaSpinBox->setValue(m_color.alphaF());
+ m_rSpinBox->setValue(m_color.redF());
+ m_gSpinBox->setValue(m_color.greenF());
+ m_bSpinBox->setValue(m_color.blueF());
+ m_colorBox->setColor(m_color);
+ QPalette pal = m_currentColorWidget->palette();
+ pal.setColor(QPalette::Background, m_color);
+ m_currentColorWidget->setPalette(pal);
+ m_blockUpdate = false;
+}
+
+} //QmlEditorWidgets
diff --git a/src/libs/qmleditorwidgets/customcolordialog.h b/src/libs/qmleditorwidgets/customcolordialog.h
new file mode 100644
index 00000000000..a017280d8d6
--- /dev/null
+++ b/src/libs/qmleditorwidgets/customcolordialog.h
@@ -0,0 +1,110 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+**
+**************************************************************************/
+
+#ifndef CUSTOMCOLORDIALOG_H
+#define CUSTOMCOLORDIALOG_H
+
+#include <qmleditorwidgets_global.h>
+#include <QFrame>
+#include <QDialog>
+
+QT_BEGIN_NAMESPACE
+class QDoubleSpinBox;
+QT_END_NAMESPACE
+
+namespace QmlEditorWidgets {
+
+class ColorBox;
+class HueControl;
+
+class QMLEDITORWIDGETS_EXPORT CustomColorDialog : public QFrame {
+
+ Q_OBJECT
+ Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
+
+public:
+ CustomColorDialog(QWidget *parent = 0);
+ QColor color() const { return m_color; }
+ void setupColor(const QColor &color);
+ void setColor(const QColor &color)
+ {
+ if (color == m_color)
+ return;
+
+ m_color = color;
+ setupWidgets();
+ emit colorChanged();
+ }
+
+public slots:
+ void changeColor(const QColor &color) { setColor(color); }
+ void spinBoxChanged();
+ void onColorBoxChanged();
+ void onHueChanged(int newHue)
+ {
+ if (m_blockUpdate)
+ return;
+
+ if (m_color.hsvHue() == newHue)
+ return;
+ m_color.setHsv(newHue, m_color.hsvSaturation(), m_color.value());
+ setupWidgets();
+ emit colorChanged();
+ }
+ void onAccept()
+ {
+ emit accepted(m_color);
+ }
+
+signals:
+ void colorChanged();
+ void accepted(const QColor &color);
+ void rejected();
+
+protected:
+ void setupWidgets();
+
+private:
+ QFrame *m_beforeColorWidget;
+ QFrame *m_currentColorWidget;
+ ColorBox *m_colorBox;
+ HueControl *m_hueControl;
+
+ QDoubleSpinBox *m_rSpinBox;
+ QDoubleSpinBox *m_gSpinBox;
+ QDoubleSpinBox *m_bSpinBox;
+ QDoubleSpinBox *m_alphaSpinBox;
+
+ QColor m_color;
+ bool m_blockUpdate;
+};
+
+} //QmlEditorWidgets
+
+#endif //CUSTOMCOLORDIALOG_H
diff --git a/src/plugins/qmldesigner/components/easingpane/easingcontextpane.cpp b/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp
similarity index 85%
rename from src/plugins/qmldesigner/components/easingpane/easingcontextpane.cpp
rename to src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp
index 0971f49985e..982c7c34f7b 100644
--- a/src/plugins/qmldesigner/components/easingpane/easingcontextpane.cpp
+++ b/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp
@@ -1,3 +1,32 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+**
+**************************************************************************/
+
#include "easingcontextpane.h"
#include "ui_easingcontextpane.h"
#include <qmljs/qmljspropertyreader.h>
@@ -7,7 +36,7 @@
#include <QPropertyAnimation>
#include <QSequentialAnimationGroup>
-namespace QmlDesigner {
+namespace QmlEditorWidgets {
class PixmapItem : public QObject, public QGraphicsPixmapItem
{
@@ -269,13 +298,13 @@ void EasingContextPane::setBounce()
} //QmlDesigner
-void QmlDesigner::EasingContextPane::on_durationSpinBox_valueChanged(int newValue)
+void QmlEditorWidgets::EasingContextPane::on_durationSpinBox_valueChanged(int newValue)
{
m_simulation->updateCurve(m_easingGraph->easingCurve(),ui->durationSpinBox->value());
emit propertyChanged(QLatin1String("duration"), newValue);
}
-void QmlDesigner::EasingContextPane::on_easingShapeComboBox_currentIndexChanged(QString newShape)
+void QmlEditorWidgets::EasingContextPane::on_easingShapeComboBox_currentIndexChanged(QString newShape)
{
if (newShape=="Linear")
setLinear();
@@ -299,7 +328,7 @@ void QmlDesigner::EasingContextPane::on_easingShapeComboBox_currentIndexChanged(
}
}
-void QmlDesigner::EasingContextPane::on_easingExtremesComboBox_currentIndexChanged(QString newExtremes)
+void QmlEditorWidgets::EasingContextPane::on_easingExtremesComboBox_currentIndexChanged(QString newExtremes)
{
if (m_easingGraph->easingExtremes() != newExtremes) {
m_easingGraph->setEasingExtremes(newExtremes);
@@ -311,7 +340,7 @@ void QmlDesigner::EasingContextPane::on_easingExtremesComboBox_currentIndexChang
}
}
-void QmlDesigner::EasingContextPane::on_amplitudeSpinBox_valueChanged(double newAmplitude)
+void QmlEditorWidgets::EasingContextPane::on_amplitudeSpinBox_valueChanged(double newAmplitude)
{
if ((newAmplitude != m_easingGraph->amplitude()) &&
(m_easingGraph->easingShape()=="Bounce" || m_easingGraph->easingShape()=="Elastic")) {
@@ -321,7 +350,7 @@ void QmlDesigner::EasingContextPane::on_amplitudeSpinBox_valueChanged(double new
}
}
-void QmlDesigner::EasingContextPane::on_periodSpinBox_valueChanged(double newPeriod)
+void QmlEditorWidgets::EasingContextPane::on_periodSpinBox_valueChanged(double newPeriod)
{
if ((newPeriod != m_easingGraph->period()) && (m_easingGraph->easingShape()=="Elastic")) {
m_easingGraph->setPeriod(newPeriod);
@@ -331,7 +360,7 @@ void QmlDesigner::EasingContextPane::on_periodSpinBox_valueChanged(double newPer
}
-void QmlDesigner::EasingContextPane::on_overshootSpinBox_valueChanged(double newOvershoot)
+void QmlEditorWidgets::EasingContextPane::on_overshootSpinBox_valueChanged(double newOvershoot)
{
if ((newOvershoot != m_easingGraph->overshoot()) && (m_easingGraph->easingShape()=="Back")) {
m_easingGraph->setOvershoot(newOvershoot);
@@ -340,7 +369,7 @@ void QmlDesigner::EasingContextPane::on_overshootSpinBox_valueChanged(double new
}
}
-void QmlDesigner::EasingContextPane::on_playButton_clicked()
+void QmlEditorWidgets::EasingContextPane::on_playButton_clicked()
{
setGraphDisplayMode(SimulationMode);
startAnimation();
diff --git a/src/plugins/qmldesigner/components/easingpane/easingcontextpane.h b/src/libs/qmleditorwidgets/easingpane/easingcontextpane.h
similarity index 56%
rename from src/plugins/qmldesigner/components/easingpane/easingcontextpane.h
rename to src/libs/qmleditorwidgets/easingpane/easingcontextpane.h
index f0a17439479..e17b0fdf2b5 100644
--- a/src/plugins/qmldesigner/components/easingpane/easingcontextpane.h
+++ b/src/libs/qmleditorwidgets/easingpane/easingcontextpane.h
@@ -1,3 +1,32 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+**
+**************************************************************************/
+
#ifndef EASINGCONTEXTPANE_H
#define EASINGCONTEXTPANE_H
@@ -17,7 +46,7 @@ namespace QmlJS {
class PropertyReader;
}
-namespace QmlDesigner {
+namespace QmlEditorWidgets {
class EasingSimulation;
class EasingContextPane : public QWidget
diff --git a/src/plugins/qmldesigner/components/easingpane/easingcontextpane.ui b/src/libs/qmleditorwidgets/easingpane/easingcontextpane.ui
similarity index 100%
rename from src/plugins/qmldesigner/components/easingpane/easingcontextpane.ui
rename to src/libs/qmleditorwidgets/easingpane/easingcontextpane.ui
diff --git a/src/plugins/qmldesigner/components/easingpane/easinggraph.cpp b/src/libs/qmleditorwidgets/easingpane/easinggraph.cpp
similarity index 87%
rename from src/plugins/qmldesigner/components/easingpane/easinggraph.cpp
rename to src/libs/qmleditorwidgets/easingpane/easinggraph.cpp
index 25f53999539..e47c40050be 100644
--- a/src/plugins/qmldesigner/components/easingpane/easinggraph.cpp
+++ b/src/libs/qmleditorwidgets/easingpane/easinggraph.cpp
@@ -1,3 +1,32 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+**
+**************************************************************************/
+
#include "easinggraph.h"
#include <QPainter>
diff --git a/src/plugins/qmldesigner/components/easingpane/easinggraph.h b/src/libs/qmleditorwidgets/easingpane/easinggraph.h
similarity index 68%
rename from src/plugins/qmldesigner/components/easingpane/easinggraph.h
rename to src/libs/qmleditorwidgets/easingpane/easinggraph.h
index 22387ffb632..036e0ac4517 100644
--- a/src/plugins/qmldesigner/components/easingpane/easinggraph.h
+++ b/src/libs/qmleditorwidgets/easingpane/easinggraph.h
@@ -1,3 +1,32 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+**
+**************************************************************************/
+
#ifndef EASINGGRAPH_H
#define EASINGGRAPH_H
diff --git a/src/libs/qmleditorwidgets/easingpane/easingpane.pri b/src/libs/qmleditorwidgets/easingpane/easingpane.pri
new file mode 100644
index 00000000000..22dfd0f76da
--- /dev/null
+++ b/src/libs/qmleditorwidgets/easingpane/easingpane.pri
@@ -0,0 +1,11 @@
+VPATH += $$PWD
+INCLUDEPATH += $$PWD
+SOURCES += $$PWD/easinggraph.cpp \
+ $$PWD/easingcontextpane.cpp
+
+HEADERS += $$PWD/easinggraph.h \
+ $$PWD/easingcontextpane.h
+
+QT += declarative
+RESOURCES += $$PWD/easingpane.qrc
+FORMS += $$PWD/easingcontextpane.ui
diff --git a/src/plugins/qmldesigner/components/easingpane/easingpane.qrc b/src/libs/qmleditorwidgets/easingpane/easingpane.qrc
similarity index 100%
rename from src/plugins/qmldesigner/components/easingpane/easingpane.qrc
rename to src/libs/qmleditorwidgets/easingpane/easingpane.qrc
diff --git a/src/plugins/qmldesigner/components/easingpane/playicon.png b/src/libs/qmleditorwidgets/easingpane/playicon.png
similarity index 100%
rename from src/plugins/qmldesigner/components/easingpane/playicon.png
rename to src/libs/qmleditorwidgets/easingpane/playicon.png
diff --git a/src/plugins/qmldesigner/components/easingpane/qt_logo.png b/src/libs/qmleditorwidgets/easingpane/qt_logo.png
similarity index 100%
rename from src/plugins/qmldesigner/components/easingpane/qt_logo.png
rename to src/libs/qmleditorwidgets/easingpane/qt_logo.png
diff --git a/src/plugins/qmldesigner/components/easingpane/stopicon.png b/src/libs/qmleditorwidgets/easingpane/stopicon.png
similarity index 100%
rename from src/plugins/qmldesigner/components/easingpane/stopicon.png
rename to src/libs/qmleditorwidgets/easingpane/stopicon.png
diff --git a/src/libs/qmleditorwidgets/filewidget.cpp b/src/libs/qmleditorwidgets/filewidget.cpp
new file mode 100644
index 00000000000..47a0020a871
--- /dev/null
+++ b/src/libs/qmleditorwidgets/filewidget.cpp
@@ -0,0 +1,142 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+**
+**************************************************************************/
+
+#include "filewidget.h"
+#include <QHBoxLayout>
+#include <QFont>
+#include <QFileDialog>
+#include <QDirIterator>
+#include <QDebug>
+
+
+namespace QmlEditorWidgets {
+
+FileWidget::FileWidget(QWidget *parent) : QWidget(parent), m_filter("(*.*)"), m_showComboBox(false), m_lock(false)
+{
+ m_pushButton = new QToolButton(this);
+ m_pushButton->setFixedWidth(32);
+ m_lineEdit = new QLineEdit(this);
+ m_comboBox = new QComboBox(this);
+ m_comboBox->hide();
+ QHBoxLayout *layout = new QHBoxLayout(this);
+ setLayout(layout);
+ layout->setContentsMargins(0, 0, 0, 0);
+ layout->addWidget(m_lineEdit);
+ layout->addWidget(m_comboBox);
+ m_comboBox->setEditable(true);
+ layout->addWidget(m_pushButton);
+ m_pushButton->setText("...");
+ connect(m_lineEdit, SIGNAL(editingFinished()), this, SLOT(lineEditChanged()));
+ connect(m_pushButton, SIGNAL(pressed()), this, SLOT(buttonPressed()));
+ connect(m_comboBox, SIGNAL(editTextChanged(const QString &)), this, SLOT(comboBoxChanged()));
+ m_currentPath = QDir::currentPath();
+}
+
+FileWidget::~FileWidget()
+{
+}
+
+void FileWidget::setShowComboBox(bool show)
+{
+ m_showComboBox = show;
+ m_comboBox->setVisible(show);
+ m_lineEdit->setVisible(!show);
+}
+
+void FileWidget::lineEditChanged()
+{
+ if (m_lock)
+ return;
+ setFileNameStr(m_lineEdit->text());
+}
+
+void FileWidget::comboBoxChanged()
+{
+ if (m_lock)
+ return;
+ setFileNameStr(m_comboBox->currentText());
+}
+
+void FileWidget::buttonPressed()
+{
+ QString path = m_currentPath;
+ QString newFile = QFileDialog::getOpenFileName(0, tr("Open File"), path, m_filter);
+ if (!newFile.isEmpty())
+ setFileNameStr(newFile);
+
+ m_currentPath = QFileInfo(newFile).absolutePath();
+}
+
+void FileWidget::setFileNameStr(const QString &fileName)
+{
+ setFileName(QUrl(fileName));
+}
+void FileWidget::setFileName(const QUrl &fileName)
+{
+ if (fileName == m_fileName)
+ return;
+
+ m_fileName = fileName;
+ if (m_lineEdit->text() != fileName.toString()) {
+ m_lineEdit->setText(fileName.toString());
+ m_lineEdit->setToolTip(m_fileName.toString());
+ }
+ if (m_comboBox->currentText() != fileName.toString()) {
+ m_comboBox->setEditText(m_fileName.toString());
+ m_comboBox->setToolTip(m_fileName.toString());
+ }
+ emit fileNameChanged(fileName);
+}
+
+void FileWidget::setupComboBox()
+{
+ m_lock = true;
+ m_comboBox->clear();
+
+ QDir dir;
+
+
+ if (m_path.isValid())
+ dir = QDir(m_path.toLocalFile());
+
+ QStringList filterList = m_filter.split(' ');
+
+ QDirIterator it(dir.absolutePath(), filterList, QDir::Files, QDirIterator::Subdirectories);
+ while (it.hasNext()) {
+ QString absolutePath = it.next();
+ m_comboBox->addItem(dir.relativeFilePath(absolutePath));
+ }
+ m_comboBox->setEditText(m_fileName.toString());
+
+ m_lock = false;
+}
+
+} //QmlEditorWidgets
+
+
diff --git a/src/libs/qmleditorwidgets/filewidget.h b/src/libs/qmleditorwidgets/filewidget.h
new file mode 100644
index 00000000000..a1c1e37bec2
--- /dev/null
+++ b/src/libs/qmleditorwidgets/filewidget.h
@@ -0,0 +1,123 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+**
+**************************************************************************/
+
+
+#ifndef FILEWIDGET_H
+#define FILEWIDGET_H
+
+#include <qmleditorwidgets_global.h>
+#include <QtGui/QWidget>
+#include <QLabel>
+#include <QToolButton>
+#include <QLineEdit>
+#include <QComboBox>
+#include <QUrl>
+
+namespace QmlEditorWidgets {
+
+class QMLEDITORWIDGETS_EXPORT FileWidget : public QWidget
+{
+ Q_OBJECT
+
+ Q_PROPERTY(QString text READ text WRITE setText)
+ Q_PROPERTY(QString fileName READ fileName WRITE setFileNameStr NOTIFY fileNameChanged)
+ Q_PROPERTY(QString filter READ filter WRITE setFilter)
+ Q_PROPERTY(bool showComboBox READ showComboBox WRITE setShowComboBox)
+ Q_PROPERTY(QUrl path READ path WRITE setPath)
+
+public:
+
+ FileWidget(QWidget *parent = 0);
+ ~FileWidget();
+
+ QString fileName() const
+ { return m_fileName.toString(); }
+
+ void setText(const QString &/*text*/)
+ {
+
+ }
+
+ void setPath(const QUrl &url) { m_path = url; setupComboBox(); }
+
+ QUrl path() const { return m_path; }
+
+ QString text() const
+ {
+ return QString();
+ }
+
+ void setFilter(const QString &filter)
+ {
+ m_filter = filter;
+ }
+
+ QString filter() const
+ {
+ return m_filter;
+ }
+
+ void setShowComboBox(bool show);
+
+ bool showComboBox() const
+ { return m_showComboBox; }
+
+public slots:
+ void setFileName(const QUrl &fileName);
+ void setFileNameStr(const QString &fileName);
+ void buttonPressed();
+ void lineEditChanged();
+ void comboBoxChanged();
+
+signals:
+ void fileNameChanged(const QUrl &fileName);
+ void itemNodeChanged();
+
+protected:
+
+private:
+
+ void setupComboBox();
+
+ QToolButton *m_pushButton;
+ QLineEdit *m_lineEdit;
+ QComboBox *m_comboBox;
+ QUrl m_fileName;
+ QUrl m_path;
+ QString m_filter;
+ bool m_showComboBox;
+ bool m_lock;
+ QString m_currentPath;
+
+};
+
+} //QmlEditorWidgets
+
+#endif
+
diff --git a/src/plugins/qmldesigner/components/propertyeditor/fontsizespinbox.cpp b/src/libs/qmleditorwidgets/fontsizespinbox.cpp
similarity index 53%
rename from src/plugins/qmldesigner/components/propertyeditor/fontsizespinbox.cpp
rename to src/libs/qmleditorwidgets/fontsizespinbox.cpp
index 2116062ce2e..1136b418d91 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/fontsizespinbox.cpp
+++ b/src/libs/qmleditorwidgets/fontsizespinbox.cpp
@@ -1,9 +1,38 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+**
+**************************************************************************/
+
#include "fontsizespinbox.h"
#include <QLineEdit>
#include <QRegExpValidator>
-namespace QmlDesigner {
+namespace QmlEditorWidgets {
FontSizeSpinBox::FontSizeSpinBox(QWidget *parent) :
QAbstractSpinBox(parent), m_isPointSize(true), m_value(0)
diff --git a/src/plugins/qmldesigner/components/propertyeditor/fontsizespinbox.h b/src/libs/qmleditorwidgets/fontsizespinbox.h
similarity index 50%
rename from src/plugins/qmldesigner/components/propertyeditor/fontsizespinbox.h
rename to src/libs/qmleditorwidgets/fontsizespinbox.h
index 38003e53d57..fb7da9223e4 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/fontsizespinbox.h
+++ b/src/libs/qmleditorwidgets/fontsizespinbox.h
@@ -1,11 +1,41 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+**
+**************************************************************************/
+
#ifndef FONTSIZESPINBOX_H
#define FONTSIZESPINBOX_H
+#include <qmleditorwidgets_global.h>
#include <QAbstractSpinBox>
-namespace QmlDesigner {
+namespace QmlEditorWidgets {
-class FontSizeSpinBox : public QAbstractSpinBox
+class QMLEDITORWIDGETS_EXPORT FontSizeSpinBox : public QAbstractSpinBox
{
Q_OBJECT
diff --git a/src/libs/qmleditorwidgets/gradientline.cpp b/src/libs/qmleditorwidgets/gradientline.cpp
new file mode 100644
index 00000000000..3ea370d466c
--- /dev/null
+++ b/src/libs/qmleditorwidgets/gradientline.cpp
@@ -0,0 +1,354 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+**
+**************************************************************************/
+
+#include "gradientline.h"
+#include <QPainter>
+#include <QMouseEvent>
+
+static inline QPixmap tilePixMap(int size)
+{
+ const int checkerbordSize= size;
+ QPixmap tilePixmap(checkerbordSize * 2, checkerbordSize * 2);
+ tilePixmap.fill(Qt::white);
+ QPainter tilePainter(&tilePixmap);
+ QColor color(220, 220, 220);
+ tilePainter.fillRect(0, 0, checkerbordSize, checkerbordSize, color);
+ tilePainter.fillRect(checkerbordSize, checkerbordSize, checkerbordSize, checkerbordSize, color);
+ return tilePixmap;
+}
+
+namespace QmlEditorWidgets {
+
+void GradientLine::setGradient(const QLinearGradient &gradient)
+{
+ m_gradient = gradient;
+ m_useGradient = true;
+ setupGradient();
+ emit gradientChanged();
+
+}
+
+static inline QColor invertColor(const QColor color)
+{
+ QColor c = color.toHsv();
+ c.setHsv(c.hue(), c.saturation(), 255 - c.value());
+ return c;
+}
+
+GradientLine::GradientLine(QWidget *parent) :
+ QWidget(parent),
+ m_activeColor(Qt::black),
+ m_gradientName("gradient"),
+ m_colorIndex(0),
+ m_dragActive(false),
+ m_yOffset(0),
+ m_create(false),
+ m_active(false),
+ m_dragOff(false),
+ m_useGradient(true)
+{
+ setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed));
+ setFocusPolicy(Qt::StrongFocus);
+ setFixedHeight(50);
+ setMinimumWidth(160);
+ resize(160, 50);
+ m_colorList << m_activeColor << QColor(Qt::white);
+ m_stops << 0 << 1;
+ updateGradient();
+ setCurrentIndex(0);
+}
+
+void GradientLine::setGradientName(const QString &newName)
+{
+ if (newName == m_gradientName)
+ return;
+ m_gradientName = newName;
+ setup();
+ emit gradientNameChanged();
+}
+
+void GradientLine::setActiveColor(const QColor &newColor)
+{
+ if (newColor.name() == m_activeColor.name() && newColor.alpha() == m_activeColor.alpha())
+ return;
+
+ m_activeColor = newColor;
+ m_colorList.removeAt(currentColorIndex());
+ m_colorList.insert(currentColorIndex(), m_activeColor);
+ updateGradient();
+ update();
+}
+
+void GradientLine::setupGradient()
+{
+ if (m_useGradient) {
+ m_colorList.clear();
+ m_stops.clear();
+ foreach (const QGradientStop &stop, m_gradient.stops()) {
+ m_stops << stop.first;
+ m_colorList << stop.second;
+ }
+ }
+ updateGradient();
+}
+
+bool GradientLine::event(QEvent *event)
+{
+ if (event->type() == QEvent::ShortcutOverride)
+ if (static_cast<QKeyEvent*>(event)->matches(QKeySequence::Delete)) {
+ event->accept();
+ return true;
+ }
+
+ return QWidget::event(event);
+}
+
+void GradientLine::keyPressEvent(QKeyEvent * event)
+{
+ if (event->matches(QKeySequence::Delete)) {
+ if ((currentColorIndex()) != 0 && (currentColorIndex() < m_stops.size() - 1)) {
+ m_dragActive = false;
+ m_stops.removeAt(currentColorIndex());
+ m_colorList.removeAt(currentColorIndex());
+ updateGradient();
+ setCurrentIndex(0);
+ //delete item
+ }
+ } else {
+ QWidget::keyPressEvent(event);
+ }
+}
+
+void GradientLine::paintEvent(QPaintEvent *event)
+{
+ QWidget::paintEvent(event);
+
+ QPainter p(this);
+
+ if (!isEnabled()) {
+ p.setBrush(Qt::NoBrush);
+ p.setPen(QColor(0x444444));
+ p.drawRect(9, 31, width() - 14, height() - 32);
+
+ p.drawTiledPixmap(10, 32, width() - 16, height() - 34, tilePixMap(8));
+ } else {
+
+ QLinearGradient linearGradient(QPointF(0, 0), QPointF(width(), 0));
+
+ for (int i =0; i < m_stops.size(); i++)
+ linearGradient.setColorAt(m_stops.at(i), m_colorList.at(i));
+
+ p.setBrush(Qt::NoBrush);
+ p.setPen(QColor(0x444444));
+ p.drawRect(9, 31, width() - 14, height() - 32);
+
+
+ p.drawTiledPixmap(9, 31, width() - 16, height() - 34, tilePixMap(8));
+
+ p.setBrush(linearGradient);
+ p.setPen(QColor(0x222222));
+ p.drawRect(8, 30, width() - 14, height() - 32);
+ p.setPen(QColor(255, 255, 255, 40));
+ p.drawRect(9, 31, width() - 16, height() - 34);
+
+ p.setPen(Qt::black);
+
+ for (int i =0; i < m_colorList.size(); i++) {
+ int localYOffset = 0;
+ QColor arrowColor(Qt::black);
+ if (i == currentColorIndex()) {
+ localYOffset = m_yOffset;
+ arrowColor = QColor(0x909090);
+ }
+ p.setPen(arrowColor);
+ if (i == 0 || i == (m_colorList.size() - 1))
+ localYOffset = 0;
+
+ int pos = qreal((width() - 16)) * m_stops.at(i) + 9;
+ p.setBrush(arrowColor);
+ QVector<QPointF> points;
+ points.append(QPointF(pos + 0.5, 28.5 + localYOffset)); //triangle
+ points.append(QPointF(pos - 3.5, 22.5 + localYOffset));
+ points.append(QPointF(pos + 4.5, 22.5 + localYOffset));
+ p.setRenderHint(QPainter::Antialiasing, true);
+ p.drawPolygon(points);
+ p.setRenderHint(QPainter::Antialiasing, false);
+ p.setBrush(Qt::NoBrush);
+ p.setPen(QColor(0x424242));
+ p.drawRect(pos - 4, 9 + localYOffset, 10, 11);
+
+ p.drawTiledPixmap(pos - 4, 9 + localYOffset, 9, 10, tilePixMap(5));
+ p.setPen(QColor(0x424242));
+ p.setBrush(m_colorList.at(i));
+ p.drawRect(pos - 5, 8 + localYOffset, 10, 11);
+ p.setBrush(Qt::NoBrush);
+ p.setPen(QColor(255, 255, 255, 30));
+ p.drawRect(pos - 4, 9 + localYOffset, 8, 9);
+ }
+ }
+}
+
+void GradientLine::mousePressEvent(QMouseEvent *event)
+{
+ if (event->button() == Qt::LeftButton) {
+ event->accept();
+ int xPos = event->pos().x();
+ int yPos = event->pos().y();
+
+ int draggedIndex = -1;
+ m_create = false;
+ m_dragActive = false;
+ if ((yPos > 10) && (yPos < 30))
+ for (int i =0; i < m_stops.size(); i++) {
+ int pos = qreal((width() - 16)) * m_stops.at(i) + 9;
+ if (((xPos + 5) > pos) && ((xPos - 5) < pos)) {
+ draggedIndex = i;
+ m_dragActive = true;
+ m_dragStart = event->pos();
+ setCurrentIndex(draggedIndex);
+ update();
+ }
+ }
+ if (draggedIndex == -1)
+ m_create = true;
+ }
+ setFocus(Qt::MouseFocusReason);
+}
+
+void GradientLine::mouseDoubleClickEvent(QMouseEvent *event)
+{
+ event->accept();
+ m_dragActive = false;
+ m_create = false;
+ emit openColorDialog(event->pos());
+}
+
+void GradientLine::mouseReleaseEvent(QMouseEvent *event)
+{
+ if (event->button() == Qt::LeftButton) {
+ event->accept();
+ if (m_dragActive == false && m_create) {
+ qreal stopPos = qreal(event->pos().x() - 9) / qreal((width() - 15));
+ int index = -1;
+ for (int i =0; i < m_stops.size() - 1; i++) {
+ if ((stopPos > m_stops.at(i)) && (index == -1))
+ index = i +1;
+ }
+ if (index != -1 && (m_useGradient)) { //creating of items only in base state
+ m_stops.insert(index, stopPos);
+ m_colorList.insert(index, QColor(Qt::white));
+ setCurrentIndex(index);
+ }
+ }
+ }
+ m_dragActive = false;
+ m_yOffset = 0;
+ updateGradient();
+ update();
+ setFocus(Qt::MouseFocusReason);
+}
+
+void GradientLine::mouseMoveEvent(QMouseEvent *event)
+{
+ if (m_dragActive) {
+ event->accept();
+ int xPos = event->pos().x();
+ int pos = qreal((width() - 20)) * m_stops.at(currentColorIndex()) + 8;
+ int offset = m_dragOff ? 2 : 20;
+ if (xPos < pos + offset && xPos > pos - offset) {
+ m_dragOff = false;
+ int xDistance = event->pos().x() - m_dragStart.x();
+ qreal distance = qreal(xDistance) / qreal((width() - 20));
+ qreal newStop = m_stops.at(currentColorIndex()) + distance;
+ if ((newStop >=0) && (newStop <= 1))
+ m_stops[currentColorIndex()] = newStop;
+ m_yOffset += event->pos().y() - m_dragStart.y();
+ if (m_yOffset > 0 || m_useGradient) { //deleting only in base state
+ m_yOffset = 0;
+ } else if ((m_yOffset < - 12) && (currentColorIndex()) != 0 && (currentColorIndex() < m_stops.size() - 1)) {
+ m_yOffset = 0;
+ m_dragActive = false;
+ m_stops.removeAt(currentColorIndex());
+ m_colorList.removeAt(currentColorIndex());
+ updateGradient();
+ setCurrentIndex(0);
+ //delete item
+ }
+ } else {
+ m_dragOff = true;
+ }
+ m_dragStart = event->pos();
+ update();
+ }
+}
+
+void GradientLine::setup()
+{
+
+}
+
+static inline QColor normalizeColor(const QColor &color)
+{
+ QColor newColor = QColor(color.name());
+ newColor.setAlpha(color.alpha());
+ return newColor;
+}
+
+static inline qreal roundReal(qreal real)
+{
+ int i = real * 100;
+ return qreal(i) / 100;
+}
+
+void GradientLine::updateGradient()
+{
+ if (m_useGradient) {
+ QGradientStops stops;
+ for (int i = 0;i < m_stops.size(); i++) {
+ stops.append(QPair<qreal, QColor>(m_stops.at(i), m_colorList.at(i)));
+ }
+ m_gradient.setStops(stops);
+ emit gradientChanged();
+ } else {
+ if (!active())
+ return;
+ }
+}
+
+void GradientLine::setCurrentIndex(int i)
+{
+ if (i == m_colorIndex)
+ return;
+ m_colorIndex = i;
+ m_activeColor = m_colorList.at(i);
+ emit activeColorChanged();
+ update();
+}
+
+} //QmlEditorWidgets
diff --git a/src/libs/qmleditorwidgets/gradientline.h b/src/libs/qmleditorwidgets/gradientline.h
new file mode 100644
index 00000000000..c0825096532
--- /dev/null
+++ b/src/libs/qmleditorwidgets/gradientline.h
@@ -0,0 +1,101 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+**
+**************************************************************************/
+
+#ifndef GRADIENTLINE_H
+#define GRADIENTLINE_H
+
+#include <qmleditorwidgets_global.h>
+#include <QtGui/QWidget>
+#include <QToolButton>
+#include <QLinearGradient>
+
+namespace QmlEditorWidgets {
+
+class QMLEDITORWIDGETS_EXPORT GradientLine : public QWidget {
+ Q_OBJECT
+ Q_PROPERTY(QColor activeColor READ activeColor WRITE setActiveColor NOTIFY activeColorChanged)
+ Q_PROPERTY(QString gradientName READ gradientName WRITE setGradientName NOTIFY gradientNameChanged)
+ Q_PROPERTY(bool active READ active WRITE setActive)
+ Q_PROPERTY(QLinearGradient gradient READ gradient WRITE setGradient NOTIFY gradientChanged)
+
+public:
+ GradientLine(QWidget *parent = 0);
+
+ QString gradientName() const { return m_gradientName; }
+ void setGradientName(const QString &newName);
+ QColor activeColor() const { return m_activeColor; }
+ void setActiveColor(const QColor &newColor);
+ bool active() const { return m_active; }
+ void setActive(bool a) { m_active = a; }
+ QLinearGradient gradient() const { return m_gradient; }
+ void setGradient(const QLinearGradient &);
+
+public slots:
+ void setupGradient();
+
+signals:
+ void activeColorChanged();
+ void itemNodeChanged();
+ void gradientNameChanged();
+ void gradientChanged();
+ void openColorDialog(const QPoint &pos);
+protected:
+ bool event(QEvent *event);
+ void keyPressEvent(QKeyEvent * event);
+ void paintEvent(QPaintEvent *event);
+ void mousePressEvent(QMouseEvent *event);
+ void mouseDoubleClickEvent(QMouseEvent *event);
+ void mouseReleaseEvent(QMouseEvent *);
+ void mouseMoveEvent(QMouseEvent *);
+
+private:
+ void setup();
+ void updateGradient();
+ int currentColorIndex() const { return m_colorIndex; }
+ void setCurrentIndex(int i);
+
+ QColor m_activeColor;
+ QString m_gradientName;
+ QList<QColor> m_colorList;
+ QList<qreal> m_stops;
+ int m_colorIndex;
+ bool m_dragActive;
+ QPoint m_dragStart;
+ QLinearGradient m_gradient;
+ int m_yOffset;
+ bool m_create;
+ bool m_active;
+ bool m_dragOff;
+ bool m_useGradient;
+
+};
+
+} //QmlEditorWidgets
+
+#endif //GRADIENTLINE_H
diff --git a/src/libs/qmleditorwidgets/huecontrol.cpp b/src/libs/qmleditorwidgets/huecontrol.cpp
new file mode 100644
index 00000000000..ea38c6cc015
--- /dev/null
+++ b/src/libs/qmleditorwidgets/huecontrol.cpp
@@ -0,0 +1,127 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+**
+**************************************************************************/
+
+#include "huecontrol.h"
+#include <QPainter>
+#include <QMouseEvent>
+
+static inline int clamp(int x, int lower, int upper)
+{
+ if (x < lower)
+ x = lower;
+ if (x > upper)
+ x = upper;
+ return x;
+}
+
+namespace QmlEditorWidgets {
+
+void HueControl::setCurrent(int y)
+{
+ y = clamp(y, 0, 120);
+ int oldAlpha = m_color.alpha();
+ m_color.setHsv((y * 359)/120, m_color.hsvSaturation(), m_color.value());
+ m_color.setAlpha(oldAlpha);
+ update(); // redraw pointer
+ emit hueChanged(m_color.hsvHue());
+}
+
+void HueControl::setHue(int newHue)
+{
+ if (m_color.hsvHue() == newHue)
+ return;
+ m_color.setHsv(newHue, m_color.hsvSaturation(), m_color.value());
+ update();
+ emit hueChanged(m_color.hsvHue());
+}
+
+void HueControl::paintEvent(QPaintEvent *event)
+{
+ QWidget::paintEvent(event);
+
+ QPainter p(this);
+
+ int localHeight = 120;
+
+ if (m_cache.isNull()) {
+ m_cache = QPixmap(10, localHeight);
+
+ QPainter cacheP(&m_cache);
+
+ for (int i = 0; i < localHeight; i++)
+ {
+ QColor c;
+ c.setHsv( (i*359) / 120.0, 255,255);
+ cacheP.fillRect(0, i, 10, i + 1, c);
+ }
+ }
+
+ p.drawPixmap(0, 5, m_cache);
+
+ QVector<QPointF> points;
+
+ int y = m_color.hueF() * 120 + 5;
+
+ points.append(QPointF(5, y));
+ points.append(QPointF(15, y + 5));
+ points.append(QPointF(15, y - 5));
+
+
+ p.setRenderHint(QPainter::Antialiasing, true);
+ p.translate(0.5, 1.5);
+ p.setPen(QColor(0, 0, 0, 120));
+ p.drawPolygon(points);
+ p.translate(0, -1);
+ p.setPen(0x222222);
+ p.setBrush(QColor(0x707070));
+ p.drawPolygon(points);
+}
+
+void HueControl::mousePressEvent(QMouseEvent *e)
+{
+ // The current cell marker is set to the cell the mouse is pressed in
+ QPoint pos = e->pos();
+ m_mousePressed = true;
+ setCurrent(pos.y() - 5);
+}
+
+void HueControl::mouseReleaseEvent(QMouseEvent * /* event */)
+{
+ m_mousePressed = false;
+}
+
+void HueControl::mouseMoveEvent(QMouseEvent *e)
+{
+ if (!m_mousePressed)
+ return;
+ QPoint pos = e->pos();
+ setCurrent(pos.y() - 5);
+}
+
+} //QmlEditorWidgets
diff --git a/src/libs/qmleditorwidgets/huecontrol.h b/src/libs/qmleditorwidgets/huecontrol.h
new file mode 100644
index 00000000000..49af3d88f40
--- /dev/null
+++ b/src/libs/qmleditorwidgets/huecontrol.h
@@ -0,0 +1,75 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+**
+**************************************************************************/
+
+#ifndef HUECONTROL_H
+#define HUECONTROL_H
+
+#include <qmleditorwidgets_global.h>
+#include <QtGui/QWidget>
+#include <QToolButton>
+#include <qdeclarative.h>
+
+namespace QmlEditorWidgets {
+
+class QMLEDITORWIDGETS_EXPORT HueControl : public QWidget
+{
+ Q_OBJECT
+ Q_PROPERTY(qreal hue READ hue WRITE setHue NOTIFY hueChanged)
+
+public:
+ HueControl(QWidget *parent = 0) : QWidget(parent), m_color(Qt::white), m_mousePressed(false)
+ {
+ setFixedWidth(28);
+ setFixedHeight(130);
+ }
+
+ void setHue(int newHue);
+ int hue() const { return m_color.hsvHue(); }
+
+signals:
+ void hueChanged(int hue);
+
+protected:
+ void paintEvent(QPaintEvent *);
+ void mousePressEvent(QMouseEvent *);
+ void mouseReleaseEvent(QMouseEvent *);
+ void mouseMoveEvent(QMouseEvent *);
+ void setCurrent(int y);
+
+private:
+ QColor m_color;
+ bool m_mousePressed;
+ QPixmap m_cache;
+};
+
+} //QmlEditorWidgets
+
+QML_DECLARE_TYPE(QmlEditorWidgets::HueControl);
+
+#endif //HUECONTROL_H
diff --git a/src/plugins/qmldesigner/components/resources/images/alignmentbottom-h-icon.png b/src/libs/qmleditorwidgets/images/alignmentbottom-h-icon.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/alignmentbottom-h-icon.png
rename to src/libs/qmleditorwidgets/images/alignmentbottom-h-icon.png
diff --git a/src/plugins/qmldesigner/components/resources/images/alignmentbottom-icon.png b/src/libs/qmleditorwidgets/images/alignmentbottom-icon.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/alignmentbottom-icon.png
rename to src/libs/qmleditorwidgets/images/alignmentbottom-icon.png
diff --git a/src/plugins/qmldesigner/components/resources/images/alignmentcenterh-h-icon.png b/src/libs/qmleditorwidgets/images/alignmentcenterh-h-icon.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/alignmentcenterh-h-icon.png
rename to src/libs/qmleditorwidgets/images/alignmentcenterh-h-icon.png
diff --git a/src/plugins/qmldesigner/components/resources/images/alignmentcenterh-icon.png b/src/libs/qmleditorwidgets/images/alignmentcenterh-icon.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/alignmentcenterh-icon.png
rename to src/libs/qmleditorwidgets/images/alignmentcenterh-icon.png
diff --git a/src/plugins/qmldesigner/components/resources/images/alignmentleft-h-icon.png b/src/libs/qmleditorwidgets/images/alignmentleft-h-icon.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/alignmentleft-h-icon.png
rename to src/libs/qmleditorwidgets/images/alignmentleft-h-icon.png
diff --git a/src/plugins/qmldesigner/components/resources/images/alignmentleft-icon.png b/src/libs/qmleditorwidgets/images/alignmentleft-icon.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/alignmentleft-icon.png
rename to src/libs/qmleditorwidgets/images/alignmentleft-icon.png
diff --git a/src/plugins/qmldesigner/components/resources/images/alignmentmiddle-h-icon.png b/src/libs/qmleditorwidgets/images/alignmentmiddle-h-icon.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/alignmentmiddle-h-icon.png
rename to src/libs/qmleditorwidgets/images/alignmentmiddle-h-icon.png
diff --git a/src/plugins/qmldesigner/components/resources/images/alignmentmiddle-icon.png b/src/libs/qmleditorwidgets/images/alignmentmiddle-icon.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/alignmentmiddle-icon.png
rename to src/libs/qmleditorwidgets/images/alignmentmiddle-icon.png
diff --git a/src/plugins/qmldesigner/components/resources/images/alignmentright-h-icon.png b/src/libs/qmleditorwidgets/images/alignmentright-h-icon.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/alignmentright-h-icon.png
rename to src/libs/qmleditorwidgets/images/alignmentright-h-icon.png
diff --git a/src/plugins/qmldesigner/components/resources/images/alignmentright-icon.png b/src/libs/qmleditorwidgets/images/alignmentright-icon.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/alignmentright-icon.png
rename to src/libs/qmleditorwidgets/images/alignmentright-icon.png
diff --git a/src/plugins/qmldesigner/components/resources/images/alignmenttop-h-icon.png b/src/libs/qmleditorwidgets/images/alignmenttop-h-icon.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/alignmenttop-h-icon.png
rename to src/libs/qmleditorwidgets/images/alignmenttop-h-icon.png
diff --git a/src/plugins/qmldesigner/components/resources/images/alignmenttop-icon.png b/src/libs/qmleditorwidgets/images/alignmenttop-icon.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/alignmenttop-icon.png
rename to src/libs/qmleditorwidgets/images/alignmenttop-icon.png
diff --git a/src/plugins/qmldesigner/components/resources/images/anchor-bottom-normal.png b/src/libs/qmleditorwidgets/images/anchor-bottom-normal.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/anchor-bottom-normal.png
rename to src/libs/qmleditorwidgets/images/anchor-bottom-normal.png
diff --git a/src/plugins/qmldesigner/components/resources/images/anchor-bottom-pressed.png b/src/libs/qmleditorwidgets/images/anchor-bottom-pressed.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/anchor-bottom-pressed.png
rename to src/libs/qmleditorwidgets/images/anchor-bottom-pressed.png
diff --git a/src/plugins/qmldesigner/components/resources/images/anchor-fill-normal.png b/src/libs/qmleditorwidgets/images/anchor-fill-normal.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/anchor-fill-normal.png
rename to src/libs/qmleditorwidgets/images/anchor-fill-normal.png
diff --git a/src/plugins/qmldesigner/components/resources/images/anchor-fill-pressed.png b/src/libs/qmleditorwidgets/images/anchor-fill-pressed.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/anchor-fill-pressed.png
rename to src/libs/qmleditorwidgets/images/anchor-fill-pressed.png
diff --git a/src/plugins/qmldesigner/components/resources/images/anchor-horizontal-normal.png b/src/libs/qmleditorwidgets/images/anchor-horizontal-normal.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/anchor-horizontal-normal.png
rename to src/libs/qmleditorwidgets/images/anchor-horizontal-normal.png
diff --git a/src/plugins/qmldesigner/components/resources/images/anchor-horizontal-pressed.png b/src/libs/qmleditorwidgets/images/anchor-horizontal-pressed.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/anchor-horizontal-pressed.png
rename to src/libs/qmleditorwidgets/images/anchor-horizontal-pressed.png
diff --git a/src/plugins/qmldesigner/components/resources/images/anchor-left-normal.png b/src/libs/qmleditorwidgets/images/anchor-left-normal.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/anchor-left-normal.png
rename to src/libs/qmleditorwidgets/images/anchor-left-normal.png
diff --git a/src/plugins/qmldesigner/components/resources/images/anchor-left-pressed.png b/src/libs/qmleditorwidgets/images/anchor-left-pressed.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/anchor-left-pressed.png
rename to src/libs/qmleditorwidgets/images/anchor-left-pressed.png
diff --git a/src/plugins/qmldesigner/components/resources/images/anchor-right-normal.png b/src/libs/qmleditorwidgets/images/anchor-right-normal.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/anchor-right-normal.png
rename to src/libs/qmleditorwidgets/images/anchor-right-normal.png
diff --git a/src/plugins/qmldesigner/components/resources/images/anchor-right-pressed.png b/src/libs/qmleditorwidgets/images/anchor-right-pressed.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/anchor-right-pressed.png
rename to src/libs/qmleditorwidgets/images/anchor-right-pressed.png
diff --git a/src/plugins/qmldesigner/components/resources/images/anchor-spacer.png b/src/libs/qmleditorwidgets/images/anchor-spacer.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/anchor-spacer.png
rename to src/libs/qmleditorwidgets/images/anchor-spacer.png
diff --git a/src/plugins/qmldesigner/components/resources/images/anchor-top-normal.png b/src/libs/qmleditorwidgets/images/anchor-top-normal.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/anchor-top-normal.png
rename to src/libs/qmleditorwidgets/images/anchor-top-normal.png
diff --git a/src/plugins/qmldesigner/components/resources/images/anchor-top-pressed.png b/src/libs/qmleditorwidgets/images/anchor-top-pressed.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/anchor-top-pressed.png
rename to src/libs/qmleditorwidgets/images/anchor-top-pressed.png
diff --git a/src/plugins/qmldesigner/components/resources/images/anchor-vertical-normal.png b/src/libs/qmleditorwidgets/images/anchor-vertical-normal.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/anchor-vertical-normal.png
rename to src/libs/qmleditorwidgets/images/anchor-vertical-normal.png
diff --git a/src/plugins/qmldesigner/components/resources/images/anchor-vertical-pressed.png b/src/libs/qmleditorwidgets/images/anchor-vertical-pressed.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/anchor-vertical-pressed.png
rename to src/libs/qmleditorwidgets/images/anchor-vertical-pressed.png
diff --git a/src/plugins/qmldesigner/components/resources/images/apply.png b/src/libs/qmleditorwidgets/images/apply.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/apply.png
rename to src/libs/qmleditorwidgets/images/apply.png
diff --git a/src/plugins/qmldesigner/components/resources/images/applybright.png b/src/libs/qmleditorwidgets/images/applybright.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/applybright.png
rename to src/libs/qmleditorwidgets/images/applybright.png
diff --git a/src/plugins/qmldesigner/components/resources/images/aspect-crop-icon.png b/src/libs/qmleditorwidgets/images/aspect-crop-icon.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/aspect-crop-icon.png
rename to src/libs/qmleditorwidgets/images/aspect-crop-icon.png
diff --git a/src/plugins/qmldesigner/components/resources/images/aspect-fit-icon.png b/src/libs/qmleditorwidgets/images/aspect-fit-icon.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/aspect-fit-icon.png
rename to src/libs/qmleditorwidgets/images/aspect-fit-icon.png
diff --git a/src/plugins/qmldesigner/components/resources/images/aspectlockoff.png b/src/libs/qmleditorwidgets/images/aspectlockoff.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/aspectlockoff.png
rename to src/libs/qmleditorwidgets/images/aspectlockoff.png
diff --git a/src/plugins/qmldesigner/components/resources/images/aspectlockset.png b/src/libs/qmleditorwidgets/images/aspectlockset.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/aspectlockset.png
rename to src/libs/qmleditorwidgets/images/aspectlockset.png
diff --git a/src/plugins/qmldesigner/components/resources/images/bold-h-icon.png b/src/libs/qmleditorwidgets/images/bold-h-icon.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/bold-h-icon.png
rename to src/libs/qmleditorwidgets/images/bold-h-icon.png
diff --git a/src/plugins/qmldesigner/components/resources/images/button-normal-left.png b/src/libs/qmleditorwidgets/images/button-normal-left.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/button-normal-left.png
rename to src/libs/qmleditorwidgets/images/button-normal-left.png
diff --git a/src/plugins/qmldesigner/components/resources/images/button-normal-middle.png b/src/libs/qmleditorwidgets/images/button-normal-middle.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/button-normal-middle.png
rename to src/libs/qmleditorwidgets/images/button-normal-middle.png
diff --git a/src/plugins/qmldesigner/components/resources/images/button-normal-right.png b/src/libs/qmleditorwidgets/images/button-normal-right.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/button-normal-right.png
rename to src/libs/qmleditorwidgets/images/button-normal-right.png
diff --git a/src/plugins/qmldesigner/components/resources/images/button-pressed-left.png b/src/libs/qmleditorwidgets/images/button-pressed-left.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/button-pressed-left.png
rename to src/libs/qmleditorwidgets/images/button-pressed-left.png
diff --git a/src/plugins/qmldesigner/components/resources/images/button-pressed-middle.png b/src/libs/qmleditorwidgets/images/button-pressed-middle.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/button-pressed-middle.png
rename to src/libs/qmleditorwidgets/images/button-pressed-middle.png
diff --git a/src/plugins/qmldesigner/components/resources/images/button-pressed-right.png b/src/libs/qmleditorwidgets/images/button-pressed-right.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/button-pressed-right.png
rename to src/libs/qmleditorwidgets/images/button-pressed-right.png
diff --git a/src/plugins/qmldesigner/components/resources/images/button_alignment_bottom_normal.png b/src/libs/qmleditorwidgets/images/button_alignment_bottom_normal.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/button_alignment_bottom_normal.png
rename to src/libs/qmleditorwidgets/images/button_alignment_bottom_normal.png
diff --git a/src/plugins/qmldesigner/components/resources/images/button_alignment_bottom_pressed.png b/src/libs/qmleditorwidgets/images/button_alignment_bottom_pressed.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/button_alignment_bottom_pressed.png
rename to src/libs/qmleditorwidgets/images/button_alignment_bottom_pressed.png
diff --git a/src/plugins/qmldesigner/components/resources/images/button_alignment_centerh_normal.png b/src/libs/qmleditorwidgets/images/button_alignment_centerh_normal.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/button_alignment_centerh_normal.png
rename to src/libs/qmleditorwidgets/images/button_alignment_centerh_normal.png
diff --git a/src/plugins/qmldesigner/components/resources/images/button_alignment_centerh_pressed.png b/src/libs/qmleditorwidgets/images/button_alignment_centerh_pressed.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/button_alignment_centerh_pressed.png
rename to src/libs/qmleditorwidgets/images/button_alignment_centerh_pressed.png
diff --git a/src/plugins/qmldesigner/components/resources/images/button_alignment_centerv_normal.png b/src/libs/qmleditorwidgets/images/button_alignment_centerv_normal.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/button_alignment_centerv_normal.png
rename to src/libs/qmleditorwidgets/images/button_alignment_centerv_normal.png
diff --git a/src/plugins/qmldesigner/components/resources/images/button_alignment_centerv_pressed.png b/src/libs/qmleditorwidgets/images/button_alignment_centerv_pressed.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/button_alignment_centerv_pressed.png
rename to src/libs/qmleditorwidgets/images/button_alignment_centerv_pressed.png
diff --git a/src/plugins/qmldesigner/components/resources/images/button_alignment_left_normal.png b/src/libs/qmleditorwidgets/images/button_alignment_left_normal.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/button_alignment_left_normal.png
rename to src/libs/qmleditorwidgets/images/button_alignment_left_normal.png
diff --git a/src/plugins/qmldesigner/components/resources/images/button_alignment_left_pressed.png b/src/libs/qmleditorwidgets/images/button_alignment_left_pressed.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/button_alignment_left_pressed.png
rename to src/libs/qmleditorwidgets/images/button_alignment_left_pressed.png
diff --git a/src/plugins/qmldesigner/components/resources/images/button_alignment_right_normal.png b/src/libs/qmleditorwidgets/images/button_alignment_right_normal.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/button_alignment_right_normal.png
rename to src/libs/qmleditorwidgets/images/button_alignment_right_normal.png
diff --git a/src/plugins/qmldesigner/components/resources/images/button_alignment_right_pressed.png b/src/libs/qmleditorwidgets/images/button_alignment_right_pressed.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/button_alignment_right_pressed.png
rename to src/libs/qmleditorwidgets/images/button_alignment_right_pressed.png
diff --git a/src/plugins/qmldesigner/components/resources/images/button_alignment_top_normal.png b/src/libs/qmleditorwidgets/images/button_alignment_top_normal.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/button_alignment_top_normal.png
rename to src/libs/qmleditorwidgets/images/button_alignment_top_normal.png
diff --git a/src/plugins/qmldesigner/components/resources/images/button_alignment_top_pressed.png b/src/libs/qmleditorwidgets/images/button_alignment_top_pressed.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/button_alignment_top_pressed.png
rename to src/libs/qmleditorwidgets/images/button_alignment_top_pressed.png
diff --git a/src/plugins/qmldesigner/components/resources/images/button_color_gradient_normal.png b/src/libs/qmleditorwidgets/images/button_color_gradient_normal.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/button_color_gradient_normal.png
rename to src/libs/qmleditorwidgets/images/button_color_gradient_normal.png
diff --git a/src/plugins/qmldesigner/components/resources/images/button_color_gradient_pressed.png b/src/libs/qmleditorwidgets/images/button_color_gradient_pressed.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/button_color_gradient_pressed.png
rename to src/libs/qmleditorwidgets/images/button_color_gradient_pressed.png
diff --git a/src/plugins/qmldesigner/components/resources/images/button_color_none_normal.png b/src/libs/qmleditorwidgets/images/button_color_none_normal.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/button_color_none_normal.png
rename to src/libs/qmleditorwidgets/images/button_color_none_normal.png
diff --git a/src/plugins/qmldesigner/components/resources/images/button_color_none_pressed.png b/src/libs/qmleditorwidgets/images/button_color_none_pressed.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/button_color_none_pressed.png
rename to src/libs/qmleditorwidgets/images/button_color_none_pressed.png
diff --git a/src/plugins/qmldesigner/components/resources/images/button_color_solid_normal.png b/src/libs/qmleditorwidgets/images/button_color_solid_normal.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/button_color_solid_normal.png
rename to src/libs/qmleditorwidgets/images/button_color_solid_normal.png
diff --git a/src/plugins/qmldesigner/components/resources/images/button_color_solid_pressed.png b/src/libs/qmleditorwidgets/images/button_color_solid_pressed.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/button_color_solid_pressed.png
rename to src/libs/qmleditorwidgets/images/button_color_solid_pressed.png
diff --git a/src/plugins/qmldesigner/components/resources/images/cancel.png b/src/libs/qmleditorwidgets/images/cancel.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/cancel.png
rename to src/libs/qmleditorwidgets/images/cancel.png
diff --git a/src/plugins/qmldesigner/components/resources/images/cancelbright.png b/src/libs/qmleditorwidgets/images/cancelbright.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/cancelbright.png
rename to src/libs/qmleditorwidgets/images/cancelbright.png
diff --git a/src/plugins/qmldesigner/components/resources/images/checkbox_checked.png b/src/libs/qmleditorwidgets/images/checkbox_checked.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/checkbox_checked.png
rename to src/libs/qmleditorwidgets/images/checkbox_checked.png
diff --git a/src/plugins/qmldesigner/components/resources/images/checkbox_checked_hover.png b/src/libs/qmleditorwidgets/images/checkbox_checked_hover.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/checkbox_checked_hover.png
rename to src/libs/qmleditorwidgets/images/checkbox_checked_hover.png
diff --git a/src/plugins/qmldesigner/components/resources/images/checkbox_checked_pressed.png b/src/libs/qmleditorwidgets/images/checkbox_checked_pressed.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/checkbox_checked_pressed.png
rename to src/libs/qmleditorwidgets/images/checkbox_checked_pressed.png
diff --git a/src/plugins/qmldesigner/components/resources/images/checkbox_unchecked.png b/src/libs/qmleditorwidgets/images/checkbox_unchecked.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/checkbox_unchecked.png
rename to src/libs/qmleditorwidgets/images/checkbox_unchecked.png
diff --git a/src/plugins/qmldesigner/components/resources/images/checkbox_unchecked_hover.png b/src/libs/qmleditorwidgets/images/checkbox_unchecked_hover.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/checkbox_unchecked_hover.png
rename to src/libs/qmleditorwidgets/images/checkbox_unchecked_hover.png
diff --git a/src/plugins/qmldesigner/components/resources/images/checkbox_unchecked_pressed.png b/src/libs/qmleditorwidgets/images/checkbox_unchecked_pressed.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/checkbox_unchecked_pressed.png
rename to src/libs/qmleditorwidgets/images/checkbox_unchecked_pressed.png
diff --git a/src/plugins/qmldesigner/components/resources/images/collapse-button-hover-mirrored.png b/src/libs/qmleditorwidgets/images/collapse-button-hover-mirrored.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/collapse-button-hover-mirrored.png
rename to src/libs/qmleditorwidgets/images/collapse-button-hover-mirrored.png
diff --git a/src/plugins/qmldesigner/components/resources/images/collapse-button-hover.png b/src/libs/qmleditorwidgets/images/collapse-button-hover.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/collapse-button-hover.png
rename to src/libs/qmleditorwidgets/images/collapse-button-hover.png
diff --git a/src/plugins/qmldesigner/components/resources/images/collapse-button-normal-mirrored.png b/src/libs/qmleditorwidgets/images/collapse-button-normal-mirrored.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/collapse-button-normal-mirrored.png
rename to src/libs/qmleditorwidgets/images/collapse-button-normal-mirrored.png
diff --git a/src/plugins/qmldesigner/components/resources/images/collapse-button-normal.png b/src/libs/qmleditorwidgets/images/collapse-button-normal.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/collapse-button-normal.png
rename to src/libs/qmleditorwidgets/images/collapse-button-normal.png
diff --git a/src/plugins/qmldesigner/components/resources/images/combobox-normal.png b/src/libs/qmleditorwidgets/images/combobox-normal.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/combobox-normal.png
rename to src/libs/qmleditorwidgets/images/combobox-normal.png
diff --git a/src/plugins/qmldesigner/components/resources/images/combobox-pressed.png b/src/libs/qmleditorwidgets/images/combobox-pressed.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/combobox-pressed.png
rename to src/libs/qmleditorwidgets/images/combobox-pressed.png
diff --git a/src/plugins/qmldesigner/components/resources/images/down_arrow.png b/src/libs/qmleditorwidgets/images/down_arrow.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/down_arrow.png
rename to src/libs/qmleditorwidgets/images/down_arrow.png
diff --git a/src/plugins/qmldesigner/components/resources/images/down_arrow_disabled.png b/src/libs/qmleditorwidgets/images/down_arrow_disabled.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/down_arrow_disabled.png
rename to src/libs/qmleditorwidgets/images/down_arrow_disabled.png
diff --git a/src/plugins/qmldesigner/components/resources/images/eye_crossed.png b/src/libs/qmleditorwidgets/images/eye_crossed.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/eye_crossed.png
rename to src/libs/qmleditorwidgets/images/eye_crossed.png
diff --git a/src/plugins/qmldesigner/components/resources/images/eye_open.png b/src/libs/qmleditorwidgets/images/eye_open.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/eye_open.png
rename to src/libs/qmleditorwidgets/images/eye_open.png
diff --git a/src/plugins/qmldesigner/components/resources/images/frame.png b/src/libs/qmleditorwidgets/images/frame.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/frame.png
rename to src/libs/qmleditorwidgets/images/frame.png
diff --git a/src/plugins/qmldesigner/components/resources/images/hole.png b/src/libs/qmleditorwidgets/images/hole.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/hole.png
rename to src/libs/qmleditorwidgets/images/hole.png
diff --git a/src/plugins/qmldesigner/components/resources/images/horizontal-scale-icon.png b/src/libs/qmleditorwidgets/images/horizontal-scale-icon.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/horizontal-scale-icon.png
rename to src/libs/qmleditorwidgets/images/horizontal-scale-icon.png
diff --git a/src/plugins/qmldesigner/components/resources/images/icon-bottom.png b/src/libs/qmleditorwidgets/images/icon-bottom.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/icon-bottom.png
rename to src/libs/qmleditorwidgets/images/icon-bottom.png
diff --git a/src/plugins/qmldesigner/components/resources/images/icon-horizontal.png b/src/libs/qmleditorwidgets/images/icon-horizontal.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/icon-horizontal.png
rename to src/libs/qmleditorwidgets/images/icon-horizontal.png
diff --git a/src/plugins/qmldesigner/components/resources/images/icon-left.png b/src/libs/qmleditorwidgets/images/icon-left.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/icon-left.png
rename to src/libs/qmleditorwidgets/images/icon-left.png
diff --git a/src/plugins/qmldesigner/components/resources/images/icon-right.png b/src/libs/qmleditorwidgets/images/icon-right.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/icon-right.png
rename to src/libs/qmleditorwidgets/images/icon-right.png
diff --git a/src/plugins/qmldesigner/components/resources/images/icon-top.png b/src/libs/qmleditorwidgets/images/icon-top.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/icon-top.png
rename to src/libs/qmleditorwidgets/images/icon-top.png
diff --git a/src/plugins/qmldesigner/components/resources/images/icon-vertical.png b/src/libs/qmleditorwidgets/images/icon-vertical.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/icon-vertical.png
rename to src/libs/qmleditorwidgets/images/icon-vertical.png
diff --git a/src/plugins/qmldesigner/components/resources/images/icon_color_gradient.png b/src/libs/qmleditorwidgets/images/icon_color_gradient.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/icon_color_gradient.png
rename to src/libs/qmleditorwidgets/images/icon_color_gradient.png
diff --git a/src/plugins/qmldesigner/components/resources/images/icon_color_none.png b/src/libs/qmleditorwidgets/images/icon_color_none.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/icon_color_none.png
rename to src/libs/qmleditorwidgets/images/icon_color_none.png
diff --git a/src/plugins/qmldesigner/components/resources/images/icon_color_solid.png b/src/libs/qmleditorwidgets/images/icon_color_solid.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/icon_color_solid.png
rename to src/libs/qmleditorwidgets/images/icon_color_solid.png
diff --git a/src/plugins/qmldesigner/components/resources/images/italic-h-icon.png b/src/libs/qmleditorwidgets/images/italic-h-icon.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/italic-h-icon.png
rename to src/libs/qmleditorwidgets/images/italic-h-icon.png
diff --git a/src/plugins/qmldesigner/components/resources/images/lock.png b/src/libs/qmleditorwidgets/images/lock.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/lock.png
rename to src/libs/qmleditorwidgets/images/lock.png
diff --git a/src/plugins/qmldesigner/components/resources/images/placeholder.png b/src/libs/qmleditorwidgets/images/placeholder.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/placeholder.png
rename to src/libs/qmleditorwidgets/images/placeholder.png
diff --git a/src/plugins/qmldesigner/components/resources/images/pushbutton.png b/src/libs/qmleditorwidgets/images/pushbutton.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/pushbutton.png
rename to src/libs/qmleditorwidgets/images/pushbutton.png
diff --git a/src/plugins/qmldesigner/components/resources/images/pushbutton_hover.png b/src/libs/qmleditorwidgets/images/pushbutton_hover.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/pushbutton_hover.png
rename to src/libs/qmleditorwidgets/images/pushbutton_hover.png
diff --git a/src/plugins/qmldesigner/components/resources/images/pushbutton_pressed.png b/src/libs/qmleditorwidgets/images/pushbutton_pressed.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/pushbutton_pressed.png
rename to src/libs/qmleditorwidgets/images/pushbutton_pressed.png
diff --git a/src/plugins/qmldesigner/components/resources/images/radiobutton_checked.png b/src/libs/qmleditorwidgets/images/radiobutton_checked.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/radiobutton_checked.png
rename to src/libs/qmleditorwidgets/images/radiobutton_checked.png
diff --git a/src/plugins/qmldesigner/components/resources/images/radiobutton_checked_hover.png b/src/libs/qmleditorwidgets/images/radiobutton_checked_hover.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/radiobutton_checked_hover.png
rename to src/libs/qmleditorwidgets/images/radiobutton_checked_hover.png
diff --git a/src/plugins/qmldesigner/components/resources/images/radiobutton_checked_pressed.png b/src/libs/qmleditorwidgets/images/radiobutton_checked_pressed.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/radiobutton_checked_pressed.png
rename to src/libs/qmleditorwidgets/images/radiobutton_checked_pressed.png
diff --git a/src/plugins/qmldesigner/components/resources/images/radiobutton_unchecked.png b/src/libs/qmleditorwidgets/images/radiobutton_unchecked.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/radiobutton_unchecked.png
rename to src/libs/qmleditorwidgets/images/radiobutton_unchecked.png
diff --git a/src/plugins/qmldesigner/components/resources/images/radiobutton_unchecked_hover.png b/src/libs/qmleditorwidgets/images/radiobutton_unchecked_hover.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/radiobutton_unchecked_hover.png
rename to src/libs/qmleditorwidgets/images/radiobutton_unchecked_hover.png
diff --git a/src/plugins/qmldesigner/components/resources/images/radiobutton_unchecked_pressed.png b/src/libs/qmleditorwidgets/images/radiobutton_unchecked_pressed.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/radiobutton_unchecked_pressed.png
rename to src/libs/qmleditorwidgets/images/radiobutton_unchecked_pressed.png
diff --git a/src/plugins/qmldesigner/components/resources/images/scale-icon.png b/src/libs/qmleditorwidgets/images/scale-icon.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/scale-icon.png
rename to src/libs/qmleditorwidgets/images/scale-icon.png
diff --git a/src/plugins/qmldesigner/components/resources/images/scrollbar-borderimage-horizontal.png b/src/libs/qmleditorwidgets/images/scrollbar-borderimage-horizontal.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/scrollbar-borderimage-horizontal.png
rename to src/libs/qmleditorwidgets/images/scrollbar-borderimage-horizontal.png
diff --git a/src/plugins/qmldesigner/components/resources/images/scrollbar-borderimage-vertical.png b/src/libs/qmleditorwidgets/images/scrollbar-borderimage-vertical.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/scrollbar-borderimage-vertical.png
rename to src/libs/qmleditorwidgets/images/scrollbar-borderimage-vertical.png
diff --git a/src/plugins/qmldesigner/components/resources/images/sizegrip.png b/src/libs/qmleditorwidgets/images/sizegrip.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/sizegrip.png
rename to src/libs/qmleditorwidgets/images/sizegrip.png
diff --git a/src/plugins/qmldesigner/components/resources/images/slider_indikator.png b/src/libs/qmleditorwidgets/images/slider_indikator.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/slider_indikator.png
rename to src/libs/qmleditorwidgets/images/slider_indikator.png
diff --git a/src/plugins/qmldesigner/components/resources/images/slider_line.png b/src/libs/qmleditorwidgets/images/slider_line.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/slider_line.png
rename to src/libs/qmleditorwidgets/images/slider_line.png
diff --git a/src/plugins/qmldesigner/components/resources/images/spindown.png b/src/libs/qmleditorwidgets/images/spindown.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/spindown.png
rename to src/libs/qmleditorwidgets/images/spindown.png
diff --git a/src/plugins/qmldesigner/components/resources/images/spindown_hover.png b/src/libs/qmleditorwidgets/images/spindown_hover.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/spindown_hover.png
rename to src/libs/qmleditorwidgets/images/spindown_hover.png
diff --git a/src/plugins/qmldesigner/components/resources/images/spindown_off.png b/src/libs/qmleditorwidgets/images/spindown_off.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/spindown_off.png
rename to src/libs/qmleditorwidgets/images/spindown_off.png
diff --git a/src/plugins/qmldesigner/components/resources/images/spindown_pressed.png b/src/libs/qmleditorwidgets/images/spindown_pressed.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/spindown_pressed.png
rename to src/libs/qmleditorwidgets/images/spindown_pressed.png
diff --git a/src/plugins/qmldesigner/components/resources/images/spinup.png b/src/libs/qmleditorwidgets/images/spinup.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/spinup.png
rename to src/libs/qmleditorwidgets/images/spinup.png
diff --git a/src/plugins/qmldesigner/components/resources/images/spinup_hover.png b/src/libs/qmleditorwidgets/images/spinup_hover.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/spinup_hover.png
rename to src/libs/qmleditorwidgets/images/spinup_hover.png
diff --git a/src/plugins/qmldesigner/components/resources/images/spinup_off.png b/src/libs/qmleditorwidgets/images/spinup_off.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/spinup_off.png
rename to src/libs/qmleditorwidgets/images/spinup_off.png
diff --git a/src/plugins/qmldesigner/components/resources/images/spinup_pressed.png b/src/libs/qmleditorwidgets/images/spinup_pressed.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/spinup_pressed.png
rename to src/libs/qmleditorwidgets/images/spinup_pressed.png
diff --git a/src/plugins/qmldesigner/components/resources/images/strikeout-h-icon.png b/src/libs/qmleditorwidgets/images/strikeout-h-icon.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/strikeout-h-icon.png
rename to src/libs/qmleditorwidgets/images/strikeout-h-icon.png
diff --git a/src/plugins/qmldesigner/components/resources/images/tile-icon-hor - scale.png b/src/libs/qmleditorwidgets/images/tile-icon-hor - scale.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/tile-icon-hor - scale.png
rename to src/libs/qmleditorwidgets/images/tile-icon-hor - scale.png
diff --git a/src/plugins/qmldesigner/components/resources/images/tile-icon-hor-crop.png b/src/libs/qmleditorwidgets/images/tile-icon-hor-crop.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/tile-icon-hor-crop.png
rename to src/libs/qmleditorwidgets/images/tile-icon-hor-crop.png
diff --git a/src/plugins/qmldesigner/components/resources/images/tile-icon-vert-crop.png b/src/libs/qmleditorwidgets/images/tile-icon-vert-crop.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/tile-icon-vert-crop.png
rename to src/libs/qmleditorwidgets/images/tile-icon-vert-crop.png
diff --git a/src/plugins/qmldesigner/components/resources/images/tile-icon-vert-scale.png b/src/libs/qmleditorwidgets/images/tile-icon-vert-scale.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/tile-icon-vert-scale.png
rename to src/libs/qmleditorwidgets/images/tile-icon-vert-scale.png
diff --git a/src/plugins/qmldesigner/components/resources/images/tile-icon.png b/src/libs/qmleditorwidgets/images/tile-icon.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/tile-icon.png
rename to src/libs/qmleditorwidgets/images/tile-icon.png
diff --git a/src/plugins/qmldesigner/components/resources/images/triangle_horz.png b/src/libs/qmleditorwidgets/images/triangle_horz.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/triangle_horz.png
rename to src/libs/qmleditorwidgets/images/triangle_horz.png
diff --git a/src/plugins/qmldesigner/components/resources/images/triangle_vert.png b/src/libs/qmleditorwidgets/images/triangle_vert.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/triangle_vert.png
rename to src/libs/qmleditorwidgets/images/triangle_vert.png
diff --git a/src/plugins/qmldesigner/components/resources/images/underline-h-icon.png b/src/libs/qmleditorwidgets/images/underline-h-icon.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/underline-h-icon.png
rename to src/libs/qmleditorwidgets/images/underline-h-icon.png
diff --git a/src/plugins/qmldesigner/components/resources/images/up_arrow.png b/src/libs/qmleditorwidgets/images/up_arrow.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/up_arrow.png
rename to src/libs/qmleditorwidgets/images/up_arrow.png
diff --git a/src/plugins/qmldesigner/components/resources/images/up_arrow_disabled.png b/src/libs/qmleditorwidgets/images/up_arrow_disabled.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/up_arrow_disabled.png
rename to src/libs/qmleditorwidgets/images/up_arrow_disabled.png
diff --git a/src/plugins/qmldesigner/components/resources/images/vertical-scale-icon.png b/src/libs/qmleditorwidgets/images/vertical-scale-icon.png
similarity index 100%
rename from src/plugins/qmldesigner/components/resources/images/vertical-scale-icon.png
rename to src/libs/qmleditorwidgets/images/vertical-scale-icon.png
diff --git a/src/libs/qmleditorwidgets/qmleditorwidgets-lib.pri b/src/libs/qmleditorwidgets/qmleditorwidgets-lib.pri
new file mode 100644
index 00000000000..c27e792971b
--- /dev/null
+++ b/src/libs/qmleditorwidgets/qmleditorwidgets-lib.pri
@@ -0,0 +1,53 @@
+QT += declarative script
+INCLUDEPATH += $$PWD
+DEPENDPATH += $$PWD
+
+contains(CONFIG, dll) {
+ DEFINES += BUILD_QMLEDITORWIDGETS_LIB
+} else {
+ DEFINES += BUILD_QMLEDITORWIDGETS_STATIC_LIB
+}
+
+## Input
+RESOURCES += \
+ resources.qrc
+
+HEADERS += \
+ fontsizespinbox.h \
+ filewidget.h \
+ contextpanewidgetrectangle.h \
+ contextpanewidgetimage.h \
+ contextpanewidget.h \
+ contextpanetextwidget.h \
+ colorwidget.h \
+ colorbutton.h \
+ colorbox.h \
+ customcolordialog.h \
+ gradientline.h \
+ huecontrol.h \
+ qmleditorwidgets_global.h
+
+SOURCES += \
+ fontsizespinbox.cpp \
+ filewidget.cpp \
+ contextpanewidgetrectangle.cpp \
+ contextpanewidgetimage.cpp \
+ contextpanewidget.cpp \
+ contextpanetextwidget.cpp \
+ colorwidget.cpp \
+ colorbox.cpp \
+ customcolordialog.cpp \
+ huecontrol.cpp \
+ gradientline.cpp \
+ colorbutton.cpp
+
+FORMS += \
+ contextpanewidgetrectangle.ui \
+ contextpanewidgetimage.ui \
+ contextpanewidgetborderimage.ui \
+ contextpanetext.ui
+
+include(easingpane/easingpane.pri)
+
+
+OTHER_FILES += qmleditorwidgets.pri
diff --git a/src/libs/qmleditorwidgets/qmleditorwidgets.pri b/src/libs/qmleditorwidgets/qmleditorwidgets.pri
new file mode 100644
index 00000000000..72520ed9809
--- /dev/null
+++ b/src/libs/qmleditorwidgets/qmleditorwidgets.pri
@@ -0,0 +1,7 @@
+INCLUDEPATH += $$PWD $$PWD/easingpane
+DEPENDPATH += $$PWD $$PWD/easingpane
+QT += declarative
+
+LIBS *= -l$$qtLibraryName(QmlEditorWidgets)
+
+include(../qmljs/qmljs.pri)
diff --git a/src/libs/qmleditorwidgets/qmleditorwidgets.pro b/src/libs/qmleditorwidgets/qmleditorwidgets.pro
new file mode 100644
index 00000000000..ad9e1dfa21e
--- /dev/null
+++ b/src/libs/qmleditorwidgets/qmleditorwidgets.pro
@@ -0,0 +1,12 @@
+TEMPLATE = lib
+CONFIG+=dll
+TARGET = QmlEditorWidgets
+
+DEFINES += QWEAKPOINTER_ENABLE_ARROW
+
+unix:QMAKE_CXXFLAGS_DEBUG += -O3
+
+include(../../qtcreatorlibrary.pri)
+include(../qmljs/qmljs.pri)
+include(qmleditorwidgets-lib.pri)
+
diff --git a/src/libs/qmleditorwidgets/qmleditorwidgets_global.h b/src/libs/qmleditorwidgets/qmleditorwidgets_global.h
new file mode 100644
index 00000000000..c9589983daf
--- /dev/null
+++ b/src/libs/qmleditorwidgets/qmleditorwidgets_global.h
@@ -0,0 +1,43 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+**
+**************************************************************************/
+
+#ifndef QMLEDITORWIDGETS_GLOBAL_H
+#define QMLEDITORWIDGETS_GLOBAL_H
+
+#include <QtCore/qglobal.h>
+
+# if defined(BUILD_QMLEDITORWIDGETS_LIB)
+# define QMLEDITORWIDGETS_EXPORT Q_DECL_EXPORT
+# elif defined(BUILD_QMLJSDEBUGGER_STATIC_LIB)
+# define QMLEDITORWIDGETS_EXPORT
+# else
+# define QMLEDITORWIDGETS_EXPORT Q_DECL_IMPORT
+#endif
+
+#endif // QMLEDITORWIDGETS_GLOBAL_H
diff --git a/src/libs/qmleditorwidgets/resources.qrc b/src/libs/qmleditorwidgets/resources.qrc
new file mode 100644
index 00000000000..ee4949f2dc2
--- /dev/null
+++ b/src/libs/qmleditorwidgets/resources.qrc
@@ -0,0 +1,130 @@
+<RCC>
+ <qresource prefix="/qmldesigner">
+ <file>images/checkbox_checked.png</file>
+ <file>images/checkbox_checked_hover.png</file>
+ <file>images/checkbox_checked_pressed.png</file>
+ <file>images/checkbox_unchecked.png</file>
+ <file>images/checkbox_unchecked_hover.png</file>
+ <file>images/checkbox_unchecked_pressed.png</file>
+ <file>images/eye_open.png</file>
+ <file>images/eye_crossed.png</file>
+ <file>images/lock.png</file>
+ <file>images/hole.png</file>
+ <file>images/down_arrow.png</file>
+ <file>images/down_arrow_disabled.png</file>
+ <file>images/frame.png</file>
+ <file>images/pushbutton.png</file>
+ <file>images/pushbutton_hover.png</file>
+ <file>images/pushbutton_pressed.png</file>
+ <file>images/radiobutton_checked.png</file>
+ <file>images/radiobutton_checked_hover.png</file>
+ <file>images/radiobutton_checked_pressed.png</file>
+ <file>images/radiobutton_unchecked.png</file>
+ <file>images/radiobutton_unchecked_hover.png</file>
+ <file>images/radiobutton_unchecked_pressed.png</file>
+ <file>images/sizegrip.png</file>
+ <file>images/spindown.png</file>
+ <file>images/spindown_hover.png</file>
+ <file>images/spindown_off.png</file>
+ <file>images/spindown_pressed.png</file>
+ <file>images/spinup.png</file>
+ <file>images/spinup_hover.png</file>
+ <file>images/spinup_off.png</file>
+ <file>images/spinup_pressed.png</file>
+ <file>images/up_arrow.png</file>
+ <file>images/up_arrow_disabled.png</file>
+ <file>images/apply.png</file>
+ <file>images/cancel.png</file>
+ <file>images/applybright.png</file>
+ <file>images/cancelbright.png</file>
+ <file>images/placeholder.png</file>
+ <file>images/triangle_horz.png</file>
+ <file>images/triangle_vert.png</file>
+ <file>images/button_color_gradient_pressed.png</file>
+ <file>images/button_color_gradient_normal.png</file>
+ <file>images/button_color_none_pressed.png</file>
+ <file>images/button_color_none_normal.png</file>
+ <file>images/button_color_solid_normal.png</file>
+ <file>images/button_color_solid_pressed.png</file>
+ <file>images/anchor-bottom-normal.png</file>
+ <file>images/anchor-bottom-pressed.png</file>
+ <file>images/anchor-top-normal.png</file>
+ <file>images/anchor-top-pressed.png</file>
+ <file>images/anchor-left-pressed.png</file>
+ <file>images/anchor-left-normal.png</file>
+ <file>images/anchor-right-normal.png</file>
+ <file>images/anchor-right-pressed.png</file>
+ <file>images/anchor-fill-pressed.png</file>
+ <file>images/anchor-fill-normal.png</file>
+ <file>images/anchor-vertical-pressed.png</file>
+ <file>images/anchor-vertical-normal.png</file>
+ <file>images/anchor-horizontal-pressed.png</file>
+ <file>images/anchor-horizontal-normal.png</file>
+ <file>images/anchor-spacer.png</file>
+ <file>images/icon-left.png</file>
+ <file>images/icon-right.png</file>
+ <file>images/icon-top.png</file>
+ <file>images/icon-bottom.png</file>
+ <file>images/icon-vertical.png</file>
+ <file>images/icon-horizontal.png</file>
+ <file>images/button_alignment_right_pressed.png</file>
+ <file>images/button_alignment_right_normal.png</file>
+ <file>images/button_alignment_left_pressed.png</file>
+ <file>images/button_alignment_left_normal.png</file>
+ <file>images/button_alignment_top_pressed.png</file>
+ <file>images/button_alignment_top_normal.png</file>
+ <file>images/button_alignment_bottom_pressed.png</file>
+ <file>images/button_alignment_bottom_normal.png</file>
+ <file>images/button_alignment_centerh_pressed.png</file>
+ <file>images/button_alignment_centerh_normal.png</file>
+ <file>images/button_alignment_centerv_pressed.png</file>
+ <file>images/button_alignment_centerv_normal.png</file>
+ <file>images/collapse-button-hover.png</file>
+ <file>images/collapse-button-normal.png</file>
+ <file>images/collapse-button-hover-mirrored.png</file>
+ <file>images/collapse-button-normal-mirrored.png</file>
+ <file>images/combobox-normal.png</file>
+ <file>images/combobox-pressed.png</file>
+ <file>images/slider_indikator.png</file>
+ <file>images/slider_line.png</file>
+ <file>images/scrollbar-borderimage-horizontal.png</file>
+ <file>images/scrollbar-borderimage-vertical.png</file>
+ <file>images/aspectlockset.png</file>
+ <file>images/aspectlockoff.png</file>
+ <file>images/button-pressed-left.png</file>
+ <file>images/button-pressed-middle.png</file>
+ <file>images/button-pressed-right.png</file>
+ <file>images/button-normal-left.png</file>
+ <file>images/button-normal-middle.png</file>
+ <file>images/button-normal-right.png</file>
+ <file>images/alignmentbottom-h-icon.png</file>
+ <file>images/alignmentbottom-icon.png</file>
+ <file>images/alignmentcenterh-h-icon.png</file>
+ <file>images/alignmentcenterh-icon.png</file>
+ <file>images/alignmentleft-h-icon.png</file>
+ <file>images/alignmentleft-icon.png</file>
+ <file>images/alignmentmiddle-h-icon.png</file>
+ <file>images/alignmentmiddle-icon.png</file>
+ <file>images/alignmentright-h-icon.png</file>
+ <file>images/alignmentright-icon.png</file>
+ <file>images/alignmenttop-h-icon.png</file>
+ <file>images/alignmenttop-icon.png</file>
+ <file>images/underline-h-icon.png</file>
+ <file>images/strikeout-h-icon.png</file>
+ <file>images/italic-h-icon.png</file>
+ <file>images/bold-h-icon.png</file>
+ <file>images/icon_color_none.png</file>
+ <file>images/icon_color_solid.png</file>
+ <file>images/icon_color_gradient.png</file>
+ <file>images/scale-icon.png</file>
+ <file>images/horizontal-scale-icon.png</file>
+ <file>images/vertical-scale-icon.png</file>
+ <file>images/tile-icon.png</file>
+ <file>images/aspect-fit-icon.png</file>
+ <file>images/aspect-crop-icon.png</file>
+ <file>images/tile-icon-vert-crop.png</file>
+ <file>images/tile-icon-hor-crop.png</file>
+ <file>images/tile-icon-hor - scale.png</file>
+ <file>images/tile-icon-vert-scale.png</file>
+ </qresource>
+</RCC>
diff --git a/src/plugins/qmldesigner/components/easingpane/easingpane.pri b/src/plugins/qmldesigner/components/easingpane/easingpane.pri
deleted file mode 100644
index 31e8b07f23e..00000000000
--- a/src/plugins/qmldesigner/components/easingpane/easingpane.pri
+++ /dev/null
@@ -1,12 +0,0 @@
-VPATH += $$PWD
-INCLUDEPATH += $$PWD
-#include($$PWD/qtgradienteditor/qtgradienteditor.pri)
-SOURCES += easinggraph.cpp \
- easingcontextpane.cpp
-
-HEADERS += easinggraph.h \
- easingcontextpane.h
-
-QT += declarative
-RESOURCES += easingpane.qrc
-FORMS += components/easingpane/easingcontextpane.ui
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.pri b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.pri
index 47f3257347f..af7187bbca9 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.pri
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.pri
@@ -19,12 +19,7 @@ SOURCES += propertyeditor.cpp \
siblingcombobox.cpp \
propertyeditortransaction.cpp \
propertyeditorcontextobject.cpp \
- declarativewidgetview.cpp \
- contextpanewidget.cpp \
- contextpanetextwidget.cpp \
- fontsizespinbox.cpp \
- contextpanewidgetrectangle.cpp \
- contextpanewidgetimage.cpp
+ declarativewidgetview.cpp
HEADERS += propertyeditor.h \
qmlanchorbindingproxy.h \
@@ -45,12 +40,8 @@ HEADERS += propertyeditor.h \
propertyeditortransaction.h \
designerpropertymap.h \
propertyeditorcontextobject.h \
- declarativewidgetview.h \
- contextpanewidget.h \
- contextpanetextwidget.h \
- fontsizespinbox.h \
- contextpanewidgetrectangle.h \
- contextpanewidgetimage.h
+ declarativewidgetview.h
+
QT += declarative
RESOURCES += propertyeditor.qrc
FORMS += behaviordialog.ui \
diff --git a/src/plugins/qmldesigner/components/resources/resources.qrc b/src/plugins/qmldesigner/components/resources/resources.qrc
index 235ae39be3e..505a3b1adc8 100644
--- a/src/plugins/qmldesigner/components/resources/resources.qrc
+++ b/src/plugins/qmldesigner/components/resources/resources.qrc
@@ -3,134 +3,6 @@
<file>templates/Standard/Form.xml</file>
<file>stylesheet.css</file>
<file>toolbutton.css</file>
- <file>scrollbar.css</file>
- <file>images/checkbox_checked.png</file>
- <file>images/checkbox_checked_hover.png</file>
- <file>images/checkbox_checked_pressed.png</file>
- <file>images/checkbox_unchecked.png</file>
- <file>images/checkbox_unchecked_hover.png</file>
- <file>images/checkbox_unchecked_pressed.png</file>
- <file>images/eye_open.png</file>
- <file>images/eye_crossed.png</file>
- <file>images/lock.png</file>
- <file>images/hole.png</file>
- <file>images/down_arrow.png</file>
- <file>images/down_arrow_disabled.png</file>
- <file>images/frame.png</file>
- <file>images/pushbutton.png</file>
- <file>images/pushbutton_hover.png</file>
- <file>images/pushbutton_pressed.png</file>
- <file>images/radiobutton_checked.png</file>
- <file>images/radiobutton_checked_hover.png</file>
- <file>images/radiobutton_checked_pressed.png</file>
- <file>images/radiobutton_unchecked.png</file>
- <file>images/radiobutton_unchecked_hover.png</file>
- <file>images/radiobutton_unchecked_pressed.png</file>
- <file>images/sizegrip.png</file>
- <file>images/spindown.png</file>
- <file>images/spindown_hover.png</file>
- <file>images/spindown_off.png</file>
- <file>images/spindown_pressed.png</file>
- <file>images/spinup.png</file>
- <file>images/spinup_hover.png</file>
- <file>images/spinup_off.png</file>
- <file>images/spinup_pressed.png</file>
- <file>images/up_arrow.png</file>
- <file>images/up_arrow_disabled.png</file>
- <file>images/apply.png</file>
- <file>images/cancel.png</file>
- <file>images/applybright.png</file>
- <file>images/cancelbright.png</file>
- <file>images/placeholder.png</file>
- <file>images/triangle_horz.png</file>
- <file>images/triangle_vert.png</file>
- <file>images/button_color_gradient_pressed.png</file>
- <file>images/button_color_gradient_normal.png</file>
- <file>images/button_color_none_pressed.png</file>
- <file>images/button_color_none_normal.png</file>
- <file>images/button_color_solid_normal.png</file>
- <file>images/button_color_solid_pressed.png</file>
- <file>images/anchor-bottom-normal.png</file>
- <file>images/anchor-bottom-pressed.png</file>
- <file>images/anchor-top-normal.png</file>
- <file>images/anchor-top-pressed.png</file>
- <file>images/anchor-left-pressed.png</file>
- <file>images/anchor-left-normal.png</file>
- <file>images/anchor-right-normal.png</file>
- <file>images/anchor-right-pressed.png</file>
- <file>images/anchor-fill-pressed.png</file>
- <file>images/anchor-fill-normal.png</file>
- <file>images/anchor-vertical-pressed.png</file>
- <file>images/anchor-vertical-normal.png</file>
- <file>images/anchor-horizontal-pressed.png</file>
- <file>images/anchor-horizontal-normal.png</file>
- <file>images/anchor-spacer.png</file>
- <file>images/icon-left.png</file>
- <file>images/icon-right.png</file>
- <file>images/icon-top.png</file>
- <file>images/icon-bottom.png</file>
- <file>images/icon-vertical.png</file>
- <file>images/icon-horizontal.png</file>
- <file>images/button_alignment_right_pressed.png</file>
- <file>images/button_alignment_right_normal.png</file>
- <file>images/button_alignment_left_pressed.png</file>
- <file>images/button_alignment_left_normal.png</file>
- <file>images/button_alignment_top_pressed.png</file>
- <file>images/button_alignment_top_normal.png</file>
- <file>images/button_alignment_bottom_pressed.png</file>
- <file>images/button_alignment_bottom_normal.png</file>
- <file>images/button_alignment_centerh_pressed.png</file>
- <file>images/button_alignment_centerh_normal.png</file>
- <file>images/button_alignment_centerv_pressed.png</file>
- <file>images/button_alignment_centerv_normal.png</file>
- <file>images/collapse-button-hover.png</file>
- <file>images/collapse-button-normal.png</file>
- <file>images/collapse-button-hover-mirrored.png</file>
- <file>images/collapse-button-normal-mirrored.png</file>
- <file>images/combobox-normal.png</file>
- <file>images/combobox-pressed.png</file>
- <file>images/slider_indikator.png</file>
- <file>images/slider_line.png</file>
- <file>formeditorstylesheet.css</file>
- <file>images/scrollbar-borderimage-horizontal.png</file>
- <file>images/scrollbar-borderimage-vertical.png</file>
- <file>images/aspectlockset.png</file>
- <file>images/aspectlockoff.png</file>
- <file>images/button-pressed-left.png</file>
- <file>outputpane-style.css</file>
- <file>images/button-pressed-middle.png</file>
- <file>images/button-pressed-right.png</file>
- <file>images/button-normal-left.png</file>
- <file>images/button-normal-middle.png</file>
- <file>images/button-normal-right.png</file>
- <file>images/alignmentbottom-h-icon.png</file>
- <file>images/alignmentbottom-icon.png</file>
- <file>images/alignmentcenterh-h-icon.png</file>
- <file>images/alignmentcenterh-icon.png</file>
- <file>images/alignmentleft-h-icon.png</file>
- <file>images/alignmentleft-icon.png</file>
- <file>images/alignmentmiddle-h-icon.png</file>
- <file>images/alignmentmiddle-icon.png</file>
- <file>images/alignmentright-h-icon.png</file>
- <file>images/alignmentright-icon.png</file>
- <file>images/alignmenttop-h-icon.png</file>
- <file>images/alignmenttop-icon.png</file>
- <file>images/underline-h-icon.png</file>
- <file>images/strikeout-h-icon.png</file>
- <file>images/italic-h-icon.png</file>
- <file>images/bold-h-icon.png</file>
- <file>images/icon_color_none.png</file>
- <file>images/icon_color_solid.png</file>
- <file>images/icon_color_gradient.png</file>
- <file>images/scale-icon.png</file>
- <file>images/horizontal-scale-icon.png</file>
- <file>images/vertical-scale-icon.png</file>
- <file>images/tile-icon.png</file>
- <file>images/aspect-fit-icon.png</file>
- <file>images/aspect-crop-icon.png</file>
- <file>images/tile-icon-vert-crop.png</file>
- <file>images/tile-icon-hor-crop.png</file>
- <file>images/tile-icon-hor - scale.png</file>
- <file>images/tile-icon-vert-scale.png</file>
+ <file>scrollbar.css</file>
</qresource>
</RCC>
--
GitLab