FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #44 from keinkurt/master

Browse Source 
add Mac OSX defines and installation paths
This commit is contained in:
martinrotter 2016-08-04 06:25:15 +02:00 committed by GitHub
commit 75f704628f
3 changed files with 58 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
resources/macosx/Info.plist.in
View File

@ -6,33 +6,31 @@
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string>
<string>@EXECUTABLE@</string>
<key>CFBundleGetInfoString</key>
<string>${MACOSX_BUNDLE_INFO_STRING}</string>
<string>@EXECUTABLE@ (C) 2011-2016 Martin Rotter</string>
<key>CFBundleIconFile</key>
<string>${MACOSX_BUNDLE_ICON_FILE}</string>
<string>@ICON@</string>
<key>CFBundleIdentifier</key>
<string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
<string>org.rssguard.RSSGuard</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
<string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string>
<key>CFBundleName</key>
<string>${MACOSX_BUNDLE_BUNDLE_NAME}</string>
<string>@EXECUTABLE@</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
<string>3.3.3</string>
<key>CFBundleSignature</key>
<string>????</string>
<string>@TYPEINFO@<string>
<key>CFBundleVersion</key>
<string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
<string>1.0.0</string>
<key>CSResourcesFileMapped</key>
<true/>
<key>LSRequiresCarbon</key>
<true/>
<key>NSHumanReadableCopyright</key>
<string>${MACOSX_BUNDLE_COPYRIGHT}</string>
<string>(C) 2011-2016 Martin Rotter</string>
<!--
<key>NOTE</key>
<string>Icon is disabled from dock. Only systray is used.</string>

39
rssguard.pro
View File

@ -638,3 +638,42 @@ unix:!mac {
misc_icon misc_plain_icon skins misc_texts \
desktop_file desktop_file_autostart translations
}
mac {
CONFIG += app_bundle
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8
QMAKE_INFO_PLIST = resources/macosx/Info.plist.in
ICON = resources/macosx/$${TARGET}.icns
IDENTIFIER = org.$${TARGET}.RSSGuard
# Install SQL initializers.
misc_sql.files = resources/misc
misc_sql.path = Contents/Resources
# Misc icons.
misc_icons.files = resources/graphics/misc
misc_icons.path = Contents/Resources/icons
# Initial feeds.
misc_feeds.files = resources/initial_feeds
misc_feeds.path = Contents/Resources
skins.files = resources/skins
skins.path = Contents/Resources
misc_plain_icon.files = resources/graphics/$${TARGET}_plain.png
misc_plain_icon.path = Contents/Resources/icons
misc_texts.files = $$TEXTS
misc_texts.path = Contents/Resources/information
translations.files = $$OUT_PWD/l10n
translations.path = Contents/Resources
QMAKE_BUNDLE_DATA += misc_sql misc_icons misc_feeds skins \
misc_plain_icon misc_texts translations
INSTALLS += misc_sql misc_icons misc_feeds skins \
misc_plain_icon misc_texts translations
}

10
src/definitions/definitions.h
View File

@ -218,6 +218,16 @@
#define APP_ICON_PATH APP_PREFIX + QString("/share/pixmaps/rssguard.png")
#define APP_ICON_PLAIN_PATH APP_PREFIX + QString("/share/rssguard/icons/rssguard_plain.png")
#define APP_INITIAL_FEEDS_PATH APP_PREFIX + QString("/share/rssguard/initial_feeds")
#elif defined(Q_OS_OSX)
#define APP_LANG_PATH APP_PREFIX + QString("/share/rssguard/l10n")
#define APP_SKIN_PATH APP_PREFIX + QString("/share/rssguard/skins")
#define APP_INFO_PATH APP_PREFIX + QString("/share/rssguard/information")
#define APP_THEME_PATH APP_PREFIX + QString("/share/rssguard/icons")
#define APP_MISC_PATH APP_PREFIX + QString("/share/rssguard/misc")
#define APP_ICON_PATH APP_PREFIX + QString("/share/pixmaps/rssguard.png")
#define APP_INFO_PATH APP_PREFIX + QString("/share/rssguard/information")
#define APP_ICON_PLAIN_PATH APP_PREFIX + QString("/share/rssguard/icons/rssguard_plain.png")
#define APP_INITIAL_FEEDS_PATH APP_PREFIX + QString("/share/rssguard/initial_feeds")
#elif defined(Q_OS_WIN)
#define APP_LANG_PATH QApplication::applicationDirPath() + QString("/l10n")
#define APP_SKIN_PATH QApplication::applicationDirPath() + QString("/skins")