-rw-r--r-- | libopie/ofileselector/ofileselector.cpp | 345 | ||||
-rw-r--r-- | libopie/ofileselector/ofileselector.h | 125 | ||||
-rw-r--r-- | libopie/ofileselector/olister.h | 1 |
3 files changed, 226 insertions, 245 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 @@ -32,3 +32,5 @@ #include "ofileview.h" +#include "ofileselectormain.h" #include "ofileselector.h" +#include "olocallister.h" #include "olister.h" @@ -103,19 +105,4 @@ 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{ - m_new->show(); - } + if (m_new ) + m_new->show(); } @@ -124,7 +111,5 @@ void OFileSelector::setCloseVisible( bool visible ) m_shClose = visible; - if( m_selector == Normal ){ - setNewVisible( m_shNew ); // yeah baby - }else{ + + if( m_close ) m_close->show(); - } } @@ -132,7 +117,6 @@ void OFileSelector::reread() { - if( m_selector == Normal ){ - setNewVisible( m_shNew ); // make it a initializeSelector - }else { - reparse(); - } + if( m_selector == Normal ) + initializeOldSelector(); + else + reparse(); } @@ -149,2 +133,3 @@ void OFileSelector::setYesCancelVisible( bool show ) m_shYesNo = show; + if( m_shYesNo ) @@ -158,3 +143,2 @@ void OFileSelector::setToolbarVisible( bool show ) m_shTool = show; - initializeListView(); // FIXME see above waste of memory @@ -176,2 +160,3 @@ void OFileSelector::setPermissionBarVisible( bool show ) initializePerm(); + if( m_shPerm ) @@ -187,5 +172,5 @@ void OFileSelector::setLineEditVisible( bool show ) }else{ - if( m_shLne && m_boxName != 0 ){ // check if we showed before this is the way to go - m_boxName->hide(); - } + // check if we showed before this is the way to go + if( m_shLne && m_boxName != 0 ) + m_boxName->hide(); } @@ -198,7 +183,8 @@ void OFileSelector::setChooserVisible( bool show ) initializeChooser(); - if( m_shChooser ){ - m_boxView->hide(); - }else{ - m_boxView->show(); - } + + if( m_shChooser ) + m_boxView->hide(); + else + m_boxView->show(); + } @@ -228,6 +214,7 @@ void OFileSelector::setMode(int mode) // FIXME do direct raising } -void OFileSelector::setShowDirs(bool ) +void OFileSelector::setShowDirs(bool dir) { - m_dir = true; - reparse(); + m_dir = dir; + if ( m_selector != Fileselector ) + reparse(); } @@ -236,3 +223,5 @@ void OFileSelector::setCaseSensetive(bool caSe ) m_case = caSe; - reparse(); + + if ( m_selector != Fileselector ) + reparse(); } @@ -382,29 +371,14 @@ 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 ); - m_selector = 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(); */ } @@ -415,5 +389,6 @@ QString OFileSelector::currentMimeType() const{ QString currentText; - if (m_shChooser ) + if (m_shChooser && m_mimeCheck ) currentText = m_mimeCheck->currentText(); + qWarning("CurrentText" + currentText ); if (tr("All") == currentText ) return QString::null; @@ -424,3 +399,3 @@ QString OFileSelector::currentMimeType() const{ it = m_mimetypes.find( currentText ); - if ( it == m_mimetypes.end() ) { + if ( it != m_mimetypes.end() ) { mime = it.data().join(";"); @@ -435,25 +410,4 @@ 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); - - 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(); + updateMimes(); @@ -461,3 +415,2 @@ void OFileSelector::slotMimeCheck(const QString &mime) m_mimeCheck->setCurrentItem(indexByString( m_mimeCheck, mime) ); - //} }else{ // others @@ -526,3 +479,7 @@ void OFileSelector::init() - m_stack = new QWidgetStack( this ); + /* take care of the main view... */ + initToolbar(); + + /* initialize the file lister */ + initLister(); if( m_selector == Normal ){ @@ -536,21 +493,6 @@ 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 @@ -605,2 +547,5 @@ void OFileSelector::initVars() m_showPopup = false; + m_mainView = 0l; + m_fileView = 0l; + m_lister = 0l; @@ -625,3 +570,2 @@ void OFileSelector::initVars() m_select = 0; - m_stack = 0; m_lay = 0; @@ -632,3 +576,2 @@ void OFileSelector::initVars() m_boxView = 0; - m_custom = 0; m_edit = 0; @@ -716,2 +659,3 @@ void OFileSelector::initializeChooser() /* update to custom views */ + updateMimeCheck(); @@ -724,57 +668,82 @@ 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 - - // toolbar members - { - // location QComboBox - m_location = new QComboBox( m_boxToolbar ); - m_location->setEditable( TRUE ); - m_location->setDuplicatesEnabled( FALSE ); - connect( m_location, SIGNAL(activated(const QString &) ), - this, SLOT( slotLocationActivated(const QString &) ) ); - connect( m_location->lineEdit(), SIGNAL(returnPressed() ), - this, SLOT(locationComboChanged() ) ); - // UP Button - m_up = new QPushButton(Resource::loadIconSet("up"),"", - m_boxToolbar,"cdUpButton"); - m_up->setFixedSize( QSize( 20, 20 ) ); - connect(m_up ,SIGNAL(clicked()),this,SLOT(cdUP() ) ); - m_up->setFlat(TRUE); - - // Home Button - m_homeButton = new QPushButton(Resource::loadIconSet("home") , - "", 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->setFixedSize( QSize( 20, 20 ) ); - connect(m_homeButton,SIGNAL(clicked()),this,SLOT(slotDoc() ) ); - m_docButton->setFlat(TRUE); - - // Close button - m_close = new QPushButton( Resource::loadIconSet( "close"), "", - m_boxToolbar ); - connect( m_close, SIGNAL(clicked() ), this, SIGNAL(closeMe() ) ); - m_close->setFixedSize( 20, 20 ); - - m_boxToolbar->setFixedHeight( 20 ); - m_pseudoLayout->addWidget(m_boxToolbar ); - - // let;s fill the Location ComboBox - StorageInfo storage; - const QList<FileSystem> &fs = storage.fileSystems(); - QListIterator<FileSystem> it ( fs ); - for( ; it.current(); ++it ){ + m_boxToolbar->setSpacing( 0 ); + + // tool bar members now + m_location = new QComboBox( m_boxToolbar ); + m_location->setEditable( TRUE ); + m_location->setDuplicatesEnabled( FALSE ); + connect( m_location, SIGNAL(activated(const QString& ) ), + this, SLOT(slotLocationActivated(const QString& )) ); + connect( m_location->lineEdit(), SIGNAL(returnPressed() ) , + this, SLOT(locationComboChanged() ) ); + + // UP Button + m_up = new QPushButton( Resource::loadIconSet("up"), QString::null, + m_boxToolbar, "cdUpButton" ); + m_up->setFixedSize( QSize(20, 20 ) ); + connect( m_up, SIGNAL( clicked() ), this, SLOT(cdUP() ) ); + m_up->setFlat( TRUE ); + + // Home Button + m_homeButton = new QPushButton(Resource::loadIconSet("home"), + 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"), + QString::null, m_boxToolbar, + "docsButton" ); + m_docButton->setFixedSize( QSize(20, 20 ) ); + m_docButton->setFlat( true ); + connect( m_docButton, SIGNAL(clicked() ), + this, SLOT(slotDoc() ) ); + + // close button + m_close = new QPushButton( Resource::loadIconSet( "close"), "", + m_boxToolbar ); + connect( m_close, SIGNAL(clicked() ), this, SIGNAL(closeMe() ) ); + m_close->setFixedSize( 20, 20 ); + + m_boxToolbar->setFixedHeight( 20 ); + 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; + const QList<FileSystem> &fs = storage.fileSystems(); + QListIterator<FileSystem> it ( fs ); + for( ; it.current(); ++it ){ const QString disk = (*it)->name(); @@ -782,25 +751,7 @@ void OFileSelector::initializeListView() m_location->insertItem(path+ "<-"+disk ); - } - int count = m_location->count(); - 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 + } + int count = m_location->count(); + m_location->insertItem( m_currentDir ); + m_location->setCurrentItem( count ); - // m_pseudoLayout->addWidget( m_View, 288 ); - m_stack->addWidget( m_pseudo, Extended ); - } } @@ -1004,6 +955,6 @@ void OFileSelector::reparse() OFileView* OFileSelector::currentView() { - return 0l; + return m_fileView; } OFileView* OFileSelector::currentView() const{ - return 0l; + return m_fileView; } @@ -1049,3 +1000,23 @@ 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 @@ -71,2 +71,3 @@ class OFileView; class OLister; +class OFileSelectorMain; // @@ -110,3 +111,3 @@ class OFileSelector : public QWidget { */ - enum Selector{Normal=0, Extended = 1, ExtendedAll =2 }; + enum Selector{Normal=0, Extended = 1, ExtendedAll = 2}; @@ -344,2 +345,4 @@ class OFileSelector : public QWidget { QPixmap pixmap( const QString& ); + /* our tool bar */ + QWidget* toolBar(); @@ -371,2 +374,5 @@ class OFileSelector : public QWidget { + OFileSelectorMain* m_mainView; + OLister* m_lister; + OFileView* m_fileView; FileSelector* m_select; @@ -392,45 +398,43 @@ class OFileSelector : public QWidget { QString m_name; - QMap<QString, QStringList> m_mimetypes; - - - QWidgetStack *m_stack; - QVBoxLayout *m_lay; - QGridLayout *m_Oselector; - - QHBox *m_boxToolbar; - QHBox *m_boxOk; - QHBox *m_boxName; - QHBox *m_boxView; - - QPopupMenu *m_custom; - - QLineEdit *m_edit; - QLabel *m_fnLabel; - - bool m_shClose : 1; - bool m_shNew : 1; - bool m_shTool : 1; - bool m_shPerm : 1; - bool m_shLne : 1; - bool m_shChooser : 1; - bool m_shYesNo : 1; - bool m_boCheckPerm : 1; - bool m_autoMime : 1; - bool m_case : 1; - bool m_dir : 1; - bool m_files : 1; - bool m_showPopup : 1; - - void initVars(); - - void delItems(); - void initializeName(); - void initializeYes(); - void initializeChooser(); - void initializeListView(); - void initializePerm(); - void initPics(); - bool compliesMime(const QString &path, - const QString &mime); - bool compliesMime(const QString& mime ); + + QMap<QString, QStringList> m_mimetypes; + + QVBoxLayout *m_lay; + QGridLayout *m_Oselector; + + QHBox *m_boxToolbar; + QHBox *m_boxOk; + QHBox *m_boxName; + QHBox *m_boxView; + + + QLineEdit *m_edit; + QLabel *m_fnLabel; + + bool m_shClose : 1; + bool m_shNew : 1; + bool m_shTool : 1; + bool m_shPerm : 1; + bool m_shLne : 1; + bool m_shChooser : 1; + bool m_shYesNo : 1; + bool m_boCheckPerm : 1; + bool m_autoMime : 1; + bool m_case : 1; + bool m_dir : 1; + bool m_files : 1; + bool m_showPopup : 1; + bool m_showHidden : 1; + + void initVars(); + + void delItems(); + void initializeName(); + void initializeYes(); + void initializeChooser(); + void initializePerm(); + void initPics(); + bool compliesMime(const QString &path, + const QString &mime); + bool compliesMime(const QString& mime ); /** @@ -438,4 +442,9 @@ class OFileSelector : public QWidget { */ - void updateMimeCheck(); + void updateMimeCheck(); + void initializeOldSelector(); + void initLister(); + void initToolbar(); + void initLocations(); + void initializeView() {}; // FIXME /** @@ -443,17 +452,17 @@ class OFileSelector : public QWidget { */ - QString currentMimeType()const; - class OFileSelectorPrivate; - OFileSelectorPrivate *d; - static QMap<QString,QPixmap> *m_pixmaps; + QString currentMimeType()const; + class OFileSelectorPrivate; + OFileSelectorPrivate *d; + static QMap<QString,QPixmap> *m_pixmaps; private slots: - void slotFileSelected(const QString & ); // not really meant to be a slot - void slotFileBridgeSelected( const DocLnk & ); - // listview above - // popup below - virtual void slotDelete(); - virtual void cdUP(); - virtual void slotHome(); - virtual void slotDoc(); - virtual void slotNavigate( ); + void slotFileSelected(const QString & ); // not really meant to be a slot + void slotFileBridgeSelected( const DocLnk & ); + // listview above + // popup below + virtual void slotDelete(); + virtual void cdUP(); + virtual void slotHome(); + virtual void slotDoc(); + virtual void slotNavigate( ); 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 @@ -6,2 +6,3 @@ #include <qstring.h> +#include <qstringlist.h> |