mirror of
https://github.com/tomahawk-player/tomahawk.git
synced 2025-08-05 13:47:26 +02:00
* Try and fix compiling with mingw.
This commit is contained in:
@@ -92,9 +92,9 @@ TomahawkWindow::TomahawkWindow( QWidget* parent )
|
|||||||
: QMainWindow( parent )
|
: QMainWindow( parent )
|
||||||
#ifdef Q_OS_WIN
|
#ifdef Q_OS_WIN
|
||||||
, m_buttonCreatedID( RegisterWindowMessage( L"TaskbarButtonCreated" ) )
|
, m_buttonCreatedID( RegisterWindowMessage( L"TaskbarButtonCreated" ) )
|
||||||
# ifdef HAVE_THUMBBUTTON
|
#ifdef HAVE_THUMBBUTTON
|
||||||
, m_taskbarList(0)
|
, m_taskbarList( 0 )
|
||||||
# endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
, ui( new Ui::TomahawkWindow )
|
, ui( new Ui::TomahawkWindow )
|
||||||
, m_searchWidget( 0 )
|
, m_searchWidget( 0 )
|
||||||
@@ -195,8 +195,7 @@ TomahawkWindow::loadSettings()
|
|||||||
bool mbVisible = s->menuBarVisible();
|
bool mbVisible = s->menuBarVisible();
|
||||||
menuBar()->setVisible( mbVisible );
|
menuBar()->setVisible( mbVisible );
|
||||||
m_compactMenuAction->setVisible( !mbVisible );
|
m_compactMenuAction->setVisible( !mbVisible );
|
||||||
ActionCollection::instance()->getAction( "toggleMenuBar" )
|
ActionCollection::instance()->getAction( "toggleMenuBar" )->setText( mbVisible ? tr( "Hide Menu Bar" ) : tr( "Show Menu Bar" ) );
|
||||||
->setText( mbVisible ? tr( "Hide Menu Bar" ) : tr( "Show Menu Bar" ) );
|
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -768,6 +767,7 @@ TomahawkWindow::audioStateChanged( AudioState newState, AudioState oldState )
|
|||||||
#endif // HAVE_THUMBBUTTON
|
#endif // HAVE_THUMBBUTTON
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void
|
void
|
||||||
TomahawkWindow::updateWindowsLoveButton()
|
TomahawkWindow::updateWindowsLoveButton()
|
||||||
{
|
{
|
||||||
|
@@ -29,6 +29,7 @@
|
|||||||
#include <QStackedWidget>
|
#include <QStackedWidget>
|
||||||
#include <QToolButton>
|
#include <QToolButton>
|
||||||
|
|
||||||
|
#include "config.h"
|
||||||
#include "Result.h"
|
#include "Result.h"
|
||||||
#include "audio/AudioEngine.h"
|
#include "audio/AudioEngine.h"
|
||||||
#include "utils/XspfLoader.h"
|
#include "utils/XspfLoader.h"
|
||||||
@@ -167,10 +168,10 @@ private:
|
|||||||
#ifdef Q_OS_WIN
|
#ifdef Q_OS_WIN
|
||||||
bool setupWindowsButtons();
|
bool setupWindowsButtons();
|
||||||
const unsigned int m_buttonCreatedID;
|
const unsigned int m_buttonCreatedID;
|
||||||
# ifdef HAVE_THUMBBUTTON
|
#ifdef HAVE_THUMBBUTTON
|
||||||
ITaskbarList3 *m_taskbarList;
|
ITaskbarList3* m_taskbarList;
|
||||||
THUMBBUTTON m_thumbButtons[5];
|
THUMBBUTTON m_thumbButtons[5];
|
||||||
# endif
|
#endif
|
||||||
enum TB_STATES{ TP_PREVIOUS = 0,TP_PLAY_PAUSE = 1,TP_NEXT = 2,TP_LOVE = 4 };
|
enum TB_STATES{ TP_PREVIOUS = 0,TP_PLAY_PAUSE = 1,TP_NEXT = 2,TP_LOVE = 4 };
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user