-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 | |||
@@ -70,26 +70,26 @@ namespace { | |||
70 | break; | 70 | break; |
71 | } | 71 | } |
72 | } | 72 | } |
73 | return index; | 73 | return index; |
74 | } | 74 | } |
75 | 75 | ||
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; |
90 | 90 | ||
91 | m_mode = mode; | 91 | m_mode = mode; |
92 | m_shTool = true; | 92 | m_shTool = true; |
93 | m_shPerm = true; | 93 | m_shPerm = true; |
94 | m_shLne = true; | 94 | m_shLne = true; |
95 | m_shChooser = true; | 95 | m_shChooser = true; |
@@ -185,24 +185,25 @@ void OFileSelector::init() | |||
185 | m_stack = new QWidgetStack(this, "wstack" ); | 185 | m_stack = new QWidgetStack(this, "wstack" ); |
186 | if( m_selector == NORMAL ){ | 186 | if( m_selector == NORMAL ){ |
187 | QString currMime; | 187 | QString currMime; |
188 | if( m_mimeCheck != 0 ) | 188 | if( m_mimeCheck != 0 ) |
189 | currMime = m_mimeCheck->currentText(); | 189 | currMime = m_mimeCheck->currentText(); |
190 | 190 | ||
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(); |
203 | } | 204 | } |
204 | 205 | ||
205 | if(m_shPerm ){ | 206 | if(m_shPerm ){ |
206 | m_checkPerm = new QCheckBox(tr("Set Permission"), this, "Permission" ); | 207 | m_checkPerm = new QCheckBox(tr("Set Permission"), this, "Permission" ); |
207 | m_checkPerm->setChecked( false ); | 208 | m_checkPerm->setChecked( false ); |
208 | m_lay->addWidget(m_checkPerm ); | 209 | m_lay->addWidget(m_checkPerm ); |
@@ -586,25 +587,26 @@ void OFileSelector::slotViewCheck(const QString &view ){ | |||
586 | QString currMime = m_mimeCheck->currentText(); | 587 | QString currMime = m_mimeCheck->currentText(); |
587 | if( view == QString::fromLatin1("Documents") ){ | 588 | if( view == QString::fromLatin1("Documents") ){ |
588 | // get the mimetype now | 589 | // get the mimetype now |
589 | // check if we're the current widget and return | 590 | // check if we're the current widget and return |
590 | if( m_View != 0) { // delete 0 shouldn't crash but it did :( | 591 | if( m_View != 0) { // delete 0 shouldn't crash but it did :( |
591 | delete m_View; | 592 | delete m_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; |
605 | m_up = 0; | 607 | m_up = 0; |
606 | m_pseudo = 0; | 608 | m_pseudo = 0; |
607 | m_pseudoLayout = 0; | 609 | m_pseudoLayout = 0; |
608 | 610 | ||
609 | delete m_select; | 611 | delete m_select; |
610 | m_select = new FileSelector( currMime == "All" ? QString::null : currMime, | 612 | m_select = new FileSelector( currMime == "All" ? QString::null : currMime, |
@@ -615,64 +617,37 @@ void OFileSelector::slotViewCheck(const QString &view ){ | |||
615 | updateMimes(); | 617 | updateMimes(); |
616 | m_mimeCheck->insertStringList( m_mimetypes ); | 618 | m_mimeCheck->insertStringList( m_mimetypes ); |
617 | m_stack->raiseWidget( NORMAL ); | 619 | m_stack->raiseWidget( NORMAL ); |
618 | connect(m_select, SIGNAL(fileSelected( const DocLnk &) ), this, SLOT(slotFileBridgeSelected(const DocLnk &) ) ); | 620 | connect(m_select, SIGNAL(fileSelected( const DocLnk &) ), this, SLOT(slotFileBridgeSelected(const DocLnk &) ) ); |
619 | 621 | ||
620 | }else if(view == QString::fromLatin1("Files") ){ | 622 | }else if(view == QString::fromLatin1("Files") ){ |
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 | }; |
673 | 648 | ||
674 | 649 | ||
675 | void OFileSelector::updateMimes() // lets check which mode is active | 650 | void OFileSelector::updateMimes() // lets check which mode is active |
676 | // check the current dir for items then | 651 | // check the current dir for items then |
677 | { | 652 | { |
678 | m_mimetypes.clear(); | 653 | m_mimetypes.clear(); |
@@ -692,25 +667,26 @@ void OFileSelector::updateMimes() // lets check which mode is active | |||
692 | }; | 667 | }; |
693 | void OFileSelector::initializeListView() | 668 | void OFileSelector::initializeListView() |
694 | { | 669 | { |
695 | // just to make sure but clean it up better FIXME | 670 | // just to make sure but clean it up better FIXME |
696 | delete m_View; | 671 | delete m_View; |
697 | m_View = 0; | 672 | m_View = 0; |
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; |
711 | m_pseudoLayout = 0; | 687 | m_pseudoLayout = 0; |
712 | // time for the toolbar | 688 | // time for the toolbar |
713 | m_pseudo = new QWidget(m_stack, "Pseudo Widget"); | 689 | m_pseudo = new QWidget(m_stack, "Pseudo Widget"); |
714 | m_pseudoLayout = new QVBoxLayout(m_pseudo ); | 690 | m_pseudoLayout = new QVBoxLayout(m_pseudo ); |
715 | if(m_shTool ){ | 691 | if(m_shTool ){ |
716 | m_boxToolbar = new QHBoxLayout( ); | 692 | m_boxToolbar = new QHBoxLayout( ); |