simplify font selection and prepare for making it a preference
This commit is contained in:
Binary file not shown.
@ -140,12 +140,12 @@ LammpsGui::LammpsGui(QWidget *parent, const char *filename) :
|
|||||||
lammps_args.push_back(mystrdup("none"));
|
lammps_args.push_back(mystrdup("none"));
|
||||||
|
|
||||||
setWindowIcon(QIcon(":/lammps-icon-128x128.png"));
|
setWindowIcon(QIcon(":/lammps-icon-128x128.png"));
|
||||||
#if (__APPLE__)
|
|
||||||
QFont text_font("Menlo");
|
QFont all_font("Arial", -1);
|
||||||
#else
|
all_font.setStyleHint(QFont::SansSerif, QFont::PreferOutline);
|
||||||
QFont text_font(":/Monospace.ttf");
|
QApplication::setFont(all_font);
|
||||||
#endif
|
QFont text_font("Monospace");
|
||||||
text_font.setStyleHint(QFont::TypeWriter);
|
text_font.setStyleHint(QFont::Monospace, QFont::PreferOutline);
|
||||||
ui->textEdit->document()->setDefaultFont(text_font);
|
ui->textEdit->document()->setDefaultFont(text_font);
|
||||||
ui->textEdit->setMinimumSize(600, 400);
|
ui->textEdit->setMinimumSize(600, 400);
|
||||||
|
|
||||||
@ -729,9 +729,6 @@ void LammpsGui::about()
|
|||||||
msg.setIconPixmap(QPixmap(":/lammps-icon-128x128.png").scaled(64, 64));
|
msg.setIconPixmap(QPixmap(":/lammps-icon-128x128.png").scaled(64, 64));
|
||||||
msg.setStandardButtons(QMessageBox::Ok);
|
msg.setStandardButtons(QMessageBox::Ok);
|
||||||
QFont font;
|
QFont font;
|
||||||
font.setFixedPitch(true);
|
|
||||||
font.setStyleHint(QFont::TypeWriter);
|
|
||||||
font.setFamily("Arial");
|
|
||||||
font.setPointSize(8);
|
font.setPointSize(8);
|
||||||
msg.setFont(font);
|
msg.setFont(font);
|
||||||
msg.exec();
|
msg.exec();
|
||||||
|
|||||||
@ -1,6 +1,5 @@
|
|||||||
<!DOCTYPE RCC><RCC version="1.0">
|
<!DOCTYPE RCC><RCC version="1.0">
|
||||||
<qresource>
|
<qresource>
|
||||||
<file alias="Monospace.ttf">DejaVuSansMono.ttf</file>
|
|
||||||
<file>lammps-icon-128x128.png</file>
|
<file>lammps-icon-128x128.png</file>
|
||||||
</qresource>
|
</qresource>
|
||||||
</RCC>
|
</RCC>
|
||||||
|
|||||||
Reference in New Issue
Block a user