summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/playlistselection.cpp35
-rw-r--r--noncore/settings/networksettings2/editconnection.cpp5
-rw-r--r--noncore/settings/networksettings2/opietooth2/Opietooth.cpp2
3 files changed, 14 insertions, 28 deletions
diff --git a/noncore/multimedia/opieplayer2/playlistselection.cpp b/noncore/multimedia/opieplayer2/playlistselection.cpp
index 678ebdf..780d705 100644
--- a/noncore/multimedia/opieplayer2/playlistselection.cpp
+++ b/noncore/multimedia/opieplayer2/playlistselection.cpp
@@ -50,14 +50,6 @@ PlayListSelection::PlayListSelection( QWidget *parent, const char *name )
50 : QListView( parent, name ) 50 : QListView( parent, name )
51{ 51{
52// odebug << "starting playlistselector" << oendl; 52// odebug << "starting playlistselector" << oendl;
53// #ifdef USE_PLAYLIST_BACKGROUND
54// setStaticBackground( TRUE );
55// setBackgroundPixmap( Resource::loadPixmap( "opieplayer/background" ) );
56
57// setBackgroundPixmap( Resource::loadPixmap( "launcher/opielogo" ) );
58// #endif
59// addColumn("Title",236);
60// setAllColumnsShowFocus( TRUE );
61 addColumn( tr( "Playlist Selection" ) ); 53 addColumn( tr( "Playlist Selection" ) );
62 header()->hide(); 54 header()->hide();
63 setSorting( -1, FALSE ); 55 setSorting( -1, FALSE );
@@ -68,15 +60,10 @@ PlayListSelection::~PlayListSelection() {
68} 60}
69 61
70 62
71// #ifdef USE_PLAYLIST_BACKGROUND
72void PlayListSelection::drawBackground( QPainter *p, const QRect &r ) { 63void PlayListSelection::drawBackground( QPainter *p, const QRect &r ) {
73// odebug << "drawBackground" << oendl; 64// odebug << "drawBackground" << oendl;
74 p->fillRect( r, QBrush( white ) ); 65 p->fillRect( r, QBrush( white ) );
75// QImage logo = Resource::loadImage( "launcher/opielogo" );
76// if ( !logo.isNull() )
77// p->drawImage( (width() - logo.width()) / 2, (height() - logo.height()) / 2, logo );
78} 66}
79// #endif
80 67
81 68
82void PlayListSelection::contentsMouseMoveEvent( QMouseEvent *event ) { 69void PlayListSelection::contentsMouseMoveEvent( QMouseEvent *event ) {
@@ -94,7 +81,7 @@ void PlayListSelection::contentsMouseMoveEvent( QMouseEvent *event ) {
94const DocLnk *PlayListSelection::current() { 81const DocLnk *PlayListSelection::current() {
95 PlayListSelectionItem *item = (PlayListSelectionItem *)selectedItem(); 82 PlayListSelectionItem *item = (PlayListSelectionItem *)selectedItem();
96 if ( item ) 83 if ( item )
97 return item->file(); 84 return item->file();
98 return NULL; 85 return NULL;
99} 86}
100 87
@@ -120,7 +107,7 @@ void PlayListSelection::removeSelected() {
120void PlayListSelection::moveSelectedUp() { 107void PlayListSelection::moveSelectedUp() {
121 QListViewItem *item = selectedItem(); 108 QListViewItem *item = selectedItem();
122 if ( item && item->itemAbove() ) 109 if ( item && item->itemAbove() )
123 item->itemAbove()->moveItem( item ); 110 item->itemAbove()->moveItem( item );
124 ensureItemVisible( selectedItem() ); 111 ensureItemVisible( selectedItem() );
125} 112}
126 113
@@ -138,7 +125,7 @@ bool PlayListSelection::prev() {
138 if ( item && item->itemAbove() ) 125 if ( item && item->itemAbove() )
139 setSelected( item->itemAbove(), TRUE ); 126 setSelected( item->itemAbove(), TRUE );
140 else 127 else
141 return FALSE; 128 return FALSE;
142 ensureItemVisible( selectedItem() ); 129 ensureItemVisible( selectedItem() );
143 return TRUE; 130 return TRUE;
144} 131}
@@ -148,7 +135,7 @@ bool PlayListSelection::next() {
148 if ( item && item->itemBelow() ) 135 if ( item && item->itemBelow() )
149 setSelected( item->itemBelow(), TRUE ); 136 setSelected( item->itemBelow(), TRUE );
150 else 137 else
151 return FALSE; 138 return FALSE;
152 ensureItemVisible( selectedItem() ); 139 ensureItemVisible( selectedItem() );
153 return TRUE; 140 return TRUE;
154} 141}
@@ -159,7 +146,7 @@ bool PlayListSelection::first() {
159 if ( item ) 146 if ( item )
160 setSelected( item, TRUE ); 147 setSelected( item, TRUE );
161 else 148 else
162 return FALSE; 149 return FALSE;
163 ensureItemVisible( selectedItem() ); 150 ensureItemVisible( selectedItem() );
164 return TRUE; 151 return TRUE;
165} 152}
@@ -169,27 +156,27 @@ bool PlayListSelection::last() {
169 QListViewItem *prevItem = NULL; 156 QListViewItem *prevItem = NULL;
170 QListViewItem *item = firstChild(); 157 QListViewItem *item = firstChild();
171 while ( ( item = item->nextSibling() ) ) 158 while ( ( item = item->nextSibling() ) )
172 prevItem = item; 159 prevItem = item;
173 if ( prevItem ) 160 if ( prevItem )
174 setSelected( prevItem, TRUE ); 161 setSelected( prevItem, TRUE );
175 else 162 else
176 return FALSE; 163 return FALSE;
177 ensureItemVisible( selectedItem() ); 164 ensureItemVisible( selectedItem() );
178 return TRUE; 165 return TRUE;
179} 166}
180 167
181void PlayListSelection::unSelect() 168void PlayListSelection::unSelect()
182{ 169{
183 //QListViewItem *item = selectedItem();
184 setSelected( currentItem(), FALSE); 170 setSelected( currentItem(), FALSE);
185} 171}
186 172
187void PlayListSelection::writeCurrent( Config& cfg ) { 173void PlayListSelection::writeCurrent( Config& cfg ) {
188 cfg.setGroup("PlayList"); 174 cfg.setGroup("PlayList");
189 QListViewItem *item = selectedItem(); 175 QListViewItem *item = selectedItem();
190 if ( item ) 176 if ( item ) {
191 cfg.writeEntry("current", item->text(0) ); 177 cfg.writeEntry("current", item->text(0) );
192 odebug << item->text(0) << oendl; 178 odebug << item->text(0) << oendl;
179 }
193 180
194} 181}
195 182
@@ -206,6 +193,4 @@ void PlayListSelection::setSelectedItem(const QString &strk ) {
206 return; 193 return;
207 } 194 }
208 } 195 }
209// setSelected( item, TRUE );
210// ensureItemVisible( selectedItem() );
211} 196}
diff --git a/noncore/settings/networksettings2/editconnection.cpp b/noncore/settings/networksettings2/editconnection.cpp
index a9bef65..d948fb9 100644
--- a/noncore/settings/networksettings2/editconnection.cpp
+++ b/noncore/settings/networksettings2/editconnection.cpp
@@ -245,12 +245,13 @@ void EditNetworkSetup::setNetworkSetup( NetworkSetup * NC ) {
245 245
246 if( ! Found ) { 246 if( ! Found ) {
247 // this means that this level is NOT present in collection 247 // this means that this level is NOT present in collection
248 // probably INCOMPATIBEL collection OR Missing plugin 248 // probably INCOMPATIBLE collection OR Missing plugin
249 QString pluginName = NNI ? NNI->nodeClass()->name() : "";
249 QMessageBox::warning( 250 QMessageBox::warning(
250 0, 251 0,
251 tr( "Error presentig NetworkSetup" ), 252 tr( "Error presentig NetworkSetup" ),
252 tr( "<p>Old NetworkSetup or missing plugin \"<i>%1</i>\"</p>" ). 253 tr( "<p>Old NetworkSetup or missing plugin \"<i>%1</i>\"</p>" ).
253 arg(NNI->nodeClass()->name()) ); 254 arg(pluginName) );
254 return; 255 return;
255 } 256 }
256 257
diff --git a/noncore/settings/networksettings2/opietooth2/Opietooth.cpp b/noncore/settings/networksettings2/opietooth2/Opietooth.cpp
index fc30bf8..e23fc9c 100644
--- a/noncore/settings/networksettings2/opietooth2/Opietooth.cpp
+++ b/noncore/settings/networksettings2/opietooth2/Opietooth.cpp
@@ -444,7 +444,7 @@ int OTScan::getDevice( OTPeer *& Peer,
444 bool IsUp = 0; 444 bool IsUp = 0;
445 unsigned int i; 445 unsigned int i;
446 446
447 if( ! OT->isEnabled() ) { 447 if( ! OT || ! OT->isEnabled() ) {
448 QMessageBox::warning( 0, 448 QMessageBox::warning( 0,
449 tr("Scanning problem"), 449 tr("Scanning problem"),
450 tr("Bluetooth not enabled" ) 450 tr("Bluetooth not enabled" )