Merge tag 'upstream/3.0.6'

Upstream version 3.0.6

# gpg: Signature made Tue 12 May 2015 04:19:45 PM EDT using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.org>"
# gpg:                 aka "Unit 193 <unit193@ubuntu.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.com>"

3 files changed, 14 insertions, 5 deletions

diff --git a/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.cpp b/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.cpp
index 1aeff0f..62d7368 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.cpp
@@ -34,6 +34,7 @@
 #include <QDebug>
 #include <QKeyEvent>
 #include <QMimeData>
+#include <themetuner.h>
 #include <dialogs/dbconverterdialog.h>
 
 CFG_KEYS_DEFINE(DbTree)
@@ -63,6 +64,8 @@ void DbTree::init()
     ui->setupUi(this);
     initDndTypes();
 
+    THEME_TUNER->manageCompactLayout(widget());
+
     ui->nameFilter->setClearButtonEnabled(true);
 
     widgetCover = new WidgetCover(this);
diff --git a/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.ui b/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.ui
index 755c9b0..687415d 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.ui
+++ b/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.ui
@@ -24,6 +24,12 @@
   </property>
   <widget class="QWidget" name="dockWidgetContents">
    <layout class="QGridLayout" name="gridLayout">
+    <property name="topMargin">
+     <number>0</number>
+    </property>
+    <property name="verticalSpacing">
+     <number>0</number>
+    </property>
     <item row="1" column="0">
      <widget class="DbTreeView" name="treeView">
       <property name="sizePolicy">
diff --git a/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtreemodel.cpp b/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtreemodel.cpp
index 78f0db8..c0f527f 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtreemodel.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtreemodel.cpp
@@ -534,7 +534,7 @@ QList<QStandardItem *> DbTreeModel::refreshSchemaTables(const QStringList &table
 {
     QStringList sortedTables = tables;
     if (sort)
-        qSort(sortedTables);
+        sortedTables.sort(Qt::CaseInsensitive);
 
     QList<QStandardItem *> items;
     foreach (const QString& table, sortedTables)
@@ -573,7 +573,7 @@ StrHash<QList<QStandardItem *> > DbTreeModel::refreshSchemaIndexes(const StrHash
     {
         sortedIndexes = indexes[key];
         if (sort)
-            qSort(sortedIndexes);
+            sortedIndexes.sort(Qt::CaseInsensitive);
 
         for (const QString& index : sortedIndexes)
             items[key] += DbTreeItemFactory::createIndex(index, this);
@@ -589,7 +589,7 @@ StrHash<QList<QStandardItem*>> DbTreeModel::refreshSchemaTriggers(const StrHash<
     {
         sortedTriggers = triggers[key];
         if (sort)
-            qSort(sortedTriggers);
+            sortedTriggers.sort(Qt::CaseInsensitive);
 
         for (const QString& trigger : sortedTriggers)
             items[key] += DbTreeItemFactory::createTrigger(trigger, this);
@@ -601,10 +601,10 @@ QList<QStandardItem *> DbTreeModel::refreshSchemaViews(const QStringList &views,
 {
     QStringList sortedViews = views;
     if (sort)
-        qSort(sortedViews);
+        sortedViews.sort(Qt::CaseInsensitive);
 
     QList<QStandardItem *> items;
-    foreach (const QString& view, views)
+    foreach (const QString& view, sortedViews)
         items += DbTreeItemFactory::createView(view, this);
 
     return items;