Mercurial > clickerconvert
changeset 60:82d38421fdf3 1.1
Fix file name defaults and xlsx extension
| author | Andre Heinecke <andre.heinecke@intevation.de> |
|---|---|
| date | Tue, 09 Aug 2016 10:39:19 +0200 |
| parents | 831f86c2cdda |
| children | 01e382374375 |
| files | src/l10n/main_de_DE.ts src/main.cpp src/mainwindow.cpp |
| diffstat | 3 files changed, 9 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/l10n/main_de_DE.ts Tue Aug 09 10:38:43 2016 +0200 +++ b/src/l10n/main_de_DE.ts Tue Aug 09 10:39:19 2016 +0200 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0" language="de_DE"> +<TS version="2.1" language="de_DE"> <context> <name></name> <message> @@ -104,17 +104,17 @@ <translation>Fehler!</translation> </message> <message> - <location filename="../mainwindow.cpp" line="166"/> + <location filename="../mainwindow.cpp" line="169"/> <source>Failed to create output directory.</source> <translation>Zielordner konnte nicht erstellt werden.</translation> </message> <message> - <location filename="../mainwindow.cpp" line="172"/> + <location filename="../mainwindow.cpp" line="175"/> <source>Failed to open "%1" for reading.</source> <translation>Die Datei "%1" konnte nicht gelesen werden.</translation> </message> <message> - <location filename="../mainwindow.cpp" line="206"/> + <location filename="../mainwindow.cpp" line="209"/> <source>Failed to find an available free name for "%1" please choose another folder.</source> <translation>Für die Datei "%1" konnte kein freier Name gefunden werden. Bitte wählen Sie einen anderen Zielordner.</translation> </message> @@ -138,7 +138,7 @@ </message> <message> <source>Output format (default xlsx).</source> - <translation>Ausgabeformat (standard xlsx)</translation> + <translation type="vanished">Ausgabeformat (standard xlsx)</translation> </message> <message> <location filename="../cconvert_options.h" line="23"/>
--- a/src/main.cpp Tue Aug 09 10:38:43 2016 +0200 +++ b/src/main.cpp Tue Aug 09 10:39:19 2016 +0200 @@ -149,7 +149,9 @@ if (outputs.isEmpty() || title.isEmpty()) { mainWin = new MainWindow(); mainWin->setTitle(title); - mainWin->setInputFile(infile); + if (!infile.isEmpty()) { + mainWin->setInputFile(infile); + } mainWin->show(); app.exec(); delete mainWin;
--- a/src/mainwindow.cpp Tue Aug 09 10:38:43 2016 +0200 +++ b/src/mainwindow.cpp Tue Aug 09 10:39:19 2016 +0200 @@ -179,7 +179,7 @@ outNames << outDir.absoluteFilePath(fi.baseName() + QStringLiteral(".html")); } if (mXlsxChk->isChecked()) { - outNames << outDir.absoluteFilePath(fi.baseName() + QStringLiteral(".xslx")); + outNames << outDir.absoluteFilePath(fi.baseName() + QStringLiteral(".xlsx")); } QStringList cleanedNames;