Skip to content

Linux/Wayland: make window title bar icon work#699

Merged
ddennedy merged 3 commits intomltframework:masterfrom
eszlari:patch-3
Feb 27, 2019
Merged

Linux/Wayland: make window title bar icon work#699
ddennedy merged 3 commits intomltframework:masterfrom
eszlari:patch-3

Conversation

@eszlari
Copy link
Copy Markdown
Contributor

@eszlari eszlari commented Feb 24, 2019

Otherwise, only a generic icon is shown.

This must match the naming scheme of packaging/linux/org.shotcut.Shotcut.desktop.

Also QGuiApplication::setDesktopFileName("org.shotcut.Shotcut"); needs to be added somewhere in main.

@eszlari
Copy link
Copy Markdown
Contributor Author

eszlari commented Feb 24, 2019

@ddennedy
Copy link
Copy Markdown
Member

This breaks loading existing settings on macOS. Also, technically, the organization responsible for Shotcut is Meltytech, whose domain is meltytech.com and shotcut.org is the product website. You should consider changing the name of the desktop file. Does that mean the package name must change to com.meltytech.Shotcut? That would be confusing for users to change and remember. I am open to a compile define macro to change this for flatpak.

@eszlari
Copy link
Copy Markdown
Contributor Author

eszlari commented Feb 26, 2019

You should consider changing the name of the desktop file. Does that mean the package name must change to com.meltytech.Shotcut?

Unfortunately, flatpak doesn't support renaming yet: flatpak/flatpak#963

@ddennedy
Copy link
Copy Markdown
Member

OK, please add setDesktopFileName("org.shotcut.Shotcut"); inside the #ifdef Q_OS_LINUX. Also, I think this change could apply to BSD in which case it should be #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)

@eszlari
Copy link
Copy Markdown
Contributor Author

eszlari commented Feb 26, 2019

please add setDesktopFileName("org.shotcut.Shotcut");

I'm no C++ expert, but will this work? Notice that, it's called QGuiApplication::setDesktopFileName and not QCoreApplication::setDesktopFileName!

@ddennedy
Copy link
Copy Markdown
Member

Yes, because Shotcut's Application inherits from QCoreApplication.

@ddennedy ddennedy added this to the v19.02 milestone Feb 27, 2019
@ddennedy ddennedy merged commit 3e52f17 into mltframework:master Feb 27, 2019
@eszlari eszlari mentioned this pull request Feb 27, 2019
@eszlari eszlari deleted the patch-3 branch March 28, 2019 03:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants