author | harlekin <harlekin> | 2002-06-11 21:51:34 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-06-11 21:51:34 (UTC) |
commit | 7ab79b2a607a0790d9ef040c76ae2687d9c5a3f8 (patch) (unidiff) | |
tree | cd2782f9be46e59cb49867bb9221e4e6d7b27d01 /core/launcher/launcher.cpp | |
parent | 53cbd5404cea16ec1ddbd2e264fcc42acfb453c8 (diff) | |
download | opie-7ab79b2a607a0790d9ef040c76ae2687d9c5a3f8.zip opie-7ab79b2a607a0790d9ef040c76ae2687d9c5a3f8.tar.gz opie-7ab79b2a607a0790d9ef040c76ae2687d9c5a3f8.tar.bz2 |
attempt to fix remove from autostart
-rw-r--r-- | core/launcher/launcher.cpp | 289 |
1 files changed, 144 insertions, 145 deletions
diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp index a0f04f1..59b38e3 100644 --- a/core/launcher/launcher.cpp +++ b/core/launcher/launcher.cpp | |||
@@ -534,11 +534,11 @@ void Launcher::updateMimeTypes(AppLnkSet* folder) | |||
534 | } | 534 | } |
535 | } | 535 | } |
536 | } | 536 | } |
537 | /** This is a HACK.... | 537 | /** This is a HACK.... |
538 | * Reason: scanning huge mediums, microdirvers for examples | 538 | * Reason: scanning huge mediums, microdirvers for examples |
539 | * consomes time. To avoid that we invented the MediumMountCheck | 539 | * consomes time. To avoid that we invented the MediumMountCheck |
540 | * | 540 | * |
541 | * a) the user globally disabled medium checking. We can ignore | 541 | * a) the user globally disabled medium checking. We can ignore |
542 | * all removable medium | 542 | * all removable medium |
543 | * b) the user enabled medium checking globally and we need to use this mimefilter | 543 | * b) the user enabled medium checking globally and we need to use this mimefilter |
544 | * c) the user enabled medium checking on a per medium bases | 544 | * c) the user enabled medium checking on a per medium bases |
@@ -572,7 +572,7 @@ void Launcher::loadDocs() // ok here comes a hack belonging to Global:: | |||
572 | StorageInfo storage; | 572 | StorageInfo storage; |
573 | const QList<FileSystem> &fileSystems = storage.fileSystems(); | 573 | const QList<FileSystem> &fileSystems = storage.fileSystems(); |
574 | QListIterator<FileSystem> it ( fileSystems ); | 574 | QListIterator<FileSystem> it ( fileSystems ); |
575 | 575 | ||
576 | // b) | 576 | // b) |
577 | if( mediumCfg.readBoolEntry("global", true ) ){ | 577 | if( mediumCfg.readBoolEntry("global", true ) ){ |
578 | QString mime = configToMime(&mediumCfg).join(";"); | 578 | QString mime = configToMime(&mediumCfg).join(";"); |
@@ -601,7 +601,7 @@ void Launcher::loadDocs() // ok here comes a hack belonging to Global:: | |||
601 | tmp = new DocLnkSet( (*it)->path(), mimetypes.join(";") ); | 601 | tmp = new DocLnkSet( (*it)->path(), mimetypes.join(";") ); |
602 | docsFolder->appendFrom( *tmp ); | 602 | docsFolder->appendFrom( *tmp ); |
603 | delete tmp; | 603 | delete tmp; |
604 | 604 | ||
605 | }else{ // come up with the gui cause this a new card | 605 | }else{ // come up with the gui cause this a new card |
606 | MediumMountGui medium(&cfg, (*it)->path() ); | 606 | MediumMountGui medium(&cfg, (*it)->path() ); |
607 | if( medium.check() ){ // we did not ask before or ask again is off | 607 | if( medium.check() ){ // we did not ask before or ask again is off |
@@ -718,65 +718,65 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data) | |||
718 | { | 718 | { |
719 | QDataStream stream( data, IO_ReadOnly ); | 719 | QDataStream stream( data, IO_ReadOnly ); |
720 | if ( msg == "closing(QString)" ){ | 720 | if ( msg == "closing(QString)" ){ |
721 | QString app; | 721 | QString app; |
722 | stream >> app; | 722 | stream >> app; |
723 | qWarning("app closed %s", app.latin1() ); | 723 | qWarning("app closed %s", app.latin1() ); |
724 | MRUList::removeTask( app ); | 724 | MRUList::removeTask( app ); |
725 | }else if ( msg == "linkChanged(QString)" ) { | 725 | }else if ( msg == "linkChanged(QString)" ) { |
726 | QString link; | 726 | QString link; |
727 | stream >> link; | 727 | stream >> link; |
728 | if ( in_lnk_props ) { | 728 | if ( in_lnk_props ) { |
729 | got_lnk_change = TRUE; | 729 | got_lnk_change = TRUE; |
730 | lnk_change = link; | 730 | lnk_change = link; |
731 | } else { | 731 | } else { |
732 | updateLink(link); | 732 | updateLink(link); |
733 | } | 733 | } |
734 | } else if ( msg == "busy()" ) { | 734 | } else if ( msg == "busy()" ) { |
735 | emit busy(); | 735 | emit busy(); |
736 | } else if ( msg == "notBusy(QString)" ) { | 736 | } else if ( msg == "notBusy(QString)" ) { |
737 | QString app; | 737 | QString app; |
738 | stream >> app; | 738 | stream >> app; |
739 | tabs->setBusy(FALSE); | 739 | tabs->setBusy(FALSE); |
740 | emit notBusy(app); | 740 | emit notBusy(app); |
741 | } else if ( msg == "mkdir(QString)" ) { | 741 | } else if ( msg == "mkdir(QString)" ) { |
742 | QString dir; | 742 | QString dir; |
743 | stream >> dir; | 743 | stream >> dir; |
744 | if ( !dir.isEmpty() ) | 744 | if ( !dir.isEmpty() ) |
745 | mkdir( dir ); | 745 | mkdir( dir ); |
746 | } else if ( msg == "rdiffGenSig(QString,QString)" ) { | 746 | } else if ( msg == "rdiffGenSig(QString,QString)" ) { |
747 | QString baseFile, sigFile; | 747 | QString baseFile, sigFile; |
748 | stream >> baseFile >> sigFile; | 748 | stream >> baseFile >> sigFile; |
749 | QRsync::generateSignature( baseFile, sigFile ); | 749 | QRsync::generateSignature( baseFile, sigFile ); |
750 | } else if ( msg == "rdiffGenDiff(QString,QString,QString)" ) { | 750 | } else if ( msg == "rdiffGenDiff(QString,QString,QString)" ) { |
751 | QString baseFile, sigFile, deltaFile; | 751 | QString baseFile, sigFile, deltaFile; |
752 | stream >> baseFile >> sigFile >> deltaFile; | 752 | stream >> baseFile >> sigFile >> deltaFile; |
753 | QRsync::generateDiff( baseFile, sigFile, deltaFile ); | 753 | QRsync::generateDiff( baseFile, sigFile, deltaFile ); |
754 | } else if ( msg == "rdiffApplyPatch(QString,QString)" ) { | 754 | } else if ( msg == "rdiffApplyPatch(QString,QString)" ) { |
755 | QString baseFile, deltaFile; | 755 | QString baseFile, deltaFile; |
756 | stream >> baseFile >> deltaFile; | 756 | stream >> baseFile >> deltaFile; |
757 | if ( !QFile::exists( baseFile ) ) { | 757 | if ( !QFile::exists( baseFile ) ) { |
758 | QFile f( baseFile ); | 758 | QFile f( baseFile ); |
759 | f.open( IO_WriteOnly ); | 759 | f.open( IO_WriteOnly ); |
760 | f.close(); | 760 | f.close(); |
761 | } | 761 | } |
762 | QRsync::applyDiff( baseFile, deltaFile ); | 762 | QRsync::applyDiff( baseFile, deltaFile ); |
763 | QCopEnvelope e( "QPE/Desktop", "patchApplied(QString)" ); | 763 | QCopEnvelope e( "QPE/Desktop", "patchApplied(QString)" ); |
764 | e << baseFile; | 764 | e << baseFile; |
765 | } else if ( msg == "rdiffCleanup()" ) { | 765 | } else if ( msg == "rdiffCleanup()" ) { |
766 | mkdir( "/tmp/rdiff" ); | 766 | mkdir( "/tmp/rdiff" ); |
767 | QDir dir; | 767 | QDir dir; |
768 | dir.setPath( "/tmp/rdiff" ); | 768 | dir.setPath( "/tmp/rdiff" ); |
769 | QStringList entries = dir.entryList(); | 769 | QStringList entries = dir.entryList(); |
770 | for ( QStringList::Iterator it = entries.begin(); it != entries.end(); ++it ) | 770 | for ( QStringList::Iterator it = entries.begin(); it != entries.end(); ++it ) |
771 | dir.remove( *it ); | 771 | dir.remove( *it ); |
772 | } else if ( msg == "sendHandshakeInfo()" ) { | 772 | } else if ( msg == "sendHandshakeInfo()" ) { |
773 | QString home = getenv( "HOME" ); | 773 | QString home = getenv( "HOME" ); |
774 | QCopEnvelope e( "QPE/Desktop", "handshakeInfo(QString,bool)" ); | 774 | QCopEnvelope e( "QPE/Desktop", "handshakeInfo(QString,bool)" ); |
775 | e << home; | 775 | e << home; |
776 | int locked = (int) Desktop::screenLocked(); | 776 | int locked = (int) Desktop::screenLocked(); |
777 | e << locked; | 777 | e << locked; |
778 | // register an app for autostart | 778 | // register an app for autostart |
779 | // if clear is send the list is cleared. | 779 | // if clear is send the list is cleared. |
780 | } else if ( msg == "autoStart(QString)" ) { | 780 | } else if ( msg == "autoStart(QString)" ) { |
781 | QString appName; | 781 | QString appName; |
782 | stream >> appName; | 782 | stream >> appName; |
@@ -819,106 +819,105 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data) | |||
819 | } | 819 | } |
820 | } else { | 820 | } else { |
821 | } | 821 | } |
822 | } else if ( msg == "sendCardInfo()" ) { | 822 | } else if ( msg == "sendCardInfo()" ) { |
823 | QCopEnvelope e( "QPE/Desktop", "cardInfo(QString)" ); | 823 | QCopEnvelope e( "QPE/Desktop", "cardInfo(QString)" ); |
824 | const QList<FileSystem> &fs = storage->fileSystems(); | 824 | const QList<FileSystem> &fs = storage->fileSystems(); |
825 | QListIterator<FileSystem> it ( fs ); | 825 | QListIterator<FileSystem> it ( fs ); |
826 | QString s; | 826 | QString s; |
827 | QString homeDir = getenv("HOME"); | 827 | QString homeDir = getenv("HOME"); |
828 | QString hardDiskHome; | 828 | QString hardDiskHome; |
829 | for ( ; it.current(); ++it ) { | 829 | for ( ; it.current(); ++it ) { |
830 | if ( (*it)->isRemovable() ) | 830 | if ( (*it)->isRemovable() ) |
831 | s += (*it)->name() + "=" + (*it)->path() + "/Documents " | 831 | s += (*it)->name() + "=" + (*it)->path() + "/Documents " |
832 | + QString::number( (*it)->availBlocks() * (*it)->blockSize() ) | 832 | + QString::number( (*it)->availBlocks() * (*it)->blockSize() ) |
833 | + " " + (*it)->options() + ";"; | 833 | + " " + (*it)->options() + ";"; |
834 | else if ( (*it)->disk() == "/dev/mtdblock1" || | 834 | else if ( (*it)->disk() == "/dev/mtdblock1" || |
835 | (*it)->disk() == "/dev/mtdblock/1" ) | 835 | (*it)->disk() == "/dev/mtdblock/1" ) |
836 | s += (*it)->name() + "=" + homeDir + "/Documents " | 836 | s += (*it)->name() + "=" + homeDir + "/Documents " |
837 | + QString::number( (*it)->availBlocks() * (*it)->blockSize() ) | 837 | + QString::number( (*it)->availBlocks() * (*it)->blockSize() ) |
838 | + " " + (*it)->options() + ";"; | 838 | + " " + (*it)->options() + ";"; |
839 | else if ( (*it)->name().contains( "Hard Disk") && | 839 | else if ( (*it)->name().contains( "Hard Disk") && |
840 | homeDir.contains( (*it)->path() ) && | 840 | homeDir.contains( (*it)->path() ) && |
841 | (*it)->path().length() > hardDiskHome.length() ) | 841 | (*it)->path().length() > hardDiskHome.length() ) |
842 | hardDiskHome = | 842 | hardDiskHome = |
843 | (*it)->name() + "=" + homeDir + "/Documents " | 843 | (*it)->name() + "=" + homeDir + "/Documents " |
844 | + QString::number( (*it)->availBlocks() * (*it)->blockSize() ) | 844 | + QString::number( (*it)->availBlocks() * (*it)->blockSize() ) |
845 | + " " + (*it)->options() + ";"; | 845 | + " " + (*it)->options() + ";"; |
846 | } | 846 | } |
847 | if ( !hardDiskHome.isEmpty() ) | 847 | if ( !hardDiskHome.isEmpty() ) |
848 | s += hardDiskHome; | 848 | s += hardDiskHome; |
849 | 849 | ||
850 | e << s; | 850 | e << s; |
851 | } else if ( msg == "sendSyncDate(QString)" ) { | 851 | } else if ( msg == "sendSyncDate(QString)" ) { |
852 | QString app; | 852 | QString app; |
853 | stream >> app; | 853 | stream >> app; |
854 | Config cfg( "qpe" ); | 854 | Config cfg( "qpe" ); |
855 | cfg.setGroup("SyncDate"); | 855 | cfg.setGroup("SyncDate"); |
856 | QCopEnvelope e( "QPE/Desktop", "syncDate(QString,QString)" ); | 856 | QCopEnvelope e( "QPE/Desktop", "syncDate(QString,QString)" ); |
857 | e << app << cfg.readEntry( app ); | 857 | e << app << cfg.readEntry( app ); |
858 | //qDebug("QPE/System sendSyncDate for %s: response %s", app.latin1(), | 858 | //qDebug("QPE/System sendSyncDate for %s: response %s", app.latin1(), |
859 | //cfg.readEntry( app ).latin1() ); | 859 | //cfg.readEntry( app ).latin1() ); |
860 | } else if ( msg == "setSyncDate(QString,QString)" ) { | 860 | } else if ( msg == "setSyncDate(QString,QString)" ) { |
861 | QString app, date; | 861 | QString app, date; |
862 | stream >> app >> date; | 862 | stream >> app >> date; |
863 | Config cfg( "qpe" ); | 863 | Config cfg( "qpe" ); |
864 | cfg.setGroup("SyncDate"); | 864 | cfg.setGroup("SyncDate"); |
865 | cfg.writeEntry( app, date ); | 865 | cfg.writeEntry( app, date ); |
866 | //qDebug("setSyncDate(QString,QString) %s %s", app.latin1(), date.latin1()); | 866 | //qDebug("setSyncDate(QString,QString) %s %s", app.latin1(), date.latin1()); |
867 | } else if ( msg == "startSync(QString)" ) { | 867 | } else if ( msg == "startSync(QString)" ) { |
868 | QString what; | 868 | QString what; |
869 | stream >> what; | 869 | stream >> what; |
870 | delete syncDialog; syncDialog = 0; | 870 | delete syncDialog; syncDialog = 0; |
871 | syncDialog = new SyncDialog( this, "syncProgress", FALSE, | 871 | syncDialog = new SyncDialog( this, "syncProgress", FALSE, |
872 | WStyle_Tool | WStyle_Customize | | 872 | WStyle_Tool | WStyle_Customize | |
873 | Qt::WStyle_StaysOnTop ); | 873 | Qt::WStyle_StaysOnTop ); |
874 | syncDialog->showMaximized(); | 874 | syncDialog->showMaximized(); |
875 | syncDialog->whatLabel->setText( "<b>" + what + "</b>" ); | 875 | syncDialog->whatLabel->setText( "<b>" + what + "</b>" ); |
876 | connect( syncDialog->buttonCancel, SIGNAL( clicked() ), | 876 | connect( syncDialog->buttonCancel, SIGNAL( clicked() ), |
877 | SLOT( cancelSync() ) ); | 877 | SLOT( cancelSync() ) ); |
878 | } | 878 | } else if ( msg == "stopSync()") { |
879 | else if ( msg == "stopSync()") { | 879 | delete syncDialog; syncDialog = 0; |
880 | delete syncDialog; syncDialog = 0; | ||
881 | } else if ( msg == "getAllDocLinks()" ) { | 880 | } else if ( msg == "getAllDocLinks()" ) { |
882 | loadDocs(); | 881 | loadDocs(); |
883 | 882 | ||
884 | QString contents; | 883 | QString contents; |
885 | 884 | ||
886 | for ( QListIterator<DocLnk> it( docsFolder->children() ); it.current(); ++it ) { | 885 | for ( QListIterator<DocLnk> it( docsFolder->children() ); it.current(); ++it ) { |
887 | DocLnk *doc = it.current(); | 886 | DocLnk *doc = it.current(); |
888 | QFileInfo fi( doc->file() ); | 887 | QFileInfo fi( doc->file() ); |
889 | if ( !fi.exists() ) | 888 | if ( !fi.exists() ) |
890 | continue; | 889 | continue; |
891 | 890 | ||
892 | bool fake = !doc->linkFileKnown(); | 891 | bool fake = !doc->linkFileKnown(); |
893 | if ( !fake ) { | 892 | if ( !fake ) { |
894 | QFile f( doc->linkFile() ); | 893 | QFile f( doc->linkFile() ); |
895 | if ( f.open( IO_ReadOnly ) ) { | 894 | if ( f.open( IO_ReadOnly ) ) { |
896 | QTextStream ts( &f ); | 895 | QTextStream ts( &f ); |
897 | ts.setEncoding( QTextStream::UnicodeUTF8 ); | 896 | ts.setEncoding( QTextStream::UnicodeUTF8 ); |
898 | contents += ts.read(); | 897 | contents += ts.read(); |
899 | f.close(); | 898 | f.close(); |
900 | } else | 899 | } else |
901 | fake = TRUE; | 900 | fake = TRUE; |
902 | } | 901 | } |
903 | if (fake) { | 902 | if (fake) { |
904 | contents += "[Desktop Entry]\n"; | 903 | contents += "[Desktop Entry]\n"; |
905 | contents += "Categories = " + Qtopia::Record::idsToString( doc->categories() ) + "\n"; | 904 | contents += "Categories = " + Qtopia::Record::idsToString( doc->categories() ) + "\n"; |
906 | contents += "File = "+doc->file()+"\n"; | 905 | contents += "File = "+doc->file()+"\n"; |
907 | contents += "Name = "+doc->name()+"\n"; | 906 | contents += "Name = "+doc->name()+"\n"; |
908 | contents += "Type = "+doc->type()+"\n"; | 907 | contents += "Type = "+doc->type()+"\n"; |
909 | } | 908 | } |
910 | contents += QString("Size = %1\n").arg( fi.size() ); | 909 | contents += QString("Size = %1\n").arg( fi.size() ); |
911 | } | 910 | } |
912 | 911 | ||
913 | //qDebug( "sending length %d", contents.length() ); | 912 | //qDebug( "sending length %d", contents.length() ); |
914 | QCopEnvelope e( "QPE/Desktop", "docLinks(QString)" ); | 913 | QCopEnvelope e( "QPE/Desktop", "docLinks(QString)" ); |
915 | e << contents; | 914 | e << contents; |
916 | 915 | ||
917 | qDebug( "================ \n\n%s\n\n===============", | 916 | qDebug( "================ \n\n%s\n\n===============", |
918 | contents.latin1() ); | 917 | contents.latin1() ); |
919 | 918 | ||
920 | delete docsFolder; | 919 | delete docsFolder; |
921 | docsFolder = 0; | 920 | docsFolder = 0; |
922 | } | 921 | } |
923 | } | 922 | } |
924 | 923 | ||