From b253675ec8a3877e8a23f710a06904cbce0b15fc Mon Sep 17 00:00:00 2001
From: Christiaan Janssen <christiaan.janssen@nokia.com>
Date: Mon, 29 Mar 2010 13:38:55 +0200
Subject: [PATCH] QmlDesigner.VisualEditor: visual editor now uses its own
stylesheet
---
.../formeditor/formeditormainwidget.cpp | 2 +-
.../formeditor/formeditorwidget.cpp | 2 +-
.../resources/formeditorstylesheet.css | 150 ++++++++++++++++++
.../components/resources/resources.qrc | 97 +++++------
4 files changed, 201 insertions(+), 50 deletions(-)
create mode 100644 src/plugins/qmldesigner/components/resources/formeditorstylesheet.css
diff --git a/src/plugins/qmldesigner/components/formeditor/formeditormainwidget.cpp b/src/plugins/qmldesigner/components/formeditor/formeditormainwidget.cpp
index e343e130b7b..f881a37c1f7 100644
--- a/src/plugins/qmldesigner/components/formeditor/formeditormainwidget.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/formeditormainwidget.cpp
@@ -48,7 +48,7 @@ FormEditorMainWidget::FormEditorMainWidget(FormEditorMainView *mainView)
m_formEditorMainView(mainView),
m_stackedWidget(new QStackedWidget(this))
{
- QFile file(":/qmldesigner/stylesheet.css");
+ QFile file(":/qmldesigner/formeditorstylesheet.css");
file.open(QFile::ReadOnly);
QString styleSheet = QLatin1String(file.readAll());
setStyleSheet(styleSheet);
diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp
index 5b698ff2932..2e066379e3e 100644
--- a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp
@@ -50,7 +50,7 @@ FormEditorWidget::FormEditorWidget(FormEditorView *view)
: QWidget(),
m_formEditorView(view)
{
- QFile file(":/qmldesigner/stylesheet.css");
+ QFile file(":/qmldesigner/formeditorstylesheet.css");
file.open(QFile::ReadOnly);
QString styleSheet = QLatin1String(file.readAll());
setStyleSheet(styleSheet);
diff --git a/src/plugins/qmldesigner/components/resources/formeditorstylesheet.css b/src/plugins/qmldesigner/components/resources/formeditorstylesheet.css
new file mode 100644
index 00000000000..805072bcb88
--- /dev/null
+++ b/src/plugins/qmldesigner/components/resources/formeditorstylesheet.css
@@ -0,0 +1,150 @@
+QFrame {
+ border: 2px;
+ background-color: #606060;
+}
+
+QLabel {
+ border: none;
+ border-image: none;
+ padding: 0;
+ background: none;
+ color: #E1E1E1;
+}
+
+QScrollArea {
+ border: 0px;
+ background-color: #606060;
+}
+
+QStackedWidget {
+ border: 0px;
+ background-color: #606060;
+}
+
+
+QGraphicsView {
+ border: 0px;
+ background-color: #606060;
+}
+
+QTabWidget {
+ border: 0px;
+ background-color: #606060;
+}
+
+QTabWidget::pane { /* The tab widget frame */
+ border: 0px;
+ background-color: #606060;
+}
+
+QLineEdit
+{
+ border: 2px solid #8F8F8F;
+ border-radius: 4px;
+ padding: 0 8px;
+ background-color: white;
+ selection-background-color: darkgray;
+}
+
+QLineEdit#itemLibrarySearchInput {
+ color: black;
+ border: 2px solid #0F0F0F;
+ border-radius: 6px;
+ border-width: 1;
+ max-height: 20px;
+ min-height: 20px;
+ background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+ stop: 0 #e0e0e0, stop: 1 #f0f0f0);
+}
+
+
+ QTreeView {
+ color: white;
+ selection-color: white
+ }
+
+ QTreeView::item:selected {
+ color: white;
+ }
+
+QTreeView::branch:has-siblings:!adjoins-item {
+ border-image: none;
+ image:none;
+ }
+
+ QTreeView::branch:has-siblings:adjoins-item {
+ border-image: none;
+ image:none;
+ }
+
+ QTreeView::branch:!has-children:!has-siblings:adjoins-item {
+ border-image: none;
+ image:none;
+ }
+
+ QTreeView::branch:has-children:!has-siblings:closed,
+ QTreeView::branch:closed:has-children:has-siblings {
+ border-image: none;
+ image: url(:/qmldesigner/images/triangle_horz.png);
+ }
+
+ QTreeView::branch:open:has-children:!has-siblings,
+ QTreeView::branch:open:has-children:has-siblings {
+ border-image: none;
+ image: url(:/qmldesigner/images/triangle_vert.png);
+ }
+
+ QListView {
+ color: white;
+ selection-color: white
+ }
+
+ QListView::item:selected {
+ color: white;
+ }
+
+ QComboBox QAbstractItemView {
+ show-decoration-selected: 1; /* make the selection span the entire width of the view */
+ background-color: #494949; /* sets background of the menu */
+ border: 1px solid black;
+ margin: 0px; /* some spacing around the menu */
+ color: #cacaca;
+ selection-background-color: #d2d2d2;
+ selection-color: #404040;
+ }
+
+QTabBar::tab {
+ border-image: none;
+
+ width: 80px;
+
+ height: 22px;
+ margin-top: 0x;
+ margin-bottom: 0px;
+ margin-left: 0px;
+ margin-right: 0px;
+ padding-right: 12px;
+ padding-left: 12px;
+ font: bold;
+ background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+ stop: 0 #3c3c3c, stop: 1 #444444);
+
+ color: #EEEEEE;
+}
+
+QTabBar::tab:hover {
+ background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+ stop: 0 #3c3c3c, stop: 1 #666666);
+}
+
+QTabBar::tab:selected {
+ border: none; /* no border for a flat push button */
+ background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+ stop: 0 #EFEFEF, stop: 1 #EEEEEE);
+ color: #3c3c3c;
+}
+
+QWidget#itemLibrarySearchInputFrame {
+ background-color: #eeeeee;
+}
+
diff --git a/src/plugins/qmldesigner/components/resources/resources.qrc b/src/plugins/qmldesigner/components/resources/resources.qrc
index 926de01f7f6..7e3f9f34311 100644
--- a/src/plugins/qmldesigner/components/resources/resources.qrc
+++ b/src/plugins/qmldesigner/components/resources/resources.qrc
@@ -1,5 +1,5 @@
<RCC>
- <qresource prefix="/qmldesigner" >
+ <qresource prefix="/qmldesigner">
<file>templates/Standard/Form.xml</file>
<file>stylesheet.css</file>
<file>toolbutton.css</file>
@@ -44,52 +44,53 @@
<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/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>
</qresource>
</RCC>
--
GitLab