Skip to content

Commit 6b70160

Browse files
committed
Fix: Newer 'new item' buttons were never disabled
1 parent 4a58932 commit 6b70160

File tree

1 file changed

+8
-11
lines changed

1 file changed

+8
-11
lines changed

src/main/main_window.cpp

+8-11
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ MainWindow::MainWindow() :
6060
participatedDebugTableView(nullptr)
6161
{
6262
setupUi(this);
63+
createTypesHandler();
6364
setupMenuIcons();
6465
statusbar->addPermanentWidget(statusBarTableSizeLabel);
6566
statusbar->addPermanentWidget(statusBarFiltersLabel);
@@ -82,9 +83,6 @@ MainWindow::MainWindow() :
8283
showFiltersAction->setChecked(Settings::mainWindow_showFilters.get());
8384

8485

85-
createTypesHandler();
86-
87-
8886
ascentFilterBar->supplyPointers(this, &db, (CompositeAscentsTable*) typesHandler->get(ItemTypeAscent)->compTable);
8987

9088

@@ -527,20 +525,19 @@ void MainWindow::initCompositeBuffers()
527525
*/
528526
void MainWindow::setUIEnabled(bool enabled)
529527
{
530-
mainAreaTabs ->setEnabled(enabled);
531-
newAscentButton ->setEnabled(enabled);
532-
newPeakButton ->setEnabled(enabled);
533-
newTripButton ->setEnabled(enabled);
534-
ascentCounterSegmentNumber ->setEnabled(enabled);
535-
ascentCounterLabel ->setEnabled(enabled);
536-
537528
saveDatabaseAsAction ->setEnabled(enabled);
538529
closeDatabaseAction ->setEnabled(enabled);
539530
projectSettingsAction ->setEnabled(enabled);
540-
541531
viewMenu ->setEnabled(enabled);
542532
newMenu ->setEnabled(enabled);
543533
toolsMenu ->setEnabled(enabled);
534+
535+
typesHandler->forEach([enabled] (const ItemTypeMapper& mapper) {
536+
mapper.newItemButton->setEnabled(enabled);
537+
});
538+
mainAreaTabs ->setEnabled(enabled);
539+
ascentCounterSegmentNumber ->setEnabled(enabled);
540+
ascentCounterLabel ->setEnabled(enabled);
544541
}
545542

546543
/**

0 commit comments

Comments
 (0)