From 7e748d15c9d4fdf42b753f58e033899c5753b899 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Tue, 10 Dec 2019 10:48:09 -0500
Subject: split data tab removed a bunch of undefined functions in MainWindow
---
src/mainwindow.h | 44 ++------------------------------------------
1 file changed, 2 insertions(+), 42 deletions(-)
(limited to 'src/mainwindow.h')
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 2c45049a..d50705e3 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -34,12 +34,11 @@ along with Mod Organizer. If not, see .
#include "iplugingame.h" //namespace MOBase { class IPluginGame; }
#include
-//Note the commented headers here can be replaced with forward references,
-//when I get round to cleaning up main.cpp
class Executable;
class CategoryFactory;
class OrganizerCore;
class FilterList;
+class DataTab;
class PluginListSortProxy;
namespace BSA { class Archive; }
@@ -122,8 +121,6 @@ public:
bool addProfile();
void updateBSAList(const QStringList &defaultArchives, const QStringList &activeArchives);
- void refreshDataTree();
- void refreshDataTreeKeepExpandedNodes();
void refreshSaveList();
void setModListSorting(int index);
@@ -137,10 +134,6 @@ public:
void addPrimaryCategoryCandidates(QMenu *primaryCategoryMenu, ModInfo::Ptr info);
- void updateModInDirectoryStructure(unsigned int index, ModInfo::Ptr modInfo);
-
- QString getOriginDisplayName(int originID);
-
void installTranslator(const QString &name);
virtual void disconnectPlugins();
@@ -219,20 +212,12 @@ private:
QMenu* createPopupMenu() override;
void activateSelectedProfile();
- void startSteam();
-
- void updateTo(QTreeWidgetItem *subTree, const std::wstring &directorySoFar, const MOShared::DirectoryEntry &directoryEntry, bool conflictsOnly, QIcon *fileIcon, QIcon *folderIcon);
bool refreshProfiles(bool selectProfile = true);
void refreshExecutablesList();
void installMod(QString fileName = "");
- QList findFileInfos(const QString &path, const std::function &filter) const;
-
bool modifyExecutablesDialog(int selection);
void displayModInformation(int row, ModInfoTabIDs tab=ModInfoTabIDs::None);
- void testExtractBSA(int modIndex);
-
- void writeDataToFile(QFile &file, const QString &directory, const MOShared::DirectoryEntry &directoryEntry);
/**
* Sets category selections from menu; for multiple mods, this will only apply
@@ -267,8 +252,6 @@ private:
void displaySaveGameInfo(QListWidgetItem *newItem);
- HANDLE nextChildProcess();
-
bool errorReported(QString &logFile);
void updateESPLock(bool locked);
@@ -285,8 +268,6 @@ private:
QMenu *openFolderMenu();
- std::set enabledArchives();
-
void scheduleUpdateButton();
QDir currentSavesDir() const;
@@ -297,7 +278,6 @@ private:
void dropLocalFile(const QUrl &url, const QString &outputDir, bool move);
void sendSelectedModsToPriority(int newPriority);
- void sendSelectedPluginsToPriority(int newPriority);
void toggleMO2EndorseState();
void toggleUpdateAction();
@@ -322,6 +302,7 @@ private:
MOBase::TutorialControl m_Tutorial;
std::unique_ptr m_Filters;
+ std::unique_ptr m_DataTab;
int m_OldProfileIndex;
@@ -364,8 +345,6 @@ private:
QFileSystemWatcher m_SavesWatcher;
- std::vector m_RemoveWidget;
-
QByteArray m_ArchiveListHash;
bool m_DidUpdateMasterList;
@@ -438,18 +417,6 @@ private slots:
void deleteSavegame_clicked();
void fixMods_clicked(SaveGameInfo::MissingAssets const &missingAssets);
// data-tree context menu
- void writeDataToFile();
- void openDataFile();
- void openDataFile(QTreeWidgetItem* item);
- void runDataFileHooked();
- void runDataFileHooked(QTreeWidgetItem* item);
- void addAsExecutable();
- void previewDataFile();
- void previewDataFile(QTreeWidgetItem* item);
- void hideFile();
- void unhideFile();
- void openDataOriginExplorer_clicked();
- void openDataModInfo_clicked();
// pluginlist context menu
void enableSelectedPlugins_clicked();
@@ -592,10 +559,7 @@ private slots:
void unignoreUpdate();
void refreshSavesIfOpen();
- void expandDataTreeItem(QTreeWidgetItem *item);
- void activateDataTreeItem(QTreeWidgetItem *item, int column);
void about();
- void delayedRemove();
void modListSortIndicatorChanged(int column, Qt::SortOrder order);
void modListSectionResized(int logicalIndex, int oldSize, int newSize);
@@ -634,11 +598,7 @@ private slots: // ui slots
void on_centralWidget_customContextMenuRequested(const QPoint &pos);
void on_bsaList_customContextMenuRequested(const QPoint &pos);
void on_clearFiltersButton_clicked();
- void on_btnRefreshData_clicked();
void on_btnRefreshDownloads_clicked();
- void on_conflictsCheckBox_toggled(bool checked);
- void on_showArchiveDataCheckBox_toggled(bool checked);
- void on_dataTree_customContextMenuRequested(const QPoint &pos);
void on_executablesListBox_currentIndexChanged(int index);
void on_modList_customContextMenuRequested(const QPoint &pos);
void on_modList_doubleClicked(const QModelIndex &index);
--
cgit v1.3.1
From 34b022a2297b869c7be306e3f6bf8e124adaf1a7 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Wed, 5 Feb 2020 16:21:41 -0500
Subject: fixed warning when comparing empty strings filter in data tab fixed
some bad iterators when removing rows fixed empty directories not being
marked as such when refreshing always sort directories first even when
reversing the sort order fixed children not being sorted fixed errors about
file sizes for directories remember state of checkboxes in data tab
---
src/datatab.cpp | 28 ++++++++++++++++++--
src/datatab.h | 2 ++
src/filetree.cpp | 24 ++++++++++++++---
src/filetree.h | 3 +++
src/filetreeitem.cpp | 20 ++++++++++++---
src/filetreemodel.cpp | 71 ++++++++++++++++++++++++++++++++++++---------------
src/filetreemodel.h | 3 +++
src/mainwindow.cpp | 22 +++++++---------
src/mainwindow.h | 2 --
src/mainwindow.ui | 13 +++++++---
src/modinfodialog.cpp | 12 +++++++++
11 files changed, 152 insertions(+), 48 deletions(-)
(limited to 'src/mainwindow.h')
diff --git a/src/datatab.cpp b/src/datatab.cpp
index 3923ba4e..74fa35ce 100644
--- a/src/datatab.cpp
+++ b/src/datatab.cpp
@@ -21,10 +21,21 @@ DataTab::DataTab(
QWidget* parent, Ui::MainWindow* mwui) :
m_core(core), m_pluginContainer(pc), m_parent(parent),
ui{
- mwui->btnRefreshData, mwui->dataTree,
- mwui->conflictsCheckBox, mwui->showArchiveDataCheckBox}
+ mwui->dataTabRefresh, mwui->dataTree,
+ mwui->dataTabShowOnlyConflicts, mwui->dataTabShowFromArchives}
{
m_filetree.reset(new FileTree(core, m_pluginContainer, ui.tree));
+ m_filter.setUseSourceSort(true);
+ m_filter.setEdit(mwui->dataTabFilter);
+ m_filter.setList(mwui->dataTree);
+
+ if (auto* m=m_filter.proxyModel()) {
+ m->setDynamicSortFilter(false);
+ }
+
+ connect(
+ &m_filter, &FilterWidget::aboutToChange,
+ [&]{ m_filetree->ensureFullyLoaded(); });
connect(
ui.refresh, &QPushButton::clicked,
@@ -54,6 +65,8 @@ DataTab::DataTab(
void DataTab::saveState(Settings& s) const
{
s.geometry().saveState(ui.tree->header());
+ s.widgets().saveChecked(ui.conflicts);
+ s.widgets().saveChecked(ui.archives);
}
void DataTab::restoreState(const Settings& s)
@@ -63,6 +76,9 @@ void DataTab::restoreState(const Settings& s)
// prior to 2.3, the list was not sortable, and this remembered in the
// widget state, for whatever reason
ui.tree->setSortingEnabled(true);
+
+ s.widgets().restoreChecked(ui.conflicts);
+ s.widgets().restoreChecked(ui.archives);
}
void DataTab::activated()
@@ -82,6 +98,14 @@ void DataTab::onRefresh()
void DataTab::updateTree()
{
m_filetree->refresh();
+
+ if (!m_filter.empty()) {
+ m_filetree->ensureFullyLoaded();
+
+ if (auto* m=m_filter.proxyModel()) {
+ m->invalidate();
+ }
+ }
}
void DataTab::onConflicts()
diff --git a/src/datatab.h b/src/datatab.h
index 4545dc5a..7e8eb2b9 100644
--- a/src/datatab.h
+++ b/src/datatab.h
@@ -1,5 +1,6 @@
#include "modinfodialogfwd.h"
#include "modinfo.h"
+#include
#include
#include
#include
@@ -47,6 +48,7 @@ private:
DataTabUi ui;
std::unique_ptr m_filetree;
std::vector m_removeLater;
+ MOBase::FilterWidget m_filter;
void onRefresh();
void onItemExpanded(QTreeWidgetItem* item);
diff --git a/src/filetree.cpp b/src/filetree.cpp
index bf3a9a7a..ae1fddfe 100644
--- a/src/filetree.cpp
+++ b/src/filetree.cpp
@@ -150,11 +150,16 @@ void FileTree::clear()
m_model->clear();
}
+void FileTree::ensureFullyLoaded()
+{
+ m_model->ensureFullyLoaded();
+}
+
FileTreeItem* FileTree::singleSelection()
{
const auto sel = m_tree->selectionModel()->selectedRows();
if (sel.size() == 1) {
- return m_model->itemFromIndex(sel[0]);
+ return m_model->itemFromIndex(proxiedIndex(sel[0]));
}
return nullptr;
@@ -357,7 +362,7 @@ void FileTree::dumpToFile() const
QString file = QFileDialog::getSaveFileName(m_tree->window());
if (file.isEmpty()) {
- log::debug("user cancelled");
+ log::debug("user canceled");
return;
}
@@ -432,7 +437,7 @@ void FileTree::dumpToFile(
void FileTree::onExpandedChanged(const QModelIndex& index, bool expanded)
{
- if (auto* item=m_model->itemFromIndex(index)) {
+ if (auto* item=m_model->itemFromIndex(proxiedIndex(index))) {
item->setExpanded(expanded);
}
}
@@ -494,7 +499,7 @@ bool FileTree::showShellMenu(QPoint pos)
bool warnOnEmpty = true;
for (auto&& index : m_tree->selectionModel()->selectedRows()) {
- auto* item = m_model->itemFromIndex(index);
+ auto* item = m_model->itemFromIndex(proxiedIndex(index));
if (!item) {
continue;
}
@@ -759,3 +764,14 @@ void FileTree::addCommonMenus(QMenu& menu)
.callback([&]{ m_tree->collapseAll(); })
.addTo(menu);
}
+
+QModelIndex FileTree::proxiedIndex(const QModelIndex& index)
+{
+ auto* model = m_tree->model();
+
+ if (auto* proxy=dynamic_cast(model)) {
+ return proxy->mapToSource(index);
+ } else {
+ return index;
+ }
+}
diff --git a/src/filetree.h b/src/filetree.h
index 80704f7b..855a1751 100644
--- a/src/filetree.h
+++ b/src/filetree.h
@@ -21,6 +21,7 @@ public:
FileTreeModel* model();
void refresh();
void clear();
+ void ensureFullyLoaded();
void open();
void openHooked();
@@ -60,6 +61,8 @@ private:
void toggleVisibility(bool b);
+ QModelIndex proxiedIndex(const QModelIndex& index);
+
void dumpToFile(
QFile& out, const QString& parentPath,
const MOShared::DirectoryEntry& entry) const;
diff --git a/src/filetreeitem.cpp b/src/filetreeitem.cpp
index bb07568a..3332fb7d 100644
--- a/src/filetreeitem.cpp
+++ b/src/filetreeitem.cpp
@@ -10,6 +10,8 @@ using namespace MOBase;
using namespace MOShared;
namespace fs = std::filesystem;
+constexpr bool AlwaysSortDirectoriesFirst = true;
+
const QString& directoryFileType()
{
static QString name;
@@ -179,9 +181,17 @@ void FileTreeItem::sort(int column, Qt::SortOrder order)
int r = 0;
if (a->isDirectory() && !b->isDirectory()) {
- r = -1;
+ if constexpr (AlwaysSortDirectoriesFirst) {
+ return true;
+ } else {
+ r = -1;
+ }
} else if (!a->isDirectory() && b->isDirectory()) {
- r = 1;
+ if constexpr (AlwaysSortDirectoriesFirst) {
+ return false;
+ } else {
+ r = 1;
+ }
} else {
r = FileTreeItem::Sorter::compare(column, a.get(), b.get());
}
@@ -192,6 +202,10 @@ void FileTreeItem::sort(int column, Qt::SortOrder order)
return (r > 0);
}
});
+
+ for (auto& child : m_children) {
+ child->sort(column, order);
+ }
}
QString FileTreeItem::virtualPath() const
@@ -232,7 +246,7 @@ QFont FileTreeItem::font() const
std::optional FileTreeItem::fileSize() const
{
- if (m_fileSize.empty()) {
+ if (m_fileSize.empty() && !m_isDirectory) {
std::error_code ec;
const auto size = fs::file_size(fs::path(m_wsRealPath), ec);
diff --git a/src/filetreemodel.cpp b/src/filetreemodel.cpp
index aa87edbf..912e2007 100644
--- a/src/filetreemodel.cpp
+++ b/src/filetreemodel.cpp
@@ -87,31 +87,32 @@ public:
//
FileTreeItem::Children::const_iterator remove()
{
- if (m_first == -1) {
- // nothing to remove
- return m_parentItem.children().begin() + m_current + 1;
- }
+ if (m_first >= 0) {
+ const auto last = m_current - 1;
+ const auto parentIndex = m_model->indexFromItem(m_parentItem);
- const auto last = m_current - 1;
- const auto parentIndex = m_model->indexFromItem(m_parentItem);
+ trace(log::debug("Range::remove() {} to {}", m_first, last));
- trace(log::debug("Range::remove() {} to {}", m_first, last));
+ m_model->beginRemoveRows(parentIndex, m_first, last);
- m_model->beginRemoveRows(parentIndex, m_first, last);
+ m_parentItem.remove(
+ static_cast(m_first),
+ static_cast(last - m_first + 1));
- m_parentItem.remove(
- static_cast(m_first),
- static_cast(last - m_first + 1));
+ m_model->endRemoveRows();
- m_model->endRemoveRows();
+ m_model->removePendingIcons(parentIndex, m_first, last);
- m_model->removePendingIcons(parentIndex, m_first, last);
+ // adjust current row to account for those that were just removed
+ m_current -= (m_current - m_first);
- // adjust current row to account for those that were just removed
- m_current -= (m_current - m_first);
+ // reset
+ m_first = -1;
+ }
- // reset
- m_first = -1;
+ if (m_current >= m_parentItem.children().size()) {
+ return m_parentItem.children().end();
+ }
return m_parentItem.children().begin() + m_current + 1;
}
@@ -138,7 +139,7 @@ void* makeInternalPointer(FileTreeItem* item)
FileTreeModel::FileTreeModel(OrganizerCore& core, QObject* parent) :
QAbstractItemModel(parent), m_core(core),
m_root(FileTreeItem::createDirectory(nullptr, L"", L"")),
- m_flags(NoFlags)
+ m_flags(NoFlags), m_fullyLoaded(false)
{
m_root->setExpanded(true);
@@ -148,16 +149,40 @@ FileTreeModel::FileTreeModel(OrganizerCore& core, QObject* parent) :
void FileTreeModel::refresh()
{
TimeThis tt("FileTreeModel::refresh()");
+
+ m_fullyLoaded = false;
update(*m_root, *m_core.directoryStructure(), L"");
}
void FileTreeModel::clear()
{
+ m_fullyLoaded = false;
+
beginResetModel();
m_root->clear();
endResetModel();
}
+void FileTreeModel::recursiveFetchMore(const QModelIndex& m)
+{
+ if (canFetchMore(m)) {
+ fetchMore(m);
+ }
+
+ for (int i=0; iareChildrenVisible() && item->isLoaded()) {
- // the item is loaded (previously expanded but now collapsed), mark
- // it as unloaded so it updates when next expanded
- item->setLoaded(false);
+ if (!d->isEmpty()) {
+ // the item is loaded (previously expanded but now collapsed) and
+ // has children, mark it as unloaded so it updates when next
+ // expanded
+ item->setLoaded(false);
+ }
}
} else {
// item wouldn't have any children, prune it
@@ -694,6 +722,7 @@ bool FileTreeModel::addNewFiles(
} else {
// this is a new file, but it shouldn't be shown
trace(log::debug("new file {}, not shown", QString::fromStdWString(file->getName())));
+ return true;
}
}
diff --git a/src/filetreemodel.h b/src/filetreemodel.h
index ffd46fac..3e846a0f 100644
--- a/src/filetreemodel.h
+++ b/src/filetreemodel.h
@@ -43,6 +43,7 @@ public:
void refresh();
void clear();
+ void ensureFullyLoaded();
QModelIndex index(int row, int col, const QModelIndex& parent={}) const override;
QModelIndex parent(const QModelIndex& index) const override;
@@ -75,6 +76,7 @@ private:
mutable std::vector m_iconPending;
mutable QTimer m_iconPendingTimer;
Sort m_sort;
+ bool m_fullyLoaded;
bool showConflictsOnly() const
{
@@ -141,6 +143,7 @@ private:
QVariant makeIcon(const FileTreeItem& item, const QModelIndex& index) const;
QModelIndex indexFromItem(FileTreeItem& item, int col=0) const;
+ void recursiveFetchMore(const QModelIndex& m);
};
Q_DECLARE_OPERATORS_FOR_FLAGS(FileTreeModel::Flags);
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index bf0dc61f..439775f8 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -455,15 +455,13 @@ MainWindow::MainWindow(Settings &settings
if (m_OrganizerCore.getArchiveParsing())
{
- ui->showArchiveDataCheckBox->setCheckState(Qt::Checked);
- ui->showArchiveDataCheckBox->setEnabled(true);
- m_showArchiveData = true;
+ ui->dataTabShowFromArchives->setCheckState(Qt::Checked);
+ ui->dataTabShowFromArchives->setEnabled(true);
}
else
{
- ui->showArchiveDataCheckBox->setCheckState(Qt::Unchecked);
- ui->showArchiveDataCheckBox->setEnabled(false);
- m_showArchiveData = false;
+ ui->dataTabShowFromArchives->setCheckState(Qt::Unchecked);
+ ui->dataTabShowFromArchives->setEnabled(false);
}
QApplication::instance()->installEventFilter(this);
@@ -1193,7 +1191,7 @@ void MainWindow::downloadFilterChanged(const QString &filter)
void MainWindow::expandModList(const QModelIndex &index)
{
QAbstractItemModel *model = ui->modList->model();
-#pragma message("why is this so complicated? mapping the index doesn't work, probably a bug in QtGroupingProxy?")
+
for (int i = 0; i < model->rowCount(); ++i) {
QModelIndex targetIdx = model->index(i, 0);
if (model->data(targetIdx).toString() == index.data().toString()) {
@@ -4949,15 +4947,13 @@ void MainWindow::on_actionSettings_triggered()
m_OrganizerCore.setArchiveParsing(state);
if (!state)
{
- ui->showArchiveDataCheckBox->setCheckState(Qt::Unchecked);
- ui->showArchiveDataCheckBox->setEnabled(false);
- m_showArchiveData = false;
+ ui->dataTabShowFromArchives->setCheckState(Qt::Unchecked);
+ ui->dataTabShowFromArchives->setEnabled(false);
}
else
{
- ui->showArchiveDataCheckBox->setCheckState(Qt::Checked);
- ui->showArchiveDataCheckBox->setEnabled(true);
- m_showArchiveData = true;
+ ui->dataTabShowFromArchives->setCheckState(Qt::Checked);
+ ui->dataTabShowFromArchives->setEnabled(true);
}
m_OrganizerCore.refreshModList();
m_OrganizerCore.refreshDirectoryStructure();
diff --git a/src/mainwindow.h b/src/mainwindow.h
index d50705e3..608bfa64 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -349,8 +349,6 @@ private:
bool m_DidUpdateMasterList;
- bool m_showArchiveData{ true };
-
MOBase::DelayedFileWriter m_ArchiveListWriter;
QAction* m_LinkToolbar;
diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index f0887f56..8bd22ff1 100644
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -1058,7 +1058,7 @@ p, li { white-space: pre-wrap; }
-
-
-
+
refresh data-directory overview
@@ -1088,7 +1088,7 @@ p, li { white-space: pre-wrap; }
-
-
+
Filters the above list so that only conflicts are displayed.
@@ -1101,7 +1101,7 @@ p, li { white-space: pre-wrap; }
-
-
+
Filters the above list so that files from archives are not shown
@@ -1147,6 +1147,13 @@ p, li { white-space: pre-wrap; }
+ -
+
+
-
+
+
+
+
diff --git a/src/modinfodialog.cpp b/src/modinfodialog.cpp
index b0a4248e..fb093529 100644
--- a/src/modinfodialog.cpp
+++ b/src/modinfodialog.cpp
@@ -47,6 +47,18 @@ int naturalCompare(const QString& a, const QString& b)
return c;
}();
+
+ // todo: remove this once the fix is released
+ // see https://bugreports.qt.io/projects/QTBUG/issues/QTBUG-81673
+ // and https://codereview.qt-project.org/c/qt/qtbase/+/287966/5/src/corelib/text/qcollator_win.cpp
+ if (!a.size()) {
+ return b.size() ? -1 : 0;
+ }
+ if (!b.size()) {
+ return +1;
+ }
+
+
return c.compare(a, b);
}
--
cgit v1.3.1
From 03ee407c346845484629c2a6afef39a13f0b9a3d Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Wed, 5 Feb 2020 20:23:53 -0500
Subject: fixed LogModel not being thread safe optimizations: - create
BrowserDialog on demand - scroll to bottom of log in a timer, coalesces fast
logging - disabled md5 of dlls
---
src/envmodule.cpp | 11 ++++++++++-
src/loglist.cpp | 19 +++++++++++--------
src/loglist.h | 6 +++---
src/mainwindow.cpp | 30 ++++++++++++++++++++++++------
src/mainwindow.h | 4 ++--
5 files changed, 50 insertions(+), 20 deletions(-)
(limited to 'src/mainwindow.h')
diff --git a/src/envmodule.cpp b/src/envmodule.cpp
index 5be52de6..2ff5027d 100644
--- a/src/envmodule.cpp
+++ b/src/envmodule.cpp
@@ -8,6 +8,12 @@ namespace env
using namespace MOBase;
+// the rationale for logging md5 was to make sure the various files were the
+// same as in the released version; this turned out to be of dubious interest,
+// while adding to the startup time
+constexpr bool UseMD5 = false;
+
+
Module::Module(QString path, std::size_t fileSize)
: m_path(std::move(path)), m_fileSize(fileSize)
{
@@ -16,7 +22,10 @@ Module::Module(QString path, std::size_t fileSize)
m_version = getVersion(fi.ffi);
m_timestamp = getTimestamp(fi.ffi);
m_versionString = fi.fileDescription;
- m_md5 = getMD5();
+
+ if (UseMD5) {
+ m_md5 = getMD5();
+ }
}
const QString& Module::path() const
diff --git a/src/loglist.cpp b/src/loglist.cpp
index 5d6710c7..af0e6768 100644
--- a/src/loglist.cpp
+++ b/src/loglist.cpp
@@ -27,7 +27,6 @@ const std::size_t MaxLines = 1000;
LogModel::LogModel()
{
- connect(this, &LogModel::entryAdded, [&](auto&& e){ onEntryAdded(e); });
}
void LogModel::create()
@@ -42,7 +41,8 @@ LogModel& LogModel::instance()
void LogModel::add(MOBase::log::Entry e)
{
- emit entryAdded(std::move(e));
+ QMetaObject::invokeMethod(
+ this, [this, e]{ onEntryAdded(std::move(e)); }, Qt::QueuedConnection);
}
void LogModel::clear()
@@ -173,13 +173,16 @@ LogList::LogList(QWidget* parent)
this, &QWidget::customContextMenuRequested,
[&](auto&& pos){ onContextMenu(pos); });
- connect(
- model(), SIGNAL(rowsInserted(const QModelIndex &, int, int)),
- this, SLOT(scrollToBottom()));
+ connect(model(), &LogModel::rowsInserted, [&]{ onNewEntry(); });
+ connect(model(), &LogModel::dataChanged, [&]{ onNewEntry(); });
- connect(
- model(), SIGNAL(dataChanged(QModelIndex,QModelIndex)),
- this, SLOT(scrollToBottom()));
+ m_timer.setSingleShot(true);
+ connect(&m_timer, &QTimer::timeout, [&]{ scrollToBottom(); });
+}
+
+void LogList::onNewEntry()
+{
+ m_timer.start(std::chrono::milliseconds(10));
}
void LogList::setCore(OrganizerCore& core)
diff --git a/src/loglist.h b/src/loglist.h
index 36671be4..56b95d65 100644
--- a/src/loglist.h
+++ b/src/loglist.h
@@ -48,9 +48,6 @@ protected:
QVariant headerData(
int section, Qt::Orientation ori, int role=Qt::DisplayRole) const override;
-signals:
- void entryAdded(MOBase::log::Entry e);
-
private:
std::deque m_entries;
@@ -75,7 +72,10 @@ public:
private:
OrganizerCore* m_core;
+ QTimer m_timer;
+
void onContextMenu(const QPoint& pos);
+ void onNewEntry();
};
#endif // LOGBUFFER_H
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 439775f8..130b5fe7 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -87,6 +87,7 @@ along with Mod Organizer. If not, see .
#include "localsavegames.h"
#include "listdialog.h"
#include "envshortcut.h"
+#include "browserdialog.h"
#include
#include
@@ -406,8 +407,6 @@ MainWindow::MainWindow(Settings &settings
connect(&m_OrganizerCore, &OrganizerCore::modInstalled, this, &MainWindow::modInstalled);
connect(&m_OrganizerCore, &OrganizerCore::close, this, &QMainWindow::close);
- connect(&m_IntegratedBrowser, SIGNAL(requestDownload(QUrl,QNetworkReply*)), &m_OrganizerCore, SLOT(requestDownload(QUrl,QNetworkReply*)));
-
m_CheckBSATimer.setSingleShot(true);
connect(&m_CheckBSATimer, SIGNAL(timeout()), this, SLOT(checkBSAList()));
@@ -632,7 +631,12 @@ MainWindow::~MainWindow()
m_PluginContainer.setUserInterface(nullptr, nullptr);
m_OrganizerCore.setUserInterface(nullptr);
- m_IntegratedBrowser.close();
+
+ if (m_IntegratedBrowser) {
+ m_IntegratedBrowser->close();
+ m_IntegratedBrowser.reset();
+ }
+
delete ui;
} catch (std::exception &e) {
QMessageBox::critical(nullptr, tr("Crash on exit"),
@@ -1393,7 +1397,12 @@ bool MainWindow::canExit()
void MainWindow::cleanup()
{
QWebEngineProfile::defaultProfile()->clearAllVisitedLinks();
- m_IntegratedBrowser.close();
+
+ if (m_IntegratedBrowser) {
+ m_IntegratedBrowser->close();
+ m_IntegratedBrowser = {};
+ }
+
m_SaveMetaTimer.stop();
m_MetaSave.waitForFinished();
}
@@ -1501,8 +1510,17 @@ void MainWindow::modPagePluginInvoke()
IPluginModPage *plugin = qobject_cast(triggeredAction->data().value());
if (plugin != nullptr) {
if (plugin->useIntegratedBrowser()) {
- m_IntegratedBrowser.setWindowTitle(plugin->displayName());
- m_IntegratedBrowser.openUrl(plugin->pageURL());
+
+ if (!m_IntegratedBrowser) {
+ m_IntegratedBrowser.reset(new BrowserDialog);
+
+ connect(
+ m_IntegratedBrowser.get(), SIGNAL(requestDownload(QUrl,QNetworkReply*)),
+ &m_OrganizerCore, SLOT(requestDownload(QUrl,QNetworkReply*)));
+ }
+
+ m_IntegratedBrowser->setWindowTitle(plugin->displayName());
+ m_IntegratedBrowser->openUrl(plugin->pageURL());
} else {
QDesktopServices::openUrl(QUrl(plugin->pageURL()));
}
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 608bfa64..afc434ef 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -21,7 +21,6 @@ along with Mod Organizer. If not, see .
#define MAINWINDOW_H
#include "bsafolder.h"
-#include "browserdialog.h"
#include "delayedfilewriter.h"
#include "errorcodes.h"
#include "imoinfo.h"
@@ -39,6 +38,7 @@ class CategoryFactory;
class OrganizerCore;
class FilterList;
class DataTab;
+class BrowserDialog;
class PluginListSortProxy;
namespace BSA { class Archive; }
@@ -341,7 +341,7 @@ private:
QString m_CurrentLanguage;
std::vector m_Translators;
- BrowserDialog m_IntegratedBrowser;
+ std::unique_ptr m_IntegratedBrowser;
QFileSystemWatcher m_SavesWatcher;
--
cgit v1.3.1