-rw-r--r-- | libopie/ofileselector.cc | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/libopie/ofileselector.cc b/libopie/ofileselector.cc index 3c3a6c4..b3aacd6 100644 --- a/libopie/ofileselector.cc +++ b/libopie/ofileselector.cc | |||
@@ -176,30 +176,26 @@ void OFileSelector::reread() | |||
176 | { | 176 | { |
177 | if( m_selector == NORMAL ){ | 177 | if( m_selector == NORMAL ){ |
178 | setNewVisible( m_shNew ); // make it a initializeSelector | 178 | setNewVisible( m_shNew ); // make it a initializeSelector |
179 | }else if ( m_selector == EXTENDED || m_selector == EXTENDED_ALL ){ | 179 | }else if ( m_selector == EXTENDED || m_selector == EXTENDED_ALL ){ |
180 | reparse(); | 180 | reparse(); |
181 | //}else{ | 181 | //}else{ |
182 | //; | 182 | //; |
183 | } | 183 | } |
184 | } | 184 | } |
185 | 185 | ||
186 | const DocLnk *OFileSelector::selected() | 186 | const DocLnk *OFileSelector::selected() |
187 | { | 187 | { |
188 | if( m_selector == NORMAL ){ | ||
189 | return m_select->selected(); | ||
190 | }else{ | ||
191 | DocLnk *lnk = new DocLnk(selectedDocument() ); | 188 | DocLnk *lnk = new DocLnk(selectedDocument() ); |
192 | return lnk; | 189 | return lnk; |
193 | } | ||
194 | } | 190 | } |
195 | 191 | ||
196 | void OFileSelector::setYesCancelVisible( bool show ) | 192 | void OFileSelector::setYesCancelVisible( bool show ) |
197 | { | 193 | { |
198 | initializeYes(); // FIXME if YesCancel is not shown we will initialize it to hide it :( | 194 | initializeYes(); // FIXME if YesCancel is not shown we will initialize it to hide it :( |
199 | m_shYesNo = show; | 195 | m_shYesNo = show; |
200 | if( m_shYesNo ) | 196 | if( m_shYesNo ) |
201 | m_boxOk->show(); | 197 | m_boxOk->show(); |
202 | else | 198 | else |
203 | m_boxOk->hide(); | 199 | m_boxOk->hide(); |
204 | 200 | ||
205 | } | 201 | } |
@@ -317,27 +313,26 @@ QString text; | |||
317 | void OFileSelector::setPopupMenu(QPopupMenu *popup ) | 313 | void OFileSelector::setPopupMenu(QPopupMenu *popup ) |
318 | { | 314 | { |
319 | m_custom = popup; | 315 | m_custom = popup; |
320 | m_showPopup = true; | 316 | m_showPopup = true; |
321 | } | 317 | } |
322 | 318 | ||
323 | //void OFileSelector::updateL | 319 | //void OFileSelector::updateL |
324 | 320 | ||
325 | QString OFileSelector::selectedName() const | 321 | QString OFileSelector::selectedName() const |
326 | { | 322 | { |
327 | QString name; | 323 | QString name; |
328 | if( m_selector == NORMAL ){ | 324 | if( m_selector == NORMAL ){ |
329 | const DocLnk *lnk = m_select->selected(); | 325 | DocLnk lnk = m_select->selectedDocument(); |
330 | name = lnk->file(); | 326 | name = lnk.file(); |
331 | delete lnk; | ||
332 | }else if( m_selector == EXTENDED || m_selector == EXTENDED_ALL ){ | 327 | }else if( m_selector == EXTENDED || m_selector == EXTENDED_ALL ){ |
333 | if ( m_shLne ) { | 328 | if ( m_shLne ) { |
334 | name = m_currentDir + "/" +m_edit->text(); | 329 | name = m_currentDir + "/" +m_edit->text(); |
335 | }else{ | 330 | }else{ |
336 | QListViewItem *item = m_View->currentItem(); | 331 | QListViewItem *item = m_View->currentItem(); |
337 | if( item != 0 ) | 332 | if( item != 0 ) |
338 | name = m_currentDir + "/" + item->text( 1 ); | 333 | name = m_currentDir + "/" + item->text( 1 ); |
339 | } | 334 | } |
340 | }else { // installed view | 335 | }else { // installed view |
341 | ; | 336 | ; |
342 | } | 337 | } |
343 | return name; | 338 | return name; |
@@ -392,27 +387,25 @@ int OFileSelector::fileCount() | |||
392 | case EXTENDED_ALL: | 387 | case EXTENDED_ALL: |
393 | default: | 388 | default: |
394 | count = m_View->childCount(); | 389 | count = m_View->childCount(); |
395 | break; | 390 | break; |
396 | } | 391 | } |
397 | return count; | 392 | return count; |
398 | } | 393 | } |
399 | DocLnk OFileSelector::selectedDocument() const | 394 | DocLnk OFileSelector::selectedDocument() const |
400 | { | 395 | { |
401 | DocLnk lnk; | 396 | DocLnk lnk; |
402 | switch( m_selector ){ | 397 | switch( m_selector ){ |
403 | case NORMAL:{ | 398 | case NORMAL:{ |
404 | const DocLnk *lnk2 = m_select->selected(); | 399 | lnk = m_select->selectedDocument(); |
405 | lnk = DocLnk(*lnk2 ); // copy | ||
406 | delete lnk2; | ||
407 | break; | 400 | break; |
408 | } | 401 | } |
409 | case EXTENDED: | 402 | case EXTENDED: |
410 | case EXTENDED_ALL: | 403 | case EXTENDED_ALL: |
411 | default: | 404 | default: |
412 | lnk = DocLnk( selectedName() ); // new DocLnk | 405 | lnk = DocLnk( selectedName() ); // new DocLnk |
413 | break; | 406 | break; |
414 | } | 407 | } |
415 | return lnk; | 408 | return lnk; |
416 | } | 409 | } |
417 | QValueList<DocLnk> OFileSelector::selectedDocuments() const | 410 | QValueList<DocLnk> OFileSelector::selectedDocuments() const |
418 | { | 411 | { |