summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kaddressbook/jumpbuttonbar.cpp47
-rw-r--r--kaddressbook/kabcore.cpp6
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
@@ -68,19 +68,19 @@ QString JumpButton::character() const
68 return mCharacter; 68 return mCharacter;
69} 69}
70 70
71JumpButtonBar::JumpButtonBar( KABCore *core, QWidget *parent, const char *name ) 71JumpButtonBar::JumpButtonBar( KABCore *core, QWidget *parent, const char *name )
72 : QWidget( parent, name ), mCore( core ) 72 : QWidget( parent, name ), mCore( core )
73{ 73{
74 if ( QApplication::desktop()->width() < 480 ) 74 if ( QApplication::desktop()->width() < 480 )
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 );
80 80
81 recreateButtons(); 81 recreateButtons();
82} 82}
83 83
84JumpButtonBar::~JumpButtonBar() 84JumpButtonBar::~JumpButtonBar()
85{ 85{
86} 86}
@@ -136,33 +136,46 @@ void JumpButtonBar::recreateButtons()
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 int fixwid = 20;
145 sortListLocaleAware( mCharacters ); 144 sortListLocaleAware( mCharacters );
146 bool skip2 = false; 145 bool skip2 = false;
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;
162 bool skipcurrent = false; 175 bool skipcurrent = false;
163 bool state = isUpdatesEnabled(); 176 bool state = isUpdatesEnabled();
164 setUpdatesEnabled( false ); 177 setUpdatesEnabled( false );
165 //qDebug("cc %d ",mCharacters.count() ); 178 //qDebug("cc %d ",mCharacters.count() );
166 JumpButton *button = 0; 179 JumpButton *button = 0;
167 int row = 0, col = 0; 180 int row = 0, col = 0;
168 JumpButton* cur = mButtons.first(); 181 JumpButton* cur = mButtons.first();
@@ -174,22 +187,24 @@ void JumpButtonBar::recreateButtons()
174 } 187 }
175 } else { 188 } else {
176 if ( cur ) { 189 if ( cur ) {
177 button = cur ; 190 button = cur ;
178 cur = mButtons.next(); 191 cur = mButtons.next();
179 button->setCharacter(mCharacters[ i ]); 192 button->setCharacter(mCharacters[ i ]);
180 } else { 193 } else {
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 );
184 connect( button, SIGNAL( clicked() ), this, SLOT( letterClicked() ) ); 198 connect( button, SIGNAL( clicked() ), this, SLOT( letterClicked() ) );
185 mButtonLayout->addWidget( button, row, col ); 199 mButtonLayout->addWidget( button, row, col );
186 } 200 }
187 button->setMaximumHeight( maxHei ); 201 if ( maxHei )
202 button->setMaximumHeight( maxHei );
188 button->show(); 203 button->show();
189 204
190 if ( col == maxRows ) { 205 if ( col == maxRows ) {
191 row = 0; 206 row = 0;
192 col++; 207 col++;
193 } else 208 } else
194 row++; 209 row++;
195 } 210 }
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 0def16e..5987e99 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -11,17 +11,17 @@
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 11 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 GNU General Public License for more details. 13 GNU General Public License for more details.
14 14
15 You should have received a copy of the GNU General Public License 15 You should have received a copy of the GNU General Public License
16 along with this program; if not, write to the Free Software 16 along with this program; if not, write to the Free Software
17 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 17 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
18 18
19 As a special exception, permission is given to link this program 19 Async a special exception, permission is given to link this program
20 with any edition of Qt, and distribute the resulting executable, 20 with any edition of Qt, and distribute the resulting executable,
21 without including the source code for Qt in the source distribution. 21 without including the source code for Qt in the source distribution.
22*/ 22*/
23 23
24/*s 24/*s
25Enhanced Version of the file for platform independent KDE tools. 25Enhanced Version of the file for platform independent KDE tools.
26Copyright (c) 2004 Ulf Schenk 26Copyright (c) 2004 Ulf Schenk
27 27
@@ -2109,17 +2109,21 @@ void KABCore::addActionsManually()
2109 QMenuBar* mb = mMainWindow->menuBar(); 2109 QMenuBar* mb = mMainWindow->menuBar();
2110 2110
2111 //US setup menubar. 2111 //US setup menubar.
2112 //Disable the following block if you do not want to have a menubar. 2112 //Disable the following block if you do not want to have a menubar.
2113 mb->insertItem( i18n("&File"), fileMenu ); 2113 mb->insertItem( i18n("&File"), fileMenu );
2114 mb->insertItem( i18n("&Edit"), editMenu ); 2114 mb->insertItem( i18n("&Edit"), editMenu );
2115 mb->insertItem( i18n("&View"), viewMenu ); 2115 mb->insertItem( i18n("&View"), viewMenu );
2116 mb->insertItem( i18n("&Settings"), settingsMenu ); 2116 mb->insertItem( i18n("&Settings"), settingsMenu );
2117#ifdef DESKTOP_VERSION
2117 mb->insertItem( i18n("Synchronize"), syncMenu ); 2118 mb->insertItem( i18n("Synchronize"), syncMenu );
2119#else
2120 mb->insertItem( i18n("Sync"), syncMenu );
2121#endif
2118 //mb->insertItem( i18n("&Change"), changeMenu ); 2122 //mb->insertItem( i18n("&Change"), changeMenu );
2119 mb->insertItem( i18n("&Help"), helpMenu ); 2123 mb->insertItem( i18n("&Help"), helpMenu );
2120 mIncSearchWidget = new IncSearchWidget( tb ); 2124 mIncSearchWidget = new IncSearchWidget( tb );
2121 // tb->insertWidget(-1, 0, mIncSearchWidget); 2125 // tb->insertWidget(-1, 0, mIncSearchWidget);
2122#ifndef DESKTOP_VERSION 2126#ifndef DESKTOP_VERSION
2123 } else { 2127 } else {
2124 //US setup toolbar 2128 //US setup toolbar
2125 QPEMenuBar *menuBarTB = new QPEMenuBar( tb ); 2129 QPEMenuBar *menuBarTB = new QPEMenuBar( tb );