diff --git a/mathmech/mathmech/resources/translations/eng.qm b/mathmech/mathmech/resources/translations/eng.qm index be651ee..ccb6cd8 100644 Binary files a/mathmech/mathmech/resources/translations/eng.qm and b/mathmech/mathmech/resources/translations/eng.qm differ diff --git a/mathmech/mathmech/resources/translations/eng.ts b/mathmech/mathmech/resources/translations/eng.ts index 96aa14b..b871e32 100644 --- a/mathmech/mathmech/resources/translations/eng.ts +++ b/mathmech/mathmech/resources/translations/eng.ts @@ -1,27 +1,98 @@ - + + + AboutWindow + + + About + About + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Liberation Serif'; font-size:10pt; font-weight:400; font-style:normal;"> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Mathematical Molecular Mechanics</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Version:</span> 1.0.0</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">License:</span> GPL</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Author:</span> Evgeniy Alekseev</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">E-mail:</span> esalexeev@gmail.com</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Graphical user interface for &quot;mathmech&quot; program pack.</p></body></html> + + + + + Close + + + AgglWindow Select file - + 'statgen' output files (*.dat);;All files (*.*) - + Save file as... - + Agglomerate files (*.agl);;All files (*.*) - + + + + + Agglomerate + + + + + Input file + + + + + + Browse + + + + + Select + + + + + Output file + + + + + Clear + + + + + Create + + + + + Close + @@ -30,12 +101,12 @@ Processing 'agl'... - + Done - + @@ -43,47 +114,165 @@ Select work directory - + Select trajectory file - + 'statgen' output files (*.dat);;All files (*.*) - + Save file as... - + PDB files (*.pdb);;All files (*.*) - + + + + + agl_all + + + + + Work directory + + + + + + + Browse + + + + + Input file + + + + + Mask of output files + + + + + File + + + + + Number of molecules + + + + + Clear + + + + + Start + + + + + Close + AtomTypesWindow + + + Atom types + + + + + Output file + + + + + Browse + + + + + Molecule + + + + + 1 + + + Add new molecule - + + + + + Number of molecules + + + + + Char atom type + + + + + Int atom type + + + + + Add + + + + + Remove + + + + + Clear + + + + + Create + + + + + Close + Save file as... - + Atom types files (*.types);;All files (*.*) - + @@ -91,72 +280,87 @@ Work directory does not exists - + Input file is not set - + Atoms in plane must be different - + Atom types file is not set - + Output file is not set - + Atom type must contain 2 characters - + Log file is not set - + Component is not found - + Atom types is not set - + Something wrong - + Interactions are not set - + Invalid file type - + Interaction step is not set - + Unknown error - + + + + + Error + + + + + Error text + + + + + Ok + @@ -164,7 +368,7 @@ Ready - + @@ -173,39 +377,39 @@ Select work directory - + Select trajectory file - + All files (*.*) - + Select atom types file - + Atom types files (*.types);;All files (*.*) - + Save files as - + Mask of trajectory files - + @@ -214,7 +418,7 @@ Save log file as... - + @@ -223,13 +427,13 @@ Log files (*.log) - + Select trajectory files - + @@ -237,47 +441,47 @@ Trajectory files (*.*[0-9]) - + Save output file as... - + Output files (*.dat) - + Save PDB file as... - + PDB files (*.pdb) - + Select agglomerate file - + Agglomerate files (*.agl);;All files (*.*) - + Processing 'trj'... - + @@ -286,60 +490,533 @@ Done - + Processing 'statgen'... - + Processing 'envir'... - + Processing 'radf'... - + Processing 'agl'... - + Processing 'trj2pdb'... - + + + + + Mathematical Molecular Mechanics + + + + + Generate trajectory + + + + + + + + + Work directory + + + + + + + + + + + + + + + + + + + + + + + + + + Browse + + + + + + + Input file + + + + + Type of trajectory + + + + + GROMACS text + + + + + PUMA + + + + + Number of steps + + + + + Atom type file + + + + + Mask of output files + + + + + Total atom types + + + + + + + + + Log + + + + + + + + + Clear + + + + + + + + + Start + + + + + Agglomeration + + + + + + Mask of input files + + + + + + Steps + + + + + + first + + + + + + last + + + + + + + + Cell, A + + + + + + + + X + + + + + + + + Y + + + + + + + + Z + + + + + atom 0 + + + + + + + atom 1 + + + + + + + atom 2 + + + + + + + atom 3 + + + + + Interaction + + + + + 0-0 + + + + + Save + + + + + Add + + + + + Remove + + + + + + + + Output file + + + + + Depth of search + + + + + Analysis + + + + + + Graph + + + + + Environment + + + + + Molecule + + + + + Radius + + + + + RADF + + + + + One atom function + + + + + Three atom function + + + + + R, A + + + + + + min + + + + + + max + + + + + + step + + + + + Angle, deg + + + + + Matrix + + + + + Generate PDB + + + + + From agglomerate + + + + + From trajectory snapshot + + + + + File with agglomerate + + + + + Menu + + + + + File &creator + + + + + &Tools + + + + + Help + + + + + &Quit + + + + + Quit + + + + + Ctrl+Q + + + + + &Help + + + + + F1 + + + + + About + + + + + Atom &types file + + + + + &Agglomerate file + + + + + &Settings + + + + + agl_all + + + + + statgen_all + SettingsWindow - - - - - - + + + + + + Select component - + - - - - - - + + + + + + All files (*) - + + + + + Settings + + + + + mm_trj + + + + + + + + + + Browse + + + + + mm_statgen + + + + + mm_envir + + + + + mm_radf + + + + + mm_trj2pdb + + + + + mm_agl + + + + + English + + + + + Russian + + + + + Save + + + + + Close + @@ -347,32 +1024,47 @@ N - + p - + r - + g - + Save image as... - + JPEG file (*.jpeg);;Portable Network Graphics file (*.png);;Bitmap file (*.bmp) - + + + + + Graph + + + + + Save + + + + + Close + diff --git a/mathmech/mathmech/resources/translations/rus.qm b/mathmech/mathmech/resources/translations/rus.qm index 3b180b7..93ce3cd 100644 Binary files a/mathmech/mathmech/resources/translations/rus.qm and b/mathmech/mathmech/resources/translations/rus.qm differ diff --git a/mathmech/mathmech/resources/translations/rus.ts b/mathmech/mathmech/resources/translations/rus.ts index e88b4b6..11b8102 100644 --- a/mathmech/mathmech/resources/translations/rus.ts +++ b/mathmech/mathmech/resources/translations/rus.ts @@ -1,6 +1,48 @@ + + AboutWindow + + + About + О программе + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Liberation Serif'; font-size:10pt; font-weight:400; font-style:normal;"> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Mathematical Molecular Mechanics</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Version:</span> 1.0.0</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">License:</span> GPL</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Author:</span> Evgeniy Alekseev</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">E-mail:</span> esalexeev@gmail.com</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Graphical user interface for &quot;mathmech&quot; program pack.</p></body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Liberation Serif'; font-size:10pt; font-weight:400; font-style:normal;"> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Mathematical Molecular Mechanics</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Версия:</span> 1.0.0</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Лицензия:</span> GPL</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Автор:</span> Evgeniy Alekseev</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">E-mail:</span> esalexeev@gmail.com</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Графический интерфейс для программного пакета &quot;mathmech&quot;.</p></body></html> + + + + Close + Закрыть + + AgglWindow @@ -23,6 +65,47 @@ Agglomerate files (*.agl);;All files (*.*) Файл с агломератом (*.agl);Все файлы (*.*) + + + Agglomerate + Агломерат + + + + Input file + Входной файл + + + + + Browse + Обзор + + + + Select + Выбор + + + + Output file + Выходной файл + + + + Clear + Очистить + + + + Create + Создать + + + + Close + Закрыть + AglAll @@ -65,16 +148,134 @@ PDB files (*.pdb);;All files (*.*) PDB файлы (*.pdb);;Все файлы (*.*) + + + agl_all + agl_all + + + + Work directory + Рабочая директория + + + + + + Browse + Обзор + + + + Input file + Входной файл + + + + Mask of output files + Маска выходных файлов + + + + File + Файл + + + + Number of molecules + Число молекул + + + + Clear + Очистить + + + + Start + Старт + + + + Close + Закрыть + AtomTypesWindow + + + Atom types + Типы атомов + + + + Output file + Выходной файл + + + + Browse + Обзор + + + + Molecule + Молекула + + + + 1 + 1 + + Add new molecule Добавить новую молекулу + + + Number of molecules + Число молекул + + + + Char atom type + Символьный тип + + + + Int atom type + Численный тип + + + + Add + Добавить + + + + Remove + Удалить + + + + Clear + Очистить + + + + Create + Создать + + + + Close + Закрыть + Save file as... @@ -158,6 +359,21 @@ Unknown error Неизвестная ошибка + + + Error + Ошибка + + + + Error text + Текст ошибки + + + + Ok + Ok + MainWindow @@ -318,29 +534,502 @@ Processing 'trj2pdb'... Выполняется 'trj2pdb'... + + + Mathematical Molecular Mechanics + Mathematical Molecular Mechanics + + + + Generate trajectory + Создать траекторию + + + + + + + + Work directory + Рабочая директория + + + + + + + + + + + + + + + + + + + + + + + + + Browse + Обзор + + + + + + Input file + Входной файл + + + + Type of trajectory + Тип траектории + + + + GROMACS text + GROMACS + + + + PUMA + PUMA + + + + Number of steps + Число шагов + + + + Atom type file + Файл типов атомов + + + + Mask of output files + Маска файлов + + + + Total atom types + Всего типов атомов + + + + + + + + Log + Лог + + + + + + + + Clear + Очистить + + + + + + + + Start + Старт + + + + Agglomeration + Агломерация + + + + + Mask of input files + Маска файлов + + + + + Steps + Шаги + + + + + first + первый + + + + + last + последний + + + + + + + Cell, A + Ячейка, А + + + + + + + X + X + + + + + + + Y + Y + + + + + + + Z + Z + + + + atom 0 + атом 0 + + + + + + atom 1 + атом 1 + + + + + + atom 2 + атом 2 + + + + + + atom 3 + атом 3 + + + + Interaction + Взаимодействие + + + + 0-0 + 0-0 + + + + Save + Сохранить + + + + Add + Добавить + + + + Remove + Удалить + + + + + + + Output file + Выходной файл + + + + Depth of search + Глубина поиска + + + + Analysis + Анализ + + + + + Graph + График + + + + Environment + Окружение + + + + Molecule + Молекула + + + + Radius + Радиус + + + + RADF + ФРУР + + + + One atom function + Одноатомная функция + + + + Three atom function + Трехатомная функция + + + + R, A + R, A + + + + + min + min + + + + + max + max + + + + + step + шаг + + + + Angle, deg + Угол, град + + + + Matrix + Матрица + + + + Generate PDB + Создать PDB + + + + From agglomerate + Из агломерата + + + + From trajectory snapshot + Из снимка траектории + + + + File with agglomerate + Файл с агломератом + + + + Menu + Меню + + + + File &creator + &Создание файлов + + + + &Tools + &Утилиты + + + + Help + Помощь + + + + &Quit + &Выход + + + + Quit + Выход + + + + Ctrl+Q + Ctrl+Q + + + + &Help + &Помощь + + + + F1 + F1 + + + + About + О программе + + + + Atom &types file + Файл типов &атомов + + + + &Agglomerate file + Файл с &агломератом + + + + &Settings + &Настройки + + + + agl_all + agl_all + + + + statgen_all + statgen_all + SettingsWindow - - - - - - + + + + + + Select component Выбор компонента - - - - - - + + + + + + All files (*) Все файлы (*) + + + Settings + Настройки + + + + mm_trj + mm_trj + + + + + + + + + Browse + Обзор + + + + mm_statgen + mm_statgen + + + + mm_envir + mm_envir + + + + mm_radf + mm_radf + + + + mm_trj2pdb + mm_trj2pdb + + + + mm_agl + mm_agl + + + + English + English + + + + Russian + Russian + + + + Save + Сохранить + + + + Close + Закрыть + StatgenGraphWindow @@ -374,5 +1063,20 @@ JPEG file (*.jpeg);;Portable Network Graphics file (*.png);;Bitmap file (*.bmp) JPEG (*.jpeg);;Portable Network Graphics (*.png);;Bitmap (*.bmp) + + + Graph + График + + + + Save + Сохранить + + + + Close + Закрыть + diff --git a/mathmech/mathmech/src/CMakeLists.txt b/mathmech/mathmech/src/CMakeLists.txt index 475b952..44daab0 100644 --- a/mathmech/mathmech/src/CMakeLists.txt +++ b/mathmech/mathmech/src/CMakeLists.txt @@ -49,10 +49,11 @@ foreach (LANGUAGE ${LANGUAGES}) endforeach() add_custom_target ( translations - COMMAND ${QT_LUPDATE_EXECUTABLE} ${HEADERS} ${SOURCES} -ts ${TRANSLATIONS}) + COMMAND ${QT_LUPDATE_EXECUTABLE} ${HEADERS} ${SOURCES} ${UI_HEADERS} -ts ${TRANSLATIONS}) add_custom_command ( TARGET translations COMMAND ${QT_LRELEASE_EXECUTABLE} ${TRANSLATIONS}) +message (STATUS "TRANSLATIONS: ${TRANSLATIONS_BINARY}") source_group ("Header Files" FILES ${HEADERS}) source_group ("Source Files" FILES ${SOURCES}) diff --git a/mathmech/mathmech/src/Makefile b/mathmech/mathmech/src/Makefile index c990a44..0d83f1e 100644 --- a/mathmech/mathmech/src/Makefile +++ b/mathmech/mathmech/src/Makefile @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: mathmech -# Generated by qmake (2.01a) (Qt 4.8.5) on: ?? ??? 23 22:01:14 2013 +# Generated by qmake (2.01a) (Qt 4.8.5) on: ?? ??? 26 15:52:26 2013 # Project: mathmech.pro # Template: app # Command: /usr/bin/qmake-qt4 -o Makefile mathmech.pro @@ -219,7 +219,7 @@ qmake: FORCE dist: @$(CHK_DIR_EXISTS) .tmp/mathmech1.0.0 || $(MKDIR) .tmp/mathmech1.0.0 - $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/mathmech1.0.0/ && $(COPY_FILE) --parents mainwindow.h errorwindow.h clear_items.h start_events.h update_fields.h atomtypeswindow.h agglwindow.h aboutwindow.h statgengraphwindow.h settingswindow.h aglallwindow.h .tmp/mathmech1.0.0/ && $(COPY_FILE) --parents main.cpp mainwindow.cpp errorwindow.cpp clear_items.cpp start_events.cpp update_fields.cpp atomtypeswindow.cpp agglwindow.cpp aboutwindow.cpp statgengraphwindow.cpp settingswindow.cpp aglallwindow.cpp .tmp/mathmech1.0.0/ && $(COPY_FILE) --parents mainwindow.ui errorwindow.ui atomtypeswindow.ui agglwindow.ui aboutwindow.ui statgengraphwindow.ui settingswindow.ui aglallwindow.ui .tmp/mathmech1.0.0/ && (cd `dirname .tmp/mathmech1.0.0` && $(TAR) mathmech1.0.0.tar mathmech1.0.0 && $(COMPRESS) mathmech1.0.0.tar) && $(MOVE) `dirname .tmp/mathmech1.0.0`/mathmech1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/mathmech1.0.0 + $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/mathmech1.0.0/ && $(COPY_FILE) --parents mainwindow.h errorwindow.h clear_items.h start_events.h update_fields.h atomtypeswindow.h agglwindow.h aboutwindow.h statgengraphwindow.h settingswindow.h aglallwindow.h .tmp/mathmech1.0.0/ && $(COPY_FILE) --parents main.cpp mainwindow.cpp errorwindow.cpp clear_items.cpp start_events.cpp update_fields.cpp atomtypeswindow.cpp agglwindow.cpp aboutwindow.cpp statgengraphwindow.cpp settingswindow.cpp aglallwindow.cpp .tmp/mathmech1.0.0/ && $(COPY_FILE) --parents mainwindow.ui errorwindow.ui atomtypeswindow.ui agglwindow.ui aboutwindow.ui statgengraphwindow.ui settingswindow.ui aglallwindow.ui .tmp/mathmech1.0.0/ && $(COPY_FILE) --parents rus.ts eng.ts .tmp/mathmech1.0.0/ && (cd `dirname .tmp/mathmech1.0.0` && $(TAR) mathmech1.0.0.tar mathmech1.0.0 && $(COMPRESS) mathmech1.0.0.tar) && $(MOVE) `dirname .tmp/mathmech1.0.0`/mathmech1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/mathmech1.0.0 clean:compiler_clean diff --git a/mathmech/mathmech/src/main.cpp b/mathmech/mathmech/src/main.cpp index a3e99a8..64e21cb 100644 --- a/mathmech/mathmech/src/main.cpp +++ b/mathmech/mathmech/src/main.cpp @@ -1,14 +1,39 @@ #include "mainwindow.h" #include +#include #include +#include +#include int main(int argc, char *argv[]) { QLocale::setDefault(QLocale::C); QApplication a(argc, argv); + QString configpath; +#ifdef _WIN32 + configpath = QFileInfo(QDir::currentPath(), ("mathmech.ini")).absoluteFilePath(); +#elif __linux + configpath = QFileInfo(QDir(QDir::homePath() + "/.config"), ("mathmech.conf")).absoluteFilePath(); +#else + return; +#endif + QFile conf_file(configpath); + conf_file.open(QIODevice::ReadOnly | QIODevice::Text); + QString language, text; + QTextStream out(&conf_file); + while (!out.atEnd()) + { + text = out.readLine(); + if (text.contains(QString("LANG="))) + language = text.split(QString("LANG="), QString::SkipEmptyParts)[0]; + } + conf_file.close(); + QTranslator translator; + translator.load(QString(":/translations/") + language); + a.installTranslator(&translator); + MainWindow w; w.show(); - return a.exec(); } diff --git a/mathmech/mathmech/src/mathmech.pro b/mathmech/mathmech/src/mathmech.pro index 4bdbee2..93d8f0c 100644 --- a/mathmech/mathmech/src/mathmech.pro +++ b/mathmech/mathmech/src/mathmech.pro @@ -39,3 +39,7 @@ SOURCES += main.cpp mainwindow.cpp \ statgengraphwindow.cpp \ settingswindow.cpp \ aglallwindow.cpp +TRANSLATIONS += rus.ts \ + eng.ts + +RESOURCES += diff --git a/mathmech/mathmech/src/mathmech.pro.user b/mathmech/mathmech/src/mathmech.pro.user index 144baaa..df00f35 100644 --- a/mathmech/mathmech/src/mathmech.pro.user +++ b/mathmech/mathmech/src/mathmech.pro.user @@ -1,6 +1,6 @@ - + ProjectExplorer.Project.ActiveTarget @@ -226,7 +226,7 @@ mathmech - Qt4ProjectManager.Qt4RunConfiguration:/home/arcanis/Documents/github/moldyn/mathmech/src/mathmech.pro + Qt4ProjectManager.Qt4RunConfiguration:/home/arcanis/Documents/github/moldyn/mathmech/mathmech/src/mathmech.pro mathmech.pro false diff --git a/mathmech/mathmech/src/settingswindow.cpp b/mathmech/mathmech/src/settingswindow.cpp index 32f1607..2b2b9a0 100644 --- a/mathmech/mathmech/src/settingswindow.cpp +++ b/mathmech/mathmech/src/settingswindow.cpp @@ -1,7 +1,9 @@ +#include #include #include #include #include +#include #include "errorwindow.h" #include "mainwindow.h" @@ -134,25 +136,28 @@ void SettingsWindow::readSettings() errorwin->show(); return; } + QString text; QTextStream out(&conf_file); - QStringList text = out.readAll().split(QString("\n"), QString::SkipEmptyParts); - conf_file.close(); - for (int i=0; i