QmlDesigner: updating plugins for meego and symbian

Update of the item library.

diff --git a/src/plugins/qmldesigner/meegoplugin/meego.metainfo b/src/plugins/qmldesigner/meegoplugin/meego.metainfo
index 222b4a8..59762e7 100644 (file)
--- a/src/plugins/qmldesigner/meegoplugin/meego.metainfo
+++ b/src/plugins/qmldesigner/meegoplugin/meego.metainfo
@@ -1,42 +1,117 @@
 <metainfo>
   <node name="Label" icon=":/meegoplugin/images/label16.png">
-    <itemlibraryentry name="Label"  category="Components MeeGo" libraryIcon=":/meegoplugin/images/label.png" requiredImport="com.meego">
+    <itemlibraryentry name="Label"  category="Components MeeGo" libraryIcon=":/meegoplugin/images/label.png" version="1.0" requiredImport="com.meego">
         <property name="text" type="QString" value="Label"/>
     </itemlibraryentry>
   </node>
+  <node name="BusyIndicator" icon=":/meegoplugin/images/button16.png">
+    <itemlibraryentry name="BusyIndicator" category="Components MeeGo" libraryIcon=":/meegoplugin/images/button.png" version="1.0" requiredImport="com.meego">
+      <property name="width" type="int" value="180"/>
+      <property name="height" type="int" value="30"/>
+      <property name="text" type="QString" value="CheckBox"/>
+    </itemlibraryentry>
+  </node>
   <node name="Button" icon=":/meegoplugin/images/button16.png">
-    <itemlibraryentry name="Button"  category="Components MeeGo" libraryIcon=":/meegoplugin/images/button.png" requiredImport="com.meego">
+    <itemlibraryentry name="Button"  category="Components MeeGo" libraryIcon=":/meegoplugin/images/button.png" version="1.0" requiredImport="com.meego">
+    </itemlibraryentry>
+  </node>
+  <node name="ToolButton" icon=":/meegoplugin/images/button16.png">
+    <itemlibraryentry name="ToolButton"  category="Components MeeGo" libraryIcon=":/meegoplugin/images/button.png" version="1.0" requiredImport="com.meego">
+    </itemlibraryentry>
+  </node>
+  <node name="TabButton" icon=":/meegoplugin/images/button16.png">
+    <itemlibraryentry name="TabButton"  category="Components MeeGo" libraryIcon=":/meegoplugin/images/button.png" version="1.0" requiredImport="com.meego">
+    </itemlibraryentry>
+  </node>
+  <node name="SheetButton" icon=":/meegoplugin/images/button16.png">
+    <itemlibraryentry name="SheetButton"  category="Components MeeGo" libraryIcon=":/meegoplugin/images/button.png" version="1.0" requiredImport="com.meego">
     </itemlibraryentry>
   </node>
   <node name="Slider" icon=":/meegoplugin/images/slider16.png">
-    <itemlibraryentry name="Slider"  category="Components MeeGo" libraryIcon=":/meegoplugin/images/slider.png" requiredImport="com.meego">
+    <itemlibraryentry name="Slider"  category="Components MeeGo" libraryIcon=":/meegoplugin/images/slider.png" version="1.0" requiredImport="com.meego">
     </itemlibraryentry>
   </node>
   <node name="CheckBox" icon=":/meegoplugin/images/checkbox16.png">
-    <itemlibraryentry name="CheckBox" category="Components MeeGo" libraryIcon=":/meegoplugin/images/checkbox.png" requiredImport="com.meego">
+    <itemlibraryentry name="CheckBox" category="Components MeeGo" libraryIcon=":/meegoplugin/images/checkbox.png" version="1.0" requiredImport="com.meego">
+    </itemlibraryentry>
+  </node>
+  <node name="RadioButton" icon=":/meegoplugin/images/checkbox16.png">
+    <itemlibraryentry name="RadioButton" category="Components MeeGo" libraryIcon=":/meegoplugin/images/checkbox.png" version="1.0" requiredImport="com.meego">
     </itemlibraryentry>
   </node>
   <node name="Spinner" icon=":/meegoplugin/images/item-icon16.png">
-    <itemlibraryentry name="Spinner"  category="Components MeeGo" libraryIcon=":/meegoplugin/images/item-icon.png" requiredImport="com.meego">
+    <itemlibraryentry name="Spinner"  category="Components MeeGo" libraryIcon=":/meegoplugin/images/item-icon.png" version="1.0" requiredImport="com.meego">
     </itemlibraryentry>
   </node>
   <node name="TextField" icon=":/meegoplugin/images/lineedit16.png">
-    <itemlibraryentry name="TextField"  category="Components MeeGo" libraryIcon=":/meegoplugin/images/lineedit.png" requiredImport="com.meego">
+    <itemlibraryentry name="TextField"  category="Components MeeGo" libraryIcon=":/meegoplugin/images/lineedit.png" version="1.0" requiredImport="com.meego">
+    </itemlibraryentry>
+  </node>
+  <node name="ProgressBar">
+    <itemlibraryentry name="ProgressBar"  category="Components MeeGo" version="1.0" requiredImport="com.meego">
     </itemlibraryentry>
   </node>
-  <node name="Fader">
-    <itemlibraryentry name="Fader"  category="Components MeeGo" requiredImport="com.meego">
+  <node name="Switch">
+    <itemlibraryentry name="Switch"  category="Components MeeGo" version="1.0" requiredImport="com.meego">
     </itemlibraryentry>
   </node>
-  <node name="IconButton">
-    <itemlibraryentry name="IconButton"  category="Components MeeGo" requiredImport="com.meego">
+  <node name="ToolItem">
+    <itemlibraryentry name="ToolItem"  category="Components MeeGo" version="1.0" requiredImport="com.meego">
     </itemlibraryentry>
   </node>
   <node name="TextArea">
-    <itemlibraryentry name="TextArea"  category="Components MeeGo" requiredImport="com.meego">
+    <itemlibraryentry name="TextArea"  category="Components MeeGo" version="1.0" requiredImport="com.meego">
       <property name="width" type="int" value="100"/>
       <property name="height" type="int" value="100"/>
       <property name="text" type="QString" value="TextArea"/>
     </itemlibraryentry>
   </node>
+  <node name="Window" icon=":/meegoplugin/images/window16.png">
+    <itemlibraryentry name="Window" category="Components MeeGo" libraryIcon=":/meegoplugin/images/window.png"  version="1.0" requiredImport="com.meego">
+      <property name="width" type="int" value="360"/>
+      <property name="height" type="int" value="640"/>
+    </itemlibraryentry>
+  </node>
+  <node name="Page" icon=":/meegoplugin/images/window16.png">
+    <itemlibraryentry name="Page" category="Components MeeGo" libraryIcon=":/meegoplugin/images/window.png"  version="1.0" requiredImport="com.meego">
+      <property name="width" type="int" value="360"/>
+      <property name="height" type="int" value="640"/>
+    </itemlibraryentry>
+  </node>
+  <node name="Sheet" icon=":/meegoplugin/images/window16.png">
+    <itemlibraryentry name="Sheet" category="Components MeeGo" libraryIcon=":/meegoplugin/images/window.png"  version="1.0" requiredImport="com.meego">
+      <property name="width" type="int" value="360"/>
+      <property name="height" type="int" value="640"/>
+    </itemlibraryentry>
+  </node>
+  <node name="ToolBar" icon=":/meegoplugin/images/window16.png">
+    <itemlibraryentry name="ToolBar" category="Components MeeGo" libraryIcon=":/meegoplugin/images/window.png"  version="1.0" requiredImport="com.meego">
+      <property name="width" type="int" value="360"/>
+      <property name="height" type="int" value="140"/>
+    </itemlibraryentry>
+  </node>
+  <node name="StatusBar" icon=":/meegoplugin/images/window16.png">
+    <itemlibraryentry name="StatusBar" category="Components MeeGo" libraryIcon=":/meegoplugin/images/window.png"  version="1.0" requiredImport="com.meego">
+      <property name="width" type="int" value="360"/>
+      <property name="height" type="int" value="140"/>
+    </itemlibraryentry>
+  </node>
+  <node name="ButtonColumn" icon=":/meegoplugin/images/window16.png">
+    <itemlibraryentry name="ButtonColumn" category="Components MeeGo" libraryIcon=":/meegoplugin/images/window.png"  version="1.0" requiredImport="com.meego">
+      <property name="width" type="int" value="100"/>
+      <property name="height" type="int" value="100"/>
+    </itemlibraryentry>
+  </node>
+  <node name="ButtonRow" icon=":/meegoplugin/images/window16.png">
+    <itemlibraryentry name=" ButtonRow" category="Components MeeGo" libraryIcon=":/meegoplugin/images/window.png"  version="1.0" requiredImport="com.meego">
+      <property name="width" type="int" value="100"/>
+      <property name="height" type="int" value="100"/>
+    </itemlibraryentry>
+  </node>
+  <node name="ToolButtonRow" icon=":/meegoplugin/images/window16.png">
+    <itemlibraryentry name=" ToolButtonRow" category="Components MeeGo" libraryIcon=":/meegoplugin/images/window.png"  version="1.0" requiredImport="com.meego">
+      <property name="width" type="int" value="100"/>
+      <property name="height" type="int" value="100"/>
+    </itemlibraryentry>
+  </node>
 </metainfo>

diff --git a/src/plugins/qmldesigner/meegoplugin/meegoplugin.qrc b/src/plugins/qmldesigner/meegoplugin/meegoplugin.qrc
index d46243e..c3c40d3 100644 (file)
--- a/src/plugins/qmldesigner/meegoplugin/meegoplugin.qrc
+++ b/src/plugins/qmldesigner/meegoplugin/meegoplugin.qrc
@@ -14,8 +14,10 @@
        <file>images/progressbar.png</file>
        <file>images/progressbar16.png</file>
        <file>images/radiobutton.png</file>
-       <file>images/radiobutton16.png</file>
-       <file>images/slider.png</file>
-       <file>images/slider16.png</file>     
+    <file>images/radiobutton16.png</file>
+    <file>images/slider.png</file>
+    <file>images/slider16.png</file>
+    <file>images/window.png</file>
+    <file>images/window16.png</file>
     </qresource>
 </RCC>

diff --git a/src/plugins/qmldesigner/symbianplugin/symbian.metainfo b/src/plugins/qmldesigner/symbianplugin/symbian.metainfo
index 935f2dc..859b051 100644 (file)
--- a/src/plugins/qmldesigner/symbianplugin/symbian.metainfo
+++ b/src/plugins/qmldesigner/symbianplugin/symbian.metainfo
@@ -6,6 +6,20 @@
       <property name="text" type="QString" value="Button"/>
     </itemlibraryentry>
   </node>
+  <node name="ToolButton" icon=":/symbianplugin/images/button16.png">
+    <itemlibraryentry name="ToolButton"  category="Components Symbian" libraryIcon=":/symbianplugin/images/button.png"  version="1.0" requiredImport="com.nokia.symbian">
+      <property name="width" type="int" value="100"/>
+      <property name="height" type="int" value="30"/>
+      <property name="text" type="QString" value="Button"/>
+    </itemlibraryentry>
+  </node>
+  <node name="TabButton" icon=":/symbianplugin/images/button16.png">
+    <itemlibraryentry name="TabButton"  category="Components Symbian" libraryIcon=":/symbianplugin/images/button.png"  version="1.0" requiredImport="com.nokia.symbian">
+      <property name="width" type="int" value="100"/>
+      <property name="height" type="int" value="30"/>
+      <property name="text" type="QString" value="Button"/>
+    </itemlibraryentry>
+  </node>
   <node name="CheckBox" icon=":/symbianplugin/images/checkbox16.png">
     <itemlibraryentry name="CheckBox" category="Components Symbian" libraryIcon=":/symbianplugin/images/checkbox.png"  version="1.0" requiredImport="com.nokia.symbian">
       <property name="width" type="int" value="180"/>
@@ -13,6 +27,13 @@
       <property name="text" type="QString" value="CheckBox"/>
     </itemlibraryentry>
   </node>
+  <node name="BusyIndicator" icon=":/symbianplugin/images/button16.png">
+    <itemlibraryentry name="BusyIndicator" category="Components Symbian" libraryIcon=":/symbianplugin/images/button.png"  version="1.0" requiredImport="com.nokia.symbian">
+      <property name="width" type="int" value="180"/>
+      <property name="height" type="int" value="30"/>
+      <property name="text" type="QString" value="CheckBox"/>
+    </itemlibraryentry>
+  </node>
   <node name="ChoiceList" icon=":/symbianplugin/images/choicelist16.png">
     <itemlibraryentry name="ChoiceList" category="Components Symbian" libraryIcon=":/symbianplugin/images/choicelist.png"  version="1.0" requiredImport="com.nokia.symbian">
       <property name="width" type="int" value="180"/>
@@ -40,6 +61,13 @@
       <property name="text" type="QString" value="TextArea"/>
     </itemlibraryentry>
   </node>
+  <node name="TextField" icon=":/symbianplugin/images/textarea16.png">
+    <itemlibraryentry name="TextField" category="Components Symbian" libraryIcon=":/symbianplugin/images/textarea.png"  version="1.0" requiredImport="com.nokia.symbian">
+      <property name="width" type="int" value="180"/>
+      <property name="height" type="int" value="30"/>
+      <property name="text" type="QString" value="TextArea"/>
+    </itemlibraryentry>
+  </node>
   <node name="Slider" icon=":/symbianplugin/images/slider16.png">
     <itemlibraryentry name="Slider" category="Components Symbian" libraryIcon=":/symbianplugin/images/slider.png"  version="1.0" requiredImport="com.nokia.symbian">
       <property name="width" type="int" value="180"/>
@@ -52,4 +80,46 @@
       <property name="height" type="int" value="640"/>
     </itemlibraryentry>
   </node>
+  <node name="Frame" icon=":/symbianplugin/images/window16.png">
+    <itemlibraryentry name="Frame" category="Components Symbian" libraryIcon=":/symbianplugin/images/window.png"  version="1.0" requiredImport="com.nokia.symbian">
+      <property name="width" type="int" value="360"/>
+      <property name="height" type="int" value="640"/>
+    </itemlibraryentry>
+  </node>
+  <node name="Page" icon=":/symbianplugin/images/window16.png">
+    <itemlibraryentry name="Page" category="Components Symbian" libraryIcon=":/symbianplugin/images/window.png"  version="1.0" requiredImport="com.nokia.symbian">
+      <property name="width" type="int" value="360"/>
+      <property name="height" type="int" value="640"/>
+    </itemlibraryentry>
+  </node>
+  <node name="TabBarLayout" icon=":/symbianponlugin/images/window16.png">
+    <itemlibraryentry name="TabBarLayout" category="Components Symbian" libraryIcon=":/symbianplugin/images/window.png"  version="1.0" requiredImport="com.nokia.symbian">
+      <property name="width" type="int" value="360"/>
+      <property name="height" type="int" value="40"/>
+    </itemlibraryentry>
+  </node>
+  <node name="TabGroup" icon=":/symbianponlugin/images/window16.png">
+    <itemlibraryentry name="TabGroup" category="Components Symbian" libraryIcon=":/symbianplugin/images/window.png"  version="1.0" requiredImport="com.nokia.symbian">
+      <property name="width" type="int" value="360"/>
+      <property name="height" type="int" value="40"/>
+    </itemlibraryentry>
+  </node>
+  <node name="ToolBar" icon=":/symbianponlugin/images/window16.png">
+    <itemlibraryentry name="ToolBar" category="Components Symbian" libraryIcon=":/symbianplugin/images/window.png"  version="1.0" requiredImport="com.nokia.symbian">
+      <property name="width" type="int" value="360"/>
+      <property name="height" type="int" value="40"/>
+    </itemlibraryentry>
+  </node>
+  <node name="TabBar" icon=":/symbianponlugin/images/window16.png">
+    <itemlibraryentry name="TabBar" category="Components Symbian" libraryIcon=":/symbianplugin/images/window.png"  version="1.0" requiredImport="com.nokia.symbian">
+      <property name="width" type="int" value="360"/>
+      <property name="height" type="int" value="40"/>
+    </itemlibraryentry>
+  </node>
+  <node name="Icon" icon=":/symbianponlugin/images/window16.png">
+    <itemlibraryentry name="Icon" category="Components Symbian" libraryIcon=":/symbianplugin/images/window.png"  version="1.0" requiredImport="com.nokia.symbian">
+      <property name="width" type="int" value="32"/>
+      <property name="height" type="int" value="32"/>
+    </itemlibraryentry>
+  </node>
 </metainfo>