From 8e468df6610f880df8acb643fb775a94a55e6b42 Mon Sep 17 00:00:00 2001 From: Michael Gregorius Date: Mon, 1 Apr 2024 14:41:27 +0200 Subject: [PATCH] Remove "GENERAL SETTINGS" tab Remove the "GENERAL SETTINGS" tab from the instrument track and sample track window. This removes clutter as well as dependencies to the non-scalable `TabWidget`. Remove superfluous calls to `setSpacing` which have set the default value of 6. Use the default content margins of (9, 9, 9, 9) instead of (8, 8, 8, 8). --- src/gui/SampleTrackWindow.cpp | 7 +------ src/gui/instrument/InstrumentTrackWindow.cpp | 6 +----- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/gui/SampleTrackWindow.cpp b/src/gui/SampleTrackWindow.cpp index 630119253aa..81a2ca89b60 100644 --- a/src/gui/SampleTrackWindow.cpp +++ b/src/gui/SampleTrackWindow.cpp @@ -40,7 +40,6 @@ #include "SampleTrackView.h" #include "Song.h" #include "SubWindow.h" -#include "TabWidget.h" #include "TrackLabelButton.h" namespace lmms::gui @@ -69,13 +68,9 @@ SampleTrackWindow::SampleTrackWindow(SampleTrackView * tv) : vlayout->setContentsMargins(0, 0, 0, 0); vlayout->setSpacing(0); - auto generalSettingsWidget = new TabWidget(tr("GENERAL SETTINGS"), this); - + auto generalSettingsWidget = new QWidget(this); auto generalSettingsLayout = new QVBoxLayout(generalSettingsWidget); - generalSettingsLayout->setContentsMargins(8, 18, 8, 8); - generalSettingsLayout->setSpacing(6); - auto nameWidget = new QWidget(generalSettingsWidget); auto nameLayout = new QHBoxLayout(nameWidget); nameLayout->setContentsMargins(0, 0, 0, 0); diff --git a/src/gui/instrument/InstrumentTrackWindow.cpp b/src/gui/instrument/InstrumentTrackWindow.cpp index b6a51624b26..5387346a93f 100644 --- a/src/gui/instrument/InstrumentTrackWindow.cpp +++ b/src/gui/instrument/InstrumentTrackWindow.cpp @@ -93,13 +93,9 @@ InstrumentTrackWindow::InstrumentTrackWindow( InstrumentTrackView * _itv ) : vlayout->setContentsMargins(0, 0, 0, 0); vlayout->setSpacing( 0 ); - auto generalSettingsWidget = new TabWidget(tr("GENERAL SETTINGS"), this); - + auto generalSettingsWidget = new QWidget(this); auto generalSettingsLayout = new QVBoxLayout(generalSettingsWidget); - generalSettingsLayout->setContentsMargins( 8, 18, 8, 8 ); - generalSettingsLayout->setSpacing( 6 ); - auto nameAndChangeTrackWidget = new QWidget(generalSettingsWidget); auto nameAndChangeTrackLayout = new QHBoxLayout(nameAndChangeTrackWidget); nameAndChangeTrackLayout->setContentsMargins( 0, 0, 0, 0 );