From 9f376ac14c93b676d6038c1cea9b6414b363b6f7 Mon Sep 17 00:00:00 2001 From: nowrep Date: Sat, 1 Sep 2012 13:56:00 +0200 Subject: [PATCH] Enabling sorting for Table/Tree Widgets everywhere. --- src/lib/bookmarks/bookmarksmanager.cpp | 1 + src/lib/bookmarks/bookmarksmanager.ui | 3 +++ src/lib/opensearch/searchenginesdialog.cpp | 1 + src/lib/opensearch/searchenginesdialog.ui | 3 +++ src/lib/preferences/autofillmanager.cpp | 3 +++ src/lib/preferences/autofillmanager.ui | 6 ++++++ src/lib/preferences/pluginslist.ui | 3 +++ src/lib/preferences/pluginsmanager.cpp | 2 ++ src/lib/preferences/useragentdialog.cpp | 3 ++- src/lib/preferences/useragentdialog.ui | 3 +++ src/lib/webview/siteinfo.cpp | 3 +++ src/lib/webview/siteinfo.ui | 6 ++++++ 12 files changed, 36 insertions(+), 1 deletion(-) diff --git a/src/lib/bookmarks/bookmarksmanager.cpp b/src/lib/bookmarks/bookmarksmanager.cpp index e97415ca4..05d82f1bb 100644 --- a/src/lib/bookmarks/bookmarksmanager.cpp +++ b/src/lib/bookmarks/bookmarksmanager.cpp @@ -68,6 +68,7 @@ BookmarksManager::BookmarksManager(QupZilla* mainClass, QWidget* parent) connect(deleteAction, SIGNAL(activated()), this, SLOT(deleteItem())); ui->bookmarksTree->setDefaultItemShowMode(TreeWidget::ItemsExpanded); + ui->bookmarksTree->sortByColumn(-1); } void BookmarksManager::importBookmarks() diff --git a/src/lib/bookmarks/bookmarksmanager.ui b/src/lib/bookmarks/bookmarksmanager.ui index d49664111..ade3f96cb 100644 --- a/src/lib/bookmarks/bookmarksmanager.ui +++ b/src/lib/bookmarks/bookmarksmanager.ui @@ -22,6 +22,9 @@ true + + true + 330 diff --git a/src/lib/opensearch/searchenginesdialog.cpp b/src/lib/opensearch/searchenginesdialog.cpp index 9251046ce..0c9c5b56c 100644 --- a/src/lib/opensearch/searchenginesdialog.cpp +++ b/src/lib/opensearch/searchenginesdialog.cpp @@ -38,6 +38,7 @@ SearchEnginesDialog::SearchEnginesDialog(QWidget* parent) connect(ui->treeWidget, SIGNAL(itemDoubleClicked(QTreeWidgetItem*, int)), this, SLOT(editEngine())); + ui->treeWidget->sortByColumn(-1); reloadEngines(); } diff --git a/src/lib/opensearch/searchenginesdialog.ui b/src/lib/opensearch/searchenginesdialog.ui index 420bd6fb5..f672f65ce 100644 --- a/src/lib/opensearch/searchenginesdialog.ui +++ b/src/lib/opensearch/searchenginesdialog.ui @@ -68,6 +68,9 @@ + + true + 200 diff --git a/src/lib/preferences/autofillmanager.cpp b/src/lib/preferences/autofillmanager.cpp index f91427ff5..d41d00e25 100644 --- a/src/lib/preferences/autofillmanager.cpp +++ b/src/lib/preferences/autofillmanager.cpp @@ -78,6 +78,9 @@ void AutoFillManager::loadPasswords() item->setData(0, Qt::UserRole + 10, query.value(1).toString()); ui->treeExcept->addTopLevelItem(item); } + + ui->treePass->sortByColumn(-1); + ui->treeExcept->sortByColumn(-1); } void AutoFillManager::showPasswords() diff --git a/src/lib/preferences/autofillmanager.ui b/src/lib/preferences/autofillmanager.ui index 4c5dd3c54..5aa0ca745 100644 --- a/src/lib/preferences/autofillmanager.ui +++ b/src/lib/preferences/autofillmanager.ui @@ -32,6 +32,9 @@ 0 + + true + 100 @@ -143,6 +146,9 @@ + + true + Server diff --git a/src/lib/preferences/pluginslist.ui b/src/lib/preferences/pluginslist.ui index 90423c622..76a865092 100644 --- a/src/lib/preferences/pluginslist.ui +++ b/src/lib/preferences/pluginslist.ui @@ -124,6 +124,9 @@ + + true + Whitelist diff --git a/src/lib/preferences/pluginsmanager.cpp b/src/lib/preferences/pluginsmanager.cpp index fc5d9f95b..3bfe21983 100644 --- a/src/lib/preferences/pluginsmanager.cpp +++ b/src/lib/preferences/pluginsmanager.cpp @@ -56,6 +56,8 @@ PluginsManager::PluginsManager(QWidget* parent) connect(ui->remove, SIGNAL(clicked()), this, SLOT(removeWhitelist())); connect(ui->allowClick2Flash, SIGNAL(clicked(bool)), this, SLOT(allowC2FChanged(bool))); + ui->whitelist->sortByColumn(-1); + settings.beginGroup("ClickToFlash"); QStringList whitelist = mApp->plugins()->c2f_getWhiteList(); ui->allowClick2Flash->setChecked(settings.value("Enable", true).toBool()); diff --git a/src/lib/preferences/useragentdialog.cpp b/src/lib/preferences/useragentdialog.cpp index e34f2dc16..3a303cebb 100644 --- a/src/lib/preferences/useragentdialog.cpp +++ b/src/lib/preferences/useragentdialog.cpp @@ -60,9 +60,10 @@ UserAgentDialog::UserAgentDialog(QWidget* parent) ui->table->insertRow(row); ui->table->setItem(row, 0, siteItem); ui->table->setItem(row, 1, userAgentItem); - } + ui->table->sortByColumn(-1); + connect(ui->add, SIGNAL(clicked()), this, SLOT(addSite())); connect(ui->remove, SIGNAL(clicked()), this, SLOT(removeSite())); connect(ui->edit, SIGNAL(clicked()), this, SLOT(editSite())); diff --git a/src/lib/preferences/useragentdialog.ui b/src/lib/preferences/useragentdialog.ui index 431dae243..ff37b1e94 100644 --- a/src/lib/preferences/useragentdialog.ui +++ b/src/lib/preferences/useragentdialog.ui @@ -72,6 +72,9 @@ false + + true + true diff --git a/src/lib/webview/siteinfo.cpp b/src/lib/webview/siteinfo.cpp index a8f65f9aa..32094fb0e 100644 --- a/src/lib/webview/siteinfo.cpp +++ b/src/lib/webview/siteinfo.cpp @@ -167,6 +167,9 @@ SiteInfo::SiteInfo(WebView* view, QWidget* parent) connect(ui->treeImages, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(imagesCustomContextMenuRequested(const QPoint &))); ui->treeImages->setContextMenuPolicy(Qt::CustomContextMenu); + ui->treeImages->sortByColumn(-1); + + ui->treeTags->sortByColumn(-1); } void SiteInfo::imagesCustomContextMenuRequested(const QPoint &p) diff --git a/src/lib/webview/siteinfo.ui b/src/lib/webview/siteinfo.ui index d9cfdefcc..a7e0c5065 100644 --- a/src/lib/webview/siteinfo.ui +++ b/src/lib/webview/siteinfo.ui @@ -195,6 +195,9 @@ + + true + 200 @@ -294,6 +297,9 @@ false + + true + 200