Added empty feed message widget.

This commit is contained in:
Martin Rotter 2013-10-05 07:43:10 +02:00
parent 1e36d7e3e4
commit 27e78b6b20
6 changed files with 64 additions and 15 deletions

View File

@ -191,6 +191,7 @@ set(APP_SOURCES
src/gui/tabbar.cpp src/gui/tabbar.cpp
src/gui/tabcontent.cpp src/gui/tabcontent.cpp
src/gui/cornerbutton.cpp src/gui/cornerbutton.cpp
src/gui/feedmessageviewer.cpp
# CORE sources. # CORE sources.
src/core/debugging.cpp src/core/debugging.cpp
@ -236,6 +237,7 @@ set(APP_HEADERS
src/gui/tabbar.h src/gui/tabbar.h
src/gui/tabcontent.h src/gui/tabcontent.h
src/gui/cornerbutton.h src/gui/cornerbutton.h
src/gui/feedmessageviewer.h
# CORE headers. # CORE headers.
src/core/settings.h src/core/settings.h

View File

@ -4,7 +4,8 @@
// Loads currently active language. // Loads currently active language.
// NOTE: Macro is used due to QTranslator persistency. // NOTE: Macro is used due to QTranslator persistency.
#define LoadLocalization(); \ #define LoadLocalization(); \
QString locale_name = Settings::getInstance()->value(APP_CFG_GEN, \ QString locale_name = Settings::getInstance()->value( \
APP_CFG_GEN, \
"language", \ "language", \
"en").toString(); \ "en").toString(); \
QTranslator qt_translator, app_translator; \ QTranslator qt_translator, app_translator; \

View File

@ -0,0 +1,15 @@
#include "gui/feedmessageviewer.h"
#include "gui/webbrowser.h"
FeedMessageViewer::FeedMessageViewer(QWidget *parent) : TabContent(parent)
{
}
FeedMessageViewer::~FeedMessageViewer() {
qDebug("Destroying FeedMessageViewer instance.");
}
WebBrowser *FeedMessageViewer::webBrowser() {
return NULL;
}

View File

@ -0,0 +1,24 @@
#ifndef FEEDMESSAGEVIEWER_H
#define FEEDMESSAGEVIEWER_H
#include "gui/tabcontent.h"
class WebBrowser;
class FeedMessageViewer : public TabContent {
Q_OBJECT
public:
explicit FeedMessageViewer(QWidget *parent = 0);
virtual ~FeedMessageViewer();
WebBrowser *webBrowser();
signals:
public slots:
};
#endif // FEEDMESSAGEVIEWER_H

View File

@ -81,6 +81,12 @@ void IconThemeFactory::loadCurrentIconTheme(bool notify_widgets) {
"icon_theme", "icon_theme",
"mini-kfaenza").toString(); "mini-kfaenza").toString();
if (m_currentIconTheme == theme_name_from_settings) {
qDebug("Icon theme '%s' already loaded.",
qPrintable(theme_name_from_settings));
return;
}
// Display list of installed themes. // Display list of installed themes.
qDebug("Installed icon themes are: %s.", qDebug("Installed icon themes are: %s.",
qPrintable(installed_themes.join(", "))); qPrintable(installed_themes.join(", ")));
@ -88,7 +94,7 @@ void IconThemeFactory::loadCurrentIconTheme(bool notify_widgets) {
if (installed_themes.contains(theme_name_from_settings)) { if (installed_themes.contains(theme_name_from_settings)) {
// Desired icon theme is installed and can be loaded. // Desired icon theme is installed and can be loaded.
qDebug("Loading theme '%s'.", qPrintable(theme_name_from_settings)); qDebug("Loading icon theme '%s'.", qPrintable(theme_name_from_settings));
QIcon::setThemeName(theme_name_from_settings); QIcon::setThemeName(theme_name_from_settings);
m_currentIconTheme = theme_name_from_settings; m_currentIconTheme = theme_name_from_settings;
} }

View File

@ -9,6 +9,7 @@
#include "gui/tabbar.h" #include "gui/tabbar.h"
#include "gui/iconthemefactory.h" #include "gui/iconthemefactory.h"
#include "gui/webbrowser.h" #include "gui/webbrowser.h"
#include "gui/feedmessageviewer.h"
#include "gui/cornerbutton.h" #include "gui/cornerbutton.h"
@ -43,7 +44,7 @@ TabBar *TabWidget::tabBar() {
void TabWidget::initializeTabs() { void TabWidget::initializeTabs() {
// Create widget for "Feeds" page and add it. // Create widget for "Feeds" page and add it.
WebBrowser *browser = new WebBrowser(this); FeedMessageViewer *browser = new FeedMessageViewer(this);
int index_of_browser = addTab(static_cast<TabContent*>(browser), int index_of_browser = addTab(static_cast<TabContent*>(browser),
QIcon(), QIcon(),
tr("Feeds"), tr("Feeds"),
@ -196,6 +197,6 @@ void TabWidget::fixContentsAfterMove(int from, int to) {
void TabWidget::fixContentsIndexes(int starting_index, int ending_index) { void TabWidget::fixContentsIndexes(int starting_index, int ending_index) {
for ( ; starting_index <= ending_index; starting_index++) { for ( ; starting_index <= ending_index; starting_index++) {
TabContent *content = static_cast<TabContent*>(widget(starting_index)); TabContent *content = static_cast<TabContent*>(widget(starting_index));
content->webBrowser()->setIndex(starting_index); content->setIndex(starting_index);
} }
} }