I've added "tmpdown" and conf("hostftp"), conf("userftp") and

conf("passftp")

diff --git a/diary-mobile_en_EN.ts b/diary-mobile_en_EN.ts
index 365e75ebef90a7317c3c2a1f455176ff47f0d8bb..242580aa26022a4e12bf9f6c563ad51db8613e21 100644 (file)
--- a/diary-mobile_en_EN.ts
+++ b/diary-mobile_en_EN.ts
@@ -4,351 +4,394 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="mainwindow.cpp" line="69"/>
+        <location filename="mainwindow.cpp" line="68"/>
         <source>first button file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="69"/>
+        <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="204"/>
+        <location filename="mainwindow.cpp" line="197"/>
         <source>get file</source>
         <comment>title to ask file</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="208"/>
+        <location filename="mainwindow.cpp" line="201"/>
         <source>box</source>
         <comment>box title to show a text</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="223"/>
+        <location filename="mainwindow.cpp" line="216"/>
         <source>set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="234"/>
+        <location filename="mainwindow.cpp" line="227"/>
         <source>Enter ID of button to edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="253"/>
+        <location filename="mainwindow.cpp" line="288"/>
         <source>&amp;File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="254"/>
+        <location filename="mainwindow.cpp" line="289"/>
         <source>&amp;Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="254"/>
+        <location filename="mainwindow.cpp" line="289"/>
         <source>Ctrl+S</source>
         <comment>File|Start</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="255"/>
+        <location filename="mainwindow.cpp" line="290"/>
         <source>&amp;Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="255"/>
+        <location filename="mainwindow.cpp" line="290"/>
         <source>Ctrl+B</source>
         <comment>File|Back</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="257"/>
+        <location filename="mainwindow.cpp" line="292"/>
         <source>sendRAW</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="257"/>
+        <location filename="mainwindow.cpp" line="292"/>
         <source>Ctrl+L</source>
         <comment>File|Upload</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="258"/>
+        <location filename="mainwindow.cpp" line="293"/>
         <source>Reset RAW</source>
         <oldsource>Reset Ui</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="259"/>
+        <location filename="mainwindow.cpp" line="294"/>
         <source>&amp;Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="259"/>
+        <location filename="mainwindow.cpp" line="294"/>
         <source>Ctrl+Q</source>
         <comment>File|Quit</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="261"/>
+        <location filename="mainwindow.cpp" line="296"/>
         <source>&amp;Buttons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="263"/>
+        <location filename="mainwindow.cpp" line="298"/>
         <source>Ctrl+D</source>
         <comment>Buttons|Add</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="264"/>
+        <location filename="mainwindow.cpp" line="299"/>
         <source>Ctrl+V</source>
         <comment>Buttons|Save</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="266"/>
+        <location filename="mainwindow.cpp" line="301"/>
         <source>Ctrl+E</source>
         <comment>Buttons|&amp;Edit</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="256"/>
+        <location filename="mainwindow.cpp" line="291"/>
         <source>&amp;View/Hide menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="268"/>
+        <location filename="mainwindow.cpp" line="303"/>
         <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="269"/>
-        <location filename="mainwindow.cpp" line="411"/>
+        <location filename="mainwindow.cpp" line="304"/>
+        <location filename="mainwindow.cpp" line="448"/>
         <source>New entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="270"/>
+        <location filename="mainwindow.cpp" line="305"/>
         <source>getButtons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="271"/>
+        <location filename="mainwindow.cpp" line="306"/>
         <source>About Qt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="271"/>
+        <location filename="mainwindow.cpp" line="306"/>
         <source>ctrl+H</source>
         <comment>Help|About Qt</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="272"/>
+        <location filename="mainwindow.cpp" line="307"/>
         <source>C&amp;reate Database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="272"/>
+        <location filename="mainwindow.cpp" line="307"/>
         <source>Ctrl+R</source>
         <comment>Help|CreateDB</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="433"/>
+        <location filename="mainwindow.cpp" line="470"/>
         <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="433"/>
+        <location filename="mainwindow.cpp" line="470"/>
         <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="435"/>
+        <location filename="mainwindow.cpp" line="472"/>
         <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="435"/>
+        <location filename="mainwindow.cpp" line="472"/>
         <source>Enter they keyword (no limit !)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="437"/>
+        <location filename="mainwindow.cpp" line="474"/>
         <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="437"/>
+        <location filename="mainwindow.cpp" line="474"/>
         <source>Enter his action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="256"/>
+        <location filename="mainwindow.cpp" line="291"/>
         <source>Ctrl+T</source>
         <comment>File|View menu</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="193"/>
+        <location filename="mainwindow.cpp" line="186"/>
         <source>choice</source>
         <comment>title of box who ask multiple choice</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="193"/>
+        <location filename="mainwindow.cpp" line="186"/>
         <source>Please choose an action.</source>
         <comment>text to ask multiple choice</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="262"/>
+        <location filename="mainwindow.cpp" line="242"/>
+        <source>URL</source>
+        <comment>title to download a custom file from URL</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="242"/>
+        <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="244"/>
+        <location filename="mainwindow.cpp" line="248"/>
+        <source>File</source>
+        <comment>title to write a file downloaded from URL</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="244"/>
+        <location filename="mainwindow.cpp" line="248"/>
+        <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="297"/>
         <source>&amp;Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="262"/>
+        <location filename="mainwindow.cpp" line="297"/>
         <source>Ctrl+W</source>
         <comment>Buttons|Downlad</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="263"/>
+        <location filename="mainwindow.cpp" line="298"/>
         <source>A&amp;dd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="264"/>
+        <location filename="mainwindow.cpp" line="299"/>
         <source>Sa&amp;v</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="265"/>
+        <location filename="mainwindow.cpp" line="300"/>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="265"/>
+        <location filename="mainwindow.cpp" line="300"/>
         <source>Ctrl+Z</source>
         <comment>Buttons|Reset</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="266"/>
+        <location filename="mainwindow.cpp" line="301"/>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="474"/>
+        <location filename="mainwindow.cpp" line="308"/>
+        <source>Download sql</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="511"/>
         <source>chooseButtonDB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="474"/>
+        <location filename="mainwindow.cpp" line="511"/>
         <source>Enter the keyword : </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="495"/>
+        <location filename="mainwindow.cpp" line="532"/>
         <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="495"/>
+        <location filename="mainwindow.cpp" line="532"/>
         <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="497"/>
+        <location filename="mainwindow.cpp" line="534"/>
         <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="497"/>
+        <location filename="mainwindow.cpp" line="534"/>
         <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="499"/>
+        <location filename="mainwindow.cpp" line="536"/>
         <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="499"/>
+        <location filename="mainwindow.cpp" line="536"/>
         <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="543"/>
+        <location filename="mainwindow.cpp" line="580"/>
         <source>RAWsent</source>
         <comment>message title when data has been send</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="543"/>
+        <location filename="mainwindow.cpp" line="580"/>
         <source>sendRAW finish</source>
         <comment>message text when data has been send</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="626"/>
+        <location filename="mainwindow.cpp" line="662"/>
         <source>Upload finish : </source>
         <comment>pop-up when data has been sent</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="630"/>
+        <location filename="mainwindow.cpp" line="666"/>
         <source>uploadDB</source>
         <comment>pop-up title when data has been sent</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="685"/>
+        <location filename="mainwindow.cpp" line="721"/>
         <source>Uisent</source>
         <comment>pop-up title when buttons has been sent</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="685"/>
+        <location filename="mainwindow.cpp" line="721"/>
         <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="691"/>
+        <location filename="mainwindow.cpp" line="727"/>
         <source>Enter the keyword : </source>
         <comment>ask keyword to get buttons</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="691"/>
+        <location filename="mainwindow.cpp" line="727"/>
         <source>getButtons</source>
         <comment>title to ask keyword fot getbuttons</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="752"/>
+        <location filename="mainwindow.cpp" line="784"/>
         <source>writeFile</source>
         <comment>pop-up title when file has been written</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="752"/>
+        <location filename="mainwindow.cpp" line="784"/>
         <source>File written : </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="mainwindow.cpp" line="830"/>
+        <source>tmp URL</source>
+        <comment>Title of box where ask for button tmp&apos;s URL</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="830"/>
+        <source>Enter URL</source>
+        <comment>Label of box where ask for button tmp&apos;s URL</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>

diff --git a/diary-mobile_fr_FR.ts b/diary-mobile_fr_FR.ts
index caa978e2f04295178e0f8b8e49bcce0383e1221e..33775edf74d96575ade71ca9b929c36ff964adb9 100644 (file)
--- a/diary-mobile_fr_FR.ts
+++ b/diary-mobile_fr_FR.ts
@@ -4,12 +4,12 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="mainwindow.cpp" line="69"/>
+        <location filename="mainwindow.cpp" line="68"/>
         <source>first button file</source>
         <translation>Premier fichier de bouton</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="69"/>
+        <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>
     </message>
@@ -22,73 +22,73 @@
         <translation type="obsolete">choisissez une action</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="204"/>
+        <location filename="mainwindow.cpp" line="197"/>
         <source>get file</source>
         <comment>title to ask file</comment>
         <translation>choisissez un fichier</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="208"/>
+        <location filename="mainwindow.cpp" line="201"/>
         <source>box</source>
         <comment>box title to show a text</comment>
         <translation>info</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="223"/>
+        <location filename="mainwindow.cpp" line="216"/>
         <source>set</source>
         <translation>définir</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="234"/>
+        <location filename="mainwindow.cpp" line="227"/>
         <source>Enter ID of button to edit</source>
         <translation>Entrez l&apos;ID du bouton à éditer</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="253"/>
+        <location filename="mainwindow.cpp" line="288"/>
         <source>&amp;File</source>
         <translation>&amp;Fichier</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="254"/>
+        <location filename="mainwindow.cpp" line="289"/>
         <source>&amp;Start</source>
         <translation>&amp;Départ</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="254"/>
+        <location filename="mainwindow.cpp" line="289"/>
         <source>Ctrl+S</source>
         <comment>File|Start</comment>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="255"/>
+        <location filename="mainwindow.cpp" line="290"/>
         <source>&amp;Back</source>
         <translation>&amp;Retour</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="255"/>
+        <location filename="mainwindow.cpp" line="290"/>
         <source>Ctrl+B</source>
         <comment>File|Back</comment>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="262"/>
+        <location filename="mainwindow.cpp" line="297"/>
         <source>Ctrl+W</source>
         <comment>Buttons|Downlad</comment>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="257"/>
+        <location filename="mainwindow.cpp" line="292"/>
         <source>sendRAW</source>
         <translation>Envoyer les données</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="257"/>
+        <location filename="mainwindow.cpp" line="292"/>
         <source>Ctrl+L</source>
         <comment>File|Upload</comment>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="258"/>
+        <location filename="mainwindow.cpp" line="293"/>
         <source>Reset RAW</source>
         <oldsource>Reset Ui</oldsource>
         <translation>Réinitialiser les donnés</translation>
@@ -99,18 +99,18 @@
         <translation type="obsolete">Ctrl+Z</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="259"/>
+        <location filename="mainwindow.cpp" line="294"/>
         <source>&amp;Quit</source>
         <translation>&amp;Quitter</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="259"/>
+        <location filename="mainwindow.cpp" line="294"/>
         <source>Ctrl+Q</source>
         <comment>File|Quit</comment>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="261"/>
+        <location filename="mainwindow.cpp" line="296"/>
         <source>&amp;Buttons</source>
         <translation>Boutons</translation>
     </message>
@@ -119,7 +119,7 @@
         <translation type="obsolete">A&amp;jouter un boutons</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="263"/>
+        <location filename="mainwindow.cpp" line="298"/>
         <source>Ctrl+D</source>
         <comment>Buttons|Add</comment>
         <translation>Ctrl+D</translation>
@@ -129,7 +129,7 @@
         <translation type="obsolete">Sauvegardez les boutons</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="264"/>
+        <location filename="mainwindow.cpp" line="299"/>
         <source>Ctrl+V</source>
         <comment>Buttons|Save</comment>
         <translation>Ctrl+V</translation>
@@ -139,103 +139,129 @@
         <translation type="obsolete">&amp;Editer les boutons</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="266"/>
+        <location filename="mainwindow.cpp" line="301"/>
         <source>Ctrl+E</source>
         <comment>Buttons|&amp;Edit</comment>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="256"/>
+        <location filename="mainwindow.cpp" line="291"/>
         <source>&amp;View/Hide menu</source>
         <translation>Voir/Cacher le menu</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="193"/>
+        <location filename="mainwindow.cpp" line="186"/>
         <source>choice</source>
         <comment>title of box who ask multiple choice</comment>
         <translation>Choix</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="193"/>
+        <location filename="mainwindow.cpp" line="186"/>
         <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="256"/>
+        <location filename="mainwindow.cpp" line="242"/>
+        <source>URL</source>
+        <comment>title to download a custom file from URL</comment>
+        <translation>Source</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="242"/>
+        <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="244"/>
+        <location filename="mainwindow.cpp" line="248"/>
+        <source>File</source>
+        <comment>title to write a file downloaded from URL</comment>
+        <translation>Fichier</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="244"/>
+        <location filename="mainwindow.cpp" line="248"/>
+        <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="291"/>
         <source>Ctrl+T</source>
         <comment>File|View menu</comment>
         <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="268"/>
+        <location filename="mainwindow.cpp" line="303"/>
         <source>&amp;Help</source>
         <translation>Aide</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="269"/>
-        <location filename="mainwindow.cpp" line="411"/>
+        <location filename="mainwindow.cpp" line="304"/>
+        <location filename="mainwindow.cpp" line="448"/>
         <source>New entry</source>
         <translation>Nouvelle entré</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="270"/>
+        <location filename="mainwindow.cpp" line="305"/>
         <source>getButtons</source>
         <translation>getButtons</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="271"/>
+        <location filename="mainwindow.cpp" line="306"/>
         <source>About Qt</source>
         <translation>A propos de Qt</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="271"/>
+        <location filename="mainwindow.cpp" line="306"/>
         <source>ctrl+H</source>
         <comment>Help|About Qt</comment>
         <translation>Ctrl+A</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="272"/>
+        <location filename="mainwindow.cpp" line="307"/>
         <source>C&amp;reate Database</source>
         <translation>C&amp;réer une base de donné</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="272"/>
+        <location filename="mainwindow.cpp" line="307"/>
         <source>Ctrl+R</source>
         <comment>Help|CreateDB</comment>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="433"/>
+        <location filename="mainwindow.cpp" line="470"/>
         <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="433"/>
+        <location filename="mainwindow.cpp" line="470"/>
         <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="435"/>
+        <location filename="mainwindow.cpp" line="472"/>
         <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="435"/>
+        <location filename="mainwindow.cpp" line="472"/>
         <source>Enter they keyword (no limit !)</source>
         <translation>Entrez les mots clé (no limit !)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="437"/>
+        <location filename="mainwindow.cpp" line="474"/>
         <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="437"/>
+        <location filename="mainwindow.cpp" line="474"/>
         <source>Enter his action</source>
         <translation>Entrez son action</translation>
     </message>
@@ -245,140 +271,157 @@
         <translation type="obsolete">0 (non) ou 1 (oui)?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="262"/>
+        <location filename="mainwindow.cpp" line="297"/>
         <source>&amp;Download</source>
         <translation>&amp;Téléchargement</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="263"/>
+        <location filename="mainwindow.cpp" line="298"/>
         <source>A&amp;dd</source>
         <translation>Nouveau</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="264"/>
+        <location filename="mainwindow.cpp" line="299"/>
         <source>Sa&amp;v</source>
         <translation>Sauvegardez</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="265"/>
+        <location filename="mainwindow.cpp" line="300"/>
         <source>Reset</source>
         <translation>Remise à zéro</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="265"/>
+        <location filename="mainwindow.cpp" line="300"/>
         <source>Ctrl+Z</source>
         <comment>Buttons|Reset</comment>
         <translation>Ctrl+Z</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="266"/>
+        <location filename="mainwindow.cpp" line="301"/>
         <source>&amp;Edit</source>
         <translation>Editez</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="474"/>
+        <location filename="mainwindow.cpp" line="308"/>
+        <source>Download sql</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="511"/>
         <source>chooseButtonDB</source>
         <translation>chooseButtonDB</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="474"/>
+        <location filename="mainwindow.cpp" line="511"/>
         <source>Enter the keyword : </source>
         <translation>Entrez le mot-clé : </translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="495"/>
+        <location filename="mainwindow.cpp" line="532"/>
         <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="495"/>
+        <location filename="mainwindow.cpp" line="532"/>
         <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="497"/>
+        <location filename="mainwindow.cpp" line="534"/>
         <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="497"/>
+        <location filename="mainwindow.cpp" line="534"/>
         <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="499"/>
+        <location filename="mainwindow.cpp" line="536"/>
         <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="499"/>
+        <location filename="mainwindow.cpp" line="536"/>
         <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="543"/>
+        <location filename="mainwindow.cpp" line="580"/>
         <source>RAWsent</source>
         <comment>message title when data has been send</comment>
         <translation>RAWsent</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="543"/>
+        <location filename="mainwindow.cpp" line="580"/>
         <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="626"/>
+        <location filename="mainwindow.cpp" line="662"/>
         <source>Upload finish : </source>
         <comment>pop-up when data has been sent</comment>
         <translation>Upload finit : </translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="630"/>
+        <location filename="mainwindow.cpp" line="666"/>
         <source>uploadDB</source>
         <comment>pop-up title when data has been sent</comment>
         <translation>uploadDB</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="685"/>
+        <location filename="mainwindow.cpp" line="721"/>
         <source>Uisent</source>
         <comment>pop-up title when buttons has been sent</comment>
         <translation>Envoyé</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="685"/>
+        <location filename="mainwindow.cpp" line="721"/>
         <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="691"/>
+        <location filename="mainwindow.cpp" line="727"/>
         <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="691"/>
+        <location filename="mainwindow.cpp" line="727"/>
         <source>getButtons</source>
         <comment>title to ask keyword fot getbuttons</comment>
         <translation>getBoutons</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="752"/>
+        <location filename="mainwindow.cpp" line="784"/>
         <source>writeFile</source>
         <comment>pop-up title when file has been written</comment>
         <translation>fichier</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="752"/>
+        <location filename="mainwindow.cpp" line="784"/>
         <source>File written : </source>
         <translation>Fichier écrit : </translation>
     </message>
+    <message>
+        <location filename="mainwindow.cpp" line="830"/>
+        <source>tmp URL</source>
+        <comment>Title of box where ask for button tmp&apos;s URL</comment>
+        <translation>tmp URL</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="830"/>
+        <source>Enter URL</source>
+        <comment>Label of box where ask for button tmp&apos;s URL</comment>
+        <translation>Entrez l&apos;URL</translation>
+    </message>
 </context>
 </TS>

diff --git a/mainwindow.cpp b/mainwindow.cpp
index da842effd5315aecba456a9f1dc2a311b6cf8b99..1e6432c1f9b1b62ebdb96ece29f1e44cd0bfeeeb 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -260,14 +260,14 @@ void MainWindow::action(const QString &a){
     else if(b[0]==QString("vid")){
         addMedia(c);
     }
-    else if(b[0]==QString("history")){
+    else if(b[0]==QString("hist")){
         flush();
-        QString wi, del;
+        QString wi;
+        lastprint=QString("hist");
         for(int i=0; i<way.size(); i++){
             wi=way[i];
             addWidget(QString(wi), new CLabel(QString(wi), conf->value(QString("button")).toString()));
-            del="rm "+QString("%1").arg(i);
-            addWidget(del, new CLabel(QString("del"), conf->value(QString("button")).toString()));
+            addWidget(QString("rm %1").arg(i), new CLabel(QString("del"), conf->value(QString("button")).toString()));
 
         }
     }
@@ -305,6 +305,8 @@ void MainWindow::createMenuBar(){
     HelpMenu->addAction(trUtf8("getButtons"), this, SLOT(getButtons()));
     HelpMenu->addAction(trUtf8("About Qt"), qApp, SLOT(aboutQt()), QKeySequence(tr("ctrl+H", "Help|About Qt")));
     HelpMenu->addAction(trUtf8("C&reate Database"), this, SLOT(createDB()), QKeySequence(trUtf8("Ctrl+R", "Help|CreateDB")));
+    HelpMenu->addAction(trUtf8("Download sql"), this, SLOT(tmpdown()));
+
     menuBar()->addMenu(HelpMenu);
 }
 void MainWindow::toggleMenu(){
@@ -390,6 +392,9 @@ void MainWindow::firstrun(){
     conf->setValue(QString("download"), QVariant("http://www.nothing2do.eu/ui.sql"));
     conf->setValue(QString("uploadRAW"), QVariant("ftp://<user>:<pass>@<server>/raw"));
     conf->setValue(QString("uploadUi"), QVariant("ftp://<user>:<pass>@<server>/ui.sql"));
+    conf->setValue(QString("userftp"), QVariant("<user>"));
+    conf->setValue(QString("hostftp"), QVariant("<host>"));
+    conf->setValue(QString("passftp"), QVariant("<pass>"));
     conf->setValue(QString("start"), QVariant("begin"));
     conf->setValue(QString("restore"), QVariant("http://www.abc.de/db"));
     conf->setValue(QString("db"), QVariant("/data/data/eu.nothing2do.diarymobile/files/db"));
@@ -563,10 +568,9 @@ void MainWindow::sendRAW(){
         b<<q->value(1).toString()<<"\n";
     }
     a.close();
-    
     qDebug()<<"a.open()="<<a.open(QIODevice::ReadOnly | QIODevice::Text);
-
-    QUrl upload(conf->value(QString("uploadRAW")).toString());
+    //QUrl upload(conf->value(QString("uploadRAW")).toString());
+    QUrl upload(QString("ftp://")+conf->value(QString("userftp")).toString()+QString(":")+conf->value(QString("passftp")).toString()+QString("@")+conf->value(QString("hostftp")).toString()+QString("/")+conf->value(QString("file")).toString());
     net=new QNetworkAccessManager(this);
     //a.open(QIODevice::ReadOnly | QIODevice::Text);
     rep=net->put(QNetworkRequest(upload), a.readAll());
@@ -707,7 +711,8 @@ void MainWindow::savButtons(){
         b<<q->value(2).toString()<<"\n";
     }
     a.close();
-    QUrl upload(conf->value(QString("uploadUi")).toString());
+    //QUrl upload(conf->value(QString("uploadUi")).toString());
+    QUrl upload(QString("ftp://")+conf->value(QString("userftp")).toString()+QString(":")+conf->value(QString("passftp")).toString()+QString("@")+conf->value(QString("hostftp")).toString()+QString("/")+conf->value(QString("buttonfile")).toString());
     net=new QNetworkAccessManager(this);
     a.open(QIODevice::ReadOnly | QIODevice::Text);
     rep=net->put(QNetworkRequest(upload), a.readAll());
@@ -819,7 +824,18 @@ void MainWindow::resizeEvent(QResizeEvent *event)
         conf->setValue(QString("maxline"), a);
         orientation=isLandscape;
         flush();
-        getButtons(lastprint);
+        action(lastprint);
     }
 
  }
+void MainWindow::tmpdown(){
+    bool ok;
+    QString url=QInputDialog::getText(this, trUtf8("tmp URL", "Title of box where ask for button tmp's URL"), trUtf8("Enter URL", "Label of box where ask for button tmp's URL"), QLineEdit::Normal, QString(""), &ok), tmp="tmp";
+    download(url);
+
+    connect(m, SIGNAL(downloaded()), this, SLOT(readData()));
+}
+void MainWindow::readData(){
+    readData(m->downloadedData());
+    m->disconnect(m, SIGNAL(downloaded()),this, SLOT(readData()));
+}

diff --git a/mainwindow.h b/mainwindow.h
index b467f99c224e827f8a0376dc48e750f9bb9928ad..b78b3c28d741509ce224f0a4fc833b9f0f835557 100644 (file)
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -133,6 +133,8 @@ public:
     const CLabel* addWidget(const QString &, const CLabel *);
     void resizeEvent(QResizeEvent *);
 private slots:
+    void tmpdown();
+    void readData();
     void play();
     void datasent();
     void back();