diff --git a/CMakeLists.txt b/CMakeLists.txt index 00a08c354..28b60c641 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -99,7 +99,7 @@ SET( CANTATA_SRCS gui/application.cpp gui/main.cpp gui/initialsettingswizard.cpp widgets/treeview.cpp widgets/listview.cpp widgets/itemview.cpp widgets/autohidingsplitter.cpp widgets/timeslider.cpp widgets/actionlabel.cpp widgets/playqueueview.cpp widgets/groupedview.cpp widgets/actionitemdelegate.cpp widgets/textbrowser.cpp widgets/coverwidget.cpp widgets/volumecontrol.cpp widgets/icons.cpp widgets/genrecombo.cpp widgets/toolbar.cpp widgets/menubutton.cpp - widgets/toolbutton.cpp widgets/wizardpage.cpp widgets/headerlabel.cpp widgets/statuslabel.cpp + widgets/toolbutton.cpp widgets/wizardpage.cpp widgets/statuslabel.cpp network/networkaccessmanager.cpp devices/deviceoptions.cpp context/lyricsettings.cpp context/ultimatelyricsprovider.cpp context/ultimatelyrics.cpp context/lyricsdialog.cpp diff --git a/context/artistview.cpp b/context/artistview.cpp index 1cf21d963..31bd58966 100644 --- a/context/artistview.cpp +++ b/context/artistview.cpp @@ -25,7 +25,6 @@ #include "localize.h" #include "covers.h" #include "utils.h" -#include "headerlabel.h" #include "musiclibrarymodel.h" #include "networkaccessmanager.h" #include "qtiocompressor/qtiocompressor.h" diff --git a/icons/sidebar-lyrics-dark.svg b/icons/sidebar-lyrics-dark.svg deleted file mode 100755 index dda885193..000000000 --- a/icons/sidebar-lyrics-dark.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/icons/sidebar-lyrics-light.svg b/icons/sidebar-lyrics-light.svg deleted file mode 100644 index d04d6c12a..000000000 --- a/icons/sidebar-lyrics-light.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/widgets/headerlabel.cpp b/widgets/headerlabel.cpp deleted file mode 100644 index 400a9570b..000000000 --- a/widgets/headerlabel.cpp +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Cantata - * - * Copyright (c) 2011-2013 Craig Drummond - * - * ---- - * - * This program 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 2 of the License, or - * (at your option) any later version. - * - * This program 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 this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - */ - -#include "headerlabel.h" -#include "lineedit.h" -#include -#include -#include -#include - -HeaderLabel::HeaderLabel(QWidget *p) - : SqueezedTextLabel(p) -{ - QFont f(font()); - f.setBold(true); - setFont(f); - setMinimumHeight(LineEdit().minimumHeight()); - setAlignment(Qt::AlignVCenter | (Qt::RightToLeft==layoutDirection() ? Qt::AlignRight : Qt::AlignLeft)); -} - -void HeaderLabel::paintEvent(QPaintEvent *ev) -{ - QPainter p(this); - QRect r(rect()); - QLinearGradient grad(r.bottomLeft(), r.bottomRight()); - QColor col(palette().color(QPalette::Highlight)); - bool rtl=Qt::RightToLeft==layoutDirection(); - col.setAlphaF(0.85); - grad.setColorAt(rtl ? 1 : 0, col); - col.setAlphaF(0.0); - grad.setColorAt(rtl ? 0 : 1, col); - p.setPen(QPen(grad, r.height()>32 ? 3 : 2)); - p.drawLine(r.bottomLeft(), r.bottomRight()); - p.end(); - SqueezedTextLabel::paintEvent(ev); -} diff --git a/widgets/headerlabel.h b/widgets/headerlabel.h deleted file mode 100644 index eed7febff..000000000 --- a/widgets/headerlabel.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Cantata - * - * Copyright (c) 2011-2013 Craig Drummond - * - * ---- - * - * This program 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 2 of the License, or - * (at your option) any later version. - * - * This program 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 this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - */ - -#ifndef HEADERLABEL_H -#define HEADERLABEL_H - -#include "squeezedtextlabel.h" - -class HeaderLabel : public SqueezedTextLabel -{ -public: - HeaderLabel(QWidget *p); - - void paintEvent(QPaintEvent *ev); -}; - -#endif