-rw-r--r-- | kaddressbook/kabcore.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 5ef61b1..e34951a 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -386,33 +386,33 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const | |||
386 | 386 | ||
387 | 387 | ||
388 | mAddressBookService = new KAddressBookService( this ); | 388 | mAddressBookService = new KAddressBookService( this ); |
389 | 389 | ||
390 | #endif //KAB_EMBEDDED | 390 | #endif //KAB_EMBEDDED |
391 | 391 | ||
392 | mMessageTimer = new QTimer( this ); | 392 | mMessageTimer = new QTimer( this ); |
393 | connect( mMessageTimer, SIGNAL( timeout() ), this, SLOT( setCaptionBack() ) ); | 393 | connect( mMessageTimer, SIGNAL( timeout() ), this, SLOT( setCaptionBack() ) ); |
394 | mEditorDialog = 0; | 394 | mEditorDialog = 0; |
395 | createAddresseeEditorDialog( this ); | 395 | createAddresseeEditorDialog( this ); |
396 | setModified( false ); | 396 | setModified( false ); |
397 | mBRdisabled = false; | 397 | mBRdisabled = false; |
398 | #ifndef DESKTOP_VERSION | 398 | #ifndef DESKTOP_VERSION |
399 | infrared = 0; | 399 | infrared = 0; |
400 | #endif | 400 | #endif |
401 | //toggleBeamReceive( ); | 401 | //toggleBeamReceive( ); |
402 | //mMainWindow->toolBar()->show(); | 402 | mMainWindow->toolBar()->show(); |
403 | // we have a toolbar repainting error on the Zaurus when starting KA/Pi | 403 | // we have a toolbar repainting error on the Zaurus when starting KA/Pi |
404 | QTimer::singleShot( 10, this , SLOT ( updateToolBar())); | 404 | QTimer::singleShot( 10, this , SLOT ( updateToolBar())); |
405 | } | 405 | } |
406 | 406 | ||
407 | void KABCore::updateToolBar() | 407 | void KABCore::updateToolBar() |
408 | { | 408 | { |
409 | static int iii = 0; | 409 | static int iii = 0; |
410 | ++iii; | 410 | ++iii; |
411 | mMainWindow->toolBar()->repaintMe(); | 411 | mMainWindow->toolBar()->repaintMe(); |
412 | if ( iii < 4 ) | 412 | if ( iii < 4 ) |
413 | QTimer::singleShot( 100*iii, this , SLOT ( updateToolBar())); | 413 | QTimer::singleShot( 100*iii, this , SLOT ( updateToolBar())); |
414 | } | 414 | } |
415 | KABCore::~KABCore() | 415 | KABCore::~KABCore() |
416 | { | 416 | { |
417 | // save(); | 417 | // save(); |
418 | //saveSettings(); | 418 | //saveSettings(); |
@@ -2160,32 +2160,33 @@ void KABCore::addActionsManually() | |||
2160 | tb->insertWidget(-1, 0, menuBarTB); | 2160 | tb->insertWidget(-1, 0, menuBarTB); |
2161 | mIncSearchWidget = new IncSearchWidget( tb ); | 2161 | mIncSearchWidget = new IncSearchWidget( tb ); |
2162 | tb->enableMoving(false); | 2162 | tb->enableMoving(false); |
2163 | popupBarTB->insertItem( i18n("&File"), fileMenu ); | 2163 | popupBarTB->insertItem( i18n("&File"), fileMenu ); |
2164 | popupBarTB->insertItem( i18n("&Edit"), editMenu ); | 2164 | popupBarTB->insertItem( i18n("&Edit"), editMenu ); |
2165 | popupBarTB->insertItem( i18n("&View"), viewMenu ); | 2165 | popupBarTB->insertItem( i18n("&View"), viewMenu ); |
2166 | popupBarTB->insertItem( i18n("&Settings"), settingsMenu ); | 2166 | popupBarTB->insertItem( i18n("&Settings"), settingsMenu ); |
2167 | popupBarTB->insertItem( i18n("Synchronize"), syncMenu ); | 2167 | popupBarTB->insertItem( i18n("Synchronize"), syncMenu ); |
2168 | mViewManager->getFilterAction()->plug ( popupBarTB); | 2168 | mViewManager->getFilterAction()->plug ( popupBarTB); |
2169 | //popupBarTB->insertItem( i18n("&Change selected"), changeMenu ); | 2169 | //popupBarTB->insertItem( i18n("&Change selected"), changeMenu ); |
2170 | popupBarTB->insertItem( i18n("&Help"), helpMenu ); | 2170 | popupBarTB->insertItem( i18n("&Help"), helpMenu ); |
2171 | if (QApplication::desktop()->width() > 320 ) { | 2171 | if (QApplication::desktop()->width() > 320 ) { |
2172 | // mViewManager->getFilterAction()->plug ( tb); | 2172 | // mViewManager->getFilterAction()->plug ( tb); |
2173 | } | 2173 | } |
2174 | } | 2174 | } |
2175 | #endif | 2175 | #endif |
2176 | mIncSearchWidget->setSize(); | ||
2176 | // mActionQuit->plug ( mMainWindow->toolBar()); | 2177 | // mActionQuit->plug ( mMainWindow->toolBar()); |
2177 | 2178 | ||
2178 | 2179 | ||
2179 | 2180 | ||
2180 | //US Now connect the actions with the menue entries. | 2181 | //US Now connect the actions with the menue entries. |
2181 | #ifdef DESKTOP_VERSION | 2182 | #ifdef DESKTOP_VERSION |
2182 | mActionPrint->plug( fileMenu ); | 2183 | mActionPrint->plug( fileMenu ); |
2183 | mActionPrintDetails->plug( fileMenu ); | 2184 | mActionPrintDetails->plug( fileMenu ); |
2184 | fileMenu->insertSeparator(); | 2185 | fileMenu->insertSeparator(); |
2185 | #endif | 2186 | #endif |
2186 | mActionMail->plug( fileMenu ); | 2187 | mActionMail->plug( fileMenu ); |
2187 | fileMenu->insertSeparator(); | 2188 | fileMenu->insertSeparator(); |
2188 | 2189 | ||
2189 | mActionNewContact->plug( editMenu ); | 2190 | mActionNewContact->plug( editMenu ); |
2190 | mActionNewContact->plug( tb ); | 2191 | mActionNewContact->plug( tb ); |
2191 | 2192 | ||
@@ -2282,33 +2283,33 @@ void KABCore::addActionsManually() | |||
2282 | if (KGlobal::getDesktopSize() > KGlobal::Small ) { | 2283 | if (KGlobal::getDesktopSize() > KGlobal::Small ) { |
2283 | 2284 | ||
2284 | mActionSave->plug( tb ); | 2285 | mActionSave->plug( tb ); |
2285 | mViewManager->getFilterAction()->plug ( tb); | 2286 | mViewManager->getFilterAction()->plug ( tb); |
2286 | //LR hide filteraction on started in 480x640 | 2287 | //LR hide filteraction on started in 480x640 |
2287 | if (QApplication::desktop()->width() == 480 ) { | 2288 | if (QApplication::desktop()->width() == 480 ) { |
2288 | mViewManager->getFilterAction()->setComboWidth( 0 ); | 2289 | mViewManager->getFilterAction()->setComboWidth( 0 ); |
2289 | } | 2290 | } |
2290 | mActionUndo->plug( tb ); | 2291 | mActionUndo->plug( tb ); |
2291 | mActionDelete->plug( tb ); | 2292 | mActionDelete->plug( tb ); |
2292 | mActionRedo->plug( tb ); | 2293 | mActionRedo->plug( tb ); |
2293 | } else { | 2294 | } else { |
2294 | mActionSave->plug( tb ); | 2295 | mActionSave->plug( tb ); |
2295 | tb->enableMoving(false); | 2296 | tb->enableMoving(false); |
2296 | } | 2297 | } |
2297 | //mActionQuit->plug ( tb ); | 2298 | //mActionQuit->plug ( tb ); |
2298 | // tb->insertWidget(-1, 0, mIncSearchWidget, 6); | 2299 | //tb->insertWidget(-1, 0, mIncSearchWidget, 6); |
2299 | 2300 | ||
2300 | //US link the searchwidget first to this. | 2301 | //US link the searchwidget first to this. |
2301 | // The real linkage to the toolbar happens later. | 2302 | // The real linkage to the toolbar happens later. |
2302 | //US mIncSearchWidget->reparent(tb, 0, QPoint(50,0), TRUE); | 2303 | //US mIncSearchWidget->reparent(tb, 0, QPoint(50,0), TRUE); |
2303 | //US tb->insertItem( mIncSearchWidget ); | 2304 | //US tb->insertItem( mIncSearchWidget ); |
2304 | /*US | 2305 | /*US |
2305 | mIncSearchWidget = new IncSearchWidget( tb ); | 2306 | mIncSearchWidget = new IncSearchWidget( tb ); |
2306 | connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ), | 2307 | connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ), |
2307 | SLOT( incrementalSearch( const QString& ) ) ); | 2308 | SLOT( incrementalSearch( const QString& ) ) ); |
2308 | 2309 | ||
2309 | mJumpButtonBar = new JumpButtonBar( this, this ); | 2310 | mJumpButtonBar = new JumpButtonBar( this, this ); |
2310 | 2311 | ||
2311 | //US topLayout->addWidget( mJumpButtonBar ); | 2312 | //US topLayout->addWidget( mJumpButtonBar ); |
2312 | this->layout()->add( mJumpButtonBar ); | 2313 | this->layout()->add( mJumpButtonBar ); |
2313 | */ | 2314 | */ |
2314 | 2315 | ||