Qt: Swap most out-of-toolbar QToolButtons to QPushButtons

Styles better on MacOS.
pull/3586/head
Stenzek 2 weeks ago
parent b5e1087e2a
commit e0e245d59a
No known key found for this signature in database

@ -189,7 +189,7 @@ AdvancedSettingsWidget::AdvancedSettingsWidget(SettingsWindow* dialog, QWidget*
connect(m_ui.logToFile, &QCheckBox::checkStateChanged, this, &AdvancedSettingsWidget::onAnyLogSinksChanged);
onAnyLogSinksChanged(); // initialize enabled/disabled state of checkboxes
connect(m_ui.logChannels, &QToolButton::clicked, this, &AdvancedSettingsWidget::onLogChannelsButtonClicked);
connect(m_ui.logChannels, &QAbstractButton::clicked, this, &AdvancedSettingsWidget::onLogChannelsButtonClicked);
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.showDebugMenu, "Main", "ShowDebugMenu", false);
connect(m_ui.showDebugMenu, &QCheckBox::checkStateChanged, g_main_window, &MainWindow::updateDebugMenuVisibility,

@ -47,7 +47,7 @@
</widget>
</item>
<item row="0" column="2">
<widget class="QToolButton" name="logChannels">
<widget class="QPushButton" name="logChannels">
<property name="toolTip">
<string>Log Channels</string>
</property>

@ -37,7 +37,7 @@ AudioSettingsWidget::AudioSettingsWidget(SettingsWindow* dialog, QWidget* parent
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.muteCDAudio, "CDROM", "MuteCDAudio", false);
connect(m_ui.audioBackend, &QComboBox::currentIndexChanged, this, &AudioSettingsWidget::updateDriverNames);
connect(m_ui.stretchMode, &QComboBox::currentIndexChanged, this, &AudioSettingsWidget::onStretchModeChanged);
connect(m_ui.stretchSettings, &QToolButton::clicked, this, &AudioSettingsWidget::onStretchSettingsClicked);
connect(m_ui.stretchSettings, &QPushButton::clicked, this, &AudioSettingsWidget::onStretchSettingsClicked);
onStretchModeChanged();
updateDriverNames();
@ -66,8 +66,8 @@ AudioSettingsWidget::AudioSettingsWidget(SettingsWindow* dialog, QWidget* parent
tr("%"), "Audio", "FastForwardVolume", 100);
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.muted, "Audio", "OutputMuted", false);
}
connect(m_ui.resetVolume, &QToolButton::clicked, this, [this]() { resetVolume(false); });
connect(m_ui.resetFastForwardVolume, &QToolButton::clicked, this, [this]() { resetVolume(true); });
connect(m_ui.resetVolume, &QPushButton::clicked, this, [this]() { resetVolume(false); });
connect(m_ui.resetFastForwardVolume, &QPushButton::clicked, this, [this]() { resetVolume(true); });
dialog->registerWidgetHelp(
m_ui.audioBackend, tr("Audio Backend"), QStringLiteral("Cubeb"),

@ -98,7 +98,7 @@
</widget>
</item>
<item row="3" column="2">
<widget class="QToolButton" name="stretchSettings">
<widget class="QPushButton" name="stretchSettings">
<property name="toolTip">
<string>Stretch Settings</string>
</property>
@ -253,7 +253,7 @@
</widget>
</item>
<item row="0" column="3">
<widget class="QToolButton" name="resetVolume">
<widget class="QPushButton" name="resetVolume">
<property name="toolTip">
<string>Reset Output Volume</string>
</property>
@ -305,7 +305,7 @@
</widget>
</item>
<item row="1" column="3">
<widget class="QToolButton" name="resetFastForwardVolume">
<widget class="QPushButton" name="resetFastForwardVolume">
<property name="toolTip">
<string>Reset Fast Forward Volume</string>
</property>

@ -100,7 +100,13 @@
</widget>
</item>
<item row="0" column="2">
<widget class="QToolButton" name="rescan">
<widget class="QPushButton" name="rescan">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Refresh BIOS List</string>
</property>
@ -222,6 +228,12 @@
<property name="orientation">
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
</layout>

@ -39,15 +39,14 @@
<property name="text">
<string>Bindings</string>
</property>
<property name="icon">
<iconset theme="controller-digital-line"/>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="icon">
<iconset theme="controller-digital-line">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
<enum>Qt::ToolButtonStyle::ToolButtonTextBesideIcon</enum>
</property>
<property name="autoRaise">
<bool>true</bool>
@ -60,14 +59,13 @@
<string>Settings</string>
</property>
<property name="icon">
<iconset theme="checkbox-multiple-blank-line">
<normaloff>.</normaloff>.</iconset>
<iconset theme="checkbox-multiple-blank-line"/>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
<enum>Qt::ToolButtonStyle::ToolButtonTextBesideIcon</enum>
</property>
<property name="autoRaise">
<bool>true</bool>
@ -80,14 +78,13 @@
<string>Macros</string>
</property>
<property name="icon">
<iconset theme="flashlight-line">
<normaloff>.</normaloff>.</iconset>
<iconset theme="flashlight-line"/>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
<enum>Qt::ToolButtonStyle::ToolButtonTextBesideIcon</enum>
</property>
<property name="autoRaise">
<bool>true</bool>
@ -99,7 +96,7 @@
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -117,11 +114,10 @@
<string>Automatic Mapping</string>
</property>
<property name="icon">
<iconset theme="controller-digital-line">
<normaloff>.</normaloff>.</iconset>
<iconset theme="controller-digital-line"/>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
<enum>Qt::ToolButtonStyle::ToolButtonTextBesideIcon</enum>
</property>
</widget>
</item>
@ -131,11 +127,10 @@
<string>Clear Mapping</string>
</property>
<property name="icon">
<iconset theme="trash-fill">
<normaloff>.</normaloff>.</iconset>
<iconset theme="trash-fill"/>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
<enum>Qt::ToolButtonStyle::ToolButtonTextBesideIcon</enum>
</property>
</widget>
</item>
@ -145,7 +140,7 @@
</widget>
</item>
<item>
<widget class="QStackedWidget" name="stackedWidget" />
<widget class="QStackedWidget" name="stackedWidget"/>
</item>
</layout>
</widget>

@ -641,6 +641,8 @@ ControllerMacroEditWidget::ControllerMacroEditWidget(ControllerMacroWidget* pare
: QWidget(parent), m_parent(parent), m_bwidget(bwidget), m_index(index)
{
m_ui.setupUi(this);
m_ui.increaseFrequency->setIcon(style()->standardIcon(QStyle::SP_ArrowUp));
m_ui.decreateFrequency->setIcon(style()->standardIcon(QStyle::SP_ArrowDown));
ControllerSettingsWindow* dialog = m_bwidget->getDialog();
const std::string& section = m_bwidget->getConfigSection();

@ -45,7 +45,13 @@
</widget>
</item>
<item>
<widget class="QToolButton" name="ledSettings">
<widget class="QPushButton" name="ledSettings">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Controller LED Settings</string>
</property>
@ -317,7 +323,7 @@
</item>
</layout>
</widget>
</item>
</item>
<item row="5" column="0">
<widget class="QGroupBox" name="profileSettings">
<property name="title">

@ -10,7 +10,7 @@
<height>433</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout" stretch="1,0,0">
<layout class="QVBoxLayout" name="verticalLayout" stretch="1,0,0,0">
<property name="leftMargin">
<number>0</number>
</property>
@ -75,10 +75,10 @@
<number>100</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="tickPosition">
<enum>QSlider::TicksBelow</enum>
<enum>QSlider::TickPosition::TicksBelow</enum>
</property>
<property name="tickInterval">
<number>10</number>
@ -111,7 +111,7 @@
<string>Select the trigger to activate this macro. This can be a single button, or combination of buttons (chord). Shift-click for multiple triggers.</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
<set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
</property>
<property name="wordWrap">
<bool>true</bool>
@ -119,7 +119,7 @@
</widget>
</item>
<item>
<widget class="QCheckBox" name="triggerToggle">
<widget class="QCheckBox" name="triggerToggle">
<property name="text">
<string>Press To Toggle</string>
</property>
@ -155,10 +155,10 @@
<number>100</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="tickPosition">
<enum>QSlider::TicksBelow</enum>
<enum>QSlider::TickPosition::TicksBelow</enum>
</property>
<property name="tickInterval">
<number>10</number>
@ -200,29 +200,23 @@
</widget>
</item>
<item>
<widget class="QToolButton" name="increaseFrequency">
<widget class="QPushButton" name="increaseFrequency">
<property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
<property name="arrowType">
<enum>Qt::UpArrow</enum>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="decreateFrequency">
<widget class="QPushButton" name="decreateFrequency">
<property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
<property name="arrowType">
<enum>Qt::DownArrow</enum>
</property>
</widget>
</item>
</layout>

@ -31,7 +31,7 @@
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QToolButton" name="add">
<widget class="QPushButton" name="add">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
@ -44,13 +44,10 @@
<property name="icon">
<iconset theme="add-line"/>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonStyle::ToolButtonIconOnly</enum>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="remove">
<widget class="QPushButton" name="remove">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
@ -63,9 +60,6 @@
<property name="icon">
<iconset theme="minus-line"/>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonStyle::ToolButtonIconOnly</enum>
</property>
</widget>
</item>
<item>

@ -210,10 +210,10 @@ GameCheatSettingsWidget::GameCheatSettingsWidget(SettingsWindow* dialog, QWidget
connect(m_ui.cheatList, &QTreeView::customContextMenuRequested, this,
&GameCheatSettingsWidget::onCheatListContextMenuRequested);
connect(m_codes_model, &QStandardItemModel::itemChanged, this, &GameCheatSettingsWidget::onCheatListItemChanged);
connect(m_ui.add, &QToolButton::clicked, this, &GameCheatSettingsWidget::newCode);
connect(m_ui.remove, &QToolButton::clicked, this, &GameCheatSettingsWidget::onRemoveCodeClicked);
connect(m_ui.disableAll, &QToolButton::clicked, this, &GameCheatSettingsWidget::disableAllCheats);
connect(m_ui.reloadCheats, &QToolButton::clicked, this, &GameCheatSettingsWidget::onReloadClicked);
connect(m_ui.add, &QPushButton::clicked, this, &GameCheatSettingsWidget::newCode);
connect(m_ui.remove, &QPushButton::clicked, this, &GameCheatSettingsWidget::onRemoveCodeClicked);
connect(m_ui.disableAll, &QPushButton::clicked, this, &GameCheatSettingsWidget::disableAllCheats);
connect(m_ui.reloadCheats, &QPushButton::clicked, this, &GameCheatSettingsWidget::onReloadClicked);
connect(m_ui.importCheats, &QPushButton::clicked, this, &GameCheatSettingsWidget::onImportClicked);
connect(m_ui.exportCheats, &QPushButton::clicked, this, &GameCheatSettingsWidget::onExportClicked);
connect(m_ui.clearCheats, &QPushButton::clicked, this, &GameCheatSettingsWidget::onClearClicked);
@ -1004,8 +1004,8 @@ GameCheatCodeChoiceEditorDialog::GameCheatCodeChoiceEditorDialog(QWidget* parent
m_ui.setupUi(this);
QtUtils::SetColumnWidthsForTreeView(m_ui.optionList, {-1, 150});
connect(m_ui.add, &QToolButton::clicked, this, &GameCheatCodeChoiceEditorDialog::onAddClicked);
connect(m_ui.remove, &QToolButton::clicked, this, &GameCheatCodeChoiceEditorDialog::onRemoveClicked);
connect(m_ui.add, &QPushButton::clicked, this, &GameCheatCodeChoiceEditorDialog::onAddClicked);
connect(m_ui.remove, &QPushButton::clicked, this, &GameCheatCodeChoiceEditorDialog::onRemoveClicked);
connect(m_ui.buttonBox, &QDialogButtonBox::accepted, this, &GameCheatCodeChoiceEditorDialog::onSaveClicked);
connect(m_ui.buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);

@ -49,7 +49,7 @@
</widget>
</item>
<item>
<widget class="QToolButton" name="sortCheats">
<widget class="QPushButton" name="sortCheats">
<property name="toolTip">
<string>Sort Alphabetically</string>
</property>
@ -62,7 +62,7 @@
</widget>
</item>
<item>
<widget class="QToolButton" name="add">
<widget class="QPushButton" name="add">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
@ -75,13 +75,10 @@
<property name="icon">
<iconset theme="add-line"/>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonStyle::ToolButtonIconOnly</enum>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="remove">
<widget class="QPushButton" name="remove">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
@ -94,13 +91,10 @@
<property name="icon">
<iconset theme="minus-line"/>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonStyle::ToolButtonIconOnly</enum>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="disableAll">
<widget class="QPushButton" name="disableAll">
<property name="toolTip">
<string>Disable All Cheats</string>
</property>
@ -110,7 +104,7 @@
</widget>
</item>
<item>
<widget class="QToolButton" name="reloadCheats">
<widget class="QPushButton" name="reloadCheats">
<property name="toolTip">
<string>Reload Cheats</string>
</property>

@ -46,7 +46,7 @@
</spacer>
</item>
<item>
<widget class="QToolButton" name="addSearchDirectoryButton">
<widget class="QPushButton" name="addSearchDirectoryButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
@ -59,13 +59,10 @@
<property name="icon">
<iconset theme="folder-add-line"/>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="removeSearchDirectoryButton">
<widget class="QPushButton" name="removeSearchDirectoryButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
@ -78,9 +75,6 @@
<property name="icon">
<iconset theme="folder-reduce-line"/>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
</property>
</widget>
</item>
</layout>
@ -122,7 +116,7 @@
</spacer>
</item>
<item>
<widget class="QToolButton" name="addExcludedFile">
<widget class="QPushButton" name="addExcludedFile">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
@ -135,13 +129,10 @@
<property name="icon">
<iconset theme="file-add-line"/>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="addExcludedFolder">
<widget class="QPushButton" name="addExcludedFolder">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
@ -154,13 +145,10 @@
<property name="icon">
<iconset theme="folder-add-line"/>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="removeExcludedPath">
<widget class="QPushButton" name="removeExcludedPath">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
@ -173,9 +161,6 @@
<property name="icon">
<iconset theme="folder-reduce-line"/>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
</property>
</widget>
</item>
</layout>

@ -65,7 +65,7 @@ GameSummaryWidget::GameSummaryWidget(const GameList::Entry* entry, SettingsWindo
populateUi(entry);
connect(m_ui.compatibilityComments, &QToolButton::clicked, this, &GameSummaryWidget::onCompatibilityCommentsClicked);
connect(m_ui.compatibilityComments, &QAbstractButton::clicked, this, &GameSummaryWidget::onCompatibilityCommentsClicked);
connect(m_ui.inputProfile, &QComboBox::currentIndexChanged, this, &GameSummaryWidget::onInputProfileChanged);
connect(m_ui.editInputProfile, &QAbstractButton::clicked, this, &GameSummaryWidget::onEditInputProfileClicked);
connect(m_ui.computeHashes, &QAbstractButton::clicked, this, &GameSummaryWidget::onComputeHashClicked);

@ -52,14 +52,10 @@
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="title">
<property name="placeholderText">
<string>Clear the line to restore the original title...</string>
</property>
</widget>
<widget class="QLineEdit" name="title" />
</item>
<item row="1" column="2">
<widget class="QToolButton" name="restoreTitle">
<widget class="QPushButton" name="restoreTitle">
<property name="enabled">
<bool>false</bool>
</property>
@ -131,7 +127,7 @@
</widget>
</item>
<item row="4" column="2">
<widget class="QToolButton" name="restoreRegion">
<widget class="QPushButton" name="restoreRegion">
<property name="enabled">
<bool>false</bool>
</property>
@ -181,7 +177,7 @@
</widget>
</item>
<item>
<widget class="QToolButton" name="compatibilityComments">
<widget class="QPushButton" name="compatibilityComments">
<property name="icon">
<iconset theme="information-line"/>
</property>

@ -1188,7 +1188,13 @@
</widget>
</item>
<item>
<widget class="QToolButton" name="textureReplacementOptions">
<widget class="QPushButton" name="textureReplacementOptions">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="icon">
<iconset theme="settings-3-line"/>
</property>

@ -48,9 +48,9 @@ InputBindingDialog::InputBindingDialog(SettingsInterface* sif, InputBindingInfo:
sif, m_ui.deadzone, m_section_name, fmt::format("{}Deadzone", m_key_name), 100.0f, 0.0f);
connect(m_ui.sensitivity, &QSlider::valueChanged, this, &InputBindingDialog::onSensitivityChanged);
connect(m_ui.resetSensitivity, &QToolButton::clicked, this, &InputBindingDialog::onResetSensitivityClicked);
connect(m_ui.resetSensitivity, &QPushButton::clicked, this, &InputBindingDialog::onResetSensitivityClicked);
connect(m_ui.deadzone, &QSlider::valueChanged, this, &InputBindingDialog::onDeadzoneChanged);
connect(m_ui.resetDeadzone, &QToolButton::clicked, this, &InputBindingDialog::onResetDeadzoneClicked);
connect(m_ui.resetDeadzone, &QPushButton::clicked, this, &InputBindingDialog::onResetDeadzoneClicked);
onSensitivityChanged(m_ui.sensitivity->value());
onDeadzoneChanged(m_ui.deadzone->value());

@ -115,7 +115,7 @@
</widget>
</item>
<item row="0" column="3">
<widget class="QToolButton" name="resetSensitivity">
<widget class="QPushButton" name="resetSensitivity">
<property name="toolTip">
<string>Reset Sensitivity</string>
</property>
@ -125,7 +125,7 @@
</widget>
</item>
<item row="1" column="3">
<widget class="QToolButton" name="resetDeadzone">
<widget class="QPushButton" name="resetDeadzone">
<property name="toolTip">
<string>Reset Deadzone</string>
</property>

@ -35,10 +35,7 @@
</widget>
</item>
<item>
<widget class="QToolButton" name="openFile">
<property name="text">
<string>...</string>
</property>
<widget class="QPushButton" name="openFile">
<property name="icon">
<iconset theme="QIcon::ThemeIcon::DocumentOpen"/>
</property>

@ -77,8 +77,8 @@
</widget>
</item>
<item>
<widget class="QToolButton" name="newCardB">
<property name="text">
<widget class="QPushButton" name="newCardB">
<property name="toolTip">
<string>New...</string>
</property>
<property name="icon">
@ -88,8 +88,8 @@
</widget>
</item>
<item>
<widget class="QToolButton" name="openCardB">
<property name="text">
<widget class="QPushButton" name="openCardB">
<property name="toolTip">
<string>Open...</string>
</property>
<property name="icon">
@ -149,8 +149,8 @@
<widget class="QComboBox" name="cardAPath"/>
</item>
<item>
<widget class="QToolButton" name="newCardA">
<property name="text">
<widget class="QPushButton" name="newCardA">
<property name="toolTip">
<string>New...</string>
</property>
<property name="icon">
@ -160,8 +160,8 @@
</widget>
</item>
<item>
<widget class="QToolButton" name="openCardA">
<property name="text">
<widget class="QPushButton" name="openCardA">
<property name="toolTip">
<string>Open...</string>
</property>
<property name="icon">

@ -80,7 +80,7 @@
</widget>
</item>
<item row="0" column="1">
<widget class="QToolButton" name="add">
<widget class="QPushButton" name="add">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
@ -93,13 +93,10 @@
<property name="icon">
<iconset theme="add-line"/>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonStyle::ToolButtonTextBesideIcon</enum>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QToolButton" name="remove">
<widget class="QPushButton" name="remove">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
@ -112,13 +109,10 @@
<property name="icon">
<iconset theme="minus-line"/>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonStyle::ToolButtonTextBesideIcon</enum>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QToolButton" name="clear">
<widget class="QPushButton" name="clear">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
@ -131,13 +125,10 @@
<property name="icon">
<iconset theme="trash-fill"/>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonStyle::ToolButtonTextBesideIcon</enum>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QToolButton" name="moveUp">
<widget class="QPushButton" name="moveUp">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
@ -150,13 +141,10 @@
<property name="icon">
<iconset theme="arrow-up-line"/>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonStyle::ToolButtonTextBesideIcon</enum>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QToolButton" name="moveDown">
<widget class="QPushButton" name="moveDown">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
@ -169,9 +157,6 @@
<property name="icon">
<iconset theme="arrow-down-line"/>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonStyle::ToolButtonTextBesideIcon</enum>
</property>
</widget>
</item>
</layout>

@ -79,11 +79,11 @@ void PostProcessingChainConfigWidget::triggerSettingsReload()
void PostProcessingChainConfigWidget::connectUi()
{
connect(m_ui.reload, &QPushButton::clicked, this, &PostProcessingChainConfigWidget::onReloadButtonClicked);
connect(m_ui.add, &QToolButton::clicked, this, &PostProcessingChainConfigWidget::onAddButtonClicked);
connect(m_ui.remove, &QToolButton::clicked, this, &PostProcessingChainConfigWidget::onRemoveButtonClicked);
connect(m_ui.clear, &QToolButton::clicked, this, &PostProcessingChainConfigWidget::onClearButtonClicked);
connect(m_ui.moveUp, &QToolButton::clicked, this, &PostProcessingChainConfigWidget::onMoveUpButtonClicked);
connect(m_ui.moveDown, &QToolButton::clicked, this, &PostProcessingChainConfigWidget::onMoveDownButtonClicked);
connect(m_ui.add, &QPushButton::clicked, this, &PostProcessingChainConfigWidget::onAddButtonClicked);
connect(m_ui.remove, &QPushButton::clicked, this, &PostProcessingChainConfigWidget::onRemoveButtonClicked);
connect(m_ui.clear, &QPushButton::clicked, this, &PostProcessingChainConfigWidget::onClearButtonClicked);
connect(m_ui.moveUp, &QPushButton::clicked, this, &PostProcessingChainConfigWidget::onMoveUpButtonClicked);
connect(m_ui.moveDown, &QPushButton::clicked, this, &PostProcessingChainConfigWidget::onMoveDownButtonClicked);
connect(m_ui.stages, &QListWidget::itemSelectionChanged, this,
&PostProcessingChainConfigWidget::onSelectedShaderChanged);
}

@ -380,7 +380,7 @@ void SetupWizardDialog::setupControllerPage(bool initial)
{
QComboBox* type_combo;
QLabel* mapping_result;
QToolButton* mapping_button;
QPushButton* mapping_button;
};
const PadWidgets pad_widgets[NUM_PADS] = {
{m_ui.controller1Type, m_ui.controller1Mapping, m_ui.controller1AutomaticMapping},

@ -488,7 +488,7 @@
</spacer>
</item>
<item>
<widget class="QToolButton" name="addSearchDirectoryButton">
<widget class="QPushButton" name="addSearchDirectoryButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
@ -501,13 +501,10 @@
<property name="icon">
<iconset theme="folder-add-line"/>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonStyle::ToolButtonTextBesideIcon</enum>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="removeSearchDirectoryButton">
<widget class="QPushButton" name="removeSearchDirectoryButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
@ -520,9 +517,6 @@
<property name="icon">
<iconset theme="folder-reduce-line"/>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonStyle::ToolButtonTextBesideIcon</enum>
</property>
</widget>
</item>
</layout>
@ -616,16 +610,13 @@
</spacer>
</item>
<item>
<widget class="QToolButton" name="controller1AutomaticMapping">
<widget class="QPushButton" name="controller1AutomaticMapping">
<property name="text">
<string>Automatic Mapping</string>
</property>
<property name="icon">
<iconset theme="controller-digital-line"/>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonStyle::ToolButtonTextBesideIcon</enum>
</property>
</widget>
</item>
</layout>
@ -679,16 +670,13 @@
</spacer>
</item>
<item>
<widget class="QToolButton" name="controller2AutomaticMapping">
<widget class="QPushButton" name="controller2AutomaticMapping">
<property name="text">
<string>Automatic Mapping</string>
</property>
<property name="icon">
<iconset theme="controller-digital-line"/>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonStyle::ToolButtonTextBesideIcon</enum>
</property>
</widget>
</item>
</layout>

Loading…
Cancel
Save