From c643e152dc7d2167381d3fc0568ad4043de5604e Mon Sep 17 00:00:00 2001
From: alwin <alwin>
Date: Thu, 14 Apr 2005 09:23:25 +0000
Subject: gui polish

---
(limited to 'noncore/multimedia')

diff --git a/noncore/multimedia/opieplayer3/mwindow.cpp b/noncore/multimedia/opieplayer3/mwindow.cpp
index 75d1490..0898c7b 100644
--- a/noncore/multimedia/opieplayer3/mwindow.cpp
+++ b/noncore/multimedia/opieplayer3/mwindow.cpp
@@ -43,6 +43,7 @@
 #include <opie2/odebug.h>
 
 #include <qpe/resource.h>
+#include <qpe/qpeapplication.h>
 
 #include <qfileinfo.h>
 #include <qfile.h>
@@ -61,7 +62,7 @@ PMainWindow::PMainWindow(QWidget*w, const char*name, WFlags f)
     : QMainWindow(w,name,f)
 {
     checkLib();
-    setCaption( QObject::tr("Opie Mediaplayer 3" ) );
+    setCaption(appTitle());
 
     m_MainBox = new QWidget(this);
 
@@ -211,6 +212,7 @@ void PMainWindow::slotUserStop()
     m_PosSlider->setEnabled(false);
     hideVideo();
     slotShowList();
+    setCaption(appTitle());
 }
 
 void PMainWindow::slotTogglePlay(bool how)
@@ -244,6 +246,7 @@ void PMainWindow::slotPlayCurrent()
         a_playAction->setOn(false);
         hideVideo();
         slotShowList();
+        setCaption(appTitle());
         return;
     }
     m_CurrentPos = 0;
@@ -266,6 +269,7 @@ void PMainWindow::slotPlayCurrent()
         return;
     }
     mediaWindowraised();
+    setCaption(appTitle()+" - "+m_LastItem->Lnk().name());
     odebug << "Range: " << result << oendl;
     m_PosSlider->setEnabled(true);
     m_PosSlider->setRange(0,m_PlayLib->length());
@@ -311,7 +315,8 @@ void PMainWindow::slotCheckPos()
         emit sigPos(m_uppos);
         m_PosSlider->setValue(m_PlayLib->currentTime());
     }
-    QTimer::singleShot( 1000, this, SLOT( slotCheckPos() ) );
+    qApp->processEvents(100);
+    QTimer::singleShot( 900, this, SLOT( slotCheckPos() ) );
 }
 
 void PMainWindow::slotRemoveFiles()
diff --git a/noncore/multimedia/opieplayer3/mwindow.h b/noncore/multimedia/opieplayer3/mwindow.h
index 5d011d5..3ea9a52 100644
--- a/noncore/multimedia/opieplayer3/mwindow.h
+++ b/noncore/multimedia/opieplayer3/mwindow.h
@@ -64,6 +64,7 @@ class PMainWindow : public QMainWindow {
     Q_OBJECT
 public:
     static QString appName() { return QString::fromLatin1("opie-mediaplayer3" ); }
+    static QString appTitle() {return QString::fromLatin1("Opie Mediaplayer 3" ); }
     PMainWindow(QWidget*, const char*, WFlags );
     virtual ~PMainWindow();
 
diff --git a/noncore/multimedia/opieplayer3/playlist.cpp b/noncore/multimedia/opieplayer3/playlist.cpp
index 2eb40e3..6f2e668 100644
--- a/noncore/multimedia/opieplayer3/playlist.cpp
+++ b/noncore/multimedia/opieplayer3/playlist.cpp
@@ -164,6 +164,8 @@ void PlaylistView::addFile(const QString&aFile,const QString&aName)
         return;
     }
     m_lastItem = m_items.last();
+    PlaylistItem*_it = currentItem();
+
     if (m_lastItem) {
         m_lastItem = new PlaylistItem(aFile,this,m_lastItem);
     } else {
@@ -199,7 +201,9 @@ void PlaylistView::addFile(const QString&aFile,const QString&aName)
     m_lastItem->setText(COL_TIME,codec);
     m_lastItem->Video(m_Infolib->hasVideo());
     m_items.append(m_lastItem);
-    setSelected(m_lastItem,true);
+    if (_it==NULL) {
+        setSelected(m_lastItem,true);
+    }
 }
 
 void PlaylistView::slotAppendDir()
diff --git a/noncore/multimedia/opieplayer3/videowidget.cpp b/noncore/multimedia/opieplayer3/videowidget.cpp
index 833ecb4..414400b 100644
--- a/noncore/multimedia/opieplayer3/videowidget.cpp
+++ b/noncore/multimedia/opieplayer3/videowidget.cpp
@@ -57,6 +57,7 @@ int VideoWidget::playFile(const DocLnk&aLnk,XINE::Lib*aLib)
     m_xineLib->setShowVideo(true);
     int res = m_xineLib->play(m_current.file());
     vSize = m_xineLib->videoSize();
+
     slot_Videoresized(m_Videodisplay->size());
     odebug << "Xine play: " << res << oendl;
     if (res != 1) {
--
cgit v0.9.0.2