author | alwin <alwin> | 2005-04-14 09:23:25 (UTC) |
---|---|---|
committer | alwin <alwin> | 2005-04-14 09:23:25 (UTC) |
commit | c643e152dc7d2167381d3fc0568ad4043de5604e (patch) (unidiff) | |
tree | 3050f49d659a1d6eb54cca2a08ed64cf0d04842a /noncore | |
parent | cb10570b4118161a066b741c2674d8d522670623 (diff) | |
download | opie-c643e152dc7d2167381d3fc0568ad4043de5604e.zip opie-c643e152dc7d2167381d3fc0568ad4043de5604e.tar.gz opie-c643e152dc7d2167381d3fc0568ad4043de5604e.tar.bz2 |
gui polish
-rw-r--r-- | noncore/multimedia/opieplayer3/mwindow.cpp | 9 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer3/mwindow.h | 1 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer3/playlist.cpp | 6 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer3/videowidget.cpp | 1 |
4 files changed, 14 insertions, 3 deletions
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 @@ | |||
43 | #include <opie2/odebug.h> | 43 | #include <opie2/odebug.h> |
44 | 44 | ||
45 | #include <qpe/resource.h> | 45 | #include <qpe/resource.h> |
46 | #include <qpe/qpeapplication.h> | ||
46 | 47 | ||
47 | #include <qfileinfo.h> | 48 | #include <qfileinfo.h> |
48 | #include <qfile.h> | 49 | #include <qfile.h> |
@@ -61,7 +62,7 @@ PMainWindow::PMainWindow(QWidget*w, const char*name, WFlags f) | |||
61 | : QMainWindow(w,name,f) | 62 | : QMainWindow(w,name,f) |
62 | { | 63 | { |
63 | checkLib(); | 64 | checkLib(); |
64 | setCaption( QObject::tr("Opie Mediaplayer 3" ) ); | 65 | setCaption(appTitle()); |
65 | 66 | ||
66 | m_MainBox = new QWidget(this); | 67 | m_MainBox = new QWidget(this); |
67 | 68 | ||
@@ -211,6 +212,7 @@ void PMainWindow::slotUserStop() | |||
211 | m_PosSlider->setEnabled(false); | 212 | m_PosSlider->setEnabled(false); |
212 | hideVideo(); | 213 | hideVideo(); |
213 | slotShowList(); | 214 | slotShowList(); |
215 | setCaption(appTitle()); | ||
214 | } | 216 | } |
215 | 217 | ||
216 | void PMainWindow::slotTogglePlay(bool how) | 218 | void PMainWindow::slotTogglePlay(bool how) |
@@ -244,6 +246,7 @@ void PMainWindow::slotPlayCurrent() | |||
244 | a_playAction->setOn(false); | 246 | a_playAction->setOn(false); |
245 | hideVideo(); | 247 | hideVideo(); |
246 | slotShowList(); | 248 | slotShowList(); |
249 | setCaption(appTitle()); | ||
247 | return; | 250 | return; |
248 | } | 251 | } |
249 | m_CurrentPos = 0; | 252 | m_CurrentPos = 0; |
@@ -266,6 +269,7 @@ void PMainWindow::slotPlayCurrent() | |||
266 | return; | 269 | return; |
267 | } | 270 | } |
268 | mediaWindowraised(); | 271 | mediaWindowraised(); |
272 | setCaption(appTitle()+" - "+m_LastItem->Lnk().name()); | ||
269 | odebug << "Range: " << result << oendl; | 273 | odebug << "Range: " << result << oendl; |
270 | m_PosSlider->setEnabled(true); | 274 | m_PosSlider->setEnabled(true); |
271 | m_PosSlider->setRange(0,m_PlayLib->length()); | 275 | m_PosSlider->setRange(0,m_PlayLib->length()); |
@@ -311,7 +315,8 @@ void PMainWindow::slotCheckPos() | |||
311 | emit sigPos(m_uppos); | 315 | emit sigPos(m_uppos); |
312 | m_PosSlider->setValue(m_PlayLib->currentTime()); | 316 | m_PosSlider->setValue(m_PlayLib->currentTime()); |
313 | } | 317 | } |
314 | QTimer::singleShot( 1000, this, SLOT( slotCheckPos() ) ); | 318 | qApp->processEvents(100); |
319 | QTimer::singleShot( 900, this, SLOT( slotCheckPos() ) ); | ||
315 | } | 320 | } |
316 | 321 | ||
317 | void PMainWindow::slotRemoveFiles() | 322 | 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 { | |||
64 | Q_OBJECT | 64 | Q_OBJECT |
65 | public: | 65 | public: |
66 | static QString appName() { return QString::fromLatin1("opie-mediaplayer3" ); } | 66 | static QString appName() { return QString::fromLatin1("opie-mediaplayer3" ); } |
67 | static QString appTitle() {return QString::fromLatin1("Opie Mediaplayer 3" ); } | ||
67 | PMainWindow(QWidget*, const char*, WFlags ); | 68 | PMainWindow(QWidget*, const char*, WFlags ); |
68 | virtual ~PMainWindow(); | 69 | virtual ~PMainWindow(); |
69 | 70 | ||
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) | |||
164 | return; | 164 | return; |
165 | } | 165 | } |
166 | m_lastItem = m_items.last(); | 166 | m_lastItem = m_items.last(); |
167 | PlaylistItem*_it = currentItem(); | ||
168 | |||
167 | if (m_lastItem) { | 169 | if (m_lastItem) { |
168 | m_lastItem = new PlaylistItem(aFile,this,m_lastItem); | 170 | m_lastItem = new PlaylistItem(aFile,this,m_lastItem); |
169 | } else { | 171 | } else { |
@@ -199,7 +201,9 @@ void PlaylistView::addFile(const QString&aFile,const QString&aName) | |||
199 | m_lastItem->setText(COL_TIME,codec); | 201 | m_lastItem->setText(COL_TIME,codec); |
200 | m_lastItem->Video(m_Infolib->hasVideo()); | 202 | m_lastItem->Video(m_Infolib->hasVideo()); |
201 | m_items.append(m_lastItem); | 203 | m_items.append(m_lastItem); |
202 | setSelected(m_lastItem,true); | 204 | if (_it==NULL) { |
205 | setSelected(m_lastItem,true); | ||
206 | } | ||
203 | } | 207 | } |
204 | 208 | ||
205 | void PlaylistView::slotAppendDir() | 209 | 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) | |||
57 | m_xineLib->setShowVideo(true); | 57 | m_xineLib->setShowVideo(true); |
58 | int res = m_xineLib->play(m_current.file()); | 58 | int res = m_xineLib->play(m_current.file()); |
59 | vSize = m_xineLib->videoSize(); | 59 | vSize = m_xineLib->videoSize(); |
60 | |||
60 | slot_Videoresized(m_Videodisplay->size()); | 61 | slot_Videoresized(m_Videodisplay->size()); |
61 | odebug << "Xine play: " << res << oendl; | 62 | odebug << "Xine play: " << res << oendl; |
62 | if (res != 1) { | 63 | if (res != 1) { |