author | kergoth <kergoth> | 2002-03-18 21:26:21 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-03-18 21:26:21 (UTC) |
commit | e6d3c651634eee7ff54675cc060ae94bd3ef41bd (patch) (unidiff) | |
tree | e11c8c4f4728dc3d93a2439cf92aa8972c6d9d4e /core | |
parent | 0a553fa7c46beb00d2a852ecf61233569b5a5e4e (diff) | |
download | opie-e6d3c651634eee7ff54675cc060ae94bd3ef41bd.zip opie-e6d3c651634eee7ff54675cc060ae94bd3ef41bd.tar.gz opie-e6d3c651634eee7ff54675cc060ae94bd3ef41bd.tar.bz2 |
Fixing package conflicts.
-rw-r--r-- | core/apps/calibrate/calibrate.cpp | 4 | ||||
-rw-r--r-- | core/multimedia/opieplayer/playlistselection.cpp | 4 |
2 files changed, 4 insertions, 4 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 | |||
@@ -1,94 +1,94 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
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 | ||
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("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 | ||
60 | Calibrate::~Calibrate() | 60 | Calibrate::~Calibrate() |
61 | { | 61 | { |
62 | store(); | 62 | store(); |
63 | } | 63 | } |
64 | 64 | ||
65 | void Calibrate::show() | 65 | void 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(); |
71 | } | 71 | } |
72 | 72 | ||
73 | void Calibrate::store() | 73 | void Calibrate::store() |
74 | { | 74 | { |
75 | QWSServer::mouseHandler()->calibrate( &goodcd ); | 75 | QWSServer::mouseHandler()->calibrate( &goodcd ); |
76 | } | 76 | } |
77 | 77 | ||
78 | void Calibrate::hide() | 78 | void Calibrate::hide() |
79 | { | 79 | { |
80 | if ( isVisible() ) | 80 | if ( isVisible() ) |
81 | store(); | 81 | store(); |
82 | QDialog::hide(); | 82 | QDialog::hide(); |
83 | } | 83 | } |
84 | 84 | ||
85 | void Calibrate::reset() | 85 | void Calibrate::reset() |
86 | { | 86 | { |
87 | penPos = QPoint(); | 87 | penPos = QPoint(); |
88 | location = QWSPointerCalibrationData::TopLeft; | 88 | location = QWSPointerCalibrationData::TopLeft; |
89 | crossPos = fromDevice( cd.screenPoints[location] ); | 89 | crossPos = fromDevice( cd.screenPoints[location] ); |
90 | } | 90 | } |
91 | 91 | ||
92 | QPoint Calibrate::fromDevice( const QPoint &p ) | 92 | QPoint Calibrate::fromDevice( const QPoint &p ) |
93 | { | 93 | { |
94 | return qt_screen->mapFromDevice( p, | 94 | return qt_screen->mapFromDevice( p, |
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 | |||
@@ -10,115 +10,115 @@ | |||
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #include <qpe/applnk.h> | 20 | #include <qpe/applnk.h> |
21 | #include <qpe/resource.h> | 21 | #include <qpe/resource.h> |
22 | #include <qpainter.h> | 22 | #include <qpainter.h> |
23 | #include <qimage.h> | 23 | #include <qimage.h> |
24 | #include <qheader.h> | 24 | #include <qheader.h> |
25 | #include <qlistview.h> | 25 | #include <qlistview.h> |
26 | #include <qlist.h> | 26 | #include <qlist.h> |
27 | #include <qpixmap.h> | 27 | #include <qpixmap.h> |
28 | 28 | ||
29 | #include "playlistselection.h" | 29 | #include "playlistselection.h" |
30 | 30 | ||
31 | #include <stdlib.h> | 31 | #include <stdlib.h> |
32 | 32 | ||
33 | class PlayListSelectionItem : public QListViewItem { | 33 | class PlayListSelectionItem : public QListViewItem { |
34 | public: | 34 | public: |
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 | ||
45 | private: | 45 | 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( "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 | ||
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( "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 | ||
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(); |
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 | ||
95 | const DocLnk *PlayListSelection::current() { | 95 | const 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 | } |
101 | 101 | ||
102 | 102 | ||
103 | void PlayListSelection::addToSelection( const DocLnk &lnk ) { | 103 | void PlayListSelection::addToSelection( const DocLnk &lnk ) { |
104 | PlayListSelectionItem *item = new PlayListSelectionItem( this, new DocLnk( lnk ) ); | 104 | PlayListSelectionItem *item = new PlayListSelectionItem( this, new DocLnk( lnk ) ); |
105 | QListViewItem *current = selectedItem(); | 105 | QListViewItem *current = selectedItem(); |
106 | if ( current ) | 106 | if ( current ) |
107 | item->moveItem( current ); | 107 | item->moveItem( current ); |
108 | setSelected( item, TRUE ); | 108 | setSelected( item, TRUE ); |
109 | ensureItemVisible( selectedItem() ); | 109 | ensureItemVisible( selectedItem() ); |
110 | } | 110 | } |
111 | 111 | ||
112 | 112 | ||
113 | void PlayListSelection::removeSelected() { | 113 | void PlayListSelection::removeSelected() { |
114 | QListViewItem *item = selectedItem(); | 114 | QListViewItem *item = selectedItem(); |
115 | if ( item ) | 115 | if ( item ) |
116 | delete item; | 116 | delete item; |
117 | setSelected( currentItem(), TRUE ); | 117 | setSelected( currentItem(), TRUE ); |
118 | ensureItemVisible( selectedItem() ); | 118 | ensureItemVisible( selectedItem() ); |
119 | } | 119 | } |
120 | 120 | ||
121 | 121 | ||
122 | void PlayListSelection::moveSelectedUp() { | 122 | void PlayListSelection::moveSelectedUp() { |
123 | QListViewItem *item = selectedItem(); | 123 | QListViewItem *item = selectedItem(); |
124 | if ( item && item->itemAbove() ) | 124 | if ( item && item->itemAbove() ) |