diff --git a/CMakeLists.txt b/CMakeLists.txt
index c6b6a34f2..3e436ee46 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -269,11 +269,6 @@ set(APP_TRANSLATIONS_WO_QT
localization/rssguard_cs.ts
)
-# Add skins.
-set(APP_SKIN_PLAIN
- # resources/skins/base/plain.qss
-)
-
set(APP_MISC
resources/text/CHANGELOG
resources/text/COPYING_GNU_GPL
@@ -374,6 +369,10 @@ if(WIN32)
DESTINATION ./themes)
install(DIRECTORY resources/graphics/flags
DESTINATION ./)
+ install(DIRECTORY resources/skins/base
+ DESTINATION ./skins)
+ install(DIRECTORY resources/html
+ DESTINATION ./)
install(FILES resources/graphics/${APP_LOW_NAME}_128.png
DESTINATION ./
RENAME ${APP_LOW_NAME}.png)
@@ -392,6 +391,10 @@ elseif(UNIX)
DESTINATION share/${APP_LOW_NAME}/themes)
install(DIRECTORY resources/graphics/flags
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
DESTINATION share/applications)
install(FILES resources/graphics/${APP_LOW_NAME}_128.png
diff --git a/localization/rssguard_cs.ts b/localization/rssguard_cs.ts
index 20ea76410..25cac517a 100644
--- a/localization/rssguard_cs.ts
+++ b/localization/rssguard_cs.ts
@@ -188,6 +188,10 @@
&Fullscreen mode
&Režime celé obrazovky
+
+ Web browser
+ Webový prohlížeč
+
FormSettings
@@ -440,6 +444,22 @@
Cannot save settings
Nastavení nelze uložit
+
+ Active skin
+
+
+
+ Selected skin
+
+
+
+ Newly selected skin is activated after the applicaton gets restarted!!!
+
+
+
+ Name
+
+
FormWelcome
@@ -551,5 +571,13 @@
Stop web page loading
Zastavit načítání aktuální webové stránky
+
+ Zoom
+
+
+
+ No title
+
+
diff --git a/localization/rssguard_en.ts b/localization/rssguard_en.ts
index c6454cd85..6be70e609 100644
--- a/localization/rssguard_en.ts
+++ b/localization/rssguard_en.ts
@@ -188,6 +188,10 @@
&Fullscreen mode
+
+ Web browser
+
+
FormSettings
@@ -434,6 +438,22 @@
Cannot save settings
+
+ Active skin
+
+
+
+ Selected skin
+
+
+
+ Newly selected skin is activated after the applicaton gets restarted!!!
+
+
+
+ Name
+
+
FormWelcome
@@ -545,5 +565,13 @@
Stop web page loading
+
+ Zoom
+
+
+
+ No title
+
+
diff --git a/resources/skins/base/plain.xml b/resources/skins/base/plain.xml
new file mode 100644
index 000000000..1b60a5667
--- /dev/null
+++ b/resources/skins/base/plain.xml
@@ -0,0 +1,10 @@
+
+
+ plain
+
+ Martin Rotter
+ rotter.martinos@gmail.com
+
+
+
+
\ No newline at end of file
diff --git a/src/core/defs.h.in b/src/core/defs.h.in
index 0542a53aa..3bf8be0b2 100644
--- a/src/core/defs.h.in
+++ b/src/core/defs.h.in
@@ -50,6 +50,7 @@
#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/themes")
+#define APP_HTML_PATH APP_PREFIX + QString("/share/rssguard/html")
#define APP_THEME_SYSTEM QString()
#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")
@@ -59,6 +60,7 @@
#define APP_SKIN_PATH QApplication::applicationDirPath() + QString("/skins")
#define APP_INFO_PATH QApplication::applicationDirPath()
#define APP_THEME_PATH QApplication::applicationDirPath() + QString("/themes")
+#define APP_HTML_PATH QApplication::applicationDirPath() + QString("/html")
#define APP_THEME_SYSTEM "-"
#define APP_FLAGS_PATH QApplication::applicationDirPath() + QString("/flags")
#define APP_ICON_PATH QApplication::applicationDirPath() + QString("/@APP_LOW_NAME@.png")
diff --git a/src/gui/basewebview.cpp b/src/gui/basewebview.cpp
index 53357e75d..16a0b965f 100644
--- a/src/gui/basewebview.cpp
+++ b/src/gui/basewebview.cpp
@@ -96,7 +96,9 @@ void BaseWebView::initializeActions() {
}
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());
}