author | kergoth <kergoth> | 2002-03-18 22:33:56 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-03-18 22:33:56 (UTC) |
commit | e7171ae513696f32a1edfeb41e22ff5b036c0460 (patch) (unidiff) | |
tree | 21297e19e810b5056a461431a0f1d8f57f66049d | |
parent | d41e6d2ed4caeabf78ab08bde7d4f5866c9eeb04 (diff) | |
download | opie-e7171ae513696f32a1edfeb41e22ff5b036c0460.zip opie-e7171ae513696f32a1edfeb41e22ff5b036c0460.tar.gz opie-e7171ae513696f32a1edfeb41e22ff5b036c0460.tar.bz2 |
oops
-rw-r--r-- | core/apps/calibrate/calibrate.cpp | 2 | ||||
-rw-r--r-- | core/multimedia/opieplayer/playlistselection.cpp | 4 | ||||
-rw-r--r-- | noncore/settings/sysinfo/versioninfo.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/core/apps/calibrate/calibrate.cpp b/core/apps/calibrate/calibrate.cpp index 945749b..8647957 100644 --- a/core/apps/calibrate/calibrate.cpp +++ b/core/apps/calibrate/calibrate.cpp | |||
@@ -32,25 +32,25 @@ | |||
32 | #include <qgfx_qws.h> | 32 | #include <qgfx_qws.h> |
33 | 33 | ||
34 | 34 | ||
35 | Calibrate::Calibrate(QWidget* parent, const char * name, WFlags wf) : | 35 | Calibrate::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("launcher/launcher/opielogo").smoothScale(w,w)); | 44 | logo.convertFromImage(Resource::loadImage("launcher/opielogo").smoothScale(w,w)); |
45 | } else { | 45 | } else { |
46 | logo = Resource::loadPixmap( "launcher/launcher/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 ); |
diff --git a/core/multimedia/opieplayer/playlistselection.cpp b/core/multimedia/opieplayer/playlistselection.cpp index b5d8b78..991301a 100644 --- a/core/multimedia/opieplayer/playlistselection.cpp +++ b/core/multimedia/opieplayer/playlistselection.cpp | |||
@@ -46,43 +46,43 @@ private: | |||
46 | const DocLnk *fl; | 46 | const DocLnk *fl; |
47 | }; | 47 | }; |
48 | 48 | ||
49 | 49 | ||
50 | PlayListSelection::PlayListSelection( QWidget *parent, const char *name ) | 50 | PlayListSelection::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( "launcher/launcher/opielogo" ) ); | 58 | setBackgroundPixmap( Resource::loadPixmap( "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 | ||
68 | PlayListSelection::~PlayListSelection() { | 68 | PlayListSelection::~PlayListSelection() { |
69 | } | 69 | } |
70 | 70 | ||
71 | 71 | ||
72 | // #ifdef USE_PLAYLIST_BACKGROUND | 72 | // #ifdef USE_PLAYLIST_BACKGROUND |
73 | void PlayListSelection::drawBackground( QPainter *p, const QRect &r ) { | 73 | void 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( "launcher/launcher/opielogo" ); | 76 | QImage logo = Resource::loadImage( "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 | ||
83 | void PlayListSelection::contentsMouseMoveEvent( QMouseEvent *event ) { | 83 | void 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(); |
diff --git a/noncore/settings/sysinfo/versioninfo.cpp b/noncore/settings/sysinfo/versioninfo.cpp index 27c4cf5..517029b 100644 --- a/noncore/settings/sysinfo/versioninfo.cpp +++ b/noncore/settings/sysinfo/versioninfo.cpp | |||
@@ -57,25 +57,25 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f ) | |||
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( "launcher/launcher/opielogo" ); | 69 | QImage logo1 = Resource::loadImage( "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 | ||