mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-03-20 15:59:42 +01:00
Code Issues Releases Wiki Activity

Pulled the Network menu outside the main menu bar.

Browse Source 
This prepares the way for the compressed menu feature.
This commit is contained in:
Teo Mrnjavac 2012-08-03 21:46:23 +02:00
parent c3588d65f4
commit cd0e9dcc2d
3 changed files with 40 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/TomahawkWindow.cpp
View File

@ -35,6 +35,7 @@
#include <QNetworkReply>
#include <QTimer>
#include <QToolBar>
#include <QToolButton>
#include "accounts/AccountManager.h"
#include "sourcetree/SourceTreeView.h"
@ -116,6 +117,7 @@ TomahawkWindow::TomahawkWindow( QWidget* parent )
ui->centralWidget->setContentsMargins( 0, 0, 0, 0 );
TomahawkUtils::unmarginLayout( ui->centralWidget->layout() );
setupAccountsMenu();
setupToolBar();
setupSideBar();
statusBar()->addPermanentWidget( m_audioControls, 1 );
@ -235,9 +237,9 @@ TomahawkWindow::setupToolBar()
m_forwardAction = toolbar->addAction( QIcon( RESPATH "images/forward.png" ), tr( "Forward" ), ViewManager::instance(), SLOT( historyForward() ) );
m_forwardAction->setToolTip( tr( "Go forward one page" ) );
QWidget* spacer = new QWidget( this );
spacer->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred );
toolbar->addWidget( spacer );
QWidget* leftSpacer = new QWidget( this );
leftSpacer->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred );
toolbar->addWidget( leftSpacer );
m_searchWidget = new QSearchField( this );
m_searchWidget->setPlaceholderText( tr( "Global Search..." ) );
@ -246,6 +248,20 @@ TomahawkWindow::setupToolBar()
connect( m_searchWidget, SIGNAL( returnPressed() ), this, SLOT( onFilterEdited() ) );
toolbar->addWidget( m_searchWidget );
QWidget* rightSpacer = new QWidget( this );
rightSpacer->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred );
toolbar->addWidget( rightSpacer );
QToolButton *accountsMenuButton = new QToolButton( toolbar );
accountsMenuButton->setIcon( QIcon( RESPATH "images/account-settings.png" ) );
accountsMenuButton->setText( tr( "&Network" ) );
accountsMenuButton->setMenu( m_menuAccounts );
//TODO: when we decide if compressed menus go left or right, if they go right, make
// them pop up *inside* the main window.
accountsMenuButton->setToolButtonStyle( Qt::ToolButtonIconOnly );
accountsMenuButton->setPopupMode( QToolButton::InstantPopup );
toolbar->addWidget( accountsMenuButton );
}
@ -418,7 +434,7 @@ TomahawkWindow::setupSignals()
connect( ui->actionPreferences, SIGNAL( triggered() ), SLOT( showSettingsDialog() ) );
connect( ui->actionDiagnostics, SIGNAL( triggered() ), SLOT( showDiagnosticsDialog() ) );
connect( ui->actionLegalInfo, SIGNAL( triggered() ), SLOT( legalInfo() ) );
connect( ui->actionToggleConnect, SIGNAL( triggered() ), AccountManager::instance(), SLOT( toggleAccountsConnected() ) );
connect( m_actionToggleConnect, SIGNAL( triggered() ), AccountManager::instance(), SLOT( toggleAccountsConnected() ) );
connect( ui->actionUpdateCollection, SIGNAL( triggered() ), SLOT( updateCollectionManually() ) );
connect( ui->actionRescanCollection, SIGNAL( triggered() ), SLOT( rescanCollectionManually() ) );
connect( ui->actionLoadXSPF, SIGNAL( triggered() ), SLOT( loadSpiff() ));
@ -460,6 +476,16 @@ TomahawkWindow::setupSignals()
connect( ViewManager::instance(), SIGNAL( historyForwardAvailable( bool ) ), SLOT( onHistoryForwardAvailable( bool ) ) );
}
void
TomahawkWindow::setupAccountsMenu()
{
m_menuAccounts = new QMenu( this );
m_actionToggleConnect = new QAction( tr( "Go &Online" ),
m_menuAccounts );
m_menuAccounts->addAction( m_actionToggleConnect );
m_menuAccounts->addSeparator();
}
void
TomahawkWindow::changeEvent( QEvent* e )
@ -771,18 +797,18 @@ TomahawkWindow::addPeerManually()
void
TomahawkWindow::pluginMenuAdded( QMenu* menu )
{
ui->menuNetwork->addMenu( menu );
m_menuAccounts->addMenu( menu );
}
void
TomahawkWindow::pluginMenuRemoved( QMenu* menu )
{
foreach ( QAction* action, ui->menuNetwork->actions() )
foreach ( QAction* action, m_menuAccounts->actions() )
{
if ( action->menu() == menu )
{
ui->menuNetwork->removeAction( action );
m_menuAccounts->removeAction( action );
return;
}
}
@ -1074,14 +1100,14 @@ TomahawkWindow::onPlaybackLoading( const Tomahawk::result_ptr& result )
void
TomahawkWindow::onAccountConnected()
{
ui->actionToggleConnect->setText( tr( "Go &offline" ) );
m_actionToggleConnect->setText( tr( "Go &offline" ) );
}
void
TomahawkWindow::onAccountDisconnected()
{
ui->actionToggleConnect->setText( tr( "Go &online" ) );
m_actionToggleConnect->setText( tr( "Go &online" ) );
}

5
src/TomahawkWindow.h
View File

@ -154,6 +154,7 @@ private:
void applyPlatformTweaks();
void setupSignals();
void setupAccountsMenu(); //must be called before setupToolBar
void setupToolBar();
void setupSideBar();
void setupUpdateCheck();
@ -177,6 +178,10 @@ private:
AnimatedSplitter* m_sidebar;
JobStatusSortModel* m_jobsModel;
// Menus and menu actions: Accounts menu
QMenu *m_menuAccounts;
QAction *m_actionToggleConnect;
QAction* m_backAction;
QAction* m_forwardAction;

8
src/TomahawkWindow.ui
View File

@ -95,13 +95,6 @@
<addaction name="separator"/>
<addaction name="actionExit"/>
</widget>
<widget class="QMenu" name="menuNetwork">
<property name="title">
<string>&amp;Network</string>
</property>
<addaction name="actionToggleConnect"/>
<addaction name="separator"/>
</widget>
<widget class="QMenu" name="menuWindow">
<property name="title">
<string>&amp;Window</string>
@ -118,7 +111,6 @@
<addaction name="actionLegalInfo"/>
</widget>
<addaction name="menuApp"/>
<addaction name="menuNetwork"/>
<addaction name="menuSettings"/>
<addaction name="menuWindow"/>
<addaction name="menu_Help"/>