diff --git a/assets/Roboto-Regular.ttf b/assets/Roboto-Regular.ttf new file mode 100644 index 0000000..2c97eea Binary files /dev/null and b/assets/Roboto-Regular.ttf differ diff --git a/assets/resources.qrc b/assets/resources.qrc index 51ddfa5..3a16809 100644 --- a/assets/resources.qrc +++ b/assets/resources.qrc @@ -30,5 +30,6 @@ bg_rearcam.png rearcam-hot.png recordactive-hot.png + Roboto-Regular.ttf diff --git a/src/autoapp/UI/MainWindow.cpp b/src/autoapp/UI/MainWindow.cpp index 4fdd888..e48bdc9 100644 --- a/src/autoapp/UI/MainWindow.cpp +++ b/src/autoapp/UI/MainWindow.cpp @@ -25,6 +25,8 @@ #include #include #include +#include +#include namespace f1x { @@ -50,6 +52,12 @@ MainWindow::MainWindow(configuration::IConfiguration::Pointer configuration, QWi QLabel { color: #ffffff; font-weight: bold;} \ "); + // Set default font and size + int id = QFontDatabase::addApplicationFont(":/Roboto-Regular.ttf"); + QString family = QFontDatabase::applicationFontFamilies(id).at(0); + QFont _font(family, 11); + qApp->setFont(_font); + // inits by files QFileInfo wallpaperDayFile("wallpaper.png"); this->wallpaperDayFileExists = wallpaperDayFile.exists(); @@ -179,7 +187,6 @@ MainWindow::MainWindow(configuration::IConfiguration::Pointer configuration, QWi ui_->pushButtonSave->hide(); ui_->pushButtonRearcam->hide(); ui_->pushButtonRearcamBack->hide(); - ui_->rearcamBG->hide(); if (!this->cameraButtonForce) { ui_->pushButtonCameraShow->hide(); diff --git a/src/autoapp/UI/mainwindow.ui b/src/autoapp/UI/mainwindow.ui index e171a97..64d1e13 100644 --- a/src/autoapp/UI/mainwindow.ui +++ b/src/autoapp/UI/mainwindow.ui @@ -30,9 +30,23 @@ 668 12 120 - 20 + 24 + + + 120 + 24 + + + + + Roboto + 16 + 75 + true + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -41,39 +55,84 @@ 578 - 408 + 368 210 - 20 + 24 + + + 210 + 24 + + + + + Roboto + 14 + 75 + true + PreferAntialias + + - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::AlignBottom|Qt::AlignRight|Qt::AlignTrailing 578 - 428 + 412 210 - 20 + 24 + + + 210 + 24 + + + + + Roboto + 8 + 75 + true + PreferAntialias + + - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::AlignBottom|Qt::AlignRight|Qt::AlignTrailing 578 - 448 + 446 210 - 20 + 24 + + + 210 + 24 + + + + + Roboto + 8 + 75 + true + PreferAntialias + + - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::AlignBottom|Qt::AlignRight|Qt::AlignTrailing @@ -475,6 +534,9 @@ + + true + 284 @@ -553,17 +615,10 @@ true - - - - 0 - 0 - 800 - 480 - - - + + true + 0 @@ -595,6 +650,8 @@ pushButtonBrightness pushButtonExit - + + +