diff --git a/resources/misc/db_init_mysql.sql b/resources/misc/db_init_mysql.sql
index 507b3f830..ae9db1395 100644
--- a/resources/misc/db_init_mysql.sql
+++ b/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);
\ No newline at end of file
+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);
diff --git a/resources/text/CHANGELOG b/resources/text/CHANGELOG
index 7092b3d15..4ce97beb5 100644
--- a/resources/text/CHANGELOG
+++ b/resources/text/CHANGELOG
@@ -3,7 +3,7 @@
Fixed:
-
+- Some MySQL-related fixes.
Added:
diff --git a/src/core/parsingfactory.cpp b/src/core/parsingfactory.cpp
index 772d47207..54b0d01d4 100755
--- a/src/core/parsingfactory.cpp
+++ b/src/core/parsingfactory.cpp
@@ -86,8 +86,7 @@ QList 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,
- // set current date as creation date for the message.
+ // Date was NOT obtained from the feed, set current date as creation date for the message.
new_message.m_created = current_time;
}
@@ -159,8 +158,7 @@ QList 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,
- // set current date as creation date for the message.
+ // Date was NOT obtained from the feed, set current date as creation date for the message.
new_message.m_created = current_time;
}
diff --git a/src/definitions/definitions.h.in b/src/definitions/definitions.h.in
index e41da1e86..1c1590983 100755
--- a/src/definitions/definitions.h.in
+++ b/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
diff --git a/src/gui/formsettings.cpp b/src/gui/formsettings.cpp
index cbf50e015..c2051b29a 100755
--- a/src/gui/formsettings.cpp
+++ b/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());
diff --git a/src/gui/formsettings.h b/src/gui/formsettings.h
index 200bca3fb..5d3b4d619 100644
--- a/src/gui/formsettings.h
+++ b/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();
diff --git a/src/gui/formsettings.ui b/src/gui/formsettings.ui
index 3f8bfa391..1268c9c47 100644
--- a/src/gui/formsettings.ui
+++ b/src/gui/formsettings.ui
@@ -6,7 +6,7 @@
0
0
- 951
+ 990
498
@@ -88,7 +88,7 @@
-
- 7
+ 1
@@ -316,7 +316,7 @@ Authors of this application are NOT responsible for lost data.
-
- -
+
-
-
@@ -343,7 +343,7 @@ Authors of this application are NOT responsible for lost data.
- -
+
-
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.
@@ -359,6 +359,16 @@ Authors of this application are NOT responsible for lost data.
+ -
+
+
+ &Show password
+
+
+ true
+
+
+
@@ -392,8 +402,8 @@ Authors of this application are NOT responsible for lost data.
0
0
- 100
- 30
+ 740
+ 448
@@ -470,8 +480,8 @@ Authors of this application are NOT responsible for lost data.
0
0
- 695
- 425
+ 208
+ 238
diff --git a/src/miscellaneous/debugging.cpp b/src/miscellaneous/debugging.cpp
index a3f85ecef..d7d58249f 100755
--- a/src/miscellaneous/debugging.cpp
+++ b/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);
}