-rw-r--r-- | kaddressbook/jumpbuttonbar.cpp | 4 | ||||
-rw-r--r-- | kaddressbook/kabcore.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kaddressbook/jumpbuttonbar.cpp b/kaddressbook/jumpbuttonbar.cpp index 32922a6..7524fb7 100644 --- a/kaddressbook/jumpbuttonbar.cpp +++ b/kaddressbook/jumpbuttonbar.cpp | |||
@@ -137,27 +137,27 @@ void JumpButtonBar::recreateButtons() | |||
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; |
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 5987e99..702eaa3 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -1731,25 +1731,25 @@ void KABCore::initGUI() | |||
1731 | mViewManager = new ViewManager( this, viewSpace ); | 1731 | mViewManager = new ViewManager( this, viewSpace ); |
1732 | viewSpace->setStretchFactor( mViewManager, 1 ); | 1732 | viewSpace->setStretchFactor( mViewManager, 1 ); |
1733 | 1733 | ||
1734 | mDetails = new ViewContainer( mDetailsSplitter ); | 1734 | mDetails = new ViewContainer( mDetailsSplitter ); |
1735 | 1735 | ||
1736 | mJumpButtonBar = new JumpButtonBar( this, this ); | 1736 | mJumpButtonBar = new JumpButtonBar( this, this ); |
1737 | 1737 | ||
1738 | mExtensionManager = new ExtensionManager( this, mExtensionBarSplitter ); | 1738 | mExtensionManager = new ExtensionManager( this, mExtensionBarSplitter ); |
1739 | 1739 | ||
1740 | topLayout->addWidget( mExtensionBarSplitter ); | 1740 | topLayout->addWidget( mExtensionBarSplitter ); |
1741 | topLayout->setStretchFactor( mExtensionBarSplitter, 100 ); | 1741 | topLayout->setStretchFactor( mExtensionBarSplitter, 100 ); |
1742 | topLayout->addWidget( mJumpButtonBar ); | 1742 | topLayout->addWidget( mJumpButtonBar ); |
1743 | topLayout->setStretchFactor( mJumpButtonBar, 1 ); | 1743 | //topLayout->setStretchFactor( mJumpButtonBar, 1 ); |
1744 | 1744 | ||
1745 | mXXPortManager = new XXPortManager( this, this ); | 1745 | mXXPortManager = new XXPortManager( this, this ); |
1746 | 1746 | ||
1747 | #else //KAB_EMBEDDED | 1747 | #else //KAB_EMBEDDED |
1748 | //US initialize viewMenu before settingup viewmanager. | 1748 | //US initialize viewMenu before settingup viewmanager. |
1749 | // Viewmanager needs this menu to plugin submenues. | 1749 | // Viewmanager needs this menu to plugin submenues. |
1750 | viewMenu = new QPopupMenu( this ); | 1750 | viewMenu = new QPopupMenu( this ); |
1751 | settingsMenu = new QPopupMenu( this ); | 1751 | settingsMenu = new QPopupMenu( this ); |
1752 | //filterMenu = new QPopupMenu( this ); | 1752 | //filterMenu = new QPopupMenu( this ); |
1753 | ImportMenu = new QPopupMenu( this ); | 1753 | ImportMenu = new QPopupMenu( this ); |
1754 | ExportMenu = new QPopupMenu( this ); | 1754 | ExportMenu = new QPopupMenu( this ); |
1755 | syncMenu = new QPopupMenu( this ); | 1755 | syncMenu = new QPopupMenu( this ); |