summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kaddressbook/kabcore.cpp22
-rw-r--r--kaddressbook/views/kaddressbooktableview.cpp4
-rw-r--r--korganizer/mainwindow.cpp15
-rw-r--r--microkde/kdeui/ktoolbar.cpp4
4 files changed, 29 insertions, 16 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index af12f2b..4e2523e 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -613,5 +613,5 @@ void KABCore::saveSettings()
KABPrefs::instance()->writeConfig();
- qDebug("KA: KABCore::saveSettings() ");
+ //qDebug("KA: KABCore::saveSettings() ");
}
@@ -845,5 +845,5 @@ void KABCore::updateMainWindow()
{
mMainWindow->showMaximized();
- mMainWindow->update();
+ //mMainWindow->repaint();
}
void KABCore::resizeEvent(QResizeEvent* e )
@@ -851,13 +851,17 @@ void KABCore::resizeEvent(QResizeEvent* e )
if ( !mMiniSplitter )
return;
- //qDebug("KABCore::resizeEvent(QResizeEvent* e ) ");
- if ( e->oldSize().width() != e->size().width() )
+ static int desktop_width = 0;
+ //qDebug("KABCore::resizeEvent %d %d ",desktop_width,QApplication::desktop()->width() );
+ if ( desktop_width != QApplication::desktop()->width() )
if ( QApplication::desktop()->width() >= 480 ) {
if (QApplication::desktop()->width() == 640 ) { // e.g. 640x480
+ //qDebug("640 ");
if ( mMiniSplitter->orientation() == Qt::Vertical ) {
+ //qDebug("switch V->H ");
mMiniSplitter->setOrientation( Qt::Horizontal);
mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right );
}
if ( QApplication::desktop()->width() <= 640 ) {
+ bool shot = mMainWindow->isVisible();
mMainWindow->showMinimized();
//mMainWindow->setMaximumSize( QApplication::desktop()->size() );
@@ -865,9 +869,12 @@ void KABCore::resizeEvent(QResizeEvent* e )
if ( mIncSearchWidget )
mIncSearchWidget->setSize();
- QTimer::singleShot( 1, this , SLOT ( updateMainWindow()));
+ if ( shot )
+ QTimer::singleShot( 1, this , SLOT ( updateMainWindow()));
}
} else if (QApplication::desktop()->width() == 480 ){// e.g. 480x640
+ //qDebug("480 ");
if ( mMiniSplitter->orientation() == Qt::Horizontal ) {
+ //qDebug("switch H->V ");
mMiniSplitter->setOrientation( Qt::Vertical );
mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down );
@@ -875,4 +882,5 @@ void KABCore::resizeEvent(QResizeEvent* e )
if ( QApplication::desktop()->width() <= 640 ) {
//mMainWindow->setMaximumSize( QApplication::desktop()->size() );
+ bool shot = mMainWindow->isVisible();
mMainWindow->showMinimized();
if ( KABPrefs::instance()->mHideSearchOnSwitch ) {
@@ -883,8 +891,10 @@ void KABCore::resizeEvent(QResizeEvent* e )
mViewManager->getFilterAction()->setComboWidth( 0 );
}
- QTimer::singleShot( 1, this , SLOT ( updateMainWindow()));
+ if ( shot )
+ QTimer::singleShot( 1, this , SLOT ( updateMainWindow()));
}
}
}
+ desktop_width = QApplication::desktop()->width();
QWidget::resizeEvent( e );
diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp
index 02fc40a..272f2eb 100644
--- a/kaddressbook/views/kaddressbooktableview.cpp
+++ b/kaddressbook/views/kaddressbooktableview.cpp
@@ -335,8 +335,10 @@ void KAddressBookTableView::refresh(QString uid)
// of items.
mListView->repaint();
-
+ if ( !currentItem )
+ currentItem = (ContactListViewItem *)mListView->firstChild();
if ( currentItem ) {
mListView->setCurrentItem( currentItem );
mListView->ensureItemVisible( currentItem );
+ mListView->setSelected( currentItem, true );
}
} else {
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 8c72d89..70baf5c 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -290,9 +290,9 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) :
mCalendarModifiedFlag = false;
- QLabel* splash = new QLabel(i18n("KO/Pi is starting ... "), this );
- splash->setAlignment ( AlignCenter );
- setCentralWidget( splash );
+ // QLabel* splash = new QLabel(i18n("KO/Pi is starting ... "), this );
+ //splash->setAlignment ( AlignCenter );
+ //setCentralWidget( splash );
#ifndef DESKTOP_VERSION
- showMaximized();
+ //showMaximized();
#endif
@@ -301,5 +301,6 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) :
mCalendar = new CalendarLocal();
mView = new CalendarView( mCalendar, this,"mCalendar " );
- mView->hide();
+ setCentralWidget( mView );
+ //mView->hide();
//mView->resize(splash->size() );
initActions();
@@ -362,6 +363,6 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) :
setCentralWidget( mView );
globalFlagBlockStartup = 0;
- mView->show();
- delete splash;
+ //mView->show();
+ //delete splash;
if ( newFile )
mView->updateConfig();
diff --git a/microkde/kdeui/ktoolbar.cpp b/microkde/kdeui/ktoolbar.cpp
index 36ede81..df2aad8 100644
--- a/microkde/kdeui/ktoolbar.cpp
+++ b/microkde/kdeui/ktoolbar.cpp
@@ -1416,11 +1416,11 @@ void KToolBar::repaintMe()
setUpdatesEnabled( true );
QToolBar::repaint( true );
- //qDebug(" KToolBar::repaintMe() ");
+ qDebug(" KToolBar::repaintMe() ");
}
void KToolBar::showEvent( QShowEvent *e )
{
- QToolBar::showEvent( e );
rebuildLayout();
+ QToolBar::showEvent( e );
}