Skip to content

Commit 31ccf5c

Browse files
MurmeleMurmele
committed
WIP
1 parent 981adc8 commit 31ccf5c

11 files changed

+140
-53
lines changed

‎src/dialogs/DiffPanel.cpp

+8-4
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,10 @@ DiffPanel::DiffPanel(const git::Repository &repo, QWidget *parent)
3939
connect(context, contextSignal, [this](int value) {
4040
mConfig.setValue("diff.context", value);
4141
foreach (MainWindow *window, MainWindow::windows()) {
42-
for (int i = 0; i < window->count(); ++i)
43-
window->view(i)->refresh();
42+
for (int i = 0; i < window->count(); ++i) {
43+
if (auto v = window->view(i))
44+
v->refresh();
45+
}
4446
}
4547
});
4648

@@ -64,8 +66,10 @@ DiffPanel::DiffPanel(const git::Repository &repo, QWidget *parent)
6466
}
6567

6668
foreach (MainWindow *window, MainWindow::windows()) {
67-
for (int i = 0; i < window->count(); ++i)
68-
window->view(i)->refresh();
69+
for (int i = 0; i < window->count(); ++i) {
70+
if (auto v = window->view(i))
71+
v->refresh();
72+
}
6973
}
7074
});
7175

‎src/dialogs/SettingsDialog.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,10 @@ class GeneralPanel : public QWidget {
165165
connect(mFetch, &QCheckBox::toggled, this, [](bool checked) {
166166
Settings::instance()->setValue(Setting::Id::FetchAutomatically, checked);
167167
foreach (MainWindow *window, MainWindow::windows()) {
168-
for (int i = 0; i < window->count(); ++i)
169-
window->view(i)->startFetchTimer();
168+
for (int i = 0; i < window->count(); ++i) {
169+
if (auto v = window->view(i))
170+
v->startFetchTimer();
171+
}
170172
}
171173
});
172174

‎src/ui/IndexCompleter.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class Model : public QAbstractListModel {
6262
}
6363

6464
int rowCount(const QModelIndex &parent = QModelIndex()) const override {
65-
return mWindow->count() ? dict().size() : 0;
65+
return mWindow->repoCount() ? dict().size() : 0;
6666
}
6767

6868
private:

‎src/ui/MainWindow.cpp

+26-10
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,8 @@ MainWindow::MainWindow(const git::Repository &repo, QWidget *parent,
117117

118118
if (refresh) {
119119
for (int i = 0; i < count(); ++i)
120-
view(i)->refresh();
120+
if (auto v = view(i))
121+
v->refresh();
121122
}
122123
});
123124

@@ -134,6 +135,7 @@ MainWindow::MainWindow(const git::Repository &repo, QWidget *parent,
134135
&MainWindow::updateTabNames);
135136

136137
setCentralWidget(tabs);
138+
tabs->addWelcomeTab();
137139

138140
if (repo)
139141
addTab(repo);
@@ -167,7 +169,11 @@ RepoView *MainWindow::addTab(const QString &path) {
167169

168170
TabWidget *tabs = tabWidget();
169171
for (int i = 0; i < tabs->count(); i++) {
170-
RepoView *view = static_cast<RepoView *>(tabs->widget(i));
172+
RepoView *view = dynamic_cast<RepoView *>(tabs->widget(i));
173+
if (!view) {
174+
// Tab 0 is the welcome tab
175+
continue;
176+
}
171177
if (path == view->repo().dir(false).path()) {
172178
tabs->setCurrentIndex(i);
173179
return view;
@@ -190,7 +196,11 @@ RepoView *MainWindow::addTab(const git::Repository &repo) {
190196

191197
TabWidget *tabs = tabWidget();
192198
for (int i = 0; i < tabs->count(); i++) {
193-
RepoView *view = static_cast<RepoView *>(tabs->widget(i));
199+
RepoView *view = dynamic_cast<RepoView *>(tabs->widget(i));
200+
if (!view) {
201+
// Tab 0 is the welcome tab
202+
continue;
203+
}
194204
if (dir.path() == view->repo().dir(false).path()) {
195205
tabs->setCurrentIndex(i);
196206
return view;
@@ -223,12 +233,14 @@ RepoView *MainWindow::addTab(const git::Repository &repo) {
223233

224234
int MainWindow::count() const { return tabWidget()->count(); }
225235

236+
int MainWindow::repoCount() const { return tabWidget()->count() - 1; }
237+
226238
RepoView *MainWindow::currentView() const {
227-
return static_cast<RepoView *>(tabWidget()->currentWidget());
239+
return dynamic_cast<RepoView *>(tabWidget()->currentWidget());
228240
}
229241

230242
RepoView *MainWindow::view(int index) const {
231-
return static_cast<RepoView *>(tabWidget()->widget(index));
243+
return dynamic_cast<RepoView *>(tabWidget()->widget(index));
232244
}
233245

234246
MainWindow *MainWindow::activeWindow() {
@@ -428,9 +440,11 @@ void MainWindow::updateTabNames() {
428440
QList<TabName> fullNames;
429441

430442
for (int i = 0; i < count(); ++i) {
431-
TabName name(view(i)->repo().dir(false).path());
432-
names[name.name()].append(i);
433-
fullNames.append(name);
443+
if (auto v = view(i)) {
444+
TabName name(v->repo().dir(false).path());
445+
names[name.name()].append(i);
446+
fullNames.append(name);
447+
}
434448
}
435449

436450
QHash<QString, QList<int>>::key_iterator first;
@@ -543,8 +557,10 @@ void MainWindow::updateWindowTitle(int ahead, int behind) {
543557

544558
QStringList MainWindow::paths() const {
545559
QStringList paths;
546-
for (int i = 0; i < count(); ++i)
547-
paths.append(view(i)->repo().dir(false).path());
560+
for (int i = 0; i < count(); ++i) {
561+
if (auto v = view(i))
562+
paths.append(v->repo().dir(false).path());
563+
}
548564
return paths;
549565
}
550566

‎src/ui/MainWindow.h

+1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ class MainWindow : public QMainWindow {
3636
RepoView *addTab(const git::Repository &repo);
3737

3838
int count() const;
39+
int repoCount() const;
3940
RepoView *currentView() const;
4041
RepoView *view(int index) const;
4142

‎src/ui/MenuBar.cpp

+37-23
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ void openCloneDialog(CloneDialog::Kind kind) {
5656
QObject::connect(dialog, &CloneDialog::accepted, [dialog] {
5757
if (MainWindow *window = MainWindow::open(dialog->path())) {
5858
RepoView *view = window->currentView();
59-
view->addLogEntry(dialog->message(), dialog->messageTitle());
59+
if (view)
60+
view->addLogEntry(dialog->message(), dialog->messageTitle());
6061
}
6162
});
6263

@@ -322,8 +323,9 @@ MenuBar::MenuBar(QWidget *parent) : QMenuBar(parent) {
322323
return;
323324

324325
if (MainWindow *win = qobject_cast<MainWindow *>(window)) {
325-
if (win->count() > 0) {
326-
win->currentView()->close();
326+
if (win->count() > 1) {
327+
if (auto c = win->currentView())
328+
c->close();
327329
return;
328330
}
329331
}
@@ -439,7 +441,8 @@ MenuBar::MenuBar(QWidget *parent) : QMenuBar(parent) {
439441
connect(mFind, &QAction::triggered, [] {
440442
QWidget *widget = QApplication::activeWindow();
441443
if (MainWindow *window = qobject_cast<MainWindow *>(widget)) {
442-
window->currentView()->find();
444+
if (auto c = window->currentView())
445+
c->find();
443446
} else if (EditorWindow *window = qobject_cast<EditorWindow *>(widget)) {
444447
window->widget()->find();
445448
}
@@ -450,7 +453,8 @@ MenuBar::MenuBar(QWidget *parent) : QMenuBar(parent) {
450453
connect(mFindNext, &QAction::triggered, [] {
451454
QWidget *widget = QApplication::activeWindow();
452455
if (MainWindow *window = qobject_cast<MainWindow *>(widget)) {
453-
window->currentView()->findNext();
456+
if (auto c = window->currentView())
457+
c->findNext();
454458
} else if (EditorWindow *window = qobject_cast<EditorWindow *>(widget)) {
455459
window->widget()->findNext();
456460
}
@@ -461,7 +465,8 @@ MenuBar::MenuBar(QWidget *parent) : QMenuBar(parent) {
461465
connect(mFindPrevious, &QAction::triggered, [] {
462466
QWidget *widget = QApplication::activeWindow();
463467
if (MainWindow *window = qobject_cast<MainWindow *>(widget)) {
464-
window->currentView()->findPrevious();
468+
if (auto c = window->currentView())
469+
c->findPrevious();
465470
} else if (EditorWindow *window = qobject_cast<EditorWindow *>(widget)) {
466471
window->widget()->findPrevious();
467472
}
@@ -753,10 +758,12 @@ MenuBar::MenuBar(QWidget *parent) : QMenuBar(parent) {
753758
return;
754759

755760
RepoView *view = win->currentView();
756-
foreach (const git::Submodule &submodule, view->repo().submodules()) {
757-
QAction *action = mOpenSubmodule->addAction(submodule.name());
758-
connect(action, &QAction::triggered,
759-
[view, submodule] { view->openSubmodule(submodule); });
761+
if (view) {
762+
foreach (const git::Submodule &submodule, view->repo().submodules()) {
763+
QAction *action = mOpenSubmodule->addAction(submodule.name());
764+
connect(action, &QAction::triggered,
765+
[view, submodule] { view->openSubmodule(submodule); });
766+
}
760767
}
761768
});
762769

@@ -893,23 +900,26 @@ MenuBar::MenuBar(QWidget *parent) : QMenuBar(parent) {
893900
QAction *diffs = debug->addAction(tr("Load All Diffs"));
894901
connect(diffs, &QAction::triggered, [this] {
895902
if (MainWindow *win = qobject_cast<MainWindow *>(window())) {
896-
RepoView *view = win->currentView();
897-
CommitList *commits = view->commitList();
898-
QAbstractItemModel *model = commits->model();
899-
for (int i = 0; i < model->rowCount(); ++i) {
900-
commits->setCurrentIndex(model->index(i, 0));
901-
view->find(); // Force editors to load.
902-
QCoreApplication::processEvents();
903+
if (RepoView *view = win->currentView()) {
904+
CommitList *commits = view->commitList();
905+
QAbstractItemModel *model = commits->model();
906+
for (int i = 0; i < model->rowCount(); ++i) {
907+
commits->setCurrentIndex(model->index(i, 0));
908+
view->find(); // Force editors to load.
909+
QCoreApplication::processEvents();
910+
}
903911
}
904912
}
905913
});
906914

907915
QAction *walk = debug->addAction(tr("Walk Commits"));
908916
connect(walk, &QAction::triggered, [this] {
909917
if (MainWindow *win = qobject_cast<MainWindow *>(window())) {
910-
git::RevWalk walker = win->currentView()->repo().walker();
911-
while (git::Commit commit = walker.next())
912-
(void)commit;
918+
if (auto c = win->currentView()) {
919+
git::RevWalk walker = c->repo().walker();
920+
while (git::Commit commit = walker.next())
921+
(void)commit;
922+
}
913923
}
914924
});
915925
}
@@ -1132,8 +1142,9 @@ void MenuBar::updateHistory() {
11321142

11331143
void MenuBar::updateWindow() {
11341144
MainWindow *win = qobject_cast<MainWindow *>(window());
1135-
mPrevTab->setEnabled(win && win->count() > 1);
1136-
mNextTab->setEnabled(win && win->count() > 1);
1145+
// First tab is the welcome tab
1146+
mPrevTab->setEnabled(win && win->count() > 2);
1147+
mNextTab->setEnabled(win && win->count() > 2);
11371148
}
11381149

11391150
QWidget *MenuBar::window() const {
@@ -1150,7 +1161,10 @@ QList<RepoView *> MenuBar::views() const {
11501161

11511162
QList<RepoView *> repos;
11521163
for (int i = 0; i < win->count(); i++) {
1153-
repos.append(win->view(i));
1164+
auto* view = win->view(i);
1165+
if (view) {
1166+
repos.append(view);
1167+
}
11541168
}
11551169
return repos;
11561170
}

‎src/ui/SideBar.cpp

+11-3
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,9 @@ class RepoModel : public QAbstractItemModel {
351351
if (!mShowFullPath)
352352
return mTabs->tabText(row);
353353

354-
RepoView *view = static_cast<RepoView *>(mTabs->widget(row));
354+
RepoView *view = dynamic_cast<RepoView *>(mTabs->widget(row));
355+
if (!view)
356+
return QStringLiteral("");
355357
return view->repo().dir(false).path();
356358
}
357359

@@ -445,7 +447,10 @@ class RepoModel : public QAbstractItemModel {
445447
if (!mTabs->count())
446448
return QVariant();
447449
QWidget *widget = mTabs->widget(row);
448-
RepoView *view = static_cast<RepoView *>(widget);
450+
RepoView *view = dynamic_cast<RepoView *>(widget);
451+
if (!view) {
452+
return QStringLiteral("");
453+
}
449454
return view->repo().dir(false).path();
450455
}
451456

@@ -492,7 +497,10 @@ class RepoModel : public QAbstractItemModel {
492497
switch (parent.row()) {
493498
case Repo:
494499
if (mTabs->count()) {
495-
RepoView *view = static_cast<RepoView *>(mTabs->widget(row));
500+
RepoView *view = dynamic_cast<RepoView *>(mTabs->widget(row));
501+
if (!view) {
502+
return QStringLiteral("");
503+
}
496504
return view->repo().dir(false).path();
497505
}
498506

‎src/ui/TabBar.cpp

+33-1
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,47 @@
88
//
99

1010
#include "TabBar.h"
11+
#include <QMouseEvent>
12+
#include <QDebug>
13+
14+
namespace {
15+
constexpr auto home_tab_width = 50;
16+
}
1117

1218
TabBar::TabBar(QWidget *parent) : QTabBar(parent) {
1319
setAutoHide(true);
1420
setDocumentMode(true);
1521
}
1622

23+
void TabBar::mousePressEvent(QMouseEvent* event) {
24+
mClickedTabIndex = tabAt(event->pos());
25+
QTabBar::mousePressEvent(event);
26+
}
27+
28+
void TabBar::mouseMoveEvent(QMouseEvent* event) {
29+
qDebug() << event->pos();
30+
// if (mClickedTabIndex == 0/*event->pos().x() <= home_tab_width || tabAt(event->pos()) == 0*/) { //
31+
// // Ignoring first tab because this is the welcome tab
32+
// return;
33+
// }
34+
35+
// QTabBar::mouseMoveEvent(event);
36+
return;
37+
}
38+
39+
void TabBar::mouseReleaseEvent(QMouseEvent* event) {
40+
mClickedTabIndex = -1;
41+
QTabBar::mouseMoveEvent(event);
42+
}
43+
1744
QSize TabBar::minimumTabSizeHint(int index) const {
1845
mCalculatingMinimumSize = true;
1946
QSize size = QTabBar::minimumTabSizeHint(index);
2047
mCalculatingMinimumSize = false;
2148

49+
if (index == 0)
50+
size.setWidth(home_tab_width);
51+
2252
// Default Tab just a small tab size on the left
2353
return size;
2454
}
@@ -28,7 +58,9 @@ QSize TabBar::tabSizeHint(int index) const {
2858
return QTabBar::tabSizeHint(index);
2959

3060
int height = fontMetrics().lineSpacing() + 12;
31-
return QSize(parentWidget()->width() / count() + 1, height);
61+
if (index == 0)
62+
return QSize(home_tab_width, height);
63+
return QSize(parentWidget()->width() / (count() - 1) + 1 - home_tab_width, height);
3264

3365
// Default Tab just a small tab size on the left
3466
}

‎src/ui/TabBar.h

+4
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,14 @@ class TabBar : public QTabBar {
1919
TabBar(QWidget *parent = nullptr);
2020

2121
protected:
22+
void mousePressEvent(QMouseEvent* event) override;
23+
void mouseMoveEvent(QMouseEvent* event) override;
24+
void mouseReleaseEvent(QMouseEvent* event) override;
2225
QSize minimumTabSizeHint(int index) const override;
2326
QSize tabSizeHint(int index) const override;
2427

2528
private:
29+
int mClickedTabIndex = -1;
2630
mutable bool mCalculatingMinimumSize = false;
2731
};
2832

0 commit comments

Comments
 (0)