-rw-r--r-- | core/multimedia/opieplayer/playlistselection.cpp | 3 | ||||
-rw-r--r-- | core/multimedia/opieplayer/playlistwidget.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/core/multimedia/opieplayer/playlistselection.cpp b/core/multimedia/opieplayer/playlistselection.cpp index 58c3966..430aa6b 100644 --- a/core/multimedia/opieplayer/playlistselection.cpp +++ b/core/multimedia/opieplayer/playlistselection.cpp | |||
@@ -173,26 +173,25 @@ bool PlayListSelection::last() { | |||
173 | while ( ( item = item->nextSibling() ) ) | 173 | while ( ( item = item->nextSibling() ) ) |
174 | prevItem = item; | 174 | prevItem = item; |
175 | if ( prevItem ) | 175 | if ( prevItem ) |
176 | setSelected( prevItem, TRUE ); | 176 | setSelected( prevItem, TRUE ); |
177 | else | 177 | else |
178 | return FALSE; | 178 | return FALSE; |
179 | ensureItemVisible( selectedItem() ); | 179 | ensureItemVisible( selectedItem() ); |
180 | return TRUE; | 180 | return TRUE; |
181 | } | 181 | } |
182 | 182 | ||
183 | void PlayListSelection::unSelect() | 183 | void PlayListSelection::unSelect() |
184 | { | 184 | { |
185 | QListViewItem *item = selectedItem(); | 185 | setSelected( currentItem() , FALSE); |
186 | setSelected( currentItem(), FALSE); | ||
187 | } | 186 | } |
188 | 187 | ||
189 | void PlayListSelection::writeCurrent( Config& cfg ) { | 188 | void PlayListSelection::writeCurrent( Config& cfg ) { |
190 | cfg.setGroup("PlayList"); | 189 | cfg.setGroup("PlayList"); |
191 | QListViewItem *item = selectedItem(); | 190 | QListViewItem *item = selectedItem(); |
192 | if ( item ) | 191 | if ( item ) |
193 | cfg.writeEntry("current", item->text(0) ); | 192 | cfg.writeEntry("current", item->text(0) ); |
194 | // odebug << item->text(0) << oendl; | 193 | // odebug << item->text(0) << oendl; |
195 | 194 | ||
196 | } | 195 | } |
197 | 196 | ||
198 | void PlayListSelection::setSelectedItem(const QString &strk ) { | 197 | void PlayListSelection::setSelectedItem(const QString &strk ) { |
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp index d85ce50..46aeff2 100644 --- a/core/multimedia/opieplayer/playlistwidget.cpp +++ b/core/multimedia/opieplayer/playlistwidget.cpp | |||
@@ -1396,25 +1396,25 @@ void PlayListWidget::populateSkinsMenu() { | |||
1396 | } | 1396 | } |
1397 | if( skinName == "default" ) { | 1397 | if( skinName == "default" ) { |
1398 | defaultSkinIndex = item; | 1398 | defaultSkinIndex = item; |
1399 | } | 1399 | } |
1400 | if( skinName == skin ) { | 1400 | if( skinName == skin ) { |
1401 | skinsMenu->setItemChecked( item, TRUE ); | 1401 | skinsMenu->setItemChecked( item, TRUE ); |
1402 | } | 1402 | } |
1403 | ++it; | 1403 | ++it; |
1404 | } | 1404 | } |
1405 | } | 1405 | } |
1406 | 1406 | ||
1407 | void PlayListWidget::skinsMenuActivated( int item ) { | 1407 | void PlayListWidget::skinsMenuActivated( int item ) { |
1408 | for( int i = defaultSkinIndex; i > defaultSkinIndex - skinsMenu->count(); i-- ) { | 1408 | for( int i = defaultSkinIndex; i > defaultSkinIndex - static_cast<int>(skinsMenu->count()); i-- ) { |
1409 | skinsMenu->setItemChecked( i, FALSE ); | 1409 | skinsMenu->setItemChecked( i, FALSE ); |
1410 | } | 1410 | } |
1411 | skinsMenu->setItemChecked( item, TRUE ); | 1411 | skinsMenu->setItemChecked( item, TRUE ); |
1412 | 1412 | ||
1413 | Config cfg( "OpiePlayer" ); | 1413 | Config cfg( "OpiePlayer" ); |
1414 | cfg.setGroup("Options"); | 1414 | cfg.setGroup("Options"); |
1415 | cfg.writeEntry("Skin", skinsMenu->text( item ) ); | 1415 | cfg.writeEntry("Skin", skinsMenu->text( item ) ); |
1416 | } | 1416 | } |
1417 | 1417 | ||
1418 | void PlayListWidget::qcopReceive(const QCString &msg, const QByteArray &data) { | 1418 | void PlayListWidget::qcopReceive(const QCString &msg, const QByteArray &data) { |
1419 | // odebug << "qcop message "+msg << oendl; | 1419 | // odebug << "qcop message "+msg << oendl; |
1420 | QDataStream stream ( data, IO_ReadOnly ); | 1420 | QDataStream stream ( data, IO_ReadOnly ); |