author | zautrix <zautrix> | 2004-11-08 22:16:36 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-11-08 22:16:36 (UTC) |
commit | d92ceb39af0bf0c655b68cb166dfea44cd688f1c (patch) (unidiff) | |
tree | b79b985969e4b6db6d4b1acacec6a62c8105e559 /kaddressbook | |
parent | 4e06ab7da7f56f579010e93b1b9009ed9fd6a33e (diff) | |
download | kdepimpi-d92ceb39af0bf0c655b68cb166dfea44cd688f1c.zip kdepimpi-d92ceb39af0bf0c655b68cb166dfea44cd688f1c.tar.gz kdepimpi-d92ceb39af0bf0c655b68cb166dfea44cd688f1c.tar.bz2 |
orientation change fix for kapi
-rw-r--r-- | kaddressbook/kabcore.cpp | 27 | ||||
-rw-r--r-- | kaddressbook/kabcore.h | 1 |
2 files changed, 27 insertions, 1 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 7be5db8..7acf1ee 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -239,48 +239,49 @@ class KAex2phonePrefs : public QDialog | |||
239 | } | 239 | } |
240 | 240 | ||
241 | public: | 241 | public: |
242 | QLineEdit* mPhoneConnection, *mPhoneDevice, *mPhoneModel; | 242 | QLineEdit* mPhoneConnection, *mPhoneDevice, *mPhoneModel; |
243 | QCheckBox* mWriteToSim; | 243 | QCheckBox* mWriteToSim; |
244 | }; | 244 | }; |
245 | 245 | ||
246 | 246 | ||
247 | bool pasteWithNewUid = true; | 247 | bool pasteWithNewUid = true; |
248 | 248 | ||
249 | #ifdef KAB_EMBEDDED | 249 | #ifdef KAB_EMBEDDED |
250 | KABCore::KABCore( KAddressBookMain *client, bool readWrite, QWidget *parent, const char *name ) | 250 | KABCore::KABCore( KAddressBookMain *client, bool readWrite, QWidget *parent, const char *name ) |
251 | : QWidget( parent, name ), KSyncInterface(), mGUIClient( client ), mViewManager( 0 ), | 251 | : QWidget( parent, name ), KSyncInterface(), mGUIClient( client ), mViewManager( 0 ), |
252 | mExtensionManager( 0 ),mConfigureDialog( 0 ),/*US mLdapSearchDialog( 0 ),*/ | 252 | mExtensionManager( 0 ),mConfigureDialog( 0 ),/*US mLdapSearchDialog( 0 ),*/ |
253 | mReadWrite( readWrite ), mModified( false ), mMainWindow(client) | 253 | mReadWrite( readWrite ), mModified( false ), mMainWindow(client) |
254 | #else //KAB_EMBEDDED | 254 | #else //KAB_EMBEDDED |
255 | KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const char *name ) | 255 | KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const char *name ) |
256 | : QWidget( parent, name ), KSyncInterface(), mGUIClient( client ), mViewManager( 0 ), | 256 | : QWidget( parent, name ), KSyncInterface(), mGUIClient( client ), mViewManager( 0 ), |
257 | mExtensionManager( 0 ), mConfigureDialog( 0 ), mLdapSearchDialog( 0 ), | 257 | mExtensionManager( 0 ), mConfigureDialog( 0 ), mLdapSearchDialog( 0 ), |
258 | mReadWrite( readWrite ), mModified( false ) | 258 | mReadWrite( readWrite ), mModified( false ) |
259 | #endif //KAB_EMBEDDED | 259 | #endif //KAB_EMBEDDED |
260 | { | 260 | { |
261 | // syncManager = new KSyncManager((QWidget*)this, (KSyncInterface*)this, KSyncManager::KAPI, KABPrefs::instance(), syncMenu); | 261 | // syncManager = new KSyncManager((QWidget*)this, (KSyncInterface*)this, KSyncManager::KAPI, KABPrefs::instance(), syncMenu); |
262 | // syncManager->setBlockSave(false); | 262 | // syncManager->setBlockSave(false); |
263 | mMiniSplitter = 0; | ||
263 | mExtensionBarSplitter = 0; | 264 | mExtensionBarSplitter = 0; |
264 | mIsPart = !parent->inherits( "KAddressBookMain" ); | 265 | mIsPart = !parent->inherits( "KAddressBookMain" ); |
265 | mAddressBook = KABC::StdAddressBook::self(); | 266 | mAddressBook = KABC::StdAddressBook::self(); |
266 | KABC::StdAddressBook::setAutomaticSave( false ); | 267 | KABC::StdAddressBook::setAutomaticSave( false ); |
267 | 268 | ||
268 | #ifndef KAB_EMBEDDED | 269 | #ifndef KAB_EMBEDDED |
269 | mAddressBook->setErrorHandler( new KABC::GUIErrorHandler ); | 270 | mAddressBook->setErrorHandler( new KABC::GUIErrorHandler ); |
270 | #endif //KAB_EMBEDDED | 271 | #endif //KAB_EMBEDDED |
271 | 272 | ||
272 | connect( mAddressBook, SIGNAL( addressBookChanged( AddressBook * ) ), | 273 | connect( mAddressBook, SIGNAL( addressBookChanged( AddressBook * ) ), |
273 | SLOT( addressBookChanged() ) ); | 274 | SLOT( addressBookChanged() ) ); |
274 | 275 | ||
275 | #if 0 | 276 | #if 0 |
276 | // LP moved to addressbook init method | 277 | // LP moved to addressbook init method |
277 | mAddressBook->addCustomField( i18n( "Department" ), KABC::Field::Organization, | 278 | mAddressBook->addCustomField( i18n( "Department" ), KABC::Field::Organization, |
278 | "X-Department", "KADDRESSBOOK" ); | 279 | "X-Department", "KADDRESSBOOK" ); |
279 | mAddressBook->addCustomField( i18n( "Profession" ), KABC::Field::Organization, | 280 | mAddressBook->addCustomField( i18n( "Profession" ), KABC::Field::Organization, |
280 | "X-Profession", "KADDRESSBOOK" ); | 281 | "X-Profession", "KADDRESSBOOK" ); |
281 | mAddressBook->addCustomField( i18n( "Assistant's Name" ), KABC::Field::Organization, | 282 | mAddressBook->addCustomField( i18n( "Assistant's Name" ), KABC::Field::Organization, |
282 | "X-AssistantsName", "KADDRESSBOOK" ); | 283 | "X-AssistantsName", "KADDRESSBOOK" ); |
283 | mAddressBook->addCustomField( i18n( "Manager's Name" ), KABC::Field::Organization, | 284 | mAddressBook->addCustomField( i18n( "Manager's Name" ), KABC::Field::Organization, |
284 | "X-ManagersName", "KADDRESSBOOK" ); | 285 | "X-ManagersName", "KADDRESSBOOK" ); |
285 | mAddressBook->addCustomField( i18n( "Spouse's Name" ), KABC::Field::Personal, | 286 | mAddressBook->addCustomField( i18n( "Spouse's Name" ), KABC::Field::Personal, |
286 | "X-SpousesName", "KADDRESSBOOK" ); | 287 | "X-SpousesName", "KADDRESSBOOK" ); |
@@ -339,49 +340,49 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const | |||
339 | #ifndef KAB_EMBEDDED | 340 | #ifndef KAB_EMBEDDED |
340 | connect( mViewManager, SIGNAL( urlDropped( const KURL& ) ), | 341 | connect( mViewManager, SIGNAL( urlDropped( const KURL& ) ), |
341 | mXXPortManager, SLOT( importVCard( const KURL& ) ) ); | 342 | mXXPortManager, SLOT( importVCard( const KURL& ) ) ); |
342 | 343 | ||
343 | connect( mDetails, SIGNAL( browse( const QString& ) ), | 344 | connect( mDetails, SIGNAL( browse( const QString& ) ), |
344 | SLOT( browse( const QString& ) ) ); | 345 | SLOT( browse( const QString& ) ) ); |
345 | 346 | ||
346 | 347 | ||
347 | mAddressBookService = new KAddressBookService( this ); | 348 | mAddressBookService = new KAddressBookService( this ); |
348 | 349 | ||
349 | #endif //KAB_EMBEDDED | 350 | #endif //KAB_EMBEDDED |
350 | 351 | ||
351 | mMessageTimer = new QTimer( this ); | 352 | mMessageTimer = new QTimer( this ); |
352 | connect( mMessageTimer, SIGNAL( timeout() ), this, SLOT( setCaptionBack() ) ); | 353 | connect( mMessageTimer, SIGNAL( timeout() ), this, SLOT( setCaptionBack() ) ); |
353 | mEditorDialog = 0; | 354 | mEditorDialog = 0; |
354 | createAddresseeEditorDialog( this ); | 355 | createAddresseeEditorDialog( this ); |
355 | setModified( false ); | 356 | setModified( false ); |
356 | mBRdisabled = false; | 357 | mBRdisabled = false; |
357 | #ifndef DESKTOP_VERSION | 358 | #ifndef DESKTOP_VERSION |
358 | infrared = 0; | 359 | infrared = 0; |
359 | #endif | 360 | #endif |
360 | //toggleBeamReceive( ); | 361 | //toggleBeamReceive( ); |
361 | 362 | ||
362 | // we have a toolbar repainting error on the Zaurus when starting KA/Pi | 363 | // we have a toolbar repainting error on the Zaurus when starting KA/Pi |
363 | QTimer::singleShot( 1, this , SLOT ( updateToolBar())); | 364 | QTimer::singleShot( 1000, this , SLOT ( updateToolBar())); |
364 | } | 365 | } |
365 | 366 | ||
366 | void KABCore::updateToolBar() | 367 | void KABCore::updateToolBar() |
367 | { | 368 | { |
368 | mMainWindow->toolBar()->repaint(); | 369 | mMainWindow->toolBar()->repaint(); |
369 | } | 370 | } |
370 | KABCore::~KABCore() | 371 | KABCore::~KABCore() |
371 | { | 372 | { |
372 | // save(); | 373 | // save(); |
373 | //saveSettings(); | 374 | //saveSettings(); |
374 | //KABPrefs::instance()->writeConfig(); | 375 | //KABPrefs::instance()->writeConfig(); |
375 | delete AddresseeConfig::instance(); | 376 | delete AddresseeConfig::instance(); |
376 | mAddressBook = 0; | 377 | mAddressBook = 0; |
377 | KABC::StdAddressBook::close(); | 378 | KABC::StdAddressBook::close(); |
378 | 379 | ||
379 | delete syncManager; | 380 | delete syncManager; |
380 | #ifndef DESKTOP_VERSION | 381 | #ifndef DESKTOP_VERSION |
381 | if ( infrared ) | 382 | if ( infrared ) |
382 | delete infrared; | 383 | delete infrared; |
383 | #endif | 384 | #endif |
384 | } | 385 | } |
385 | void KABCore::receive( const QCString& cmsg, const QByteArray& data ) | 386 | void KABCore::receive( const QCString& cmsg, const QByteArray& data ) |
386 | { | 387 | { |
387 | qDebug("KA: QCOP message received: %s ", cmsg.data() ); | 388 | qDebug("KA: QCOP message received: %s ", cmsg.data() ); |
@@ -755,51 +756,75 @@ void KABCore::mailVCard( const QStringList& uids ) | |||
755 | QString::null, | 756 | QString::null, |
756 | urls ); // attachments | 757 | urls ); // attachments |
757 | */ | 758 | */ |
758 | 759 | ||
759 | } | 760 | } |
760 | 761 | ||
761 | /** | 762 | /** |
762 | Beams the "WhoAmI contact. | 763 | Beams the "WhoAmI contact. |
763 | */ | 764 | */ |
764 | void KABCore::beamMySelf() | 765 | void KABCore::beamMySelf() |
765 | { | 766 | { |
766 | KABC::Addressee a = KABC::StdAddressBook::self()->whoAmI(); | 767 | KABC::Addressee a = KABC::StdAddressBook::self()->whoAmI(); |
767 | if (!a.isEmpty()) | 768 | if (!a.isEmpty()) |
768 | { | 769 | { |
769 | QStringList uids; | 770 | QStringList uids; |
770 | uids << a.uid(); | 771 | uids << a.uid(); |
771 | 772 | ||
772 | beamVCard(uids); | 773 | beamVCard(uids); |
773 | } else { | 774 | } else { |
774 | KMessageBox::information( this, i18n( "Your personal contact is\nnot set! Please select it\nand set it with menu:\nSettings - Set Who Am I\n" ) ); | 775 | KMessageBox::information( this, i18n( "Your personal contact is\nnot set! Please select it\nand set it with menu:\nSettings - Set Who Am I\n" ) ); |
775 | 776 | ||
776 | 777 | ||
777 | } | 778 | } |
778 | } | 779 | } |
780 | void KABCore::resizeEvent(QResizeEvent* e ) | ||
781 | { | ||
782 | if ( !mMiniSplitter ) | ||
783 | return; | ||
784 | if ( QApplication::desktop()->width() >= 480 ) { | ||
785 | int fac = QApplication::desktop()->width()/QApplication::desktop()->height(); | ||
786 | if ( fac > 0 ) { // e.g. 640x480 | ||
787 | if ( mMiniSplitter->orientation() == Qt::Vertical ) { | ||
788 | mMiniSplitter->setOrientation( Qt::Horizontal); | ||
789 | mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right ); | ||
790 | if ( QApplication::desktop()->width() <= 640 ) | ||
791 | topLevelWidget()->showMaximized(); | ||
792 | } | ||
793 | } else {// e.g. 480x640 | ||
794 | if ( mMiniSplitter->orientation() == Qt::Horizontal ) { | ||
795 | mMiniSplitter->setOrientation( Qt::Vertical ); | ||
796 | mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down ); | ||
797 | if ( QApplication::desktop()->width() <= 640 ) | ||
798 | topLevelWidget()->showMaximized(); | ||
799 | } | ||
800 | } | ||
801 | } | ||
779 | 802 | ||
803 | } | ||
780 | void KABCore::export2phone() | 804 | void KABCore::export2phone() |
781 | { | 805 | { |
806 | |||
782 | QStringList uids; | 807 | QStringList uids; |
783 | XXPortSelectDialog dlg( this, false, this ); | 808 | XXPortSelectDialog dlg( this, false, this ); |
784 | if ( dlg.exec() ) | 809 | if ( dlg.exec() ) |
785 | uids = dlg.uids(); | 810 | uids = dlg.uids(); |
786 | else | 811 | else |
787 | return; | 812 | return; |
788 | if ( uids.isEmpty() ) | 813 | if ( uids.isEmpty() ) |
789 | return; | 814 | return; |
790 | // qDebug("count %d ", uids.count()); | 815 | // qDebug("count %d ", uids.count()); |
791 | 816 | ||
792 | KAex2phonePrefs ex2phone; | 817 | KAex2phonePrefs ex2phone; |
793 | ex2phone.mPhoneConnection->setText( KPimGlobalPrefs::instance()->mEx2PhoneConnection ); | 818 | ex2phone.mPhoneConnection->setText( KPimGlobalPrefs::instance()->mEx2PhoneConnection ); |
794 | ex2phone.mPhoneDevice->setText( KPimGlobalPrefs::instance()->mEx2PhoneDevice ); | 819 | ex2phone.mPhoneDevice->setText( KPimGlobalPrefs::instance()->mEx2PhoneDevice ); |
795 | ex2phone.mPhoneModel->setText( KPimGlobalPrefs::instance()->mEx2PhoneModel ); | 820 | ex2phone.mPhoneModel->setText( KPimGlobalPrefs::instance()->mEx2PhoneModel ); |
796 | 821 | ||
797 | if ( !ex2phone.exec() ) { | 822 | if ( !ex2phone.exec() ) { |
798 | return; | 823 | return; |
799 | } | 824 | } |
800 | KPimGlobalPrefs::instance()->mEx2PhoneConnection = ex2phone.mPhoneConnection->text(); | 825 | KPimGlobalPrefs::instance()->mEx2PhoneConnection = ex2phone.mPhoneConnection->text(); |
801 | KPimGlobalPrefs::instance()->mEx2PhoneDevice = ex2phone.mPhoneDevice->text(); | 826 | KPimGlobalPrefs::instance()->mEx2PhoneDevice = ex2phone.mPhoneDevice->text(); |
802 | KPimGlobalPrefs::instance()->mEx2PhoneModel = ex2phone.mPhoneModel->text(); | 827 | KPimGlobalPrefs::instance()->mEx2PhoneModel = ex2phone.mPhoneModel->text(); |
803 | 828 | ||
804 | 829 | ||
805 | PhoneAccess::writeConfig( KPimGlobalPrefs::instance()->mEx2PhoneDevice, | 830 | PhoneAccess::writeConfig( KPimGlobalPrefs::instance()->mEx2PhoneDevice, |
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h index 0a52838..fe2d3a2 100644 --- a/kaddressbook/kabcore.h +++ b/kaddressbook/kabcore.h | |||
@@ -361,48 +361,49 @@ class KABCore : public QWidget, public KSyncInterface | |||
361 | // void slotSyncMenu( int ); | 361 | // void slotSyncMenu( int ); |
362 | private slots: | 362 | private slots: |
363 | void updateToolBar(); | 363 | void updateToolBar(); |
364 | void receive( const QCString& cmsg, const QByteArray& data ); | 364 | void receive( const QCString& cmsg, const QByteArray& data ); |
365 | void toggleBeamReceive( ); | 365 | void toggleBeamReceive( ); |
366 | void disableBR(bool); | 366 | void disableBR(bool); |
367 | void setJumpButtonBarVisible( bool visible ); | 367 | void setJumpButtonBarVisible( bool visible ); |
368 | void setCaptionBack(); | 368 | void setCaptionBack(); |
369 | void importFromOL(); | 369 | void importFromOL(); |
370 | void extensionModified( const KABC::Addressee::List &list ); | 370 | void extensionModified( const KABC::Addressee::List &list ); |
371 | void extensionChanged( int id ); | 371 | void extensionChanged( int id ); |
372 | void clipboardDataChanged(); | 372 | void clipboardDataChanged(); |
373 | void updateActionMenu(); | 373 | void updateActionMenu(); |
374 | void configureKeyBindings(); | 374 | void configureKeyBindings(); |
375 | void removeVoice(); | 375 | void removeVoice(); |
376 | #ifdef KAB_EMBEDDED | 376 | #ifdef KAB_EMBEDDED |
377 | void configureResources(); | 377 | void configureResources(); |
378 | #endif //KAB_EMBEDDED | 378 | #endif //KAB_EMBEDDED |
379 | 379 | ||
380 | void slotEditorDestroyed( const QString &uid ); | 380 | void slotEditorDestroyed( const QString &uid ); |
381 | void configurationChanged(); | 381 | void configurationChanged(); |
382 | void addressBookChanged(); | 382 | void addressBookChanged(); |
383 | 383 | ||
384 | private: | 384 | private: |
385 | void resizeEvent(QResizeEvent* e ); | ||
385 | bool mBRdisabled; | 386 | bool mBRdisabled; |
386 | #ifndef DESKTOP_VERSION | 387 | #ifndef DESKTOP_VERSION |
387 | QCopChannel* infrared; | 388 | QCopChannel* infrared; |
388 | #endif | 389 | #endif |
389 | QTimer *mMessageTimer; | 390 | QTimer *mMessageTimer; |
390 | void initGUI(); | 391 | void initGUI(); |
391 | void initActions(); | 392 | void initActions(); |
392 | QString getPhoneFile(); | 393 | QString getPhoneFile(); |
393 | 394 | ||
394 | AddresseeEditorDialog *createAddresseeEditorDialog( QWidget *parent, | 395 | AddresseeEditorDialog *createAddresseeEditorDialog( QWidget *parent, |
395 | const char *name = 0 ); | 396 | const char *name = 0 ); |
396 | 397 | ||
397 | KXMLGUIClient *mGUIClient; | 398 | KXMLGUIClient *mGUIClient; |
398 | 399 | ||
399 | KABC::AddressBook *mAddressBook; | 400 | KABC::AddressBook *mAddressBook; |
400 | 401 | ||
401 | ViewManager *mViewManager; | 402 | ViewManager *mViewManager; |
402 | // QSplitter *mDetailsSplitter; | 403 | // QSplitter *mDetailsSplitter; |
403 | KDGanttMinimizeSplitter *mExtensionBarSplitter; | 404 | KDGanttMinimizeSplitter *mExtensionBarSplitter; |
404 | ViewContainer *mDetails; | 405 | ViewContainer *mDetails; |
405 | KDGanttMinimizeSplitter* mMiniSplitter; | 406 | KDGanttMinimizeSplitter* mMiniSplitter; |
406 | XXPortManager *mXXPortManager; | 407 | XXPortManager *mXXPortManager; |
407 | JumpButtonBar *mJumpButtonBar; | 408 | JumpButtonBar *mJumpButtonBar; |
408 | IncSearchWidget *mIncSearchWidget; | 409 | IncSearchWidget *mIncSearchWidget; |