diff --git a/resources/desktop/com.github.rssguard.appdata.xml b/resources/desktop/com.github.rssguard.appdata.xml index fe6409688..bdda0209e 100644 --- a/resources/desktop/com.github.rssguard.appdata.xml +++ b/resources/desktop/com.github.rssguard.appdata.xml @@ -26,7 +26,7 @@ https://github.com/sponsors/martinrotter - + none diff --git a/resources/sql/db_init_sqlite.sql b/resources/sql/db_init_sqlite.sql index c413e8d03..bd4238c69 100644 --- a/resources/sql/db_init_sqlite.sql +++ b/resources/sql/db_init_sqlite.sql @@ -1,5 +1,5 @@ CREATE TABLE Information ( - inf_key TEXT NOT NULL UNIQUE CHECK (inf_key != ''), + inf_key VARCHAR(128) NOT NULL UNIQUE CHECK (inf_key != ''), /* Use VARCHAR as MariaDB 10.3 does no support UNIQUE TEXT columns. */ inf_value TEXT ); -- ! diff --git a/src/librssguard/core/messagesmodelsqllayer.cpp b/src/librssguard/core/messagesmodelsqllayer.cpp index 1a4c7dbc4..10f687abf 100644 --- a/src/librssguard/core/messagesmodelsqllayer.cpp +++ b/src/librssguard/core/messagesmodelsqllayer.cpp @@ -103,6 +103,9 @@ QString MessagesModelSqlLayer::orderByClause() const { ? QSL("%1") : QSL("LOWER(%1)"); + //sorts.append(QSL("LENGTH(%1)").arg(order_sql.arg(field_name)) + + // (m_sortOrders[i] == Qt::SortOrder::AscendingOrder ? QSL(" ASC") : QSL(" DESC"))); + sorts.append(order_sql.arg(field_name) + (m_sortOrders[i] == Qt::SortOrder::AscendingOrder ? QSL(" ASC") : QSL(" DESC"))); } diff --git a/src/librssguard/services/abstract/gui/formaccountdetails.ui b/src/librssguard/services/abstract/gui/formaccountdetails.ui index 679d4532a..c33017f63 100644 --- a/src/librssguard/services/abstract/gui/formaccountdetails.ui +++ b/src/librssguard/services/abstract/gui/formaccountdetails.ui @@ -10,8 +10,8 @@ 450 - - + + QFrame::NoFrame @@ -25,7 +25,7 @@ 0 0 532 - 403 + 402 @@ -43,6 +43,12 @@ + + + 0 + 1 + + -1 @@ -52,7 +58,7 @@ - + Qt::Horizontal