From cbc4252ac99878ad0548a21a778e3446c3dba8df Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Sun, 13 Feb 2011 10:30:49 +0100
Subject: [PATCH] * General design / layout fixes.

---
 src/libtomahawk/playlist/queueview.cpp |  4 +-
 src/tomahawkwindow.cpp                 | 38 +++++++++++++-----
 src/tomahawkwindow.ui                  | 55 +++-----------------------
 src/transferview.cpp                   |  3 ++
 4 files changed, 39 insertions(+), 61 deletions(-)

diff --git a/src/libtomahawk/playlist/queueview.cpp b/src/libtomahawk/playlist/queueview.cpp
index e196c2f99..023d16584 100644
--- a/src/libtomahawk/playlist/queueview.cpp
+++ b/src/libtomahawk/playlist/queueview.cpp
@@ -23,7 +23,9 @@ QueueView::QueueView( AnimatedSplitter* parent )
     m_queue = new PlaylistView( this );
     m_queue->setProxyModel( new QueueProxyModel( this ) );
     m_queue->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Ignored );
-
+    m_queue->setFrameShape( QFrame::NoFrame );
+    m_queue->setAttribute( Qt::WA_MacShowFocusRect, 0 );
+    
     m_button = new QPushButton();
     m_button->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Fixed );
     m_button->setText( tr( "Click to show queue" ) );
diff --git a/src/tomahawkwindow.cpp b/src/tomahawkwindow.cpp
index 3b9ece032..7c21c4898 100644
--- a/src/tomahawkwindow.cpp
+++ b/src/tomahawkwindow.cpp
@@ -23,6 +23,8 @@
 #include "network/controlconnection.h"
 #include "playlist/playlistmanager.h"
 #include "sip/SipHandler.h"
+#include "sourcetree/sourcetreeview.h"
+#include "utils/animatedsplitter.h"
 #include "utils/proxystyle.h"
 #include "utils/widgetdragfilter.h"
 #include "utils/xspfloader.h"
@@ -34,6 +36,7 @@
 #include "settingsdialog.h"
 #include "tomahawksettings.h"
 #include "sourcelist.h"
+#include "transferview.h"
 #include "tomahawktrayicon.h"
 #include "playlist/dynamic/GeneratorInterface.h"
 
@@ -60,20 +63,35 @@ TomahawkWindow::TomahawkWindow( QWidget* parent )
     
     ui->setupUi( this );
 
+    delete ui->sidebarWidget;
     delete ui->playlistWidget;
+
+    ui->centralWidget->setContentsMargins( 0, 0, 0, 0 );
+    ui->centralWidget->layout()->setContentsMargins( 0, 0, 0, 0 );
+    ui->centralWidget->layout()->setMargin( 0 );
+    
+    AnimatedSplitter* sidebar = new AnimatedSplitter( this );
+    sidebar->setOrientation( Qt::Vertical );
+    sidebar->setChildrenCollapsible( false );
+    sidebar->setGreedyWidget( 0 );
+    sidebar->setStretchFactor( 0, 3 );
+    sidebar->setStretchFactor( 1, 1 );
+    
+    SourceTreeView* stv = new SourceTreeView();
+    TransferView* transferView = new TransferView();
+    
+    sidebar->addWidget( stv );
+    sidebar->addWidget( transferView );
+    sidebar->hide( 1, false );
+    
+    ui->splitter->addWidget( sidebar );
+    
     ui->splitter->addWidget( PlaylistManager::instance()->widget() );
     ui->splitter->setStretchFactor( 0, 1 );
     ui->splitter->setStretchFactor( 1, 3 );
     ui->splitter->setCollapsible( 1, false );
     ui->splitter->setHandleWidth( 1 );
 
-    ui->sidebarSplitter->setChildrenCollapsible( false );
-    ui->sidebarSplitter->setGreedyWidget( 0 );
-    ui->sidebarSplitter->setStretchFactor( 0, 3 );
-    ui->sidebarSplitter->setStretchFactor( 1, 1 );
-    ui->sidebarSplitter->hide( 1, false );
-    ui->sidebarSplitter->setHandleWidth( 1 );
-
 /*    QToolBar* toolbar = addToolBar( "TomahawkToolbar" );
     toolbar->setObjectName( "TomahawkToolbar" );
     toolbar->addWidget( m_topbar );
@@ -143,7 +161,7 @@ TomahawkWindow::setupSignals()
     connect( ui->actionCreate_New_Station, SIGNAL( triggered() ), SLOT( createStation() ));
     connect( ui->actionAboutTomahawk, SIGNAL( triggered() ), SLOT( showAboutTomahawk() ) );
     connect( ui->actionExit, SIGNAL( triggered() ), APP, SLOT( quit() ) );
-    connect( ui->statusButton, SIGNAL( clicked() ), APP->sipHandler(), SLOT( toggleConnect() ) );
+//    connect( ui->statusButton, SIGNAL( clicked() ), APP->sipHandler(), SLOT( toggleConnect() ) );
 
     // <SipHandler>
     connect( APP->sipHandler(), SIGNAL( connected() ), SLOT( onSipConnected() ) );
@@ -354,14 +372,14 @@ TomahawkWindow::onPlaybackLoading( const Tomahawk::result_ptr& result )
 void
 TomahawkWindow::onSipConnected()
 {
-    ui->statusButton->setText( tr( "Online" ) );
+//    ui->statusButton->setText( tr( "Online" ) );
 }
 
 
 void
 TomahawkWindow::onSipDisconnected()
 {
-    ui->statusButton->setText( tr( "Offline" ) );
+//    ui->statusButton->setText( tr( "Offline" ) );
 }
 
 
diff --git a/src/tomahawkwindow.ui b/src/tomahawkwindow.ui
index b5ce7b2d3..e41225877 100644
--- a/src/tomahawkwindow.ui
+++ b/src/tomahawkwindow.ui
@@ -14,43 +14,16 @@
    <string>Tomahawk</string>
   </property>
   <widget class="QWidget" name="centralWidget">
-   <layout class="QHBoxLayout" name="horizontalLayout">
-    <property name="margin">
-     <number>0</number>
-    </property>
+   <layout class="QVBoxLayout" name="verticalLayout">
     <item>
      <widget class="QSplitter" name="splitter">
       <property name="orientation">
        <enum>Qt::Horizontal</enum>
       </property>
-      <widget class="QWidget" name="layoutWidget">
-       <layout class="QVBoxLayout" name="verticalLayout">
-        <item>
-         <widget class="AnimatedSplitter" name="sidebarSplitter">
-          <property name="orientation">
-           <enum>Qt::Vertical</enum>
-          </property>
-          <widget class="SourceTreeView" name="sourceTreeView">
-           <property name="minimumSize">
-            <size>
-             <width>250</width>
-             <height>0</height>
-            </size>
-           </property>
-          </widget>
-          <widget class="TransferView" name="treeWidget">
-          </widget>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="statusButton">
-          <property name="text">
-           <string/>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </widget>
+      <property name="handleWidth">
+       <number>1</number>
+      </property>
+      <widget class="QWidget" name="sidebarWidget" native="true"/>
       <widget class="QWidget" name="playlistWidget" native="true"/>
      </widget>
     </item>
@@ -173,24 +146,6 @@
   </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
- <customwidgets>
-  <customwidget>
-   <class>SourceTreeView</class>
-   <extends>QTreeView</extends>
-   <header>sourcetreeview.h</header>
-  </customwidget>
-  <customwidget>
-   <class>AnimatedSplitter</class>
-   <extends>QSplitter</extends>
-   <header>utils/animatedsplitter.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>TransferView</class>
-   <extends>QTreeWidget</extends>
-   <header>transferview.h</header>
-  </customwidget>
- </customwidgets>
  <resources/>
  <connections/>
  <slots>
diff --git a/src/transferview.cpp b/src/transferview.cpp
index 936be9f59..75231cc81 100644
--- a/src/transferview.cpp
+++ b/src/transferview.cpp
@@ -35,6 +35,9 @@ TransferView::TransferView( AnimatedSplitter* parent )
 
     m_tree->header()->setStretchLastSection( true );
     m_tree->setRootIsDecorated( false );
+
+    m_tree->setFrameShape( QFrame::NoFrame );
+    m_tree->setAttribute( Qt::WA_MacShowFocusRect, 0 );
 }