Merge branch 'lammps-gui' of github.com:akohlmey/lammps into lammps-gui
# Conflicts: # tools/lammps-gui/lammpsgui.cpp
This commit is contained in:
@ -62,12 +62,16 @@ LammpsGui::LammpsGui(QWidget *parent, const char *filename) :
|
||||
recent_files.clear();
|
||||
|
||||
lammps_args.clear();
|
||||
lammps_args.push_back(mystrdup("LAMMPS GUI"));
|
||||
lammps_args.push_back(mystrdup("LAMMPS-GUI"));
|
||||
lammps_args.push_back(mystrdup("-log"));
|
||||
lammps_args.push_back(mystrdup("none"));
|
||||
|
||||
setWindowIcon(QIcon(":/lammps-icon-128x128.png"));
|
||||
QFont text_font(":/monospace.ttf");
|
||||
#if (__APPLE__)
|
||||
QFont text_font("Menlo");
|
||||
#else
|
||||
QFont text_font(":/Monospace.ttf");
|
||||
#endif
|
||||
text_font.setStyleHint(QFont::TypeWriter);
|
||||
ui->textEdit->document()->setDefaultFont(text_font);
|
||||
ui->textEdit->setMinimumSize(800, 600);
|
||||
@ -426,7 +430,11 @@ void LammpsGui::run_buffer()
|
||||
logwindow->setWindowTitle("LAMMPS-GUI - Output from running LAMMPS on buffer - " +
|
||||
current_file);
|
||||
logwindow->setWindowIcon(QIcon(":/lammps-icon-128x128.png"));
|
||||
QFont text_font(":/monospace.ttf");
|
||||
#if (__APPLE__)
|
||||
QFont text_font("Menlo");
|
||||
#else
|
||||
QFont text_font(":/Monospace.ttf");
|
||||
#endif
|
||||
text_font.setStyleHint(QFont::TypeWriter);
|
||||
logwindow->document()->setDefaultFont(text_font);
|
||||
logwindow->setLineWrapMode(QPlainTextEdit::NoWrap);
|
||||
|
||||
Reference in New Issue
Block a user