remove general settings page

Aitum · Jul 29, 2024 · bd3fa49 · bd3fa49
1 parent eaf8f25
commit bd3fa49
Showing 1 changed file with 4 additions and 19 deletions.
diff --git a/config-dialog.cpp b/config-dialog.cpp
@@ -57,12 +57,6 @@ OBSBasicSettings::OBSBasicSettings(QMainWindow *parent) : QDialog(parent)
 	listWidget->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Expanding);
 	listWidget->setMaximumWidth(180);
 	QListWidgetItem *listwidgetitem = new QListWidgetItem(listWidget);
-	listwidgetitem->setIcon(QIcon(QString::fromUtf8(":/settings/images/settings/general.svg")));
-	//listwidgetitem->setProperty("themeID", QVariant(QString::fromUtf8("configIconSmall")));
-	//cogsIcon
-	listwidgetitem->setText(QString::fromUtf8(obs_module_text("General")));
-
-	listwidgetitem = new QListWidgetItem(listWidget);
 	listwidgetitem->setIcon(QIcon(QString::fromUtf8(":/settings/images/settings/stream.svg")));
 	listwidgetitem->setText(QString::fromUtf8(obs_module_text("MainCanvas")));
 
@@ -86,20 +80,12 @@ OBSBasicSettings::OBSBasicSettings(QMainWindow *parent) : QDialog(parent)
 	settingsPages->setFrameShape(QFrame::NoFrame);
 	settingsPages->setLineWidth(0);
 
-	QWidget *generalPage = new QWidget;
-	QScrollArea *scrollArea = new QScrollArea;
-	scrollArea->setWidget(generalPage);
-	scrollArea->setWidgetResizable(true);
-	scrollArea->setLineWidth(0);
-	scrollArea->setFrameShape(QFrame::NoFrame);
-	settingsPages->addWidget(scrollArea);
-
 	auto mainOutputsPage = new QGroupBox;
 	mainOutputsPage->setProperty("customTitle", QVariant(true));
 	mainOutputsPage->setStyleSheet(QString("QGroupBox[customTitle=\"true\"]{ padding-top: 4px;}"));
 	mainOutputsPage->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
 
-	scrollArea = new QScrollArea;
+	QScrollArea *scrollArea = new QScrollArea;
 	scrollArea->setWidget(mainOutputsPage);
 	scrollArea->setWidgetResizable(true);
 	scrollArea->setLineWidth(0);
@@ -297,7 +283,7 @@ OBSBasicSettings::OBSBasicSettings(QMainWindow *parent) : QDialog(parent)
 	contentLayout->addWidget(settingsPages, 1);
 
 	listWidget->connect(listWidget, &QListWidget::currentRowChanged, settingsPages, &QStackedWidget::setCurrentIndex);
-	listWidget->setCurrentRow(1);
+	listWidget->setCurrentRow(0);
 
 	QVBoxLayout *vlayout = new QVBoxLayout;
 	vlayout->setContentsMargins(11, 11, 11, 11);
@@ -356,19 +342,18 @@ QIcon OBSBasicSettings::GetAdvancedIcon() const
 
 void OBSBasicSettings::SetGeneralIcon(const QIcon &icon)
 {
-	listWidget->item(0)->setIcon(icon);
+	UNUSED_PARAMETER(icon);
 }
 
 void OBSBasicSettings::SetStreamIcon(const QIcon &icon)
 {
+	listWidget->item(0)->setIcon(icon);
 	listWidget->item(1)->setIcon(icon);
-	listWidget->item(2)->setIcon(icon);
 }
 
 void OBSBasicSettings::SetOutputIcon(const QIcon &icon)
 {
 	UNUSED_PARAMETER(icon);
-	//listWidget->item(2)->setIcon(icon);
 }
 
 void OBSBasicSettings::SetAudioIcon(const QIcon &icon)