X-Git-Url: http://git.maemo.org/git/?p=mdictionary;a=blobdiff_plain;f=www%2Fqmlelements.html;fp=www%2Fqmlelements.html;h=8afc38f0da810f3e26d0b0b513d4959c208e035b;hp=aa73b2c723fe26bd3b87bd98627962b14f4d9919;hb=9427983f428542e40d737a9f7f719809c229a83d;hpb=b598b5429912126f850c9990e60af8cdee8649ee

diff --git a/www/qmlelements.html b/www/qmlelements.html
index aa73b2c..8afc38f 100644
--- a/www/qmlelements.html
+++ b/www/qmlelements.html
@@ -31,7 +31,11 @@
 <div id="webContainer">
 	<div id="topBar">
 		<img src="images/mLogo_ie24.png" style="float:left;"></img>
+<<<<<<< HEAD
 	<div class="installs">
+=======
+<!--	<div class="installs">
+>>>>>>> 21a14d392f44458d749c76552e971f33625705ea
 		INSTALL:
 		<a href="files/mdictionary.install"
 		   class="install" style="margin-top:4px;"
@@ -47,7 +51,11 @@
 		</a>
 		<span style="clear:both;text-align:center;display:block;font-size:9px;"><a href="howto.html" style="font-size:9px;text-decoration:none;">(read How To... first)</a></span>
 	</div>
+<<<<<<< HEAD
 		<div style="display:block;height:100px;">
+=======
+-->		<div style="display:block;height:100px;">
+>>>>>>> 21a14d392f44458d749c76552e971f33625705ea
 			<p class="title">
 				mDictionary
 			</p>
@@ -141,7 +149,12 @@ When we created a graphic user interface we prepared a few basic components <br/
 			<div class="faq_switcher" onClick="javascript:faq_switcher(this);"></div>
 			Combobox
 			<div class="qml_answer">
+<<<<<<< HEAD
 				<p> text </p>
+=======
+				<p> ComboBox component allows to select one text item from the dropdown list, In the non-expanded state displays the currently selected item, when you expand it is possible to return without selecting a new element by clicking arrow at the component's right edge. You can use any set of text elements as a data model, as well as the change in size (it can be extended to the width). </p>
+				<img src="images/qml/cb01.png" ></img>
+>>>>>>> 21a14d392f44458d749c76552e971f33625705ea
 			</div>
 		</div>
 		<div class="faq_question">
@@ -189,7 +202,11 @@ When we created a graphic user interface we prepared a few basic components <br/
 			<div class="faq_switcher" onClick="javascript:faq_switcher(this);"></div>
 			WebView
 			<div class="qml_answer">
+<<<<<<< HEAD
 				<p> text </p>
+=======
+				<p> This component uses a WebView from QtQuick. It is responsible for displaying html pages formatted using CSS. It has a zoom option, available by two buttons at the bottom right corner. The screen is also movable, the user by touch is able to move screen in all directions </p>
+>>>>>>> 21a14d392f44458d749c76552e971f33625705ea
 				<img src="images/qml/wv01.png" width="460"></img>
 			</div>
 		</div>
@@ -213,6 +230,10 @@ When we created a graphic user interface we prepared a few basic components <br/
 				<img src="images/qml/w02.png"></img>
 				<img src="images/qml/w04.png"></img>
 				<img src="images/qml/w06.png"></img>
+<<<<<<< HEAD
+=======
+				<img src="images/qml/w07.png"></img>
+>>>>>>> 21a14d392f44458d749c76552e971f33625705ea
 				<img src="images/qml/widget01.png"></img>
 				<img src="images/qml/widget02.png" width="460"></img>
 			</div>