Commit 40c75aa1 authored by Harald Sitter's avatar Harald Sitter 😷

Merge branch 'Applications/18.08'

# Conflicts:
#	CMakeLists.txt
parents 9c8fa719 96c7f931
......@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
# KDE Application Version, managed by release script
set(KDE_APPLICATIONS_VERSION_MAJOR "18")
set(KDE_APPLICATIONS_VERSION_MINOR "11")
set(KDE_APPLICATIONS_VERSION_MICRO "70")
set(KDE_APPLICATIONS_VERSION_MICRO "2")
set(KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}")
set(PROJECT_VERSION ${KDE_APPLICATIONS_VERSION})
......
......@@ -245,11 +245,13 @@ MainWindow::~MainWindow()
void MainWindow::closeEvent (QCloseEvent *event)
{
// Restore the state of these before closing
mainWindow()->setWindowState( Qt::WindowNoState );
statusBar()->setHidden( m_statusbarIsHidden );
toolBar()->setHidden( m_toolbarIsHidden );
menuBar()->setHidden( m_menuBarIsHidden );
// restore the following user ui settings which are changed in full screen mode
if (mainWindow()->isFullScreen()) {
statusBar()->setHidden( m_statusbarIsHidden );
toolBar()->setHidden( m_toolbarIsHidden );
menuBar()->setHidden( m_menuBarIsHidden );
}
KMainWindow::closeEvent( event );
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment