I've added the init file (a bunch of SQL command to create DB, and

populate, if you want)

diff --git a/diary-mobile_en_EN.ts b/diary-mobile_en_EN.ts
index d2b3237d08e8306e72370e88cad1f45e601ef9f0..f4618894b770dadf9630d068265c7b02beea198d 100644 (file)
--- a/diary-mobile_en_EN.ts
+++ b/diary-mobile_en_EN.ts
@@ -4,513 +4,513 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="mainwindow.cpp" line="68"/>
+        <location filename="mainwindow.cpp" line="69"/>
         <source>first button file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="68"/>
-        <source>Enter the URL to download the first buttons file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="239"/>
-        <location filename="mainwindow.cpp" line="242"/>
+        <location filename="mainwindow.cpp" line="245"/>
+        <location filename="mainwindow.cpp" line="248"/>
         <source>get file</source>
         <comment>title to ask file</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="251"/>
+        <location filename="mainwindow.cpp" line="257"/>
         <source>box</source>
         <comment>box title to show a text</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="266"/>
+        <location filename="mainwindow.cpp" line="272"/>
         <source>set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="277"/>
+        <location filename="mainwindow.cpp" line="283"/>
         <source>Enter ID of button to edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="350"/>
+        <location filename="mainwindow.cpp" line="366"/>
         <source>Ctrl+S</source>
         <comment>File|Start</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="351"/>
+        <location filename="mainwindow.cpp" line="367"/>
         <source>Ctrl+B</source>
         <comment>File|Back</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="353"/>
+        <location filename="mainwindow.cpp" line="369"/>
         <source>Ctrl+L</source>
         <comment>File|Upload</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="355"/>
+        <location filename="mainwindow.cpp" line="371"/>
         <source>Ctrl+Q</source>
         <comment>File|Quit</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="359"/>
-        <source>Ctrl+D</source>
-        <comment>Buttons|Add</comment>
+        <location filename="mainwindow.cpp" line="548"/>
+        <source>New entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="383"/>
+        <source>ctrl+H</source>
+        <comment>Help|About Qt</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="368"/>
+        <source>&amp;View/Hide menu</source>
+        <comment>File|View/Hide menu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="373"/>
+        <source>&amp;Data</source>
+        <comment>top menu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="374"/>
+        <source>&amp;Download</source>
+        <comment>Data|Downlad</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="359"/>
+        <location filename="mainwindow.cpp" line="374"/>
+        <source>Ctrl+W</source>
+        <comment>Data|Downlad</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="375"/>
         <source>A&amp;dd</source>
-        <comment>Buttons|Add</comment>
+        <comment>Data|Add</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="360"/>
-        <source>Ctrl+V</source>
-        <comment>Buttons|Save</comment>
+        <location filename="mainwindow.cpp" line="375"/>
+        <source>Ctrl+D</source>
+        <comment>Data|Add</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="360"/>
+        <location filename="mainwindow.cpp" line="376"/>
         <source>Sa&amp;v</source>
-        <comment>Buttons|Sav</comment>
+        <comment>Data|Sav</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="376"/>
+        <source>Ctrl+V</source>
+        <comment>Data|Save</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="361"/>
+        <location filename="mainwindow.cpp" line="377"/>
         <source>Reset</source>
-        <comment>Buttons|Reset</comment>
+        <comment>Data|Reset</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="362"/>
-        <source>Ctrl+E</source>
-        <comment>Buttons|&amp;Edit</comment>
+        <location filename="mainwindow.cpp" line="377"/>
+        <source>Ctrl+Z</source>
+        <comment>Data|Reset</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="513"/>
-        <source>New entry</source>
+        <location filename="mainwindow.cpp" line="378"/>
+        <source>&amp;Edit</source>
+        <comment>Data|Edit</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="367"/>
-        <source>ctrl+H</source>
-        <comment>Help|About Qt</comment>
+        <location filename="mainwindow.cpp" line="378"/>
+        <source>Ctrl+E</source>
+        <comment>Data|&amp;Edit</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="368"/>
+        <location filename="mainwindow.cpp" line="384"/>
         <source>Ctrl+R</source>
         <comment>Help|CreateDB</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="368"/>
+        <location filename="mainwindow.cpp" line="384"/>
         <source>C&amp;reate Database</source>
         <comment>Hack|Create</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="369"/>
+        <location filename="mainwindow.cpp" line="385"/>
         <source>Download sql</source>
         <comment>Hack|download sql</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="535"/>
+        <location filename="mainwindow.cpp" line="570"/>
         <source>label</source>
         <comment>Title of box where ask for new button&apos;s label</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="535"/>
+        <location filename="mainwindow.cpp" line="570"/>
         <source>Enter his label</source>
         <comment>his/her/?they? I&apos;ve forget my school lesson</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="537"/>
+        <location filename="mainwindow.cpp" line="572"/>
         <source>keyword</source>
         <comment>Title of box where ask for new button&apos;s keyword</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="537"/>
+        <location filename="mainwindow.cpp" line="572"/>
         <source>Enter they keyword (no limit !)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="539"/>
+        <location filename="mainwindow.cpp" line="574"/>
         <source>action</source>
         <comment>Title of box where ask for new button&apos;s action</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="539"/>
+        <location filename="mainwindow.cpp" line="574"/>
         <source>Enter his action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="352"/>
+        <location filename="mainwindow.cpp" line="368"/>
         <source>Ctrl+T</source>
         <comment>File|View menu</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="170"/>
+        <location filename="mainwindow.cpp" line="69"/>
+        <source>Enter the URL to download the init file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="171"/>
         <source>Variable&apos;s name ?</source>
         <comment>text to ask value&apos;s name before changing it (set)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="182"/>
-        <location filename="mainwindow.cpp" line="206"/>
+        <location filename="mainwindow.cpp" line="183"/>
+        <location filename="mainwindow.cpp" line="207"/>
         <source>Error</source>
         <comment>title if action(&quot;set&quot;) has too much value</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="182"/>
-        <location filename="mainwindow.cpp" line="206"/>
+        <location filename="mainwindow.cpp" line="183"/>
+        <location filename="mainwindow.cpp" line="207"/>
         <source>Too much value in button&apos;s action</source>
         <comment>text if action(&quot;set&quot;) has too much value</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="186"/>
+        <location filename="mainwindow.cpp" line="187"/>
         <source>variable text change</source>
         <comment>title to warn about variable content change</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="186"/>
-        <location filename="mainwindow.cpp" line="247"/>
+        <location filename="mainwindow.cpp" line="187"/>
+        <location filename="mainwindow.cpp" line="253"/>
         <source>value of </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="194"/>
-        <location filename="mainwindow.cpp" line="237"/>
+        <location filename="mainwindow.cpp" line="195"/>
+        <location filename="mainwindow.cpp" line="243"/>
         <source>Variable&apos;s name ?</source>
         <comment>text to ask value&apos;s name before changing it (setint)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="210"/>
+        <location filename="mainwindow.cpp" line="211"/>
         <source>variable integer change</source>
         <comment>title to warn about variable content change</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="210"/>
+        <location filename="mainwindow.cpp" line="211"/>
         <source>Value of </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="221"/>
+        <location filename="mainwindow.cpp" line="222"/>
         <source>choice</source>
         <comment>title of box who ask multiple choice</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="221"/>
+        <location filename="mainwindow.cpp" line="222"/>
         <source>Please choose an action.</source>
         <comment>text to ask multiple choice</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="247"/>
+        <location filename="mainwindow.cpp" line="253"/>
         <source>variable file change</source>
         <comment>title to warn about variable content change</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="284"/>
+        <location filename="mainwindow.cpp" line="290"/>
         <source>Error</source>
         <comment>title if action(&quot;edit&quot;) has too much value</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="284"/>
+        <location filename="mainwindow.cpp" line="290"/>
         <source>Too much value in button&apos;s action</source>
         <comment>text if action(&quot;edit&quot;) has too much value</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="299"/>
+        <location filename="mainwindow.cpp" line="305"/>
         <source>URL</source>
         <comment>title to download a custom file from URL</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="299"/>
+        <location filename="mainwindow.cpp" line="305"/>
         <source>Enter the URL of the file</source>
         <comment>label to download a custom file</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="301"/>
-        <location filename="mainwindow.cpp" line="305"/>
+        <location filename="mainwindow.cpp" line="307"/>
+        <location filename="mainwindow.cpp" line="311"/>
         <source>File</source>
         <comment>title to write a file downloaded from URL</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="301"/>
-        <location filename="mainwindow.cpp" line="305"/>
+        <location filename="mainwindow.cpp" line="307"/>
+        <location filename="mainwindow.cpp" line="311"/>
         <source>Enter the name of the file</source>
         <comment>label to write the downloaded data</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="340"/>
+        <location filename="mainwindow.cpp" line="350"/>
         <source>Error</source>
         <comment>title of box if action(&quot;read&quot; has too much (or too &quot;less&quot;) value</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="340"/>
+        <location filename="mainwindow.cpp" line="350"/>
         <source>Bad number of value</source>
         <comment>text of box if action(&quot;read&quot;) has too much (or too &quot;less&quot;) value</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="349"/>
+        <location filename="mainwindow.cpp" line="365"/>
         <source>&amp;File</source>
         <comment>top menu</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="350"/>
+        <location filename="mainwindow.cpp" line="366"/>
         <source>&amp;Start</source>
         <comment>File|Start</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="351"/>
+        <location filename="mainwindow.cpp" line="367"/>
         <source>&amp;Back</source>
         <comment>File|Back</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="352"/>
-        <source>&amp;View/Hide menu</source>
-        <comment>File|View/Hide</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="353"/>
+        <location filename="mainwindow.cpp" line="369"/>
         <source>sendRAW</source>
         <comment>File|SendRAW</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="354"/>
+        <location filename="mainwindow.cpp" line="370"/>
         <source>Reset RAW</source>
         <comment>File|resetRAW</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="354"/>
+        <location filename="mainwindow.cpp" line="370"/>
         <source>Ctrl+E</source>
         <comment>File|Reset</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="355"/>
+        <location filename="mainwindow.cpp" line="371"/>
         <source>&amp;Quit</source>
         <comment>File|Quit</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="357"/>
-        <source>&amp;Buttons</source>
-        <comment>top menu</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="358"/>
-        <source>&amp;Download</source>
-        <comment>Buttons|Downlad</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="362"/>
-        <source>&amp;Edit</source>
-        <comment>Buttons|Edit</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="364"/>
+        <location filename="mainwindow.cpp" line="380"/>
         <source>&amp;Hack</source>
         <comment>top menu</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="365"/>
+        <location filename="mainwindow.cpp" line="381"/>
         <source>New entry</source>
         <comment>Hack|Entry</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="366"/>
+        <location filename="mainwindow.cpp" line="382"/>
         <source>Action</source>
         <comment>Hack|Action</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="367"/>
+        <location filename="mainwindow.cpp" line="383"/>
         <source>About Qt</source>
         <comment>Hack|About Qt</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="899"/>
+        <location filename="mainwindow.cpp" line="779"/>
+        <source>upload</source>
+        <comment>pop-up title when data has been sent</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="946"/>
         <source>tmp URL</source>
         <comment>Title of box where ask for button file&apos;s URL</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="899"/>
+        <location filename="mainwindow.cpp" line="946"/>
         <source>Enter URL</source>
         <comment>Label of box where ask for button file&apos;s URL</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="936"/>
+        <location filename="mainwindow.cpp" line="957"/>
         <source>action</source>
         <comment>Title of box where ask for a custom action</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="936"/>
+        <location filename="mainwindow.cpp" line="957"/>
         <source>Enter your action</source>
         <comment>Label of box where ask for custom action</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="358"/>
-        <source>Ctrl+W</source>
-        <comment>Buttons|Downlad</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="361"/>
-        <source>Ctrl+Z</source>
-        <comment>Buttons|Reset</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="576"/>
-        <source>chooseButtonDB</source>
+        <location filename="mainwindow.cpp" line="611"/>
+        <source>Enter the keyword : </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="576"/>
-        <source>Enter the keyword : </source>
+        <location filename="mainwindow.cpp" line="611"/>
+        <source>chooseDB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="597"/>
+        <location filename="mainwindow.cpp" line="642"/>
         <source>keyword</source>
         <comment>Title of box where ask for button&apos;s keyword</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="597"/>
+        <location filename="mainwindow.cpp" line="642"/>
         <source>new keyword</source>
         <comment>question to get new button&apos;s keyword</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="599"/>
+        <location filename="mainwindow.cpp" line="644"/>
         <source>label</source>
         <comment>Title of box where ask for button&apos;s label</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="599"/>
+        <location filename="mainwindow.cpp" line="644"/>
         <source>new label</source>
         <comment>question to get new button&apos;s label</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="601"/>
+        <location filename="mainwindow.cpp" line="646"/>
         <source>action</source>
         <comment>Title of box where ask for button&apos;s action</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="601"/>
+        <location filename="mainwindow.cpp" line="646"/>
         <source>new action</source>
         <comment>question to get new button&apos;s action</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="646"/>
+        <location filename="mainwindow.cpp" line="691"/>
         <source>RAWsent</source>
         <comment>message title when data has been send</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="646"/>
+        <location filename="mainwindow.cpp" line="691"/>
         <source>sendRAW finish</source>
         <comment>message text when data has been send</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="729"/>
+        <location filename="mainwindow.cpp" line="775"/>
         <source>Upload finish : </source>
         <comment>pop-up when data has been sent</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="733"/>
-        <source>uploadDB</source>
-        <comment>pop-up title when data has been sent</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="790"/>
+        <location filename="mainwindow.cpp" line="834"/>
         <source>Uisent</source>
         <comment>pop-up title when buttons has been sent</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="790"/>
+        <location filename="mainwindow.cpp" line="834"/>
         <source>savbuttons finish</source>
         <comment>pop-up text when buttons has been sent</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="796"/>
+        <location filename="mainwindow.cpp" line="840"/>
         <source>Enter the keyword : </source>
         <comment>ask keyword to get buttons</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="796"/>
+        <location filename="mainwindow.cpp" line="840"/>
         <source>getButtons</source>
         <comment>title to ask keyword fot getbuttons</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="853"/>
+        <location filename="mainwindow.cpp" line="899"/>
         <source>writeFile</source>
         <comment>pop-up title when file has been written</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="853"/>
+        <location filename="mainwindow.cpp" line="899"/>
         <source>File written : </source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/diary-mobile_fr_FR.ts b/diary-mobile_fr_FR.ts
index 796f33c413b08e8b5f47a8889fd5630899d44e1a..9c46d5a8a5bd7ccafd6e31e6c070e045a637fbc9 100644 (file)
--- a/diary-mobile_fr_FR.ts
+++ b/diary-mobile_fr_FR.ts
@@ -4,14 +4,13 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="mainwindow.cpp" line="68"/>
+        <location filename="mainwindow.cpp" line="69"/>
         <source>first button file</source>
         <translation>Premier fichier de bouton</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="68"/>
         <source>Enter the URL to download the first buttons file</source>
-        <translation>Entrez l&apos;URL pour télécharger vos boutons</translation>
+        <translation type="obsolete">Entrez l&apos;URL pour télécharger vos boutons</translation>
     </message>
     <message>
         <source>choice</source>
@@ -22,25 +21,25 @@
         <translation type="obsolete">choisissez une action</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="239"/>
-        <location filename="mainwindow.cpp" line="242"/>
+        <location filename="mainwindow.cpp" line="245"/>
+        <location filename="mainwindow.cpp" line="248"/>
         <source>get file</source>
         <comment>title to ask file</comment>
         <translation>choisissez un fichier</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="251"/>
+        <location filename="mainwindow.cpp" line="257"/>
         <source>box</source>
         <comment>box title to show a text</comment>
         <translation>info</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="266"/>
+        <location filename="mainwindow.cpp" line="272"/>
         <source>set</source>
         <translation>définir</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="277"/>
+        <location filename="mainwindow.cpp" line="283"/>
         <source>Enter ID of button to edit</source>
         <translation>Entrez l&apos;ID du bouton à éditer</translation>
     </message>
@@ -53,7 +52,7 @@
         <translation type="obsolete">&amp;Départ</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="350"/>
+        <location filename="mainwindow.cpp" line="366"/>
         <source>Ctrl+S</source>
         <comment>File|Start</comment>
         <translation>Ctrl+D</translation>
@@ -63,59 +62,56 @@
         <translation type="obsolete">&amp;Retour</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="351"/>
+        <location filename="mainwindow.cpp" line="367"/>
         <source>Ctrl+B</source>
         <comment>File|Back</comment>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="352"/>
         <source>&amp;View/Hide menu</source>
         <comment>File|View/Hide</comment>
-        <translation>Voir/Cacher le menu</translation>
+        <translation type="obsolete">Voir/Cacher le menu</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="353"/>
+        <location filename="mainwindow.cpp" line="369"/>
         <source>sendRAW</source>
         <comment>File|SendRAW</comment>
         <translation>Envoyer les données</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="354"/>
+        <location filename="mainwindow.cpp" line="370"/>
         <source>Reset RAW</source>
         <comment>File|resetRAW</comment>
         <translation>Réinitialiser les donnés</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="354"/>
+        <location filename="mainwindow.cpp" line="370"/>
         <source>Ctrl+E</source>
         <comment>File|Reset</comment>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="355"/>
+        <location filename="mainwindow.cpp" line="371"/>
         <source>&amp;Quit</source>
         <comment>File|Quit</comment>
         <translation>&amp;Quitter</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="357"/>
         <source>&amp;Buttons</source>
         <comment>top menu</comment>
-        <translation>Boutons</translation>
+        <translation type="obsolete">Boutons</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="358"/>
         <source>Ctrl+W</source>
         <comment>Buttons|Downlad</comment>
-        <translation>Ctrl+D</translation>
+        <translation type="obsolete">Ctrl+D</translation>
     </message>
     <message>
         <source>sendRAW</source>
         <translation type="obsolete">Envoyer les données</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="353"/>
+        <location filename="mainwindow.cpp" line="369"/>
         <source>Ctrl+L</source>
         <comment>File|Upload</comment>
         <translation>Ctrl+L</translation>
@@ -135,7 +131,7 @@
         <translation type="obsolete">&amp;Quitter</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="355"/>
+        <location filename="mainwindow.cpp" line="371"/>
         <source>Ctrl+Q</source>
         <comment>File|Quit</comment>
         <translation>Ctrl+Q</translation>
@@ -149,251 +145,326 @@
         <translation type="obsolete">A&amp;jouter un boutons</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="359"/>
         <source>Ctrl+D</source>
         <comment>Buttons|Add</comment>
-        <translation>Ctrl+D</translation>
+        <translation type="obsolete">Ctrl+D</translation>
     </message>
     <message>
         <source>Sa&amp;v buttons</source>
         <translation type="obsolete">Sauvegardez les boutons</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="360"/>
         <source>Ctrl+V</source>
         <comment>Buttons|Save</comment>
-        <translation>Ctrl+V</translation>
+        <translation type="obsolete">Ctrl+V</translation>
     </message>
     <message>
         <source>&amp;Edit buttons</source>
         <translation type="obsolete">&amp;Editer les boutons</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="362"/>
         <source>Ctrl+E</source>
         <comment>Buttons|&amp;Edit</comment>
-        <translation>Ctrl+E</translation>
+        <translation type="obsolete">Ctrl+E</translation>
     </message>
     <message>
         <source>&amp;View/Hide menu</source>
         <translation type="obsolete">Voir/Cacher le menu</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="170"/>
+        <location filename="mainwindow.cpp" line="69"/>
+        <source>Enter the URL to download the init file</source>
+        <translation>Entrez l&apos;URL pour téléchargez le fichier d&apos;initialisation</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="171"/>
         <source>Variable&apos;s name ?</source>
         <comment>text to ask value&apos;s name before changing it (set)</comment>
         <translation>Nom de la variable</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="182"/>
-        <location filename="mainwindow.cpp" line="206"/>
+        <location filename="mainwindow.cpp" line="183"/>
+        <location filename="mainwindow.cpp" line="207"/>
         <source>Error</source>
         <comment>title if action(&quot;set&quot;) has too much value</comment>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="182"/>
-        <location filename="mainwindow.cpp" line="206"/>
+        <location filename="mainwindow.cpp" line="183"/>
+        <location filename="mainwindow.cpp" line="207"/>
         <source>Too much value in button&apos;s action</source>
         <comment>text if action(&quot;set&quot;) has too much value</comment>
         <translation>Trop de mots dans l&apos;action du bouton</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="186"/>
+        <location filename="mainwindow.cpp" line="187"/>
         <source>variable text change</source>
         <comment>title to warn about variable content change</comment>
         <translation>changement du contenu de la variable</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="186"/>
-        <location filename="mainwindow.cpp" line="247"/>
+        <location filename="mainwindow.cpp" line="187"/>
+        <location filename="mainwindow.cpp" line="253"/>
         <source>value of </source>
         <translation>Valeur de </translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="194"/>
-        <location filename="mainwindow.cpp" line="237"/>
+        <location filename="mainwindow.cpp" line="195"/>
+        <location filename="mainwindow.cpp" line="243"/>
         <source>Variable&apos;s name ?</source>
         <comment>text to ask value&apos;s name before changing it (setint)</comment>
         <translation>Nom de la variable ?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="210"/>
+        <location filename="mainwindow.cpp" line="211"/>
         <source>variable integer change</source>
         <comment>title to warn about variable content change</comment>
         <translation>changement de valeur</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="210"/>
+        <location filename="mainwindow.cpp" line="211"/>
         <source>Value of </source>
         <translation>Valeur de </translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="221"/>
+        <location filename="mainwindow.cpp" line="222"/>
         <source>choice</source>
         <comment>title of box who ask multiple choice</comment>
         <translation>Choix</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="221"/>
+        <location filename="mainwindow.cpp" line="222"/>
         <source>Please choose an action.</source>
         <comment>text to ask multiple choice</comment>
         <translation>Choisissez une action</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="247"/>
+        <location filename="mainwindow.cpp" line="253"/>
         <source>variable file change</source>
         <comment>title to warn about variable content change</comment>
         <translation>changement de valeur</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="284"/>
+        <location filename="mainwindow.cpp" line="290"/>
         <source>Error</source>
         <comment>title if action(&quot;edit&quot;) has too much value</comment>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="284"/>
+        <location filename="mainwindow.cpp" line="290"/>
         <source>Too much value in button&apos;s action</source>
         <comment>text if action(&quot;edit&quot;) has too much value</comment>
         <translation>Trop de mots dans l&apos;action du bouton</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="299"/>
+        <location filename="mainwindow.cpp" line="305"/>
         <source>URL</source>
         <comment>title to download a custom file from URL</comment>
         <translation>Source</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="299"/>
+        <location filename="mainwindow.cpp" line="305"/>
         <source>Enter the URL of the file</source>
         <comment>label to download a custom file</comment>
         <translation>Entrez l&apos;URL des données</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="301"/>
-        <location filename="mainwindow.cpp" line="305"/>
+        <location filename="mainwindow.cpp" line="307"/>
+        <location filename="mainwindow.cpp" line="311"/>
         <source>File</source>
         <comment>title to write a file downloaded from URL</comment>
         <translation>Fichier</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="301"/>
-        <location filename="mainwindow.cpp" line="305"/>
+        <location filename="mainwindow.cpp" line="307"/>
+        <location filename="mainwindow.cpp" line="311"/>
         <source>Enter the name of the file</source>
         <comment>label to write the downloaded data</comment>
         <translation>Entrez le nom du fichier</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="340"/>
+        <location filename="mainwindow.cpp" line="350"/>
         <source>Error</source>
         <comment>title of box if action(&quot;read&quot; has too much (or too &quot;less&quot;) value</comment>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="340"/>
+        <location filename="mainwindow.cpp" line="350"/>
         <source>Bad number of value</source>
         <comment>text of box if action(&quot;read&quot;) has too much (or too &quot;less&quot;) value</comment>
         <translation>Mauvais &quot;nombre&quot; de mot</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="349"/>
+        <location filename="mainwindow.cpp" line="365"/>
         <source>&amp;File</source>
         <comment>top menu</comment>
         <translation>&amp;Fichier</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="350"/>
+        <location filename="mainwindow.cpp" line="366"/>
         <source>&amp;Start</source>
         <comment>File|Start</comment>
         <translation>&amp;Départ</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="351"/>
+        <location filename="mainwindow.cpp" line="367"/>
         <source>&amp;Back</source>
         <comment>File|Back</comment>
         <translation>&amp;Retour</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="352"/>
+        <location filename="mainwindow.cpp" line="368"/>
         <source>Ctrl+T</source>
         <comment>File|View menu</comment>
         <translation>Ctrl+M</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="358"/>
+        <location filename="mainwindow.cpp" line="368"/>
+        <source>&amp;View/Hide menu</source>
+        <comment>File|View/Hide menu</comment>
+        <translation>Voir/Cacher le menu</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="373"/>
+        <source>&amp;Data</source>
+        <comment>top menu</comment>
+        <translation>Données</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="374"/>
         <source>&amp;Download</source>
-        <comment>Buttons|Downlad</comment>
+        <comment>Data|Downlad</comment>
         <translation>&amp;Téléchargement</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="359"/>
+        <location filename="mainwindow.cpp" line="374"/>
+        <source>Ctrl+W</source>
+        <comment>Data|Downlad</comment>
+        <translation>Ctrl+T</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="375"/>
         <source>A&amp;dd</source>
-        <comment>Buttons|Add</comment>
+        <comment>Data|Add</comment>
         <translation>Nouveau</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="360"/>
+        <location filename="mainwindow.cpp" line="375"/>
+        <source>Ctrl+D</source>
+        <comment>Data|Add</comment>
+        <translation>Nouveau</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="376"/>
         <source>Sa&amp;v</source>
-        <comment>Buttons|Sav</comment>
+        <comment>Data|Sav</comment>
         <translation>Sauvegardez</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="361"/>
+        <location filename="mainwindow.cpp" line="376"/>
+        <source>Ctrl+V</source>
+        <comment>Data|Save</comment>
+        <translation>Ctrl+V</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="377"/>
         <source>Reset</source>
-        <comment>Buttons|Reset</comment>
+        <comment>Data|Reset</comment>
         <translation>Remise à zéro</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="362"/>
+        <location filename="mainwindow.cpp" line="377"/>
+        <source>Ctrl+Z</source>
+        <comment>Data|Reset</comment>
+        <translation>Ctrl+Z</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="378"/>
+        <source>&amp;Edit</source>
+        <comment>Data|Edit</comment>
+        <translation>Edition</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="378"/>
+        <source>Ctrl+E</source>
+        <comment>Data|&amp;Edit</comment>
+        <translation>Ctrl+E</translation>
+    </message>
+    <message>
+        <source>&amp;Download</source>
+        <comment>Buttons|Downlad</comment>
+        <translation type="obsolete">&amp;Téléchargement</translation>
+    </message>
+    <message>
+        <source>A&amp;dd</source>
+        <comment>Buttons|Add</comment>
+        <translation type="obsolete">Nouveau</translation>
+    </message>
+    <message>
+        <source>Sa&amp;v</source>
+        <comment>Buttons|Sav</comment>
+        <translation type="obsolete">Sauvegardez</translation>
+    </message>
+    <message>
+        <source>Reset</source>
+        <comment>Buttons|Reset</comment>
+        <translation type="obsolete">Remise à zéro</translation>
+    </message>
+    <message>
         <source>&amp;Edit</source>
         <comment>Buttons|Edit</comment>
-        <translation>Editer</translation>
+        <translation type="obsolete">Editer</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="364"/>
+        <location filename="mainwindow.cpp" line="380"/>
         <source>&amp;Hack</source>
         <comment>top menu</comment>
         <translation>&amp;Hack</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="365"/>
+        <location filename="mainwindow.cpp" line="381"/>
         <source>New entry</source>
         <comment>Hack|Entry</comment>
         <translation>Nouvelle entrée</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="366"/>
+        <location filename="mainwindow.cpp" line="382"/>
         <source>Action</source>
         <comment>Hack|Action</comment>
         <translation>Action</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="367"/>
+        <location filename="mainwindow.cpp" line="383"/>
         <source>About Qt</source>
         <comment>Hack|About Qt</comment>
         <translation>A propos de Qt</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="899"/>
+        <location filename="mainwindow.cpp" line="779"/>
+        <source>upload</source>
+        <comment>pop-up title when data has been sent</comment>
+        <translation>Envoie</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="946"/>
         <source>tmp URL</source>
         <comment>Title of box where ask for button file&apos;s URL</comment>
         <translation>URL temporaire</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="899"/>
+        <location filename="mainwindow.cpp" line="946"/>
         <source>Enter URL</source>
         <comment>Label of box where ask for button file&apos;s URL</comment>
         <translation>Entrez l&apos;URL</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="936"/>
+        <location filename="mainwindow.cpp" line="957"/>
         <source>action</source>
         <comment>Title of box where ask for a custom action</comment>
         <translation>action</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="936"/>
+        <location filename="mainwindow.cpp" line="957"/>
         <source>Enter your action</source>
         <comment>Label of box where ask for custom action</comment>
         <translation>Entrez votre action</translation>
@@ -403,7 +474,7 @@
         <translation type="obsolete">Aide</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="513"/>
+        <location filename="mainwindow.cpp" line="548"/>
         <source>New entry</source>
         <translation>Nouvelle entrée</translation>
     </message>
@@ -416,7 +487,7 @@
         <translation type="obsolete">A propos de Qt</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="367"/>
+        <location filename="mainwindow.cpp" line="383"/>
         <source>ctrl+H</source>
         <comment>Help|About Qt</comment>
         <translation>Ctrl+A</translation>
@@ -426,54 +497,54 @@
         <translation type="obsolete">C&amp;réer une base de donné</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="368"/>
+        <location filename="mainwindow.cpp" line="384"/>
         <source>Ctrl+R</source>
         <comment>Help|CreateDB</comment>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="368"/>
+        <location filename="mainwindow.cpp" line="384"/>
         <source>C&amp;reate Database</source>
         <comment>Hack|Create</comment>
         <translation>C&amp;réer une base de donné</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="369"/>
+        <location filename="mainwindow.cpp" line="385"/>
         <source>Download sql</source>
         <comment>Hack|download sql</comment>
         <translation>Télécharger un fichier sql</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="535"/>
+        <location filename="mainwindow.cpp" line="570"/>
         <source>label</source>
         <comment>Title of box where ask for new button&apos;s label</comment>
         <translation>Etiquette</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="535"/>
+        <location filename="mainwindow.cpp" line="570"/>
         <source>Enter his label</source>
         <comment>his/her/?they? I&apos;ve forget my school lesson</comment>
         <translation>Entrez son étiquette</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="537"/>
+        <location filename="mainwindow.cpp" line="572"/>
         <source>keyword</source>
         <comment>Title of box where ask for new button&apos;s keyword</comment>
         <translation>mot-clé</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="537"/>
+        <location filename="mainwindow.cpp" line="572"/>
         <source>Enter they keyword (no limit !)</source>
         <translation>Entrez les mots clé (no limit !)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="539"/>
+        <location filename="mainwindow.cpp" line="574"/>
         <source>action</source>
         <comment>Title of box where ask for new button&apos;s action</comment>
         <translation>action</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="539"/>
+        <location filename="mainwindow.cpp" line="574"/>
         <source>Enter his action</source>
         <translation>Entrez son action</translation>
     </message>
@@ -499,10 +570,9 @@
         <translation type="obsolete">Remise à zéro</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="361"/>
         <source>Ctrl+Z</source>
         <comment>Buttons|Reset</comment>
-        <translation>Ctrl+Z</translation>
+        <translation type="obsolete">Ctrl+Z</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
@@ -517,107 +587,110 @@
         <translation type="obsolete">Télécharger un fichier sql</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="576"/>
         <source>chooseButtonDB</source>
-        <translation>chooseButtonDB</translation>
+        <translation type="obsolete">chooseButtonDB</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="576"/>
+        <location filename="mainwindow.cpp" line="611"/>
         <source>Enter the keyword : </source>
         <translation>Entrez le mot-clé : </translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="597"/>
+        <location filename="mainwindow.cpp" line="611"/>
+        <source>chooseDB</source>
+        <translation>choisirBD</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="642"/>
         <source>keyword</source>
         <comment>Title of box where ask for button&apos;s keyword</comment>
         <translation>mot-clé</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="597"/>
+        <location filename="mainwindow.cpp" line="642"/>
         <source>new keyword</source>
         <comment>question to get new button&apos;s keyword</comment>
         <translation>nouveau mot-clé</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="599"/>
+        <location filename="mainwindow.cpp" line="644"/>
         <source>label</source>
         <comment>Title of box where ask for button&apos;s label</comment>
         <translation>étiquette</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="599"/>
+        <location filename="mainwindow.cpp" line="644"/>
         <source>new label</source>
         <comment>question to get new button&apos;s label</comment>
         <translation>nouvel étiquette</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="601"/>
+        <location filename="mainwindow.cpp" line="646"/>
         <source>action</source>
         <comment>Title of box where ask for button&apos;s action</comment>
         <translation>action</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="601"/>
+        <location filename="mainwindow.cpp" line="646"/>
         <source>new action</source>
         <comment>question to get new button&apos;s action</comment>
         <translation>nouvelle action</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="646"/>
+        <location filename="mainwindow.cpp" line="691"/>
         <source>RAWsent</source>
         <comment>message title when data has been send</comment>
         <translation>RAWsent</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="646"/>
+        <location filename="mainwindow.cpp" line="691"/>
         <source>sendRAW finish</source>
         <comment>message text when data has been send</comment>
         <translation>données envoyées</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="729"/>
+        <location filename="mainwindow.cpp" line="775"/>
         <source>Upload finish : </source>
         <comment>pop-up when data has been sent</comment>
         <translation>Upload finit : </translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="733"/>
         <source>uploadDB</source>
         <comment>pop-up title when data has been sent</comment>
-        <translation>uploadDB</translation>
+        <translation type="obsolete">uploadDB</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="790"/>
+        <location filename="mainwindow.cpp" line="834"/>
         <source>Uisent</source>
         <comment>pop-up title when buttons has been sent</comment>
         <translation>Envoyé</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="790"/>
+        <location filename="mainwindow.cpp" line="834"/>
         <source>savbuttons finish</source>
         <comment>pop-up text when buttons has been sent</comment>
         <translation>boutons sauvegardés sur le serveur</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="796"/>
+        <location filename="mainwindow.cpp" line="840"/>
         <source>Enter the keyword : </source>
         <comment>ask keyword to get buttons</comment>
         <translation>Entrez le mot-clé : </translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="796"/>
+        <location filename="mainwindow.cpp" line="840"/>
         <source>getButtons</source>
         <comment>title to ask keyword fot getbuttons</comment>
         <translation>getBoutons</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="853"/>
+        <location filename="mainwindow.cpp" line="899"/>
         <source>writeFile</source>
         <comment>pop-up title when file has been written</comment>
         <translation>fichier</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="853"/>
+        <location filename="mainwindow.cpp" line="899"/>
         <source>File written : </source>
         <translation>Fichier écrit : </translation>
     </message>

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 3c57947e0534b94350a85c6a4edc47c00d68ac8b..1794053e8f7e6480688b419a21bc7cb52b0cf6c3 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -65,10 +65,11 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     screen->show();
     if((conf->value(QString("first")).toInt()==1)){
         qDebug()<<"second";
-        QString ser=QInputDialog::getText(this, trUtf8("first button file"), trUtf8("Enter the URL to download the first buttons file"), QLineEdit::Normal, conf->value(QString("download")).toString());
-        if(ser!="")conf->setValue(QString("download"), ser);
-        createDB();
-        downloadData();
+        bool ok;
+        QString ser=QInputDialog::getText(this, trUtf8("init file"), trUtf8("Enter the URL to download the init file"), QLineEdit::Normal, conf->value(QString("init")).toString(), &ok);
+        if((ok)&&(ser!=""))conf->setValue(QString("init"), ser);
+        else qApp->quit();
+        downSQL(ser);
         conf->setValue(QString("first"), 2);
     };
     statusBar()->addPermanentWidget(label);
@@ -222,7 +223,7 @@ void MainWindow::action(const QString &a){
         if(ok)action(e);
     }
     else if(b[0]==QString("sav")){
-        send(c);
+        sav(c);
     }
     else if(b[0]==QString("back")){
         if(way.size()>1){
@@ -328,8 +329,8 @@ void MainWindow::action(const QString &a){
         lastprint=QString("-hist");
         for(int i=0; i<way.size(); i++){
             wi=way[i];
-            addWidget(wi, new CLabel(wi, conf->value(QString("button")).toString()));
-            addWidget(QString("rm %1").arg(i), new CLabel(QString("del"), conf->value(QString("button")).toString()));
+            addWidget(wi, new CLabel(wi, *conf));
+            addWidget(QString("rm %1").arg(i), new CLabel(QString("del"), *conf));
 
         }
     }
@@ -371,7 +372,7 @@ void MainWindow::createMenuBar(){
     menuBar()->addMenu(FileMenu);
     EditMenu=new QMenu(trUtf8("&Data", "top menu"));
     EditMenu->addAction(trUtf8("&Download", "Data|Downlad"), this, SLOT(downloadData()),QKeySequence(trUtf8("Ctrl+W", "Data|Downlad")));
-    EditMenu->addAction(trUtf8("A&dd", "Data|Add"), this, SLOT(addDataDB()), QKeySequence(trUtf8("Ctrl+D", "Data|Add")));
+    EditMenu->addAction(trUtf8("A&dd", "Data|Add"), this, SLOT(addDB()), QKeySequence(trUtf8("Ctrl+D", "Data|Add")));
     EditMenu->addAction(trUtf8("Sa&v", "Data|Sav"), this, SLOT(savData()), QKeySequence(trUtf8("Ctrl+V", "Data|Save")));
     EditMenu->addAction(trUtf8("Reset", "Data|Reset"), this, SLOT(reset()), QKeySequence(trUtf8("Ctrl+Z", "Data|Reset")));
     EditMenu->addAction(trUtf8("&Edit", "Data|Edit"), this, SLOT(chooseDB()), QKeySequence(trUtf8("Ctrl+E", "Data|&Edit")));
@@ -403,14 +404,15 @@ void MainWindow::flush(){
     }
     //widget.clear();
 }
-CLabel::CLabel( const QString& text, const QString & style, QWidget * parent ) : QLabel(parent)
+CLabel::CLabel( const QString& text, const QSettings & set, QWidget * parent ) : QLabel(parent)
 {
-    m_style=style;
+    m_style=set.value(QString("button")).toString();
     setText(text);
     setWordWrap(true);
     setLineWidth(5);
-    setStyleSheet(style);
+    setStyleSheet(m_style);
     setScaledContents(1);
+    setting=&set;
 }
 CLabel::~CLabel()
 {
@@ -418,13 +420,13 @@ CLabel::~CLabel()
 void CLabel::mousePressEvent (QMouseEvent * event )
 {
     switch(event->button()){
-        case Qt::LeftButton:setStyleSheet(m_style.replace(QString("border-style: outset"), QString("border-style: inset")));emit pressed();break;
+        case Qt::LeftButton:setStyleSheet(m_style.replace(setting->value(QString("buttonbefore")).toString(), setting->value(QString("buttonafter")).toString()));emit pressed();break;
     }
 }
 void CLabel::mouseReleaseEvent( QMouseEvent * event )
 {
     switch(event->button()){
-        case Qt::LeftButton:setStyleSheet(m_style.replace(QString("border-style: inset"), QString("border-style: outset")));emit released();break;
+        case Qt::LeftButton:setStyleSheet(m_style.replace(setting->value(QString("buttonafter")).toString(), setting->value(QString("buttonbefore")).toString()));emit released();break;
 
     }
 }
@@ -465,7 +467,8 @@ void MainWindow::firstrun(){
     conf->setValue(QString("buttonbefore"), QVariant("border-style: outset"));
     conf->setValue(QString("buttonafter"), QVariant("border-style: inset"));
     conf->setValue(QString("menu"), QVariant(0));
-    conf->setValue(QString("download"), QVariant("http://www.nothing2do.eu/ui.sql+"));
+    conf->setValue(QString("download"), QVariant("http://www.nothing2do.eu/"+conf->value(QString("filebuttons")).toString()));
+    conf->setValue(QString("init"), QVariant("http://www.nothing2do.eu/init"));
     conf->setValue(QString("userftp"), QVariant("<user>"));
     conf->setValue(QString("hostftp"), QVariant("<host>"));
     conf->setValue(QString("passftp"), QVariant("<pass>"));
@@ -473,19 +476,17 @@ void MainWindow::firstrun(){
     conf->setValue(QString("restore"), QVariant("http://www.abc.de/db"));
     conf->setValue(QString("db"), QVariant("/data/data/eu.nothing2do.diarymobile/files/db"));
     conf->setValue(QString("selectbuttons"), QVariant("select keyword,label,action from ui order by label;"));
-    conf->setValue(QString("columnbuttons"), QVariant(3));
     conf->setValue(QString("sqlbuttons"), QVariant("INSERT INTO ui (keyword,label,action) VALUES(?,?,?);"));
     conf->setValue(QString("selectraw"), QVariant("select date,texte from raw order by date;"));
-    conf->setValue(QString("columnraw"), QVariant(2));
     conf->setValue(QString("menuback"), QVariant("-menuback"));
     conf->setValue(QString("choosebuttons"), QVariant("select id,label from ui where keyword like ? order by label;"));
     conf->setValue(QString("addbuttons"), QVariant("insert into ui (label, keyword, action) values (:label, :keyword, :action)"));
     conf->setValue(QString("getbuttons"), QVariant("select label,action from ui where keyword like ? order by label;"));
     conf->setValue(QString("editbuttons"), QVariant("select id,keyword,label,action from ui where id=?;"));
     conf->setValue(QString("updatebuttons"), QVariant("update ui set keyword=?, label=?, action=? where id=?;"));
-    conf->setValue(QString("deletebutton"), QVariant("delete from ui where id=?"));
+    conf->setValue(QString("deletebuttons"), QVariant("delete from ui where id=?"));
     conf->setValue(QString("testbuttons"), QVariant("select id,keyword from ui where label=? and action=?;"));
-    conf->setValue(QString("changekey"), QVariant("select keyword,label,action,id from ui where keyword like ?;"));
+    conf->setValue(QString("changekeyword"), QVariant("select keyword,label,action,id from ui where keyword like ?;"));
     conf->setValue(QString("volumdown"), QVariant("back"));
     conf->setValue(QString("volumup"), QVariant("begin"));
     conf->setValue(QString("askkeyword"), QVariant(0));
@@ -588,7 +589,7 @@ void MainWindow::get(const QString & d, const QString &b){
     else{qDebug()<<"updatelocker is locked more than 1mn";}
 
     QString c="%"+a+"%";
-    QList<QString> tmp({conf->value(QString("getbuttons")).toString(), c});
+    QList<QString> tmp({conf->value(QString("get")+d).toString(), c});
     label->setText(a);
     exec(tmp);
     int labCol = 0;//r.indexOf("label");
@@ -596,7 +597,7 @@ void MainWindow::get(const QString & d, const QString &b){
     int i=0;
     qDebug()<<"bcl to add buttons";
     while(q->next()){
-        addWidget(q->value(actCol).toString(), new CLabel(q->value(labCol).toString(), conf->value(QString("button")).toString()));
+        addWidget(q->value(actCol).toString(), new CLabel(q->value(labCol).toString(), *conf));
         i++;
     };
     grid->update();
@@ -618,7 +619,7 @@ void MainWindow::chooseDB(const QString & b){
     qDebug()<<"exec()="<<exec(QList<QString>({conf->value(QString("choose"+a)).toString(), c}));
     while (q->next()) {
         const QString action="edit "+q->value(0).toString();
-        addWidget(action, new CLabel(q->value(1).toString(), conf->value(QString("button")).toString()));
+        addWidget(action, new CLabel(q->value(1).toString(), *conf));
     }
 }
 void MainWindow::chooseDB(const QString & a,const QString & b){
@@ -627,12 +628,13 @@ void MainWindow::chooseDB(const QString & a,const QString & b){
     qDebug()<<"exec()="<<exec(QList<QString>({conf->value(QString("choose"+a)).toString(), c}));
     while (q->next()) {
         const QString action="edit "+q->value(0).toString();
-        addWidget(action, new CLabel(q->value(1).toString(), conf->value(QString("button")).toString()));
+        addWidget(action, new CLabel(q->value(1).toString(), *conf));
     }
 }
 void MainWindow::editDB(const QString & a, const QString & b){
-    qDebug()<<"a="<<a;
-    exec(QList<QString>({conf->value(QString("edit")+a).toString(), b}));
+    QString tmp=conf->value(QString("edit")+a).toString();
+    qDebug()<<"a="<<a<< "exec()="<<tmp;
+    exec(QList<QString>({tmp, b}));
     if(q->isSelect())q->first();
     bool ok;
     QString keyword=q->value(1).toString();
@@ -645,8 +647,7 @@ void MainWindow::editDB(const QString & a, const QString & b){
     const QString tmpaction=QInputDialog::getMultiLineText(this, trUtf8("action", "Title of box where ask for button's action"), trUtf8("new action", "question to get new button's action"), action, &ok);
     if(!ok)return;
     if((tmpkeyword=="")||(tmplabel=="")||(tmpaction=="")){
-        //exec(QList<QString>({conf->value(QString("deletebuttons")).toString(), a}));
-        remove(b, keyword, label, action);
+        remove(a, keyword, label, action);
         return;
         }
     exec(QList<QString>({conf->value(QString("update")+a).toString(), tmpkeyword, tmplabel, tmpaction, b}));
@@ -693,7 +694,7 @@ void MainWindow::RAWsent(){
 void MainWindow::back(){
     if(!((video)&&(playlist))){
         get(QString("buttons"),conf->value(QString("menuback")).toString());
-    }else if(label->text()==conf->value(QString("menuback")).toString())get(QString("buttons"),way.takeLast());
+    }else if(QString("-")+label->text()==conf->value(QString("menuback")).toString())get(QString("buttons"),way.takeLast());
     else{
         get(QString("buttons"), QString("+video"));
     }
@@ -811,8 +812,9 @@ void MainWindow::sav(const QString & a){
     QFile b(conf->value(tmp).toString());
     b.open(QIODevice::WriteOnly|QIODevice::Text);
     QTextStream c(&b);
-    int d=conf->value(QString("column")+a).toInt()-1;
-    QString sep=conf->value(QString("sep")+a).toString();
+    //int d=conf->value(QString("column")+a).toInt()-1;
+    int d=q->record().count()-1;
+    QString sep=conf->value(QString("sepcol")+a).toString();
     qDebug()<<"d="<<d;
     while (q->next()) {
         for (int i=0; i<d; i++){
@@ -858,11 +860,13 @@ void MainWindow::insert(const QString & a, const QString & keyword, const QStrin
     }
 }
 void MainWindow::remove(const QString & a, const QString & keyword, const QString & label, const QString & action){
-    qDebug()<<"keyword="<<keyword<<" label="<<label<<" action="<<action;
+    qDebug()<<"remove : a="<<a<<"keyword="<<keyword<<" label="<<label<<" action="<<action;
     QList<QString> tmp;
     tmp.append(conf->value(QString("test")+a).toString());
+
     tmp.append(label);
     tmp.append(action);
+    qDebug()<<"tmp.size()="<<tmp.size()<<" tmp[0]="<<tmp[0];
     exec(tmp);
     q->first();
     int count=1;
@@ -873,7 +877,7 @@ void MainWindow::remove(const QString & a, const QString & keyword, const QStrin
         key=key+" "+cur;
     }
     qDebug()<<"key="<<key<<" keyword="<<keyword;
-    if(key==QString(" ").repeated(key.size()))exec(QList<QString>({conf->value(QString("delete")+a).toString(), id}));
+    if((key==QString(" ").repeated(key.size()))||(key==keyword))exec(QList<QString>({conf->value(QString("delete")+a).toString(), id}));
     else{
         key.replace(keyword, QString(""));
         exec(QList<QString>({conf->value(QString("updatebuttons")).toString(), key, label, action, id}));
@@ -949,39 +953,13 @@ void MainWindow::readData(){
     read(QString("buttons"), m->downloadedData());
     m->disconnect(m, SIGNAL(downloaded()),this, SLOT(readData()));
 }
-void MainWindow::send(const QString & a){
-    QString t="select"+a;
-    exec(QList<QString> ({conf->value(t).toString()}));
-    t="file"+a;
-    QFile tmp(conf->value(t).toString());
-    tmp.open(QIODevice::WriteOnly|QIODevice::Text);
-    QTextStream b(&tmp);
-    t="column"+a;
-    int c=conf->value(t).toInt()-1;
-    t="sep"+a;
-    QString sep=conf->value(t).toString();
-    while (q->next()) {
-        for (int i=0; i<c; i++){
-            b<<q->value(i).toString()<<sep;
-        }
-        b<<q->value(c).toString()<<"\n";
-    }
-    tmp.close();
-    t="file"+a;
-    QUrl upload(QString("ftp://")+conf->value(QString("userftp")).toString()+QString(":")+conf->value(QString("passftp")).toString()+QString("@")+conf->value(QString("hostftp")).toString()+QString("/")+conf->value(t).toString());
-    net=new QNetworkAccessManager(this);
-    tmp.open(QIODevice::ReadOnly | QIODevice::Text);
-    rep=net->put(QNetworkRequest(upload), tmp.readAll());
-    qDebug()<<"net->put : "<<rep<< " upload : "<<upload.url();
-    connect(rep, SIGNAL(finished()), this, SLOT(RAWsent()));
-}
 void MainWindow::action(){
     bool ok;
     QString cmd=QInputDialog::getText(this, trUtf8("action", "Title of box where ask for a custom action"), trUtf8("Enter your action", "Label of box where ask for custom action"), QLineEdit::Normal, QString(""), &ok);
     if(ok)action(cmd);
 }
 void MainWindow::mass(int c, const QString & a, const QString & b){
-    exec(QList<QString>({conf->value(QString("changekey")).toString(), a}));
+    exec(QList<QString>({conf->value(QString("changekeyword")).toString(), a}));
     QString key;
     while(q->next()){
         key=get(c);
@@ -997,7 +975,7 @@ void MainWindow::mass(int c, const QString & a, const QString & b){
     }
     get(QString("buttons"), lastprint);
 }
-void MainWindow::addDataDB(){
+void MainWindow::addDB(){
     addDB(QString("buttons"));
 }
 void MainWindow::savData(){
@@ -1006,3 +984,22 @@ void MainWindow::savData(){
 void MainWindow::reset(){
     reset(QString("ui"));
 }
+QSettings & MainWindow::getSettings(){
+    return *conf;
+}
+void MainWindow::downSQL(const QString & a){
+    download(a);
+    connect(m, SIGNAL(downloaded()), SLOT(readSQL()));
+}
+void MainWindow::readSQL(){
+    disconnect(m, SIGNAL(downloaded()));
+    qDebug()<<"readSQL";
+    QByteArray in=m->downloadedData();
+    q->exec("PRAGMA foreign_keys=OFF;");
+    q->exec("BEGIN TRANSACTION;");// these 2 line is SQLite specific
+    int b=in.count('\n');
+    for(int i=0;i<b;i++){
+        q->exec(in.split('\n').at(i));
+    }
+    emit datafilled();
+}

diff --git a/mainwindow.h b/mainwindow.h
index deb6fcda54f72353ac64fb4105ba4fd1bb26c78c..bfd2af77f5e77767fe3ef389396d17feddf2489a 100644 (file)
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -95,9 +95,10 @@ class CLabel : public QLabel
 {
 Q_OBJECT
     QString m_style;
+    QSettings * setting;
 
 public:
-    explicit CLabel(const QString& text,const QString &style,QWidget * parent = 0 );
+    explicit CLabel(const QString&, const QSettings &, QWidget * parent = 0 );
     ~CLabel();
     void SetTextToLabel(const QString &);
 signals:
@@ -128,13 +129,15 @@ public:
 
     // Note that this will only have an effect on Symbian and Fremantle.
     void setOrientation(ScreenOrientation orientation);
-
+    QSettings & getSettings();
     void showExpanded();
     const CLabel* addWidget(const QString &, const CLabel *);
     void resizeEvent(QResizeEvent *);
-    void send(const QString &);
+    void sav(const QString &);
     void mass(int, const QString &, const  QString &);
+    void downSQL(const QString &);
 private slots:
+    void readSQL();
     void tmpdown();
     void readData();
     void play();
@@ -160,7 +163,7 @@ private slots:
     void entry();
     void createDB();
     void addDB(const QString &);
-    void addDataDB();
+    void addDB();
     void writeDB();
     void chooseDB();
     void chooseDB(const QString &);
@@ -176,7 +179,7 @@ private slots:
     void sendRAW();
     void RAWsent();
     void Uisent();
-    void sav(const QString &);
+    //void sav(const QString &);
     //void savButtons();
     void savData();
     void read(const QString &, const QByteArray &);