diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/AnchorBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/AnchorBox.qml index b892025617368ab2522e6f0127f32926d812fb83..e346ba58ad30684b623fa6f68105cbb50481cec0 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/AnchorBox.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/AnchorBox.qml @@ -1,4 +1,5 @@ import Qt 4.6 +import Bauhaus 1.0 QWidget { width:220;fixedWidth: width diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/CheckBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/CheckBox.qml index ff3c8e66e1b30e2971107e2b89c59f0a3607b97c..8f3babe1ba3e9eb6ae6221de212e047dfbf98c72 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/CheckBox.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/CheckBox.qml @@ -1,4 +1,5 @@ import Qt 4.6 +import Bauhaus 1.0 QCheckBox { //This is a special CheckBox that does color coding for states id: CheckBox; diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/Geometry.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/Geometry.qml index 6601b878de8434ec654f1040a2f9474354cb8a87..f22f07e4e9dba08e9a9458daa04675862bd00bce 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/Geometry.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/Geometry.qml @@ -1,4 +1,5 @@ import Qt 4.6 +import Bauhaus 1.0 GroupBox { finished: finishedNotify; diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/HorizontalLine.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/HorizontalLine.qml index b1f64185674bfaa3b9940f3d573215f6eb5ae8b9..d046ee2e777c9f9260949f8f555ebacbee580b9b 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/HorizontalLine.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/HorizontalLine.qml @@ -1,4 +1,5 @@ import Qt 4.6 +import Bauhaus 1.0 QLineEdit { text: ""; diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/HorizontalWhiteLine.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/HorizontalWhiteLine.qml index b8e1e31b87830fb2b1b7429a932a342ce5b87723..00e688380a5ca1b2fbef2f7216eef4ca23c346ce 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/HorizontalWhiteLine.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/HorizontalWhiteLine.qml @@ -1,4 +1,5 @@ import Qt 4.6 +import Bauhaus 1.0 QLineEdit { text: ""; diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/Layout.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/Layout.qml index c8c505f932e90ed406ac03ba798e8ae15d7b1772..3f5b7003b054c39303f997130cb30d75f8767c97 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/Layout.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/Layout.qml @@ -1,4 +1,5 @@ import Qt 4.6 +import Bauhaus 1.0 GroupBox { finished: finishedNotify; diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/Modifiers.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/Modifiers.qml index b46f8a4f9e659eeb5af60665d9008bfa7ea12507..11b87b545767133a708710df334f3e6abf25b9f7 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/Modifiers.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/Modifiers.qml @@ -1,4 +1,5 @@ import Qt 4.6 +import Bauhaus 1.0 GroupBox { finished: finishedNotify; diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/PropertyFrame.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/PropertyFrame.qml index 5356e4291ee3654ab15b8eab915587fce3890db3..220eed573cbaaf0c6166195e754278fb292492df 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/PropertyFrame.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/PropertyFrame.qml @@ -1,4 +1,5 @@ import Qt 4.6 +import Bauhaus 1.0 WidgetFrame { id: PropertyFrame; diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/Switches.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/Switches.qml index f054873146b405605bcb18b779965cbca84e441e..4a95ae0f96df5ed58af05ddb7ca285e904453f06 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/Switches.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/Switches.qml @@ -1,4 +1,5 @@ import Qt 4.6 +import Bauhaus 1.0 QFrame { styleSheetFile: "switch.css"; diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/Type.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/Type.qml index 4dfd15083dc5a1eef3dff63e752b68ed4b76cad6..594929424888a2cffe54de01dfc013cc7ba02ee2 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/Type.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/Type.qml @@ -1,4 +1,5 @@ import Qt 4.6 +import Bauhaus 1.0 GroupBox { id: Type; diff --git a/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp b/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp index 2768ccd1f7717867ed6f241a15bbdf386cc0b1c0..f720fc8278d6c14eeceec7160fe3b768e41036ef 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp @@ -1119,63 +1119,63 @@ public: {} }; -QML_DEFINE_EXTENDED_TYPE(Qt,4,6,QWidget,QWidget,QWidgetDeclarativeUI); +QML_DEFINE_EXTENDED_TYPE(Bauhaus,1,0,QWidget,QWidget,QWidgetDeclarativeUI); //display -QML_DEFINE_TYPE(Qt,4,6,QLabel,QLabel); -QML_DEFINE_TYPE(Qt,4,6,QProgressBar,QProgressBar); -QML_DEFINE_TYPE(Qt,4,6,QLCDNumber,QLCDNumber); +QML_DEFINE_TYPE(Bauhaus,1,0,QLabel,QLabel) +QML_DEFINE_TYPE(Bauhaus,1,0,QProgressBar,QProgressBar) +QML_DEFINE_TYPE(Bauhaus,1,0,QLCDNumber,QLCDNumber) //input -QML_DEFINE_TYPE(Qt,4,6,QLineEdit,QLineEdit); -QML_DEFINE_TYPE(Qt,4,6,QTextEdit,QTextEdit); -QML_DEFINE_TYPE(Qt,4,6,QPlainTextEdit,QPlainTextEdit); -QML_DEFINE_TYPE(Qt,4,6,QSpinBox,QSpinBox); -QML_DEFINE_TYPE(Qt,4,6,QDoubleSpinBox,QDoubleSpinBox); -QML_DEFINE_TYPE(Qt,4,6,QSlider,QSlider); -QML_DEFINE_TYPE(Qt,4,6,QDateTimeEdit,QDateTimeEdit); -QML_DEFINE_TYPE(Qt,4,6,QDateEdit,QDateEdit); -QML_DEFINE_TYPE(Qt,4,6,QTimeEdit,QTimeEdit); -QML_DEFINE_TYPE(Qt,4,6,QFontComboBox,QFontComboBox); -QML_DEFINE_TYPE(Qt,4,6,QDial,QDial); -QML_DEFINE_TYPE(Qt,4,6,QScrollBar,QScrollBar); -QML_DEFINE_TYPE(Qt,4,6,QCalendarWidget, QCalendarWidget); - - -QML_DECLARE_TYPE(MyGroupBox); -QML_DECLARE_TYPE(WidgetLoader); -QML_DECLARE_TYPE(WidgetFrame); -//QML_DEFINE_TYPE(Qt,4,6,QComboBox,QComboBox); //need a way to populate +QML_DEFINE_TYPE(Bauhaus,1,0,QLineEdit,QLineEdit) +QML_DEFINE_TYPE(Bauhaus,1,0,QTextEdit,QTextEdit) +QML_DEFINE_TYPE(Bauhaus,1,0,QPlainTextEdit,QPlainTextEdit) +QML_DEFINE_TYPE(Bauhaus,1,0,QSpinBox,QSpinBox) +QML_DEFINE_TYPE(Bauhaus,1,0,QDoubleSpinBox,QDoubleSpinBox) +QML_DEFINE_TYPE(Bauhaus,1,0,QSlider,QSlider) +QML_DEFINE_TYPE(Bauhaus,1,0,QDateTimeEdit,QDateTimeEdit) +QML_DEFINE_TYPE(Bauhaus,1,0,QDateEdit,QDateEdit) +QML_DEFINE_TYPE(Bauhaus,1,0,QTimeEdit,QTimeEdit) +QML_DEFINE_TYPE(Bauhaus,1,0,QFontComboBox,QFontComboBox) +QML_DEFINE_TYPE(Bauhaus,1,0,QDial,QDial) +QML_DEFINE_TYPE(Bauhaus,1,0,QScrollBar,QScrollBar) +QML_DEFINE_TYPE(Bauhaus,1,0,QCalendarWidget, QCalendarWidget) + + +QML_DECLARE_TYPE(MyGroupBox) +QML_DECLARE_TYPE(WidgetLoader) +QML_DECLARE_TYPE(WidgetFrame) +//QML_DEFINE_TYPE(Bauhaus,1,0,QComboBox,QComboBox); //need a way to populate //QML_DEFINE_EXTENDED_TYPE(QComboBox,QComboBox, QComboBox); //need a way to populate //buttons -//QML_DEFINE_TYPE(Qt,4,6,QPushButton,QPushButton); -QML_DEFINE_TYPE(Qt,4,6,QCheckBox,QCheckBox); -QML_DEFINE_TYPE(Qt,4,6,QAction,Action); -QML_DEFINE_TYPE(Qt,4,6,QRadioButton,QRadioButton); -QML_DEFINE_TYPE(Qt,4,6,FileWidget, FileWidget); -QML_DEFINE_TYPE(Qt,4,6,LayoutWidget, LayoutWidget); +//QML_DEFINE_TYPE(Bauhaus,1,0,QPushButton,QPushButton); +QML_DEFINE_TYPE(Bauhaus,1,0,QCheckBox,QCheckBox) +QML_DEFINE_TYPE(Bauhaus,1,0,QAction,Action) +QML_DEFINE_TYPE(Bauhaus,1,0,QRadioButton,QRadioButton) +QML_DEFINE_TYPE(Bauhaus,1,0,FileWidget, FileWidget) +QML_DEFINE_TYPE(Bauhaus,1,0,LayoutWidget, LayoutWidget) //containers -QML_DEFINE_TYPE(Qt,4,6,QFrame,QFrame); -QML_DEFINE_TYPE(Qt,4,6,WidgetFrame,WidgetFrame); -QML_DEFINE_TYPE(Qt,4,6,WidgetLoader,WidgetLoader); -QML_DEFINE_EXTENDED_TYPE(Qt,4,6,QExtGroupBox,MyGroupBox,QGroupBoxDeclarativeUI); -QML_DEFINE_EXTENDED_TYPE(Qt,4,6,QTabWidget,QTabWidget,QTabWidgetDeclarativeUI); -QML_DEFINE_EXTENDED_TYPE(Qt,4,6,QScrollArea,QScrollArea,QScrollAreaDeclarativeUI); -QML_DEFINE_EXTENDED_TYPE(Qt,4,6,QPushButton,QPushButton,QPushButtonDeclarativeUI); -QML_DEFINE_EXTENDED_TYPE(Qt,4,6,QToolButton,QToolButton, QToolButtonDeclarativeUI); -QML_DEFINE_EXTENDED_TYPE(Qt,4,6,QComboBox,QComboBox, QComboBoxDeclarativeUI); -QML_DEFINE_EXTENDED_TYPE(Qt,4,6,QMenu,QMenu, QMenuDeclarativeUI); -//QML_DEFINE_TYPE(Qt,4,6,QToolBox,QToolBox); -//QML_DEFINE_TYPE(Qt,4,6,QScrollArea,QScrollArea); - -//QML_DEFINE_EXTENDED_TYPE(QtColorButton,QtColorButton,QtColorButtonDeclarativeUI); +QML_DEFINE_TYPE(Bauhaus,1,0,QFrame,QFrame) +QML_DEFINE_TYPE(Bauhaus,1,0,WidgetFrame,WidgetFrame) +QML_DEFINE_TYPE(Bauhaus,1,0,WidgetLoader,WidgetLoader) +QML_DEFINE_EXTENDED_TYPE(Bauhaus,1,0,QExtGroupBox,MyGroupBox,QGroupBoxDeclarativeUI) +QML_DEFINE_EXTENDED_TYPE(Bauhaus,1,0,QTabWidget,QTabWidget,QTabWidgetDeclarativeUI) +QML_DEFINE_EXTENDED_TYPE(Bauhaus,1,0,QScrollArea,QScrollArea,QScrollAreaDeclarativeUI) +QML_DEFINE_EXTENDED_TYPE(Bauhaus,1,0,QPushButton,QPushButton,QPushButtonDeclarativeUI) +QML_DEFINE_EXTENDED_TYPE(Bauhaus,1,0,QToolButton,QToolButton, QToolButtonDeclarativeUI) +QML_DEFINE_EXTENDED_TYPE(Bauhaus,1,0,QComboBox,QComboBox, QComboBoxDeclarativeUI) +QML_DEFINE_EXTENDED_TYPE(Bauhaus,1,0,QMenu,QMenu, QMenuDeclarativeUI) +//QML_DEFINE_TYPE(Bauhaus,1,0,BauhausoolBox,BauhausoolBox); +//QML_DEFINE_TYPE(Bauhaus,1,0,QScrollArea,QScrollArea); + +//QML_DEFINE_EXTENDED_TYPE(BauhausColorButton,BauhausColorButton,BauhausColorButtonDeclarativeUI); //itemviews -//QML_DEFINE_TYPE(Qt,4,6,QListView,QListView); -//QML_DEFINE_TYPE(Qt,4,6,QTreeView,QTreeView); -//QML_DEFINE_TYPE(Qt,4,6,QTableView,QTableView); +//QML_DEFINE_TYPE(Bauhaus,1,0,QListView,QListView); +//QML_DEFINE_TYPE(Bauhaus,1,0,BauhausreeView,BauhausreeView); +//QML_DEFINE_TYPE(Bauhaus,1,0,BauhausableView,BauhausableView); #include "basicwidgets.moc"