summaryrefslogtreecommitdiffabout
path: root/kaddressbook/jumpbuttonbar.cpp
Unidiff
Diffstat (limited to 'kaddressbook/jumpbuttonbar.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--kaddressbook/jumpbuttonbar.cpp4
1 files changed, 2 insertions, 2 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()
125 setEnabled( false ); 125 setEnabled( false );
126 return; 126 return;
127 } 127 }
128 mCharacters.append( "*"); 128 mCharacters.append( "*");
129 for ( it = ab->begin(); it != ab->end(); ++it ) { 129 for ( it = ab->begin(); it != ab->end(); ++it ) {
130 if ( !field->value( *it ).isEmpty() ) 130 if ( !field->value( *it ).isEmpty() )
131 character = field->value( *it )[ 0 ].lower(); 131 character = field->value( *it )[ 0 ].lower();
132 if ( character != "!" ) 132 if ( character != "!" )
133 if ( !character.isEmpty() && !mCharacters.contains( character ) ) 133 if ( !character.isEmpty() && !mCharacters.contains( character ) )
134 mCharacters.append( character ); 134 mCharacters.append( character );
135 } 135 }
136 if ( mCharacters.count() == 0 ) { 136 if ( mCharacters.count() == 0 ) {
137 setEnabled( false ); 137 setEnabled( false );
138 return; 138 return;
139 } 139 }
140 140
141 int maxRows = mCharacters.count() / 2; // we use 2 columns 141 int maxRows = mCharacters.count() / 2; // we use 2 columns
142 if ( mCharacters.count() % 2 ) 142 if ( mCharacters.count() % 2 )
143 maxRows++; 143 maxRows++;
144 sortListLocaleAware( mCharacters ); 144 sortListLocaleAware( mCharacters );
145 bool skip2 = false; 145 bool skip2 = false;
146 int skipcount = 0; 146 int skipcount = 0;
147 int maxHei = 0; 147 int maxHei = 0;
148#ifdef DESKTOP_VERSION 148#ifdef DESKTOP_VERSION
149 int maxChar = 26; 149 int maxChar = 16;
150 int heightDiff = 200; 150 int heightDiff = 200;
151 int fixwid = 0; 151 int fixwid = 36;
152#else 152#else
153 //default for 240x320 diaplay: 153 //default for 240x320 diaplay:
154 int maxChar = 16; 154 int maxChar = 16;
155 int heightDiff = 64; 155 int heightDiff = 64;
156 int fixwid = 20; 156 int fixwid = 20;
157 157
158 if ( QApplication::desktop()->height() == 480 ) { 158 if ( QApplication::desktop()->height() == 480 ) {
159 maxChar = 16; 159 maxChar = 16;
160 heightDiff = 135; 160 heightDiff = 135;
161 fixwid = 34; 161 fixwid = 34;
162 } else if ( QApplication::desktop()->height() >= 640 ) { 162 } else if ( QApplication::desktop()->height() >= 640 ) {
163 maxChar = 20; 163 maxChar = 20;
164 heightDiff = 135; 164 heightDiff = 135;
165 fixwid = 34; 165 fixwid = 34;
166 } 166 }
167#endif 167#endif
168 168
169 if ( mCharacters.count() > maxChar ) 169 if ( mCharacters.count() > maxChar )
170 skipcount = mCharacters.count()- maxChar; 170 skipcount = mCharacters.count()- maxChar;
171 maxHei = (QApplication::desktop()->height()-heightDiff)/(maxChar); 171 maxHei = (QApplication::desktop()->height()-heightDiff)/(maxChar);
172 172
173 173
174 maxRows = 28; 174 maxRows = 28;
175 bool skipcurrent = false; 175 bool skipcurrent = false;