summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kaddressbook/jumpbuttonbar.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/kaddressbook/jumpbuttonbar.cpp b/kaddressbook/jumpbuttonbar.cpp
index 7524fb7..aebf8a6 100644
--- a/kaddressbook/jumpbuttonbar.cpp
+++ b/kaddressbook/jumpbuttonbar.cpp
@@ -84,99 +84,100 @@ JumpButtonBar::JumpButtonBar( KABCore *core, QWidget *parent, const char *name )
84JumpButtonBar::~JumpButtonBar() 84JumpButtonBar::~JumpButtonBar()
85{ 85{
86} 86}
87 87
88QSizePolicy JumpButtonBar::sizePolicy() const 88QSizePolicy JumpButtonBar::sizePolicy() const
89{ 89{
90#ifndef KAB_EMBEDDED 90#ifndef KAB_EMBEDDED
91 return QSizePolicy( QSizePolicy::Maximum, QSizePolicy::Minimum, 91 return QSizePolicy( QSizePolicy::Maximum, QSizePolicy::Minimum,
92 QSizePolicy::Vertically ); 92 QSizePolicy::Vertically );
93#else //KAB_EMBEDDED 93#else //KAB_EMBEDDED
94 return QSizePolicy( QSizePolicy::Maximum, QSizePolicy::Minimum); 94 return QSizePolicy( QSizePolicy::Maximum, QSizePolicy::Minimum);
95#endif //KAB_EMBEDDED 95#endif //KAB_EMBEDDED
96} 96}
97 97
98void JumpButtonBar::letterClicked() 98void JumpButtonBar::letterClicked()
99{ 99{
100 JumpButton *button = (JumpButton*)sender(); 100 JumpButton *button = (JumpButton*)sender();
101 QString character = button->character(); 101 QString character = button->character();
102 if ( character.length() == 2 ) 102 if ( character.length() == 2 )
103 character = character.left(1) +"-"+character.right(1); 103 character = character.left(1) +"-"+character.right(1);
104 if ( !character.isNull() ) 104 if ( !character.isNull() )
105 emit jumpToLetter( character ); 105 emit jumpToLetter( character );
106 //qDebug("emit *%s* ",character.latin1()); 106 //qDebug("emit *%s* ",character.latin1());
107} 107}
108 108
109void JumpButtonBar::recreateButtons() 109void JumpButtonBar::recreateButtons()
110{ 110{
111 // the easiest way to remove all buttons ;) 111 // the easiest way to remove all buttons ;)
112 //mButtons.setAutoDelete( true ); 112 //mButtons.setAutoDelete( true );
113 //mButtons.clear(); 113 //mButtons.clear();
114 //mButtons.setAutoDelete( false ); 114 //mButtons.setAutoDelete( false );
115 mCharacters.clear(); 115 mCharacters.clear();
116 116
117 QString character; 117 QString character;
118 118
119 KABC::AddressBook *ab = mCore->addressBook(); 119 KABC::AddressBook *ab = mCore->addressBook();
120 KABC::AddressBook::Iterator it; 120 KABC::AddressBook::Iterator it;
121 KABC::Field *field = mCore->currentSearchField(); 121 KABC::Field *field = mCore->currentSearchField();
122 if ( field ) { 122 if ( field ) {
123 setEnabled( true ); 123 setEnabled( true );
124 } else { 124 } else {
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 ) && character.at( 0 ).isLetter ())
134 mCharacters.append( character ); 134 mCharacters.append( character );
135 }
135 } 136 }
136 if ( mCharacters.count() == 0 ) { 137 if ( mCharacters.count() == 0 ) {
137 setEnabled( false ); 138 setEnabled( false );
138 return; 139 return;
139 } 140 }
140 141
141 int maxRows = mCharacters.count() / 2; // we use 2 columns 142 int maxRows = mCharacters.count() / 2; // we use 2 columns
142 if ( mCharacters.count() % 2 ) 143 if ( mCharacters.count() % 2 )
143 maxRows++; 144 maxRows++;
144 sortListLocaleAware( mCharacters ); 145 sortListLocaleAware( mCharacters );
145 bool skip2 = false; 146 bool skip2 = false;
146 int skipcount = 0; 147 int skipcount = 0;
147 int maxHei = 0; 148 int maxHei = 0;
148#ifdef DESKTOP_VERSION 149#ifdef DESKTOP_VERSION
149 int maxChar = 16; 150 int maxChar = 16;
150 int heightDiff = 200; 151 int heightDiff = 200;
151 int fixwid = 36; 152 int fixwid = 36;
152#else 153#else
153 //default for 240x320 diaplay: 154 //default for 240x320 diaplay:
154 int maxChar = 16; 155 int maxChar = 16;
155 int heightDiff = 64; 156 int heightDiff = 64;
156 int fixwid = 20; 157 int fixwid = 20;
157 158
158 if ( QApplication::desktop()->height() == 480 ) { 159 if ( QApplication::desktop()->height() == 480 ) {
159 maxChar = 16; 160 maxChar = 16;
160 heightDiff = 135; 161 heightDiff = 135;
161 fixwid = 34; 162 fixwid = 34;
162 } else if ( QApplication::desktop()->height() >= 640 ) { 163 } else if ( QApplication::desktop()->height() >= 640 ) {
163 maxChar = 20; 164 maxChar = 20;
164 heightDiff = 135; 165 heightDiff = 135;
165 fixwid = 34; 166 fixwid = 34;
166 } 167 }
167#endif 168#endif
168 169
169 if ( mCharacters.count() > maxChar ) 170 if ( mCharacters.count() > maxChar )
170 skipcount = mCharacters.count()- maxChar; 171 skipcount = mCharacters.count()- maxChar;
171 maxHei = (QApplication::desktop()->height()-heightDiff)/(maxChar); 172 maxHei = (QApplication::desktop()->height()-heightDiff)/(maxChar);
172 173
173 174
174 maxRows = 28; 175 maxRows = 28;
175 bool skipcurrent = false; 176 bool skipcurrent = false;
176 bool state = isUpdatesEnabled(); 177 bool state = isUpdatesEnabled();
177 setUpdatesEnabled( false ); 178 setUpdatesEnabled( false );
178 //qDebug("cc %d ",mCharacters.count() ); 179 //qDebug("cc %d ",mCharacters.count() );
179 JumpButton *button = 0; 180 JumpButton *button = 0;
180 int row = 0, col = 0; 181 int row = 0, col = 0;
181 JumpButton* cur = mButtons.first(); 182 JumpButton* cur = mButtons.first();
182 for ( uint i = 0; i < mCharacters.count(); ++i ) { 183 for ( uint i = 0; i < mCharacters.count(); ++i ) {