Diffstat (limited to 'noncore/multimedia/opieplayer2') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 25 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.cpp | 43 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.h | 5 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 25 |
4 files changed, 50 insertions, 48 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index 23d12ec..fd18dbb 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp | |||
@@ -101,26 +101,3 @@ AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye | |||
101 | 101 | ||
102 | buttonMask = QImage( imgUp.width(), imgUp.height(), 8, 255 ); | 102 | setupButtons( skinInfo, buttonCount, QPEApplication::qpeDir() + "/pics/" + skinPath + "/skin_mask_", imgUp.size() ); |
103 | buttonMask.fill( 0 ); | ||
104 | |||
105 | for ( uint i = 0; i < buttonCount; i++ ) { | ||
106 | Button button; | ||
107 | button.command = skinInfo[ i ].command; | ||
108 | button.type = skinInfo[ i ].type; | ||
109 | |||
110 | QString filename = QString( QPEApplication::qpeDir() + "/pics/" + skinPath + "/skin_mask_" + skinInfo[i].fileName + ".png" ); | ||
111 | button.mask =QBitmap( filename ); | ||
112 | |||
113 | if ( !button.mask.isNull() ) { | ||
114 | QImage imgMask = button.mask.convertToImage(); | ||
115 | uchar **dest = buttonMask.jumpTable(); | ||
116 | for ( int y = 0; y < imgUp.height(); y++ ) { | ||
117 | uchar *line = dest[y]; | ||
118 | for ( int x = 0; x < imgUp.width(); x++ ) | ||
119 | if ( !qRed( imgMask.pixel( x, y ) ) ) | ||
120 | line[x] = button.command + 1; | ||
121 | } | ||
122 | } | ||
123 | |||
124 | buttons.push_back( button ); | ||
125 | } | ||
126 | 103 | ||
diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp index 4c4cead..db16b44 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.cpp +++ b/noncore/multimedia/opieplayer2/mediawidget.cpp | |||
@@ -41,2 +41,45 @@ MediaWidget::~MediaWidget() | |||
41 | 41 | ||
42 | void MediaWidget::setupButtons( const SkinButtonInfo *skinInfo, uint buttonCount, | ||
43 | const QString &imagePrefix, const QSize &buttonAreaSize ) | ||
44 | { | ||
45 | buttonMask = QImage( buttonAreaSize, 8, 255 ); | ||
46 | buttonMask.fill( 0 ); | ||
47 | |||
48 | for ( uint i = 0; i < buttonCount; ++i ) { | ||
49 | Button button = setupButton( skinInfo[ i ], imagePrefix ); | ||
50 | buttons.push_back( button ); | ||
51 | } | ||
52 | } | ||
53 | |||
54 | MediaWidget::Button MediaWidget::setupButton( const SkinButtonInfo &buttonInfo, const QString &imagePrefix ) | ||
55 | { | ||
56 | Button button; | ||
57 | button.command = buttonInfo.command; | ||
58 | button.type = buttonInfo.type; | ||
59 | |||
60 | QString fileName = imagePrefix + buttonInfo.fileName + ".png"; | ||
61 | |||
62 | button.mask = setupButtonMask( button.command, fileName ); | ||
63 | |||
64 | return button; | ||
65 | } | ||
66 | |||
67 | QBitmap MediaWidget::setupButtonMask( const Command &command, const QString &fileName ) | ||
68 | { | ||
69 | QBitmap mask( fileName ); | ||
70 | if ( mask.isNull() ) | ||
71 | return mask; | ||
72 | |||
73 | QImage imgMask = mask.convertToImage(); | ||
74 | uchar **dest = buttonMask.jumpTable(); | ||
75 | for ( int y = 0; y < buttonMask.height(); y++ ) { | ||
76 | uchar *line = dest[y]; | ||
77 | for ( int x = 0; x < buttonMask.width(); x++ ) | ||
78 | if ( !qRed( imgMask.pixel( x, y ) ) ) | ||
79 | line[x] = command + 1; | ||
80 | } | ||
81 | |||
82 | return mask; | ||
83 | } | ||
84 | |||
42 | void MediaWidget::closeEvent( QCloseEvent * ) | 85 | void MediaWidget::closeEvent( QCloseEvent * ) |
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h index 8031371..148948a 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.h +++ b/noncore/multimedia/opieplayer2/mediawidget.h | |||
@@ -85,2 +85,7 @@ signals: | |||
85 | protected: | 85 | protected: |
86 | void setupButtons( const SkinButtonInfo *skinInfo, uint buttonCount, | ||
87 | const QString &imagePrefix, const QSize &buttonAreaSize ); | ||
88 | Button setupButton( const SkinButtonInfo &buttonInfo, const QString &imagePrefix ); | ||
89 | QBitmap setupButtonMask( const Command &command, const QString &fileName ); | ||
90 | |||
86 | virtual void closeEvent( QCloseEvent * ); | 91 | virtual void closeEvent( QCloseEvent * ); |
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp index 4901e47..d1efaad 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp | |||
@@ -96,26 +96,3 @@ VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye | |||
96 | 96 | ||
97 | buttonMask = QImage( imgUp.width(), imgUp.height(), 8, 255 ); | 97 | setupButtons( skinInfo, buttonCount, QPEApplication::qpeDir() + "/pics/" + skinPath + "/skinV_mask_", imgUp.size() ); |
98 | buttonMask.fill( 0 ); | ||
99 | |||
100 | for ( uint i = 0; i < buttonCount; i++ ) { | ||
101 | Button button; | ||
102 | button.command = skinInfo[ i ].command; | ||
103 | button.type = skinInfo[ i ].type; | ||
104 | |||
105 | QString filename = QString( QPEApplication::qpeDir() + "/pics/" + skinPath + "/skinV_mask_" + skinInfo[i].fileName + ".png" ); | ||
106 | button.mask =QBitmap( filename ); | ||
107 | |||
108 | if ( !button.mask.isNull() ) { | ||
109 | QImage imgMask = button.mask.convertToImage(); | ||
110 | uchar **dest = buttonMask.jumpTable(); | ||
111 | for ( int y = 0; y < imgUp.height(); y++ ) { | ||
112 | uchar *line = dest[y]; | ||
113 | for ( int x = 0; x < imgUp.width(); x++ ) | ||
114 | if ( !qRed( imgMask.pixel( x, y ) ) ) | ||
115 | line[x] = button.command + 1; | ||
116 | } | ||
117 | } | ||
118 | |||
119 | buttons.push_back( button ); | ||
120 | } | ||
121 | 98 | ||