mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-13 09:34:53 +02:00
Code Issues Releases Wiki Activity

* Restore last fullscreen state on OSX.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2013-01-16 13:18:40 +01:00
parent 6e0fb0d597
commit fbeee55c16
2 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/TomahawkWindow.cpp
View File

@@ -148,6 +148,12 @@ TomahawkWindow::TomahawkWindow( QWidget* parent )
vm->setQueue( m_queueView ); vm->setQueue( m_queueView );
vm->showWelcomePage(); vm->showWelcomePage();
if ( TomahawkSettings::instance()->fullscreenEnabled() )
{
// Window must be fully constructed to toggle fullscreen mode. Queue it up.
QTimer::singleShot( 0, this, SLOT( toggleFullscreen() ) );
}
} }
@@ -543,6 +549,7 @@ TomahawkWindow::setupSignals()
#if defined( Q_OS_MAC ) #if defined( Q_OS_MAC )
connect( ac->getAction( "minimize" ), SIGNAL( triggered() ), SLOT( minimize() ) ); connect( ac->getAction( "minimize" ), SIGNAL( triggered() ), SLOT( minimize() ) );
connect( ac->getAction( "zoom" ), SIGNAL( triggered() ), SLOT( maximize() ) ); connect( ac->getAction( "zoom" ), SIGNAL( triggered() ), SLOT( maximize() ) );
connect( ac->getAction( "fullscreen" ), SIGNAL( triggered() ), SLOT( toggleFullscreen() ) );
#else #else
connect( ac->getAction( "toggleMenuBar" ), SIGNAL( triggered() ), SLOT( toggleMenuBar() ) ); connect( ac->getAction( "toggleMenuBar" ), SIGNAL( triggered() ), SLOT( toggleMenuBar() ) );
#endif #endif
@@ -875,14 +882,24 @@ TomahawkWindow::showOfflineSources()
void void
TomahawkWindow::fullScreenEntered() TomahawkWindow::fullScreenEntered()
{ {
TomahawkSettings::instance()->setFullscreenEnabled( true );
statusBar()->setSizeGripEnabled( false ); statusBar()->setSizeGripEnabled( false );
#if defined( Q_WS_MAC )
ActionCollection::instance()->getAction( "fullscreen" )->setText( tr( "Exit Full Screen" ) );
#endif
} }
void void
TomahawkWindow::fullScreenExited() TomahawkWindow::fullScreenExited()
{ {
TomahawkSettings::instance()->setFullscreenEnabled( false );
statusBar()->setSizeGripEnabled( true ); statusBar()->setSizeGripEnabled( true );
#if defined( Q_WS_MAC )
ActionCollection::instance()->getAction( "fullscreen" )->setText( tr( "Enter Full Screen" ) );
#endif
} }
@@ -1290,6 +1307,17 @@ TomahawkWindow::maximize()
} }
void
TomahawkWindow::toggleFullscreen()
{
tDebug() << Q_FUNC_INFO;
#if defined( Q_WS_MAC )
Tomahawk::toggleFullscreen();
#endif
}
void void
TomahawkWindow::crashNow() TomahawkWindow::crashNow()
{ {

1
src/TomahawkWindow.h
View File

@@ -139,6 +139,7 @@ private slots:
void minimize(); void minimize();
void maximize(); void maximize();
void toggleFullscreen();
void playlistCreateDialogFinished( int ret ); void playlistCreateDialogFinished( int ret );