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

Added Faenza theme, rssguard icon for Mac OSX build. Made definitions.h match pro file.

Browse Source
This commit is contained in:
Martin Rotter 2016-08-04 06:46:09 +02:00
parent f724a7360e
commit 299833f72b
2 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
rssguard.pro
View File

@ -655,6 +655,9 @@ mac {
misc_icons.files = resources/graphics/misc misc_icons.files = resources/graphics/misc
misc_icons.path = Contents/Resources/icons misc_icons.path = Contents/Resources/icons
faenza.files = resources/graphics/Faenza
faenza.path = Contents/Resources/icons
# Initial feeds. # Initial feeds.
misc_feeds.files = resources/initial_feeds misc_feeds.files = resources/initial_feeds
misc_feeds.path = Contents/Resources misc_feeds.path = Contents/Resources
@ -662,6 +665,9 @@ mac {
skins.files = resources/skins skins.files = resources/skins
skins.path = Contents/Resources skins.path = Contents/Resources
misc_icon.files = resources/graphics/$${TARGET}.png
misc_icon.path = Contents/Resources/icons
misc_plain_icon.files = resources/graphics/$${TARGET}_plain.png misc_plain_icon.files = resources/graphics/$${TARGET}_plain.png
misc_plain_icon.path = Contents/Resources/icons misc_plain_icon.path = Contents/Resources/icons
@ -671,9 +677,9 @@ mac {
translations.files = $$OUT_PWD/l10n translations.files = $$OUT_PWD/l10n
translations.path = Contents/Resources translations.path = Contents/Resources
QMAKE_BUNDLE_DATA += misc_sql misc_icons misc_feeds skins \ QMAKE_BUNDLE_DATA += misc_sql misc_icons faenza misc_feeds skins \
misc_plain_icon misc_texts translations misc_icon misc_plain_icon misc_texts translations
INSTALLS += misc_sql misc_icons misc_feeds skins \ INSTALLS += misc_sql misc_icons faenza misc_feeds skins \
misc_plain_icon misc_texts translations misc_icon misc_plain_icon misc_texts translations
} }

30
src/definitions/definitions.h
View File

@ -15,8 +15,8 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with RSS Guard. If not, see <http://www.gnu.org/licenses/>. // along with RSS Guard. If not, see <http://www.gnu.org/licenses/>.
#ifndef DEFS_H #ifndef DEFINITIONS_H
#define DEFS_H #define DEFINITIONS_H
#include <QtGlobal> #include <QtGlobal>
@ -207,6 +207,7 @@
#endif #endif
#if defined(Q_OS_LINUX) #if defined(Q_OS_LINUX)
#define APP_DESKTOP_ENTRY_PATH APP_PREFIX + QString("/share/rssguard/autostart") #define APP_DESKTOP_ENTRY_PATH APP_PREFIX + QString("/share/rssguard/autostart")
#define APP_DESKTOP_SOURCE_ENTRY_FILE "rssguard.desktop.autostart" #define APP_DESKTOP_SOURCE_ENTRY_FILE "rssguard.desktop.autostart"
#define APP_DESKTOP_ENTRY_FILE "rssguard.desktop" #define APP_DESKTOP_ENTRY_FILE "rssguard.desktop"
@ -218,17 +219,21 @@
#define APP_ICON_PATH APP_PREFIX + QString("/share/pixmaps/rssguard.png") #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_ICON_PLAIN_PATH APP_PREFIX + QString("/share/rssguard/icons/rssguard_plain.png")
#define APP_INITIAL_FEEDS_PATH APP_PREFIX + QString("/share/rssguard/initial_feeds") #define APP_INITIAL_FEEDS_PATH APP_PREFIX + QString("/share/rssguard/initial_feeds")
#elif defined(Q_OS_OSX) #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_LANG_PATH QApplication::applicationDirPath() + QString("/../Resources/l10n")
#define APP_INFO_PATH APP_PREFIX + QString("/share/rssguard/information") #define APP_SKIN_PATH QApplication::applicationDirPath() + QString("/../Resources/skins")
#define APP_THEME_PATH APP_PREFIX + QString("/share/rssguard/icons") #define APP_INFO_PATH QApplication::applicationDirPath() + QString("/../Resources/information")
#define APP_MISC_PATH APP_PREFIX + QString("/share/rssguard/misc") #define APP_THEME_PATH QApplication::applicationDirPath() + QString("/../Resources/icons")
#define APP_ICON_PATH APP_PREFIX + QString("/share/pixmaps/rssguard.png") #define APP_MISC_PATH QApplication::applicationDirPath() + QString("/../Resources/misc")
#define APP_INFO_PATH APP_PREFIX + QString("/share/rssguard/information") #define APP_ICON_PATH QApplication::applicationDirPath() + QString("/../Resources/icons/rssguard.png")
#define APP_ICON_PLAIN_PATH APP_PREFIX + QString("/share/rssguard/icons/rssguard_plain.png") #define APP_INFO_PATH QApplication::applicationDirPath() + QString("/../Resources/information")
#define APP_INITIAL_FEEDS_PATH APP_PREFIX + QString("/share/rssguard/initial_feeds") #define APP_ICON_PLAIN_PATH QApplication::applicationDirPath() + QString("/../Resources/icons/rssguard_plain.png")
#define APP_INITIAL_FEEDS_PATH QApplication::applicationDirPath() + QString("/../Resources/initial_feeds")
#elif defined(Q_OS_WIN) #elif defined(Q_OS_WIN)
#define APP_LANG_PATH QApplication::applicationDirPath() + QString("/l10n") #define APP_LANG_PATH QApplication::applicationDirPath() + QString("/l10n")
#define APP_SKIN_PATH QApplication::applicationDirPath() + QString("/skins") #define APP_SKIN_PATH QApplication::applicationDirPath() + QString("/skins")
#define APP_INFO_PATH QApplication::applicationDirPath() #define APP_INFO_PATH QApplication::applicationDirPath()
@ -237,6 +242,7 @@
#define APP_ICON_PATH QApplication::applicationDirPath() + QString("/rssguard.png") #define APP_ICON_PATH QApplication::applicationDirPath() + QString("/rssguard.png")
#define APP_ICON_PLAIN_PATH QApplication::applicationDirPath() + QString("/rssguard_plain.png") #define APP_ICON_PLAIN_PATH QApplication::applicationDirPath() + QString("/rssguard_plain.png")
#define APP_INITIAL_FEEDS_PATH QApplication::applicationDirPath() + QString("/initial_feeds") #define APP_INITIAL_FEEDS_PATH QApplication::applicationDirPath() + QString("/initial_feeds")
#endif #endif
#endif // DEFS_H #endif // DEFINITIONS_H