Diffstat (limited to 'kaddressbook/jumpbuttonbar.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | kaddressbook/jumpbuttonbar.cpp | 47 |
1 files changed, 31 insertions, 16 deletions
diff --git a/kaddressbook/jumpbuttonbar.cpp b/kaddressbook/jumpbuttonbar.cpp index e89ec52..32922a6 100644 --- a/kaddressbook/jumpbuttonbar.cpp +++ b/kaddressbook/jumpbuttonbar.cpp | |||
@@ -75,5 +75,5 @@ JumpButtonBar::JumpButtonBar( KABCore *core, QWidget *parent, const char *name ) | |||
75 | 75 | ||
76 | mButtonLayout = new QGridLayout( this, 2, 14 ); | 76 | mButtonLayout = new QGridLayout( this, 1, 18 ); |
77 | else | 77 | else |
78 | mButtonLayout = new QGridLayout( this, 1, 28 ); | 78 | mButtonLayout = new QGridLayout( this, 1, 20 ); |
79 | mButtonLayout->setAlignment( Qt::AlignTop ); | 79 | mButtonLayout->setAlignment( Qt::AlignTop ); |
@@ -143,3 +143,2 @@ void JumpButtonBar::recreateButtons() | |||
143 | maxRows++; | 143 | maxRows++; |
144 | int fixwid = 20; | ||
145 | sortListLocaleAware( mCharacters ); | 144 | sortListLocaleAware( mCharacters ); |
@@ -147,15 +146,29 @@ void JumpButtonBar::recreateButtons() | |||
147 | int skipcount = 0; | 146 | int skipcount = 0; |
148 | int maxHei = 25; | 147 | int maxHei = 0; |
149 | int roW = 15;//13 is ok | 148 | #ifdef DESKTOP_VERSION |
150 | if ( QApplication::desktop()->width() < 480 && mCharacters.count() > roW ) { | 149 | int maxChar = 26; |
151 | skipcount = mCharacters.count()-roW ; | 150 | int heightDiff = 200; |
152 | maxHei = (QApplication::desktop()->height()-65)/roW ; | 151 | int fixwid = 0; |
153 | } | 152 | #else |
154 | else { | 153 | //default for 240x320 diaplay: |
155 | fixwid = 30; | 154 | int maxChar = 16; |
156 | if ( mCharacters.count() > 16 ) | 155 | int heightDiff = 64; |
157 | skipcount = mCharacters.count()- 16; | 156 | int fixwid = 20; |
158 | maxHei = (QApplication::desktop()->height()-120)/(16); | ||
159 | 157 | ||
158 | if ( QApplication::desktop()->height() == 480 ) { | ||
159 | maxChar = 16; | ||
160 | heightDiff = 135; | ||
161 | fixwid = 34; | ||
162 | } else if ( QApplication::desktop()->height() >= 640 ) { | ||
163 | maxChar = 20; | ||
164 | heightDiff = 135; | ||
165 | fixwid = 34; | ||
160 | } | 166 | } |
167 | #endif | ||
168 | |||
169 | if ( mCharacters.count() > maxChar ) | ||
170 | skipcount = mCharacters.count()- maxChar; | ||
171 | maxHei = (QApplication::desktop()->height()-heightDiff)/(maxChar); | ||
172 | |||
173 | |||
161 | maxRows = 28; | 174 | maxRows = 28; |
@@ -181,3 +194,4 @@ void JumpButtonBar::recreateButtons() | |||
181 | button = new JumpButton( mCharacters[ i ].upper(), this, mCharacters[ i ] ); | 194 | button = new JumpButton( mCharacters[ i ].upper(), this, mCharacters[ i ] ); |
182 | button->setFixedWidth( fixwid ); | 195 | if ( fixwid ) |
196 | button->setFixedWidth( fixwid ); | ||
183 | mButtons.append( button ); | 197 | mButtons.append( button ); |
@@ -186,3 +200,4 @@ void JumpButtonBar::recreateButtons() | |||
186 | } | 200 | } |
187 | button->setMaximumHeight( maxHei ); | 201 | if ( maxHei ) |
202 | button->setMaximumHeight( maxHei ); | ||
188 | button->show(); | 203 | button->show(); |