From c8580935a9ad7385ec40d1a9000cc3e7600bf45d Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Fri, 31 Jan 2014 07:18:01 +0100 Subject: [PATCH] UTF-8 made default encoding for new feeds. --- src/core/defs.h.in | 1 + src/gui/formstandardfeeddetails.cpp | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/src/core/defs.h.in b/src/core/defs.h.in index dc7084400..2314fd23d 100755 --- a/src/core/defs.h.in +++ b/src/core/defs.h.in @@ -23,6 +23,7 @@ #define APP_VERSION "@APP_VERSION@" #define APP_USERAGENT QString("@APP_NAME@/@APP_VERSION@ (@APP_URL@) on @CMAKE_SYSTEM@; Webkit/") + qWebKitVersion() +#define DEFAULT_FEED_ENCODING "UTF-8" #define URL_REGEXP "^(http|https|feed|ftp):\\/\\/[\\w\\-_]+(\\.[\\w\\-_]+)+([\\w\\-\\.,@?^=%&:/~\\+#]*[\\w\\-\\@?^=%&/~\\+#])?$" #define USER_AGENT_HTTP_HEADER "User-Agent" #define TEXT_TITLE_LIMIT 30 diff --git a/src/gui/formstandardfeeddetails.cpp b/src/gui/formstandardfeeddetails.cpp index 7f953b984..184c7cccd 100644 --- a/src/gui/formstandardfeeddetails.cpp +++ b/src/gui/formstandardfeeddetails.cpp @@ -50,6 +50,12 @@ int FormStandardFeedDetails::exec(FeedsModelStandardFeed *input_feed) { // Make sure that "default" icon is used as the default option for new // feed. m_actionUseDefaultIcon->trigger(); + + int default_encoding_index = m_ui->m_cmbEncoding->findText(DEFAULT_FEED_ENCODING); + + if (default_encoding_index >= 0) { + m_ui->m_cmbEncoding->setCurrentIndex(default_encoding_index); + } } else { // User is editing existing category.