summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/TODO1
-rw-r--r--libopie/ofileselector.cc10
2 files changed, 6 insertions, 5 deletions
diff --git a/libopie/TODO b/libopie/TODO
index a4e1ada..d49910c 100644
--- a/libopie/TODO
+++ b/libopie/TODO
@@ -1,19 +1,20 @@
- xmltree done
- tododb
- set Alarms
- multiple categories
- Attendees
- OFileSelector
+ - fix the weird view change bug delete m_pseudoLayout crash
- DocLnk when not in Document Mode ( and vice versa )
- MultipleDocuments
- TreeView have a own OFileSelectorItem for this
- IconView add a QIconView to the widgetstack
- Move OFileSelectorItem to it's own files
- add functions to access the member variables
- debug
- new Dirs created inside the listview
- Clickable labels?
Harlekin you wanted them in the libs? \ No newline at end of file
diff --git a/libopie/ofileselector.cc b/libopie/ofileselector.cc
index 7451c1b..968541a 100644
--- a/libopie/ofileselector.cc
+++ b/libopie/ofileselector.cc
@@ -575,50 +575,50 @@ void OFileSelector::slotMimeCheck(const QString &view ){
m_select = new FileSelector(view == "All" ? QString::null : view
, m_stack, "fileselector", FALSE, FALSE );
m_stack->addWidget( m_select, NORMAL );
m_stack->raiseWidget( NORMAL );
}else{
reparse();
}
}
void OFileSelector::slotViewCheck(const QString &view ){
qWarning("changed: show %s", view.latin1() );
// if the current view is the one
QString currMime = m_mimeCheck->currentText();
if( view == QString::fromLatin1("Documents") ){
// get the mimetype now
// check if we're the current widget and return
if( m_View != 0) { // delete 0 shouldn't crash but it did :(
delete m_View;
delete m_boxToolbar;
delete m_homeButton;
delete m_docButton;
delete m_location;
delete m_up;
delete m_pseudo;
- if(m_pseudoLayout!=0 )
- delete m_pseudoLayout;
+ //if(m_pseudoLayout!=0 )
+// delete m_pseudoLayout;
}
m_View = 0;
m_boxToolbar = 0;
m_homeButton = 0;
m_docButton = 0;
m_location = 0;
m_up = 0;
m_pseudo = 0;
m_pseudoLayout = 0;
delete m_select;
m_select = new FileSelector( currMime == "All" ? QString::null : currMime,
m_stack,"fileselector", FALSE, FALSE );
m_stack->addWidget( m_select, NORMAL );
m_mimeCheck->clear();
m_selector = NORMAL;
updateMimes();
m_mimeCheck->insertStringList( m_mimetypes );
m_stack->raiseWidget( NORMAL );
connect(m_select, SIGNAL(fileSelected( const DocLnk &) ), this, SLOT(slotFileBridgeSelected(const DocLnk &) ) );
}else if(view == QString::fromLatin1("Files") ){
// remove from the stack
delete m_select;
@@ -654,51 +654,51 @@ void OFileSelector::updateMimes() // lets check which mode is active
m_mimetypes.append("All" );
if( m_selector == NORMAL ){
DocLnkSet set;
Global::findDocuments(&set, QString::null );
QListIterator<DocLnk> dit( set.children() );
for ( ; dit.current(); ++dit ) {
if( !m_mimetypes.contains((*dit)->type() ) )
m_mimetypes.append( (*dit)->type() );
}
}else{
// should be allreday updatet
;
}
};
void OFileSelector::initializeListView()
{
// just to make sure but clean it up better FIXME
delete m_View;
m_View = 0;
delete m_boxToolbar;
delete m_homeButton;
delete m_docButton;
delete m_location;
delete m_up;
- delete m_pseudo;
- if(m_pseudoLayout!=0 ) // why did you overload malloc
- delete m_pseudoLayout;
+ //delete m_pseudo;
+ //if(m_pseudoLayout!=0 ) // why did you overload malloc
+ //delete m_pseudoLayout;
m_boxToolbar = 0;
m_homeButton = 0;
m_docButton = 0;
m_location = 0;
m_up = 0;
m_pseudo = 0;
m_pseudoLayout = 0;
// time for the toolbar
m_pseudo = new QWidget(m_stack, "Pseudo Widget");
m_pseudoLayout = new QVBoxLayout(m_pseudo );
if(m_shTool ){
m_boxToolbar = new QHBoxLayout( );
m_boxToolbar->setAutoAdd( true );
m_location = new QComboBox(m_pseudo );
m_up = new QPushButton(Resource::loadIconSet("up"),"", m_pseudo,"cdUpButton");
m_up->setMinimumSize( QSize( 20, 20 ) );
m_up->setMaximumSize( QSize( 20, 20 ) );
connect(m_up ,SIGNAL(clicked()),this,SLOT(cdUP() ) );
m_up->setFlat(TRUE);
m_homeButton = new QPushButton(Resource::loadIconSet("home") , "", m_pseudo);
m_homeButton->setMinimumSize( QSize( 20, 20 ) );
m_homeButton->setMaximumSize( QSize( 20, 20 ) );