From: jakub <jakub.jaszczynski@comarch.com>
Date: Fri, 25 Feb 2011 08:39:59 +0000 (+0100)
Subject: Merge branch 'qml' of ssh://drop.maemo.org/git/mdictionary into qml
X-Git-Url: https://vcs.maemo.org/git/?p=mdictionary;a=commitdiff_plain;h=9427983f428542e40d737a9f7f719809c229a83d

Merge branch 'qml' of ssh://drop.maemo.org/git/mdictionary into qml

Conflicts:
	www/devhowto.html
	www/images/Meego.png
	www/images/qml/w07.png
	www/qmlelements.html
---

9427983f428542e40d737a9f7f719809c229a83d
diff --cc www/devhowto.html
index d078f5e,2626590..892afa3
--- a/www/devhowto.html
+++ b/www/devhowto.html
@@@ -31,22 -31,23 +31,23 @@@
  <div id="webContainer">
  	<div id="topBar">
  		<img src="images/mLogo_ie24.png" style="float:left;"></img>
- 	<div class="installs">
- 		INSTALL:
- 		<a href="files/mdictionary.install"
- 		   class="install" style="margin-top:4px;"
- 		   title="Click to install mDictionary on OS2006"><span>OS2006</span>
- 		</a>
- 		<a href="files/mdictionary.install"
- 		   class="install" style="clear:both; margin-top:4px;"
- 		   title="Click to install mDictionary on OS2007"><span style="letter-spacing:0px;">OS2007</span>
- 		</a>
- 		<a href="files/mdictionary2008.install"
- 		   class="install" style="clear:both; margin-top:4px;"
- 		   title="Click to install mDictionary on OS2008"><span style="letter-spacing:0px;">OS2008</span>
- 		</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>
 -	<!--	<div class="installs">
++<!--	<div class="installs">
+ 			INSTALL:
+ 			<a href="files/mdictionary.install"
+ 			   class="install" style="margin-top:4px;"
+ 			   title="Click to install mDictionary on OS2006"><span>OS2006</span>
+ 			</a>
+ 			<a href="files/mdictionary.install"
+ 			   class="install" style="clear:both; margin-top:4px;"
+ 			   title="Click to install mDictionary on OS2007"><span style="letter-spacing:0px;">OS2007</span>
+ 			</a>
+ 			<a href="files/mdictionary2008.install"
+ 			   class="install" style="clear:both; margin-top:4px;"
+ 			   title="Click to install mDictionary on OS2008"><span style="letter-spacing:0px;">OS2008</span>
+ 			</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>
+ -->		
  		<div style="display:block;height:100px;">
  			<p class="title">
  				mDictionary
@@@ -71,7 -72,15 +72,13 @@@
  		</div>
  	</div>
  	<div id="contentContainer">
- 		<h1>Developer's HOWTO:<br />making Your own GUI for mDictionary</h1>
 -
 -
+ 		<h1>Developer's HOWTO:<br />making Your own plugin</h1>
+ 			The manual is available <a href="files/doc-plugin.1.0.4.odt">here</a>
+ 
+ 		<h1>Developer's HOWTO:<br />making Your own GUI (new version of mDictionary)</h1>
+ 			The manual isn't available yet 
+ 		
+ 		<h1>Developer's HOWTO:<br />making Your own GUI for mDictionary (old versien of mDictionary)</h1>
  
  <p><b>mDictionary</b> is intended to be as modifiable as possible. So apart from developing Your own dictionary engines, You can also create alternative user interface, should You find ours inattractive. For the intrepid ones, I have described how to do that. In this howto, I am going to explain how to communicate GUI with the engines's manager</p>
  
@@@ -80,7 -89,7 +87,6 @@@
  	
  <div class="code">dbus_data = ws_dbus_create ("mDictionaryGui", "v1.0");</div>
  <p>
--Then You configure the remote and local addresses, by using <span class="code">ws_dbus_config</span>. The settings should be the same as in the example, below:
  
  </p>
  <div class="code">ws_dbus_config( dbus_data,
diff --cc www/qmlelements.html
index aa73b2c,8969b14..8afc38f
--- a/www/qmlelements.html
+++ b/www/qmlelements.html
@@@ -31,7 -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 -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 -141,8 +149,12 @@@ When we created a graphic user interfac
  			<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 -190,7 +202,11 @@@
  			<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 -214,7 +230,10 @@@
  				<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>