author | zautrix <zautrix> | 2005-03-29 17:05:50 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-03-29 17:05:50 (UTC) |
commit | a7c827aa0e555206b60dec3bc07f7afab4352883 (patch) (unidiff) | |
tree | 56dbda15314f27ffabd143d09ea036b092444198 | |
parent | 3116f249fc6ccd0e067213e826d3d924f6986972 (diff) | |
download | kdepimpi-a7c827aa0e555206b60dec3bc07f7afab4352883.zip kdepimpi-a7c827aa0e555206b60dec3bc07f7afab4352883.tar.gz kdepimpi-a7c827aa0e555206b60dec3bc07f7afab4352883.tar.bz2 |
fixes
-rw-r--r-- | bin/kdepim/korganizer/germantranslation.txt | 2 | ||||
-rw-r--r-- | kabc/addresseedialog.cpp | 2 | ||||
-rw-r--r-- | kaddressbook/kabcore.cpp | 40 | ||||
-rw-r--r-- | kaddressbook/kabcore.h | 4 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 13 | ||||
-rw-r--r-- | libkdepim/externalapphandler.cpp | 9 | ||||
-rw-r--r-- | libkdepim/externalapphandler.h | 1 |
7 files changed, 59 insertions, 12 deletions
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt index b3a406c..1a045f3 100644 --- a/bin/kdepim/korganizer/germantranslation.txt +++ b/bin/kdepim/korganizer/germantranslation.txt | |||
@@ -1304,28 +1304,28 @@ | |||
1304 | { "Show current time","Zeige aktuelle Zeit" }, | 1304 | { "Show current time","Zeige aktuelle Zeit" }, |
1305 | { "Edit new item","Bearbeite neuen Eintrag" }, | 1305 | { "Edit new item","Bearbeite neuen Eintrag" }, |
1306 | { "Please select at least one\nof the types to search for:\n\nEvents\nTodos\nJournals","Bitte wählen Sie mindestens\neinen dieser Typen\num darin zu suchen:\n\nTermine\nTodos\nJournale" }, | 1306 | { "Please select at least one\nof the types to search for:\n\nEvents\nTodos\nJournals","Bitte wählen Sie mindestens\neinen dieser Typen\num darin zu suchen:\n\nTermine\nTodos\nJournale" }, |
1307 | { "There is no next alarm.","Es gibt keinen nächsten Alarm." }, | 1307 | { "There is no next alarm.","Es gibt keinen nächsten Alarm." }, |
1308 | { "%1 %2 - %3 (next event/todo with alarm)","%1 %2 - %3 (nächster Termin/Todo mit Alarm)" }, | 1308 | { "%1 %2 - %3 (next event/todo with alarm)","%1 %2 - %3 (nächster Termin/Todo mit Alarm)" }, |
1309 | { "The next alarm is in:\n","Der nächste Alarm ist in:\n" }, | 1309 | { "The next alarm is in:\n","Der nächste Alarm ist in:\n" }, |
1310 | { "%1 days\n","%1 Tagen\n" }, | 1310 | { "%1 days\n","%1 Tagen\n" }, |
1311 | { "1 day\n","1 Tag\n" }, | 1311 | { "1 day\n","1 Tag\n" }, |
1312 | { "%1 hours\n","%1 Stunden\n" }, | 1312 | { "%1 hours\n","%1 Stunden\n" }, |
1313 | { "1 hour\n","1 Stunde\n" }, | 1313 | { "1 hour\n","1 Stunde\n" }, |
1314 | { "%1 minutes\n","%1 Minuten\n" }, | 1314 | { "%1 minutes\n","%1 Minuten\n" }, |
1315 | { "1 minute\n","1 Minute\n" }, | 1315 | { "1 minute\n","1 Minute\n" }, |
1316 | { "Only one toolbar","Nur eine Toolbar" }, | 1316 | { "Only one toolbar","Nur eine Toolbar" }, |
1317 | { "Print","Drucke" }, | 1317 | { "Print","Drucke" }, |
1318 | { "Print selected event / todo...","Drucke ausgewählten Termin / Todo..." }, | 1318 | { "Print selected event / todo...","Drucke ausgewählten Termin / Todo..." }, |
1319 | { "There is nothing selected!","Es ist nichts ausgewählt!" }, | 1319 | { "There is nothing selected!","Es ist nichts ausgewählt!" }, |
1320 | { "\n\nDo you really want to print this item?","\n\nMöchten Sie wirklich diesen Eintrag ausdrucken? " }, | 1320 | { "\n\nDo you really want to print this item?","\n\nMöchten Sie wirklich diesen Eintrag ausdrucken? " }, |
1321 | { "KO/Pi Print Confirmation","KO/Pi Druckbestätigung" }, | 1321 | { "KO/Pi Print Confirmation","KO/Pi Druckbestätigung" }, |
1322 | { "This prints the view as you see it.\n(With the complete content, of course.)\nYou may change the print layout by resizing the view.\nPrint unscaled may print several pages\ndepending on the amount of data.\nPrint scaled down will print all on one page.\nPrint scaled up/down will print all on one page,\nbut will scale up the text to page boundaries,\nif the text is smaller than the page.\nYou can select page geometry setup in the next dialog.\n","Dies druckt die Ansicht wie man sie sieht.\n(Mit dem kompletten Inhalt natürlich.)\nMan kann das Layout ändern durch ändern der Fenstergröße.\nDrucke unskaliert druckt ggf. mehrere Seiten\nabhängig von der Menge der Daten.\nDrucke runterskaliert um auf eine Seite zu passen\ndruckt alles auf eine Seite.\nDrucke hoch/runterskaliert um genau auf eine Seite zu passen\nvergrößert den Text gegebenenfalls.\nDas Seitenlayout kann im nächsten Dialog gewählt werden.\n" }, | 1322 | { "This prints the view as you see it.\n(With the complete content, of course.)\nYou may change the print layout by resizing the view.\nPrint unscaled may print several pages\ndepending on the amount of data.\nPrint scaled down will print all on one page.\nPrint scaled up/down will print all on one page,\nbut will scale up the text to page boundaries,\nif the text is smaller than the page.\nYou can select page geometry setup in the next dialog.\n","Dies druckt die Ansicht wie man sie sieht.\n(Mit dem kompletten Inhalt natürlich.)\nMan kann das Layout ändern durch ändern der Fenstergröße.\nDrucke unskaliert druckt ggf. mehrere Seiten\nabhängig von der Menge der Daten.\nDrucke runterskaliert um auf eine Seite zu passen\ndruckt alles auf eine Seite.\nDrucke hoch/runterskaliert um genau auf eine Seite zu passen\nvergrößert den Text gegebenenfalls.\nDas Seitenlayout kann im nächsten Dialog gewählt werden.\n" }, |
1323 | { "KO/Pi Printout","KO/Pi Ausdruck" }, | 1323 | { "KO/Pi Printout","KO/Pi Ausdruck" }, |
1324 | { "Print unscaled","Drucke unskaliert" }, | 1324 | { "Print unscaled","Drucke unskaliert" }, |
1325 | { "Print scaled down to fit one page","Drucke runterskaliert um auf eine Seite zu passen." }, | 1325 | { "Print scaled down to fit one page","Drucke runterskaliert um auf eine Seite zu passen." }, |
1326 | { "Print scaled up/down to fit one page","Drucke hoch/runterskaliert um genau auf eine Seite zu passen." }, | 1326 | { "Print scaled up/down to fit one page","Drucke hoch/runterskaliert um genau auf eine Seite zu passen." }, |
1327 | { "Printout Mode","Druck Modus" }, | 1327 | { "Printout Mode","Druck Modus" }, |
1328 | { "","" }, | 1328 | { "Filter menu icon","Filtermenu Icon" }, |
1329 | { "","" }, | 1329 | { "","" }, |
1330 | { "","" }, | 1330 | { "","" }, |
1331 | { "","" }, \ No newline at end of file | 1331 | { "","" }, \ No newline at end of file |
diff --git a/kabc/addresseedialog.cpp b/kabc/addresseedialog.cpp index b3429e3..648e780 100644 --- a/kabc/addresseedialog.cpp +++ b/kabc/addresseedialog.cpp | |||
@@ -43,48 +43,49 @@ AddresseeItem::AddresseeItem( QListView *parent, const Addressee &addressee ) : | |||
43 | mAddressee( addressee ) | 43 | mAddressee( addressee ) |
44 | { | 44 | { |
45 | QString name = addressee.familyName()+", "+ addressee.givenName(); | 45 | QString name = addressee.familyName()+", "+ addressee.givenName(); |
46 | if ( name.length() == 2 ) | 46 | if ( name.length() == 2 ) |
47 | name = addressee.organization(); | 47 | name = addressee.organization(); |
48 | setText( Name,name); | 48 | setText( Name,name); |
49 | setText( Email, addressee.preferredEmail() ); | 49 | setText( Email, addressee.preferredEmail() ); |
50 | } | 50 | } |
51 | 51 | ||
52 | QString AddresseeItem::key( int column, bool ) const | 52 | QString AddresseeItem::key( int column, bool ) const |
53 | { | 53 | { |
54 | 54 | ||
55 | if (column == Email) { | 55 | if (column == Email) { |
56 | QString value = text(Email); | 56 | QString value = text(Email); |
57 | int val = value.findRev("@"); | 57 | int val = value.findRev("@"); |
58 | return value.mid( val) + value.left( val ); | 58 | return value.mid( val) + value.left( val ); |
59 | } | 59 | } |
60 | return text(column).lower(); | 60 | return text(column).lower(); |
61 | } | 61 | } |
62 | 62 | ||
63 | AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) : | 63 | AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) : |
64 | KDialogBase( KDialogBase::Plain, i18n("Select Addressee"), | 64 | KDialogBase( KDialogBase::Plain, i18n("Select Addressee"), |
65 | Ok|Cancel, No, parent ), mMultiple( multiple ) | 65 | Ok|Cancel, No, parent ), mMultiple( multiple ) |
66 | { | 66 | { |
67 | qDebug("NEW AddresseeDialog "); | ||
67 | QWidget *topWidget = plainPage(); | 68 | QWidget *topWidget = plainPage(); |
68 | 69 | ||
69 | QBoxLayout *topLayout = new QHBoxLayout( topWidget ); | 70 | QBoxLayout *topLayout = new QHBoxLayout( topWidget ); |
70 | 71 | ||
71 | 72 | ||
72 | KDGanttMinimizeSplitter* mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, topWidget); | 73 | KDGanttMinimizeSplitter* mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, topWidget); |
73 | mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right ); | 74 | mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right ); |
74 | 75 | ||
75 | topLayout->addWidget(mMiniSplitter ); | 76 | topLayout->addWidget(mMiniSplitter ); |
76 | 77 | ||
77 | QWidget *listWidget = new QWidget( mMiniSplitter ); | 78 | QWidget *listWidget = new QWidget( mMiniSplitter ); |
78 | 79 | ||
79 | QBoxLayout *listLayout = new QVBoxLayout (listWidget) ; | 80 | QBoxLayout *listLayout = new QVBoxLayout (listWidget) ; |
80 | //topLayout->addLayout( listLayout ); | 81 | //topLayout->addLayout( listLayout ); |
81 | 82 | ||
82 | mAddresseeList = new KListView( listWidget ); | 83 | mAddresseeList = new KListView( listWidget ); |
83 | mAddresseeList->addColumn( i18n("Name") ); | 84 | mAddresseeList->addColumn( i18n("Name") ); |
84 | mAddresseeList->addColumn( i18n("Email") ); | 85 | mAddresseeList->addColumn( i18n("Email") ); |
85 | mAddresseeList->setAllColumnsShowFocus( true ); | 86 | mAddresseeList->setAllColumnsShowFocus( true ); |
86 | mAddresseeList->setFullWidth( true ); | 87 | mAddresseeList->setFullWidth( true ); |
87 | listLayout->addWidget( mAddresseeList ); | 88 | listLayout->addWidget( mAddresseeList ); |
88 | connect( mAddresseeList, SIGNAL( doubleClicked( QListViewItem * ) ), | 89 | connect( mAddresseeList, SIGNAL( doubleClicked( QListViewItem * ) ), |
89 | SLOT( slotOk() ) ); | 90 | SLOT( slotOk() ) ); |
90 | 91 | ||
@@ -116,48 +117,49 @@ AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) : | |||
116 | connect ( unselectButton, SIGNAL( clicked() ), SLOT( removeSelected() ) ); | 117 | connect ( unselectButton, SIGNAL( clicked() ), SLOT( removeSelected() ) ); |
117 | 118 | ||
118 | connect( mAddresseeList, SIGNAL( clicked( QListViewItem * ) ), | 119 | connect( mAddresseeList, SIGNAL( clicked( QListViewItem * ) ), |
119 | SLOT( addSelected( QListViewItem * ) ) ); | 120 | SLOT( addSelected( QListViewItem * ) ) ); |
120 | connect( mAddresseeList, SIGNAL( returnPressed( QListViewItem * ) ), | 121 | connect( mAddresseeList, SIGNAL( returnPressed( QListViewItem * ) ), |
121 | SLOT( selectNextItem( QListViewItem * ) ) ); | 122 | SLOT( selectNextItem( QListViewItem * ) ) ); |
122 | 123 | ||
123 | } | 124 | } |
124 | 125 | ||
125 | mAddressBook = StdAddressBook::self( true ); | 126 | mAddressBook = StdAddressBook::self( true ); |
126 | connect( mAddressBook, SIGNAL( addressBookChanged( AddressBook* ) ), | 127 | connect( mAddressBook, SIGNAL( addressBookChanged( AddressBook* ) ), |
127 | SLOT( addressBookChanged() ) ); | 128 | SLOT( addressBookChanged() ) ); |
128 | connect( mAddressBook, SIGNAL( loadingFinished( Resource* ) ), | 129 | connect( mAddressBook, SIGNAL( loadingFinished( Resource* ) ), |
129 | SLOT( addressBookChanged() ) ); | 130 | SLOT( addressBookChanged() ) ); |
130 | 131 | ||
131 | loadAddressBook(); | 132 | loadAddressBook(); |
132 | QValueList<int> splitterSize; | 133 | QValueList<int> splitterSize; |
133 | splitterSize.append( ( width() / 5 ) * 3 ); | 134 | splitterSize.append( ( width() / 5 ) * 3 ); |
134 | splitterSize.append( ( width() / 5 ) *2 ); | 135 | splitterSize.append( ( width() / 5 ) *2 ); |
135 | mMiniSplitter->setSizes( splitterSize ); | 136 | mMiniSplitter->setSizes( splitterSize ); |
136 | } | 137 | } |
137 | 138 | ||
138 | AddresseeDialog::~AddresseeDialog() | 139 | AddresseeDialog::~AddresseeDialog() |
139 | { | 140 | { |
141 | qDebug("DELETE AddresseeDialog "); | ||
140 | } | 142 | } |
141 | 143 | ||
142 | void AddresseeDialog::loadAddressBook() | 144 | void AddresseeDialog::loadAddressBook() |
143 | { | 145 | { |
144 | mAddresseeList->clear(); | 146 | mAddresseeList->clear(); |
145 | mItemDict.clear(); | 147 | mItemDict.clear(); |
146 | if ( mAddresseeEdit->text().isEmpty() ) { | 148 | if ( mAddresseeEdit->text().isEmpty() ) { |
147 | AddressBook::Iterator it; | 149 | AddressBook::Iterator it; |
148 | for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { | 150 | for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { |
149 | if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") ) | 151 | if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") ) |
150 | continue; | 152 | continue; |
151 | new AddresseeItem( mAddresseeList, (*it) ); | 153 | new AddresseeItem( mAddresseeList, (*it) ); |
152 | } | 154 | } |
153 | return; | 155 | return; |
154 | } | 156 | } |
155 | //mAddresseeEdit->completionObject()->clear(); | 157 | //mAddresseeEdit->completionObject()->clear(); |
156 | QRegExp re; | 158 | QRegExp re; |
157 | re.setWildcard(true); // most people understand these better. | 159 | re.setWildcard(true); // most people understand these better. |
158 | re.setCaseSensitive(false); | 160 | re.setCaseSensitive(false); |
159 | re.setPattern( "*"+ mAddresseeEdit->text() + "*"); | 161 | re.setPattern( "*"+ mAddresseeEdit->text() + "*"); |
160 | 162 | ||
161 | AddressBook::Iterator it; | 163 | AddressBook::Iterator it; |
162 | for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { | 164 | for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { |
163 | if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") ) | 165 | if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") ) |
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 27aca2d..3f9b546 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -353,48 +353,49 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const | |||
353 | connect( mViewManager, SIGNAL( deleteRequest( ) ), | 353 | connect( mViewManager, SIGNAL( deleteRequest( ) ), |
354 | SLOT( deleteContacts( ) ) ); | 354 | SLOT( deleteContacts( ) ) ); |
355 | connect( mViewManager, SIGNAL( modified() ), | 355 | connect( mViewManager, SIGNAL( modified() ), |
356 | SLOT( setModified() ) ); | 356 | SLOT( setModified() ) ); |
357 | 357 | ||
358 | connect( mExtensionManager, SIGNAL( modified( const KABC::Addressee::List& ) ), this, SLOT( extensionModified( const KABC::Addressee::List& ) ) ); | 358 | connect( mExtensionManager, SIGNAL( modified( const KABC::Addressee::List& ) ), this, SLOT( extensionModified( const KABC::Addressee::List& ) ) ); |
359 | connect( mExtensionManager, SIGNAL( changedActiveExtension( int ) ), this, SLOT( extensionChanged( int ) ) ); | 359 | connect( mExtensionManager, SIGNAL( changedActiveExtension( int ) ), this, SLOT( extensionChanged( int ) ) ); |
360 | 360 | ||
361 | connect( mXXPortManager, SIGNAL( modified() ), | 361 | connect( mXXPortManager, SIGNAL( modified() ), |
362 | SLOT( setModified() ) ); | 362 | SLOT( setModified() ) ); |
363 | 363 | ||
364 | connect( mJumpButtonBar, SIGNAL( jumpToLetter( const QString& ) ), | 364 | connect( mJumpButtonBar, SIGNAL( jumpToLetter( const QString& ) ), |
365 | SLOT( incrementalSearch( const QString& ) ) ); | 365 | SLOT( incrementalSearch( const QString& ) ) ); |
366 | connect( mIncSearchWidget, SIGNAL( fieldChanged() ), | 366 | connect( mIncSearchWidget, SIGNAL( fieldChanged() ), |
367 | mJumpButtonBar, SLOT( recreateButtons() ) ); | 367 | mJumpButtonBar, SLOT( recreateButtons() ) ); |
368 | 368 | ||
369 | connect( mDetails, SIGNAL( sendEmail( const QString& ) ), | 369 | connect( mDetails, SIGNAL( sendEmail( const QString& ) ), |
370 | SLOT( sendMail( const QString& ) ) ); | 370 | SLOT( sendMail( const QString& ) ) ); |
371 | 371 | ||
372 | 372 | ||
373 | connect( ExternalAppHandler::instance(), SIGNAL (requestForNameEmailUidList(const QString&, const QString&)),this, SLOT(requestForNameEmailUidList(const QString&, const QString&))); | 373 | connect( ExternalAppHandler::instance(), SIGNAL (requestForNameEmailUidList(const QString&, const QString&)),this, SLOT(requestForNameEmailUidList(const QString&, const QString&))); |
374 | connect( ExternalAppHandler::instance(), SIGNAL (requestForDetails(const QString&, const QString&, const QString&, const QString&, const QString&)),this, SLOT(requestForDetails(const QString&, const QString&, const QString&, const QString&, const QString&))); | 374 | connect( ExternalAppHandler::instance(), SIGNAL (requestForDetails(const QString&, const QString&, const QString&, const QString&, const QString&)),this, SLOT(requestForDetails(const QString&, const QString&, const QString&, const QString&, const QString&))); |
375 | connect( ExternalAppHandler::instance(), SIGNAL (requestForBirthdayList(const QString&, const QString&)),this, SLOT(requestForBirthdayList(const QString&, const QString&))); | 375 | connect( ExternalAppHandler::instance(), SIGNAL (requestForBirthdayList(const QString&, const QString&)),this, SLOT(requestForBirthdayList(const QString&, const QString&))); |
376 | connect( ExternalAppHandler::instance(), SIGNAL (nextView()),this, SLOT(setDetailsToggle())); | 376 | connect( ExternalAppHandler::instance(), SIGNAL (nextView()),this, SLOT(setDetailsToggle())); |
377 | connect( ExternalAppHandler::instance(), SIGNAL (callContactdialog()),this, SLOT(callContactdialog())); | ||
377 | 378 | ||
378 | 379 | ||
379 | #ifndef KAB_EMBEDDED | 380 | #ifndef KAB_EMBEDDED |
380 | connect( mViewManager, SIGNAL( urlDropped( const KURL& ) ), | 381 | connect( mViewManager, SIGNAL( urlDropped( const KURL& ) ), |
381 | mXXPortManager, SLOT( importVCard( const KURL& ) ) ); | 382 | mXXPortManager, SLOT( importVCard( const KURL& ) ) ); |
382 | 383 | ||
383 | connect( mDetails, SIGNAL( browse( const QString& ) ), | 384 | connect( mDetails, SIGNAL( browse( const QString& ) ), |
384 | SLOT( browse( const QString& ) ) ); | 385 | SLOT( browse( const QString& ) ) ); |
385 | 386 | ||
386 | 387 | ||
387 | mAddressBookService = new KAddressBookService( this ); | 388 | mAddressBookService = new KAddressBookService( this ); |
388 | 389 | ||
389 | #endif //KAB_EMBEDDED | 390 | #endif //KAB_EMBEDDED |
390 | 391 | ||
391 | mMessageTimer = new QTimer( this ); | 392 | mMessageTimer = new QTimer( this ); |
392 | connect( mMessageTimer, SIGNAL( timeout() ), this, SLOT( setCaptionBack() ) ); | 393 | connect( mMessageTimer, SIGNAL( timeout() ), this, SLOT( setCaptionBack() ) ); |
393 | mEditorDialog = 0; | 394 | mEditorDialog = 0; |
394 | createAddresseeEditorDialog( this ); | 395 | createAddresseeEditorDialog( this ); |
395 | setModified( false ); | 396 | setModified( false ); |
396 | mBRdisabled = false; | 397 | mBRdisabled = false; |
397 | #ifndef DESKTOP_VERSION | 398 | #ifndef DESKTOP_VERSION |
398 | infrared = 0; | 399 | infrared = 0; |
399 | #endif | 400 | #endif |
400 | //toggleBeamReceive( ); | 401 | //toggleBeamReceive( ); |
@@ -814,74 +815,76 @@ void KABCore::beamMySelf() | |||
814 | beamVCard(uids); | 815 | beamVCard(uids); |
815 | } else { | 816 | } else { |
816 | KMessageBox::information( this, i18n( "Your personal contact is\nnot set! Please select it\nand set it with menu:\nSettings - Set Who Am I\n" ) ); | 817 | KMessageBox::information( this, i18n( "Your personal contact is\nnot set! Please select it\nand set it with menu:\nSettings - Set Who Am I\n" ) ); |
817 | 818 | ||
818 | 819 | ||
819 | } | 820 | } |
820 | } | 821 | } |
821 | void KABCore::updateMainWindow() | 822 | void KABCore::updateMainWindow() |
822 | { | 823 | { |
823 | mMainWindow->showMaximized(); | 824 | mMainWindow->showMaximized(); |
824 | mMainWindow->update(); | 825 | mMainWindow->update(); |
825 | } | 826 | } |
826 | void KABCore::resizeEvent(QResizeEvent* e ) | 827 | void KABCore::resizeEvent(QResizeEvent* e ) |
827 | { | 828 | { |
828 | if ( !mMiniSplitter ) | 829 | if ( !mMiniSplitter ) |
829 | return; | 830 | return; |
830 | //qDebug("KABCore::resizeEvent(QResizeEvent* e ) "); | 831 | //qDebug("KABCore::resizeEvent(QResizeEvent* e ) "); |
831 | if ( QApplication::desktop()->width() >= 480 ) { | 832 | if ( QApplication::desktop()->width() >= 480 ) { |
832 | if (QApplication::desktop()->width() == 640 ) { // e.g. 640x480 | 833 | if (QApplication::desktop()->width() == 640 ) { // e.g. 640x480 |
833 | if ( mMiniSplitter->orientation() == Qt::Vertical ) { | 834 | if ( mMiniSplitter->orientation() == Qt::Vertical ) { |
834 | mMiniSplitter->setOrientation( Qt::Horizontal); | 835 | mMiniSplitter->setOrientation( Qt::Horizontal); |
835 | mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right ); | 836 | mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right ); |
836 | } | 837 | } |
837 | if ( QApplication::desktop()->width() <= 640 ) { | 838 | if ( QApplication::desktop()->width() <= 640 ) { |
839 | mMainWindow->showMinimized(); | ||
838 | //mMainWindow->setMaximumSize( QApplication::desktop()->size() ); | 840 | //mMainWindow->setMaximumSize( QApplication::desktop()->size() ); |
839 | mViewManager->getFilterAction()->setComboWidth( 150 ); | 841 | mViewManager->getFilterAction()->setComboWidth( 150 ); |
840 | if ( mIncSearchWidget ) | 842 | if ( mIncSearchWidget ) |
841 | mIncSearchWidget->setSize(); | 843 | mIncSearchWidget->setSize(); |
842 | QTimer::singleShot( 1, this , SLOT ( updateMainWindow())); | 844 | QTimer::singleShot( 1, this , SLOT ( updateMainWindow())); |
843 | } | 845 | } |
844 | 846 | ||
845 | } else if (QApplication::desktop()->width() == 480 ){// e.g. 480x640 | 847 | } else if (QApplication::desktop()->width() == 480 ){// e.g. 480x640 |
846 | if ( mMiniSplitter->orientation() == Qt::Horizontal ) { | 848 | if ( mMiniSplitter->orientation() == Qt::Horizontal ) { |
847 | mMiniSplitter->setOrientation( Qt::Vertical ); | 849 | mMiniSplitter->setOrientation( Qt::Vertical ); |
848 | mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down ); | 850 | mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down ); |
849 | } | 851 | } |
850 | if ( QApplication::desktop()->width() <= 640 ) { | 852 | if ( QApplication::desktop()->width() <= 640 ) { |
851 | //mMainWindow->setMaximumSize( QApplication::desktop()->size() ); | 853 | //mMainWindow->setMaximumSize( QApplication::desktop()->size() ); |
852 | mMainWindow->showMinimized(); | 854 | mMainWindow->showMinimized(); |
853 | if ( KABPrefs::instance()->mHideSearchOnSwitch ) { | 855 | if ( KABPrefs::instance()->mHideSearchOnSwitch ) { |
854 | if ( mIncSearchWidget ) { | 856 | if ( mIncSearchWidget ) { |
855 | mIncSearchWidget->setSize(); | 857 | mIncSearchWidget->setSize(); |
856 | } | 858 | } |
857 | } else { | 859 | } else { |
858 | mViewManager->getFilterAction()->setComboWidth( 0 ); | 860 | mViewManager->getFilterAction()->setComboWidth( 0 ); |
859 | } | 861 | } |
860 | QTimer::singleShot( 1, this , SLOT ( updateMainWindow())); | 862 | QTimer::singleShot( 1, this , SLOT ( updateMainWindow())); |
861 | } | 863 | } |
862 | } | 864 | } |
863 | } | 865 | } |
866 | QWidget::resizeEvent( e ); | ||
864 | 867 | ||
865 | } | 868 | } |
866 | void KABCore::export2phone() | 869 | void KABCore::export2phone() |
867 | { | 870 | { |
868 | 871 | ||
869 | QStringList uids; | 872 | QStringList uids; |
870 | XXPortSelectDialog dlg( this, false, this ); | 873 | XXPortSelectDialog dlg( this, false, this ); |
871 | if ( dlg.exec() ) | 874 | if ( dlg.exec() ) |
872 | uids = dlg.uids(); | 875 | uids = dlg.uids(); |
873 | else | 876 | else |
874 | return; | 877 | return; |
875 | if ( uids.isEmpty() ) | 878 | if ( uids.isEmpty() ) |
876 | return; | 879 | return; |
877 | // qDebug("count %d ", uids.count()); | 880 | // qDebug("count %d ", uids.count()); |
878 | 881 | ||
879 | KAex2phonePrefs ex2phone; | 882 | KAex2phonePrefs ex2phone; |
880 | ex2phone.mPhoneConnection->setText( KPimGlobalPrefs::instance()->mEx2PhoneConnection ); | 883 | ex2phone.mPhoneConnection->setText( KPimGlobalPrefs::instance()->mEx2PhoneConnection ); |
881 | ex2phone.mPhoneDevice->setText( KPimGlobalPrefs::instance()->mEx2PhoneDevice ); | 884 | ex2phone.mPhoneDevice->setText( KPimGlobalPrefs::instance()->mEx2PhoneDevice ); |
882 | ex2phone.mPhoneModel->setText( KPimGlobalPrefs::instance()->mEx2PhoneModel ); | 885 | ex2phone.mPhoneModel->setText( KPimGlobalPrefs::instance()->mEx2PhoneModel ); |
883 | 886 | ||
884 | if ( !ex2phone.exec() ) { | 887 | if ( !ex2phone.exec() ) { |
885 | return; | 888 | return; |
886 | } | 889 | } |
887 | KPimGlobalPrefs::instance()->mEx2PhoneConnection = ex2phone.mPhoneConnection->text(); | 890 | KPimGlobalPrefs::instance()->mEx2PhoneConnection = ex2phone.mPhoneConnection->text(); |
@@ -2484,78 +2487,99 @@ void KABCore::configureKeyBindings() | |||
2484 | #ifndef KAB_EMBEDDED | 2487 | #ifndef KAB_EMBEDDED |
2485 | KKeyDialog::configure( actionCollection(), true ); | 2488 | KKeyDialog::configure( actionCollection(), true ); |
2486 | #else //KAB_EMBEDDED | 2489 | #else //KAB_EMBEDDED |
2487 | qDebug("KABCore::configureKeyBindings() not implemented"); | 2490 | qDebug("KABCore::configureKeyBindings() not implemented"); |
2488 | #endif //KAB_EMBEDDED | 2491 | #endif //KAB_EMBEDDED |
2489 | } | 2492 | } |
2490 | 2493 | ||
2491 | #ifdef KAB_EMBEDDED | 2494 | #ifdef KAB_EMBEDDED |
2492 | void KABCore::configureResources() | 2495 | void KABCore::configureResources() |
2493 | { | 2496 | { |
2494 | KRES::KCMKResources dlg( this, "" , 0 ); | 2497 | KRES::KCMKResources dlg( this, "" , 0 ); |
2495 | 2498 | ||
2496 | if ( !dlg.exec() ) | 2499 | if ( !dlg.exec() ) |
2497 | return; | 2500 | return; |
2498 | KMessageBox::information( this, i18n("Please restart to get the \nchanged resources (re)loaded!\n") ); | 2501 | KMessageBox::information( this, i18n("Please restart to get the \nchanged resources (re)loaded!\n") ); |
2499 | } | 2502 | } |
2500 | #endif //KAB_EMBEDDED | 2503 | #endif //KAB_EMBEDDED |
2501 | 2504 | ||
2502 | 2505 | ||
2503 | /* this method will be called through the QCop interface from Ko/Pi to select addresses | 2506 | /* this method will be called through the QCop interface from Ko/Pi to select addresses |
2504 | * for the attendees list of an event. | 2507 | * for the attendees list of an event. |
2505 | */ | 2508 | */ |
2506 | void KABCore::requestForNameEmailUidList(const QString& sourceChannel, const QString& uid) | 2509 | void KABCore::requestForNameEmailUidList(const QString& sourceChannel, const QString& uid) |
2507 | { | 2510 | { |
2508 | QStringList nameList; | 2511 | |
2509 | QStringList emailList; | ||
2510 | QStringList uidList; | ||
2511 | bool ok = false; | 2512 | bool ok = false; |
2513 | mEmailSourceChannel = sourceChannel; | ||
2512 | int wid = uid.toInt( &ok ); | 2514 | int wid = uid.toInt( &ok ); |
2515 | qDebug("UID %s ", uid.latin1()); | ||
2513 | if ( ok ) { | 2516 | if ( ok ) { |
2514 | if ( wid != QApplication::desktop()->width() ) { | 2517 | if ( wid != QApplication::desktop()->width() ) { |
2515 | qDebug("KA/Pi: Request from different desktop geometry. Resizing ..."); | 2518 | qDebug("KA/Pi: Request from different desktop geometry. Resizing ..."); |
2516 | message( i18n("Resizing, please wait...") ); | 2519 | message( i18n("Resizing, please wait...") ); |
2517 | raise(); | 2520 | mMainWindow->showMinimized(); |
2518 | qApp->processEvents(); | 2521 | /* |
2522 | { | ||
2523 | QCopEnvelope e("QPE/Application/kapi", "callContactdialog()"); | ||
2524 | } | ||
2525 | */ | ||
2526 | QTimer::singleShot( 1,this, SLOT ( resizeAndCallContactdialog() ) ); | ||
2527 | return; | ||
2519 | } | 2528 | } |
2520 | 2529 | ||
2521 | } else { | 2530 | } else { |
2522 | qDebug("KABCore::requestForNameEmailUidList:: Got invalid uid "); | 2531 | qDebug("KABCore::requestForNameEmailUidList:: Got invalid uid "); |
2523 | } | 2532 | } |
2524 | 2533 | callContactdialog(); | |
2534 | //QCopEnvelope e("QPE/Application/kapi", "callContactdialog()"); | ||
2535 | |||
2536 | } | ||
2537 | void KABCore::resizeAndCallContactdialog() | ||
2538 | { | ||
2539 | updateMainWindow(); | ||
2540 | QTimer::singleShot( 100,this, SLOT ( callContactdialog() ) ); | ||
2541 | } | ||
2542 | |||
2543 | void KABCore::callContactdialog() | ||
2544 | { | ||
2545 | QStringList nameList; | ||
2546 | QStringList emailList; | ||
2547 | QStringList uidList; | ||
2548 | qDebug("WIDTH %d ", QApplication::desktop()->width() ); | ||
2525 | KABC::Addressee::List list = KABC::AddresseeDialog::getAddressees(this); | 2549 | KABC::Addressee::List list = KABC::AddresseeDialog::getAddressees(this); |
2526 | uint i=0; | 2550 | uint i=0; |
2527 | for (i=0; i < list.count(); i++) | 2551 | for (i=0; i < list.count(); i++) |
2528 | { | 2552 | { |
2529 | nameList.append(list[i].realName()); | 2553 | nameList.append(list[i].realName()); |
2530 | emailList.append(list[i].preferredEmail()); | 2554 | emailList.append(list[i].preferredEmail()); |
2531 | uidList.append(list[i].uid()); | 2555 | uidList.append(list[i].uid()); |
2532 | } | 2556 | } |
2557 | QString uid = "unnamed"; | ||
2533 | //qDebug("%s %s ", sourceChannel.latin1(), uid.latin1()); | 2558 | //qDebug("%s %s ", sourceChannel.latin1(), uid.latin1()); |
2534 | bool res = ExternalAppHandler::instance()->returnNameEmailUidListFromKAPI(sourceChannel, uid, nameList, emailList, uidList); | 2559 | bool res = ExternalAppHandler::instance()->returnNameEmailUidListFromKAPI(mEmailSourceChannel, uid, nameList, emailList, uidList); |
2535 | 2560 | ||
2536 | } | 2561 | } |
2537 | |||
2538 | /* this method will be called through the QCop interface from Ko/Pi to select birthdays | 2562 | /* this method will be called through the QCop interface from Ko/Pi to select birthdays |
2539 | * to put them into the calendar. | 2563 | * to put them into the calendar. |
2540 | */ | 2564 | */ |
2541 | void KABCore::requestForBirthdayList(const QString& sourceChannel, const QString& uid) | 2565 | void KABCore::requestForBirthdayList(const QString& sourceChannel, const QString& uid) |
2542 | { | 2566 | { |
2543 | // qDebug("KABCore::requestForBirthdayList"); | 2567 | // qDebug("KABCore::requestForBirthdayList"); |
2544 | QStringList birthdayList; | 2568 | QStringList birthdayList; |
2545 | QStringList anniversaryList; | 2569 | QStringList anniversaryList; |
2546 | QStringList realNameList; | 2570 | QStringList realNameList; |
2547 | QStringList preferredEmailList; | 2571 | QStringList preferredEmailList; |
2548 | QStringList assembledNameList; | 2572 | QStringList assembledNameList; |
2549 | QStringList uidList; | 2573 | QStringList uidList; |
2550 | 2574 | ||
2551 | KABC::AddressBook::Iterator it; | 2575 | KABC::AddressBook::Iterator it; |
2552 | 2576 | ||
2553 | int count = 0; | 2577 | int count = 0; |
2554 | for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { | 2578 | for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { |
2555 | ++count; | 2579 | ++count; |
2556 | } | 2580 | } |
2557 | QProgressBar bar(count,0 ); | 2581 | QProgressBar bar(count,0 ); |
2558 | int w = 300; | 2582 | int w = 300; |
2559 | if ( QApplication::desktop()->width() < 320 ) | 2583 | if ( QApplication::desktop()->width() < 320 ) |
2560 | w = 220; | 2584 | w = 220; |
2561 | int h = bar.sizeHint().height() ; | 2585 | int h = bar.sizeHint().height() ; |
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h index c185117..47ea152 100644 --- a/kaddressbook/kabcore.h +++ b/kaddressbook/kabcore.h | |||
@@ -347,65 +347,69 @@ class KABCore : public QWidget, public KSyncInterface | |||
347 | void requestForBirthdayList(const QString& sourceChannel, const QString& sessionuid); | 347 | void requestForBirthdayList(const QString& sourceChannel, const QString& sessionuid); |
348 | 348 | ||
349 | 349 | ||
350 | signals: | 350 | signals: |
351 | void contactSelected( const QString &name ); | 351 | void contactSelected( const QString &name ); |
352 | void contactSelected( const QPixmap &pixmap ); | 352 | void contactSelected( const QPixmap &pixmap ); |
353 | public slots: | 353 | public slots: |
354 | void recieve(QString cmsg ); | 354 | void recieve(QString cmsg ); |
355 | void getFile( bool success ); | 355 | void getFile( bool success ); |
356 | void syncFileRequest(); | 356 | void syncFileRequest(); |
357 | void setDetailsVisible( bool visible ); | 357 | void setDetailsVisible( bool visible ); |
358 | void setDetailsToState(); | 358 | void setDetailsToState(); |
359 | 359 | ||
360 | void saveSettings(); | 360 | void saveSettings(); |
361 | 361 | ||
362 | private slots: | 362 | private slots: |
363 | void updateToolBar(); | 363 | void updateToolBar(); |
364 | void updateMainWindow(); | 364 | void updateMainWindow(); |
365 | void receive( const QCString& cmsg, const QByteArray& data ); | 365 | void receive( const QCString& cmsg, const QByteArray& data ); |
366 | void toggleBeamReceive( ); | 366 | void toggleBeamReceive( ); |
367 | void disableBR(bool); | 367 | void disableBR(bool); |
368 | void setJumpButtonBarVisible( bool visible ); | 368 | void setJumpButtonBarVisible( bool visible ); |
369 | void setJumpButtonBar( bool visible ); | 369 | void setJumpButtonBar( bool visible ); |
370 | void setCaptionBack(); | 370 | void setCaptionBack(); |
371 | void resizeAndCallContactdialog(); | ||
372 | void callContactdialog(); | ||
373 | |||
371 | void importFromOL(); | 374 | void importFromOL(); |
372 | void extensionModified( const KABC::Addressee::List &list ); | 375 | void extensionModified( const KABC::Addressee::List &list ); |
373 | void extensionChanged( int id ); | 376 | void extensionChanged( int id ); |
374 | void clipboardDataChanged(); | 377 | void clipboardDataChanged(); |
375 | void updateActionMenu(); | 378 | void updateActionMenu(); |
376 | void configureKeyBindings(); | 379 | void configureKeyBindings(); |
377 | void removeVoice(); | 380 | void removeVoice(); |
378 | void setFormattedName(); | 381 | void setFormattedName(); |
379 | #ifdef KAB_EMBEDDED | 382 | #ifdef KAB_EMBEDDED |
380 | void configureResources(); | 383 | void configureResources(); |
381 | #endif //KAB_EMBEDDED | 384 | #endif //KAB_EMBEDDED |
382 | 385 | ||
383 | void slotEditorDestroyed( const QString &uid ); | 386 | void slotEditorDestroyed( const QString &uid ); |
384 | void configurationChanged(); | 387 | void configurationChanged(); |
385 | void addressBookChanged(); | 388 | void addressBookChanged(); |
386 | 389 | ||
387 | private: | 390 | private: |
391 | QString mEmailSourceChannel; | ||
388 | void resizeEvent(QResizeEvent* e ); | 392 | void resizeEvent(QResizeEvent* e ); |
389 | bool mBRdisabled; | 393 | bool mBRdisabled; |
390 | #ifndef DESKTOP_VERSION | 394 | #ifndef DESKTOP_VERSION |
391 | QCopChannel* infrared; | 395 | QCopChannel* infrared; |
392 | #endif | 396 | #endif |
393 | QTimer *mMessageTimer; | 397 | QTimer *mMessageTimer; |
394 | void initGUI(); | 398 | void initGUI(); |
395 | void initActions(); | 399 | void initActions(); |
396 | QString getPhoneFile(); | 400 | QString getPhoneFile(); |
397 | 401 | ||
398 | AddresseeEditorDialog *createAddresseeEditorDialog( QWidget *parent, | 402 | AddresseeEditorDialog *createAddresseeEditorDialog( QWidget *parent, |
399 | const char *name = 0 ); | 403 | const char *name = 0 ); |
400 | 404 | ||
401 | KXMLGUIClient *mGUIClient; | 405 | KXMLGUIClient *mGUIClient; |
402 | 406 | ||
403 | KABC::AddressBook *mAddressBook; | 407 | KABC::AddressBook *mAddressBook; |
404 | 408 | ||
405 | ViewManager *mViewManager; | 409 | ViewManager *mViewManager; |
406 | // QSplitter *mDetailsSplitter; | 410 | // QSplitter *mDetailsSplitter; |
407 | KDGanttMinimizeSplitter *mExtensionBarSplitter; | 411 | KDGanttMinimizeSplitter *mExtensionBarSplitter; |
408 | ViewContainer *mDetails; | 412 | ViewContainer *mDetails; |
409 | KDGanttMinimizeSplitter* mMiniSplitter; | 413 | KDGanttMinimizeSplitter* mMiniSplitter; |
410 | XXPortManager *mXXPortManager; | 414 | XXPortManager *mXXPortManager; |
411 | JumpButtonBar *mJumpButtonBar; | 415 | JumpButtonBar *mJumpButtonBar; |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 8a4c7eb..6ddced0 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -723,83 +723,92 @@ void MainWindow::initActions() | |||
723 | today_action->addTo( viewMenu ); | 723 | today_action->addTo( viewMenu ); |
724 | connect( today_action, SIGNAL( activated() ), | 724 | connect( today_action, SIGNAL( activated() ), |
725 | mView, SLOT( goToday() ) ); | 725 | mView, SLOT( goToday() ) ); |
726 | viewMenu->insertSeparator(); | 726 | viewMenu->insertSeparator(); |
727 | 727 | ||
728 | // *********************** | 728 | // *********************** |
729 | if ( KOPrefs::instance()->mVerticalScreen ) { | 729 | if ( KOPrefs::instance()->mVerticalScreen ) { |
730 | icon = SmallIcon( "1updownarrow" ); | 730 | icon = SmallIcon( "1updownarrow" ); |
731 | } else { | 731 | } else { |
732 | icon = SmallIcon("1leftrightarrow" ); | 732 | icon = SmallIcon("1leftrightarrow" ); |
733 | } | 733 | } |
734 | configureToolBarMenu->insertItem(icon, i18n("Toggle Fullscreen"), 28 ); | 734 | configureToolBarMenu->insertItem(icon, i18n("Toggle Fullscreen"), 28 ); |
735 | QAction* FSaction = new QAction( i18n("Toggle Fullscreen"), icon, i18n("Toggle Fullscreen"), 0, this ); | 735 | QAction* FSaction = new QAction( i18n("Toggle Fullscreen"), icon, i18n("Toggle Fullscreen"), 0, this ); |
736 | FSaction->addTo( viewMenu ); | 736 | FSaction->addTo( viewMenu ); |
737 | connect( FSaction, SIGNAL( activated() ), mView, SLOT( toggleExpand() )); | 737 | connect( FSaction, SIGNAL( activated() ), mView, SLOT( toggleExpand() )); |
738 | 738 | ||
739 | icon = loadPixmap( pathString + "navi" ); | 739 | icon = loadPixmap( pathString + "navi" ); |
740 | configureToolBarMenu->insertItem(icon, i18n("Toggle DateNavigator"), 22 ); | 740 | configureToolBarMenu->insertItem(icon, i18n("Toggle DateNavigator"), 22 ); |
741 | action = new QAction( i18n("Toggle DateNavigator"), icon, i18n("Toggle DateNavigator"), 0, this ); | 741 | action = new QAction( i18n("Toggle DateNavigator"), icon, i18n("Toggle DateNavigator"), 0, this ); |
742 | action->addTo( viewMenu ); | 742 | action->addTo( viewMenu ); |
743 | connect( action, SIGNAL( activated() ), | 743 | connect( action, SIGNAL( activated() ), |
744 | mView, SLOT( toggleDateNavigatorWidget() ) ); | 744 | mView, SLOT( toggleDateNavigatorWidget() ) ); |
745 | mToggleNav = action ; | 745 | mToggleNav = action ; |
746 | icon = loadPixmap( pathString + "filter" ); | 746 | icon = loadPixmap( pathString + "filter" ); |
747 | configureToolBarMenu->insertItem(icon, i18n("Toggle FilterView"), 26 ); | 747 | configureToolBarMenu->insertItem(icon, i18n("Filter menu icon"), 26 ); |
748 | action = new QAction( i18n("Toggle FilterView"), icon, i18n("Toggle FilterView"), 0, this ); | 748 | action = new QAction( i18n("Toggle FilterView"), icon, i18n("Toggle FilterView"), 0, this ); |
749 | action->addTo( viewMenu ); | 749 | action->addTo( viewMenu ); |
750 | connect( action, SIGNAL( activated() ), | 750 | connect( action, SIGNAL( activated() ), |
751 | mView, SLOT( toggleFilter() ) ); | 751 | mView, SLOT( toggleFilter() ) ); |
752 | mToggleFilter = action; | 752 | mToggleFilter = action; |
753 | icon = loadPixmap( pathString + "allday" ); | 753 | icon = loadPixmap( pathString + "allday" ); |
754 | configureToolBarMenu->insertItem(icon, i18n("Toggle Allday"), 24 ); | 754 | configureToolBarMenu->insertItem(icon, i18n("Toggle Allday"), 24 ); |
755 | action = new QAction( i18n("Toggle Allday"), icon,i18n("Toggle Allday"), 0, this ); | 755 | action = new QAction( i18n("Toggle Allday"), icon,i18n("Toggle Allday"), 0, this ); |
756 | action->addTo( viewMenu ); | 756 | action->addTo( viewMenu ); |
757 | connect( action, SIGNAL( activated() ), | 757 | connect( action, SIGNAL( activated() ), |
758 | mView, SLOT( toggleAllDaySize() ) ); | 758 | mView, SLOT( toggleAllDaySize() ) ); |
759 | mToggleAllday = action; | 759 | mToggleAllday = action; |
760 | 760 | ||
761 | 761 | ||
762 | connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ), | 762 | connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ), |
763 | mToggleNav, SLOT( setEnabled ( bool ) ) ); | 763 | mToggleNav, SLOT( setEnabled ( bool ) ) ); |
764 | connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ), | 764 | connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ), |
765 | mToggleFilter, SLOT( setEnabled ( bool ) ) ); | 765 | mToggleFilter, SLOT( setEnabled ( bool ) ) ); |
766 | connect( mView->viewManager(), SIGNAL( signalAgendaView( bool ) ), | 766 | connect( mView->viewManager(), SIGNAL( signalAgendaView( bool ) ), |
767 | mToggleAllday, SLOT( setEnabled ( bool ) ) ); | 767 | mToggleAllday, SLOT( setEnabled ( bool ) ) ); |
768 | 768 | ||
769 | viewMenu->insertSeparator(); | 769 | viewMenu->insertSeparator(); |
770 | icon = loadPixmap( pathString + "picker" ); | 770 | icon = loadPixmap( pathString + "picker" ); |
771 | action = new QAction( i18n("Date Picker"), icon, i18n("Date Picker"), 0, this ); | 771 | action = new QAction( i18n("Date Picker"), icon, i18n("Date Picker"), 0, this ); |
772 | action->addTo( viewMenu ); | 772 | action->addTo( viewMenu ); |
773 | connect( action, SIGNAL( activated() ), | 773 | connect( action, SIGNAL( activated() ), |
774 | mView, SLOT( showDatePicker() ) ); | 774 | mView, SLOT( showDatePicker() ) ); |
775 | action->addTo( iconToolBar ); | 775 | action->addTo( iconToolBar ); |
776 | viewMenu->insertSeparator(); | 776 | viewMenu->insertSeparator(); |
777 | 777 | ||
778 | if ( p-> mShowIconToggleFull ) | 778 | if ( p-> mShowIconToggleFull ) |
779 | FSaction->addTo( iconToolBar ); | 779 | FSaction->addTo( iconToolBar ); |
780 | if ( p->mShowIconNavigator ) mToggleNav ->addTo( iconToolBar ); | 780 | if ( p->mShowIconNavigator ) mToggleNav ->addTo( iconToolBar ); |
781 | if ( p->mShowIconFilterview ) mToggleFilter->addTo( iconToolBar ); | 781 | if ( p->mShowIconFilterview ) { |
782 | icon = loadPixmap( pathString + "filter" ); | ||
783 | QPEMenuBar *menuBar111 = new QPEMenuBar( iconToolBar ); | ||
784 | menuBar111->insertItem( icon.pixmap(), selectFilterMenu); | ||
785 | int isi = 24; | ||
786 | if ( QApplication::desktop()->width() < 480 ) | ||
787 | isi = 18; | ||
788 | menuBar111->setFixedSize( QSize( isi, isi )) ; | ||
789 | } | ||
790 | //******************** | ||
782 | if ( p->mShowIconAllday ) mToggleAllday->addTo( iconToolBar ); | 791 | if ( p->mShowIconAllday ) mToggleAllday->addTo( iconToolBar ); |
783 | 792 | ||
784 | 793 | ||
785 | icon = loadPixmap( pathString + "whatsnext" ); | 794 | icon = loadPixmap( pathString + "whatsnext" ); |
786 | configureToolBarMenu->insertItem(icon, i18n("What's Next"), 110 ); | 795 | configureToolBarMenu->insertItem(icon, i18n("What's Next"), 110 ); |
787 | QAction* whatsnext_action = new QAction( i18n("What's Next"), icon, i18n("What's Next"), 0, this ); | 796 | QAction* whatsnext_action = new QAction( i18n("What's Next"), icon, i18n("What's Next"), 0, this ); |
788 | whatsnext_action->addTo( viewMenu ); | 797 | whatsnext_action->addTo( viewMenu ); |
789 | connect( whatsnext_action, SIGNAL( activated() ), | 798 | connect( whatsnext_action, SIGNAL( activated() ), |
790 | mView->viewManager(), SLOT( showWhatsNextView() ) ); | 799 | mView->viewManager(), SLOT( showWhatsNextView() ) ); |
791 | 800 | ||
792 | icon = loadPixmap( pathString + "xdays" ); | 801 | icon = loadPixmap( pathString + "xdays" ); |
793 | configureToolBarMenu->insertItem(icon, i18n("Next days"), 100 ); | 802 | configureToolBarMenu->insertItem(icon, i18n("Next days"), 100 ); |
794 | QAction* xdays_action = new QAction( i18n("Next days"), icon, i18n("Next days"), 0, this ); | 803 | QAction* xdays_action = new QAction( i18n("Next days"), icon, i18n("Next days"), 0, this ); |
795 | xdays_action->addTo( viewMenu ); | 804 | xdays_action->addTo( viewMenu ); |
796 | connect( xdays_action, SIGNAL( activated() ), | 805 | connect( xdays_action, SIGNAL( activated() ), |
797 | mView->viewManager(), SLOT( showNextXView() ) ); | 806 | mView->viewManager(), SLOT( showNextXView() ) ); |
798 | 807 | ||
799 | 808 | ||
800 | icon = loadPixmap( pathString + "journal" ); | 809 | icon = loadPixmap( pathString + "journal" ); |
801 | configureToolBarMenu->insertItem(icon, i18n("Journal"), 90 ); | 810 | configureToolBarMenu->insertItem(icon, i18n("Journal"), 90 ); |
802 | QAction* viewjournal_action = new QAction( i18n("Journal"), icon, i18n("Journal"), 0, this ); | 811 | QAction* viewjournal_action = new QAction( i18n("Journal"), icon, i18n("Journal"), 0, this ); |
803 | viewjournal_action->addTo( viewMenu ); | 812 | viewjournal_action->addTo( viewMenu ); |
804 | connect( viewjournal_action, SIGNAL( activated() ), | 813 | connect( viewjournal_action, SIGNAL( activated() ), |
805 | mView->viewManager(), SLOT( showJournalView() ) ); | 814 | mView->viewManager(), SLOT( showJournalView() ) ); |
diff --git a/libkdepim/externalapphandler.cpp b/libkdepim/externalapphandler.cpp index f8f4c8a..0d66a5a 100644 --- a/libkdepim/externalapphandler.cpp +++ b/libkdepim/externalapphandler.cpp | |||
@@ -1114,69 +1114,76 @@ void ExternalAppHandler::passParameters(QCopEnvelope* e, const QString& paramete | |||
1114 | } | 1114 | } |
1115 | } | 1115 | } |
1116 | 1116 | ||
1117 | if (useValMap == true) | 1117 | if (useValMap == true) |
1118 | (*e) << valmap; | 1118 | (*e) << valmap; |
1119 | 1119 | ||
1120 | #endif | 1120 | #endif |
1121 | 1121 | ||
1122 | } | 1122 | } |
1123 | 1123 | ||
1124 | 1124 | ||
1125 | 1125 | ||
1126 | /************************************************************************** | 1126 | /************************************************************************** |
1127 | * | 1127 | * |
1128 | **************************************************************************/ | 1128 | **************************************************************************/ |
1129 | 1129 | ||
1130 | void ExternalAppHandler::appMessage( const QCString& cmsg, const QByteArray& data ) | 1130 | void ExternalAppHandler::appMessage( const QCString& cmsg, const QByteArray& data ) |
1131 | { | 1131 | { |
1132 | 1132 | ||
1133 | if ( cmsg == "nextView()" ) { | 1133 | if ( cmsg == "nextView()" ) { |
1134 | qDebug("nextView()"); | 1134 | qDebug("nextView()"); |
1135 | emit nextView(); | 1135 | emit nextView(); |
1136 | return; | 1136 | return; |
1137 | } | 1137 | } |
1138 | 1138 | if ( cmsg == "callContactdialog()" ) { | |
1139 | qDebug("callContactdialog()"); | ||
1140 | emit callContactdialog(); | ||
1141 | return; | ||
1142 | } | ||
1143 | |||
1139 | bool res = mNameEmailUidListFromKAPITransfer->appMessage( cmsg, data ); | 1144 | bool res = mNameEmailUidListFromKAPITransfer->appMessage( cmsg, data ); |
1140 | if (!res) | 1145 | if (!res) |
1141 | res = mBirthdayListFromKAPITransfer->appMessage( cmsg, data ); | 1146 | res = mBirthdayListFromKAPITransfer->appMessage( cmsg, data ); |
1142 | 1147 | ||
1143 | if (!res) | 1148 | if (!res) |
1144 | res = mDisplayDetails->appMessage( cmsg, data ); | 1149 | res = mDisplayDetails->appMessage( cmsg, data ); |
1145 | 1150 | ||
1146 | // if (!res) | 1151 | // if (!res) |
1147 | // res = mNameEmailUidListFromKAPITransfer->appMessage( cmsg, data ); | 1152 | // res = mNameEmailUidListFromKAPITransfer->appMessage( cmsg, data ); |
1148 | } | 1153 | } |
1149 | 1154 | ||
1150 | 1155 | ||
1151 | 1156 | ||
1152 | bool ExternalAppHandler::requestNameEmailUidListFromKAPI(const QString& sourceChannel, const QString& sessionuid) | 1157 | bool ExternalAppHandler::requestNameEmailUidListFromKAPI(const QString& sourceChannel, const QString& sessionuid) |
1153 | { | 1158 | { |
1154 | mNameEmailUidListFromKAPITransfer->setSourceChannel(sourceChannel); | 1159 | mNameEmailUidListFromKAPITransfer->setSourceChannel(sourceChannel); |
1155 | // maybe we are sending to KA/Pi fom a different worldd... | 1160 | // maybe we are sending to KA/Pi fom a different worldd... |
1156 | // it may be that the QAplication::desktop()->width() values in KA/Pi are not the same as in our application | 1161 | // it may be that the QAplication::desktop()->width() values in KA/Pi are not the same as in our application |
1157 | // for that reason we send the current QApplication::desktop()->width() to KA/Pi | 1162 | // for that reason we send the current QApplication::desktop()->width() to KA/Pi |
1163 | //qDebug("UID %s ", sessionuid.latin1()); | ||
1158 | return mNameEmailUidListFromKAPITransfer->sendMessageToTarget(QString::number ( QApplication::desktop()->width() )); | 1164 | return mNameEmailUidListFromKAPITransfer->sendMessageToTarget(QString::number ( QApplication::desktop()->width() )); |
1165 | //return mNameEmailUidListFromKAPITransfer->sendMessageToTarget(sessionuid); | ||
1159 | } | 1166 | } |
1160 | 1167 | ||
1161 | bool ExternalAppHandler::returnNameEmailUidListFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QStringList& list1, const QStringList& list2, const QStringList& list3) | 1168 | bool ExternalAppHandler::returnNameEmailUidListFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QStringList& list1, const QStringList& list2, const QStringList& list3) |
1162 | { | 1169 | { |
1163 | QStringList list4, list5, list6; | 1170 | QStringList list4, list5, list6; |
1164 | 1171 | ||
1165 | mNameEmailUidListFromKAPITransfer->setSourceChannel(sourceChannel); | 1172 | mNameEmailUidListFromKAPITransfer->setSourceChannel(sourceChannel); |
1166 | return mNameEmailUidListFromKAPITransfer->sendMessageToSource(sessionuid, list1, list2, list3, list4, list5, list6); | 1173 | return mNameEmailUidListFromKAPITransfer->sendMessageToSource(sessionuid, list1, list2, list3, list4, list5, list6); |
1167 | } | 1174 | } |
1168 | 1175 | ||
1169 | bool ExternalAppHandler::requestFindByEmailFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QString& email) | 1176 | bool ExternalAppHandler::requestFindByEmailFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QString& email) |
1170 | { | 1177 | { |
1171 | mFindByEmailFromKAPITransfer->setSourceChannel(sourceChannel); | 1178 | mFindByEmailFromKAPITransfer->setSourceChannel(sourceChannel); |
1172 | return mFindByEmailFromKAPITransfer->sendMessageToTarget(sessionuid, email); | 1179 | return mFindByEmailFromKAPITransfer->sendMessageToTarget(sessionuid, email); |
1173 | } | 1180 | } |
1174 | 1181 | ||
1175 | bool ExternalAppHandler::returnFindByEmailFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QStringList& list1, const QStringList& list2, const QStringList& list3) | 1182 | bool ExternalAppHandler::returnFindByEmailFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QStringList& list1, const QStringList& list2, const QStringList& list3) |
1176 | { | 1183 | { |
1177 | QStringList list4, list5, list6; | 1184 | QStringList list4, list5, list6; |
1178 | 1185 | ||
1179 | mFindByEmailFromKAPITransfer->setSourceChannel(sourceChannel); | 1186 | mFindByEmailFromKAPITransfer->setSourceChannel(sourceChannel); |
1180 | return mFindByEmailFromKAPITransfer->sendMessageToSource(sessionuid, list1, list2, list3, list4, list5, list6); | 1187 | return mFindByEmailFromKAPITransfer->sendMessageToSource(sessionuid, list1, list2, list3, list4, list5, list6); |
1181 | } | 1188 | } |
1182 | 1189 | ||
diff --git a/libkdepim/externalapphandler.h b/libkdepim/externalapphandler.h index 52a64e1..097f306 100644 --- a/libkdepim/externalapphandler.h +++ b/libkdepim/externalapphandler.h | |||
@@ -212,48 +212,49 @@ class ExternalAppHandler : public QObject | |||
212 | bool returnFindByEmailFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QStringList& name, const QStringList& email, const QStringList& uid); | 212 | bool returnFindByEmailFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QStringList& name, const QStringList& email, const QStringList& uid); |
213 | 213 | ||
214 | bool requestDetailsFromKAPI(const QString& name, const QString& email, const QString& uid); | 214 | bool requestDetailsFromKAPI(const QString& name, const QString& email, const QString& uid); |
215 | 215 | ||
216 | 216 | ||
217 | 217 | ||
218 | bool requestBirthdayListFromKAPI(const QString& sourceChannel, const QString& sessionuid); | 218 | bool requestBirthdayListFromKAPI(const QString& sourceChannel, const QString& sessionuid); |
219 | bool returnBirthdayListFromKAPI(const QString& sourceChannel, const QString& sessionuid, | 219 | bool returnBirthdayListFromKAPI(const QString& sourceChannel, const QString& sessionuid, |
220 | const QStringList& birthdayList, const QStringList& anniversaryList, | 220 | const QStringList& birthdayList, const QStringList& anniversaryList, |
221 | const QStringList& realNameList, const QStringList& emailList, | 221 | const QStringList& realNameList, const QStringList& emailList, |
222 | const QStringList& assembledNameList, const QStringList& uidList); | 222 | const QStringList& assembledNameList, const QStringList& uidList); |
223 | 223 | ||
224 | 224 | ||
225 | //loadConfig clears the cache and checks again if the applications are available or not | 225 | //loadConfig clears the cache and checks again if the applications are available or not |
226 | void loadConfig(); | 226 | void loadConfig(); |
227 | 227 | ||
228 | QList<DefaultAppItem> getAvailableDefaultItems(Types); | 228 | QList<DefaultAppItem> getAvailableDefaultItems(Types); |
229 | DefaultAppItem* getDefaultItem(Types, int); | 229 | DefaultAppItem* getDefaultItem(Types, int); |
230 | 230 | ||
231 | public slots: | 231 | public slots: |
232 | void appMessage( const QCString& msg, const QByteArray& data ); | 232 | void appMessage( const QCString& msg, const QByteArray& data ); |
233 | 233 | ||
234 | 234 | ||
235 | signals: | 235 | signals: |
236 | void callContactdialog(); | ||
236 | void nextView(); | 237 | void nextView(); |
237 | // Emmitted when the target app receives a request from the source app | 238 | // Emmitted when the target app receives a request from the source app |
238 | void requestForNameEmailUidList(const QString& sourceChannel, const QString& uid); | 239 | void requestForNameEmailUidList(const QString& sourceChannel, const QString& uid); |
239 | 240 | ||
240 | // Emitted when the source app recieves a list of name/email pairs (=addresses) from another target app. Usually Ka/Pi | 241 | // Emitted when the source app recieves a list of name/email pairs (=addresses) from another target app. Usually Ka/Pi |
241 | // The first parameter is a uniqueid. It can be used to identify the event | 242 | // The first parameter is a uniqueid. It can be used to identify the event |
242 | void receivedNameEmailUidListEvent(const QString& uid, const QStringList& nameList, const QStringList& emailList, const QStringList& uidList); | 243 | void receivedNameEmailUidListEvent(const QString& uid, const QStringList& nameList, const QStringList& emailList, const QStringList& uidList); |
243 | 244 | ||
244 | void requestFindByEmail(const QString& sourceChannel, const QString& uid, const QString& email); | 245 | void requestFindByEmail(const QString& sourceChannel, const QString& uid, const QString& email); |
245 | void receivedFindByEmailEvent(const QString& uid, const QStringList& nameList, const QStringList& emailList, const QStringList& uidList); | 246 | void receivedFindByEmailEvent(const QString& uid, const QStringList& nameList, const QStringList& emailList, const QStringList& uidList); |
246 | 247 | ||
247 | void requestForDetails(const QString& sourceChannel, const QString& sessionuid, const QString& name, const QString& email, const QString& uid); | 248 | void requestForDetails(const QString& sourceChannel, const QString& sessionuid, const QString& name, const QString& email, const QString& uid); |
248 | 249 | ||
249 | 250 | ||
250 | // Emmitted when the target app receives a request from the source app | 251 | // Emmitted when the target app receives a request from the source app |
251 | void requestForBirthdayList(const QString& sourceChannel, const QString& uid); | 252 | void requestForBirthdayList(const QString& sourceChannel, const QString& uid); |
252 | 253 | ||
253 | // Emitted when the source app recieves a list of name/email pairs (=addresses) from another target app. Usually Ka/Pi | 254 | // Emitted when the source app recieves a list of name/email pairs (=addresses) from another target app. Usually Ka/Pi |
254 | // The first parameter is a uniqueid. It can be used to identify the event | 255 | // The first parameter is a uniqueid. It can be used to identify the event |
255 | void receivedBirthdayListEvent(const QString& uid, const QStringList& birthdayList, | 256 | void receivedBirthdayListEvent(const QString& uid, const QStringList& birthdayList, |
256 | const QStringList& anniversaryList, const QStringList& realNameList, | 257 | const QStringList& anniversaryList, const QStringList& realNameList, |
257 | const QStringList& emailList, const QStringList& assembledNameList, | 258 | const QStringList& emailList, const QStringList& assembledNameList, |
258 | const QStringList& uidList); | 259 | const QStringList& uidList); |
259 | 260 | ||