summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/apps/calibrate/calibrate.cpp4
-rw-r--r--core/multimedia/opieplayer/playlistselection.cpp4
-rw-r--r--noncore/settings/sysinfo/versioninfo.cpp2
-rw-r--r--pics/launcher/opielogo.png (renamed from pics/opielogo.png)bin12347 -> 12347 bytes
4 files changed, 5 insertions, 5 deletions
diff --git a/core/apps/calibrate/calibrate.cpp b/core/apps/calibrate/calibrate.cpp
index c0ec933..945749b 100644
--- a/core/apps/calibrate/calibrate.cpp
+++ b/core/apps/calibrate/calibrate.cpp
@@ -20,51 +20,51 @@
20 20
21#include "calibrate.h" 21#include "calibrate.h"
22 22
23#include <qpe/resource.h> 23#include <qpe/resource.h>
24 24
25#include <qapplication.h> 25#include <qapplication.h>
26 26
27#if defined(Q_WS_QWS) || defined(_WS_QWS_) 27#if defined(Q_WS_QWS) || defined(_WS_QWS_)
28 28
29#include <qpainter.h> 29#include <qpainter.h>
30#include <qtimer.h> 30#include <qtimer.h>
31#include <qwindowsystem_qws.h> 31#include <qwindowsystem_qws.h>
32#include <qgfx_qws.h> 32#include <qgfx_qws.h>
33 33
34 34
35Calibrate::Calibrate(QWidget* parent, const char * name, WFlags wf) : 35Calibrate::Calibrate(QWidget* parent, const char * name, WFlags wf) :
36 QDialog( parent, name, TRUE, wf | WStyle_Tool | WStyle_Customize | WStyle_StaysOnTop ) 36 QDialog( parent, name, TRUE, wf | WStyle_Tool | WStyle_Customize | WStyle_StaysOnTop )
37{ 37{
38 showCross = TRUE; 38 showCross = TRUE;
39 const int offset = 30; 39 const int offset = 30;
40 QRect desk = qApp->desktop()->geometry(); 40 QRect desk = qApp->desktop()->geometry();
41 setGeometry( 0, 0, desk.width(), desk.height() ); 41 setGeometry( 0, 0, desk.width(), desk.height() );
42 if ( desk.height() < 250 ) { 42 if ( desk.height() < 250 ) {
43 int w = desk.height()/3; 43 int w = desk.height()/3;
44 logo.convertFromImage(Resource::loadImage("opielogo").smoothScale(w,w)); 44 logo.convertFromImage(Resource::loadImage("launcher/launcher/opielogo").smoothScale(w,w));
45 } else { 45 } else {
46 logo = Resource::loadPixmap( "opielogo" ); 46 logo = Resource::loadPixmap( "launcher/launcher/opielogo" );
47 } 47 }
48 cd.screenPoints[QWSPointerCalibrationData::TopLeft] = QPoint( offset, offset ); 48 cd.screenPoints[QWSPointerCalibrationData::TopLeft] = QPoint( offset, offset );
49 cd.screenPoints[QWSPointerCalibrationData::BottomLeft] = QPoint( offset, qt_screen->deviceHeight() - offset ); 49 cd.screenPoints[QWSPointerCalibrationData::BottomLeft] = QPoint( offset, qt_screen->deviceHeight() - offset );
50 cd.screenPoints[QWSPointerCalibrationData::BottomRight] = QPoint( qt_screen->deviceWidth() - offset, qt_screen->deviceHeight() - offset ); 50 cd.screenPoints[QWSPointerCalibrationData::BottomRight] = QPoint( qt_screen->deviceWidth() - offset, qt_screen->deviceHeight() - offset );
51 cd.screenPoints[QWSPointerCalibrationData::TopRight] = QPoint( qt_screen->deviceWidth() - offset, offset ); 51 cd.screenPoints[QWSPointerCalibrationData::TopRight] = QPoint( qt_screen->deviceWidth() - offset, offset );
52 cd.screenPoints[QWSPointerCalibrationData::Center] = QPoint( qt_screen->deviceWidth()/2, qt_screen->deviceHeight()/2 ); 52 cd.screenPoints[QWSPointerCalibrationData::Center] = QPoint( qt_screen->deviceWidth()/2, qt_screen->deviceHeight()/2 );
53 goodcd = cd; 53 goodcd = cd;
54 reset(); 54 reset();
55 55
56 timer = new QTimer( this ); 56 timer = new QTimer( this );
57 connect( timer, SIGNAL(timeout()), this, SLOT(timeout()) ); 57 connect( timer, SIGNAL(timeout()), this, SLOT(timeout()) );
58} 58}
59 59
60Calibrate::~Calibrate() 60Calibrate::~Calibrate()
61{ 61{
62 store(); 62 store();
63} 63}
64 64
65void Calibrate::show() 65void Calibrate::show()
66{ 66{
67 grabMouse(); 67 grabMouse();
68 QWSServer::mouseHandler()->getCalibration(&goodcd); 68 QWSServer::mouseHandler()->getCalibration(&goodcd);
69 QWSServer::mouseHandler()->clearCalibration(); 69 QWSServer::mouseHandler()->clearCalibration();
70 QDialog::show(); 70 QDialog::show();
diff --git a/core/multimedia/opieplayer/playlistselection.cpp b/core/multimedia/opieplayer/playlistselection.cpp
index 47fc731..b5d8b78 100644
--- a/core/multimedia/opieplayer/playlistselection.cpp
+++ b/core/multimedia/opieplayer/playlistselection.cpp
@@ -34,67 +34,67 @@ class PlayListSelectionItem : public QListViewItem {
34public: 34public:
35 PlayListSelectionItem( QListView *parent, const DocLnk *f ) : QListViewItem( parent ), fl( f ) { 35 PlayListSelectionItem( QListView *parent, const DocLnk *f ) : QListViewItem( parent ), fl( f ) {
36 setText( 0, f->name() ); 36 setText( 0, f->name() );
37 setPixmap( 0, f->pixmap() ); 37 setPixmap( 0, f->pixmap() );
38 } 38 }
39 39
40 ~PlayListSelectionItem() { 40 ~PlayListSelectionItem() {
41 }; 41 };
42 42
43 const DocLnk *file() const { return fl; } 43 const DocLnk *file() const { return fl; }
44 44
45private: 45private:
46 const DocLnk *fl; 46 const DocLnk *fl;
47}; 47};
48 48
49 49
50PlayListSelection::PlayListSelection( QWidget *parent, const char *name ) 50PlayListSelection::PlayListSelection( QWidget *parent, const char *name )
51 : QListView( parent, name ) 51 : QListView( parent, name )
52{ 52{
53 qDebug("starting playlistselector"); 53 qDebug("starting playlistselector");
54// #ifdef USE_PLAYLIST_BACKGROUND 54// #ifdef USE_PLAYLIST_BACKGROUND
55// setStaticBackground( TRUE ); 55// setStaticBackground( TRUE );
56// setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/background" ) ); 56// setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/background" ) );
57 57
58 setBackgroundPixmap( Resource::loadPixmap( "opielogo" ) ); 58 setBackgroundPixmap( Resource::loadPixmap( "launcher/launcher/opielogo" ) );
59// #endif 59// #endif
60// addColumn("Title",236); 60// addColumn("Title",236);
61// setAllColumnsShowFocus( TRUE ); 61// setAllColumnsShowFocus( TRUE );
62 addColumn( tr( "Playlist Selection" ) ); 62 addColumn( tr( "Playlist Selection" ) );
63 header()->hide(); 63 header()->hide();
64 setSorting( -1, FALSE ); 64 setSorting( -1, FALSE );
65} 65}
66 66
67 67
68PlayListSelection::~PlayListSelection() { 68PlayListSelection::~PlayListSelection() {
69} 69}
70 70
71 71
72// #ifdef USE_PLAYLIST_BACKGROUND 72// #ifdef USE_PLAYLIST_BACKGROUND
73void PlayListSelection::drawBackground( QPainter *p, const QRect &r ) { 73void PlayListSelection::drawBackground( QPainter *p, const QRect &r ) {
74// qDebug("drawBackground"); 74// qDebug("drawBackground");
75 p->fillRect( r, QBrush( white ) ); 75 p->fillRect( r, QBrush( white ) );
76 QImage logo = Resource::loadImage( "opielogo" ); 76 QImage logo = Resource::loadImage( "launcher/launcher/opielogo" );
77 if ( !logo.isNull() ) 77 if ( !logo.isNull() )
78 p->drawImage( (width() - logo.width()) / 2, (height() - logo.height()) / 2, logo ); 78 p->drawImage( (width() - logo.width()) / 2, (height() - logo.height()) / 2, logo );
79} 79}
80// #endif 80// #endif
81 81
82 82
83void PlayListSelection::contentsMouseMoveEvent( QMouseEvent *event ) { 83void PlayListSelection::contentsMouseMoveEvent( QMouseEvent *event ) {
84 if ( event->state() == QMouseEvent::LeftButton ) { 84 if ( event->state() == QMouseEvent::LeftButton ) {
85 QListViewItem *currentItem = selectedItem(); 85 QListViewItem *currentItem = selectedItem();
86 QListViewItem *itemUnder = itemAt( QPoint( event->pos().x(), event->pos().y() - contentsY() ) ); 86 QListViewItem *itemUnder = itemAt( QPoint( event->pos().x(), event->pos().y() - contentsY() ) );
87 if ( currentItem && currentItem->itemAbove() == itemUnder ) 87 if ( currentItem && currentItem->itemAbove() == itemUnder )
88 moveSelectedUp(); 88 moveSelectedUp();
89 else if ( currentItem && currentItem->itemBelow() == itemUnder ) 89 else if ( currentItem && currentItem->itemBelow() == itemUnder )
90 moveSelectedDown(); 90 moveSelectedDown();
91 } 91 }
92} 92}
93 93
94 94
95const DocLnk *PlayListSelection::current() { 95const DocLnk *PlayListSelection::current() {
96 PlayListSelectionItem *item = (PlayListSelectionItem *)selectedItem(); 96 PlayListSelectionItem *item = (PlayListSelectionItem *)selectedItem();
97 if ( item ) 97 if ( item )
98 return item->file(); 98 return item->file();
99 return NULL; 99 return NULL;
100} 100}
diff --git a/noncore/settings/sysinfo/versioninfo.cpp b/noncore/settings/sysinfo/versioninfo.cpp
index ecb13bc..27c4cf5 100644
--- a/noncore/settings/sysinfo/versioninfo.cpp
+++ b/noncore/settings/sysinfo/versioninfo.cpp
@@ -45,49 +45,49 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f )
45 QString v; 45 QString v;
46 t >> v; t >> v; t >> v; 46 t >> v; t >> v; t >> v;
47 v = v.left( 20 ); 47 v = v.left( 20 );
48 kernelVersionString = tr( "<b>Linux Kernel</b><p>Version: " ) + v + "<p>"; 48 kernelVersionString = tr( "<b>Linux Kernel</b><p>Version: " ) + v + "<p>";
49 t >> v; 49 t >> v;
50 kernelVersionString += tr( "Compiled by: " ) + v; 50 kernelVersionString += tr( "Compiled by: " ) + v;
51 file.close(); 51 file.close();
52 } 52 }
53 53
54 QString palmtopVersionString; 54 QString palmtopVersionString;
55 palmtopVersionString = tr( "<b>Opie</b><p>Version: " ) + QPE_VERSION + "<p>"; 55 palmtopVersionString = tr( "<b>Opie</b><p>Version: " ) + QPE_VERSION + "<p>";
56#ifdef QPE_VENDOR 56#ifdef QPE_VENDOR
57 QString builder = QPE_VENDOR; 57 QString builder = QPE_VENDOR;
58#else 58#else
59 QString builder = "Unknown"; 59 QString builder = "Unknown";
60#endif 60#endif
61 palmtopVersionString += tr( "Compiled by: " ) + builder + "<p>"; 61 palmtopVersionString += tr( "Compiled by: " ) + builder + "<p>";
62 palmtopVersionString += tr( "Built on: " ) + __DATE__; 62 palmtopVersionString += tr( "Built on: " ) + __DATE__;
63 63
64 64
65 QHBoxLayout *hb1 = new QHBoxLayout( vb ); 65 QHBoxLayout *hb1 = new QHBoxLayout( vb );
66 hb1->setSpacing( 2 ); 66 hb1->setSpacing( 2 );
67 67
68 QLabel *palmtopLogo = new QLabel( this ); 68 QLabel *palmtopLogo = new QLabel( this );
69 QImage logo1 = Resource::loadImage( "opielogo" ); 69 QImage logo1 = Resource::loadImage( "launcher/launcher/opielogo" );
70 logo1 = logo1.smoothScale( 50, 55 ); 70 logo1 = logo1.smoothScale( 50, 55 );
71 QPixmap logo1Pixmap; 71 QPixmap logo1Pixmap;
72 logo1Pixmap.convertFromImage( logo1 ); 72 logo1Pixmap.convertFromImage( logo1 );
73 palmtopLogo->setPixmap( logo1Pixmap ); 73 palmtopLogo->setPixmap( logo1Pixmap );
74 palmtopLogo->setFixedSize( 60, 60 ); 74 palmtopLogo->setFixedSize( 60, 60 );
75 hb1->addWidget( palmtopLogo, 0, Qt::AlignTop + Qt::AlignLeft ); 75 hb1->addWidget( palmtopLogo, 0, Qt::AlignTop + Qt::AlignLeft );
76 76
77 QLabel *palmtopVersion = new QLabel( this ); 77 QLabel *palmtopVersion = new QLabel( this );
78 palmtopVersion->setText( palmtopVersionString ); 78 palmtopVersion->setText( palmtopVersionString );
79 hb1->addWidget( palmtopVersion, 1, Qt::AlignTop + Qt::AlignLeft ); 79 hb1->addWidget( palmtopVersion, 1, Qt::AlignTop + Qt::AlignLeft );
80 80
81 81
82 QHBoxLayout *hb2 = new QHBoxLayout( vb ); 82 QHBoxLayout *hb2 = new QHBoxLayout( vb );
83 hb1->setSpacing( 2 ); 83 hb1->setSpacing( 2 );
84 84
85 QLabel *linuxLogo = new QLabel( this ); 85 QLabel *linuxLogo = new QLabel( this );
86 86
87 // Need to do this extra qpainter code with this image becuase for some 87 // Need to do this extra qpainter code with this image becuase for some
88 // reason it doesn't alpha belnd if directly converted to a pixmap 88 // reason it doesn't alpha belnd if directly converted to a pixmap
89 QPixmap logo2Pixmap( 60, 60 ); 89 QPixmap logo2Pixmap( 60, 60 );
90 QColor bgColor = colorGroup().background(); 90 QColor bgColor = colorGroup().background();
91 QPainter painter( &logo2Pixmap ); 91 QPainter painter( &logo2Pixmap );
92 painter.fillRect( QRect( 0, 0, 60, 60 ), QBrush( bgColor ) ); 92 painter.fillRect( QRect( 0, 0, 60, 60 ), QBrush( bgColor ) );
93 QImage logo2 = Resource::loadImage( "tux-logo" ); 93 QImage logo2 = Resource::loadImage( "tux-logo" );
diff --git a/pics/opielogo.png b/pics/launcher/opielogo.png
index 0adc183..0adc183 100644
--- a/pics/opielogo.png
+++ b/pics/launcher/opielogo.png
Binary files differ