summaryrefslogtreecommitdiff
authorzecke <zecke>2002-03-22 23:09:26 (UTC)
committer zecke <zecke>2002-03-22 23:09:26 (UTC)
commit5c17e8b168cf27ac2922e7c118cb886b116eab42 (patch) (unidiff)
tree5ba4ad0f08f9e93c62b95545d97a462f6924e45c
parent232a5bed633ba2aa96fcab73ff991ab3a796ad76 (diff)
downloadopie-5c17e8b168cf27ac2922e7c118cb886b116eab42.zip
opie-5c17e8b168cf27ac2922e7c118cb886b116eab42.tar.gz
opie-5c17e8b168cf27ac2922e7c118cb886b116eab42.tar.bz2
make some people happy update
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/launcher.cpp1
-rw-r--r--core/launcher/mediummountgui.cpp1
-rw-r--r--libopie/oconfig.h2
3 files changed, 3 insertions, 1 deletions
diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp
index dcc3ba1..1c38a05 100644
--- a/core/launcher/launcher.cpp
+++ b/core/launcher/launcher.cpp
@@ -500,96 +500,97 @@ void Launcher::updateMimeTypes(AppLnkSet* folder)
500 updateMimeTypes((AppLnkSet *)app); 500 updateMimeTypes((AppLnkSet *)app);
501 else { 501 else {
502 MimeType::registerApp(*app); 502 MimeType::registerApp(*app);
503 } 503 }
504 } 504 }
505} 505}
506 506
507void Launcher::loadDocs() // ok here comes a hack belonging to Global:: 507void Launcher::loadDocs() // ok here comes a hack belonging to Global::
508{ 508{
509 qWarning("loading Documents" ); 509 qWarning("loading Documents" );
510 qWarning("The currentTimeStamp is: %s", m_timeStamp.latin1() ); 510 qWarning("The currentTimeStamp is: %s", m_timeStamp.latin1() );
511 delete docsFolder; 511 delete docsFolder;
512 docsFolder = new DocLnkSet; 512 docsFolder = new DocLnkSet;
513 qWarning("new DocLnkSet" ); 513 qWarning("new DocLnkSet" );
514 // find out wich filesystems are new in this round 514 // find out wich filesystems are new in this round
515 // We will do this by having a timestamp inside each mountpoint 515 // We will do this by having a timestamp inside each mountpoint
516 // if the current timestamp doesn't match this is a new file system and 516 // if the current timestamp doesn't match this is a new file system and
517 // come up with our MediumMountGui :) let the hacking begin 517 // come up with our MediumMountGui :) let the hacking begin
518 int stamp = uidgen.generate(); 518 int stamp = uidgen.generate();
519 519
520 QString newStamp = QString::number( stamp ); 520 QString newStamp = QString::number( stamp );
521 qWarning("new time stamp is: %s", newStamp.latin1() ); 521 qWarning("new time stamp is: %s", newStamp.latin1() );
522 StorageInfo storage; 522 StorageInfo storage;
523 const QList<FileSystem> &fileSystems = storage.fileSystems(); 523 const QList<FileSystem> &fileSystems = storage.fileSystems();
524 qWarning("QList<FileSystem>" ); 524 qWarning("QList<FileSystem>" );
525 QListIterator<FileSystem> it ( fileSystems ); 525 QListIterator<FileSystem> it ( fileSystems );
526 qWarning("iterator initiliazed" ); 526 qWarning("iterator initiliazed" );
527 for ( ; it.current(); ++it ) { 527 for ( ; it.current(); ++it ) {
528 qWarning("inside for loop" ); 528 qWarning("inside for loop" );
529 qWarning("checking device %s", (*it)->path().latin1() ); 529 qWarning("checking device %s", (*it)->path().latin1() );
530 if ( (*it)->isRemovable() ) { // let's find out if we should search on it 530 if ( (*it)->isRemovable() ) { // let's find out if we should search on it
531 qWarning("%s is removeable", (*it)->path().latin1() ); 531 qWarning("%s is removeable", (*it)->path().latin1() );
532 OConfig cfg( (*it)->path() + "/.opiestorage.cf"); 532 OConfig cfg( (*it)->path() + "/.opiestorage.cf");
533 cfg.setGroup("main"); 533 cfg.setGroup("main");
534 QString stamp = cfg.readEntry("timestamp", QDateTime::currentDateTime().toString() ); 534 QString stamp = cfg.readEntry("timestamp", QDateTime::currentDateTime().toString() );
535 if( stamp == m_timeStamp ){ // ok we know this card 535 if( stamp == m_timeStamp ){ // ok we know this card
536 qWarning("time stamp match" ); 536 qWarning("time stamp match" );
537 cfg.writeEntry("timestamp", newStamp ); 537 cfg.writeEntry("timestamp", newStamp );
538 // we need to scan the list now. Hopefully the cache will be there 538 // we need to scan the list now. Hopefully the cache will be there
539 }else{ // come up with the gui 539 }else{ // come up with the gui
540 qWarning("time stamp doesn't match" ); 540 qWarning("time stamp doesn't match" );
541 MediumMountGui medium((*it)->path() ); 541 MediumMountGui medium((*it)->path() );
542 qWarning("medium mount gui created" ); 542 qWarning("medium mount gui created" );
543 if( medium.check() ){ 543 if( medium.check() ){
544 qWarning("need to check this device" ); 544 qWarning("need to check this device" );
545 if( medium.exec() ){ //ok 545 if( medium.exec() ){ //ok
546 // speicher 546 // speicher
547 qWarning("execed" ); 547 qWarning("execed" );
548 cfg.read();
548 cfg.writeEntry("timestamp", newStamp ); 549 cfg.writeEntry("timestamp", newStamp );
549 } 550 }
550 }else{ 551 }else{
551 qWarning("wrong :(" ); 552 qWarning("wrong :(" );
552 // do something different see what we need to do 553 // do something different see what we need to do
553 } 554 }
554 } 555 }
555 } 556 }
556 } 557 }
557 qWarning("findDocuments" ); 558 qWarning("findDocuments" );
558 Global::findDocuments(docsFolder); // get rid of this call later 559 Global::findDocuments(docsFolder); // get rid of this call later
559 qWarning("done" ); 560 qWarning("done" );
560 m_timeStamp = newStamp; 561 m_timeStamp = newStamp;
561} 562}
562 563
563void Launcher::updateTabs() 564void Launcher::updateTabs()
564{ 565{
565 MimeType::updateApplications(); // ### reads all applnks twice 566 MimeType::updateApplications(); // ### reads all applnks twice
566 567
567 delete rootFolder; 568 delete rootFolder;
568 rootFolder = new AppLnkSet( MimeType::appsFolderName() ); 569 rootFolder = new AppLnkSet( MimeType::appsFolderName() );
569 570
570 loadDocs(); 571 loadDocs();
571 572
572 tabs->initializeCategories(rootFolder, docsFolder, storage->fileSystems()); 573 tabs->initializeCategories(rootFolder, docsFolder, storage->fileSystems());
573} 574}
574 575
575void Launcher::updateDocs() 576void Launcher::updateDocs()
576{ 577{
577 loadDocs(); 578 loadDocs();
578 tabs->updateDocs(docsFolder,storage->fileSystems()); 579 tabs->updateDocs(docsFolder,storage->fileSystems());
579} 580}
580 581
581void Launcher::viewSelected(const QString& s) 582void Launcher::viewSelected(const QString& s)
582{ 583{
583 setCaption( s + tr(" - Launcher") ); 584 setCaption( s + tr(" - Launcher") );
584} 585}
585 586
586void Launcher::nextView() 587void Launcher::nextView()
587{ 588{
588 tabs->nextTab(); 589 tabs->nextTab();
589} 590}
590 591
591 592
592void Launcher::select( const AppLnk *appLnk ) 593void Launcher::select( const AppLnk *appLnk )
593{ 594{
594 if ( appLnk->type() == "Folder" ) { 595 if ( appLnk->type() == "Folder" ) {
595 // Not supported: flat is simpler for the user 596 // Not supported: flat is simpler for the user
diff --git a/core/launcher/mediummountgui.cpp b/core/launcher/mediummountgui.cpp
index 5225711..e3fa5bd 100644
--- a/core/launcher/mediummountgui.cpp
+++ b/core/launcher/mediummountgui.cpp
@@ -55,96 +55,97 @@ void MediumMountGui::readConfig(){
55bool MediumMountGui::check() { 55bool MediumMountGui::check() {
56 return !checkagain; 56 return !checkagain;
57} 57}
58 58
59QStringList MediumMountGui::dirs() { 59QStringList MediumMountGui::dirs() {
60 QStringList list = QStringList::split(",", limittodirs ); 60 QStringList list = QStringList::split(",", limittodirs );
61 return list; 61 return list;
62} 62}
63 63
64void MediumMountGui::writeConfig(bool autocheck) { 64void MediumMountGui::writeConfig(bool autocheck) {
65 65
66 OConfig cfg (mediumPath +"/.opiestorage.cf"); 66 OConfig cfg (mediumPath +"/.opiestorage.cf");
67 cfg.setGroup("main"); 67 cfg.setGroup("main");
68 cfg.writeEntry("check", AskBox->isChecked() ); 68 cfg.writeEntry("check", AskBox->isChecked() );
69 cfg.writeEntry("autocheck", autocheck ); 69 cfg.writeEntry("autocheck", autocheck );
70 70
71 cfg.setGroup("mimetypes"); 71 cfg.setGroup("mimetypes");
72 72
73 cfg.writeEntry("audio", CheckBoxAudio->isChecked() ); 73 cfg.writeEntry("audio", CheckBoxAudio->isChecked() );
74 cfg.writeEntry("image",CheckBoxImage->isChecked() ); 74 cfg.writeEntry("image",CheckBoxImage->isChecked() );
75 cfg.writeEntry("text",CheckBoxImage->isChecked() ); 75 cfg.writeEntry("text",CheckBoxImage->isChecked() );
76 cfg.writeEntry("video",CheckBoxVideo->isChecked() ); 76 cfg.writeEntry("video",CheckBoxVideo->isChecked() );
77 cfg.writeEntry("all",CheckBoxAll->isChecked() ); 77 cfg.writeEntry("all",CheckBoxAll->isChecked() );
78 78
79 cfg.setGroup("dirs"); 79 cfg.setGroup("dirs");
80 cfg.writeEntry("dirs", ""); 80 cfg.writeEntry("dirs", "");
81 81
82 82
83 // if all is checked then add only "null" to the list. 83 // if all is checked then add only "null" to the list.
84 if (checkmimeall) { 84 if (checkmimeall) {
85 mimeTypeList += ("null"); 85 mimeTypeList += ("null");
86 } else { 86 } else {
87 if (checkmimeaudio) { 87 if (checkmimeaudio) {
88 mimeTypeList += ("audio//*"); 88 mimeTypeList += ("audio//*");
89 } 89 }
90 if (checkmimetext) { 90 if (checkmimetext) {
91 mimeTypeList += ("text//*"); 91 mimeTypeList += ("text//*");
92 } 92 }
93 if (checkmimevideo) { 93 if (checkmimevideo) {
94 mimeTypeList += ("video//*"); 94 mimeTypeList += ("video//*");
95 } 95 }
96 if (checkmimeimage) { 96 if (checkmimeimage) {
97 mimeTypeList += ("image//*"); 97 mimeTypeList += ("image//*");
98 } 98 }
99 if (checkmimeall) { 99 if (checkmimeall) {
100 mimeTypeList << ("null"); 100 mimeTypeList << ("null");
101 } 101 }
102 } 102 }
103 cfg.write();
103} 104}
104 105
105void MediumMountGui::startGui() { 106void MediumMountGui::startGui() {
106 107
107 QPixmap image = Resource::loadPixmap( "HelpBrowser"); 108 QPixmap image = Resource::loadPixmap( "HelpBrowser");
108 109
109 Text_2 = new QLabel( this ); 110 Text_2 = new QLabel( this );
110 Text_2->setGeometry( QRect( 10, 15, 40, 40 ) ); 111 Text_2->setGeometry( QRect( 10, 15, 40, 40 ) );
111 Text_2->setPixmap( image ); 112 Text_2->setPixmap( image );
112 113
113 Text = new QLabel( this, "Text" ); 114 Text = new QLabel( this, "Text" );
114 Text->setGeometry( QRect( 55, 11, this->width()-50, 50 ) ); 115 Text->setGeometry( QRect( 55, 11, this->width()-50, 50 ) );
115 Text->setText( tr( "A <b>storage medium</b> was inserted. Should it be scanned for media files?" ) ); 116 Text->setText( tr( "A <b>storage medium</b> was inserted. Should it be scanned for media files?" ) );
116 117
117 // media box 118 // media box
118 GroupBox1 = new QGroupBox( this, "GroupBox1" ); 119 GroupBox1 = new QGroupBox( this, "GroupBox1" );
119 GroupBox1->setGeometry( QRect( 10, 80, (this->width())-25, 80 ) ); 120 GroupBox1->setGeometry( QRect( 10, 80, (this->width())-25, 80 ) );
120 GroupBox1->setTitle( tr( "Which media files" ) ); 121 GroupBox1->setTitle( tr( "Which media files" ) );
121 122
122 CheckBoxAudio = new QCheckBox( GroupBox1, "CheckBoxAudio" ); 123 CheckBoxAudio = new QCheckBox( GroupBox1, "CheckBoxAudio" );
123 CheckBoxAudio->setGeometry( QRect( 10, 15, (GroupBox1->width()/2)-15 , 15 ) ); 124 CheckBoxAudio->setGeometry( QRect( 10, 15, (GroupBox1->width()/2)-15 , 15 ) );
124 CheckBoxAudio->setText( tr( "Audio" ) ); 125 CheckBoxAudio->setText( tr( "Audio" ) );
125 126
126 CheckBoxImage = new QCheckBox( GroupBox1, "CheckBoxImage" ); 127 CheckBoxImage = new QCheckBox( GroupBox1, "CheckBoxImage" );
127 CheckBoxImage->setGeometry( QRect( 10, 35,(GroupBox1->width()/2)-15, 15 ) ); 128 CheckBoxImage->setGeometry( QRect( 10, 35,(GroupBox1->width()/2)-15, 15 ) );
128 CheckBoxImage->setText( tr( "Image" ) ); 129 CheckBoxImage->setText( tr( "Image" ) );
129 130
130 CheckBoxText = new QCheckBox( GroupBox1, "CheckBoxText" ); 131 CheckBoxText = new QCheckBox( GroupBox1, "CheckBoxText" );
131 CheckBoxText->setGeometry( QRect((GroupBox1->width()/2) , 15, (GroupBox1->width()/2)-15, 15 ) ); 132 CheckBoxText->setGeometry( QRect((GroupBox1->width()/2) , 15, (GroupBox1->width()/2)-15, 15 ) );
132 CheckBoxText->setText( tr( "Text" ) ); 133 CheckBoxText->setText( tr( "Text" ) );
133 134
134 CheckBoxVideo = new QCheckBox( GroupBox1, "CheckBoxVideo" ); 135 CheckBoxVideo = new QCheckBox( GroupBox1, "CheckBoxVideo" );
135 CheckBoxVideo->setGeometry( QRect( (GroupBox1->width()/2), 35, (GroupBox1->width()/2)-15, 15 ) ); 136 CheckBoxVideo->setGeometry( QRect( (GroupBox1->width()/2), 35, (GroupBox1->width()/2)-15, 15 ) );
136 CheckBoxVideo->setText( tr( "Video" ) ); 137 CheckBoxVideo->setText( tr( "Video" ) );
137 138
138 CheckBoxAll = new QCheckBox ( GroupBox1); 139 CheckBoxAll = new QCheckBox ( GroupBox1);
139 CheckBoxAll->setGeometry( QRect( 10, 55, (GroupBox1->width()/2)-15, 15 ) ); 140 CheckBoxAll->setGeometry( QRect( 10, 55, (GroupBox1->width()/2)-15, 15 ) );
140 CheckBoxAll->setText( tr( "All" ) ); 141 CheckBoxAll->setText( tr( "All" ) );
141 QObject::connect( (QObject*)CheckBoxAll, SIGNAL( clicked() ), this, SLOT( deactivateOthers()) ); 142 QObject::connect( (QObject*)CheckBoxAll, SIGNAL( clicked() ), this, SLOT( deactivateOthers()) );
142 143
143 144
144 145
145 CheckBoxLink = new QCheckBox ( GroupBox1); 146 CheckBoxLink = new QCheckBox ( GroupBox1);
146 CheckBoxLink->setGeometry( QRect( (GroupBox1->width()/2), 55, (GroupBox1->width()/2)-15, 15 ) ); 147 CheckBoxLink->setGeometry( QRect( (GroupBox1->width()/2), 55, (GroupBox1->width()/2)-15, 15 ) );
147 CheckBoxLink->setText( tr( "Link apps" ) ); 148 CheckBoxLink->setText( tr( "Link apps" ) );
148 // as long as the feature is not supported 149 // as long as the feature is not supported
149 CheckBoxLink->setEnabled(false); 150 CheckBoxLink->setEnabled(false);
150 151
diff --git a/libopie/oconfig.h b/libopie/oconfig.h
index c97fb6a..f6227d1 100644
--- a/libopie/oconfig.h
+++ b/libopie/oconfig.h
@@ -1,48 +1,48 @@
1/* 1/*
2               =. This file is part of the OPIE Project 2               =. This file is part of the OPIE Project
3             .=l. Copyright (c) 2002 Holger 'zecke' Freyther<freyther@kde.org> 3             .=l. Copyright (c) 2002 Holger 'zecke' Freyther<freyther@kde.org>
4           .>+-= 4           .>+-=
5 _;:,     .>    :=|. This library is free software; you can 5 _;:,     .>    :=|. This library is free software; you can
6.> <`_,   >  .   <= redistribute it and/or modify it under 6.> <`_,   >  .   <= redistribute it and/or modify it under
7:`=1 )Y*s>-.--   : the terms of the GNU Library General Public 7:`=1 )Y*s>-.--   : the terms of the GNU Library General Public
8.="- .-=="i,     .._ License as published by the Free Software 8.="- .-=="i,     .._ License as published by the Free Software
9 - .   .-<_>     .<> Foundation; either version 2 of the License, 9 - .   .-<_>     .<> Foundation; either version 2 of the License,
10     ._= =}       : or (at your option) any later version. 10     ._= =}       : or (at your option) any later version.
11    .%`+i>       _;_. 11    .%`+i>       _;_.
12    .i_,=:_.      -<s. This library is distributed in the hope that 12    .i_,=:_.      -<s. This library is distributed in the hope that
13     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY; 13     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
14    : ..    .:,     . . . without even the implied warranty of 14    : ..    .:,     . . . without even the implied warranty of
15    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A 15    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
16  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU 16  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU
17..}^=.=       =       ; Library General Public License for more 17..}^=.=       =       ; Library General Public License for more
18++=   -.     .`     .: details. 18++=   -.     .`     .: details.
19 :     =  ...= . :.=- 19 :     =  ...= . :.=-
20 -.   .:....=;==+<; You should have received a copy of the GNU 20 -.   .:....=;==+<; You should have received a copy of the GNU
21  -_. . .   )=.  = Library General Public License along with 21  -_. . .   )=.  = Library General Public License along with
22    --        :-=` this library; see the file COPYING.LIB. 22    --        :-=` this library; see the file COPYING.LIB.
23 If not, write to the Free Software Foundation, 23 If not, write to the Free Software Foundation,
24 Inc., 59 Temple Place - Suite 330, 24 Inc., 59 Temple Place - Suite 330,
25 Boston, MA 02111-1307, USA. 25 Boston, MA 02111-1307, USA.
26 26
27*/ 27*/
28 28
29 29
30#include <qpe/config.h> 30#include <qpe/config.h>
31 31
32#ifndef opieconfig_h 32#ifndef opieconfig_h
33#define opieconfig_h 33#define opieconfig_h
34 34
35/** It supports all Config items + it lets you decide 35/** It supports all Config items + it lets you decide
36 * which file to use. 36 * which file to use.
37 */ 37 */
38 38
39class OConfig : public Config { 39class OConfig : public Config {
40 public: 40 public:
41 OConfig( const QString &filename ); 41 OConfig( const QString &filename );
42 ~OConfig(); 42 ~OConfig();
43 QString fileName() const; 43 QString fileName() const;
44 44 void read( ) { Config::read(); };
45}; 45};
46 46
47#endif 47#endif
48 48