From: Nikolay Tischenko <niktischenko@gmail.com>
Date: Mon, 1 Nov 2010 17:22:02 +0000 (+0600)
Subject: Fixed issue with large title lable
X-Git-Tag: 1.4.0
X-Git-Url: https://vcs.maemo.org/git/?a=commitdiff_plain;h=f5220f7e7820734fb853b1043b6f33fecc241000;hp=d3b1b0233563d5f6fabb15d53ac450b7dfd915ad;p=someplayer

Fixed issue with large title lable
---

diff --git a/src/playerform.cpp b/src/playerform.cpp
index 0cbabd2..a0ffb37 100644
--- a/src/playerform.cpp
+++ b/src/playerform.cpp
@@ -432,22 +432,22 @@ void PlayerForm::landscapeMode() {
 	ui->widget->layout()->removeItem(ui->controlLayout);
 	ui->controlLayout->removeItem(ui->countHLayout);
 	ui->controlLayout->removeItem(ui->cverticalSpacer_0);
-	ui->controlLayout->removeWidget(ui->titleLabel);
+	ui->controlLayout->removeItem(ui->titleLayout);
 	ui->controlLayout->removeItem(ui->coverLayout);
 	ui->controlLayout->removeItem(ui->cverticalSpacer_1);
 	ui->controlLayout->removeItem(ui->seekLayout);
 	ui->controlLayout->removeItem(ui->progressLayout);
 	ui->controlLayout->removeItem(ui->cverticalSpacer_2);
-	ui->controlLayout->removeWidget(ui->artistAlbumLabel);
+	ui->controlLayout->removeItem(ui->artistAlbumLayout);
 	ui->controlLayout->removeItem(ui->cverticalSpacer_3);
 	ui->controlLayout->addItem(ui->countHLayout);
 	ui->controlLayout->addItem(ui->cverticalSpacer_0);
-	ui->controlLayout->addWidget(ui->titleLabel);
+	ui->controlLayout->addItem(ui->titleLayout);
 	ui->controlLayout->addItem(ui->cverticalSpacer_1);
 	ui->controlLayout->addItem(ui->progressLayout);
 	ui->controlLayout->addItem(ui->seekLayout);
 	ui->controlLayout->addItem(ui->cverticalSpacer_2);
-	ui->controlLayout->addWidget(ui->artistAlbumLabel);
+	ui->controlLayout->addItem(ui->artistAlbumLayout);
 	ui->controlLayout->addItem(ui->cverticalSpacer_3);
 
 	((QGridLayout *)ui->widget->layout())->addItem(ui->coverLayout, 0, 0);
@@ -496,22 +496,22 @@ void PlayerForm::portraitMode() {
 
 	ui->controlLayout->removeItem(ui->countHLayout);
 	ui->controlLayout->removeItem(ui->cverticalSpacer_0);
-	ui->controlLayout->removeWidget(ui->titleLabel);
+	ui->controlLayout->removeItem(ui->titleLayout);
 	ui->controlLayout->removeItem(ui->coverLayout);
 	ui->controlLayout->removeItem(ui->cverticalSpacer_1);
 	ui->controlLayout->removeItem(ui->seekLayout);
 	ui->controlLayout->removeItem(ui->progressLayout);
 	ui->controlLayout->removeItem(ui->cverticalSpacer_2);
-	ui->controlLayout->removeWidget(ui->artistAlbumLabel);
+	ui->controlLayout->removeItem(ui->artistAlbumLayout);
 	ui->controlLayout->removeItem(ui->cverticalSpacer_3);
 
 	ui->controlLayout->addItem(ui->countHLayout);
 	ui->controlLayout->addItem(ui->progressLayout);
 	ui->controlLayout->addItem(ui->seekLayout);
 	ui->controlLayout->addItem(ui->cverticalSpacer_0);
-	ui->controlLayout->addWidget(ui->titleLabel);
+	ui->controlLayout->addItem(ui->titleLayout);
 	ui->controlLayout->addItem(ui->coverLayout);
-	ui->controlLayout->addWidget(ui->artistAlbumLabel);
+	ui->controlLayout->addItem(ui->artistAlbumLayout);
 	ui->controlLayout->addItem(ui->cverticalSpacer_1);
 	ui->controlLayout->invalidate();
 
diff --git a/src/ui/playerform.ui b/src/ui/playerform.ui
index 03275d1..9a1b111 100644
--- a/src/ui/playerform.ui
+++ b/src/ui/playerform.ui
@@ -508,14 +508,27 @@
                </spacer>
               </item>
               <item>
-               <widget class="QLabel" name="titleLabel">
-                <property name="text">
-                 <string>&lt;h3&gt;Title&lt;/h3&gt;</string>
+               <layout class="QHBoxLayout" name="titleLayout">
+                <property name="spacing">
+                 <number>0</number>
                 </property>
-                <property name="alignment">
-                 <set>Qt::AlignCenter</set>
-                </property>
-               </widget>
+                <item>
+                 <widget class="QLabel" name="titleLabel">
+                  <property name="maximumSize">
+                   <size>
+                    <width>340</width>
+                    <height>16777215</height>
+                   </size>
+                  </property>
+                  <property name="text">
+                   <string>&lt;h3&gt;Title&lt;/h3&gt;</string>
+                  </property>
+                  <property name="alignment">
+                   <set>Qt::AlignCenter</set>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
               </item>
               <item>
                <spacer name="cverticalSpacer_1">
@@ -618,14 +631,27 @@
                </spacer>
               </item>
               <item>
-               <widget class="QLabel" name="artistAlbumLabel">
-                <property name="text">
-                 <string>&lt;b&gt;Artist&lt;/b&gt;&lt;br/&gt;album</string>
+               <layout class="QHBoxLayout" name="artistAlbumLayout">
+                <property name="spacing">
+                 <number>0</number>
                 </property>
-                <property name="alignment">
-                 <set>Qt::AlignCenter</set>
-                </property>
-               </widget>
+                <item>
+                 <widget class="QLabel" name="artistAlbumLabel">
+                  <property name="maximumSize">
+                   <size>
+                    <width>340</width>
+                    <height>16777215</height>
+                   </size>
+                  </property>
+                  <property name="text">
+                   <string>&lt;b&gt;Artist&lt;/b&gt;&lt;br/&gt;album</string>
+                  </property>
+                  <property name="alignment">
+                   <set>Qt::AlignCenter</set>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
               </item>
               <item>
                <spacer name="cverticalSpacer_3">