Local changes.

resources/misc/db_init_mysql.sql

@@ -69,6 +69,7 @@ CREATE TABLE IF NOT EXISTS Messages (
   date_created    BIGINT      NOT NULL CHECK (date_created != 0),
   contents        TEXT,
   is_pdeleted     INTEGER(1)  NOT NULL DEFAULT 0 CHECK (is_pdeleted >= 0 AND is_pdeleted <= 1),
+  enclosures      TEXT,
   
   FOREIGN KEY (feed) REFERENCES Feeds (id)
 );
@@ -83,4 +84,4 @@ INSERT INTO Feeds (title, description, date_created, category, encoding, url, pr
 -- !
 INSERT INTO Feeds (title, description, date_created, category, encoding, url, protected, update_type, type) VALUES ('LXer: Linux News', 'The world is talking about GNU/Linux and Free/Open Source Software.', 1388678961000, 1, 'UTF-8', 'http://lxer.com/module/newswire/headlines.rss', 0, 1, 2);
 -- !
-INSERT INTO Feeds (title, description, date_created, category, encoding, url, protected, update_type, update_interval, type) VALUES ('Recent Commits', 'Recent commits for RSS Guard project.', 1388678961000, 2, 'UTF-8', 'http://bitbucket.org/skunkos/rssguard/rss', 0, 2, 30, 1);
+INSERT INTO Feeds (title, description, date_created, category, encoding, url, protected, update_type, update_interval, type) VALUES ('Recent Commits', 'Recent commits for RSS Guard project.', 1388678961000, 2, 'UTF-8', 'http://bitbucket.org/skunkos/rssguard/rss', 0, 2, 30, 1);

resources/text/CHANGELOG

@@ -3,7 +3,7 @@
 
 Fixed:
 <ul>
-<li></li>
+<li>Some MySQL-related fixes.</li>
 </ul>
 
 Added:

src/core/parsingfactory.cpp

@@ -86,8 +86,7 @@ QList<Message> ParsingFactory::parseAsATOM10(const QString &data) {
     new_message.m_createdFromFeed = !new_message.m_created.isNull();
 
     if (!new_message.m_createdFromFeed) {
-      // Date was NOT obtained from the feed,
+      // Date was NOT obtained from the feed, set current date as creation date for the message.
-      // set current date as creation date for the message.
       new_message.m_created = current_time;
     }
 
@@ -159,8 +158,7 @@ QList<Message> ParsingFactory::parseAsRDF(const QString &data) {
     new_message.m_createdFromFeed = !new_message.m_created.isNull();
 
     if (!new_message.m_createdFromFeed) {
-      // Date was NOT obtained from the feed,
+      // Date was NOT obtained from the feed, set current date as creation date for the message.
-      // set current date as creation date for the message.
       new_message.m_created = current_time;
     }
 

src/definitions/definitions.h.in

@@ -137,6 +137,7 @@
 #define MSG_DB_DCREATED_INDEX     8
 #define MSG_DB_CONTENTS_INDEX     9
 #define MSG_DB_PDELETED_INDEX     10
+#define MSG_DB_ENCLOSURES_INDEX   11
 
 // Indexes of columns as they are DEFINED IN THE TABLE for CATEGORIES.
 #define CAT_DB_ID_INDEX           0

src/gui/formsettings.cpp

@@ -131,6 +131,7 @@ FormSettings::FormSettings(QWidget *parent) : QDialog(parent), m_ui(new Ui::Form
   connect(m_ui->m_cmbSelectToolBar, SIGNAL(currentIndexChanged(int)), m_ui->m_stackedToolbars, SLOT(setCurrentIndex(int)));
   connect(m_ui->m_cmbDatabaseDriver, SIGNAL(currentIndexChanged(int)), this, SLOT(selectSqlBackend(int)));
   connect(m_ui->m_btnDownloadsTargetDirectory, SIGNAL(clicked()), this, SLOT(selectDownloadsDirectory()));
+  connect(m_ui->m_checkMysqlShowPassword, SIGNAL(toggled(bool)), this, SLOT(switchMysqlPasswordVisiblity(bool)));
 
   // Load all settings.
   loadGeneral();
@@ -494,8 +495,10 @@ void FormSettings::loadDataStorage() {
 
     m_ui->m_txtMysqlHostname->lineEdit()->setText(settings->value(GROUP(Database), SETTING(Database::MySQLHostname)).toString());
     m_ui->m_txtMysqlUsername->lineEdit()->setText(settings->value(GROUP(Database), SETTING(Database::MySQLUsername)).toString());
-    m_ui->m_txtMysqlPassword->lineEdit()->setText(settings->value(GROUP(Database), SETTING(Database::MySQLUsername)).toString());
+    m_ui->m_txtMysqlPassword->lineEdit()->setText(settings->value(GROUP(Database), SETTING(Database::MySQLPassword)).toString());
     m_ui->m_spinMysqlPort->setValue(settings->value(GROUP(Database), SETTING(Database::MySQLPort)).toInt());
+
+    m_ui->m_checkMysqlShowPassword->setChecked(false);
   }
 
   int index_current_backend = m_ui->m_cmbDatabaseDriver->findData(settings->value(GROUP(Database), SETTING(Database::ActiveDriver)).toString());
@@ -602,6 +605,10 @@ void FormSettings::selectSqlBackend(int index) {
   }
 }
 
+void FormSettings::switchMysqlPasswordVisiblity(bool visible) {
+  m_ui->m_txtMysqlPassword->lineEdit()->setEchoMode(visible ? QLineEdit::Normal : QLineEdit::PasswordEchoOnEdit);
+}
+
 void FormSettings::loadGeneral() {
   m_ui->m_checkAutostart->setText(m_ui->m_checkAutostart->text().arg(APP_NAME));
   m_ui->m_checkForUpdatesOnStart->setChecked(qApp->settings()->value(GROUP(General), SETTING(General::UpdateOnStartup)).toBool());

src/gui/formsettings.h

@@ -77,6 +77,7 @@ class FormSettings : public QDialog {
     void onMysqlPasswordChanged(const QString &new_password);
     void onMysqlDataStorageEdited();
     void selectSqlBackend(int index);
+    void switchMysqlPasswordVisiblity(bool visible);
 
     void loadLanguage();
     void saveLanguage();

src/gui/formsettings.ui

@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>951</width>
+    <width>990</width>
     <height>498</height>
    </rect>
   </property>
@@ -88,7 +88,7 @@
    <item row="0" column="1">
     <widget class="QStackedWidget" name="m_stackedSettings">
      <property name="currentIndex">
-      <number>7</number>
+      <number>1</number>
      </property>
      <widget class="QWidget" name="m_pageGeneral">
       <layout class="QFormLayout" name="formLayout_5">
@@ -316,7 +316,7 @@ Authors of this application are NOT responsible for lost data.</string>
            <item row="2" column="1">
             <widget class="LineEditWithStatus" name="m_txtMysqlPassword" native="true"/>
            </item>
-           <item row="3" column="1">
+           <item row="4" column="1">
             <layout class="QHBoxLayout" name="horizontalLayout_11">
              <item>
               <widget class="QPushButton" name="m_btnMysqlTestSetup">
@@ -343,7 +343,7 @@ Authors of this application are NOT responsible for lost data.</string>
              </item>
             </layout>
            </item>
-           <item row="4" column="0" colspan="2">
+           <item row="5" column="0" colspan="2">
             <widget class="QLabel" name="m_lblMysqlInfo">
              <property name="text">
               <string>Note that speed of used MySQL server and latency of used connection medium HEAVILY influences the final performance of this application. Using slow database connections leads to bad performance when browsing feeds or messages.</string>
@@ -359,6 +359,16 @@ Authors of this application are NOT responsible for lost data.</string>
              </property>
             </widget>
            </item>
+           <item row="3" column="1">
+            <widget class="QCheckBox" name="m_checkMysqlShowPassword">
+             <property name="text">
+              <string>&amp;Show password</string>
+             </property>
+             <property name="checked">
+              <bool>true</bool>
+             </property>
+            </widget>
+           </item>
           </layout>
          </widget>
         </widget>
@@ -392,8 +402,8 @@ Authors of this application are NOT responsible for lost data.</string>
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>100</width>
+            <width>740</width>
-            <height>30</height>
+            <height>448</height>
            </rect>
           </property>
           <layout class="QHBoxLayout" name="horizontalLayout_4">
@@ -470,8 +480,8 @@ Authors of this application are NOT responsible for lost data.</string>
                <rect>
                 <x>0</x>
                 <y>0</y>
-                <width>695</width>
+                <width>208</width>
-                <height>425</height>
+                <height>238</height>
                </rect>
               </property>
               <layout class="QFormLayout" name="formLayout">

src/miscellaneous/debugging.cpp

@@ -40,8 +40,6 @@ void Debugging::performLog(const char *message, QtMsgType type, const char *file
             APP_LOW_NAME, message, type_string, file, line, function);
   }
 
-  // TODO: Write to file here.
-
   if (type == QtFatalMsg) {
     qApp->exit(EXIT_FAILURE);
   }