QmlDesigner.PropertyEditor: Color Coding for Line Edits

6 files changed, 5 insertions, 146 deletions

diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/HorizontalLine.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/HorizontalLine.qml
deleted file mode 100644
index d046ee2e777..00000000000
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/HorizontalLine.qml
+++ /dev/null
@@ -1,9 +0,0 @@
-import Qt 4.6
-import Bauhaus 1.0
-
-    QLineEdit {
-    text:  "";
-    readOnly: true;
-    maximumHeight: 2;
-    styleSheet: "QLineEdit {border: 2px solid #3F3F3F;}";
-    }
\ No newline at end of file
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ListView.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ListView.qml
deleted file mode 100644
index 6a24c95bb25..00000000000
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ListView.qml
+++ /dev/null
@@ -1,85 +0,0 @@
-import Qt 4.6
-import Bauhaus 1.0
-
-PropertyFrame {
-    layout: QVBoxLayout {
-        topMargin: 0;
-        bottomMargin: 0;
-        leftMargin: 0;
-        rightMargin: 0;
-        spacing: 0;
-
-        Switches {
-        }
-
-        QScrollArea {
-            horizontalScrollBarPolicy: "Qt::ScrollBarAlwaysOff";
-            id: standardPane;
-            content: properyEditorStandard;
-            QFrame {
-                minimumHeight: 400;
-                id: properyEditorStandard
-                layout: QVBoxLayout {
-                    topMargin: 2;
-                    bottomMargin: 2;
-                    leftMargin: 2;
-                    rightMargin: 2;
-                    Type {
-                    }
-                    HorizontalLine {
-                    }
-
-                    Geometry {
-                    }
-
-                    Modifiers {
-
-                    }
-
-                    QScrollArea {
-                    }
-
-                    } // layout
-                    } //QWidget
-                    } //QScrollArea
-
-
-                    QScrollArea {
-                        horizontalScrollBarPolicy: "Qt::ScrollBarAlwaysOff";
-                        id: specialPane;
-                        visible: false;
-                        visible: false;
-                        content: properyEditorSpecial;
-                        QFrame {
-                            minimumHeight: 200;
-                            id: properyEditorSpecial
-                            layout: QVBoxLayout {
-                                topMargin: 2;
-                                bottomMargin: 2;
-                                leftMargin: 2;
-                                rightMargin: 2;
-                                Type {
-                                }
-
-                                QScrollArea {
-                                }
-                            }
-                        }
-                    }
-
-                    ExtendedPane {
-                        id: extendedPane;
-                    }
-
-                    LayoutPane {
-                        id: layoutPane;
-                    }
-
-
-                    ResetPane {
-                        id: resetPane;
-                    }
-
-
-    }
-}
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ListViewSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ListViewSpecifics.qml
index c0170e2fa23..b7d9fc7fc7e 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ListViewSpecifics.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ListViewSpecifics.qml
@@ -29,7 +29,7 @@ GroupBox {
                         rightMargin: 0;
                         QLabel {
                             minimumHeight: 22;
-                            text: "Highlight Follows:"
+                            text: "Highlight:"
                             font.bold: true;
                         }
 
@@ -50,7 +50,7 @@ GroupBox {
 
                         CheckBox {
                             id: highlightFollowsCurrentItemCheckBox;
-                            text: "";
+                            text: "Follows";
                             backendValue: backendValues.highlightFollowsCurrentItem;
                             baseStateFlag: isBaseState;
                             checkable: true;
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ResetPane.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ResetPane.qml
deleted file mode 100644
index 9fe4b63b52a..00000000000
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ResetPane.qml
+++ /dev/null
@@ -1,41 +0,0 @@
-import Qt 4.6
-import Bauhaus 1.0
-
-QScrollArea {
-    horizontalScrollBarPolicy: "Qt::ScrollBarAlwaysOff";
-    id: resetPane;
-    visible: false;
-    content: properyEditorReset;
-    QFrame {
-    //minimumHeight: 1800;
-    id: properyEditorReset
-    layout: QVBoxLayout {
-    topMargin: 2;
-    bottomMargin: 2;
-    leftMargin: 2;
-    rightMargin: 2;
-
-    Type {
-    }
-    ResetWidget {
-        id: resetWidget;
-        //minimumHeight: 2000;
-
-
-        height: 500;
-        width: 200;
-        backendObject: backendValues;
-
-        QLineEdit {
-            visible: false;
-            text: backendValues.id;
-            onTextChanged: {
-                resetWidget.resetView();
-            }
-        }
-    }
-
-
-    }
-    }
-}
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/WebViewSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/WebViewSpecifics.qml
index 581ef590448..438766610fb 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/WebViewSpecifics.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/WebViewSpecifics.qml
@@ -16,11 +16,9 @@ GroupBox {
                 Label {
                     text: "Url"
                 }
-                QLineEdit {
-                    text: backendValues.url.value;
-                    onEditingFinished: {
-                        backendValues.url.value = text;
-                    }
+                LineEdit {
+                    backendValue: backendValues.url
+                    baseStateFlag: isBaseState;
                 }
             }
         }
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/emptyPane.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/emptyPane.qml
index ea03d77caba..d39da68f864 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/emptyPane.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/emptyPane.qml
@@ -43,9 +43,5 @@ PropertyFrame {
                 }
             }
         }
-
-        HorizontalLine {
-        }
-
     }
 }