[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [Amarok]  Removed empty line if the author hasn't set a loca
From:       Teo Mrnjavac <teo () getamarok ! com>
Date:       2009-08-22 18:12:06
Message-ID: 200908221812.n7MIC6Sr004367 () Wurst ! kollide ! net
[Download RAW message or body]

commit b557d307df5604ceee2ace1286a0cda871a6b03a
Author:     Teo Mrnjavac <teo@getamarok.com>
AuthorDate: Sat Aug 22 20:08:11 2009 +0200
Commit:     Teo Mrnjavac <teo@getamarok.com>
CommitDate: Sat Aug 22 20:08:11 2009 +0200

    Removed empty line if the author hasn't set a location in the openDesktop.org \
profile.

diff --git a/src/aboutdialog/OcsAuthorItem.cpp b/src/aboutdialog/OcsAuthorItem.cpp
index c4a3c0d..172849d 100644
--- a/src/aboutdialog/OcsAuthorItem.cpp
+++ b/src/aboutdialog/OcsAuthorItem.cpp
@@ -37,11 +37,13 @@ OcsAuthorItem::OcsAuthorItem( const KAboutPerson &person, const \
Attica::Person &  m_avatar->setSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed );
 
     m_avatar->setFixedSize( 56, 56 );
-    m_avatar->setFrameStyle( QFrame::StyledPanel );
+    m_avatar->setFrameShape( QFrame::StyledPanel );
     m_avatar->setPixmap( m_ocsPerson->avatar() );
     m_avatar->setAlignment( Qt::AlignCenter );
 
-    m_aboutText.append( "<br/>" + ( m_ocsPerson->city().isEmpty() ? "" : ( \
m_ocsPerson->city() + ", " ) ) + m_ocsPerson->country() ); +    if( !( \
m_ocsPerson->city().isEmpty() && m_ocsPerson->country().isEmpty() ) ) +        \
m_aboutText.append( "<br/>" + ( m_ocsPerson->city().isEmpty() ? "" : ( \
m_ocsPerson->city() + ", " ) ) + m_ocsPerson->country() ); +
     if( !m_ocsPerson->extendedAttribute( "ircchannels" ).isEmpty() )
     {
         QString channelsString = m_ocsPerson->extendedAttribute( "ircchannels" );
diff --git a/src/aboutdialog/OcsAuthorItem.ui b/src/aboutdialog/OcsAuthorItem.ui
index 72aa6ec..752b3e5 100644
--- a/src/aboutdialog/OcsAuthorItem.ui
+++ b/src/aboutdialog/OcsAuthorItem.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>503</width>
-    <height>55</height>
+    <width>501</width>
+    <height>53</height>
    </rect>
   </property>
   <property name="sizePolicy">


[prev in list] [next in list] [prev in thread] [next in thread]