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

* Style fixes.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2013-09-07 20:52:24 +02:00
parent 669f27716e
commit 56211adbf1
5 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libtomahawk/widgets/HistoryWidget.cpp
View File

@@ -51,7 +51,7 @@ HistoryWidget::HistoryWidget( const source_ptr& source, QWidget* parent )
m_calendarTo->setDisplayFormat( "yyyy MMMM dd" );
// setting an empty style-sheet prevents the QDateEdits from adopting their parent's QPalette
QString calSheet = QString( "QDateEdit { }" );
QString calSheet = QString( "QDateEdit {}" );
m_calendarFrom->setStyleSheet( calSheet );
m_calendarTo->setStyleSheet( calSheet );

26
src/tomahawk/TomahawkWindow.cpp
View File

@@ -1,6 +1,6 @@
/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
*
* Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
* Copyright 2010-2013, Christian Muehlhaeuser <muesli@tomahawk-player.org>
* Copyright 2010-2012, Leo Franchi <lfranchi@kde.org>
* Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.org>
* Copyright 2012, Teo Mrnjavac <teo@kde.org>
@@ -214,6 +214,8 @@ TomahawkWindow::loadSettings()
m_compactMenuAction->setVisible( !mbVisible );
ActionCollection::instance()->getAction( "toggleMenuBar" )->setText( mbVisible ? tr( "Hide Menu Bar" ) : tr( "Show Menu Bar" ) );
#endif
ActionCollection::instance()->getAction( "showOfflineSources" )->setChecked( TomahawkSettings::instance()->showOfflineSources() );
}
@@ -255,6 +257,7 @@ TomahawkWindow::applyPlatformTweaks()
#endif
}
void
TomahawkWindow::setupToolBar()
{
@@ -302,9 +305,10 @@ TomahawkWindow::setupToolBar()
m_searchWidget->setPlaceholderText( tr( "Search for any artist, album or song..." ) );
m_searchWidget->setSizePolicy( QSizePolicy::Fixed, QSizePolicy::Preferred );
m_searchWidget->setFixedWidth( scaledX( 340 ) );
connect( m_searchWidget, SIGNAL( returnPressed() ), this, SLOT( onFilterEdited() ) );
connect( m_searchWidget, SIGNAL( returnPressed() ), SLOT( onFilterEdited() ) );
// Use Ctrl+F to focus the searchWidget
QShortcut *shortcut = new QShortcut( QKeySequence( QKeySequence::Find ), this );
QShortcut* shortcut = new QShortcut( QKeySequence( QKeySequence::Find ), this );
QObject::connect( shortcut, SIGNAL( activated() ), m_searchWidget, SLOT( setFocus() ) );
m_toolbar->addWidget( m_searchWidget )->setProperty( "kind", QString( "search" ) );
@@ -320,8 +324,7 @@ TomahawkWindow::setupToolBar()
m_accountsButton = new AccountsToolButton( m_toolbar );
m_toolbar->addWidget( m_accountsButton );
connect( m_accountsButton, SIGNAL( widthChanged() ),
this, SLOT( balanceToolbar() ) );
connect( m_accountsButton, SIGNAL( widthChanged() ), SLOT( balanceToolbar() ) );
#ifndef Q_OS_MAC
ContainedMenuButton* compactMenuButton = new ContainedMenuButton( m_toolbar );
@@ -338,6 +341,7 @@ TomahawkWindow::setupToolBar()
addAction( ActionCollection::instance()->getAction( "toggleMenuBar" ) );
addAction( ActionCollection::instance()->getAction( "quit" ) );
#endif
balanceToolbar();
}
@@ -350,9 +354,10 @@ TomahawkWindow::balanceToolbar()
bool flip = false;
foreach ( QAction* action, m_toolbar->actions() )
{
if ( action->property( "kind" ) == QString( "spacer" ) ||
!action->isVisible() )
if ( action->property( "kind" ) == QString( "spacer" ) || !action->isVisible() )
{
continue;
}
else if ( action->property( "kind" ) == QString( "search" ) )
{
flip = true;
@@ -432,9 +437,6 @@ TomahawkWindow::setupSideBar()
ui->splitter->addWidget( ViewManager::instance()->widget() );
ui->splitter->setCollapsible( 0, false );
ui->splitter->setCollapsible( 1, false );
ActionCollection::instance()->getAction( "showOfflineSources" )
->setChecked( TomahawkSettings::instance()->showOfflineSources() );
}
@@ -524,10 +526,10 @@ TomahawkWindow::setupWindowsButtons()
HICON
TomahawkWindow::thumbIcon(TomahawkUtils::ImageType type)
TomahawkWindow::thumbIcon( TomahawkUtils::ImageType type )
{
static QMap<TomahawkUtils::ImageType,HICON> thumbIcons;
if (!thumbIcons.contains( type ) )
if ( !thumbIcons.contains( type ) )
{
QPixmap pix ( TomahawkUtils::defaultPixmap(type , TomahawkUtils::Original, QSize( 20, 20 ) ) );
thumbIcons[type] = pix.toWinHICON();

2
src/tomahawk/TomahawkWindow.h
View File

@@ -1,6 +1,6 @@
/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
*
* Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
* Copyright 2010-2013, Christian Muehlhaeuser <muesli@tomahawk-player.org>
* Copyright 2010-2012, Leo Franchi <lfranchi@kde.org>
* Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.org>
* Copyright 2012, Teo Mrnjavac <teo@kde.org>

1
src/tomahawk/sourcetree/items/PlaylistItems.h
View File

@@ -63,6 +63,7 @@ private slots:
void parsedDroppedTracks( const QList<Tomahawk::query_ptr>& tracks );
void onUpdated();
private:
bool createOverlay();

1
src/tomahawk/sourcetree/items/SourceItem.cpp
View File

@@ -398,6 +398,7 @@ void
SourceItem::playlistDeletedInternal( SourceTreeItem* parent, const T& p )
{
Q_ASSERT( parent ); // How can we delete playlists if we have none?
int curCount = parent->children().count();
for( int i = 0; i < curCount; i++ )
{