New upstream version 3.3.3+dfsg1.upstream/3.3.3+dfsg1

1 files changed, 27 insertions, 4 deletions

diff --git a/SQLiteStudio3/guiSQLiteStudio/uiutils.cpp b/SQLiteStudio3/guiSQLiteStudio/uiutils.cpp
index 72dde94..fbdc4b3 100644
--- a/SQLiteStudio3/guiSQLiteStudio/uiutils.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/uiutils.cpp
@@ -2,6 +2,7 @@
 #include "services/config.h"
 #include "common/widgetstateindicator.h"
 #include "common/utils.h"
+#include "uiconfig.h"
 #include <QObject>
 #include <QCheckBox>
 #include <QSpinBox>
@@ -14,6 +15,8 @@
 #include <QPainter>
 #include <QDesktopWidget>
 #include <QApplication>
+#include <QStyle>
+#include <QScreen>
 
 const QStringList pageSizes = {
     "A4", "B5", "Letter", "Legal", "Executive", "A0", "A1", "A2", "A3", "A5", "A6", "A7", "A8", "A9", "B0", "B1",
@@ -29,9 +32,8 @@ QString getDbPath(bool newFileMode, const QString &startWith)
         dir = CFG->get("dialogCache", "lastDbDir").toString();
 
     QStringList filters;
-    filters += QObject::tr("All SQLite databases")+" (*.db *.sdb *.sqlite *.db3 *.s3db *.sqlite3 *.sl3 *.db2 *.s2db *.sqlite2 *.sl2)";
+    filters += QObject::tr("All SQLite databases")+" (*.db *.sdb *.sqlite *.db3 *.s3db *.sqlite3 *.sl3)";
     filters += "SQLite3 (*.db3 *.s3db *.sqlite3 *.sl3)";
-    filters += "SQLite2 (*.db2 *.s2db *.sqlite2 *.sl2)";
     filters += QObject::tr("All files")+" (*)";
     QString filter = filters.join(";;");
 
@@ -87,7 +89,7 @@ QString convertPageSize(QPagedPaintDevice::PageSize size)
     if (idx < 0 || idx >= pageSizesSize)
     {
         qDebug() << "Asked to convertPageSize() with page side enum value out of range:" << idx;
-        return QString::null;
+        return QString();
     }
 
     return pageSizes[idx];
@@ -116,10 +118,31 @@ QPixmap addOpacity(const QPixmap& input, float opacity)
 
 void limitDialogWidth(QDialog* dialog)
 {
-    dialog->setMaximumWidth(QApplication::desktop()->availableGeometry().width());
+    dialog->setMaximumWidth(QGuiApplication::primaryScreen()->availableGeometry().width());
 }
 
 void fixTextCursorSelectedText(QString& text)
 {
     text.replace("\u2029", "\n");
 }
+
+QColor styleSyntaxStringColor()
+{
+    static const QColor stdAltColor = QColor(Qt::green);
+    if (QApplication::style()->standardPalette().text().color().lightness() >= 128)
+        return stdAltColor.lighter();
+    else
+        return stdAltColor.darker();
+}
+
+QBrush styleEditorLineColor()
+{
+    QPalette palette = QApplication::style()->standardPalette();
+    if (CFG_UI.General.Style.get().toLower() != "macintosh")
+        return palette.alternateBase();
+
+    if (palette.base().color().lightness() < 128)
+        return QBrush(palette.alternateBase().color().darker(300));
+
+    return palette.alternateBase();
+}