-rw-r--r-- | libopie/ofileselector.cc | 40 |
1 files changed, 8 insertions, 32 deletions
diff --git a/libopie/ofileselector.cc b/libopie/ofileselector.cc index c3a3514..7451c1b 100644 --- a/libopie/ofileselector.cc +++ b/libopie/ofileselector.cc | |||
@@ -76,14 +76,14 @@ namespace { | |||
76 | }; | 76 | }; |
77 | 77 | ||
78 | 78 | ||
79 | OFileSelector::OFileSelector(QWidget *wid, int mode, int selector, const QString &dirName, | 79 | OFileSelector::OFileSelector(QWidget *wid, int mode, int selector, const QString &dirName, |
80 | const QString &fileName, const QStringList &mimetypes ) : QWidget( wid ) | 80 | const QString &fileName, const QStringList &mimetypes ) : QWidget( wid ) |
81 | { | 81 | { |
82 | 82 | if(wid!=0) | |
83 | resize(wid->width(),wid->height()); | 83 | resize(wid->width(),wid->height()); |
84 | m_selector = selector; | 84 | m_selector = selector; |
85 | m_currentDir = dirName; | 85 | m_currentDir = dirName; |
86 | m_name = fileName; | 86 | m_name = fileName; |
87 | m_mimetypes = mimetypes; | 87 | m_mimetypes = mimetypes; |
88 | if( mimetypes.isEmpty() ) | 88 | if( mimetypes.isEmpty() ) |
89 | m_autoMime = true; | 89 | m_autoMime = true; |
@@ -191,12 +191,13 @@ void OFileSelector::init() | |||
191 | updateMimes(); | 191 | updateMimes(); |
192 | m_select = new FileSelector( currMime == "All" ? QString::null : currMime , m_stack, "fileselector", FALSE, FALSE ); | 192 | m_select = new FileSelector( currMime == "All" ? QString::null : currMime , m_stack, "fileselector", FALSE, FALSE ); |
193 | m_stack->addWidget(m_select, NORMAL ); | 193 | m_stack->addWidget(m_select, NORMAL ); |
194 | m_lay->addWidget(m_stack ); | 194 | m_lay->addWidget(m_stack ); |
195 | m_stack->raiseWidget(NORMAL ); | 195 | m_stack->raiseWidget(NORMAL ); |
196 | connect(m_select, SIGNAL(fileSelected( const DocLnk &) ), this, SLOT(slotFileBridgeSelected(const DocLnk &) ) ); | 196 | connect(m_select, SIGNAL(fileSelected( const DocLnk &) ), this, SLOT(slotFileBridgeSelected(const DocLnk &) ) ); |
197 | m_pseudoLayout = 0l; | ||
197 | }else { | 198 | }else { |
198 | initializeListView(); | 199 | initializeListView(); |
199 | } | 200 | } |
200 | 201 | ||
201 | if(m_shLne ){ | 202 | if(m_shLne ){ |
202 | initializeName(); | 203 | initializeName(); |
@@ -592,13 +593,14 @@ void OFileSelector::slotViewCheck(const QString &view ){ | |||
592 | delete m_boxToolbar; | 593 | delete m_boxToolbar; |
593 | delete m_homeButton; | 594 | delete m_homeButton; |
594 | delete m_docButton; | 595 | delete m_docButton; |
595 | delete m_location; | 596 | delete m_location; |
596 | delete m_up; | 597 | delete m_up; |
597 | delete m_pseudo; | 598 | delete m_pseudo; |
598 | delete m_pseudoLayout; | 599 | if(m_pseudoLayout!=0 ) |
600 | delete m_pseudoLayout; | ||
599 | } | 601 | } |
600 | m_View = 0; | 602 | m_View = 0; |
601 | m_boxToolbar = 0; | 603 | m_boxToolbar = 0; |
602 | m_homeButton = 0; | 604 | m_homeButton = 0; |
603 | m_docButton = 0; | 605 | m_docButton = 0; |
604 | m_location = 0; | 606 | m_location = 0; |
@@ -621,52 +623,25 @@ void OFileSelector::slotViewCheck(const QString &view ){ | |||
621 | // remove from the stack | 623 | // remove from the stack |
622 | delete m_select; | 624 | delete m_select; |
623 | m_select = 0; | 625 | m_select = 0; |
624 | delete m_View; | 626 | delete m_View; |
625 | m_View = 0; | 627 | m_View = 0; |
626 | 628 | ||
627 | delete m_boxToolbar; | 629 | |
628 | delete m_homeButton; | ||
629 | delete m_docButton; | ||
630 | delete m_location; | ||
631 | delete m_up; | ||
632 | delete m_pseudo; | ||
633 | delete m_pseudoLayout; | ||
634 | m_boxToolbar = 0; | ||
635 | m_homeButton = 0; | ||
636 | m_docButton = 0; | ||
637 | m_location = 0; | ||
638 | m_up = 0; | ||
639 | m_pseudo = 0; | ||
640 | m_pseudoLayout = 0; | ||
641 | 630 | ||
642 | m_selector = EXTENDED; | 631 | m_selector = EXTENDED; |
643 | // create the ListView or IconView | 632 | // create the ListView or IconView |
644 | initializeListView(); | 633 | initializeListView(); |
645 | 634 | ||
646 | reparse(); | 635 | reparse(); |
647 | }else if(view == QString::fromLatin1("All Files") ) { | 636 | }else if(view == QString::fromLatin1("All Files") ) { |
648 | // remove from the stack | 637 | // remove from the stack |
649 | delete m_select; | 638 | delete m_select; |
650 | m_select = 0; | 639 | m_select = 0; |
651 | delete m_View; | 640 | delete m_View; |
652 | m_View = 0; | 641 | m_View = 0; |
653 | delete m_boxToolbar; | ||
654 | delete m_homeButton; | ||
655 | delete m_docButton; | ||
656 | delete m_location; | ||
657 | delete m_up; | ||
658 | delete m_pseudo; | ||
659 | delete m_pseudoLayout; | ||
660 | m_boxToolbar = 0; | ||
661 | m_homeButton = 0; | ||
662 | m_docButton = 0; | ||
663 | m_location = 0; | ||
664 | m_up = 0; | ||
665 | m_pseudo = 0; | ||
666 | m_pseudoLayout = 0; | ||
667 | 642 | ||
668 | m_selector = EXTENDED_ALL; | 643 | m_selector = EXTENDED_ALL; |
669 | initializeListView(); | 644 | initializeListView(); |
670 | reparse(); | 645 | reparse(); |
671 | }; | 646 | }; |
672 | }; | 647 | }; |
@@ -698,13 +673,14 @@ void OFileSelector::initializeListView() | |||
698 | delete m_boxToolbar; | 673 | delete m_boxToolbar; |
699 | delete m_homeButton; | 674 | delete m_homeButton; |
700 | delete m_docButton; | 675 | delete m_docButton; |
701 | delete m_location; | 676 | delete m_location; |
702 | delete m_up; | 677 | delete m_up; |
703 | delete m_pseudo; | 678 | delete m_pseudo; |
704 | delete m_pseudoLayout; | 679 | if(m_pseudoLayout!=0 ) // why did you overload malloc |
680 | delete m_pseudoLayout; | ||
705 | m_boxToolbar = 0; | 681 | m_boxToolbar = 0; |
706 | m_homeButton = 0; | 682 | m_homeButton = 0; |
707 | m_docButton = 0; | 683 | m_docButton = 0; |
708 | m_location = 0; | 684 | m_location = 0; |
709 | m_up = 0; | 685 | m_up = 0; |
710 | m_pseudo = 0; | 686 | m_pseudo = 0; |