diff --git a/mathmech/mathmech/resources/translations/eng.qm b/mathmech/mathmech/resources/translations/eng.qm index ccb6cd8..d843fd1 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 b871e32..1507361 100644 --- a/mathmech/mathmech/resources/translations/eng.ts +++ b/mathmech/mathmech/resources/translations/eng.ts @@ -23,12 +23,24 @@ p, li { white-space: pre-wrap; } <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;">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 - + Close @@ -36,63 +48,63 @@ p, li { white-space: pre-wrap; } Select file - + Select file 'statgen' output files (*.dat);;All files (*.*) - + 'statgen' output files (*.dat);;All files (*.*) Save file as... - + Save file as... Agglomerate files (*.agl);;All files (*.*) - + Agglomerate files (*.agl);;All files (*.*) Agglomerate - + Agglomerate Input file - + Input file Browse - + Browse Select - + Select Output file - + Output file Clear - + Clear Create - + Create Close - + Close @@ -101,12 +113,12 @@ p, li { white-space: pre-wrap; } Processing 'agl'... - + Processing 'agl'... Done - + Done @@ -114,107 +126,92 @@ p, li { white-space: pre-wrap; } Select work directory - + Select work directory Select trajectory file - + Select trajectory file 'statgen' output files (*.dat);;All files (*.*) - + 'statgen' output files (*.dat);;All files (*.*) Save file as... - + Save file as... PDB files (*.pdb);;All files (*.*) - + PDB files (*.pdb);;All files (*.*) agl_all - + agl_all Work directory - + Work directory Browse - + Browse Input file - + Input file Mask of output files - + Mask of output files File - + File Number of molecules - + Number of molecules Clear - + Clear Start - + Start Close - + Close AtomTypesWindow - - Atom types - + + Save file as... + Save file as... - - Output file - - - - - Browse - - - - - Molecule - - - - - 1 - + + Atom types files (*.types);;All files (*.*) + Atom types files (*.types);;All files (*.*) @@ -222,57 +219,72 @@ p, li { white-space: pre-wrap; } Add new molecule - + Add new molecule + + + + Atom types + Atom types + + + + Output file + Output file + + + + Browse + Browse + + + + Molecule + Molecule + + + + 1 + 1 Number of molecules - + Number of molecules Char atom type - + Char atom type Int atom type - + Int atom type Add - + Add Remove - + Remove Clear - + Clear Create - + Create Close - - - - - Save file as... - - - - - Atom types files (*.types);;All files (*.*) - + Close @@ -280,87 +292,87 @@ p, li { white-space: pre-wrap; } Work directory does not exists - + Work directory does not exists Input file is not set - + Input file is not set Atoms in plane must be different - + Atoms in plane must be different Atom types file is not set - + Atom types file is not set Output file is not set - + Output file is not set Atom type must contain 2 characters - + Atom type must contain 2 characters Log file is not set - + Log file is not set Component is not found - + Component is not found Atom types is not set - + Atom types is not set Something wrong - + Something wrong Interactions are not set - + Interactions are not set Invalid file type - + Invalid file type Interaction step is not set - + Interaction step is not set Unknown error - + Unknown error Error - + Error Error text - + Error text Ok - + Ok @@ -368,7 +380,7 @@ p, li { white-space: pre-wrap; } Ready - + Ready @@ -377,39 +389,39 @@ p, li { white-space: pre-wrap; } Select work directory - + Select work directory Select trajectory file - + Select trajectory file All files (*.*) - + All files (*.*) Select atom types file - + Select atom types file Atom types files (*.types);;All files (*.*) - + Atom types files (*.types);;All files (*.*) Save files as - + Save files as Mask of trajectory files - + Mask of trajectory files @@ -418,7 +430,7 @@ p, li { white-space: pre-wrap; } Save log file as... - + Save log file as... @@ -427,13 +439,13 @@ p, li { white-space: pre-wrap; } Log files (*.log) - + Log files (*.log) Select trajectory files - + Select trajectory files @@ -441,47 +453,47 @@ p, li { white-space: pre-wrap; } Trajectory files (*.*[0-9]) - + Trajectory files (*.*[0-9]) Save output file as... - + Save output file as... Output files (*.dat) - + Output files (*.dat) Save PDB file as... - + Save PDB file as... PDB files (*.pdb) - + PDB files (*.pdb) Select agglomerate file - + Select agglomerate file Agglomerate files (*.agl);;All files (*.*) - + Agglomerate files (*.agl);;All files (*.*) Processing 'trj'... - + Processing 'trj'... @@ -490,47 +502,97 @@ p, li { white-space: pre-wrap; } Done - + Done Processing 'statgen'... - + Processing 'statgen'... Processing 'envir'... - + Processing 'envir'... Processing 'radf'... - + Processing 'radf'... Processing 'agl'... - + Processing 'agl'... Processing 'trj2pdb'... - + Processing 'trj2pdb'... Mathematical Molecular Mechanics - + Mathematical Molecular Mechanics - - Generate trajectory - + + &Quit + &Quit + + + + Quit + Quit + + + + Ctrl+Q + Ctrl+Q + + + + &Help + &Help + + + + F1 + F1 + + + + About + About + + + + Atom &types file + Atom &types file + + + + &Agglomerate file + &Agglomerate file + + + + &Settings + &Settings + + + + agl_all + agl_all + + + + statgen_all + statgen_all @@ -539,7 +601,7 @@ p, li { white-space: pre-wrap; } Work directory - + Work directory @@ -565,49 +627,49 @@ p, li { white-space: pre-wrap; } Browse - + Browse Input file - + Input file Type of trajectory - + Type of trajectory GROMACS text - + GROMACS text PUMA - + PUMA Number of steps - + Number of steps Atom type file - + Atom type file Mask of output files - + Mask of output files Total atom types - + Total atom types @@ -616,7 +678,7 @@ p, li { white-space: pre-wrap; } Log - + Log @@ -625,7 +687,7 @@ p, li { white-space: pre-wrap; } Clear - + Clear @@ -634,36 +696,36 @@ p, li { white-space: pre-wrap; } Start - + Start - - Agglomeration - + + Generate trajectory + Generate trajectory Mask of input files - + Mask of input files Steps - + Steps first - + first last - + last @@ -671,7 +733,7 @@ p, li { white-space: pre-wrap; } Cell, A - + Cell, A @@ -679,7 +741,7 @@ p, li { white-space: pre-wrap; } X - + X @@ -687,7 +749,7 @@ p, li { white-space: pre-wrap; } Y - + Y @@ -695,58 +757,58 @@ p, li { white-space: pre-wrap; } Z - + Z atom 0 - + atom 0 atom 1 - + atom 1 atom 2 - + atom 2 atom 3 - + atom 3 Interaction - + Interaction 0-0 - + 0-0 Save - + Save Add - + Add Remove - + Remove @@ -754,91 +816,91 @@ p, li { white-space: pre-wrap; } Output file - + Output file Depth of search - + Depth of search Analysis - + Analysis Graph - + Graph - - Environment - + + Agglomeration + Agglomeration Molecule - + Molecule Radius - + Radius - - RADF - + + Environment + Environment One atom function - + One atom function Three atom function - + Three atom function R, A - + R, A min - + min max - + max step - + step Angle, deg - + Angle, deg Matrix - + Matrix - - Generate PDB - + + RADF + RADF @@ -848,175 +910,130 @@ p, li { white-space: pre-wrap; } From trajectory snapshot - + From trajectory snapshot File with agglomerate - + File with agglomerate + + + + Generate PDB + Generate PDB Menu - + Menu File &creator - + File &creator &Tools - + &Tools Help - - - - - &Quit - - - - - Quit - - - - - Ctrl+Q - - - - - &Help - - - - - F1 - - - - - About - - - - - Atom &types file - - - - - &Agglomerate file - - - - - &Settings - - - - - agl_all - - - - - statgen_all - + Help SettingsWindow - - - - - - + + + + + + Select component - + Select component - - - - - - + + + + + + All files (*) - + All files (*) - + Settings - + Settings - + mm_trj - + mm_trj - - - - - - + + + + + + Browse - + 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 - + + You need to restart application + You need to restart application + + + Save - + Save - + Close - + Close @@ -1024,47 +1041,47 @@ p, li { white-space: pre-wrap; } N - + N p - + p r - + r g - + g Save image as... - + Save image as... JPEG file (*.jpeg);;Portable Network Graphics file (*.png);;Bitmap file (*.bmp) - + JPEG file (*.jpeg);;Portable Network Graphics file (*.png);;Bitmap file (*.bmp) Graph - + Graph Save - + Save Close - + Close diff --git a/mathmech/mathmech/resources/translations/rus.qm b/mathmech/mathmech/resources/translations/rus.qm index 93ce3cd..086f2fb 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 11b8102..d925965 100644 --- a/mathmech/mathmech/resources/translations/rus.ts +++ b/mathmech/mathmech/resources/translations/rus.ts @@ -946,87 +946,92 @@ p, li { white-space: pre-wrap; } 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 - + + You need to restart application + You need to restart application + + + Save Сохранить - + Close Закрыть diff --git a/mathmech/mathmech/src/mathmech.pro.user b/mathmech/mathmech/src/mathmech.pro.user index df00f35..afa1552 100644 --- a/mathmech/mathmech/src/mathmech.pro.user +++ b/mathmech/mathmech/src/mathmech.pro.user @@ -1,6 +1,6 @@ - + ProjectExplorer.Project.ActiveTarget diff --git a/mathmech/mathmech/src/settingswindow.cpp b/mathmech/mathmech/src/settingswindow.cpp index 2b2b9a0..a2ebdb4 100644 --- a/mathmech/mathmech/src/settingswindow.cpp +++ b/mathmech/mathmech/src/settingswindow.cpp @@ -3,7 +3,6 @@ #include #include #include -#include #include "errorwindow.h" #include "mainwindow.h" @@ -34,6 +33,7 @@ SettingsWindow::SettingsWindow(MainWindow *parent) : applySettings(); } showSettings(); + ui->settings_layout_lang_2->setHidden(true); } SettingsWindow::~SettingsWindow() @@ -248,3 +248,8 @@ void SettingsWindow::on_settings_pushButton_agl_clicked() if (!filename.isEmpty()) ui->settings_lineEdit_agl->setText(filename); } + +void SettingsWindow::on_settings_comboBox_lang_currentIndexChanged(int index) +{ + ui->settings_layout_lang_2->setHidden(false); +} diff --git a/mathmech/mathmech/src/settingswindow.h b/mathmech/mathmech/src/settingswindow.h index ef86aca..7762255 100644 --- a/mathmech/mathmech/src/settingswindow.h +++ b/mathmech/mathmech/src/settingswindow.h @@ -31,6 +31,7 @@ private slots: void on_settings_pushButton_radf_clicked(); void on_settings_pushButton_trj2pdb_clicked(); void on_settings_pushButton_agl_clicked(); + void on_settings_comboBox_lang_currentIndexChanged(int index); private: Ui::SettingsWindow *ui; diff --git a/mathmech/mathmech/src/settingswindow.ui b/mathmech/mathmech/src/settingswindow.ui index 8c4d811..1e5dec5 100644 --- a/mathmech/mathmech/src/settingswindow.ui +++ b/mathmech/mathmech/src/settingswindow.ui @@ -268,6 +268,38 @@ + + + + + + + + 110 + 23 + + + + + + + + + + + + 0 + 0 + + + + You need to restart application + + + + + +