From 80c34b071c8d3fbe439e0010dfc951bfa1e9b256 Mon Sep 17 00:00:00 2001 From: Jorge Capona Date: Mon, 30 Aug 2021 13:51:37 -0400 Subject: [PATCH 1/3] Don't set window title if not specified --- src/main.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index efdd2a4..c465e15 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -156,7 +156,7 @@ int main(int argc, char *argv[]) parser.addOption(kioskModeOption); QCommandLineOption sizeOption(QStringList() << "s" << "size", "Window size relative to screen, expressed as 'x' (e.g. '0.6x0.4'), where each scalar is a decimal number from 0 to 1.", "size", "0.65x0.55"); parser.addOption(sizeOption); - QCommandLineOption titleOption(QStringList() << "t" << "window-title", "Specify a title for the window. This will appear in the title bar.", "title", "web-renderer"); + QCommandLineOption titleOption(QStringList() << "t" << "window-title", "Specify a title for the window. This will appear in the title bar.", "title", ""); parser.addOption(titleOption); QCommandLineOption iconOption(QStringList() << "i" << "icon", "Specify the path to an icon to be set as the application icon. This will appear in the title bar (unless the '--hide-frame' option is selected), and in the application bar.", "path", ""); parser.addOption(iconOption); @@ -267,9 +267,11 @@ int main(int argc, char *argv[]) //////////////// qInfo() << "Configuring view"; - app.setApplicationName(titleArg); - rootObject->setProperty("title", titleArg); - + if (titleArg != "") { + app.setApplicationName(titleArg); + rootObject->setProperty("title", titleArg); + } + const QSize &screenSize = app.primaryScreen()->size(); if (kioskModeArg) { From aed4ddeaaec330bda515a10c8300aa7f17d57d04 Mon Sep 17 00:00:00 2001 From: Jorge Capona Date: Mon, 30 Aug 2021 13:53:34 -0400 Subject: [PATCH 2/3] Update deb-build workflow --- .github/workflows/deb-build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/deb-build.yml b/.github/workflows/deb-build.yml index 4c2d215..6f5115b 100644 --- a/.github/workflows/deb-build.yml +++ b/.github/workflows/deb-build.yml @@ -93,6 +93,7 @@ jobs: repository: ${{ env.PACKAGECLOUD_REPO }}/${{ env.OS }}/${{ env.DISTRO }} env: PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }} + if: github.ref == 'refs/heads/master' # dsc - uses: docker://lpenz/ghaction-packagecloud:v0.3 @@ -101,3 +102,4 @@ jobs: files: ./artifacts/${{ env.ARTIFACT_PREFIX }}.dsc env: PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }} + if: github.ref == 'refs/heads/master' From c24fe82d89aa92ac1afd43fd2a05654ef4b3ce61 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 30 Aug 2021 17:55:30 +0000 Subject: [PATCH 3/3] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index c465e15..f1384c4 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -271,7 +271,7 @@ int main(int argc, char *argv[]) app.setApplicationName(titleArg); rootObject->setProperty("title", titleArg); } - + const QSize &screenSize = app.primaryScreen()->size(); if (kioskModeArg) {