From 97e1d0fe3f836c42325ab039b38bc1322496f60f Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Wed, 1 Aug 2012 21:52:19 +0200 Subject: [PATCH] Replace the list widget in the settings dialog with a horizontal thingy. --- src/CMakeLists.txt | 1 - src/SettingsDialog.cpp | 104 +++++++++++++++++++-------------- src/SettingsDialog.h | 8 ++- src/SettingsListDelegate.cpp | 74 ----------------------- src/SettingsListDelegate.h | 39 ------------- src/StackedSettingsDialog.ui | 110 +++++++++++------------------------ 6 files changed, 100 insertions(+), 236 deletions(-) delete mode 100644 src/SettingsListDelegate.cpp delete mode 100644 src/SettingsListDelegate.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c7894f210..26a4b8342 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -70,7 +70,6 @@ SET( tomahawkSourcesGui ${tomahawkSourcesGui} AudioControls.cpp SettingsDialog.cpp DiagnosticsDialog.cpp - SettingsListDelegate.cpp TomahawkWindow.cpp LoadXSPFDialog.cpp SocialWidget.cpp diff --git a/src/SettingsDialog.cpp b/src/SettingsDialog.cpp index 213373ea0..7e9c07293 100644 --- a/src/SettingsDialog.cpp +++ b/src/SettingsDialog.cpp @@ -3,6 +3,7 @@ * Copyright 2010-2011, Christian Muehlhaeuser * Copyright 2010-2011, Leo Franchi * Copyright 2010-2012, Jeff Mitchell + * Copyright 2012, Teo Mrnjavac * * Tomahawk is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -28,6 +29,7 @@ #include #include #include +#include #include "AtticaManager.h" #include "AclRegistry.h" @@ -39,7 +41,6 @@ #include "ExternalResolverGui.h" #include "utils/TomahawkUtilsGui.h" #include "utils/GuiHelpers.h" -#include "SettingsListDelegate.h" #include "accounts/AccountDelegate.h" #include "database/Database.h" #include "network/Servent.h" @@ -72,11 +73,18 @@ SettingsDialog::SettingsDialog( QWidget *parent ) TomahawkSettings* s = TomahawkSettings::instance(); TomahawkUtils::unmarginLayout( layout() ); - ui->stackedWidget->setContentsMargins( 4, 4, 4, 0 ); +#ifdef Q_WS_X11 + ui->stackedWidget->setContentsMargins( 4, 4, 4, 4 ); +#else + ui->stackedWidget->setContentsMargins( 4, 4, 4, 0 ); +#endif ui->checkBoxReporter->setChecked( s->crashReporterEnabled() ); ui->checkBoxHttp->setChecked( s->httpEnabled() ); + m_toolBar = new QToolBar( tr( "Tomahawk Settings" ), this ); + ui->horizontalLayout->insertWidget( 0, m_toolBar ); + m_toolBar->setToolButtonStyle( Qt::ToolButtonTextUnderIcon ); //Network settings TomahawkSettings::ExternalAddressMode mode = TomahawkSettings::instance()->externalAddressMode(); @@ -102,8 +110,6 @@ SettingsDialog::SettingsDialog( QWidget *parent ) createIcons(); #ifdef Q_WS_X11 - ui->listWidget->setFrameShape( QFrame::StyledPanel ); - ui->listWidget->setFrameShadow( QFrame::Sunken ); setContentsMargins( 4, 4, 4, 4 ); #else setContentsMargins( 0, 4, 4, 4 ); @@ -210,9 +216,6 @@ SettingsDialog::SettingsDialog( QWidget *parent ) connect( ui->upnpRadioButton, SIGNAL( toggled(bool) ), SLOT( toggleRemoteMode() ) ); connect( ui->enableProxyCheckBox, SIGNAL( toggled(bool) ), SLOT( toggleProxyEnabled() ) ); connect( this, SIGNAL( rejected() ), SLOT( onRejected() ) ); - - ui->listWidget->setCurrentRow( 0 ); - ui->listWidget->setItemDelegate(new SettingsListDelegate()); } @@ -280,56 +283,67 @@ SettingsDialog::serventReady() void SettingsDialog::createIcons() { - /// Not fun but QListWidget sucks. Do our max-width calculation manually - /// so the icons arre lined up. - // Resolvers is the longest string... in english. fml. - ensurePolished(); - int maxlen = 0; - QFontMetrics fm( font() ); - QListWidgetItem *accountsButton = new QListWidgetItem( ui->listWidget ); - accountsButton->setIcon( QIcon( RESPATH "images/account-settings.png" ) ); - accountsButton->setText( tr( "Services" ) ); - accountsButton->setTextAlignment( Qt::AlignHCenter ); - accountsButton->setFlags( Qt::ItemIsSelectable | Qt::ItemIsEnabled ); - maxlen = fm.width( accountsButton->text() ); + m_settingsGroup = new QActionGroup( m_toolBar ); - QListWidgetItem *musicButton = new QListWidgetItem( ui->listWidget ); - musicButton->setIcon( QIcon( RESPATH "images/music-settings.png" ) ); - musicButton->setText( tr( "Collection" ) ); - musicButton->setTextAlignment( Qt::AlignHCenter ); - musicButton->setFlags( Qt::ItemIsSelectable | Qt::ItemIsEnabled ); - maxlen = qMax( fm.width( musicButton->text() ), maxlen ); + QWidget *leftSpacer = new QWidget( m_toolBar ); + leftSpacer->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred ); + m_toolBar->addWidget( leftSpacer ); - QListWidgetItem *advancedButton = new QListWidgetItem( ui->listWidget ); - advancedButton->setIcon( QIcon( RESPATH "images/advanced-settings.png" ) ); - advancedButton->setText( tr( "Advanced" ) ); - advancedButton->setTextAlignment( Qt::AlignHCenter ); - advancedButton->setFlags( Qt::ItemIsSelectable | Qt::ItemIsEnabled ); - maxlen = qMax( fm.width( advancedButton->text() ), maxlen ); + QAction *accountsAction = new QAction( QIcon( RESPATH "images/account-settings.png" ), + tr( "Services" ), + m_toolBar ); + accountsAction->setCheckable( true ); + accountsAction->setToolTip( tr( "Services
" + "Configure the accounts and services used by Tomahawk " + "to search and retrieve music, find your friends and " + "update your status." ) ); + m_settingsGroup->addAction( accountsAction ); - maxlen += 15; // padding - accountsButton->setSizeHint( QSize( maxlen, 60 ) ); - musicButton->setSizeHint( QSize( maxlen, 60 ) ); - advancedButton->setSizeHint( QSize( maxlen, 60 ) ); + QAction *musicAction = new QAction( QIcon( RESPATH "images/music-settings.png" ), + tr( "Collection" ), + m_toolBar ); + musicAction->setCheckable( true ); + musicAction->setToolTip( tr( "Collection
" + "Manage how Tomahawk finds music on your computer." ) ); + m_settingsGroup->addAction( musicAction ); -#ifndef Q_WS_MAC - // doesn't listen to sizehint... - ui->listWidget->setFixedWidth( maxlen + 8 ); -#endif - connect( ui->listWidget, SIGNAL( currentItemChanged( QListWidgetItem*, QListWidgetItem* ) ), SLOT( changePage( QListWidgetItem*, QListWidgetItem* ) ) ); + QAction *advancedAction = new QAction( QIcon( RESPATH "images/advanced-settings.png" ), + tr( "Advanced" ), + m_toolBar ); + advancedAction->setCheckable( true ); + advancedAction->setToolTip( tr( "Advanced
" + "Configure Tomahawk's advanced settings, including " + "network connectivity settings, browser interaction " + "and more." ) ); + m_settingsGroup->addAction( advancedAction ); + + m_settingsGroup->setExclusive( true ); + + m_toolBar->addActions( m_settingsGroup->actions() ); + + QWidget *rightSpacer = new QWidget( m_toolBar ); + rightSpacer->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred ); + m_toolBar->addWidget( rightSpacer ); + + connect( m_settingsGroup, SIGNAL( triggered( QAction * ) ), + this, SLOT( changePage( QAction * ) ) ); + + accountsAction->setChecked( true ); + changePage( accountsAction ); } void -SettingsDialog::changePage( QListWidgetItem* current, QListWidgetItem* previous ) +SettingsDialog::changePage( QAction *action ) { - if ( !current ) - current = previous; - - ui->stackedWidget->setCurrentIndex( ui->listWidget->row(current) ); + int index = m_settingsGroup->actions().indexOf( action ); + if( ui->stackedWidget->currentIndex() != index ) + { + ui->stackedWidget->setCurrentIndex( index ); + } } diff --git a/src/SettingsDialog.h b/src/SettingsDialog.h index 487f6e4ae..88cb934a0 100644 --- a/src/SettingsDialog.h +++ b/src/SettingsDialog.h @@ -3,6 +3,7 @@ * Copyright 2010-2011, Christian Muehlhaeuser * Copyright 2010-2011, Leo Franchi * Copyright 2010-2012, Jeff Mitchell + * Copyright 2012, Teo Mrnjavac * * Tomahawk is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -23,6 +24,8 @@ #include #include +#include +#include #include "config.h" @@ -94,7 +97,7 @@ private slots: void updateScanOptionsView(); - void changePage( QListWidgetItem*, QListWidgetItem* ); + void changePage( QAction *action ); void serventReady(); void aclEntryClearButtonClicked(); @@ -106,6 +109,9 @@ private: Ui_StackedSettingsDialog* ui; + QToolBar *m_toolBar; + QActionGroup *m_settingsGroup; + ProxyDialog m_proxySettings; bool m_rejected; bool m_restartRequired; diff --git a/src/SettingsListDelegate.cpp b/src/SettingsListDelegate.cpp deleted file mode 100644 index 3756c5314..000000000 --- a/src/SettingsListDelegate.cpp +++ /dev/null @@ -1,74 +0,0 @@ -/* === This file is part of Tomahawk Player - === - * - * Copyright 2011, Michael Zanetti - * Copyright 2011, Leo Franchi - * - * 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 . - */ - -#include "SettingsListDelegate.h" -#include "utils/Logger.h" - -#include -#include -#include - -SettingsListDelegate::SettingsListDelegate(QObject *parent) : - QStyledItemDelegate(parent) -{ -} - - -void SettingsListDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const -{ - painter->save(); - - QStyleOptionViewItemV4 opt = option; - initStyleOption( &opt, QModelIndex() ); - qApp->style()->drawControl( QStyle::CE_ItemViewItem, &opt, painter ); - -#if defined(Q_WS_MAC) || defined(Q_WS_WIN) - // On mac draw our own selection rect as we don't get one from osx (around the whole icon or around just text) - if ( opt.state & QStyle::State_Selected ) - { - painter->setRenderHint( QPainter::Antialiasing ); - - QPainterPath p; - p.addRoundedRect( opt.rect.adjusted( 2, 1, -1, -1 ), 5, 5 ); - - QColor fill( 214, 214, 214 ); - QColor border( 107, 107, 107 ); - painter->setPen( border ); - painter->drawPath( p ); - painter->fillPath( p, fill ); - } -#else - if ( ( option.state & QStyle::State_Selected ) == QStyle::State_Selected ) - { - painter->setPen( option.palette.color( QPalette::HighlightedText ) ); - } -#endif - - int horizontalOffset = ( option.rect.width() - option.decorationSize.width() ) /2; - QRect iconRect = option.rect.adjusted( horizontalOffset, 6, -horizontalOffset, -option.rect.height() + 6 + option.decorationSize.height() ); - QPixmap avatar = index.data( Qt::DecorationRole ).value().pixmap( iconRect.size() ); - painter->drawPixmap( iconRect, avatar ); - - QRect textRect = option.rect.adjusted( 6, iconRect.height() + 8, -6, 0 ); - QString text = painter->fontMetrics().elidedText( index.data( Qt::DisplayRole ).toString(), Qt::ElideRight, textRect.width() ); - QTextOption to( Qt::AlignHCenter ); - painter->drawText( textRect, text, to ); - - painter->restore(); -} diff --git a/src/SettingsListDelegate.h b/src/SettingsListDelegate.h deleted file mode 100644 index 730de7858..000000000 --- a/src/SettingsListDelegate.h +++ /dev/null @@ -1,39 +0,0 @@ -/* === This file is part of Tomahawk Player - === - * - * Copyright 2011, Michael Zanetti - * Copyright 2011, Leo Franchi - * - * 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 . - */ - -#ifndef SETTINGSLISTDELEGATE_H -#define SETTINGSLISTDELEGATE_H - -#include - -class SettingsListDelegate : public QStyledItemDelegate -{ - Q_OBJECT -public: - explicit SettingsListDelegate(QObject *parent = 0); - - virtual void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const; - -signals: - -public slots: - -}; - -#endif // SETTINGSLISTDELEGATE_H diff --git a/src/StackedSettingsDialog.ui b/src/StackedSettingsDialog.ui index 08dcdf48b..e260416d4 100644 --- a/src/StackedSettingsDialog.ui +++ b/src/StackedSettingsDialog.ui @@ -18,74 +18,11 @@ 0 - - - - - - - Qt::NoFocus - - - QFrame::StyledPanel - - - QFrame::Sunken - - - Qt::ScrollBarAlwaysOff - - - Qt::ScrollBarAlwaysOff - - - true - - - - 32 - 32 - - - - QListView::Static - - - QListView::Adjust - - - QListView::Batched - - - 1 - - - QListView::IconMode - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 1 - 4 - - - - - - + - 2 + 0 @@ -93,9 +30,12 @@ 0 - - - Internet Services + + + QFrame::NoFrame + + + QFrame::Plain @@ -153,11 +93,17 @@ 0 - - - Local Music Information + + + QFrame::NoFrame + + + QFrame::Plain + + 2 + @@ -234,17 +180,23 @@ 0 - + 0 0 - - Advanced Settings + + QFrame::NoFrame + + + QFrame::Plain + + -1 + 2 @@ -342,10 +294,13 @@ Qt::Vertical + + QSizePolicy::Fixed + 20 - 40 + 10 @@ -378,10 +333,13 @@ Qt::Vertical + + QSizePolicy::Fixed + 20 - 40 + 10