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
@@ -41,69 +41,56 @@ public:
41 41
42 const DocLnk *file() const { return fl; } 42 const DocLnk *file() const { return fl; }
43 43
44private: 44private:
45 const DocLnk *fl; 45 const DocLnk *fl;
46}; 46};
47 47
48 48
49PlayListSelection::PlayListSelection( QWidget *parent, const char *name ) 49PlayListSelection::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 );
64} 56}
65 57
66 58
67PlayListSelection::~PlayListSelection() { 59PlayListSelection::~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 ) {
83 if ( event->state() == QMouseEvent::LeftButton ) { 70 if ( event->state() == QMouseEvent::LeftButton ) {
84 QListViewItem *currentItem = selectedItem(); 71 QListViewItem *currentItem = selectedItem();
85 QListViewItem *itemUnder = itemAt( QPoint( event->pos().x(), event->pos().y() - contentsY() ) ); 72 QListViewItem *itemUnder = itemAt( QPoint( event->pos().x(), event->pos().y() - contentsY() ) );
86 if ( currentItem && currentItem->itemAbove() == itemUnder ) 73 if ( currentItem && currentItem->itemAbove() == itemUnder )
87 moveSelectedUp(); 74 moveSelectedUp();
88 else if ( currentItem && currentItem->itemBelow() == itemUnder ) 75 else if ( currentItem && currentItem->itemBelow() == itemUnder )
89 moveSelectedDown(); 76 moveSelectedDown();
90 } 77 }
91} 78}
92 79
93 80
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
101 88
102void PlayListSelection::addToSelection( const DocLnk &lnk ) { 89void PlayListSelection::addToSelection( const DocLnk &lnk ) {
103 PlayListSelectionItem *item = new PlayListSelectionItem( this, new DocLnk( lnk ) ); 90 PlayListSelectionItem *item = new PlayListSelectionItem( this, new DocLnk( lnk ) );
104 QListViewItem *current = selectedItem(); 91 QListViewItem *current = selectedItem();
105 if ( current ) 92 if ( current )
106 item->moveItem( current ); 93 item->moveItem( current );
107 setSelected( item, TRUE ); 94 setSelected( item, TRUE );
108 ensureItemVisible( selectedItem() ); 95 ensureItemVisible( selectedItem() );
109} 96}
@@ -111,101 +98,99 @@ void PlayListSelection::addToSelection( const DocLnk &lnk ) {
111 98
112void PlayListSelection::removeSelected() { 99void PlayListSelection::removeSelected() {
113 QListViewItem *item = selectedItem(); 100 QListViewItem *item = selectedItem();
114 delete item; 101 delete item;
115 setSelected( currentItem(), TRUE ); 102 setSelected( currentItem(), TRUE );
116 ensureItemVisible( selectedItem() ); 103 ensureItemVisible( selectedItem() );
117} 104}
118 105
119 106
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
127 114
128void PlayListSelection::moveSelectedDown() { 115void PlayListSelection::moveSelectedDown() {
129 QListViewItem *item = selectedItem(); 116 QListViewItem *item = selectedItem();
130 if ( item && item->itemBelow() ) 117 if ( item && item->itemBelow() )
131 item->moveItem( item->itemBelow() ); 118 item->moveItem( item->itemBelow() );
132 ensureItemVisible( selectedItem() ); 119 ensureItemVisible( selectedItem() );
133} 120}
134 121
135 122
136bool PlayListSelection::prev() { 123bool PlayListSelection::prev() {
137 QListViewItem *item = selectedItem(); 124 QListViewItem *item = selectedItem();
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}
145 132
146bool PlayListSelection::next() { 133bool PlayListSelection::next() {
147 QListViewItem *item = selectedItem(); 134 QListViewItem *item = selectedItem();
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}
155 142
156 143
157bool PlayListSelection::first() { 144bool PlayListSelection::first() {
158 QListViewItem *item = firstChild(); 145 QListViewItem *item = firstChild();
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}
166 153
167 154
168bool PlayListSelection::last() { 155bool 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
196void PlayListSelection::setSelectedItem(const QString &strk ) { 183void PlayListSelection::setSelectedItem(const QString &strk ) {
197 184
198 unSelect(); 185 unSelect();
199 QListViewItemIterator it( this ); 186 QListViewItemIterator it( this );
200 for ( ; it.current(); ++it ) { 187 for ( ; it.current(); ++it ) {
201// odebug << it.current()->text(0) << oendl; 188// odebug << it.current()->text(0) << oendl;
202 if( strk == it.current()->text(0)) { 189 if( strk == it.current()->text(0)) {
203// odebug << "We have a match "+strk << oendl; 190// odebug << "We have a match "+strk << oendl;
204 setSelected( it.current(), TRUE); 191 setSelected( it.current(), TRUE);
205 ensureItemVisible( it.current() ); 192 ensureItemVisible( it.current() );
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
@@ -236,30 +236,31 @@ void EditNetworkSetup::setNetworkSetup( NetworkSetup * NC ) {
236 // check its children 236 // check its children
237 Found = 1; 237 Found = 1;
238 it = it->firstChild(); 238 it = it->firstChild();
239 NNI = SelectedNodes->next(); 239 NNI = SelectedNodes->next();
240 // do not bother to check other items 240 // do not bother to check other items
241 break; 241 break;
242 } 242 }
243 it = it->nextSibling(); 243 it = it->nextSibling();
244 } 244 }
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
257 // it now contains selected radio 258 // it now contains selected radio
258 NN = (*Mapping)[it]; 259 NN = (*Mapping)[it];
259 } else { 260 } else {
260 // automatic selection 261 // automatic selection
261 if( NNI == 0 || it->text(0) != NNI->nodeClass()->name() ) { 262 if( NNI == 0 || it->text(0) != NNI->nodeClass()->name() ) {
262 // should exist and be the same 263 // should exist and be the same
263 if( NNI ) { 264 if( NNI ) {
264 QMessageBox::warning( 265 QMessageBox::warning(
265 0, 266 0,
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
@@ -435,25 +435,25 @@ OTScan::~OTScan() {
435 } 435 }
436} 436}
437 437
438// static scan dialog function 438// static scan dialog function
439int OTScan::getDevice( OTPeer *& Peer, 439int OTScan::getDevice( OTPeer *& Peer,
440 int & Channel, 440 int & Channel,
441 OTGateway * OT, 441 OTGateway * OT,
442 const UUIDVector & Filter, 442 const UUIDVector & Filter,
443 QWidget* Parent ) { 443 QWidget* Parent ) {
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" )
451 ); 451 );
452 return QDialog::Rejected; 452 return QDialog::Rejected;
453 } 453 }
454 454
455 // check if bluetooth is up 455 // check if bluetooth is up
456 OTDriverList & DL = OT->getDriverList(); 456 OTDriverList & DL = OT->getDriverList();
457 for( i = 0; 457 for( i = 0;
458 i < DL.count(); 458 i < DL.count();
459 i ++ ) { 459 i ++ ) {