Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

a couple of fixes #62

Merged
merged 3 commits into from
Feb 25, 2024
Merged

a couple of fixes #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
921621d
search for all required Qt components in the first find_package call
kambala-decapitator Feb 25, 2024
5b97533
fix running the app on non-Windows
kambala-decapitator Feb 25, 2024
de4bdb0
[macOS] increase font size in the About window
kambala-decapitator Feb 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ if(WIN32)
endif()

# dependencies
find_package(QT NAMES Qt6 REQUIRED COMPONENTS Core)
set(qtComponents Gui Network Widgets LinguistTools)
if(LINUX)
list(APPEND qtComponents DBus)
endif()
find_package(QT NAMES Qt6 REQUIRED COMPONENTS ${qtComponents})
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS ${qtComponents})

if(MSVC_TOOLSET_VERSION EQUAL 142)
Expand Down
8 changes: 7 additions & 1 deletion creator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
#include <QProcess>
#include <QVersionNumber>
#include <QSignalBlocker>
#include <QApplication>

#if defined(Q_OS_WIN)
#include "diskwriter_windows.h"
Expand Down Expand Up @@ -74,6 +75,12 @@ Creator::Creator(Privileges &privilegesArg, QWidget *parent) :

ui->setupUi(this);

#ifdef Q_OS_MACOS
auto fontAbout = ui->labelAbout->font();
fontAbout.setPointSize(fontAbout.pointSize() + 2);
ui->labelAbout->setFont(fontAbout);
#endif

#if defined(Q_OS_WIN)
diskWriter = new DiskWriter_windows();
devEnumerator = new DeviceEnumerator_windows();
Expand Down Expand Up @@ -305,7 +312,6 @@ void Creator::retranslateUi()
// retranslate dynamic texts
ui->labelVersion->setText(tr("Version: %1\nBuild date: %2").arg(QLatin1String{BUILD_VERSION}, QLatin1String{BUILD_DATE}));

ui->labelAbout->setTextFormat(Qt::RichText);
ui->labelAbout->setText(QString("<html><head/><body><p align=\"center\"><span style=\" font-size:16pt; font-weight:600;\"><h2>&copy; LibreELEC %8</h2></span></p><p align=\"center\">%1<br/>%2</p><p align=\"center\">%3<br/><a href=\"https://github.com/LibreELEC/usb-sd-creator\"><span style=\" text-decoration: underline; color:#0000ff;\">https://github.com/LibreELEC/usb-sd-creator</span></a><br/></p><p align=\"center\">%4<br/>%5</p><p align=\"center\">%6<br/>%7 <br/><br/><a href=\"https://opencollective.com/libreelec/donate\"><img src=\":/icons/opencollective.png\"></a></p></body></html>") \
.arg(tr("This software was created with love and released"))
.arg(tr("under GPLv2, using earlier work from RasPlex."))
Expand Down
3 changes: 3 additions & 0 deletions creator.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -807,6 +807,9 @@
<pointsize>10</pointsize>
</font>
</property>
<property name="textFormat">
<enum>Qt::RichText</enum>
</property>
<property name="alignment">
<set>Qt::AlignHCenter|Qt::AlignTop</set>
</property>
Expand Down
2 changes: 2 additions & 0 deletions main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ void noMessageOutput(QtMsgType type, const QMessageLogContext &context, const QS

int main(int argc, char *argv[])
{
#ifdef Q_OS_WINDOWS
qputenv("QT_QPA_PLATFORM", "windows:darkmode=0");
#endif
QApplication app(argc, argv);

const auto cmdArgs = app.arguments();
Expand Down
Loading