*

diff --git a/bottombar.cpp b/bottombar.cpp
index c242e81..a5ede85 100644 (file)
--- a/bottombar.cpp
+++ b/bottombar.cpp
@@ -13,14 +13,18 @@ bottomBar::bottomBar(QWidget *parent) :
     //ui->graphicsView->setTransformationAnchor(QGraphicsView::NoAnchor);
     main->setBackgroundBrush(this->palette().window());
     main->setSceneRect(0,0,this->width(),15);
-    this->playbackProgress = main->addRect(0,0,this->width()/2,15,QPen(Qt::white),QBrush(Qt::white));
+
 #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"));
     ui->pauseB->setIcon(QIcon::fromTheme("media-playback-pause"));
     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
 }
 

diff --git a/groove.cpp b/groove.cpp
index 2ba62fa..51b457d 100644 (file)
--- a/groove.cpp
+++ b/groove.cpp
@@ -68,14 +68,16 @@ groove::groove(QWidget *parent) :
     layout->addWidget(button);
     vlayout->addWidget(ok);
     //vlayout->addLayout(layout);
-    QTabWidget *tab = new QTabWidget();
-    tab->addTab(resultView,"Search Results");
+    stack = new QStackedWidget();
+    stack->addWidget(resultView);
 
-    vlayout->addWidget(tab);
+    vlayout->addWidget(stack);
     //vlayout->addLayout(bottomLayout);
     bBar = new bottomBar();
-    vlayout->addWidget(bBar);
     vlayout->setSpacing(0);
+    vlayout->setMargin(0);
+    vlayout->addWidget(bBar);
+
     bottomLayout->addWidget(dButton);
     bottomLayout->addWidget(stopButton);
     bottomLayout->addWidget(nextB);
@@ -114,9 +116,19 @@ groove::groove(QWidget *parent) :
     connect(bBar,SIGNAL(back()),player,SLOT(back()));
     bBar->setPlaybackProgress(100,100);
     pwindow = new pWin();
-    tab->addTab(pwindow,"Playlist");
+    stack->addWidget(pwindow);
+    stack->setCurrentWidget(resultView);
+    connect(bBar,SIGNAL(list()),this,SLOT(togglePlaylist()));
 
 }
+void groove::togglePlaylist()
+{
+    if(stack->currentWidget()==pwindow)
+        stack->setCurrentWidget(resultView);
+    else
+        stack->setCurrentWidget(pwindow);
+}
+
 void groove::performSearch(QString s)
 {
     qDebug() << s;

diff --git a/groove.h b/groove.h
index 02eef81..7c9341e 100644 (file)
--- a/groove.h
+++ b/groove.h
@@ -36,6 +36,7 @@ private slots:
     void progressUpdate(int,qint64,qint64);
     void addSongPlaylist();
     void showOthers();
+    void togglePlaylist();
 private:
     //mpgplayer *mpg;
     bottomBar *bBar;
@@ -49,6 +50,7 @@ private:
     bool portrait;
     gscom *gs;
     pWin *pwindow;
+    QStackedWidget *stack;
 #if defined(Q_WS_MAEMO_5) || defined(Q_WS_HILDON)
     QMaemo5Rotator *rot;
 #endif

diff --git a/pwin.ui b/pwin.ui
index 20ec927..2adb40e 100644 (file)
--- a/pwin.ui
+++ b/pwin.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
-    <height>300</height>
+    <width>369</width>
+    <height>278</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -15,35 +15,43 @@
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout">
    <item>
-    <widget class="QListWidget" name="listWidget">
-     <item>
-      <property name="text">
-       <string>jdfgdg</string>
-      </property>
-      <property name="background">
-       <brush brushstyle="SolidPattern">
-        <color alpha="255">
-         <red>80</red>
-         <green>60</green>
-         <blue>231</blue>
-        </color>
-       </brush>
-      </property>
-     </item>
-    </widget>
+    <widget class="QListWidget" name="listWidget"/>
    </item>
    <item>
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
+    <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>
+     <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>
+     </item>
+    </layout>
    </item>
   </layout>
  </widget>
- <resources/>
+ <resources>
+  <include location="res.qrc"/>
+ </resources>
  <connections/>
 </ui>

diff --git a/searchresults.ui b/searchresults.ui
index 2fa1dc4..7016349 100644 (file)
--- a/searchresults.ui
+++ b/searchresults.ui
@@ -1,7 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <author/>
- <comment/>
- <exportmacro/>
  <class>SearchResults</class>
  <widget class="QWidget" name="SearchResults">
   <property name="geometry">
@@ -15,7 +13,28 @@
   <property name="windowTitle">
    <string>Form</string>
   </property>
+  <widget class="QStackedWidget" name="stackedWidget">
+   <property name="geometry">
+    <rect>
+     <x>80</x>
+     <y>100</y>
+     <width>120</width>
+     <height>80</height>
+    </rect>
+   </property>
+   <property name="frameShape">
+    <enum>QFrame::NoFrame</enum>
+   </property>
+   <property name="frameShadow">
+    <enum>QFrame::Plain</enum>
+   </property>
+   <property name="currentIndex">
+    <number>1</number>
+   </property>
+   <widget class="QWidget" name="page"/>
+   <widget class="QWidget" name="page_2"/>
+  </widget>
  </widget>
- <pixmapfunction/>
+ <resources/>
  <connections/>
 </ui>