Skip to content

Use webpage title if title argument is not provided #36

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

Draft
jcapona wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Use webpage title if title argument is not provided #36

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
80c34b0
Don't set window title if not specified
jcapona Aug 30, 2021
aed4dde
Update deb-build workflow
jcapona Aug 30, 2021
c24fe82
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 30, 2021
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: 2 additions & 0 deletions .github/workflows/deb-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -101,3 +102,4 @@ jobs:
files: ./artifacts/${{ env.ARTIFACT_PREFIX }}.dsc
env:
PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
if: github.ref == 'refs/heads/master'
8 changes: 5 additions & 3 deletions src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 '<width_scalar>x<height_scalar>' (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);
Expand Down Expand Up @@ -267,8 +267,10 @@ 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)
Expand Down