-rw-r--r-- | libopie/libopie.pro | 33 | ||||
-rw-r--r-- | libopie/ofileselector/ofileselector.cpp | 345 | ||||
-rw-r--r-- | libopie/ofileselector/ofileselector.h | 125 | ||||
-rw-r--r-- | libopie/ofileselector/olister.h | 1 | ||||
-rw-r--r-- | libopie/pim/opimrecord.cpp | 26 | ||||
-rw-r--r-- | libopie/pim/opimrecord.h | 4 | ||||
-rw-r--r-- | libopie/pim/otodo.cpp | 265 | ||||
-rw-r--r-- | libopie/pim/otodo.h | 26 |
8 files changed, 348 insertions, 477 deletions
diff --git a/libopie/libopie.pro b/libopie/libopie.pro index 6c47e86..70be6ac 100644 --- a/libopie/libopie.pro +++ b/libopie/libopie.pro | |||
@@ -1,6 +1,6 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | CONFIG += qte warn_on release | 2 | CONFIG += qte warn_on release |
3 | HEADERS = ofontmenu.h ofileselector.h \ | 3 | HEADERS = ofontmenu.h \ |
4 | ofiledialog.h tododb.h \ | 4 | tododb.h \ |
5 | todoevent.h todoresource.h \ | 5 | todoevent.h todoresource.h \ |
6 | todovcalresource.h xmltree.h \ | 6 | todovcalresource.h xmltree.h \ |
@@ -9,7 +9,18 @@ HEADERS = ofontmenu.h ofileselector.h \ | |||
9 | oprocess.h odevice.h \ | 9 | oprocess.h odevice.h \ |
10 | otimepicker.h otabwidget.h \ | 10 | otimepicker.h otabwidget.h \ |
11 | otabbar.h otabinfo.h | 11 | otabbar.h otabinfo.h \ |
12 | SOURCES = ofontmenu.cc ofileselector.cc \ | 12 | ofileselector/ofiledialog.h \ |
13 | ofiledialog.cc xmltree.cc \ | 13 | ofileselector/ofilelistview.h \ |
14 | ofileselector/ofileselector.h \ | ||
15 | ofileselector/ofileselectoritem.h \ | ||
16 | ofileselector/ofileview.h \ | ||
17 | ofileselector/olister.h \ | ||
18 | ofileselector/olocallister.h \ | ||
19 | ofileselector/ofileselectormain.h \ | ||
20 | pim/opimrecord.h \ | ||
21 | pim/otodo.h | ||
22 | |||
23 | SOURCES = ofontmenu.cc \ | ||
24 | xmltree.cc \ | ||
14 | tododb.cpp todoevent.cpp \ | 25 | tododb.cpp todoevent.cpp \ |
15 | todovcalresource.cpp colordialog.cpp \ | 26 | todovcalresource.cpp colordialog.cpp \ |
@@ -17,5 +28,15 @@ SOURCES = ofontmenu.cc ofileselector.cc \ | |||
17 | oprocctrl.cpp oprocess.cpp \ | 28 | oprocctrl.cpp oprocess.cpp \ |
18 | odevice.cpp otimepicker.cpp \ | 29 | odevice.cpp otimepicker.cpp \ |
19 | otabwidget.cpp otabbar.cpp | 30 | otabwidget.cpp otabbar.cpp \ |
31 | ofileselector/ofiledialog.cpp \ | ||
32 | ofileselector/ofilelistview.cpp \ | ||
33 | ofileselector/ofileselector.cpp \ | ||
34 | ofileselector/ofileselectoritem.cpp \ | ||
35 | ofileselector/ofileview.cpp \ | ||
36 | ofileselector/olister.cpp \ | ||
37 | ofileselector/olocallister.cpp \ | ||
38 | ofileselector/ofileselectormain.cpp \ | ||
39 | pim/opimrecord.cpp \ | ||
40 | pim/otodo.cpp | ||
20 | TARGET = opie | 41 | TARGET = opie |
21 | INCLUDEPATH += $(OPIEDIR)/include | 42 | INCLUDEPATH += $(OPIEDIR)/include |
diff --git a/libopie/ofileselector/ofileselector.cpp b/libopie/ofileselector/ofileselector.cpp index 98b61f7..c52aa62 100644 --- a/libopie/ofileselector/ofileselector.cpp +++ b/libopie/ofileselector/ofileselector.cpp | |||
@@ -31,5 +31,7 @@ | |||
31 | 31 | ||
32 | #include "ofileview.h" | 32 | #include "ofileview.h" |
33 | #include "ofileselectormain.h" | ||
33 | #include "ofileselector.h" | 34 | #include "ofileselector.h" |
35 | #include "olocallister.h" | ||
34 | #include "olister.h" | 36 | #include "olister.h" |
35 | 37 | ||
@@ -102,38 +104,20 @@ void OFileSelector::setNewVisible( bool visible ) | |||
102 | { | 104 | { |
103 | m_shNew = visible; | 105 | m_shNew = visible; |
104 | if( m_selector == Normal ){ | 106 | if (m_new ) |
105 | delete m_select; | 107 | m_new->show(); |
106 | // we need to initialize but keep the selected mimetype | ||
107 | QString mime = currentMimeType(); | ||
108 | m_select = new FileSelector( mime , | ||
109 | m_stack, "fileselector", | ||
110 | m_shNew, m_shClose); | ||
111 | |||
112 | connect(m_select, SIGNAL(fileSelected( const DocLnk & ) ), | ||
113 | this, SLOT( slotFileBridgeSelected(const DocLnk & ) ) ); | ||
114 | connect(m_select, SIGNAL(closeMe() ), | ||
115 | this, SIGNAL(closeMe() ) ); | ||
116 | //connect to close me and other signals as well | ||
117 | m_stack->addWidget( m_select, Normal ); | ||
118 | }else{ | ||
119 | m_new->show(); | ||
120 | } | ||
121 | } | 108 | } |
122 | void OFileSelector::setCloseVisible( bool visible ) | 109 | void OFileSelector::setCloseVisible( bool visible ) |
123 | { | 110 | { |
124 | m_shClose = visible; | 111 | m_shClose = visible; |
125 | if( m_selector == Normal ){ | 112 | |
126 | setNewVisible( m_shNew ); // yeah baby | 113 | if( m_close ) |
127 | }else{ | ||
128 | m_close->show(); | 114 | m_close->show(); |
129 | } | ||
130 | } | 115 | } |
131 | void OFileSelector::reread() | 116 | void OFileSelector::reread() |
132 | { | 117 | { |
133 | if( m_selector == Normal ){ | 118 | if( m_selector == Normal ) |
134 | setNewVisible( m_shNew ); // make it a initializeSelector | 119 | initializeOldSelector(); |
135 | }else { | 120 | else |
136 | reparse(); | 121 | reparse(); |
137 | } | ||
138 | } | 122 | } |
139 | 123 | ||
@@ -148,4 +132,5 @@ void OFileSelector::setYesCancelVisible( bool show ) | |||
148 | initializeYes(); // FIXME if YesCancel is not shown we will initialize it to hide it :( | 132 | initializeYes(); // FIXME if YesCancel is not shown we will initialize it to hide it :( |
149 | m_shYesNo = show; | 133 | m_shYesNo = show; |
134 | |||
150 | if( m_shYesNo ) | 135 | if( m_shYesNo ) |
151 | m_boxOk->show(); | 136 | m_boxOk->show(); |
@@ -157,5 +142,4 @@ void OFileSelector::setToolbarVisible( bool show ) | |||
157 | { | 142 | { |
158 | m_shTool = show; | 143 | m_shTool = show; |
159 | initializeListView(); // FIXME see above waste of memory | ||
160 | 144 | ||
161 | if(!m_shTool ){ | 145 | if(!m_shTool ){ |
@@ -175,4 +159,5 @@ void OFileSelector::setPermissionBarVisible( bool show ) | |||
175 | m_shPerm = show; | 159 | m_shPerm = show; |
176 | initializePerm(); | 160 | initializePerm(); |
161 | |||
177 | if( m_shPerm ) | 162 | if( m_shPerm ) |
178 | m_checkPerm->show(); | 163 | m_checkPerm->show(); |
@@ -186,7 +171,7 @@ void OFileSelector::setLineEditVisible( bool show ) | |||
186 | m_boxName->show(); | 171 | m_boxName->show(); |
187 | }else{ | 172 | }else{ |
188 | if( m_shLne && m_boxName != 0 ){ // check if we showed before this is the way to go | 173 | // check if we showed before this is the way to go |
189 | m_boxName->hide(); | 174 | if( m_shLne && m_boxName != 0 ) |
190 | } | 175 | m_boxName->hide(); |
191 | } | 176 | } |
192 | m_shLne = show; | 177 | m_shLne = show; |
@@ -197,9 +182,10 @@ void OFileSelector::setChooserVisible( bool show ) | |||
197 | m_shChooser = show; | 182 | m_shChooser = show; |
198 | initializeChooser(); | 183 | initializeChooser(); |
199 | if( m_shChooser ){ | 184 | |
200 | m_boxView->hide(); | 185 | if( m_shChooser ) |
201 | }else{ | 186 | m_boxView->hide(); |
202 | m_boxView->show(); | 187 | else |
203 | } | 188 | m_boxView->show(); |
189 | |||
204 | } | 190 | } |
205 | 191 | ||
@@ -227,13 +213,16 @@ void OFileSelector::setMode(int mode) // FIXME do direct raising | |||
227 | return; | 213 | return; |
228 | } | 214 | } |
229 | void OFileSelector::setShowDirs(bool ) | 215 | void OFileSelector::setShowDirs(bool dir) |
230 | { | 216 | { |
231 | m_dir = true; | 217 | m_dir = dir; |
232 | reparse(); | 218 | if ( m_selector != Fileselector ) |
219 | reparse(); | ||
233 | } | 220 | } |
234 | void OFileSelector::setCaseSensetive(bool caSe ) | 221 | void OFileSelector::setCaseSensetive(bool caSe ) |
235 | { | 222 | { |
236 | m_case = caSe; | 223 | m_case = caSe; |
237 | reparse(); | 224 | |
225 | if ( m_selector != Fileselector ) | ||
226 | reparse(); | ||
238 | } | 227 | } |
239 | void OFileSelector::setShowFiles(bool show ) | 228 | void OFileSelector::setShowFiles(bool show ) |
@@ -381,31 +370,16 @@ void OFileSelector::slotViewCheck(const QString &sel) | |||
381 | { | 370 | { |
382 | if( sel == tr("Documents" ) ){ | 371 | if( sel == tr("Documents" ) ){ |
383 | if( m_select == 0 ){ | 372 | initializeOldSelector(); |
384 | // autMime? fix cause now we use All and not the current | 373 | m_selector = Normal; |
385 | // yes currentMime fixes that for us | 374 | |
386 | QString mime = currentMimeType(); | ||
387 | m_select = new FileSelector(mime, | ||
388 | m_stack, "fileselector", | ||
389 | m_shNew, m_shClose); | ||
390 | connect(m_select, SIGNAL(fileSelected( const DocLnk & ) ), | ||
391 | this, SLOT( slotFileBridgeSelected(const DocLnk & ) ) ); | ||
392 | connect(m_select, SIGNAL(closeMe() ), | ||
393 | this, SIGNAL(closeMe() ) ); | ||
394 | //connect to close me and other signals as well | ||
395 | |||
396 | m_stack->addWidget( m_select, Normal ); | ||
397 | } | ||
398 | m_stack->raiseWidget( Normal ); | ||
399 | m_selector = Normal; | ||
400 | }else if( sel == tr("Files") ){ | 375 | }else if( sel == tr("Files") ){ |
401 | m_selector = Extended; | 376 | m_selector = Extended; |
402 | initializeListView(); | 377 | |
403 | reparse(); | 378 | // FIXME call the factory |
404 | m_stack->raiseWidget( Extended ); | 379 | //reparse(); |
405 | }else if( sel == tr("All Files") ){ | 380 | }else if( sel == tr("All Files") ){ |
406 | m_selector = ExtendedAll; | 381 | m_selector = ExtendedAll; |
407 | initializeListView(); | 382 | /* see above |
408 | reparse(); | 383 | reparse(); */ |
409 | m_stack->raiseWidget( Extended ); // same widget other QFileFilter | ||
410 | } | 384 | } |
411 | } | 385 | } |
@@ -414,7 +388,8 @@ QString OFileSelector::currentMimeType() const{ | |||
414 | QString mime; | 388 | QString mime; |
415 | QString currentText; | 389 | QString currentText; |
416 | if (m_shChooser ) | 390 | if (m_shChooser && m_mimeCheck ) |
417 | currentText = m_mimeCheck->currentText(); | 391 | currentText = m_mimeCheck->currentText(); |
418 | 392 | ||
393 | qWarning("CurrentText" + currentText ); | ||
419 | if (tr("All") == currentText ) return QString::null; | 394 | if (tr("All") == currentText ) return QString::null; |
420 | else if (currentText.isEmpty() ) { | 395 | else if (currentText.isEmpty() ) { |
@@ -423,5 +398,5 @@ QString OFileSelector::currentMimeType() const{ | |||
423 | QMap<QString, QStringList>::ConstIterator it; | 398 | QMap<QString, QStringList>::ConstIterator it; |
424 | it = m_mimetypes.find( currentText ); | 399 | it = m_mimetypes.find( currentText ); |
425 | if ( it == m_mimetypes.end() ) { | 400 | if ( it != m_mimetypes.end() ) { |
426 | mime = it.data().join(";"); | 401 | mime = it.data().join(";"); |
427 | }else{ | 402 | }else{ |
@@ -434,31 +409,9 @@ void OFileSelector::slotMimeCheck(const QString &mime) | |||
434 | { | 409 | { |
435 | if( m_selector == Normal ){ | 410 | if( m_selector == Normal ){ |
436 | //if( m_autoMime ){ | 411 | initializeOldSelector(); |
437 | QString newMimeType; | 412 | |
438 | if (mime != tr("All") ) { | ||
439 | QMap<QString, QStringList>::Iterator it; | ||
440 | it = m_mimetypes.find(mime); | ||
441 | if ( it != m_mimetypes.end() ) { | ||
442 | newMimeType = it.data().join(";"); | ||
443 | }else{ | ||
444 | newMimeType = mime; | ||
445 | } | ||
446 | } | ||
447 | delete m_select; | ||
448 | m_select = new FileSelector( newMimeType, | ||
449 | m_stack, "fileselector", | ||
450 | m_shNew, m_shClose); | ||
451 | |||
452 | connect(m_select, SIGNAL(fileSelected( const DocLnk & ) ), | ||
453 | this, SLOT( slotFileBridgeSelected(const DocLnk & ) ) ); | ||
454 | connect(m_select, SIGNAL(closeMe() ), | ||
455 | this, SIGNAL(closeMe() ) ); | ||
456 | //connect to close me and other signals as well | ||
457 | m_stack->addWidget( m_select, Normal ); | ||
458 | m_stack->raiseWidget( Normal ); | ||
459 | updateMimes(); | 413 | updateMimes(); |
460 | updateMimeCheck(); | 414 | updateMimeCheck(); |
461 | m_mimeCheck->setCurrentItem(indexByString( m_mimeCheck, mime) ); | 415 | m_mimeCheck->setCurrentItem(indexByString( m_mimeCheck, mime) ); |
462 | //} | ||
463 | }else{ // others | 416 | }else{ // others |
464 | qWarning("Mime %s", mime.latin1() ); | 417 | qWarning("Mime %s", mime.latin1() ); |
@@ -525,5 +478,9 @@ void OFileSelector::init() | |||
525 | m_lay->setSpacing(0 ); | 478 | m_lay->setSpacing(0 ); |
526 | 479 | ||
527 | m_stack = new QWidgetStack( this ); | 480 | /* take care of the main view... */ |
481 | initToolbar(); | ||
482 | |||
483 | /* initialize the file lister */ | ||
484 | initLister(); | ||
528 | if( m_selector == Normal ){ | 485 | if( m_selector == Normal ){ |
529 | QString mime; | 486 | QString mime; |
@@ -535,23 +492,8 @@ void OFileSelector::init() | |||
535 | } | 492 | } |
536 | } | 493 | } |
537 | m_select = new FileSelector(mime, | 494 | initializeOldSelector(); |
538 | m_stack, "fileselector", | 495 | }else{ |
539 | m_shNew, m_shClose); | 496 | initializeView(); |
540 | |||
541 | connect(m_select, SIGNAL(fileSelected( const DocLnk & ) ), | ||
542 | this, SLOT( slotFileBridgeSelected(const DocLnk & ) ) ); | ||
543 | connect(m_select, SIGNAL(closeMe() ), | ||
544 | this, SIGNAL( closeMe() ) ); | ||
545 | //connect to close me and other signals as well | ||
546 | |||
547 | m_stack->addWidget( m_select, Normal ); | ||
548 | m_stack->raiseWidget( Normal ); | ||
549 | }else{ // we're in init so it will be EXTENDED or EXTENDED_ALL | ||
550 | // and initializeListview will take care of those | ||
551 | // toolbar get's generade in initializeListView | ||
552 | initializeListView( ); // will raise the widget as well | ||
553 | m_stack->raiseWidget( Extended ); | ||
554 | } | 497 | } |
555 | m_lay->addWidget( m_stack, 100 ); // add to the layout 10 = stretch | ||
556 | 498 | ||
557 | if( m_shLne ) // the LineEdit with the current FileName | 499 | if( m_shLne ) // the LineEdit with the current FileName |
@@ -604,4 +546,7 @@ void OFileSelector::initVars() | |||
604 | m_files = true; | 546 | m_files = true; |
605 | m_showPopup = false; | 547 | m_showPopup = false; |
548 | m_mainView = 0l; | ||
549 | m_fileView = 0l; | ||
550 | m_lister = 0l; | ||
606 | 551 | ||
607 | if(m_pixmaps == 0 ) // init the pixmaps | 552 | if(m_pixmaps == 0 ) // init the pixmaps |
@@ -624,5 +569,4 @@ void OFileSelector::initVars() | |||
624 | m_pseudoLayout = 0; | 569 | m_pseudoLayout = 0; |
625 | m_select = 0; | 570 | m_select = 0; |
626 | m_stack = 0; | ||
627 | m_lay = 0; | 571 | m_lay = 0; |
628 | m_Oselector = 0; | 572 | m_Oselector = 0; |
@@ -631,5 +575,4 @@ void OFileSelector::initVars() | |||
631 | m_boxName = 0; | 575 | m_boxName = 0; |
632 | m_boxView = 0; | 576 | m_boxView = 0; |
633 | m_custom = 0; | ||
634 | m_edit = 0; | 577 | m_edit = 0; |
635 | m_fnLabel = 0; | 578 | m_fnLabel = 0; |
@@ -715,4 +658,5 @@ void OFileSelector::initializeChooser() | |||
715 | m_viewCheck->insertItem( tr("All Files") ); | 658 | m_viewCheck->insertItem( tr("All Files") ); |
716 | /* update to custom views */ | 659 | /* update to custom views */ |
660 | |||
717 | updateMimeCheck(); | 661 | updateMimeCheck(); |
718 | 662 | ||
@@ -723,85 +667,92 @@ void OFileSelector::initializeChooser() | |||
723 | } | 667 | } |
724 | } | 668 | } |
725 | void OFileSelector::initializeListView() | 669 | /* generate the buttons for the toolbar */ |
726 | { | 670 | void OFileSelector::initToolbar() { |
727 | qWarning("initializeListView"); | 671 | m_mainView = new OFileSelectorMain( this ); |
728 | if( m_pseudo == 0 ){ | 672 | |
729 | qWarning("init"); | 673 | /* now generate the tool bar */ |
730 | m_pseudo = new QWidget( m_stack, "Pseudo Widget"); | 674 | qWarning( "toolbar" ); |
675 | m_pseudo = new QWidget( m_mainView, "Pseudo Widget" ); | ||
731 | m_pseudoLayout = new QVBoxLayout( m_pseudo ); | 676 | m_pseudoLayout = new QVBoxLayout( m_pseudo ); |
732 | // toolbar | 677 | |
733 | m_boxToolbar = new QHBox( m_pseudo ); | 678 | m_boxToolbar = new QHBox( m_pseudo ); |
734 | m_boxToolbar->setSpacing(0 ); // next to each other please | 679 | m_boxToolbar->setSpacing( 0 ); |
735 | 680 | ||
736 | // toolbar members | 681 | // tool bar members now |
737 | { | 682 | m_location = new QComboBox( m_boxToolbar ); |
738 | // location QComboBox | 683 | m_location->setEditable( TRUE ); |
739 | m_location = new QComboBox( m_boxToolbar ); | 684 | m_location->setDuplicatesEnabled( FALSE ); |
740 | m_location->setEditable( TRUE ); | 685 | connect( m_location, SIGNAL(activated(const QString& ) ), |
741 | m_location->setDuplicatesEnabled( FALSE ); | 686 | this, SLOT(slotLocationActivated(const QString& )) ); |
742 | connect( m_location, SIGNAL(activated(const QString &) ), | 687 | connect( m_location->lineEdit(), SIGNAL(returnPressed() ) , |
743 | this, SLOT( slotLocationActivated(const QString &) ) ); | 688 | this, SLOT(locationComboChanged() ) ); |
744 | connect( m_location->lineEdit(), SIGNAL(returnPressed() ), | 689 | |
745 | this, SLOT(locationComboChanged() ) ); | 690 | // UP Button |
746 | // UP Button | 691 | m_up = new QPushButton( Resource::loadIconSet("up"), QString::null, |
747 | m_up = new QPushButton(Resource::loadIconSet("up"),"", | 692 | m_boxToolbar, "cdUpButton" ); |
748 | m_boxToolbar,"cdUpButton"); | 693 | m_up->setFixedSize( QSize(20, 20 ) ); |
749 | m_up->setFixedSize( QSize( 20, 20 ) ); | 694 | connect( m_up, SIGNAL( clicked() ), this, SLOT(cdUP() ) ); |
750 | connect(m_up ,SIGNAL(clicked()),this,SLOT(cdUP() ) ); | 695 | m_up->setFlat( TRUE ); |
751 | m_up->setFlat(TRUE); | 696 | |
752 | 697 | // Home Button | |
753 | // Home Button | 698 | m_homeButton = new QPushButton(Resource::loadIconSet("home"), |
754 | m_homeButton = new QPushButton(Resource::loadIconSet("home") , | 699 | QString::null, m_boxToolbar ); |
755 | "", m_boxToolbar); | 700 | m_homeButton->setFixedSize( QSize(20, 20 ) ); |
756 | m_homeButton->setFixedSize( QSize( 20, 20 ) ); | 701 | connect(m_homeButton, SIGNAL(clicked() ), this, SLOT(slotHome() ) ); |
757 | connect(m_homeButton,SIGNAL(clicked()),this,SLOT(slotHome() ) ); | 702 | m_homeButton->setFlat( TRUE ); |
758 | m_homeButton->setFlat(TRUE); | 703 | |
759 | // Documents Button | 704 | // Documents Button |
760 | m_docButton = new QPushButton(Resource::loadIconSet("DocsIcon"),"", | 705 | m_docButton = new QPushButton( Resource::loadIconSet("DocsIcon"), |
761 | m_boxToolbar,"docsButton"); | 706 | QString::null, m_boxToolbar, |
762 | m_docButton->setFixedSize( QSize( 20, 20 ) ); | 707 | "docsButton" ); |
763 | connect(m_homeButton,SIGNAL(clicked()),this,SLOT(slotDoc() ) ); | 708 | m_docButton->setFixedSize( QSize(20, 20 ) ); |
764 | m_docButton->setFlat(TRUE); | 709 | m_docButton->setFlat( true ); |
765 | 710 | connect( m_docButton, SIGNAL(clicked() ), | |
766 | // Close button | 711 | this, SLOT(slotDoc() ) ); |
767 | m_close = new QPushButton( Resource::loadIconSet( "close"), "", | 712 | |
768 | m_boxToolbar ); | 713 | // close button |
769 | connect( m_close, SIGNAL(clicked() ), this, SIGNAL(closeMe() ) ); | 714 | m_close = new QPushButton( Resource::loadIconSet( "close"), "", |
770 | m_close->setFixedSize( 20, 20 ); | 715 | m_boxToolbar ); |
771 | 716 | connect( m_close, SIGNAL(clicked() ), this, SIGNAL(closeMe() ) ); | |
772 | m_boxToolbar->setFixedHeight( 20 ); | 717 | m_close->setFixedSize( 20, 20 ); |
773 | m_pseudoLayout->addWidget(m_boxToolbar ); | 718 | |
774 | 719 | m_boxToolbar->setFixedHeight( 20 ); | |
775 | // let;s fill the Location ComboBox | 720 | m_pseudoLayout->addWidget(m_boxToolbar ); |
776 | StorageInfo storage; | 721 | |
777 | const QList<FileSystem> &fs = storage.fileSystems(); | 722 | /* init the locations */ |
778 | QListIterator<FileSystem> it ( fs ); | 723 | initLocations(); |
779 | for( ; it.current(); ++it ){ | 724 | |
725 | if( !m_shTool ){ | ||
726 | m_location->hide( ); | ||
727 | m_up->hide( ); | ||
728 | m_homeButton->hide( ); | ||
729 | m_docButton->hide( ); | ||
730 | } | ||
731 | if(!m_shClose ) | ||
732 | m_close->hide(); | ||
733 | |||
734 | m_mainView->setToolbar( m_pseudo ); | ||
735 | m_lay->addWidget( m_mainView, 100 ); | ||
736 | } | ||
737 | /* initialize the OLocalLister */ | ||
738 | void OFileSelector::initLister() { | ||
739 | m_lister = new OLocalLister(this); | ||
740 | } | ||
741 | /* put default locations into the bar */ | ||
742 | void OFileSelector::initLocations () { | ||
743 | |||
744 | // let;s fill the Location ComboBox | ||
745 | StorageInfo storage; | ||
746 | const QList<FileSystem> &fs = storage.fileSystems(); | ||
747 | QListIterator<FileSystem> it ( fs ); | ||
748 | for( ; it.current(); ++it ){ | ||
780 | const QString disk = (*it)->name(); | 749 | const QString disk = (*it)->name(); |
781 | const QString path = (*it)->path(); | 750 | const QString path = (*it)->path(); |
782 | m_location->insertItem(path+ "<-"+disk ); | 751 | m_location->insertItem(path+ "<-"+disk ); |
783 | } | 752 | } |
784 | int count = m_location->count(); | 753 | int count = m_location->count(); |
785 | m_location->insertItem( m_currentDir ); | 754 | m_location->insertItem( m_currentDir ); |
786 | m_location->setCurrentItem( count ); | 755 | m_location->setCurrentItem( count ); |
787 | // due to the New and Close button we can not simply hide m_boxToolBar to not show it | ||
788 | if( !m_shTool ){ | ||
789 | m_location->hide( ); | ||
790 | m_up->hide( ); | ||
791 | m_homeButton->hide( ); | ||
792 | m_docButton->hide( ); | ||
793 | } | ||
794 | if(!m_shClose ) | ||
795 | m_close->hide(); | ||
796 | //if(!m_shNew) | ||
797 | //m_close->hide(); | ||
798 | |||
799 | } // off toolbar | ||
800 | // the Main ListView | ||
801 | // make a QWidgetStack first so Views can share the Toolbar | ||
802 | 756 | ||
803 | // m_pseudoLayout->addWidget( m_View, 288 ); | ||
804 | m_stack->addWidget( m_pseudo, Extended ); | ||
805 | } | ||
806 | } | 757 | } |
807 | void OFileSelector::initializePerm() | 758 | void OFileSelector::initializePerm() |
@@ -1003,8 +954,8 @@ void OFileSelector::reparse() | |||
1003 | 954 | ||
1004 | OFileView* OFileSelector::currentView() { | 955 | OFileView* OFileSelector::currentView() { |
1005 | return 0l; | 956 | return m_fileView; |
1006 | } | 957 | } |
1007 | OFileView* OFileSelector::currentView() const{ | 958 | OFileView* OFileSelector::currentView() const{ |
1008 | return 0l; | 959 | return m_fileView; |
1009 | } | 960 | } |
1010 | int OFileSelector::filter() { | 961 | int OFileSelector::filter() { |
@@ -1048,4 +999,24 @@ QPixmap OFileSelector::pixmap( const QString& s ) { | |||
1048 | } | 999 | } |
1049 | OLister* OFileSelector::currentLister()const { | 1000 | OLister* OFileSelector::currentLister()const { |
1050 | return 0l; | 1001 | return m_lister; |
1002 | } | ||
1003 | void OFileSelector::initializeOldSelector() { | ||
1004 | qWarning("initializeOldSelector"); | ||
1005 | |||
1006 | delete m_select; | ||
1007 | |||
1008 | // we need to initialize but keep the selected mimetype | ||
1009 | /* we default not to show close and new buttons */ | ||
1010 | QString mime = currentMimeType(); | ||
1011 | qWarning("MimeType " + mime ); | ||
1012 | m_select = new FileSelector( mime , | ||
1013 | m_mainView, "fileselector", | ||
1014 | FALSE, FALSE); | ||
1015 | |||
1016 | connect(m_select, SIGNAL(fileSelected( const DocLnk & ) ), | ||
1017 | this, SLOT( slotFileBridgeSelected(const DocLnk & ) ) ); | ||
1018 | connect(m_select, SIGNAL(closeMe() ), | ||
1019 | this, SIGNAL(closeMe() ) ); | ||
1020 | //connect to close me and other signals as well | ||
1021 | m_mainView->setWidget( m_select ); | ||
1051 | } | 1022 | } |
diff --git a/libopie/ofileselector/ofileselector.h b/libopie/ofileselector/ofileselector.h index a7b363f..bf9a26b 100644 --- a/libopie/ofileselector/ofileselector.h +++ b/libopie/ofileselector/ofileselector.h | |||
@@ -70,4 +70,5 @@ class QHBox; | |||
70 | class OFileView; | 70 | class OFileView; |
71 | class OLister; | 71 | class OLister; |
72 | class OFileSelectorMain; | ||
72 | // | 73 | // |
73 | 74 | ||
@@ -109,5 +110,5 @@ class OFileSelector : public QWidget { | |||
109 | * ExtendedAll also shows 'hidden' files | 110 | * ExtendedAll also shows 'hidden' files |
110 | */ | 111 | */ |
111 | enum Selector{Normal=0, Extended = 1, ExtendedAll =2 }; | 112 | enum Selector{Normal=0, Extended = 1, ExtendedAll = 2}; |
112 | 113 | ||
113 | /** | 114 | /** |
@@ -343,4 +344,6 @@ class OFileSelector : public QWidget { | |||
343 | int sorting(); | 344 | int sorting(); |
344 | QPixmap pixmap( const QString& ); | 345 | QPixmap pixmap( const QString& ); |
346 | /* our tool bar */ | ||
347 | QWidget* toolBar(); | ||
345 | 348 | ||
346 | signals: | 349 | signals: |
@@ -370,4 +373,7 @@ class OFileSelector : public QWidget { | |||
370 | private: | 373 | private: |
371 | 374 | ||
375 | OFileSelectorMain* m_mainView; | ||
376 | OLister* m_lister; | ||
377 | OFileView* m_fileView; | ||
372 | FileSelector* m_select; | 378 | FileSelector* m_select; |
373 | int m_mode, m_selector; | 379 | int m_mode, m_selector; |
@@ -391,70 +397,73 @@ class OFileSelector : public QWidget { | |||
391 | QString m_currentDir; | 397 | QString m_currentDir; |
392 | QString m_name; | 398 | QString m_name; |
393 | QMap<QString, QStringList> m_mimetypes; | 399 | |
394 | 400 | QMap<QString, QStringList> m_mimetypes; | |
395 | 401 | ||
396 | QWidgetStack *m_stack; | 402 | QVBoxLayout *m_lay; |
397 | QVBoxLayout *m_lay; | 403 | QGridLayout *m_Oselector; |
398 | QGridLayout *m_Oselector; | 404 | |
399 | 405 | QHBox *m_boxToolbar; | |
400 | QHBox *m_boxToolbar; | 406 | QHBox *m_boxOk; |
401 | QHBox *m_boxOk; | 407 | QHBox *m_boxName; |
402 | QHBox *m_boxName; | 408 | QHBox *m_boxView; |
403 | QHBox *m_boxView; | 409 | |
404 | 410 | ||
405 | QPopupMenu *m_custom; | 411 | QLineEdit *m_edit; |
406 | 412 | QLabel *m_fnLabel; | |
407 | QLineEdit *m_edit; | 413 | |
408 | QLabel *m_fnLabel; | 414 | bool m_shClose : 1; |
409 | 415 | bool m_shNew : 1; | |
410 | bool m_shClose : 1; | 416 | bool m_shTool : 1; |
411 | bool m_shNew : 1; | 417 | bool m_shPerm : 1; |
412 | bool m_shTool : 1; | 418 | bool m_shLne : 1; |
413 | bool m_shPerm : 1; | 419 | bool m_shChooser : 1; |
414 | bool m_shLne : 1; | 420 | bool m_shYesNo : 1; |
415 | bool m_shChooser : 1; | 421 | bool m_boCheckPerm : 1; |
416 | bool m_shYesNo : 1; | 422 | bool m_autoMime : 1; |
417 | bool m_boCheckPerm : 1; | 423 | bool m_case : 1; |
418 | bool m_autoMime : 1; | 424 | bool m_dir : 1; |
419 | bool m_case : 1; | 425 | bool m_files : 1; |
420 | bool m_dir : 1; | 426 | bool m_showPopup : 1; |
421 | bool m_files : 1; | 427 | bool m_showHidden : 1; |
422 | bool m_showPopup : 1; | 428 | |
423 | 429 | void initVars(); | |
424 | void initVars(); | 430 | |
425 | 431 | void delItems(); | |
426 | void delItems(); | 432 | void initializeName(); |
427 | void initializeName(); | 433 | void initializeYes(); |
428 | void initializeYes(); | 434 | void initializeChooser(); |
429 | void initializeChooser(); | 435 | void initializePerm(); |
430 | void initializeListView(); | 436 | void initPics(); |
431 | void initializePerm(); | 437 | bool compliesMime(const QString &path, |
432 | void initPics(); | 438 | const QString &mime); |
433 | bool compliesMime(const QString &path, | 439 | bool compliesMime(const QString& mime ); |
434 | const QString &mime); | ||
435 | bool compliesMime(const QString& mime ); | ||
436 | /** | 440 | /** |
437 | * Updates the QComboBox with the current mimetypes | 441 | * Updates the QComboBox with the current mimetypes |
438 | */ | 442 | */ |
439 | void updateMimeCheck(); | 443 | void updateMimeCheck(); |
440 | 444 | ||
445 | void initializeOldSelector(); | ||
446 | void initLister(); | ||
447 | void initToolbar(); | ||
448 | void initLocations(); | ||
449 | void initializeView() {}; // FIXME | ||
441 | /** | 450 | /** |
442 | * Returns the current mimetype | 451 | * Returns the current mimetype |
443 | */ | 452 | */ |
444 | QString currentMimeType()const; | 453 | QString currentMimeType()const; |
445 | class OFileSelectorPrivate; | 454 | class OFileSelectorPrivate; |
446 | OFileSelectorPrivate *d; | 455 | OFileSelectorPrivate *d; |
447 | static QMap<QString,QPixmap> *m_pixmaps; | 456 | static QMap<QString,QPixmap> *m_pixmaps; |
448 | 457 | ||
449 | private slots: | 458 | private slots: |
450 | void slotFileSelected(const QString & ); // not really meant to be a slot | 459 | void slotFileSelected(const QString & ); // not really meant to be a slot |
451 | void slotFileBridgeSelected( const DocLnk & ); | 460 | void slotFileBridgeSelected( const DocLnk & ); |
452 | // listview above | 461 | // listview above |
453 | // popup below | 462 | // popup below |
454 | virtual void slotDelete(); | 463 | virtual void slotDelete(); |
455 | virtual void cdUP(); | 464 | virtual void cdUP(); |
456 | virtual void slotHome(); | 465 | virtual void slotHome(); |
457 | virtual void slotDoc(); | 466 | virtual void slotDoc(); |
458 | virtual void slotNavigate( ); | 467 | virtual void slotNavigate( ); |
459 | 468 | ||
460 | /* for OLister */ | 469 | /* for OLister */ |
diff --git a/libopie/ofileselector/olister.h b/libopie/ofileselector/olister.h index 081b876..ef61cab 100644 --- a/libopie/ofileselector/olister.h +++ b/libopie/ofileselector/olister.h | |||
@@ -5,4 +5,5 @@ | |||
5 | #include <qmap.h> | 5 | #include <qmap.h> |
6 | #include <qstring.h> | 6 | #include <qstring.h> |
7 | #include <qstringlist.h> | ||
7 | 8 | ||
8 | class OFileSelector; | 9 | class OFileSelector; |
diff --git a/libopie/pim/opimrecord.cpp b/libopie/pim/opimrecord.cpp index 95de1df..d8f73c7 100644 --- a/libopie/pim/opimrecord.cpp +++ b/libopie/pim/opimrecord.cpp | |||
@@ -3,5 +3,7 @@ | |||
3 | OPimRecord::OPimRecord( int uid ) | 3 | OPimRecord::OPimRecord( int uid ) |
4 | : Qtopia::Record() { | 4 | : Qtopia::Record() { |
5 | |||
5 | setUid( uid ); | 6 | setUid( uid ); |
7 | /* assign a new UID */ | ||
6 | if ( uid == 1 ) | 8 | if ( uid == 1 ) |
7 | assignUid(); | 9 | assignUid(); |
@@ -9,5 +11,5 @@ OPimRecord::OPimRecord( int uid ) | |||
9 | OPimRecord::~OPimRecord() { | 11 | OPimRecord::~OPimRecord() { |
10 | } | 12 | } |
11 | OPimRecord::OPimRecord( OPimRecord& rec ) | 13 | OPimRecord::OPimRecord( const OPimRecord& rec ) |
12 | : Qtopia::Record( rec ) | 14 | : Qtopia::Record( rec ) |
13 | { | 15 | { |
@@ -16,7 +18,7 @@ OPimRecord::OPimRecord( OPimRecord& rec ) | |||
16 | 18 | ||
17 | OPimRecord &OPimRecord::operator=( const OPimRecord& rec) { | 19 | OPimRecord &OPimRecord::operator=( const OPimRecord& rec) { |
18 | /* how do I call the parent copy operator ? */ | 20 | Qtopia::Record::operator=( rec ); |
19 | setUid( rec.uid() ); | 21 | m_relations = rec.m_relations; |
20 | setCategories( rec.categories() ); | 22 | |
21 | return *this; | 23 | return *this; |
22 | } | 24 | } |
@@ -26,5 +28,5 @@ QStringList OPimRecord::categoryNames()const { | |||
26 | return list; | 28 | return list; |
27 | } | 29 | } |
28 | void OPimRecord::setCategoryName( const QStringList& ) { | 30 | void OPimRecord::setCategoryNames( const QStringList& ) { |
29 | 31 | ||
30 | } | 32 | } |
@@ -89,2 +91,16 @@ void OPimRecord::setRelations( const QString& app, QArray<int> ids ) { | |||
89 | m_relations.replace( app, tmp ); | 91 | m_relations.replace( app, tmp ); |
90 | } | 92 | } |
93 | QString OPimRecord::crossToString()const { | ||
94 | QString str; | ||
95 | QMap<QString, QArray<int> >::ConstIterator it; | ||
96 | for (it = m_relations.begin(); it != m_relations.end(); ++it ) { | ||
97 | QArray<int> id = it.data(); | ||
98 | for ( uint i = 0; i < id.size(); ++i ) { | ||
99 | str += it.key() + "," + QString::number( i ) + ";"; | ||
100 | } | ||
101 | } | ||
102 | str = str.remove( str.length()-1, 1); // strip the ; | ||
103 | //qWarning("IDS " + str ); | ||
104 | |||
105 | return str; | ||
106 | } | ||
diff --git a/libopie/pim/opimrecord.h b/libopie/pim/opimrecord.h index a0e0413..18112d4 100644 --- a/libopie/pim/opimrecord.h +++ b/libopie/pim/opimrecord.h | |||
@@ -20,5 +20,5 @@ public: | |||
20 | * copy c'tor | 20 | * copy c'tor |
21 | */ | 21 | */ |
22 | OPimRecord( OPimRecord& rec ); | 22 | OPimRecord( const OPimRecord& rec ); |
23 | 23 | ||
24 | /** | 24 | /** |
@@ -35,5 +35,5 @@ public: | |||
35 | * set category names they will be resolved | 35 | * set category names they will be resolved |
36 | */ | 36 | */ |
37 | void setCategoryName( const QStringList& ); | 37 | void setCategoryNames( const QStringList& ); |
38 | 38 | ||
39 | /** | 39 | /** |
diff --git a/libopie/pim/otodo.cpp b/libopie/pim/otodo.cpp index d8e0447..3c93838 100644 --- a/libopie/pim/otodo.cpp +++ b/libopie/pim/otodo.cpp | |||
@@ -12,12 +12,11 @@ | |||
12 | #include <qpe/categoryselect.h> | 12 | #include <qpe/categoryselect.h> |
13 | 13 | ||
14 | #include "todoevent.h" | ||
15 | 14 | ||
16 | using namespace Opie; | ||
17 | 15 | ||
18 | Qtopia::UidGen ToDoEvent::m_gen; | 16 | #include "otodo.h" |
19 | 17 | ||
20 | struct ToDoEvent::ToDoEventData : public QShared { | 18 | |
21 | ToDoEventData() : QShared() { | 19 | struct OTodo::OTodoData : public QShared { |
20 | OTodoData() : QShared() { | ||
22 | }; | 21 | }; |
23 | 22 | ||
@@ -30,6 +29,4 @@ struct ToDoEvent::ToDoEventData : public QShared { | |||
30 | QString sum; | 29 | QString sum; |
31 | QMap<QString, QString> extra; | 30 | QMap<QString, QString> extra; |
32 | QMap<QString, QArray<int> > relations; | ||
33 | int uid; | ||
34 | ushort prog; | 31 | ushort prog; |
35 | bool hasAlarmDateTime :1; | 32 | bool hasAlarmDateTime :1; |
@@ -37,13 +34,13 @@ struct ToDoEvent::ToDoEventData : public QShared { | |||
37 | }; | 34 | }; |
38 | 35 | ||
39 | ToDoEvent::ToDoEvent(const ToDoEvent &event ) | 36 | OTodo::OTodo(const OTodo &event ) |
40 | : data( event.data ) | 37 | : OPimRecord( event ), data( event.data ) |
41 | { | 38 | { |
42 | data->ref(); | 39 | data->ref(); |
43 | //qWarning("ref up"); | 40 | //qWarning("ref up"); |
44 | } | 41 | } |
45 | ToDoEvent::~ToDoEvent() { | 42 | OTodo::~OTodo() { |
46 | if ( data->deref() ) { | 43 | if ( data->deref() ) { |
47 | //qWarning("ToDoEvent::dereffing"); | 44 | //qWarning("OTodo::dereffing"); |
48 | delete data; | 45 | delete data; |
49 | data = 0l; | 46 | data = 0l; |
@@ -51,5 +48,5 @@ ToDoEvent::~ToDoEvent() { | |||
51 | } | 48 | } |
52 | 49 | ||
53 | ToDoEvent::ToDoEvent(bool completed, int priority, | 50 | OTodo::OTodo(bool completed, int priority, |
54 | const QStringList &category, | 51 | const QStringList &category, |
55 | const QString& summary, | 52 | const QString& summary, |
@@ -57,33 +54,20 @@ ToDoEvent::ToDoEvent(bool completed, int priority, | |||
57 | ushort progress, | 54 | ushort progress, |
58 | bool hasDate, QDate date, int uid ) | 55 | bool hasDate, QDate date, int uid ) |
56 | : OPimRecord( uid ) | ||
59 | { | 57 | { |
60 | //qWarning("ToDoEventData"); | 58 | //qWarning("OTodoData"); |
61 | data = new ToDoEventData; | 59 | setCategories( idsFromString( category.join(";") ) ); |
60 | data = new OTodoData; | ||
62 | data->date = date; | 61 | data->date = date; |
63 | data->isCompleted = completed; | 62 | data->isCompleted = completed; |
64 | data->hasDate = hasDate; | 63 | data->hasDate = hasDate; |
65 | data->priority = priority; | 64 | data->priority = priority; |
66 | data->category = category; | ||
67 | data->sum = summary; | 65 | data->sum = summary; |
68 | data->prog = progress; | 66 | data->prog = progress; |
69 | data->desc = Qtopia::simplifyMultiLineSpace(description ); | 67 | data->desc = Qtopia::simplifyMultiLineSpace(description ); |
70 | if (uid == -1 ) { | ||
71 | uid = m_gen.generate(); | ||
72 | |||
73 | }// generated the ids | ||
74 | m_gen.store( uid ); | ||
75 | |||
76 | data->uid = uid; | ||
77 | data->hasAlarmDateTime = false; | 68 | data->hasAlarmDateTime = false; |
78 | 69 | ||
79 | } | 70 | } |
80 | QArray<int> ToDoEvent::categories()const | 71 | bool OTodo::match( const QRegExp ®Exp )const |
81 | { | ||
82 | qWarning( "ToDoEvent:cats" + data->category.join(";") ); | ||
83 | QArray<int> array(data->category.count() ); // currently the datebook can be only in one category | ||
84 | array = Qtopia::Record::idsFromString( data->category.join(";") ); | ||
85 | return array; | ||
86 | } | ||
87 | bool ToDoEvent::match( const QRegExp ®Exp )const | ||
88 | { | 72 | { |
89 | if( QString::number( data->priority ).find( regExp ) != -1 ){ | 73 | if( QString::number( data->priority ).find( regExp ) != -1 ){ |
@@ -93,184 +77,88 @@ bool ToDoEvent::match( const QRegExp ®Exp )const | |||
93 | }else if(data->desc.find( regExp ) != -1 ){ | 77 | }else if(data->desc.find( regExp ) != -1 ){ |
94 | return true; | 78 | return true; |
79 | }else if(data->sum.find( regExp ) != -1 ) { | ||
80 | return true; | ||
95 | } | 81 | } |
96 | return false; | 82 | return false; |
97 | } | 83 | } |
98 | bool ToDoEvent::isCompleted() const | 84 | bool OTodo::isCompleted() const |
99 | { | 85 | { |
100 | return data->isCompleted; | 86 | return data->isCompleted; |
101 | } | 87 | } |
102 | bool ToDoEvent::hasDueDate() const | 88 | bool OTodo::hasDueDate() const |
103 | { | 89 | { |
104 | return data->hasDate; | 90 | return data->hasDate; |
105 | } | 91 | } |
106 | bool ToDoEvent::hasAlarmDateTime() const | 92 | bool OTodo::hasAlarmDateTime() const |
107 | { | 93 | { |
108 | return data->hasAlarmDateTime; | 94 | return data->hasAlarmDateTime; |
109 | } | 95 | } |
110 | int ToDoEvent::priority()const | 96 | int OTodo::priority()const |
111 | { | 97 | { |
112 | return data->priority; | 98 | return data->priority; |
113 | } | 99 | } |
114 | QStringList ToDoEvent::allCategories()const | 100 | QString OTodo::summary() const |
115 | { | ||
116 | return data->category; | ||
117 | } | ||
118 | QString ToDoEvent::extra(const QString& )const | ||
119 | { | ||
120 | return QString::null; | ||
121 | } | ||
122 | QString ToDoEvent::summary() const | ||
123 | { | 101 | { |
124 | return data->sum; | 102 | return data->sum; |
125 | } | 103 | } |
126 | ushort ToDoEvent::progress() const | 104 | ushort OTodo::progress() const |
127 | { | 105 | { |
128 | return data->prog; | 106 | return data->prog; |
129 | } | 107 | } |
130 | QStringList ToDoEvent::relatedApps() const | 108 | QDate OTodo::dueDate()const |
131 | { | ||
132 | QStringList list; | ||
133 | QMap<QString, QArray<int> >::ConstIterator it; | ||
134 | for ( it = data->relations.begin(); it != data->relations.end(); ++it ) { | ||
135 | list << it.key(); | ||
136 | } | ||
137 | return list; | ||
138 | } | ||
139 | QArray<int> ToDoEvent::relations( const QString& app)const | ||
140 | { | ||
141 | QArray<int> tmp; | ||
142 | QMap<QString, QArray<int> >::ConstIterator it; | ||
143 | it = data->relations.find( app); | ||
144 | if ( it != data->relations.end() ) | ||
145 | tmp = it.data(); | ||
146 | return tmp; | ||
147 | } | ||
148 | void ToDoEvent::insertCategory(const QString &str ) | ||
149 | { | ||
150 | changeOrModify(); | ||
151 | qWarning("insert category;" + str ); | ||
152 | data->category.append( str ); | ||
153 | } | ||
154 | void ToDoEvent::clearCategories() | ||
155 | { | ||
156 | changeOrModify(); | ||
157 | data->category.clear(); | ||
158 | } | ||
159 | void ToDoEvent::setCategories(const QStringList &list ) | ||
160 | { | ||
161 | changeOrModify(); | ||
162 | qWarning("set categories" + list.join(";") ); | ||
163 | data->category = list; | ||
164 | } | ||
165 | QDate ToDoEvent::dueDate()const | ||
166 | { | 109 | { |
167 | return data->date; | 110 | return data->date; |
168 | } | 111 | } |
169 | 112 | ||
170 | QDateTime ToDoEvent::alarmDateTime() const | 113 | QDateTime OTodo::alarmDateTime() const |
171 | { | 114 | { |
172 | return data->alarmDateTime; | 115 | return data->alarmDateTime; |
173 | } | 116 | } |
174 | 117 | ||
175 | QString ToDoEvent::description()const | 118 | QString OTodo::description()const |
176 | { | 119 | { |
177 | return data->desc; | 120 | return data->desc; |
178 | } | 121 | } |
179 | void ToDoEvent::setCompleted( bool completed ) | 122 | void OTodo::setCompleted( bool completed ) |
180 | { | 123 | { |
181 | changeOrModify(); | 124 | changeOrModify(); |
182 | data->isCompleted = completed; | 125 | data->isCompleted = completed; |
183 | } | 126 | } |
184 | void ToDoEvent::setHasDueDate( bool hasDate ) | 127 | void OTodo::setHasDueDate( bool hasDate ) |
185 | { | 128 | { |
186 | changeOrModify(); | 129 | changeOrModify(); |
187 | data->hasDate = hasDate; | 130 | data->hasDate = hasDate; |
188 | } | 131 | } |
189 | void ToDoEvent::setHasAlarmDateTime( bool hasAlarmDateTime ) | 132 | void OTodo::setHasAlarmDateTime( bool hasAlarmDateTime ) |
190 | { | 133 | { |
191 | changeOrModify(); | 134 | changeOrModify(); |
192 | data->hasAlarmDateTime = hasAlarmDateTime; | 135 | data->hasAlarmDateTime = hasAlarmDateTime; |
193 | } | 136 | } |
194 | void ToDoEvent::setDescription(const QString &desc ) | 137 | void OTodo::setDescription(const QString &desc ) |
195 | { | 138 | { |
196 | changeOrModify(); | 139 | changeOrModify(); |
197 | data->desc = Qtopia::simplifyMultiLineSpace(desc ); | 140 | data->desc = Qtopia::simplifyMultiLineSpace(desc ); |
198 | } | 141 | } |
199 | void ToDoEvent::setExtra( const QString&, const QString& ) | 142 | void OTodo::setSummary( const QString& sum ) |
200 | { | ||
201 | |||
202 | } | ||
203 | void ToDoEvent::setSummary( const QString& sum ) | ||
204 | { | 143 | { |
205 | changeOrModify(); | 144 | changeOrModify(); |
206 | data->sum = sum; | 145 | data->sum = sum; |
207 | } | 146 | } |
208 | void ToDoEvent::setCategory( const QString &cat ) | 147 | void OTodo::setPriority(int prio ) |
209 | { | ||
210 | changeOrModify(); | ||
211 | //qWarning("setCategory %s", cat.latin1() ); | ||
212 | data->category.clear(); | ||
213 | data->category << cat; | ||
214 | } | ||
215 | void ToDoEvent::setPriority(int prio ) | ||
216 | { | 148 | { |
217 | changeOrModify(); | 149 | changeOrModify(); |
218 | data->priority = prio; | 150 | data->priority = prio; |
219 | } | 151 | } |
220 | void ToDoEvent::setDueDate( QDate date ) | 152 | void OTodo::setDueDate( QDate date ) |
221 | { | 153 | { |
222 | changeOrModify(); | 154 | changeOrModify(); |
223 | data->date = date; | 155 | data->date = date; |
224 | } | 156 | } |
225 | void ToDoEvent::setAlarmDateTime( const QDateTime& alarm ) | 157 | void OTodo::setAlarmDateTime( const QDateTime& alarm ) |
226 | { | 158 | { |
227 | changeOrModify(); | 159 | changeOrModify(); |
228 | data->alarmDateTime = alarm; | 160 | data->alarmDateTime = alarm; |
229 | } | 161 | } |
230 | void ToDoEvent::addRelated( const QString &app, int id ) | 162 | bool OTodo::isOverdue( ) |
231 | { | ||
232 | changeOrModify(); | ||
233 | |||
234 | QMap<QString, QArray<int> >::Iterator it; | ||
235 | QArray<int> tmp; | ||
236 | it = data->relations.find( app ); | ||
237 | if ( it == data->relations.end() ) { | ||
238 | tmp.resize(1 ); | ||
239 | tmp[0] = id; | ||
240 | }else{ | ||
241 | tmp = it.data(); | ||
242 | tmp.resize( tmp.size() + 1 ); | ||
243 | tmp[tmp.size() - 1] = id; | ||
244 | } | ||
245 | data->relations.replace( app, tmp ); | ||
246 | } | ||
247 | void ToDoEvent::addRelated(const QString& app, QArray<int> ids ) | ||
248 | { | ||
249 | changeOrModify(); | ||
250 | |||
251 | QMap<QString, QArray<int> >::Iterator it; | ||
252 | QArray<int> tmp; | ||
253 | it = data->relations.find( app); | ||
254 | if ( it == data->relations.end() ) { // not there | ||
255 | /** tmp.resize( ids.size() ); stupid?? | ||
256 | */ | ||
257 | tmp = ids; | ||
258 | }else{ | ||
259 | tmp = it.data(); | ||
260 | int offset = tmp.size()-1; | ||
261 | tmp.resize( tmp.size() + ids.size() ); | ||
262 | for (uint i = 0; i < ids.size(); i++ ) { | ||
263 | tmp[offset+i] = ids[i]; | ||
264 | } | ||
265 | |||
266 | } | ||
267 | data->relations.replace( app, tmp ); | ||
268 | } | ||
269 | void ToDoEvent::clearRelated( const QString& app ) | ||
270 | { | ||
271 | changeOrModify(); | ||
272 | data->relations.remove( app ); | ||
273 | } | ||
274 | bool ToDoEvent::isOverdue( ) | ||
275 | { | 163 | { |
276 | if( data->hasDate ) | 164 | if( data->hasDate ) |
@@ -278,13 +166,16 @@ bool ToDoEvent::isOverdue( ) | |||
278 | return false; | 166 | return false; |
279 | } | 167 | } |
280 | void ToDoEvent::setProgress(ushort progress ) | 168 | void OTodo::setProgress(ushort progress ) |
281 | { | 169 | { |
282 | changeOrModify(); | 170 | changeOrModify(); |
283 | data->prog = progress; | 171 | data->prog = progress; |
284 | } | 172 | } |
173 | QString OTodo::toShortText() const { | ||
174 | return summary(); | ||
175 | } | ||
285 | /*! | 176 | /*! |
286 | Returns a richt text string | 177 | Returns a richt text string |
287 | */ | 178 | */ |
288 | QString ToDoEvent::richText() const | 179 | QString OTodo::toRichText() const |
289 | { | 180 | { |
290 | QString text; | 181 | QString text; |
@@ -317,26 +208,12 @@ QString ToDoEvent::richText() const | |||
317 | } | 208 | } |
318 | 209 | ||
319 | // Open database of all categories and get the list of | ||
320 | // the categories this todoevent belongs to. | ||
321 | // Then print them... | ||
322 | // I am not sure whether there is no better way doing this !? | ||
323 | Categories catdb; | ||
324 | bool firstloop = true; | ||
325 | catdb.load( categoryFileName() ); | ||
326 | catlist = allCategories(); | ||
327 | |||
328 | text += "<b>" + QObject::tr( "Category:") + "</b> "; | 210 | text += "<b>" + QObject::tr( "Category:") + "</b> "; |
329 | for ( QStringList::Iterator it = catlist.begin(); it != catlist.end(); ++it ) { | 211 | text += categoryNames().join(", "); |
330 | if (!firstloop){ | ||
331 | text += ", "; | ||
332 | } | ||
333 | firstloop = false; | ||
334 | text += catdb.label ("todo", (*it).toInt()); | ||
335 | } | ||
336 | text += "<br>"; | 212 | text += "<br>"; |
213 | |||
337 | return text; | 214 | return text; |
338 | } | 215 | } |
339 | 216 | ||
340 | bool ToDoEvent::operator<( const ToDoEvent &toDoEvent )const{ | 217 | bool OTodo::operator<( const OTodo &toDoEvent )const{ |
341 | if( !hasDueDate() && !toDoEvent.hasDueDate() ) return true; | 218 | if( !hasDueDate() && !toDoEvent.hasDueDate() ) return true; |
342 | if( !hasDueDate() && toDoEvent.hasDueDate() ) return false; | 219 | if( !hasDueDate() && toDoEvent.hasDueDate() ) return false; |
@@ -350,5 +227,5 @@ bool ToDoEvent::operator<( const ToDoEvent &toDoEvent )const{ | |||
350 | return false; | 227 | return false; |
351 | } | 228 | } |
352 | bool ToDoEvent::operator<=(const ToDoEvent &toDoEvent )const | 229 | bool OTodo::operator<=(const OTodo &toDoEvent )const |
353 | { | 230 | { |
354 | if( !hasDueDate() && !toDoEvent.hasDueDate() ) return true; | 231 | if( !hasDueDate() && !toDoEvent.hasDueDate() ) return true; |
@@ -363,5 +240,5 @@ bool ToDoEvent::operator<=(const ToDoEvent &toDoEvent )const | |||
363 | return true; | 240 | return true; |
364 | } | 241 | } |
365 | bool ToDoEvent::operator>(const ToDoEvent &toDoEvent )const | 242 | bool OTodo::operator>(const OTodo &toDoEvent )const |
366 | { | 243 | { |
367 | if( !hasDueDate() && !toDoEvent.hasDueDate() ) return false; | 244 | if( !hasDueDate() && !toDoEvent.hasDueDate() ) return false; |
@@ -376,5 +253,5 @@ bool ToDoEvent::operator>(const ToDoEvent &toDoEvent )const | |||
376 | return false; | 253 | return false; |
377 | } | 254 | } |
378 | bool ToDoEvent::operator>=(const ToDoEvent &toDoEvent )const | 255 | bool OTodo::operator>=(const OTodo &toDoEvent )const |
379 | { | 256 | { |
380 | if( !hasDueDate() && !toDoEvent.hasDueDate() ) return true; | 257 | if( !hasDueDate() && !toDoEvent.hasDueDate() ) return true; |
@@ -389,5 +266,5 @@ bool ToDoEvent::operator>=(const ToDoEvent &toDoEvent )const | |||
389 | return true; | 266 | return true; |
390 | } | 267 | } |
391 | bool ToDoEvent::operator==(const ToDoEvent &toDoEvent )const | 268 | bool OTodo::operator==(const OTodo &toDoEvent )const |
392 | { | 269 | { |
393 | if( data->priority == toDoEvent.data->priority && | 270 | if( data->priority == toDoEvent.data->priority && |
@@ -405,5 +282,5 @@ bool ToDoEvent::operator==(const ToDoEvent &toDoEvent )const | |||
405 | return false; | 282 | return false; |
406 | } | 283 | } |
407 | void ToDoEvent::deref() { | 284 | void OTodo::deref() { |
408 | 285 | ||
409 | //qWarning("deref in ToDoEvent"); | 286 | //qWarning("deref in ToDoEvent"); |
@@ -414,21 +291,19 @@ void ToDoEvent::deref() { | |||
414 | } | 291 | } |
415 | } | 292 | } |
416 | ToDoEvent &ToDoEvent::operator=(const ToDoEvent &item ) | 293 | OTodo &OTodo::operator=(const OTodo &item ) |
417 | { | 294 | { |
295 | OPimRecord::operator=( item ); | ||
418 | //qWarning("operator= ref "); | 296 | //qWarning("operator= ref "); |
419 | item.data->ref(); | 297 | item.data->ref(); |
420 | deref(); | 298 | deref(); |
421 | 299 | ||
422 | data = item.data; | ||
423 | |||
424 | |||
425 | return *this; | 300 | return *this; |
426 | } | 301 | } |
427 | 302 | ||
428 | QMap<int, QString> ToDoEvent::toMap() const { | 303 | QMap<int, QString> OTodo::toMap() const { |
429 | QMap<int, QString> map; | 304 | QMap<int, QString> map; |
430 | 305 | ||
431 | map.insert( Uid, QString::number( data->uid ) ); | 306 | map.insert( Uid, QString::number( uid() ) ); |
432 | map.insert( Category, data->category.join(";") ); | 307 | map.insert( Category, idsToString( categories() ) ); |
433 | map.insert( HasDate, QString::number( data->hasDate ) ); | 308 | map.insert( HasDate, QString::number( data->hasDate ) ); |
434 | map.insert( Completed, QString::number( data->isCompleted ) ); | 309 | map.insert( Completed, QString::number( data->isCompleted ) ); |
@@ -447,30 +322,5 @@ QMap<int, QString> ToDoEvent::toMap() const { | |||
447 | } | 322 | } |
448 | 323 | ||
449 | 324 | QMap<QString, QString> OTodo::toExtraMap()const { | |
450 | QString ToDoEvent::crossToString()const { | ||
451 | QString str; | ||
452 | QMap<QString, QArray<int> >::ConstIterator it; | ||
453 | for (it = data->relations.begin(); it != data->relations.end(); ++it ) { | ||
454 | QArray<int> id = it.data(); | ||
455 | for ( uint i = 0; i < id.size(); ++i ) { | ||
456 | str += it.key() + "," + QString::number( i ) + ";"; | ||
457 | } | ||
458 | } | ||
459 | str = str.remove( str.length()-1, 1); // strip the ; | ||
460 | //qWarning("IDS " + str ); | ||
461 | |||
462 | return str; | ||
463 | } | ||
464 | int ToDoEvent::uid()const { | ||
465 | return data->uid; | ||
466 | } | ||
467 | void ToDoEvent::setUid( int id ) { | ||
468 | if ( id == -1 ) | ||
469 | id = m_gen.generate(); | ||
470 | m_gen.store(id ); | ||
471 | changeOrModify(); | ||
472 | data->uid = id; | ||
473 | } | ||
474 | QMap<QString, QString> ToDoEvent::extras()const { | ||
475 | return data->extra; | 325 | return data->extra; |
476 | } | 326 | } |
@@ -480,24 +330,21 @@ QMap<QString, QString> ToDoEvent::extras()const { | |||
480 | * right in place | 330 | * right in place |
481 | */ | 331 | */ |
482 | void ToDoEvent::changeOrModify() { | 332 | void OTodo::changeOrModify() { |
483 | if ( data->count != 1 ) { | 333 | if ( data->count != 1 ) { |
484 | //qWarning("changeOrModify"); | 334 | //qWarning("changeOrModify"); |
485 | data->deref(); | 335 | data->deref(); |
486 | ToDoEventData* d2 = new ToDoEventData(); | 336 | OTodoData* d2 = new OTodoData(); |
487 | copy(data, d2 ); | 337 | copy(data, d2 ); |
488 | data = d2; | 338 | data = d2; |
489 | } | 339 | } |
490 | } | 340 | } |
491 | void ToDoEvent::copy( ToDoEventData* src, ToDoEventData* dest ) { | 341 | void OTodo::copy( OTodoData* src, OTodoData* dest ) { |
492 | dest->date = src->date; | 342 | dest->date = src->date; |
493 | dest->isCompleted = src->isCompleted; | 343 | dest->isCompleted = src->isCompleted; |
494 | dest->hasDate = src->hasDate; | 344 | dest->hasDate = src->hasDate; |
495 | dest->priority = src->priority; | 345 | dest->priority = src->priority; |
496 | dest->category = src->category; | ||
497 | dest->desc = src->desc; | 346 | dest->desc = src->desc; |
498 | dest->sum = src->sum; | 347 | dest->sum = src->sum; |
499 | dest->extra = src->extra; | 348 | dest->extra = src->extra; |
500 | dest->relations = src->relations; | ||
501 | dest->uid = src->uid; | ||
502 | dest->prog = src->prog; | 349 | dest->prog = src->prog; |
503 | dest->hasAlarmDateTime = src->hasAlarmDateTime; | 350 | dest->hasAlarmDateTime = src->hasAlarmDateTime; |
diff --git a/libopie/pim/otodo.h b/libopie/pim/otodo.h index 429108a..e1729db 100644 --- a/libopie/pim/otodo.h +++ b/libopie/pim/otodo.h | |||
@@ -19,5 +19,5 @@ | |||
19 | class OTodo : public OPimRecord { | 19 | class OTodo : public OPimRecord { |
20 | public: | 20 | public: |
21 | typedef QValueList<ToDoEvent> ValueList; | 21 | typedef QValueList<OTodo> ValueList; |
22 | enum RecordFields { | 22 | enum RecordFields { |
23 | Uid = Qtopia::UID_ID, | 23 | Uid = Qtopia::UID_ID, |
@@ -119,4 +119,11 @@ public: | |||
119 | QString toRichText() const; | 119 | QString toRichText() const; |
120 | 120 | ||
121 | /** | ||
122 | * reimplementation | ||
123 | */ | ||
124 | QString type()const; | ||
125 | QString toShortText()const; | ||
126 | QMap<QString, QString> toExtraMap()const; | ||
127 | QString recordField(int id )const; | ||
121 | 128 | ||
122 | /** | 129 | /** |
@@ -184,22 +191,21 @@ public: | |||
184 | bool operator>=(const OTodo &toDoEvent)const; | 191 | bool operator>=(const OTodo &toDoEvent)const; |
185 | bool operator==(const OTodo &toDoEvent )const; | 192 | bool operator==(const OTodo &toDoEvent )const; |
186 | ToDoEvent &operator=(const OTodo &toDoEvent ); | 193 | OTodo &operator=(const OTodo &toDoEvent ); |
187 | 194 | ||
188 | private: | 195 | private: |
189 | class OTodoPrivate; | 196 | class OTodoPrivate; |
190 | struct OTodoEventData; | 197 | struct OTodoData; |
191 | 198 | ||
192 | void deref(); | 199 | void deref(); |
193 | void changeOrModify(); | 200 | void changeOrModify(); |
194 | void copy( OTodoData* src, OTodoData* dest ); | 201 | void copy( OTodoData* src, OTodoData* dest ); |
195 | ToDoEventPrivate *d; | 202 | OTodoPrivate *d; |
196 | ToDoEventData *data; | 203 | OTodoData *data; |
197 | 204 | ||
198 | static Qtopia::UidGen m_gen; | ||
199 | }; | ||
200 | inline bool ToDoEvent::operator!=(const ToDoEvent &toDoEvent )const { | ||
201 | return !(*this == toDoEvent); | ||
202 | } | ||
203 | }; | 205 | }; |
206 | inline bool OTodo::operator!=(const OTodo &toDoEvent )const { | ||
207 | return !(*this == toDoEvent); | ||
208 | } | ||
209 | |||
204 | 210 | ||
205 | #endif | 211 | #endif |