mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-04 21:27:58 +02:00
Code Issues Releases Wiki Activity

Merge pull request #239 from TheOneRing/win_app_id

Browse Source 
install an app id on Windows, to enable Windows 8 notifications without ...
This commit is contained in:
Uwe L. Korn
2014-07-09 12:39:27 +02:00
parent 0614267c25 7b30cddf8f
commit 151fedaa44
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeModules/NSIS.template.in
View File

@@ -34,6 +34,9 @@
!define NSI_PATH "${SOURCE_PATH}/admin/win/nsi" !define NSI_PATH "${SOURCE_PATH}/admin/win/nsi"
;define app id needed for Windows 8 notifications
!define AppUserModelId org.tomahawk-player.Tomahawk
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; Installer version ; Installer version
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
@@ -366,6 +369,7 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
File "${MING_BIN}\libffi-6.dll" File "${MING_BIN}\libffi-6.dll"
; Snorenotify ; Snorenotify
File "${MING_BIN}\SnoreToast.exe"
File "${MING_BIN}\libsnore.dll" File "${MING_BIN}\libsnore.dll"
File "${MING_LIB}\libsnore\libsnore_backend_snarl.dll" File "${MING_LIB}\libsnore\libsnore_backend_snarl.dll"
File "${MING_LIB}\libsnore\libsnore_backend_snore.dll" File "${MING_LIB}\libsnore\libsnore_backend_snore.dll"
@@ -400,6 +404,7 @@ SectionGroup "Shortcuts"
CreateDirectory "$SMPROGRAMS\Tomahawk" CreateDirectory "$SMPROGRAMS\Tomahawk"
CreateShortCut "$SMPROGRAMS\Tomahawk\LICENSE.lnk" "$INSTDIR\LICENSE.txt" CreateShortCut "$SMPROGRAMS\Tomahawk\LICENSE.lnk" "$INSTDIR\LICENSE.txt"
CreateShortCut "$SMPROGRAMS\Tomahawk\Tomahawk.lnk" "$INSTDIR\tomahawk.exe" CreateShortCut "$SMPROGRAMS\Tomahawk\Tomahawk.lnk" "$INSTDIR\tomahawk.exe"
WinShell::SetLnkAUMI "$SMPROGRAMS\Tomahawk\Tomahawk.lnk" "${AppUserModelId}"
CreateShortCut "$SMPROGRAMS\Tomahawk\Release notes.lnk" "$INSTDIR\NOTES.txt" CreateShortCut "$SMPROGRAMS\Tomahawk\Release notes.lnk" "$INSTDIR\NOTES.txt"
CreateShortCut "$SMPROGRAMS\Tomahawk\Uninstall.lnk" "$INSTDIR\uninstall.exe" CreateShortCut "$SMPROGRAMS\Tomahawk\Uninstall.lnk" "$INSTDIR\uninstall.exe"
SetShellVarContext current SetShellVarContext current
@@ -544,6 +549,8 @@ Section Uninstall
;Start menu shortcuts. ;Start menu shortcuts.
!ifdef OPTION_SECTION_SC_START_MENU !ifdef OPTION_SECTION_SC_START_MENU
SetShellVarContext all SetShellVarContext all
WinShell::UninstAppUserModelId "${AppUserModelId}"
WinShell::UninstShortcut "$SMPROGRAMS\Tomahawk\Tomahawk.lnk"
RMDir /r "$SMPROGRAMS\Tomahawk" RMDir /r "$SMPROGRAMS\Tomahawk"
SetShellVarContext current SetShellVarContext current
!endif !endif

3
src/infoplugins/generic/snorenotify/SnoreNotifyPlugin.cpp
View File

@@ -81,7 +81,8 @@ SnoreNotifyPlugin::SnoreNotifyPlugin()
tDebug( LOGVERBOSE ) << Q_FUNC_INFO << m_snore->primaryNotificationBackend(); tDebug( LOGVERBOSE ) << Q_FUNC_INFO << m_snore->primaryNotificationBackend();
m_application = Snore::Application( qApp->applicationName(), m_defaultIcon ); m_application = Snore::Application( qApp->applicationName(), m_defaultIcon );
m_application.hints().setValue( "desktop-entry" ,"tomahawk" ); m_application.hints().setValue( "windows_app_id", "org.tomahawk-player.Tomahawk" );
m_application.hints().setValue( "desktop-entry", "tomahawk" );
addAlert( InfoNotifyUser, tr( "Notify User" ) ); addAlert( InfoNotifyUser, tr( "Notify User" ) );
addAlert( InfoNowPlaying, tr( "Now Playing" ) ); addAlert( InfoNowPlaying, tr( "Now Playing" ) );