* Remove TopBar and move SearchLineEdit into widgets/searchlineedit/.

src/libtomahawk/playlist/topbar/TopBar.cpp

@@ -1,344 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
- *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.org>
- *
- *   Tomahawk is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   Tomahawk is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "TopBar.h"
-#include "ui_TopBar.h"
-
-#include "SearchButton.h"
-
-#include <QPropertyAnimation>
-#include <QRadioButton>
-#include <QFile>
-
-#include "utils/TomahawkUtils.h"
-#include "utils/Logger.h"
-
-#define MAXDUDES 3
-#define DUDEWIDTH 10
-#define DUDEX( i ) ( DUDEWIDTH * i )
-
-using namespace Tomahawk;
-
-
-TopBar::TopBar( QWidget* parent )
-    : QWidget( parent )
-    , ui( new Ui::TopBar )
-    , m_sources( 0 )
-    , m_tracks( 0 )
-    , m_artists( 0 )
-    , m_shown( 0 )
-{
-    ui->setupUi( this );
-
-    ui->statsLabelNumTracks->setFormat( "%L1 " + tr( "Tracks" ) );
-    ui->statsLabelNumArtists->setFormat( "%L1 " + tr( "Artists" ) );
-    connect( ui->filterEdit, SIGNAL( textChanged( QString ) ), SIGNAL( filterTextChanged( QString ) ) );
-
-    ui->filterEdit->setStyleSheet( "QLineEdit { border: 1px solid gray; border-radius: 6px; margin-right: 2px; }" );
-    ui->filterEdit->setInactiveText( tr( "Filter" ) );
-#ifdef Q_WS_MAC
-    ui->filterEdit->setAttribute( Qt::WA_MacShowFocusRect, 0 );
-#endif
-
-    ui->filterEdit->searchButton()->setImage( QImage( RESPATH "images/filter.png" ) );
-
-    // initialise dudes
-    for( int i = 0; i < MAXDUDES; ++i )
-    {
-        QLabel* manlbl = new QLabel( ui->widgetMen );
-        manlbl->setPixmap( QPixmap( RESPATH "images/avatar-dude.png" ) );
-        manlbl->move( QPoint( -10,0 ) );
-        manlbl->show();
-        m_dudes.append( manlbl );
-    }
-
-    QFile f( RESPATH "stylesheets/topbar-radiobuttons.css" );
-    f.open( QFile::ReadOnly );
-    QString css = QString::fromAscii( f.readAll() );
-    f.close();
-
-    ui->widgetRadio->setStyleSheet( css );
-
-    ui->radioNormal->setFocusPolicy( Qt::NoFocus );
-    ui->radioDetailed->setFocusPolicy( Qt::NoFocus );
-    ui->radioCloud->setFocusPolicy( Qt::NoFocus );
-
-    ui->radioCloud->hide();
-
-    ui->radioNormal->setToolTip( tr( "Artist View" ) );
-    ui->radioDetailed->setToolTip( tr("Flat View" ) );
-
-    connect( ui->radioNormal, SIGNAL( clicked() ), SIGNAL( artistMode() ) );
-    connect( ui->radioDetailed, SIGNAL( clicked() ), SIGNAL( flatMode() ) );
-    connect( ui->radioCloud, SIGNAL( clicked() ), SIGNAL( albumMode() ) );
-
-    setNumSources( 0 );
-    setNumTracks( 0 );
-    setNumArtists( 0 );
-    setNumShown( 0 );
-
-    onArtistMode();
-
-    connect( ViewManager::instance(), SIGNAL( numSourcesChanged( unsigned int ) ),
-                                        SLOT( setNumSources( unsigned int ) ) );
-
-    connect( ViewManager::instance(), SIGNAL( numTracksChanged( unsigned int ) ),
-                                        SLOT( setNumTracks( unsigned int ) ) );
-
-    connect( ViewManager::instance(), SIGNAL( numArtistsChanged( unsigned int ) ),
-                                        SLOT( setNumArtists( unsigned int ) ) );
-
-    connect( ViewManager::instance(), SIGNAL( numShownChanged( unsigned int ) ),
-                                        SLOT( setNumShown( unsigned int ) ) );
-
-    connect( ViewManager::instance(), SIGNAL( statsAvailable( bool ) ),
-                                        SLOT( setStatsVisible( bool ) ) );
-
-    connect( ViewManager::instance(), SIGNAL( modesAvailable( bool ) ),
-                                        SLOT( setModesVisible( bool ) ) );
-
-    connect( ViewManager::instance(), SIGNAL( filterAvailable( bool ) ),
-                                        SLOT( setFilterVisible( bool ) ) );
-
-    connect( ViewManager::instance(), SIGNAL( modeChanged( Tomahawk::PlaylistModes::ViewMode ) ),
-                                        SLOT( onModeChanged( Tomahawk::PlaylistModes::ViewMode ) ) );
-}
-
-
-TopBar::~TopBar()
-{
-    delete ui;
-}
-
-
-void
-TopBar::changeEvent( QEvent* e )
-{
-    QWidget::changeEvent( e );
-    switch ( e->type() )
-    {
-        case QEvent::LanguageChange:
-            ui->retranslateUi( this );
-            break;
-
-        default:
-            break;
-    }
-}
-
-
-void
-TopBar::resizeEvent( QResizeEvent* e )
-{
-    QWidget::resizeEvent( e );
-}
-
-
-void
-TopBar::fadeInDude( unsigned int i )
-{
-//    qDebug() << Q_FUNC_INFO << i;
-
-    QLabel* dude = m_dudes.at( i );
-    QPropertyAnimation* ani = new QPropertyAnimation( dude, "pos" );
-    ani->setDuration( 1000 );
-    ani->setEasingCurve( QEasingCurve::InQuad );
-    ani->setStartValue( QPoint( -10,0 ) );
-    ani->setEndValue( QPoint( DUDEX( i+1 ), 0 ) );
-
-    qDebug() << "Animating from" << ani->startValue() << "to" << ani->endValue();
-    connect( ani, SIGNAL( finished() ), ani, SLOT( deleteLater() ) );
-    ani->start();
-}
-
-
-void
-TopBar::fadeOutDude( unsigned int i )
-{
-//    qDebug() << Q_FUNC_INFO << i;
-
-    QLabel* dude = m_dudes.at( i );
-    QPropertyAnimation* ani = new QPropertyAnimation( dude, "pos" );
-    ani->setDuration( 1000 );
-    ani->setEasingCurve( QEasingCurve::OutQuad );
-    ani->setStartValue( dude->pos() );
-    ani->setEndValue( QPoint( -10, 0 ) );
-
-    qDebug() << "Animating from" << ani->startValue() << "to" << ani->endValue();
-    connect( ani, SIGNAL( finished() ), ani, SLOT( deleteLater() ) );
-    ani->start();
-}
-
-
-void
-TopBar::setNumSources( unsigned int i )
-{
-//    qDebug() << Q_FUNC_INFO << i;
-
-    // Dude0 Dude1 Dude2
-    ui->statsLabelNumSources->setText( QString( "%L1 %2" ).arg( i ).arg( tr( "Sources" ) ) );
-
-    if( ( m_sources >= MAXDUDES && i >= MAXDUDES ) || m_sources == i )
-    {
-        m_sources = i;
-        return;
-    }
-
-    if( i > m_sources )
-    {
-        for( unsigned int k = m_sources; k < MAXDUDES && k < i; ++k )
-        {
-            fadeInDude( k );
-        }
-        m_sources = i;
-    }
-    else
-    {
-        int k = qMin( (unsigned int)MAXDUDES - 1, m_sources - 1 );
-        do
-        {
-            fadeOutDude( k );
-            m_sources--;
-        } while( (unsigned int)k-- > i );
-
-        m_sources = i;
-    }
-}
-
-
-void
-TopBar::setNumTracks( unsigned int i )
-{
-    m_tracks = i;
-    ui->statsLabelNumTracks->setVal( i );
-}
-
-
-void
-TopBar::setNumArtists( unsigned int i )
-{
-    m_artists = i;
-    ui->statsLabelNumArtists->setVisible( m_artists > 0 );
-    ui->statsLabelNumArtists->setVal( i );
-}
-
-
-void
-TopBar::setNumShown( unsigned int i )
-{
-    m_shown = i;
-    ui->statsLabelNumShown->setVisible( m_shown != m_tracks && ui->statsLabelNumTracks->isVisible() );
-    ui->statsLabelNumShown->setText( QString( "%L1 %2" ).arg( i ).arg( tr( "Shown" ) ) );
-}
-
-
-void
-TopBar::addSource()
-{
-//    qDebug() << Q_FUNC_INFO;
-    setNumSources( m_sources + 1 );
-}
-
-
-void
-TopBar::removeSource()
-{
-//    qDebug() << Q_FUNC_INFO;
-    Q_ASSERT( m_sources > 0 );
-    setNumSources( m_sources - 1 );
-}
-
-
-void
-TopBar::setStatsVisible( bool b )
-{
-    foreach( QLabel* dude, m_dudes )
-        dude->setVisible( b );
-
-//    ui->statsLabelNumArtists->setVisible( b );
-//    ui->statsLabelNumShown->setVisible( b );
-    ui->statsLabelNumSources->setVisible( b );
-    ui->statsLabelNumTracks->setVisible( b );
-}
-
-
-void
-TopBar::setModesVisible( bool b )
-{
-    ui->widgetRadio->setVisible( b );
-}
-
-
-void
-TopBar::setFilterVisible( bool b )
-{
-    ui->filterEdit->setVisible( b );
-}
-
-
-void
-TopBar::setFilter( const QString& filter )
-{
-    ui->filterEdit->setText( filter );
-}
-
-
-void
-TopBar::onModeChanged( Tomahawk::PlaylistModes::ViewMode mode )
-{
-    qDebug() << Q_FUNC_INFO << mode;
-    switch ( mode )
-    {
-        case Tomahawk::PlaylistModes::Flat:
-            onFlatMode();
-            break;
-
-        case Tomahawk::PlaylistModes::Tree:
-            onArtistMode();
-            break;
-
-        case Tomahawk::PlaylistModes::Album:
-            onAlbumMode();
-            break;
-
-        default:
-            break;
-    }
-}
-
-
-void
-TopBar::onFlatMode()
-{
-    ui->radioDetailed->setChecked( true );
-}
-
-
-void
-TopBar::onArtistMode()
-{
-    ui->radioNormal->setChecked( true );
-}
-
-
-void
-TopBar::onAlbumMode()
-{
-    ui->radioCloud->setChecked( true );
-}

src/libtomahawk/playlist/topbar/TopBar.h

@@ -1,87 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
- *
- *   Tomahawk is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   Tomahawk is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef TOPBAR_H
-#define TOPBAR_H
-
-#include <QWidget>
-#include <QLabel>
-#include <QList>
-
-#include "ViewManager.h"
-#include "SourceList.h"
-#include "DllMacro.h"
-
-namespace Ui
-{
-    class TopBar;
-}
-
-class DLLEXPORT TopBar : public QWidget
-{
-Q_OBJECT
-
-public:
-    TopBar( QWidget* parent = 0 );
-    ~TopBar();
-
-signals:
-    void filterTextChanged( const QString& newtext );
-
-    void flatMode();
-    void artistMode();
-    void albumMode();
-
-public slots:
-    void setNumSources( unsigned int );
-    void setNumTracks( unsigned int );
-    void setNumArtists( unsigned int );
-    void setNumShown( unsigned int );
-
-    void setStatsVisible( bool b );
-    void setModesVisible( bool b );
-    void setFilterVisible( bool b );
-
-    void addSource();
-    void removeSource();
-
-    void setFilter( const QString& filter );
-
-private slots:
-    void onModeChanged( Tomahawk::PlaylistModes::ViewMode mode );
-    void onFlatMode();
-    void onArtistMode();
-    void onAlbumMode();
-
-protected:
-    void changeEvent( QEvent* e );
-    void resizeEvent( QResizeEvent* e );
-
-private:
-    void fadeOutDude( unsigned int i );
-    void fadeInDude( unsigned int i );
-
-    Ui::TopBar* ui;
-
-    unsigned int m_sources, m_tracks, m_artists, m_shown;
-    QList<QLabel*> m_dudes;
-
-    Tomahawk::source_ptr m_onesource;
-};
-
-#endif // TOPBAR_H

src/libtomahawk/playlist/topbar/TopBar.ui

@@ -1,324 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>TopBar</class>
- <widget class="QWidget" name="TopBar">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>809</width>
-    <height>45</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>0</width>
-    <height>38</height>
-   </size>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QHBoxLayout" name="horizontalLayout">
-   <property name="leftMargin">
-    <number>6</number>
-   </property>
-   <property name="topMargin">
-    <number>2</number>
-   </property>
-   <property name="rightMargin">
-    <number>2</number>
-   </property>
-   <property name="bottomMargin">
-    <number>4</number>
-   </property>
-   <item>
-    <widget class="QWidget" name="widgetMen" native="true">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>36</width>
-       <height>22</height>
-      </size>
-     </property>
-     <property name="styleSheet">
-      <string notr="true">margin-top:3px;</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="statsLabelNumSources">
-     <property name="styleSheet">
-      <string notr="true"/>
-     </property>
-     <property name="text">
-      <string>0 Sources</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <spacer name="horizontalSpacer_3">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Fixed</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>5</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item>
-    <widget class="AnimatedCounterLabel" name="statsLabelNumTracks">
-     <property name="text">
-      <string>0 Tracks</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <spacer name="horizontalSpacer_4">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Fixed</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>5</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item>
-    <widget class="AnimatedCounterLabel" name="statsLabelNumArtists">
-     <property name="text">
-      <string>0 Artists</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <spacer name="horizontalSpacer_5">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Fixed</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>5</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item>
-    <widget class="QLabel" name="statsLabelNumShown">
-     <property name="text">
-      <string>0 Shown</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <spacer name="horizontalSpacer">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::MinimumExpanding</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>149</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item>
-    <widget class="QWidget" name="widgetRadio" native="true">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>58</width>
-       <height>30</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>58</width>
-       <height>30</height>
-      </size>
-     </property>
-     <widget class="QRadioButton" name="radioNormal">
-      <property name="geometry">
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>29</width>
-        <height>30</height>
-       </rect>
-      </property>
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="minimumSize">
-       <size>
-        <width>29</width>
-        <height>30</height>
-       </size>
-      </property>
-      <property name="maximumSize">
-       <size>
-        <width>29</width>
-        <height>30</height>
-       </size>
-      </property>
-      <property name="text">
-       <string/>
-      </property>
-     </widget>
-     <widget class="QRadioButton" name="radioCloud">
-      <property name="geometry">
-       <rect>
-        <x>58</x>
-        <y>0</y>
-        <width>29</width>
-        <height>30</height>
-       </rect>
-      </property>
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="minimumSize">
-       <size>
-        <width>29</width>
-        <height>30</height>
-       </size>
-      </property>
-      <property name="maximumSize">
-       <size>
-        <width>29</width>
-        <height>30</height>
-       </size>
-      </property>
-      <property name="text">
-       <string/>
-      </property>
-     </widget>
-     <widget class="QRadioButton" name="radioDetailed">
-      <property name="geometry">
-       <rect>
-        <x>29</x>
-        <y>0</y>
-        <width>29</width>
-        <height>30</height>
-       </rect>
-      </property>
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="minimumSize">
-       <size>
-        <width>29</width>
-        <height>30</height>
-       </size>
-      </property>
-      <property name="maximumSize">
-       <size>
-        <width>29</width>
-        <height>30</height>
-       </size>
-      </property>
-      <property name="text">
-       <string/>
-      </property>
-     </widget>
-    </widget>
-   </item>
-   <item>
-    <spacer name="horizontalSpacer_2">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Fixed</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>15</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item>
-    <widget class="SearchLineEdit" name="filterEdit">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>150</width>
-       <height>27</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>150</width>
-       <height>27</height>
-      </size>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>AnimatedCounterLabel</class>
-   <extends>QLabel</extends>
-   <header>widgets/AnimatedCounterLabel.h</header>
-  </customwidget>
-  <customwidget>
-   <class>SearchLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>playlist/topbar/SearchLineEdit.h</header>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>