diff --git a/languages/gui_de.ts b/languages/gui_de.ts index db1b812..5019091 100644 --- a/languages/gui_de.ts +++ b/languages/gui_de.ts @@ -736,7 +736,7 @@ - + select color Farbe auswählen @@ -892,7 +892,7 @@ - + About MinetestMapper Über MinetestMapper @@ -941,7 +941,7 @@ - + New Profile Neues Profil @@ -972,7 +972,7 @@ - + About MinetestMapper GUI Über MinetestMapperGUI @@ -1128,69 +1128,69 @@ Die einzelnen Parameter können entfernt, verändert, oder neue hinzugefügt wer - + Open Minetest World Minetest Welt-Ordner öffnen - + Save generated map to... Karte speichern nach... - + png image (*.png) png Grafik (*.png) - + Open HeightmapNodes File Öffne HeightmapNodes Datei - - - + + + TXT File (*.txt) TXT Datei (*.txt) - + Open HeightmapColors File Öffne Höhenkarte Farbdefinitionsdatei - + Open colors.txt File Öffne colors.txt Datei - + <h1>About MinetestMapperGUI</h1>The <b>MinetestMapper Gui</b> is written by addi.<br />It is licensed under a <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0 Unported License</a>.<br>The current version is %1. <br>The sourcecode is aviable on <a href='https://bitbucket.org/adrido/minetestmappergui/'>Bitbucket</a>.<br>You may also want to read the <a href='https://forum.minetest.net/viewtopic.php?f=14&t=12139'>Minetest forum thread</a>.<br><br><b>Thanks to:</b><br>McKrustenkaese for his great icon - + map center - + map origin (top left) - + <h1>About MinetestMapper</h1>The <b>MinetestMapper</b> is written by:<br>Miroslav Bendík <miroslav.bendik@gmail.com><br>ShadowNinja <shadowninja@minetest.net><br>sfan5 <sfan5@live.de><br>Rogier <rogier777@gmail.com><br><br><u>License:</u>LGPLv2.1+ and BSD 2-clause.<br><u>Source Code:</u> <a href='https://github.com/Rogier-5/minetest-mapper-cpp'>Github</a><br> - + preview: %1 Vorschau: %1 - + Name of the new Profile: Name des Neuen Profils: diff --git a/languages/gui_en.ts b/languages/gui_en.ts index 450fa85..3b49479 100644 --- a/languages/gui_en.ts +++ b/languages/gui_en.ts @@ -432,7 +432,7 @@ - + select color @@ -851,7 +851,7 @@ - + About MinetestMapper @@ -897,7 +897,7 @@ - + About MinetestMapper GUI @@ -921,7 +921,7 @@ - + New Profile @@ -1097,69 +1097,69 @@ The arguments can be removed, modified, or new arguments can be added. - + Open Minetest World - + Save generated map to... - + png image (*.png) - + Open HeightmapNodes File - - - + + + TXT File (*.txt) - + Open HeightmapColors File - + Open colors.txt File - + <h1>About MinetestMapperGUI</h1>The <b>MinetestMapper Gui</b> is written by addi.<br />It is licensed under a <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0 Unported License</a>.<br>The current version is %1. <br>The sourcecode is aviable on <a href='https://bitbucket.org/adrido/minetestmappergui/'>Bitbucket</a>.<br>You may also want to read the <a href='https://forum.minetest.net/viewtopic.php?f=14&t=12139'>Minetest forum thread</a>.<br><br><b>Thanks to:</b><br>McKrustenkaese for his great icon - + map center - + map origin (top left) - + <h1>About MinetestMapper</h1>The <b>MinetestMapper</b> is written by:<br>Miroslav Bendík <miroslav.bendik@gmail.com><br>ShadowNinja <shadowninja@minetest.net><br>sfan5 <sfan5@live.de><br>Rogier <rogier777@gmail.com><br><br><u>License:</u>LGPLv2.1+ and BSD 2-clause.<br><u>Source Code:</u> <a href='https://github.com/Rogier-5/minetest-mapper-cpp'>Github</a><br> - + preview: %1 - + Name of the new Profile: diff --git a/mainwindow.cpp b/mainwindow.cpp index ecccb5e..d52c993 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -629,16 +629,12 @@ void MainWindow::createProfilesMenu(){ connect(profileGroup, SIGNAL (triggered(QAction *)), this, SLOT (slotProfileChanged(QAction *))); - #if QT_VERSION >=0x050500 - //if using Qt version >= 5.5.0; - QDir dir = QDir(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation).append("/profiles/")); - #else - //Qt 5.4 or less - QSettings dummySettings(QSettings::IniFormat, QSettings::UserScope,QCoreApplication::organizationName(),"/profiles/default"); + //Qt 5.4 or less + QSettings dummySettings(QSettings::IniFormat, QSettings::UserScope,QCoreApplication::organizationName(),"/profiles/default"); + + QDir dir = QFileInfo(dummySettings.fileName()).absoluteDir(); - QDir dir = QFileInfo(dummySettings.fileName()).absoluteDir(); - #endif QStringList fileNames = dir.entryList(QStringList("*.ini")); qDebug()<<"found the Profiles"<< fileNames<< "in"<data().toString(); readProfile(currentProfile); }