author | eilers <eilers> | 2002-10-16 10:55:17 (UTC) |
---|---|---|
committer | eilers <eilers> | 2002-10-16 10:55:17 (UTC) |
commit | 2bfae6336f88a460311abaf727256c3413b27f67 (patch) (unidiff) | |
tree | f554fcecb260ef506a839f4d7994f427ad184555 /core/pim | |
parent | f9756ca203a06fa60413ef1a96416d87b9dc1a6b (diff) | |
download | opie-2bfae6336f88a460311abaf727256c3413b27f67.zip opie-2bfae6336f88a460311abaf727256c3413b27f67.tar.gz opie-2bfae6336f88a460311abaf727256c3413b27f67.tar.bz2 |
Fixed reload after sync- bug
-rw-r--r-- | core/pim/addressbook/TODO | 8 | ||||
-rw-r--r-- | core/pim/addressbook/abtable.cpp | 21 | ||||
-rw-r--r-- | core/pim/addressbook/abtable.h | 5 | ||||
-rw-r--r-- | core/pim/addressbook/addressbook.cpp | 56 |
4 files changed, 25 insertions, 65 deletions
diff --git a/core/pim/addressbook/TODO b/core/pim/addressbook/TODO index 32d2838..7bc906d 100644 --- a/core/pim/addressbook/TODO +++ b/core/pim/addressbook/TODO | |||
@@ -1,7 +1,8 @@ | |||
1 | Stuff todo: | 1 | Stuff todo: |
2 | 2 | ||
3 | Urgent: | 3 | Urgent: |
4 | - Syncing: abtable not reloaded after sync. | 4 | |
5 | - Font menu is invisible using german translation | ||
5 | 6 | ||
6 | Important: | 7 | Important: |
7 | 8 | ||
@@ -20,7 +21,8 @@ Less important: | |||
20 | placed verticaly or horizontally (configurable) | 21 | placed verticaly or horizontally (configurable) |
21 | 22 | ||
22 | 23 | ||
23 | Should be Fixed: | 24 | Should be Fixed (not absolute sure, need validation): |
24 | - "Nonenglish" translation bug has to be fixed. | 25 | - "Nonenglish" translation bug has to be fixed. |
25 | 26 | ||
26 | Fixed: \ No newline at end of file | 27 | Fixed: |
28 | - Syncing: abtable not reloaded after sync. | ||
diff --git a/core/pim/addressbook/abtable.cpp b/core/pim/addressbook/abtable.cpp index 70c070f..91a7171 100644 --- a/core/pim/addressbook/abtable.cpp +++ b/core/pim/addressbook/abtable.cpp | |||
@@ -470,17 +470,16 @@ void AbTable::resizeRows() { | |||
470 | } | 470 | } |
471 | 471 | ||
472 | 472 | ||
473 | bool AbTable::save( const QString& /* fn */ ) | 473 | bool AbTable::save() |
474 | { | 474 | { |
475 | // QTime t; | 475 | // QTime t; |
476 | // t.start(); | 476 | // t.start(); |
477 | qWarning("abtable:Save data"); | 477 | qWarning("abtable:Save data"); |
478 | m_contactdb.save(); | 478 | |
479 | 479 | return m_contactdb.save(); | |
480 | return true; | ||
481 | } | 480 | } |
482 | 481 | ||
483 | void AbTable::load( const QString& /* fn */ ) | 482 | void AbTable::load() |
484 | { | 483 | { |
485 | setSorting( false ); | 484 | setSorting( false ); |
486 | setUpdatesEnabled( FALSE ); | 485 | setUpdatesEnabled( FALSE ); |
@@ -494,15 +493,19 @@ void AbTable::load( const QString& /* fn */ ) | |||
494 | for ( it = list.begin(); it != list.end(); ++it ) | 493 | for ( it = list.begin(); it != list.end(); ++it ) |
495 | insertIntoTable( *it, row++ ); | 494 | insertIntoTable( *it, row++ ); |
496 | 495 | ||
497 | resort(); | ||
498 | |||
499 | setUpdatesEnabled( TRUE ); | 496 | setUpdatesEnabled( TRUE ); |
500 | 497 | ||
501 | setSorting( true ); | 498 | setSorting( true ); |
502 | //resort(); | 499 | resort(); |
503 | } | 500 | } |
504 | 501 | ||
505 | 502 | ||
503 | void AbTable::reload() | ||
504 | { | ||
505 | m_contactdb.reload(); | ||
506 | load(); | ||
507 | } | ||
508 | |||
506 | void AbTable::realignTable( int row ) | 509 | void AbTable::realignTable( int row ) |
507 | { | 510 | { |
508 | QTableItem *ti1, | 511 | QTableItem *ti1, |
diff --git a/core/pim/addressbook/abtable.h b/core/pim/addressbook/abtable.h index 84aef1e..80c3ca0 100644 --- a/core/pim/addressbook/abtable.h +++ b/core/pim/addressbook/abtable.h | |||
@@ -77,8 +77,9 @@ public: | |||
77 | void clearFindRow() { currFindRow = -2; } | 77 | void clearFindRow() { currFindRow = -2; } |
78 | void loadFields(); | 78 | void loadFields(); |
79 | void refresh(); | 79 | void refresh(); |
80 | bool save( const QString &fn ); | 80 | bool save(); |
81 | void load( const QString &fn ); | 81 | void load(); |
82 | void reload(); | ||
82 | 83 | ||
83 | // addresspicker mode | 84 | // addresspicker mode |
84 | void setChoiceNames( const QStringList& list); | 85 | void setChoiceNames( const QStringList& list); |
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp index 2eb9ddf..93581e8 100644 --- a/core/pim/addressbook/addressbook.cpp +++ b/core/pim/addressbook/addressbook.cpp | |||
@@ -67,18 +67,6 @@ | |||
67 | #include <qdatetime.h> | 67 | #include <qdatetime.h> |
68 | 68 | ||
69 | #include "picker.h" | 69 | #include "picker.h" |
70 | static QString addressbookOldXMLFilename() | ||
71 | { | ||
72 | QString filename = QPEApplication::documentDir() + "addressbook.xml"; | ||
73 | return filename; | ||
74 | } | ||
75 | |||
76 | static QString addressbookXMLFilename() | ||
77 | { | ||
78 | QString filename = Global::applicationFileName("addressbook", | ||
79 | "addressbook.xml"); | ||
80 | return filename; | ||
81 | } | ||
82 | 70 | ||
83 | static QString addressbookPersonalVCardName() | 71 | static QString addressbookPersonalVCardName() |
84 | { | 72 | { |
@@ -202,21 +190,6 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name, | |||
202 | a->addTo( edit ); | 190 | a->addTo( edit ); |
203 | 191 | ||
204 | // Create Views | 192 | // Create Views |
205 | |||
206 | // This is safe to call without checking to see if it exists... | ||
207 | // not to mention it also does the necessary stuff for the | ||
208 | // journaling... | ||
209 | QString str = addressbookXMLFilename(); | ||
210 | if ( str.isNull() ) { | ||
211 | QMessageBox::warning( | ||
212 | this, | ||
213 | tr("Out of Space"), | ||
214 | tr("There is not enough space to create\n" | ||
215 | "neccessary startup files.\n" | ||
216 | "\nFree up some space before\nentering data!") | ||
217 | ); | ||
218 | } | ||
219 | |||
220 | listContainer = new QWidget( this ); | 193 | listContainer = new QWidget( this ); |
221 | 194 | ||
222 | QVBoxLayout *vb = new QVBoxLayout( listContainer ); | 195 | QVBoxLayout *vb = new QVBoxLayout( listContainer ); |
@@ -230,11 +203,7 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name, | |||
230 | 203 | ||
231 | mView = 0; | 204 | mView = 0; |
232 | 205 | ||
233 | abList->load( addressbookXMLFilename() ); | 206 | abList->load(); |
234 | if ( QFile::exists(addressbookOldXMLFilename()) ) { | ||
235 | abList->load( addressbookOldXMLFilename() ); | ||
236 | QFile::remove(addressbookOldXMLFilename()); | ||
237 | } | ||
238 | 207 | ||
239 | pLabel = new LetterPicker( listContainer ); | 208 | pLabel = new LetterPicker( listContainer ); |
240 | connect(pLabel, SIGNAL(letterClicked(char)), this, SLOT(slotSetLetter(char))); | 209 | connect(pLabel, SIGNAL(letterClicked(char)), this, SLOT(slotSetLetter(char))); |
@@ -709,13 +678,13 @@ void AddressbookWindow::reload() | |||
709 | { | 678 | { |
710 | syncing = FALSE; | 679 | syncing = FALSE; |
711 | abList->clear(); | 680 | abList->clear(); |
712 | abList->load( addressbookXMLFilename() ); | 681 | abList->reload(); |
713 | } | 682 | } |
714 | 683 | ||
715 | void AddressbookWindow::flush() | 684 | void AddressbookWindow::flush() |
716 | { | 685 | { |
717 | syncing = TRUE; | 686 | syncing = TRUE; |
718 | abList->save( addressbookXMLFilename() ); | 687 | abList->save(); |
719 | } | 688 | } |
720 | 689 | ||
721 | 690 | ||
@@ -755,9 +724,8 @@ void AddressbookWindow::closeEvent( QCloseEvent *e ) | |||
755 | 724 | ||
756 | bool AddressbookWindow::save() | 725 | bool AddressbookWindow::save() |
757 | { | 726 | { |
758 | QString str = addressbookXMLFilename(); | 727 | if ( !abList->save() ) { |
759 | if ( str.isNull() ) { | 728 | if ( QMessageBox::critical( 0, tr( "Out of space" ), |
760 | if ( QMessageBox::critical( 0, tr("Out of space"), | ||
761 | tr("Unable to save information.\n" | 729 | tr("Unable to save information.\n" |
762 | "Free up some space\n" | 730 | "Free up some space\n" |
763 | "and try again.\n" | 731 | "and try again.\n" |
@@ -768,20 +736,6 @@ bool AddressbookWindow::save() | |||
768 | return TRUE; | 736 | return TRUE; |
769 | else | 737 | else |
770 | return FALSE; | 738 | return FALSE; |
771 | } else { | ||
772 | if ( !abList->save( str ) ) { | ||
773 | if ( QMessageBox::critical( 0, tr( "Out of space" ), | ||
774 | tr("Unable to save information.\n" | ||
775 | "Free up some space\n" | ||
776 | "and try again.\n" | ||
777 | "\nQuit anyway?"), | ||
778 | QMessageBox::Yes|QMessageBox::Escape, | ||
779 | QMessageBox::No|QMessageBox::Default ) | ||
780 | != QMessageBox::No ) | ||
781 | return TRUE; | ||
782 | else | ||
783 | return FALSE; | ||
784 | } | ||
785 | } | 739 | } |
786 | return TRUE; | 740 | return TRUE; |
787 | } | 741 | } |