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

Clean up some tabs to spaces

Browse Source
This commit is contained in:
Jasmine Iwanek
2025-08-13 00:45:15 -04:00
parent 03006ca078
commit b04d9e1b06
2 changed files with 52 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
src/86box.c
View File

@@ -234,29 +234,46 @@ struct accelKey acc_keys[NUM_ACCELS];
// Default accelerator key values // Default accelerator key values
struct accelKey def_acc_keys[NUM_ACCELS] = { struct accelKey def_acc_keys[NUM_ACCELS] = {
{ .name="send_ctrl_alt_del", .desc="Send Control+Alt+Del", {
.seq="Ctrl+F12" }, .name="send_ctrl_alt_del",
.desc="Send Control+Alt+Del",
{ .name="send_ctrl_alt_esc", .desc="Send Control+Alt+Escape", .seq="Ctrl+F12"
.seq="Ctrl+F10" }, },
{
{ .name="fullscreen", .desc="Toggle fullscreen", .name="send_ctrl_alt_esc",
.seq="Ctrl+Alt+PgUp" }, .desc="Send Control+Alt+Escape",
.seq="Ctrl+F10"
{ .name="screenshot", .desc="Screenshot", },
.seq="Ctrl+F11" }, {
.name="fullscreen",
{ .name="release_mouse", .desc="Release mouse pointer", .desc="Toggle fullscreen",
.seq="Ctrl+End" }, .seq="Ctrl+Alt+PgUp"
},
{ .name="hard_reset", .desc="Hard reset", {
.seq="Ctrl+Alt+F12" }, .name="screenshot",
.desc="Screenshot",
{ .name="pause", .desc="Toggle pause", .seq="Ctrl+F11"
.seq="Ctrl+Alt+F1" }, },
{
{ .name="mute", .desc="Toggle mute", .name="release_mouse",
.seq="Ctrl+Alt+M" } .desc="Release mouse pointer",
.seq="Ctrl+End"
},
{
.name="hard_reset",
.desc="Hard reset",
.seq="Ctrl+Alt+F12"
},
{
.name="pause",
.desc="Toggle pause",
.seq="Ctrl+Alt+F1"
},
{
.name="mute",
.desc="Toggle mute",
.seq="Ctrl+Alt+M"
}
}; };
char vmm_path[1024] = { '\0' }; /* VM manager path to scan for VMs */ char vmm_path[1024] = { '\0' }; /* VM manager path to scan for VMs */
@@ -2008,13 +2025,11 @@ do_pause(int p)
// Helper to find an accelerator key and return it's index in acc_keys // Helper to find an accelerator key and return it's index in acc_keys
int FindAccelerator(const char *name) { int FindAccelerator(const char *name) {
for(int x=0;x<NUM_ACCELS;x++) for (int x = 0; x < NUM_ACCELS; x++) {
{ if(strcmp(acc_keys[x].name, name) == 0)
if(strcmp(acc_keys[x].name, name) == 0) return(x);
{ }
return(x);
} // No key was found
} return -1;
// No key was found
return -1;
} }

10
src/qt/qt_settingsinput.hpp
View File

@@ -38,16 +38,16 @@ private slots:
void on_pushButtonJoystick03_clicked(); void on_pushButtonJoystick03_clicked();
void on_pushButtonJoystick04_clicked(); void on_pushButtonJoystick04_clicked();
void on_tableKeys_cellDoubleClicked(int row, int col); void on_tableKeys_cellDoubleClicked(int row, int col);
void on_tableKeys_currentCellChanged(int currentRow, int currentColumn, int previousRow, int previousColumn); void on_tableKeys_currentCellChanged(int currentRow, int currentColumn, int previousRow, int previousColumn);
void on_pushButtonClearBind_clicked(); void on_pushButtonClearBind_clicked();
void on_pushButtonBind_clicked(); void on_pushButtonBind_clicked();
private: private:
Ui::SettingsInput *ui; Ui::SettingsInput *ui;
int machineId = 0; int machineId = 0;
void refreshInputList(); void refreshInputList();
}; };
#endif // QT_SETTINGSINPUT_HPP #endif // QT_SETTINGSINPUT_HPP