author | zautrix <zautrix> | 2005-01-29 10:45:01 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-01-29 10:45:01 (UTC) |
commit | f542fb5846520683e6241a522921e3d5eb24b833 (patch) (side-by-side diff) | |
tree | f264d1db1d3e28b73e9baaef5d50443b940fa0c8 /kaddressbook | |
parent | b868f87e4ada5e16b8e2acfc5f5892a6c3f0f6a9 (diff) | |
download | kdepimpi-f542fb5846520683e6241a522921e3d5eb24b833.zip kdepimpi-f542fb5846520683e6241a522921e3d5eb24b833.tar.gz kdepimpi-f542fb5846520683e6241a522921e3d5eb24b833.tar.bz2 |
bb fix
-rw-r--r-- | kaddressbook/jumpbuttonbar.cpp | 4 | ||||
-rw-r--r-- | kaddressbook/kabcore.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kaddressbook/jumpbuttonbar.cpp b/kaddressbook/jumpbuttonbar.cpp index 32922a6..7524fb7 100644 --- a/kaddressbook/jumpbuttonbar.cpp +++ b/kaddressbook/jumpbuttonbar.cpp @@ -125,51 +125,51 @@ void JumpButtonBar::recreateButtons() setEnabled( false ); return; } mCharacters.append( "*"); for ( it = ab->begin(); it != ab->end(); ++it ) { if ( !field->value( *it ).isEmpty() ) character = field->value( *it )[ 0 ].lower(); if ( character != "!" ) if ( !character.isEmpty() && !mCharacters.contains( character ) ) mCharacters.append( character ); } if ( mCharacters.count() == 0 ) { setEnabled( false ); return; } int maxRows = mCharacters.count() / 2; // we use 2 columns if ( mCharacters.count() % 2 ) maxRows++; sortListLocaleAware( mCharacters ); bool skip2 = false; int skipcount = 0; int maxHei = 0; #ifdef DESKTOP_VERSION - int maxChar = 26; + int maxChar = 16; int heightDiff = 200; - int fixwid = 0; + int fixwid = 36; #else //default for 240x320 diaplay: int maxChar = 16; int heightDiff = 64; int fixwid = 20; if ( QApplication::desktop()->height() == 480 ) { maxChar = 16; heightDiff = 135; fixwid = 34; } else if ( QApplication::desktop()->height() >= 640 ) { maxChar = 20; heightDiff = 135; fixwid = 34; } #endif if ( mCharacters.count() > maxChar ) skipcount = mCharacters.count()- maxChar; maxHei = (QApplication::desktop()->height()-heightDiff)/(maxChar); maxRows = 28; bool skipcurrent = false; diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 5987e99..702eaa3 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -1719,49 +1719,49 @@ void KABCore::initGUI() topLayout->setSpacing( KDialogBase::spacingHint() ); mExtensionBarSplitter = new QSplitter( this ); mExtensionBarSplitter->setOrientation( Qt::Vertical ); mDetailsSplitter = new QSplitter( mExtensionBarSplitter ); QVBox *viewSpace = new QVBox( mDetailsSplitter ); mIncSearchWidget = new IncSearchWidget( viewSpace ); connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ), SLOT( incrementalSearch( const QString& ) ) ); mViewManager = new ViewManager( this, viewSpace ); viewSpace->setStretchFactor( mViewManager, 1 ); mDetails = new ViewContainer( mDetailsSplitter ); mJumpButtonBar = new JumpButtonBar( this, this ); mExtensionManager = new ExtensionManager( this, mExtensionBarSplitter ); topLayout->addWidget( mExtensionBarSplitter ); topLayout->setStretchFactor( mExtensionBarSplitter, 100 ); topLayout->addWidget( mJumpButtonBar ); - topLayout->setStretchFactor( mJumpButtonBar, 1 ); + //topLayout->setStretchFactor( mJumpButtonBar, 1 ); mXXPortManager = new XXPortManager( this, this ); #else //KAB_EMBEDDED //US initialize viewMenu before settingup viewmanager. // Viewmanager needs this menu to plugin submenues. viewMenu = new QPopupMenu( this ); settingsMenu = new QPopupMenu( this ); //filterMenu = new QPopupMenu( this ); ImportMenu = new QPopupMenu( this ); ExportMenu = new QPopupMenu( this ); syncMenu = new QPopupMenu( this ); changeMenu= new QPopupMenu( this ); beamMenu= new QPopupMenu( this ); //US since we have no splitter for the embedded system, setup // a layout with two frames. One left and one right. QBoxLayout *topLayout; // = new QHBoxLayout( this ); // QBoxLayout *topLayout = (QBoxLayout*)layout(); // QWidget *mainBox = new QWidget( this ); |