Murmele/Gittyup
1
1
Fork 0
mirror of https://github.com/Murmele/Gittyup.git synced 2024-09-11 10:45:39 +03:00
Code Issues Projects Releases Wiki Activity

Fix repo tab name deduplication only working for 2 tabs at most

Browse Source 
Merge pull request #504 from exactly-one-kas/fix-tab-names
This commit is contained in:
Murmele 2023-04-15 17:50:49 +02:00 committed by GitHub
commit 6a7eecf0b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/ui/MainWindow.cpp
View File

@ -21,6 +21,7 @@
#include "git/Repository.h"
#include "git/Config.h"
#include "git/Submodule.h"
#include "qmap.h"
#include <QApplication>
#include <QCloseEvent>
#include <QGuiApplication>
@ -54,6 +55,8 @@ public:
QString name() const { return mPath.section('/', -mSections); }
void increment() { ++mSections; }
int sections() const { return mSections; }
void setSections(int sections) { mSections = sections; }
private:
QString mPath;
@ -462,25 +465,31 @@ void MainWindow::warnInvalidRepo(const QString &path) {
}
void MainWindow::updateTabNames() {
QList<TabName> names;
TabWidget *tabs = tabWidget();
QHash<QString, QList<int>> names;
QList<TabName> fullNames;
for (int i = 0; i < count(); ++i) {
TabName name(view(i)->repo().workdir().path());
auto functor = [&name](const TabName &rhs) {
return (name.name() == rhs.name());
};
QList<TabName>::iterator it, end = names.end();
while ((it = std::find_if(names.begin(), end, functor)) != end) {
it->increment();
name.increment();
}
names.append(name);
names[name.name()].append(i);
fullNames.append(name);
}
TabWidget *tabs = tabWidget();
for (int i = 0; i < count(); ++i)
tabs->setTabText(i, names.at(i).name());
QHash<QString, QList<int>>::key_iterator first;
while ((first = names.keyBegin()) != names.keyEnd()) {
auto key = *first;
auto ids = names.take(key);
if (ids.count() == 1) {
tabs->setTabText(ids.first(), key);
} else {
for (auto id : ids) {
auto &name = fullNames[id];
name.increment();
names[name.name()].append(id);
}
}
}
}
void MainWindow::updateInterface() {