-rw-r--r-- | libopie/ofileselector/ofileselector.cpp | 249 | ||||
-rw-r--r-- | libopie/ofileselector/ofileselector.h | 17 | ||||
-rw-r--r-- | libopie/ofileselector/olister.h | 1 |
3 files changed, 124 insertions, 143 deletions
diff --git a/libopie/ofileselector/ofileselector.cpp b/libopie/ofileselector/ofileselector.cpp index 98b61f7..c52aa62 100644 --- a/libopie/ofileselector/ofileselector.cpp +++ b/libopie/ofileselector/ofileselector.cpp @@ -31,5 +31,7 @@ #include "ofileview.h" +#include "ofileselectormain.h" #include "ofileselector.h" +#include "olocallister.h" #include "olister.h" @@ -102,39 +104,21 @@ void OFileSelector::setNewVisible( bool visible ) { m_shNew = visible; - if( m_selector == Normal ){ - delete m_select; - // we need to initialize but keep the selected mimetype - QString mime = currentMimeType(); - m_select = new FileSelector( mime , - m_stack, "fileselector", - m_shNew, m_shClose); - - connect(m_select, SIGNAL(fileSelected( const DocLnk & ) ), - this, SLOT( slotFileBridgeSelected(const DocLnk & ) ) ); - connect(m_select, SIGNAL(closeMe() ), - this, SIGNAL(closeMe() ) ); - //connect to close me and other signals as well - m_stack->addWidget( m_select, Normal ); - }else{ + if (m_new ) m_new->show(); } -} void OFileSelector::setCloseVisible( bool visible ) { m_shClose = visible; - if( m_selector == Normal ){ - setNewVisible( m_shNew ); // yeah baby - }else{ + + if( m_close ) m_close->show(); } -} void OFileSelector::reread() { - if( m_selector == Normal ){ - setNewVisible( m_shNew ); // make it a initializeSelector - }else { + if( m_selector == Normal ) + initializeOldSelector(); + else reparse(); } -} const DocLnk *OFileSelector::selected() @@ -148,4 +132,5 @@ void OFileSelector::setYesCancelVisible( bool show ) initializeYes(); // FIXME if YesCancel is not shown we will initialize it to hide it :( m_shYesNo = show; + if( m_shYesNo ) m_boxOk->show(); @@ -157,5 +142,4 @@ void OFileSelector::setToolbarVisible( bool show ) { m_shTool = show; - initializeListView(); // FIXME see above waste of memory if(!m_shTool ){ @@ -175,4 +159,5 @@ void OFileSelector::setPermissionBarVisible( bool show ) m_shPerm = show; initializePerm(); + if( m_shPerm ) m_checkPerm->show(); @@ -186,8 +171,8 @@ void OFileSelector::setLineEditVisible( bool show ) m_boxName->show(); }else{ - if( m_shLne && m_boxName != 0 ){ // check if we showed before this is the way to go + // check if we showed before this is the way to go + if( m_shLne && m_boxName != 0 ) m_boxName->hide(); } - } m_shLne = show; } @@ -197,9 +182,10 @@ void OFileSelector::setChooserVisible( bool show ) m_shChooser = show; initializeChooser(); - if( m_shChooser ){ + + if( m_shChooser ) m_boxView->hide(); - }else{ + else m_boxView->show(); - } + } @@ -227,7 +213,8 @@ void OFileSelector::setMode(int mode) // FIXME do direct raising return; } -void OFileSelector::setShowDirs(bool ) +void OFileSelector::setShowDirs(bool dir) { - m_dir = true; + m_dir = dir; + if ( m_selector != Fileselector ) reparse(); } @@ -235,4 +222,6 @@ void OFileSelector::setCaseSensetive(bool caSe ) { m_case = caSe; + + if ( m_selector != Fileselector ) reparse(); } @@ -381,31 +370,16 @@ void OFileSelector::slotViewCheck(const QString &sel) { if( sel == tr("Documents" ) ){ - if( m_select == 0 ){ - // autMime? fix cause now we use All and not the current - // yes currentMime fixes that for us - QString mime = currentMimeType(); - m_select = new FileSelector(mime, - m_stack, "fileselector", - m_shNew, m_shClose); - connect(m_select, SIGNAL(fileSelected( const DocLnk & ) ), - this, SLOT( slotFileBridgeSelected(const DocLnk & ) ) ); - connect(m_select, SIGNAL(closeMe() ), - this, SIGNAL(closeMe() ) ); - //connect to close me and other signals as well - - m_stack->addWidget( m_select, Normal ); - } - m_stack->raiseWidget( Normal ); + initializeOldSelector(); m_selector = Normal; + }else if( sel == tr("Files") ){ m_selector = Extended; - initializeListView(); - reparse(); - m_stack->raiseWidget( Extended ); + + // FIXME call the factory + //reparse(); }else if( sel == tr("All Files") ){ m_selector = ExtendedAll; - initializeListView(); - reparse(); - m_stack->raiseWidget( Extended ); // same widget other QFileFilter +/* see above + reparse(); */ } } @@ -414,7 +388,8 @@ QString OFileSelector::currentMimeType() const{ QString mime; QString currentText; - if (m_shChooser ) + if (m_shChooser && m_mimeCheck ) currentText = m_mimeCheck->currentText(); + qWarning("CurrentText" + currentText ); if (tr("All") == currentText ) return QString::null; else if (currentText.isEmpty() ) { @@ -423,5 +398,5 @@ QString OFileSelector::currentMimeType() const{ QMap<QString, QStringList>::ConstIterator it; it = m_mimetypes.find( currentText ); - if ( it == m_mimetypes.end() ) { + if ( it != m_mimetypes.end() ) { mime = it.data().join(";"); }else{ @@ -434,31 +409,9 @@ void OFileSelector::slotMimeCheck(const QString &mime) { if( m_selector == Normal ){ - //if( m_autoMime ){ - QString newMimeType; - if (mime != tr("All") ) { - QMap<QString, QStringList>::Iterator it; - it = m_mimetypes.find(mime); - if ( it != m_mimetypes.end() ) { - newMimeType = it.data().join(";"); - }else{ - newMimeType = mime; - } - } - delete m_select; - m_select = new FileSelector( newMimeType, - m_stack, "fileselector", - m_shNew, m_shClose); + initializeOldSelector(); - connect(m_select, SIGNAL(fileSelected( const DocLnk & ) ), - this, SLOT( slotFileBridgeSelected(const DocLnk & ) ) ); - connect(m_select, SIGNAL(closeMe() ), - this, SIGNAL(closeMe() ) ); - //connect to close me and other signals as well - m_stack->addWidget( m_select, Normal ); - m_stack->raiseWidget( Normal ); updateMimes(); updateMimeCheck(); m_mimeCheck->setCurrentItem(indexByString( m_mimeCheck, mime) ); - //} }else{ // others qWarning("Mime %s", mime.latin1() ); @@ -525,5 +478,9 @@ void OFileSelector::init() m_lay->setSpacing(0 ); - m_stack = new QWidgetStack( this ); + /* take care of the main view... */ + initToolbar(); + + /* initialize the file lister */ + initLister(); if( m_selector == Normal ){ QString mime; @@ -535,23 +492,8 @@ void OFileSelector::init() } } - m_select = new FileSelector(mime, - m_stack, "fileselector", - m_shNew, m_shClose); - - connect(m_select, SIGNAL(fileSelected( const DocLnk & ) ), - this, SLOT( slotFileBridgeSelected(const DocLnk & ) ) ); - connect(m_select, SIGNAL(closeMe() ), - this, SIGNAL( closeMe() ) ); - //connect to close me and other signals as well - - m_stack->addWidget( m_select, Normal ); - m_stack->raiseWidget( Normal ); - }else{ // we're in init so it will be EXTENDED or EXTENDED_ALL - // and initializeListview will take care of those - // toolbar get's generade in initializeListView - initializeListView( ); // will raise the widget as well - m_stack->raiseWidget( Extended ); + initializeOldSelector(); + }else{ + initializeView(); } - m_lay->addWidget( m_stack, 100 ); // add to the layout 10 = stretch if( m_shLne ) // the LineEdit with the current FileName @@ -604,4 +546,7 @@ void OFileSelector::initVars() m_files = true; m_showPopup = false; + m_mainView = 0l; + m_fileView = 0l; + m_lister = 0l; if(m_pixmaps == 0 ) // init the pixmaps @@ -624,5 +569,4 @@ void OFileSelector::initVars() m_pseudoLayout = 0; m_select = 0; - m_stack = 0; m_lay = 0; m_Oselector = 0; @@ -631,5 +575,4 @@ void OFileSelector::initVars() m_boxName = 0; m_boxView = 0; - m_custom = 0; m_edit = 0; m_fnLabel = 0; @@ -715,4 +658,5 @@ void OFileSelector::initializeChooser() m_viewCheck->insertItem( tr("All Files") ); /* update to custom views */ + updateMimeCheck(); @@ -723,18 +667,17 @@ void OFileSelector::initializeChooser() } } -void OFileSelector::initializeListView() -{ - qWarning("initializeListView"); - if( m_pseudo == 0 ){ - qWarning("init"); - m_pseudo = new QWidget( m_stack, "Pseudo Widget"); +/* generate the buttons for the toolbar */ +void OFileSelector::initToolbar() { + m_mainView = new OFileSelectorMain( this ); + + /* now generate the tool bar */ + qWarning( "toolbar" ); + m_pseudo = new QWidget( m_mainView, "Pseudo Widget" ); m_pseudoLayout = new QVBoxLayout( m_pseudo ); - // toolbar + m_boxToolbar = new QHBox( m_pseudo ); - m_boxToolbar->setSpacing(0 ); // next to each other please + m_boxToolbar->setSpacing( 0 ); - // toolbar members - { - // location QComboBox + // tool bar members now m_location = new QComboBox( m_boxToolbar ); m_location->setEditable( TRUE ); @@ -744,6 +687,7 @@ void OFileSelector::initializeListView() connect( m_location->lineEdit(), SIGNAL(returnPressed() ), this, SLOT(locationComboChanged() ) ); + // UP Button - m_up = new QPushButton(Resource::loadIconSet("up"),"", + m_up = new QPushButton( Resource::loadIconSet("up"), QString::null, m_boxToolbar,"cdUpButton"); m_up->setFixedSize( QSize( 20, 20 ) ); @@ -753,16 +697,19 @@ void OFileSelector::initializeListView() // Home Button m_homeButton = new QPushButton(Resource::loadIconSet("home") , - "", m_boxToolbar); + QString::null, m_boxToolbar ); m_homeButton->setFixedSize( QSize( 20, 20 ) ); connect(m_homeButton,SIGNAL(clicked()),this,SLOT(slotHome() ) ); m_homeButton->setFlat(TRUE); + // Documents Button - m_docButton = new QPushButton(Resource::loadIconSet("DocsIcon"),"", - m_boxToolbar,"docsButton"); + m_docButton = new QPushButton( Resource::loadIconSet("DocsIcon"), + QString::null, m_boxToolbar, + "docsButton" ); m_docButton->setFixedSize( QSize( 20, 20 ) ); - connect(m_homeButton,SIGNAL(clicked()),this,SLOT(slotDoc() ) ); - m_docButton->setFlat(TRUE); + m_docButton->setFlat( true ); + connect( m_docButton, SIGNAL(clicked() ), + this, SLOT(slotDoc() ) ); - // Close button + // close button m_close = new QPushButton( Resource::loadIconSet( "close"), "", m_boxToolbar ); @@ -773,4 +720,26 @@ void OFileSelector::initializeListView() m_pseudoLayout->addWidget(m_boxToolbar ); + /* init the locations */ + initLocations(); + + if( !m_shTool ){ + m_location->hide( ); + m_up->hide( ); + m_homeButton->hide( ); + m_docButton->hide( ); + } + if(!m_shClose ) + m_close->hide(); + + m_mainView->setToolbar( m_pseudo ); + m_lay->addWidget( m_mainView, 100 ); +} +/* initialize the OLocalLister */ +void OFileSelector::initLister() { + m_lister = new OLocalLister(this); +} +/* put default locations into the bar */ +void OFileSelector::initLocations () { + // let;s fill the Location ComboBox StorageInfo storage; @@ -785,23 +754,5 @@ void OFileSelector::initializeListView() m_location->insertItem( m_currentDir ); m_location->setCurrentItem( count ); - // due to the New and Close button we can not simply hide m_boxToolBar to not show it - if( !m_shTool ){ - m_location->hide( ); - m_up->hide( ); - m_homeButton->hide( ); - m_docButton->hide( ); - } - if(!m_shClose ) - m_close->hide(); - //if(!m_shNew) - //m_close->hide(); - - } // off toolbar - // the Main ListView - // make a QWidgetStack first so Views can share the Toolbar - // m_pseudoLayout->addWidget( m_View, 288 ); - m_stack->addWidget( m_pseudo, Extended ); - } } void OFileSelector::initializePerm() @@ -1003,8 +954,8 @@ void OFileSelector::reparse() OFileView* OFileSelector::currentView() { - return 0l; + return m_fileView; } OFileView* OFileSelector::currentView() const{ - return 0l; + return m_fileView; } int OFileSelector::filter() { @@ -1048,4 +999,24 @@ QPixmap OFileSelector::pixmap( const QString& s ) { } OLister* OFileSelector::currentLister()const { - return 0l; + return m_lister; +} +void OFileSelector::initializeOldSelector() { + qWarning("initializeOldSelector"); + + delete m_select; + + // we need to initialize but keep the selected mimetype + /* we default not to show close and new buttons */ + QString mime = currentMimeType(); + qWarning("MimeType " + mime ); + m_select = new FileSelector( mime , + m_mainView, "fileselector", + FALSE, FALSE); + + connect(m_select, SIGNAL(fileSelected( const DocLnk & ) ), + this, SLOT( slotFileBridgeSelected(const DocLnk & ) ) ); + connect(m_select, SIGNAL(closeMe() ), + this, SIGNAL(closeMe() ) ); + //connect to close me and other signals as well + m_mainView->setWidget( m_select ); } diff --git a/libopie/ofileselector/ofileselector.h b/libopie/ofileselector/ofileselector.h index a7b363f..bf9a26b 100644 --- a/libopie/ofileselector/ofileselector.h +++ b/libopie/ofileselector/ofileselector.h @@ -70,4 +70,5 @@ class QHBox; class OFileView; class OLister; +class OFileSelectorMain; // @@ -343,4 +344,6 @@ class OFileSelector : public QWidget { int sorting(); QPixmap pixmap( const QString& ); + /* our tool bar */ + QWidget* toolBar(); signals: @@ -370,4 +373,7 @@ class OFileSelector : public QWidget { private: + OFileSelectorMain* m_mainView; + OLister* m_lister; + OFileView* m_fileView; FileSelector* m_select; int m_mode, m_selector; @@ -391,8 +397,7 @@ class OFileSelector : public QWidget { QString m_currentDir; QString m_name; - QMap<QString, QStringList> m_mimetypes; + QMap<QString, QStringList> m_mimetypes; - QWidgetStack *m_stack; QVBoxLayout *m_lay; QGridLayout *m_Oselector; @@ -403,5 +408,4 @@ class OFileSelector : public QWidget { QHBox *m_boxView; - QPopupMenu *m_custom; QLineEdit *m_edit; @@ -421,4 +425,5 @@ class OFileSelector : public QWidget { bool m_files : 1; bool m_showPopup : 1; + bool m_showHidden : 1; void initVars(); @@ -428,5 +433,4 @@ class OFileSelector : public QWidget { void initializeYes(); void initializeChooser(); - void initializeListView(); void initializePerm(); void initPics(); @@ -439,4 +443,9 @@ class OFileSelector : public QWidget { void updateMimeCheck(); + void initializeOldSelector(); + void initLister(); + void initToolbar(); + void initLocations(); + void initializeView() {}; // FIXME /** * Returns the current mimetype diff --git a/libopie/ofileselector/olister.h b/libopie/ofileselector/olister.h index 081b876..ef61cab 100644 --- a/libopie/ofileselector/olister.h +++ b/libopie/ofileselector/olister.h @@ -5,4 +5,5 @@ #include <qmap.h> #include <qstring.h> +#include <qstringlist.h> class OFileSelector; |