summaryrefslogtreecommitdiffabout
path: root/kaddressbook/kabcore.cpp
Side-by-side diff
Diffstat (limited to 'kaddressbook/kabcore.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--kaddressbook/kabcore.cpp30
1 files changed, 19 insertions, 11 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 74e5cf7..1a1bcff 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -273,62 +273,70 @@ void KABCore::restoreSettings()
state = KABPrefs::instance()->mJumpButtonBarVisible;
mActionJumpBar->setChecked( state );
setJumpButtonBarVisible( state );
/*US
QValueList<int> splitterSize = KABPrefs::instance()->mDetailsSplitter;
if ( splitterSize.count() == 0 ) {
splitterSize.append( width() / 2 );
splitterSize.append( width() / 2 );
}
mMiniSplitter->setSizes( splitterSize );
if ( mExtensionBarSplitter ) {
splitterSize = KABPrefs::instance()->mExtensionsSplitter;
if ( splitterSize.count() == 0 ) {
splitterSize.append( width() / 2 );
splitterSize.append( width() / 2 );
}
mExtensionBarSplitter->setSizes( splitterSize );
}
*/
mViewManager->restoreSettings();
mIncSearchWidget->setCurrentItem( KABPrefs::instance()->mCurrentIncSearchField );
mExtensionManager->restoreSettings();
-
- QValueList<int> splitterSize = KABPrefs::instance()->mDetailsSplitter;
- if ( splitterSize.count() == 0 ) {
- splitterSize.append( width() / 2 );
- splitterSize.append( width() / 2 );
+#ifdef DESKTOP_VERSION
+ int wid = width();
+ if ( wid < 10 )
+ wid = 400;
+#else
+ int wid = QApplication::desktop()->width();
+ if ( wid < 640 )
+ wid = QApplication::desktop()->height();
+#endif
+ QValueList<int> splitterSize;// = KABPrefs::instance()->mDetailsSplitter;
+ if ( true /*splitterSize.count() == 0*/ ) {
+ splitterSize.append( wid / 2 );
+ splitterSize.append( wid / 2 );
}
mMiniSplitter->setSizes( splitterSize );
if ( mExtensionBarSplitter ) {
- splitterSize = KABPrefs::instance()->mExtensionsSplitter;
- if ( splitterSize.count() == 0 ) {
- splitterSize.append( width() / 2 );
- splitterSize.append( width() / 2 );
- }
- mExtensionBarSplitter->setSizes( splitterSize );
+ //splitterSize = KABPrefs::instance()->mExtensionsSplitter;
+ if ( true /*splitterSize.count() == 0*/ ) {
+ splitterSize.append( wid / 2 );
+ splitterSize.append( wid / 2 );
+ }
+ mExtensionBarSplitter->setSizes( splitterSize );
}
}
void KABCore::saveSettings()
{
KABPrefs::instance()->mJumpButtonBarVisible = mActionJumpBar->isChecked();
if ( mExtensionBarSplitter )
KABPrefs::instance()->mExtensionsSplitter = mExtensionBarSplitter->sizes();
KABPrefs::instance()->mDetailsPageVisible = mActionDetails->isChecked();
KABPrefs::instance()->mDetailsSplitter = mMiniSplitter->sizes();
#ifndef KAB_EMBEDDED
KABPrefs::instance()->mExtensionsSplitter = mExtensionBarSplitter->sizes();
KABPrefs::instance()->mDetailsSplitter = mDetailsSplitter->sizes();
#endif //KAB_EMBEDDED
mExtensionManager->saveSettings();
mViewManager->saveSettings();
KABPrefs::instance()->mCurrentIncSearchField = mIncSearchWidget->currentItem();
}