Fixed a couple of file path issues.

Raffarti · Aug 2, 2015 · f0b4b9f · f0b4b9f
1 parent 6500f2a
commit f0b4b9f
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 27 deletions.
diff --git a/Dictionaries/de.qm b/Dictionaries/de.qm
diff --git a/Dictionaries/de.ts b/Dictionaries/de.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="de" sourcelanguage="en">
+<TS version="2.0" language="de" sourcelanguage="en">
 <context>
     <name>EditDialog</name>
     <message>
@@ -402,41 +402,41 @@ inherit old group gestures?</source>
     <name>Scribe</name>
     <message>
         <source>File not found</source>
-        <translation type="vanished">Datei nicht gefunden</translation>
+        <translation type="obsolete">Datei nicht gefunden</translation>
     </message>
     <message>
         <source>Target file doesn&apos;t exists,
 make a new one?</source>
-        <translation type="vanished">Zieldatei existiert nicht, soll sie angelegt werden?</translation>
+        <translation type="obsolete">Zieldatei existiert nicht, soll sie angelegt werden?</translation>
     </message>
     <message>
         <source>File path doesn&apos;t exists</source>
-        <translation type="vanished">Pfad zur Datei existiert nicht</translation>
+        <translation type="obsolete">Pfad zur Datei existiert nicht</translation>
     </message>
     <message>
         <source>The folder of the file doesn&apos;t exists,
 make a new one?</source>
-        <translation type="vanished">Der Ordner ist nicht vorhanden, soll er angelegt werden?</translation>
+        <translation type="obsolete">Der Ordner ist nicht vorhanden, soll er angelegt werden?</translation>
     </message>
     <message>
         <source>Cannot create folder</source>
-        <translation type="vanished">Ordner kann nicht angelegt werden</translation>
+        <translation type="obsolete">Ordner kann nicht angelegt werden</translation>
     </message>
     <message>
         <source>Cannot create parent folder.</source>
-        <translation type="vanished">Kann Übergeordneten Ordner nicht anlegen.</translation>
+        <translation type="obsolete">Kann Übergeordneten Ordner nicht anlegen.</translation>
     </message>
     <message>
         <source>Cannot open file</source>
-        <translation type="vanished">Datei kann nicht geöffnet werden</translation>
+        <translation type="obsolete">Datei kann nicht geöffnet werden</translation>
     </message>
     <message>
         <source>Cannot write file.</source>
-        <translation type="vanished">Datei kann icht gespeichert werden.</translation>
+        <translation type="obsolete">Datei kann icht gespeichert werden.</translation>
     </message>
     <message>
         <source>Cannot create the configuration file.</source>
-        <translation type="vanished">Kann die Konfigurationsdatei nicht anlegen.</translation>
+        <translation type="obsolete">Kann die Konfigurationsdatei nicht anlegen.</translation>
     </message>
     <message>
         <location filename="../scribe.cpp" line="36"/>

diff --git a/Dictionaries/en.qm b/Dictionaries/en.qm
diff --git a/Dictionaries/en.ts b/Dictionaries/en.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="en" sourcelanguage="en">
+<TS version="2.0" language="en" sourcelanguage="en">
 <context>
     <name>EditDialog</name>
     <message>

diff --git a/Dictionaries/it.qm b/Dictionaries/it.qm
diff --git a/Dictionaries/it.ts b/Dictionaries/it.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="it_IT" sourcelanguage="en">
+<TS version="2.0" language="it_IT" sourcelanguage="en">
 <context>
     <name>EditDialog</name>
     <message>
@@ -406,41 +406,41 @@ inherit old group gestures?</source>
     <name>Scribe</name>
     <message>
         <source>File not found</source>
-        <translation type="vanished">File non trovato</translation>
+        <translation type="obsolete">File non trovato</translation>
     </message>
     <message>
         <source>Target file doesn&apos;t exists,
 make a new one?</source>
-        <translation type="vanished">Creare il file?</translation>
+        <translation type="obsolete">Creare il file?</translation>
     </message>
     <message>
         <source>File path doesn&apos;t exists</source>
-        <translation type="vanished">Percorso inesistente</translation>
+        <translation type="obsolete">Percorso inesistente</translation>
     </message>
     <message>
         <source>The folder of the file doesn&apos;t exists,
 make a new one?</source>
-        <translation type="vanished">La cartella non esiste,\ncrearla?</translation>
+        <translation type="obsolete">La cartella non esiste,\ncrearla?</translation>
     </message>
     <message>
         <source>Cannot create folder</source>
-        <translation type="vanished">Impossibile creare cartella</translation>
+        <translation type="obsolete">Impossibile creare cartella</translation>
     </message>
     <message>
         <source>Cannot create parent folder.</source>
-        <translation type="vanished">Impossibile creare la catella.</translation>
+        <translation type="obsolete">Impossibile creare la catella.</translation>
     </message>
     <message>
         <source>Cannot open file</source>
-        <translation type="vanished">Impossibile aprire il file</translation>
+        <translation type="obsolete">Impossibile aprire il file</translation>
     </message>
     <message>
         <source>Cannot write file.</source>
-        <translation type="vanished">Impossibile scrivere sul file.</translation>
+        <translation type="obsolete">Impossibile scrivere sul file.</translation>
     </message>
     <message>
         <source>Cannot create the configuration file.</source>
-        <translation type="vanished">Impossibile creare il file di configurazione.</translation>
+        <translation type="obsolete">Impossibile creare il file di configurazione.</translation>
     </message>
     <message>
         <location filename="../scribe.cpp" line="36"/>

diff --git a/Dictionaries/zh_CN.ts b/Dictionaries/zh_CN.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="zh_CN">
+<TS version="2.0" language="zh_CN">
 <context>
     <name>EditDialog</name>
     <message>

diff --git a/gui.cpp b/gui.cpp
@@ -86,10 +86,10 @@ QString Gui::getPath(){
     ret.replace(QRegExp("^~"),QDir::homePath());
     //is the path is a directory, adding touchegg.conf as file by default
     if (QFileInfo(ret).isDir()){
-        ret = QFileInfo(ret).canonicalPath().append(QString("/touchegg.conf"));
+        ret = QFileInfo(ret).canonicalFilePath().append("/touchegg.conf");
     }
     if (ret.endsWith("/"))
-        ret.append(QString("/touchegg.conf"));
+        ret.append(QString("touchegg.conf"));
     return ret;
 }
 

diff --git a/scribe.cpp b/scribe.cpp
@@ -37,7 +37,7 @@ bool Scribe::open(const QString &path){
                                                 tr("File path does not exists, create it?"),QMessageBox::Ok|QMessageBox::Cancel);
             if (result != QMessageBox::Ok)
                 return false;
-            if (!info.dir().mkpath(info.canonicalPath())){
+            if (!info.dir().mkpath(info.path())){
                 QMessageBox::critical(0,tr("File error"),
                                       tr("Cannot create file path."));
                 return false;

diff --git a/scribe.h b/scribe.h
@@ -35,8 +35,6 @@ class Scribe : public QObject
 private:
     QFile *file;
 public slots:
-   // void creationConfirmed(QAbstractButton *button);
-   // void folderCreationConfirmed(QAbstractButton *button);
     void restartTouchegg(QAbstractButton *button);
 };