*

diff --git a/bottombar.cpp b/bottombar.cpp
index c5b3527..c36b7d8 100644 (file)
--- a/bottombar.cpp
+++ b/bottombar.cpp
@@ -14,7 +14,7 @@ bottomBar::bottomBar(QWidget *parent) :
     main->setBackgroundBrush(this->palette().window());
     main->setSceneRect(0,0,this->width(),15);
 
-#ifndef Q_WS_MAEMO_5
+//#ifndef Q_WS_MAEMO_5
     QBrush k = QApplication::palette().highlight();
     this->playbackProgress = main->addRect(0,0,this->width()/2,15,QPen(k.color()),QBrush(k));
     ui->stopButton->setIcon(QIcon::fromTheme("media-playback-stop"));
@@ -22,9 +22,9 @@ bottomBar::bottomBar(QWidget *parent) :
     ui->nextB->setIcon(QIcon::fromTheme("media-skip-forward"));
     ui->backB->setIcon(QIcon::fromTheme("media-skip-backward"));
     ui->settingsB->setIcon(QIcon::fromTheme("document-properties"));
-#else
-    this->playbackProgress = main->addRect(0,0,this->width()/2,15,QPen(Qt::white),QBrush(Qt::white));
-#endif
+//#else
+//    this->playbackProgress = main->addRect(0,0,this->width()/2,15,QPen(Qt::white),QBrush(Qt::white);
+//#endif
 }
 
 bottomBar::~bottomBar()

diff --git a/groove.cpp b/groove.cpp
index 51b457d..5cfd9a1 100644 (file)
--- a/groove.cpp
+++ b/groove.cpp
@@ -17,7 +17,7 @@ groove::groove(QWidget *parent) :
     player = new sPlayer();
     QHBoxLayout *layout = new QHBoxLayout();
     QVBoxLayout *vlayout = new QVBoxLayout();
-    QHBoxLayout *bottomLayout = new QHBoxLayout();
+    //QHBoxLayout *bottomLayout = new QHBoxLayout();
     button = new QPushButton("Search");
     QPushButton *dButton = new QPushButton("Queue");
     QPushButton *stopButton = new QPushButton("Pause");
@@ -76,12 +76,13 @@ groove::groove(QWidget *parent) :
     bBar = new bottomBar();
     vlayout->setSpacing(0);
     vlayout->setMargin(0);
+    vlayout->setContentsMargins(QMargins(0,0,0,0));
     vlayout->addWidget(bBar);
 
-    bottomLayout->addWidget(dButton);
+    /*bottomLayout->addWidget(dButton);
     bottomLayout->addWidget(stopButton);
     bottomLayout->addWidget(nextB);
-    bottomLayout->addWidget(moreButton);
+    bottomLayout->addWidget(moreButton);*/
     vlayout->setMenuBar(mBar);
     vlayout->setContentsMargins(QMargins());
     setLayout(vlayout);

diff --git a/pwin.ui b/pwin.ui
index 2adb40e..4b0aeb7 100644 (file)
--- a/pwin.ui
+++ b/pwin.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>369</width>
-    <height>278</height>
+    <width>634</width>
+    <height>349</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -15,38 +15,26 @@
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout">
    <item>
-    <widget class="QListWidget" name="listWidget"/>
-   </item>
-   <item>
-    <layout class="QVBoxLayout" name="verticalLayout">
-     <item>
-      <widget class="QPushButton" name="pushButton">
-       <property name="text">
-        <string/>
-       </property>
-       <property name="icon">
-        <iconset resource="res.qrc">
-         <normaloff>:/groove/icons/general_close.png</normaloff>:/groove/icons/general_close.png</iconset>
-       </property>
-       <property name="flat">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
+    <widget class="QListWidget" name="listWidget">
+     <property name="dragDropMode">
+      <enum>QAbstractItemView::InternalMove</enum>
+     </property>
+     <property name="selectionBehavior">
+      <enum>QAbstractItemView::SelectRows</enum>
+     </property>
      <item>
-      <spacer name="verticalSpacer">
-       <property name="orientation">
-        <enum>Qt::Vertical</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>20</width>
-         <height>40</height>
-        </size>
-       </property>
-      </spacer>
+      <property name="text">
+       <string>New Item</string>
+      </property>
+      <property name="icon">
+       <iconset resource="res.qrc">
+        <normaloff>:/groove/icons/general_forward.png</normaloff>:/groove/icons/general_forward.png</iconset>
+      </property>
      </item>
-    </layout>
+    </widget>
+   </item>
+   <item>
+    <layout class="QVBoxLayout" name="verticalLayout"/>
    </item>
   </layout>
  </widget>