claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5780 from Cacodemon345/manager-fixes

Browse Source 
Fix placement of CPU frame size option, also add Exit option
This commit is contained in:
Miran Grča
2025-07-11 11:14:11 +02:00
committed by GitHub
parent 7398ed7cac f4f6bbc465
commit 82abf45076
4 changed files with 75 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/qt/qt_settingsmachine.ui
View File

@@ -315,9 +315,6 @@
</layout> </layout>
</item> </item>
<item> <item>
<widget class="QFrame" name="horizontalFrame">
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
<widget class="QGroupBox" name="groupBox"> <widget class="QGroupBox" name="groupBox">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred"> <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
@@ -353,20 +350,7 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="2">
<widget class="QGroupBox" name="groupBox_2"> <widget class="QGroupBox" name="groupBox_2">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Maximum"> <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
@@ -398,22 +382,6 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="3">
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item> <item>
<spacer name="verticalSpacer"> <spacer name="verticalSpacer">
<property name="orientation"> <property name="orientation">

6
src/qt/qt_vmmanager_mainwindow.cpp
View File

@@ -181,3 +181,9 @@ VMManagerMainWindow::checkForUpdatesTriggered()
const auto updateCheck = new UpdateCheckDialog(updateChannel); const auto updateCheck = new UpdateCheckDialog(updateChannel);
updateCheck->exec(); updateCheck->exec();
} }
void VMManagerMainWindow::on_actionExit_triggered()
{
this->close();
}

2
src/qt/qt_vmmanager_mainwindow.hpp
View File

@@ -52,6 +52,8 @@ private slots:
void preferencesTriggered(); void preferencesTriggered();
static void checkForUpdatesTriggered(); static void checkForUpdatesTriggered();
void on_actionExit_triggered();
protected: protected:
void closeEvent(QCloseEvent *event) override; void closeEvent(QCloseEvent *event) override;
}; };

13
src/qt/qt_vmmanager_mainwindow.ui
View File

@@ -35,6 +35,8 @@
<string>File</string> <string>File</string>
</property> </property>
<addaction name="actionNew_Machine"/> <addaction name="actionNew_Machine"/>
<addaction name="separator"/>
<addaction name="actionExit"/>
</widget> </widget>
<addaction name="menuFile"/> <addaction name="menuFile"/>
<addaction name="menuTools"/> <addaction name="menuTools"/>
@@ -204,6 +206,17 @@
<string>Check for updates</string> <string>Check for updates</string>
</property> </property>
</action> </action>
<action name="actionExit">
<property name="icon">
<iconset theme="QIcon::ThemeIcon::ApplicationExit"/>
</property>
<property name="text">
<string>&amp;Exit</string>
</property>
<property name="menuRole">
<enum>QAction::MenuRole::QuitRole</enum>
</property>
</action>
</widget> </widget>
<resources> <resources>
<include location="../qt_resources.qrc"/> <include location="../qt_resources.qrc"/>