| -rw-r--r-- | kaddressbook/jumpbuttonbar.cpp | 47 | ||||
| -rw-r--r-- | kaddressbook/kabcore.cpp | 6 |
2 files changed, 36 insertions, 17 deletions
diff --git a/kaddressbook/jumpbuttonbar.cpp b/kaddressbook/jumpbuttonbar.cpp index e89ec52..32922a6 100644 --- a/kaddressbook/jumpbuttonbar.cpp +++ b/kaddressbook/jumpbuttonbar.cpp @@ -73,9 +73,9 @@ JumpButtonBar::JumpButtonBar( KABCore *core, QWidget *parent, const char *name ) { if ( QApplication::desktop()->width() < 480 ) - mButtonLayout = new QGridLayout( this, 2, 14 ); + mButtonLayout = new QGridLayout( this, 1, 18 ); else - mButtonLayout = new QGridLayout( this, 1, 28 ); + mButtonLayout = new QGridLayout( this, 1, 20 ); mButtonLayout->setAlignment( Qt::AlignTop ); recreateButtons(); @@ -141,23 +141,36 @@ void JumpButtonBar::recreateButtons() int maxRows = mCharacters.count() / 2; // we use 2 columns if ( mCharacters.count() % 2 ) maxRows++; - int fixwid = 20; sortListLocaleAware( mCharacters ); bool skip2 = false; int skipcount = 0; - int maxHei = 25; - int roW = 15;//13 is ok - if ( QApplication::desktop()->width() < 480 && mCharacters.count() > roW ) { - skipcount = mCharacters.count()-roW ; - maxHei = (QApplication::desktop()->height()-65)/roW ; - } - else { - fixwid = 30; - if ( mCharacters.count() > 16 ) - skipcount = mCharacters.count()- 16; - maxHei = (QApplication::desktop()->height()-120)/(16); + int maxHei = 0; +#ifdef DESKTOP_VERSION + int maxChar = 26; + int heightDiff = 200; + int fixwid = 0; +#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; bool state = isUpdatesEnabled(); @@ -179,12 +192,14 @@ void JumpButtonBar::recreateButtons() button->setCharacter(mCharacters[ i ]); } else { button = new JumpButton( mCharacters[ i ].upper(), this, mCharacters[ i ] ); - button->setFixedWidth( fixwid ); + if ( fixwid ) + button->setFixedWidth( fixwid ); mButtons.append( button ); connect( button, SIGNAL( clicked() ), this, SLOT( letterClicked() ) ); mButtonLayout->addWidget( button, row, col ); } - button->setMaximumHeight( maxHei ); + if ( maxHei ) + button->setMaximumHeight( maxHei ); button->show(); if ( col == maxRows ) { diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 0def16e..5987e99 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -16,7 +16,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - As a special exception, permission is given to link this program + Async a special exception, permission is given to link this program with any edition of Qt, and distribute the resulting executable, without including the source code for Qt in the source distribution. */ @@ -2114,7 +2114,11 @@ void KABCore::addActionsManually() mb->insertItem( i18n("&Edit"), editMenu ); mb->insertItem( i18n("&View"), viewMenu ); mb->insertItem( i18n("&Settings"), settingsMenu ); +#ifdef DESKTOP_VERSION mb->insertItem( i18n("Synchronize"), syncMenu ); +#else + mb->insertItem( i18n("Sync"), syncMenu ); +#endif //mb->insertItem( i18n("&Change"), changeMenu ); mb->insertItem( i18n("&Help"), helpMenu ); mIncSearchWidget = new IncSearchWidget( tb ); |