summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--kaddressbook/kabcore.cpp36
-rw-r--r--korganizer/kodaymatrix.cpp2
-rw-r--r--korganizer/mainwindow.cpp6
3 files changed, 40 insertions, 4 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 9c40142..a4f3579 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -551,4 +551,20 @@ void KABCore::restoreSettings()
}
+#ifdef DESKTOP_VERSION
+ KConfig *config = KABPrefs::instance()->getConfig();
+ config->setGroup("WidgetLayout");
+ QStringList list;
+ list = config->readListEntry("MainLayout");
+ int x,y,w,h;
+ if ( ! list.isEmpty() ) {
+ x = list[0].toInt();
+ y = list[1].toInt();
+ w = list[2].toInt();
+ h = list[3].toInt();
+ KApplication::testCoords( &x,&y,&w,&h );
+ topLevelWidget()->setGeometry(x,y,w,h);
-
+ } else {
+ topLevelWidget()->setGeometry( 40 ,40 , 640, 440);
+ }
+#endif
}
@@ -571,2 +587,20 @@ void KABCore::saveSettings()
KABPrefs::instance()->mCurrentIncSearchField = mIncSearchWidget->currentItem();
+#ifdef DESKTOP_VERSION
+ KConfig *config = KABPrefs::instance()->getConfig();
+ config->setGroup("WidgetLayout");
+ QStringList list ;//= config->readListEntry("MainLayout");
+ int x,y,w,h;
+ QWidget* wid;
+ wid = topLevelWidget();
+ x = wid->geometry().x();
+ y = wid->geometry().y();
+ w = wid->width();
+ h = wid->height();
+ list.clear();
+ list << QString::number( x );
+ list << QString::number( y );
+ list << QString::number( w );
+ list << QString::number( h );
+ config->writeEntry("MainLayout",list );
+#endif
KABPrefs::instance()->writeConfig();
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index 4366265..30efbf6 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -205,2 +205,3 @@ QString KODayMatrix::getWhatsThisText( QPoint p )
}
+ mToolTip.sort();
if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_T_VIEW ) {
@@ -220,3 +221,2 @@ QString KODayMatrix::getWhatsThisText( QPoint p )
}
- mToolTip.sort();
if (KOPrefs::instance()->mCurrentDisplayedView == VIEW_J_VIEW ) {
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index eed023c..3c0259f 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -189,3 +189,3 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
filterToolBar = new QPEToolBar ( this );
- filterMenubar = new QMenuBar( filterToolBar );
+ filterMenubar = new QMenuBar( 0 );
QFontMetrics fm ( filterMenubar->font() );
@@ -1282,4 +1282,6 @@ void MainWindow::initActions()
- if ( filterMenubar )
+ if ( filterMenubar ) {
+ filterMenubar->reparent(filterToolBar,0,QPoint(0,0) );
connect( mView->filterView(), SIGNAL( filterChanged() ), SLOT( updateFilterToolbar() ) );
+ }
connect( configureToolBarMenu, SIGNAL( activated( int ) ),this, SLOT(configureToolBar( int ) ) );