author | harlekin <harlekin> | 2002-08-19 20:39:26 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-08-19 20:39:26 (UTC) |
commit | 6c0751d0d1869089066269430b4664655e1dbe68 (patch) (unidiff) | |
tree | 870894a8eba99d8d07d2db8e3daae21e77eba450 | |
parent | 5c057c7040fe0669a159173f07793c7f28c95477 (diff) | |
download | opie-6c0751d0d1869089066269430b4664655e1dbe68.zip opie-6c0751d0d1869089066269430b4664655e1dbe68.tar.gz opie-6c0751d0d1869089066269430b4664655e1dbe68.tar.bz2 |
works now also on retail sharp rom
5 files changed, 9 insertions, 9 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index bf3590b..40e20e1 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp | |||
@@ -150,3 +150,3 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : | |||
150 | for ( int i = 0; i < 10; i++ ) { | 150 | for ( int i = 0; i < 10; i++ ) { |
151 | QString filename = QString(getenv("OPIEDIR")) + "/pics/" + skinPath + "/skin_mask_" + skin_mask_file_names[i] + ".png"; | 151 | QString filename = QString( QPEApplication::qpeDir() + "/pics/" + skinPath + "/skin_mask_" + skin_mask_file_names[i] + ".png" ); |
152 | masks[i] = new QBitmap( filename ); | 152 | masks[i] = new QBitmap( filename ); |
diff --git a/noncore/multimedia/opieplayer2/opieplayer2.pro b/noncore/multimedia/opieplayer2/opieplayer2.pro index 8cbac06..3a47c06 100644 --- a/noncore/multimedia/opieplayer2/opieplayer2.pro +++ b/noncore/multimedia/opieplayer2/opieplayer2.pro | |||
@@ -1,4 +1,4 @@ | |||
1 | TEMPLATE = app | 1 | TEMPLATE = app |
2 | #CONFIG = qt warn_on release | 2 | CONFIG = qt warn_on release |
3 | CONFIG = qt warn_on debug | 3 | #CONFIG = qt warn_on debug |
4 | DESTDIR = $(OPIEDIR)/bin | 4 | DESTDIR = $(OPIEDIR)/bin |
diff --git a/noncore/multimedia/opieplayer2/playlistselection.cpp b/noncore/multimedia/opieplayer2/playlistselection.cpp index 85228a9..975dec3 100644 --- a/noncore/multimedia/opieplayer2/playlistselection.cpp +++ b/noncore/multimedia/opieplayer2/playlistselection.cpp | |||
@@ -186,3 +186,3 @@ void PlayListSelection::unSelect() | |||
186 | { | 186 | { |
187 | QListViewItem *item = selectedItem(); | 187 | //QListViewItem *item = selectedItem(); |
188 | setSelected( currentItem(), FALSE); | 188 | setSelected( currentItem(), FALSE); |
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp index 262b685..6299328 100644 --- a/noncore/multimedia/opieplayer2/playlistwidget.cpp +++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp | |||
@@ -148,3 +148,2 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
148 | 148 | ||
149 | |||
150 | pmView = new QPopupMenu( this ); | 149 | pmView = new QPopupMenu( this ); |
@@ -586,3 +585,3 @@ void PlayListWidget::saveList() { | |||
586 | QString filename; | 585 | QString filename; |
587 | InputDialog *fileDlg; | 586 | InputDialog *fileDlg = 0l; |
588 | fileDlg = new InputDialog(this,tr("Save Playlist"),TRUE, 0); | 587 | fileDlg = new InputDialog(this,tr("Save Playlist"),TRUE, 0); |
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp index 60a3563..5b53568 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp | |||
@@ -33,2 +33,3 @@ | |||
33 | 33 | ||
34 | #include <qpe/qpeapplication.h> | ||
34 | #include <qpe/resource.h> | 35 | #include <qpe/resource.h> |
@@ -106,3 +107,3 @@ QWidget( parent, name, f ), scaledWidth( 0 ), scaledHeight( 0 ) { | |||
106 | for ( int i = 0; i < 7; i++ ) { | 107 | for ( int i = 0; i < 7; i++ ) { |
107 | QString filename = QString(getenv("OPIEDIR")) + "/pics/" + skinPath + "/skinV_mask_" + skinV_mask_file_names[i] + ".png"; | 108 | QString filename = QString( QPEApplication::qpeDir() + "/pics/" + skinPath + "/skinV_mask_" + skinV_mask_file_names[i] + ".png" ); |
108 | masks[i] = new QBitmap( filename ); | 109 | masks[i] = new QBitmap( filename ); |
@@ -184,4 +185,4 @@ void VideoWidget::resizeEvent( QResizeEvent * ) { | |||
184 | int w = width(); | 185 | int w = width(); |
185 | int Vh = 160; | 186 | //int Vh = 160; |
186 | int Vw = 220; | 187 | //int Vw = 220; |
187 | 188 | ||