-rw-r--r-- | libopie/ofileselector/ofileselector.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libopie/ofileselector/ofileselector.cpp b/libopie/ofileselector/ofileselector.cpp index 7f38f5b..4ab744c 100644 --- a/libopie/ofileselector/ofileselector.cpp +++ b/libopie/ofileselector/ofileselector.cpp | |||
@@ -241,20 +241,20 @@ bool OFileSelector::cd(const QString &path ) | |||
241 | void OFileSelector::setSelector(int mode ) | 241 | void OFileSelector::setSelector(int mode ) |
242 | { | 242 | { |
243 | QString text; | 243 | QString text; |
244 | switch( mode ){ | 244 | switch( mode ){ |
245 | case Normal: | 245 | case Normal: |
246 | text = tr("Documents"); | 246 | text = tr("Documents"); |
247 | break; | 247 | break; |
248 | case Extended: | 248 | case Extended: |
249 | text = tr("Files"); | 249 | text = tr("List View"); |
250 | break; | 250 | break; |
251 | case ExtendedAll: | 251 | case ExtendedAll: |
252 | text = tr("All Files"); | 252 | text = tr("All List View"); |
253 | break; | 253 | break; |
254 | } | 254 | } |
255 | slotViewCheck( text ); | 255 | slotViewCheck( text ); |
256 | } | 256 | } |
257 | 257 | ||
258 | void OFileSelector::setPopupFactory(OPopupMenuFactory */*popup*/ ) | 258 | void OFileSelector::setPopupFactory(OPopupMenuFactory */*popup*/ ) |
259 | { | 259 | { |
260 | /* m_custom = popup; | 260 | /* m_custom = popup; |
@@ -461,16 +461,18 @@ void OFileSelector::locationComboChanged() | |||
461 | void OFileSelector::init() | 461 | void OFileSelector::init() |
462 | { | 462 | { |
463 | initFactory(); | 463 | initFactory(); |
464 | m_lay = new QVBoxLayout( this ); | 464 | m_lay = new QVBoxLayout( this ); |
465 | m_lay->setSpacing(0 ); | 465 | m_lay->setSpacing(0 ); |
466 | 466 | ||
467 | /* take care of the main view... */ | 467 | /* take care of the main view... */ |
468 | initToolbar(); | 468 | initToolbar(); |
469 | //if( m_shChooser ) // the Chooser for the view and Mimetypes | ||
470 | initializeChooser(); | ||
469 | 471 | ||
470 | /* initialize the file lister */ | 472 | /* initialize the file lister */ |
471 | if( m_selector == Normal ){ | 473 | if( m_selector == Normal ){ |
472 | QString mime; | 474 | QString mime; |
473 | if (!m_autoMime) { | 475 | if (!m_autoMime) { |
474 | if (!m_mimetypes.isEmpty() ) { | 476 | if (!m_mimetypes.isEmpty() ) { |
475 | QMap<QString, QStringList>::Iterator it; | 477 | QMap<QString, QStringList>::Iterator it; |
476 | it = m_mimetypes.begin(); // cause we're in the init | 478 | it = m_mimetypes.begin(); // cause we're in the init |
@@ -483,19 +485,16 @@ void OFileSelector::init() | |||
483 | } | 485 | } |
484 | 486 | ||
485 | if( m_shLne ) // the LineEdit with the current FileName | 487 | if( m_shLne ) // the LineEdit with the current FileName |
486 | initializeName(); | 488 | initializeName(); |
487 | 489 | ||
488 | if( m_shPerm ) // the Permission QCheckBox | 490 | if( m_shPerm ) // the Permission QCheckBox |
489 | initializePerm(); | 491 | initializePerm(); |
490 | 492 | ||
491 | if( m_shChooser ) // the Chooser for the view and Mimetypes | ||
492 | initializeChooser(); | ||
493 | |||
494 | if( m_shYesNo ) // the Yes No button row | 493 | if( m_shYesNo ) // the Yes No button row |
495 | initializeYes( ); | 494 | initializeYes( ); |
496 | 495 | ||
497 | if (m_selector != Normal ) | 496 | if (m_selector != Normal ) |
498 | reparse(); | 497 | reparse(); |
499 | } | 498 | } |
500 | void OFileSelector::updateMimes() | 499 | void OFileSelector::updateMimes() |
501 | { | 500 | { |
@@ -951,16 +950,17 @@ void OFileSelector::setView( const QString& lis ) { | |||
951 | if ( lis == tr("Documents") ) { | 950 | if ( lis == tr("Documents") ) { |
952 | m_selector = Normal; | 951 | m_selector = Normal; |
953 | delete m_lister; | 952 | delete m_lister; |
954 | delete m_fileView; | 953 | delete m_fileView; |
955 | m_lister = 0l; | 954 | m_lister = 0l; |
956 | m_fileView = 0l; | 955 | m_fileView = 0l; |
957 | initializeOldSelector(); | 956 | initializeOldSelector(); |
958 | }else { | 957 | }else { |
958 | qWarning("lis %s", lis.latin1() ); | ||
959 | QString list; | 959 | QString list; |
960 | 960 | ||
961 | delete m_lister; | 961 | delete m_lister; |
962 | delete m_fileView; | 962 | delete m_fileView; |
963 | delete m_select; | 963 | delete m_select; |
964 | m_lister =0l; | 964 | m_lister =0l; |
965 | m_fileView = 0l; | 965 | m_fileView = 0l; |
966 | m_select = 0l; | 966 | m_select = 0l; |
@@ -1087,14 +1087,14 @@ void OFileSelector::initializeOldSelector() { | |||
1087 | * with QString::null to get the default | 1087 | * with QString::null to get the default |
1088 | * setView with either Files or All Files | 1088 | * setView with either Files or All Files |
1089 | * depending on Extended | 1089 | * depending on Extended |
1090 | */ | 1090 | */ |
1091 | void OFileSelector::initializeView() { | 1091 | void OFileSelector::initializeView() { |
1092 | setLister(QString::null); | 1092 | setLister(QString::null); |
1093 | fillList(); | 1093 | fillList(); |
1094 | if (m_selector == Extended ) { | 1094 | if (m_selector == Extended ) { |
1095 | setView( tr("Files") ); | 1095 | setView( tr("List View") ); |
1096 | }else{ | 1096 | }else{ |
1097 | setView( tr("All Files") ); | 1097 | setView( tr("All List View") ); |
1098 | } | 1098 | } |
1099 | } | 1099 | } |
1100 | 1100 | ||