Added plain skin.

This commit is contained in:
Martin Rotter 2013-09-30 16:47:10 +02:00
parent 1a3c56a332
commit 8a5ee09118
6 changed files with 79 additions and 6 deletions

View file

@ -269,11 +269,6 @@ set(APP_TRANSLATIONS_WO_QT
localization/rssguard_cs.ts localization/rssguard_cs.ts
) )
# Add skins.
set(APP_SKIN_PLAIN
# resources/skins/base/plain.qss
)
set(APP_MISC set(APP_MISC
resources/text/CHANGELOG resources/text/CHANGELOG
resources/text/COPYING_GNU_GPL resources/text/COPYING_GNU_GPL
@ -374,6 +369,10 @@ if(WIN32)
DESTINATION ./themes) DESTINATION ./themes)
install(DIRECTORY resources/graphics/flags install(DIRECTORY resources/graphics/flags
DESTINATION ./) DESTINATION ./)
install(DIRECTORY resources/skins/base
DESTINATION ./skins)
install(DIRECTORY resources/html
DESTINATION ./)
install(FILES resources/graphics/${APP_LOW_NAME}_128.png install(FILES resources/graphics/${APP_LOW_NAME}_128.png
DESTINATION ./ DESTINATION ./
RENAME ${APP_LOW_NAME}.png) RENAME ${APP_LOW_NAME}.png)
@ -392,6 +391,10 @@ elseif(UNIX)
DESTINATION share/${APP_LOW_NAME}/themes) DESTINATION share/${APP_LOW_NAME}/themes)
install(DIRECTORY resources/graphics/flags install(DIRECTORY resources/graphics/flags
DESTINATION share/${APP_LOW_NAME}/) DESTINATION share/${APP_LOW_NAME}/)
install(DIRECTORY resources/skins/base
DESTINATION share/${APP_LOW_NAME}/skins)
install(DIRECTORY resources/html
DESTINATION share/${APP_LOW_NAME})
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/resources/desktop/${APP_LOW_NAME}.desktop install(FILES ${CMAKE_CURRENT_BINARY_DIR}/resources/desktop/${APP_LOW_NAME}.desktop
DESTINATION share/applications) DESTINATION share/applications)
install(FILES resources/graphics/${APP_LOW_NAME}_128.png install(FILES resources/graphics/${APP_LOW_NAME}_128.png

View file

@ -188,6 +188,10 @@
<source>&amp;Fullscreen mode</source> <source>&amp;Fullscreen mode</source>
<translation>&amp;Režime celé obrazovky</translation> <translation>&amp;Režime celé obrazovky</translation>
</message> </message>
<message>
<source>Web browser</source>
<translation type="unfinished">Webový prohlížeč</translation>
</message>
</context> </context>
<context> <context>
<name>FormSettings</name> <name>FormSettings</name>
@ -440,6 +444,22 @@
<source>Cannot save settings</source> <source>Cannot save settings</source>
<translation>Nastavení nelze uložit</translation> <translation>Nastavení nelze uložit</translation>
</message> </message>
<message>
<source>Active skin</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Selected skin</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Newly selected skin is activated after the applicaton gets restarted!!!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Name</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>FormWelcome</name> <name>FormWelcome</name>
@ -551,5 +571,13 @@
<source>Stop web page loading</source> <source>Stop web page loading</source>
<translation>Zastavit načítání aktuální webové stránky</translation> <translation>Zastavit načítání aktuální webové stránky</translation>
</message> </message>
<message>
<source>Zoom </source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No title</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
</TS> </TS>

View file

@ -188,6 +188,10 @@
<source>&amp;Fullscreen mode</source> <source>&amp;Fullscreen mode</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Web browser</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>FormSettings</name> <name>FormSettings</name>
@ -434,6 +438,22 @@
<source>Cannot save settings</source> <source>Cannot save settings</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Active skin</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Selected skin</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Newly selected skin is activated after the applicaton gets restarted!!!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Name</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>FormWelcome</name> <name>FormWelcome</name>
@ -545,5 +565,13 @@
<source>Stop web page loading</source> <source>Stop web page loading</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Zoom </source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No title</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
</TS> </TS>

View file

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<skin version="0.11a">
<name>plain</name>
<author>
<name>Martin Rotter</name>
<email>rotter.martinos@gmail.com</email>
</author>
<style>fusion,plastique</style>
<data/>
</skin>

View file

@ -50,6 +50,7 @@
#define APP_SKIN_PATH APP_PREFIX + QString("/share/rssguard/skins") #define APP_SKIN_PATH APP_PREFIX + QString("/share/rssguard/skins")
#define APP_INFO_PATH APP_PREFIX + QString("/share/rssguard/information") #define APP_INFO_PATH APP_PREFIX + QString("/share/rssguard/information")
#define APP_THEME_PATH APP_PREFIX + QString("/share/rssguard/themes") #define APP_THEME_PATH APP_PREFIX + QString("/share/rssguard/themes")
#define APP_HTML_PATH APP_PREFIX + QString("/share/rssguard/html")
#define APP_THEME_SYSTEM QString() #define APP_THEME_SYSTEM QString()
#define APP_FLAGS_PATH APP_PREFIX + QString("/share/rssguard/flags") #define APP_FLAGS_PATH APP_PREFIX + QString("/share/rssguard/flags")
#define APP_ICON_PATH APP_PREFIX + QString("/share/icons/hicolor/128x128/apps/@APP_LOW_NAME@.png") #define APP_ICON_PATH APP_PREFIX + QString("/share/icons/hicolor/128x128/apps/@APP_LOW_NAME@.png")
@ -59,6 +60,7 @@
#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()
#define APP_THEME_PATH QApplication::applicationDirPath() + QString("/themes") #define APP_THEME_PATH QApplication::applicationDirPath() + QString("/themes")
#define APP_HTML_PATH QApplication::applicationDirPath() + QString("/html")
#define APP_THEME_SYSTEM "-" #define APP_THEME_SYSTEM "-"
#define APP_FLAGS_PATH QApplication::applicationDirPath() + QString("/flags") #define APP_FLAGS_PATH QApplication::applicationDirPath() + QString("/flags")
#define APP_ICON_PATH QApplication::applicationDirPath() + QString("/@APP_LOW_NAME@.png") #define APP_ICON_PATH QApplication::applicationDirPath() + QString("/@APP_LOW_NAME@.png")

View file

@ -96,7 +96,9 @@ void BaseWebView::initializeActions() {
} }
void BaseWebView::displayErrorPage() { void BaseWebView::displayErrorPage() {
// TODO: Add better custom error page. // TODO: Add better custom error page. Custom htmls are now copied during
// "make install" to APP_HTML_PATH. It is needed to setup css absolute
// path by replacing "##" with APP_HTML_PATH/css in "compact_text.html".
setHtml("error", url()); setHtml("error", url());
} }