github/chiaki
1
0
Fork 0
mirror of https://git.sr.ht/~thestr4ng3r/chiaki synced 2025-08-20 05:23:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add quit (Ctrl+Q) shortcut to GUI

Browse source
This commit is contained in:
Street Pea 2022-12-10 15:12:28 +01:00 • committed by Florian Märkl
commit 36816db7ac
4 changed files with 22 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gui/include/mainwindow.h
View file

@ -55,6 +55,7 @@ class MainWindow : public QMainWindow
void UpdateDiscoveryEnabled(); void UpdateDiscoveryEnabled();
void ShowSettings(); void ShowSettings();
void Quit();
void UpdateDisplayServers(); void UpdateDisplayServers();
void UpdateServerWidgets(); void UpdateServerWidgets();

1
gui/include/streamwindow.h
View file

@ -48,6 +48,7 @@ class StreamWindow: public QMainWindow
void ToggleFullscreen(); void ToggleFullscreen();
void ToggleStretch(); void ToggleStretch();
void ToggleZoom(); void ToggleZoom();
void Quit();
}; };
#endif // CHIAKI_GUI_STREAMWINDOW_H #endif // CHIAKI_GUI_STREAMWINDOW_H

10
gui/src/mainwindow.cpp
View file

@ -146,6 +146,11 @@ MainWindow::MainWindow(Settings *settings, QWidget *parent)
AddToolBarAction(settings_action); AddToolBarAction(settings_action);
connect(settings_action, &QAction::triggered, this, &MainWindow::ShowSettings); connect(settings_action, &QAction::triggered, this, &MainWindow::ShowSettings);
auto quit_action = new QAction(tr("Quit"), this);
quit_action->setShortcut(Qt::CTRL + Qt::Key_Q);
addAction(quit_action);
connect(quit_action, &QAction::triggered, this, &MainWindow::Quit);
auto scroll_area = new QScrollArea(this); auto scroll_area = new QScrollArea(this);
scroll_area->setWidgetResizable(true); scroll_area->setWidgetResizable(true);
scroll_area->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); scroll_area->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
@ -305,6 +310,11 @@ void MainWindow::ShowSettings()
dialog.exec(); dialog.exec();
} }
void MainWindow::Quit()
{
qApp->exit();
}
void MainWindow::UpdateDisplayServers() void MainWindow::UpdateDisplayServers()
{ {
display_servers.clear(); display_servers.clear();

10
gui/src/streamwindow.cpp
View file

@ -102,6 +102,11 @@ void StreamWindow::Init()
addAction(zoom_action); addAction(zoom_action);
connect(zoom_action, &QAction::triggered, this, &StreamWindow::ToggleZoom); connect(zoom_action, &QAction::triggered, this, &StreamWindow::ToggleZoom);
auto quit_action = new QAction(tr("Quit"), this);
quit_action->setShortcut(Qt::CTRL + Qt::Key_Q);
addAction(quit_action);
connect(quit_action, &QAction::triggered, this, &StreamWindow::Quit);
resize(connect_info.video_profile.width, connect_info.video_profile.height); resize(connect_info.video_profile.width, connect_info.video_profile.height);
if(connect_info.fullscreen) if(connect_info.fullscreen)
@ -127,6 +132,11 @@ void StreamWindow::keyReleaseEvent(QKeyEvent *event)
session->HandleKeyboardEvent(event); session->HandleKeyboardEvent(event);
} }
void StreamWindow::Quit()
{
close();
}
void StreamWindow::mousePressEvent(QMouseEvent *event) void StreamWindow::mousePressEvent(QMouseEvent *event)
{ {
if(session && session->HandleMouseEvent(event)) if(session && session->HandleMouseEvent(event))