Commit b386f19d authored by Ingemar Ceicer's avatar Ingemar Ceicer

BUGG

parent 4133b6ea
......@@ -1640,12 +1640,12 @@ void Hash::checksum()
ui2->setupUi(d);
//const QFont fixedFont = QFontDatabase::systemFont(QFontDatabase::FixedFont);
// Font
QString fontPath = ":/fonts/fonts/UbuntuMono-R.ttf";
int id = QFontDatabase::addApplicationFont(fontPath);
QString family = QFontDatabase::applicationFontFamilies(id).at(0);
QFont default_font(family);
default_font.setPointSize(12);
ui2->textBrowser->setFont(default_font);
// QString fontPath = ":/fonts/fonts/UbuntuMono-R.ttf";
// int id = QFontDatabase::addApplicationFont(fontPath);
// QString family = QFontDatabase::applicationFontFamilies(id).at(0);
// QFont default_font(family);
// default_font.setPointSize(12);
// ui2->textBrowser->setFont(default_font);
// End Font
/* COLOR */
QColor c(RED, GREEN, BLUE);
......@@ -3470,12 +3470,12 @@ void Hash::dropEvent(QDropEvent *ev)
ui2->setupUi(d);
//const QFont fixedFont = QFontDatabase::systemFont(QFontDatabase::FixedFont);
// Font
QString fontPath = ":/fonts/fonts/UbuntuMono-R.ttf";
int id = QFontDatabase::addApplicationFont(fontPath);
QString family = QFontDatabase::applicationFontFamilies(id).at(0);
QFont default_font(family);
default_font.setPointSize(12);
ui2->textBrowser->setFont(default_font);
// QString fontPath = ":/fonts/fonts/UbuntuMono-R.ttf";
// int id = QFontDatabase::addApplicationFont(fontPath);
// QString family = QFontDatabase::applicationFontFamilies(id).at(0);
// QFont default_font(family);
// default_font.setPointSize(12);
// ui2->textBrowser->setFont(default_font);
// End Font
/* COLOR */
QColor c(RED, GREEN, BLUE);
......
......@@ -57,6 +57,8 @@
#define GREEN 255
#define BLUE 221
#define LINUX_FONT 13
#define WINDOWS_FONT 10
......
......@@ -50,7 +50,7 @@ TARGET = hashsum-2.5.0
# CONFIG += /opt/Qt5.13.1/5.13.1/gcc_64/bin/lrelease embed_translations
## Windows
# CONFIG += C:\Qt\Qt5.13.2_static\5.13.2\bin\lrelease embed_translations
CONFIG += C:\Qt\Qt5.14.1\5.14.1\bin\lrelease embed_translations
CONFIG += C:\Qt\Qt5.14.2\5.14.2\bin\lrelease embed_translations
## 64-bit Lubuntu 14.04
# CONFIG += /opt/Qt5.8.0/5.8/gcc_64/bin\lrelease embed_translations
## Ubuntu 18.04
......
......@@ -33,10 +33,10 @@ int main(int argc, char *argv[])
//Font
QFontDatabase::addApplicationFont(":/fonts/PTSans-Regular.ttf");
#ifdef Q_OS_WIN // Windows 32- and 64-bit
QFont f = QFont("PT Sans", 10);
QFont f = QFont("PT Sans", WINDOWS_FONT);
#endif
#ifdef Q_OS_LINUX // Linux
QFont f = QFont("PT Sans", 12);
QFont f = QFont("PT Sans", LINUX_FONT);
#endif
// a.setFont(f);
QApplication::setFont(f);
......
/********************************************************************************
** Form generated from reading UI file 'hash.ui'
**
** Created by: Qt User Interface Compiler version 5.14.1
** Created by: Qt User Interface Compiler version 5.14.2
**
** WARNING! All changes made in this file will be lost when recompiling UI file!
********************************************************************************/
......
/********************************************************************************
** Form generated from reading UI file 'license.ui'
**
** Created by: Qt User Interface Compiler version 5.14.1
** Created by: Qt User Interface Compiler version 5.14.2
**
** WARNING! All changes made in this file will be lost when recompiling UI file!
********************************************************************************/
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment