author | harlekin <harlekin> | 2003-04-18 21:15:41 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2003-04-18 21:15:41 (UTC) |
commit | c667951bfeaa17136bc828380e38062e150b2762 (patch) (unidiff) | |
tree | f9f9e5c9dbad7a91977f78b3ad413e8d8266e523 | |
parent | 486db3bff8680e22bade85c348a7673f847a6f37 (diff) | |
download | opie-c667951bfeaa17136bc828380e38062e150b2762.zip opie-c667951bfeaa17136bc828380e38062e150b2762.tar.gz opie-c667951bfeaa17136bc828380e38062e150b2762.tar.bz2 |
removed exerimental stuff I accidently commited
-rw-r--r-- | core/launcher/launcher.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp index 3eb561a..bcc2495 100644 --- a/core/launcher/launcher.cpp +++ b/core/launcher/launcher.cpp | |||
@@ -755,127 +755,127 @@ void Launcher::loadDocs() // ok here comes a hack belonging to Global:: | |||
755 | 755 | ||
756 | for ( ; it.current(); ++it ) { | 756 | for ( ; it.current(); ++it ) { |
757 | if ( (*it)->disk() == "/dev/mtdblock6" || (*it)->disk() == "tmpfs" ) { | 757 | if ( (*it)->disk() == "/dev/mtdblock6" || (*it)->disk() == "tmpfs" ) { |
758 | tmp = new DocLnkSet( (*it)->path(), QString::null ); | 758 | tmp = new DocLnkSet( (*it)->path(), QString::null ); |
759 | docsFolder->appendFrom( *tmp ); | 759 | docsFolder->appendFrom( *tmp ); |
760 | delete tmp; | 760 | delete tmp; |
761 | } | 761 | } |
762 | } | 762 | } |
763 | 763 | ||
764 | Config mediumCfg( "medium"); | 764 | Config mediumCfg( "medium"); |
765 | mediumCfg.setGroup("main"); | 765 | mediumCfg.setGroup("main"); |
766 | // a) -zecke we don't want to check | 766 | // a) -zecke we don't want to check |
767 | if(!mediumCfg.readBoolEntry("use", true ) ) | 767 | if(!mediumCfg.readBoolEntry("use", true ) ) |
768 | return; | 768 | return; |
769 | 769 | ||
770 | // find out wich filesystems are new in this round | 770 | // find out wich filesystems are new in this round |
771 | // We will do this by having a timestamp inside each mountpoint | 771 | // We will do this by having a timestamp inside each mountpoint |
772 | // if the current timestamp doesn't match this is a new file system and | 772 | // if the current timestamp doesn't match this is a new file system and |
773 | // come up with our MediumMountGui :) let the hacking begin | 773 | // come up with our MediumMountGui :) let the hacking begin |
774 | int stamp = uidgen.generate(); | 774 | int stamp = uidgen.generate(); |
775 | 775 | ||
776 | QString newStamp = QString::number( stamp ); // generates newtime Stamp | 776 | QString newStamp = QString::number( stamp ); // generates newtime Stamp |
777 | 777 | ||
778 | // b) | 778 | // b) |
779 | if( mediumCfg.readBoolEntry("global", true ) ){ | 779 | if( mediumCfg.readBoolEntry("global", true ) ){ |
780 | QString mime = configToMime(&mediumCfg).join(";"); | 780 | QString mime = configToMime(&mediumCfg).join(";"); |
781 | for( it.toFirst(); it.current(); ++it ){ | 781 | for( it.toFirst(); it.current(); ++it ){ |
782 | if( (*it)->isRemovable() ){ | 782 | if( (*it)->isRemovable() ){ |
783 | tmp = new DocLnkSet( (*it)->path(), mime ); | 783 | tmp = new DocLnkSet( (*it)->path(), mime ); |
784 | docsFolder->appendFrom( *tmp ); | 784 | docsFolder->appendFrom( *tmp ); |
785 | delete tmp; | 785 | delete tmp; |
786 | } | 786 | } |
787 | } // done | 787 | } // done |
788 | return; // save the else | 788 | return; // save the else |
789 | } | 789 | } |
790 | // c) zecke | 790 | // c) zecke |
791 | for ( it.toFirst(); it.current(); ++it ) { | 791 | for ( it.toFirst(); it.current(); ++it ) { |
792 | if ( (*it)->isRemovable() ) { // let's find out if we should search on it | 792 | if ( (*it)->isRemovable() ) { // let's find out if we should search on it |
793 | Config cfg( (*it)->path() + "/.opiestorage.cf", Config::File); | 793 | Config cfg( (*it)->path() + "/.opiestorage.cf", Config::File); |
794 | cfg.setGroup("main"); | 794 | cfg.setGroup("main"); |
795 | QString stamp = cfg.readEntry("timestamp", QDateTime::currentDateTime().toString() ); | 795 | QString stamp = cfg.readEntry("timestamp", QDateTime::currentDateTime().toString() ); |
796 | /** This medium is uptodate | 796 | /** This medium is uptodate |
797 | */ | 797 | */ |
798 | if( stamp == m_timeStamp ){ // ok we know this card | 798 | if( stamp == m_timeStamp ){ // ok we know this card |
799 | cfg.writeEntry("timestamp", newStamp ); //just write a new timestamp | 799 | cfg.writeEntry("timestamp", newStamp ); //just write a new timestamp |
800 | // we need to scan the list now. Hopefully the cache will be there | 800 | // we need to scan the list now. Hopefully the cache will be there |
801 | // read the mimetypes from the config and search for documents | 801 | // read the mimetypes from the config and search for documents |
802 | QStringList mimetypes = configToMime( &cfg); | 802 | QStringList mimetypes = configToMime( &cfg); |
803 | qApp->processEvents(); | 803 | //qApp->processEvents(); |
804 | Global::statusMessage( tr( "Searching documents" ) ); | 804 | Global::statusMessage( tr( "Searching documents" ) ); |
805 | tmp = new DocLnkSet( (*it)->path(), mimetypes.join(";") ); | 805 | tmp = new DocLnkSet( (*it)->path(), mimetypes.join(";") ); |
806 | docsFolder->appendFrom( *tmp ); | 806 | docsFolder->appendFrom( *tmp ); |
807 | delete tmp; | 807 | delete tmp; |
808 | 808 | ||
809 | }else{ // come up with the gui cause this a new card | 809 | }else{ // come up with the gui cause this a new card |
810 | MediumMountGui medium(&cfg, (*it)->path() ); | 810 | MediumMountGui medium(&cfg, (*it)->path() ); |
811 | if( medium.check() ){ // we did not ask before or ask again is off | 811 | if( medium.check() ){ // we did not ask before or ask again is off |
812 | /** c2) */ | 812 | /** c2) */ |
813 | if( medium.exec() ){ // he clicked yes so search it | 813 | if( medium.exec() ){ // he clicked yes so search it |
814 | // speicher | 814 | // speicher |
815 | //cfg.read(); // cause of a race we need to reread - fixed | 815 | //cfg.read(); // cause of a race we need to reread - fixed |
816 | cfg.setGroup("main"); | 816 | cfg.setGroup("main"); |
817 | cfg.writeEntry("timestamp", newStamp ); | 817 | cfg.writeEntry("timestamp", newStamp ); |
818 | cfg.write(); | 818 | cfg.write(); |
819 | 819 | ||
820 | qApp->processEvents(); | 820 | //qApp->processEvents(); |
821 | tmp = new DocLnkSet( (*it)->path(), medium.mimeTypes().join(";" ) ); | 821 | tmp = new DocLnkSet( (*it)->path(), medium.mimeTypes().join(";" ) ); |
822 | docsFolder->appendFrom( *tmp ); | 822 | docsFolder->appendFrom( *tmp ); |
823 | delete tmp; | 823 | delete tmp; |
824 | }// no else | 824 | }// no else |
825 | /** c1) */ | 825 | /** c1) */ |
826 | }else{ // we checked | 826 | }else{ // we checked |
827 | // do something different see what we need to do | 827 | // do something different see what we need to do |
828 | // let's see if we should check the device | 828 | // let's see if we should check the device |
829 | cfg.setGroup("main" ); | 829 | cfg.setGroup("main" ); |
830 | bool check = cfg.readBoolEntry("autocheck", true ); | 830 | bool check = cfg.readBoolEntry("autocheck", true ); |
831 | if( check ){ // find the documents | 831 | if( check ){ // find the documents |
832 | 832 | ||
833 | qApp->processEvents(); | 833 | //qApp->processEvents(); |
834 | Global::statusMessage( tr( "Searching documents" ) ); | 834 | Global::statusMessage( tr( "Searching documents" ) ); |
835 | tmp = new DocLnkSet( (*it)->path(), configToMime(&cfg ).join(";") ); | 835 | tmp = new DocLnkSet( (*it)->path(), configToMime(&cfg ).join(";") ); |
836 | docsFolder->appendFrom( *tmp ); | 836 | docsFolder->appendFrom( *tmp ); |
837 | delete tmp; | 837 | delete tmp; |
838 | } | 838 | } |
839 | } | 839 | } |
840 | } | 840 | } |
841 | } | 841 | } |
842 | } | 842 | } |
843 | m_timeStamp = newStamp; | 843 | m_timeStamp = newStamp; |
844 | owait->hide(); | 844 | owait->hide(); |
845 | delete owait; | 845 | delete owait; |
846 | } | 846 | } |
847 | 847 | ||
848 | void Launcher::updateTabs() | 848 | void Launcher::updateTabs() |
849 | { | 849 | { |
850 | MimeType::updateApplications(); // ### reads all applnks twice | 850 | MimeType::updateApplications(); // ### reads all applnks twice |
851 | 851 | ||
852 | delete rootFolder; | 852 | delete rootFolder; |
853 | rootFolder = new AppLnkSet( MimeType::appsFolderName() ); | 853 | rootFolder = new AppLnkSet( MimeType::appsFolderName() ); |
854 | 854 | ||
855 | loadDocs(); | 855 | loadDocs(); |
856 | 856 | ||
857 | tabs->initializeCategories(rootFolder, docsFolder, storage->fileSystems()); | 857 | tabs->initializeCategories(rootFolder, docsFolder, storage->fileSystems()); |
858 | } | 858 | } |
859 | 859 | ||
860 | void Launcher::updateDocs() | 860 | void Launcher::updateDocs() |
861 | { | 861 | { |
862 | loadDocs(); | 862 | loadDocs(); |
863 | tabs->updateDocs(docsFolder,storage->fileSystems()); | 863 | tabs->updateDocs(docsFolder,storage->fileSystems()); |
864 | } | 864 | } |
865 | 865 | ||
866 | void Launcher::viewSelected(const QString& s) | 866 | void Launcher::viewSelected(const QString& s) |
867 | { | 867 | { |
868 | setCaption( s + tr(" - Launcher") ); | 868 | setCaption( s + tr(" - Launcher") ); |
869 | } | 869 | } |
870 | 870 | ||
871 | void Launcher::nextView() | 871 | void Launcher::nextView() |
872 | { | 872 | { |
873 | tabs->nextTab(); | 873 | tabs->nextTab(); |
874 | } | 874 | } |
875 | 875 | ||
876 | void Launcher::showTab(const QString& id) | 876 | void Launcher::showTab(const QString& id) |
877 | { | 877 | { |
878 | tabs->showTab(id); | 878 | tabs->showTab(id); |
879 | raise(); | 879 | raise(); |
880 | } | 880 | } |
881 | 881 | ||