Upload 2.5.2-2 to unstable

[minitube] / src / sidebarheader.cpp

diff --git a/src/sidebarheader.cpp b/src/sidebarheader.cpp
index dc8026e4550d18d651f923ca02e13c4ccae375ee..b6fb87a2607bfb165cf89dbb000e2267aedfa63e 100644 (file)
--- a/src/sidebarheader.cpp
+++ b/src/sidebarheader.cpp
@@ -19,11 +19,10 @@ along with Minitube.  If not, see <http://www.gnu.org/licenses/>.
 $END_LICENSE */
 
 #include "sidebarheader.h"
-#include "utils.h"
+#include "iconutils.h"
 #include "mediaview.h"
 #include "videosource.h"
 #include "fontutils.h"
-#include "utils.h"
 
 SidebarHeader::SidebarHeader(QWidget *parent) : QToolBar(parent) { }
 
@@ -35,14 +34,14 @@ void SidebarHeader::setup() {
     setIconSize(QSize(16, 16));
 
     backAction = new QAction(
-                Utils::icon("go-previous"),
+                IconUtils::icon("go-previous"),
                 tr("&Back"), this);
     backAction->setShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_Left));
     connect(backAction, SIGNAL(triggered()), MediaView::instance(), SLOT(goBack()));
     addAction(backAction);
 
     forwardAction = new QAction(
-                Utils::icon("go-next"),
+                IconUtils::icon("go-next"),
                 tr("&Back"), this);
     forwardAction->setShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_Right));
     connect(forwardAction, SIGNAL(triggered()), MediaView::instance(), SLOT(goForward()));
@@ -50,7 +49,7 @@ void SidebarHeader::setup() {
 
     foreach (QAction* action, actions()) {
         window()->addAction(action);
-        Utils::setupAction(action);
+        IconUtils::setupAction(action);
     }
 
     QWidget *spacerWidget = new QWidget(this);
@@ -58,8 +57,8 @@ void SidebarHeader::setup() {
     addWidget(spacerWidget);
 }
 
-QSize SidebarHeader::minimumSizeHint (void) const {
-    return(QSize(160, QFontMetrics(font()).height() * 1.9));
+QSize SidebarHeader::minimumSizeHint() const {
+    return QSize(160, QFontMetrics(font()).height() * 1.9);
 }
 
 void SidebarHeader::updateInfo() {
@@ -99,12 +98,12 @@ void SidebarHeader::updateInfo() {
     setTitle(currentVideoSource->getName());
 }
 
-void SidebarHeader::updateTitle(QString title) {
+void SidebarHeader::updateTitle(const QString &title) {
     sender()->disconnect(this);
     setTitle(title);
 }
 
-void SidebarHeader::setTitle(QString title) {
+void SidebarHeader::setTitle(const QString &title) {
     this->title = title;
     update();
 
@@ -121,15 +120,15 @@ void SidebarHeader::paintEvent(QPaintEvent *event) {
     QToolBar::paintEvent(event);
     if (title.isEmpty()) return;
     QPainter p(this);
-    p.setFont(FontUtils::smallBold());
     p.setPen(Qt::white);
+    p.setFont(FontUtils::small());
 
     const QRect r = rect();
 
     QString t = title;
     QRect textBox = p.boundingRect(r, Qt::AlignCenter, t);
     int i = 1;
-    static const int margin = 50;
+    const int margin = forwardAction->isVisible() ? 45 : 20;
     while (textBox.width() > r.width() - margin*2 && t.length() > 3) {
         t = t.left(t.length() - i).trimmed() + QLatin1String("...");
         textBox = p.boundingRect(r, Qt::AlignCenter, t);