From feda8a7db8d1d7c5439aa8f8feef7cc0dd2b59a0 Mon Sep 17 00:00:00 2001 From: Unit 193 Date: Fri, 27 Jul 2018 23:51:12 -0400 Subject: New upstream version 3.2.1+dfsg1 --- .../guiSQLiteStudio/dialogs/configdialog.cpp | 43 +++++++++++++--------- 1 file changed, 25 insertions(+), 18 deletions(-) (limited to 'SQLiteStudio3/guiSQLiteStudio/dialogs/configdialog.cpp') diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/configdialog.cpp b/SQLiteStudio3/guiSQLiteStudio/dialogs/configdialog.cpp index 85ae12d..63af58a 100644 --- a/SQLiteStudio3/guiSQLiteStudio/dialogs/configdialog.cpp +++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/configdialog.cpp @@ -63,7 +63,7 @@ ConfigDialog::~ConfigDialog() // Notify plugins about dialog being closed UiConfiguredPlugin* cfgPlugin = nullptr; - foreach (Plugin* plugin, PLUGINS->getLoadedPlugins()) + for (Plugin* plugin : PLUGINS->getLoadedPlugins()) { cfgPlugin = dynamic_cast(plugin); if (!cfgPlugin) @@ -133,7 +133,7 @@ QString ConfigDialog::getFilterString(QTreeWidget *widget) { QList items = widget->findItems("*", Qt::MatchWildcard|Qt::MatchRecursive); QStringList strList; - foreach (QTreeWidgetItem* item, items) + for (QTreeWidgetItem* item : items) for (int i = 0; i < widget->columnCount(); i++) strList << item->text(i) + " " + item->toolTip(0); @@ -144,7 +144,7 @@ QString ConfigDialog::getFilterString(QListWidget *widget) { QList items = widget->findItems("*", Qt::MatchWildcard|Qt::MatchRecursive); QStringList strList; - foreach (QListWidgetItem* item, items) + for (QListWidgetItem* item : items) strList << item->text() + " " + item->toolTip(); return strList.join(" "); @@ -154,7 +154,7 @@ QString ConfigDialog::getFilterString(QTableWidget *widget) { QList items = widget->findItems("*", Qt::MatchWildcard|Qt::MatchRecursive); QStringList strList; - foreach (QTableWidgetItem* item, items) + for (QTableWidgetItem* item : items) strList << item->text() + " " + item->toolTip(); return strList.join(" "); @@ -299,7 +299,7 @@ void ConfigDialog::applyFilter(const QString &filter) QColor disabledColor = ui->categoriesTree->palette().color(QPalette::Disabled, QPalette::WindowText); if (filter.isEmpty()) { - foreach (QTreeWidgetItem* item, getAllCategoryItems()) + for (QTreeWidgetItem* item : getAllCategoryItems()) item->setForeground(0, normalColor); return; @@ -307,7 +307,7 @@ void ConfigDialog::applyFilter(const QString &filter) QList widgets = ui->stackedWidget->findChildren(); QList matchedWidgets; - foreach (QWidget* widget, widgets) + for (QWidget* widget : widgets) { if (getFilterString(widget).contains(filter, Qt::CaseInsensitive)) matchedWidgets << widget; @@ -315,9 +315,9 @@ void ConfigDialog::applyFilter(const QString &filter) QHash pageToCategoryItem = buildPageToCategoryItemMap(); QSet matchedCategories; - foreach (QWidget* page, pageToCategoryItem.keys()) + for (QWidget* page : pageToCategoryItem.keys()) { - foreach (QWidget* matched, matchedWidgets) + for (QWidget* matched : matchedWidgets) { if (page->isAncestorOf(matched)) { @@ -333,10 +333,10 @@ void ConfigDialog::applyFilter(const QString &filter) } } - foreach (QTreeWidgetItem* item, getAllCategoryItems()) + for (QTreeWidgetItem* item : getAllCategoryItems()) item->setForeground(0, disabledColor); - foreach (QTreeWidgetItem* item, matchedCategories) + for (QTreeWidgetItem* item : matchedCategories) { item->setForeground(0, normalColor); while ((item = item->parent()) != nullptr) @@ -347,7 +347,7 @@ void ConfigDialog::applyFilter(const QString &filter) QHash ConfigDialog::buildPageToCategoryItemMap() const { QHash pageNameToCategoryItem; - foreach (QTreeWidgetItem* item, getAllCategoryItems()) + for (QTreeWidgetItem* item : getAllCategoryItems()) pageNameToCategoryItem[item->statusTip(0)] = item; QWidget* page = nullptr; @@ -486,7 +486,14 @@ void ConfigDialog::addDataTypeEditor(const QString& pluginName) void ConfigDialog::addDataTypeEditor(MultiEditorWidgetPlugin* plugin) { MultiEditorWidget* editor = plugin->getInstance(); + editor->setTabLabel(plugin->getTabLabel()); ui->dataEditorsSelectedTabs->addTab(editor, editor->getTabLabel().replace("&", "&&")); + + connect(editor, &MultiEditorWidget::aboutToBeDeleted, [this, editor]() + { + int idx = ui->dataEditorsSelectedTabs->indexOf(editor); + ui->dataEditorsSelectedTabs->removeTab(idx); + }); } void ConfigDialog::removeDataTypeEditor(QListWidgetItem* item, const QString& pluginName) @@ -704,7 +711,7 @@ void ConfigDialog::delDataType() void ConfigDialog::dataTypesHelp() { - static const QString url = QStringLiteral("http://wiki.sqlitestudio.pl/index.php/User_Manual#Customizing_data_type_editors"); + static const QString url = QStringLiteral("https://github.com/pawelsalawa/sqlitestudio/wiki/User_Manual#customizing-data-type-editors"); QDesktopServices::openUrl(QUrl(url, QUrl::StrictMode)); } @@ -1085,7 +1092,7 @@ void ConfigDialog::refreshFormattersPage() void ConfigDialog::applyStyle(QWidget *widget, QStyle *style) { widget->setStyle(style); - foreach (QObject* child, widget->children()) + for (QObject* child : widget->children()) { if (!qobject_cast(child)) continue; @@ -1184,7 +1191,7 @@ void ConfigDialog::initPlugins() // Recreate QTreeWidgetItem *typeItem = nullptr; - foreach (PluginType* pluginType, PLUGINS->getPluginTypes()) + for (PluginType* pluginType : PLUGINS->getPluginTypes()) { typeItem = createPluginsTypeItem(pluginType->getConfigUiForm(), pluginType->getTitle()); if (!typeItem) @@ -1193,7 +1200,7 @@ void ConfigDialog::initPlugins() item->addChild(typeItem); pluginTypeToItemMap[pluginType] = typeItem; - foreach (Plugin* plugin, pluginType->getLoadedPlugins()) + for (Plugin* plugin : pluginType->getLoadedPlugins()) pluginLoaded(plugin, pluginType, true); } @@ -1244,7 +1251,7 @@ void ConfigDialog::initPluginsPage() categoryRow = 0; QList pluginTypes = PLUGINS->getPluginTypes(); qSort(pluginTypes.begin(), pluginTypes.end(), PluginType::nameLessThan); - foreach (PluginType* pluginType, pluginTypes) + for (PluginType* pluginType : pluginTypes) { category = new QTreeWidgetItem({pluginType->getTitle()}); font.setItalic(false); @@ -1264,7 +1271,7 @@ void ConfigDialog::initPluginsPage() itemRow = 0; pluginNames = pluginType->getAllPluginNames(); qSort(pluginNames); - foreach (const QString& pluginName, pluginNames) + for (const QString& pluginName : pluginNames) { builtIn = PLUGINS->isBuiltIn(pluginName); title = PLUGINS->getTitle(pluginName); @@ -1497,7 +1504,7 @@ void ConfigDialog::initShortcuts(CfgCategory *cfgCategory) int itemRow = 0; QStringList entryNames = cfgCategory->getEntries().keys(); qSort(entryNames); - foreach (const QString& entryName, entryNames) + for (const QString& entryName : entryNames) { // Title title = cfgCategory->getEntries()[entryName]->getTitle(); -- cgit v1.2.3