rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:debauchee/barrier

This commit is contained in:
walker0643 2018-03-01 10:57:49 -05:00
parent db1e05ff08 315f4c05ca
commit 4da5c29e5f
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/src/MainWindow.cpp
View File

@ -96,6 +96,13 @@ MainWindow::MainWindow(QSettings& settings, AppConfig& appConfig) :
m_pSslCertificate(NULL), m_pSslCertificate(NULL),
m_pLogWindow(new LogWindow(nullptr)) m_pLogWindow(new LogWindow(nullptr))
{ {
// explicitly unset DeleteOnClose so the window can be show and hidden
// repeatedly until Barrier is finished
setAttribute(Qt::WA_DeleteOnClose, false);
// mark the windows as sort of "dialog" window so that tiling window
// managers will float it by default (X11)
setAttribute(Qt::WA_X11NetWmWindowTypeDialog, true);
setupUi(this); setupUi(this);
createMenuBar(); createMenuBar();
@ -230,6 +237,7 @@ void MainWindow::createMenuBar()
m_pMenuBarrier->addAction(m_pActionShowLog); m_pMenuBarrier->addAction(m_pActionShowLog);
m_pMenuBarrier->addAction(m_pActionSettings); m_pMenuBarrier->addAction(m_pActionSettings);
m_pMenuBarrier->addAction(m_pActionMinimize);
m_pMenuBarrier->addSeparator(); m_pMenuBarrier->addSeparator();
m_pMenuBarrier->addAction(m_pActionSave); m_pMenuBarrier->addAction(m_pActionSave);
m_pMenuBarrier->addSeparator(); m_pMenuBarrier->addSeparator();

2
src/gui/src/MainWindowBase.ui
View File

@ -350,7 +350,7 @@
<string>Hide</string> <string>Hide</string>
</property> </property>
<property name="shortcut"> <property name="shortcut">
<string notr="true"/> <string notr="true">F5</string>
</property> </property>
</action> </action>
<action name="m_pActionRestore"> <action name="m_pActionRestore">