-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 | |||
@@ -101,99 +101,99 @@ void JumpButtonBar::letterClicked() | |||
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 | ||
109 | void JumpButtonBar::recreateButtons() | 109 | void 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 ) ) |
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; |
176 | bool state = isUpdatesEnabled(); | 176 | bool state = isUpdatesEnabled(); |
177 | setUpdatesEnabled( false ); | 177 | setUpdatesEnabled( false ); |
178 | //qDebug("cc %d ",mCharacters.count() ); | 178 | //qDebug("cc %d ",mCharacters.count() ); |
179 | JumpButton *button = 0; | 179 | JumpButton *button = 0; |
180 | int row = 0, col = 0; | 180 | int row = 0, col = 0; |
181 | JumpButton* cur = mButtons.first(); | 181 | JumpButton* cur = mButtons.first(); |
182 | for ( uint i = 0; i < mCharacters.count(); ++i ) { | 182 | for ( uint i = 0; i < mCharacters.count(); ++i ) { |
183 | if ( skipcount > 0 && skipcurrent ) { | 183 | if ( skipcount > 0 && skipcurrent ) { |
184 | --skipcount; | 184 | --skipcount; |
185 | if ( button ) { | 185 | if ( button ) { |
186 | button->setCharacter( button->character() + mCharacters[ i ]); | 186 | button->setCharacter( button->character() + mCharacters[ i ]); |
187 | } | 187 | } |
188 | } else { | 188 | } else { |
189 | if ( cur ) { | 189 | if ( cur ) { |
190 | button = cur ; | 190 | button = cur ; |
191 | cur = mButtons.next(); | 191 | cur = mButtons.next(); |
192 | button->setCharacter(mCharacters[ i ]); | 192 | button->setCharacter(mCharacters[ i ]); |
193 | } else { | 193 | } else { |
194 | button = new JumpButton( mCharacters[ i ].upper(), this, mCharacters[ i ] ); | 194 | button = new JumpButton( mCharacters[ i ].upper(), this, mCharacters[ i ] ); |
195 | if ( fixwid ) | 195 | if ( fixwid ) |
196 | button->setFixedWidth( fixwid ); | 196 | button->setFixedWidth( fixwid ); |
197 | mButtons.append( button ); | 197 | mButtons.append( button ); |
198 | connect( button, SIGNAL( clicked() ), this, SLOT( letterClicked() ) ); | 198 | connect( button, SIGNAL( clicked() ), this, SLOT( letterClicked() ) ); |
199 | mButtonLayout->addWidget( button, row, col ); | 199 | mButtonLayout->addWidget( button, row, col ); |
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 5987e99..702eaa3 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -1695,97 +1695,97 @@ AddresseeEditorDialog *KABCore::createAddresseeEditorDialog( QWidget *parent, | |||
1695 | 1695 | ||
1696 | if ( mEditorDialog == 0 ) { | 1696 | if ( mEditorDialog == 0 ) { |
1697 | mEditorDialog = new AddresseeEditorDialog( this, parent, | 1697 | mEditorDialog = new AddresseeEditorDialog( this, parent, |
1698 | name ? name : "editorDialog" ); | 1698 | name ? name : "editorDialog" ); |
1699 | 1699 | ||
1700 | 1700 | ||
1701 | connect( mEditorDialog, SIGNAL( contactModified( const KABC::Addressee& ) ), | 1701 | connect( mEditorDialog, SIGNAL( contactModified( const KABC::Addressee& ) ), |
1702 | SLOT( contactModified( const KABC::Addressee& ) ) ); | 1702 | SLOT( contactModified( const KABC::Addressee& ) ) ); |
1703 | //connect( mEditorDialog, SIGNAL( editorDestroyed( const QString& ) ), | 1703 | //connect( mEditorDialog, SIGNAL( editorDestroyed( const QString& ) ), |
1704 | // SLOT( slotEditorDestroyed( const QString& ) ) ; | 1704 | // SLOT( slotEditorDestroyed( const QString& ) ) ; |
1705 | } | 1705 | } |
1706 | 1706 | ||
1707 | return mEditorDialog; | 1707 | return mEditorDialog; |
1708 | } | 1708 | } |
1709 | 1709 | ||
1710 | void KABCore::slotEditorDestroyed( const QString &uid ) | 1710 | void KABCore::slotEditorDestroyed( const QString &uid ) |
1711 | { | 1711 | { |
1712 | //mEditorDict.remove( uid ); | 1712 | //mEditorDict.remove( uid ); |
1713 | } | 1713 | } |
1714 | 1714 | ||
1715 | void KABCore::initGUI() | 1715 | void KABCore::initGUI() |
1716 | { | 1716 | { |
1717 | #ifndef KAB_EMBEDDED | 1717 | #ifndef KAB_EMBEDDED |
1718 | QHBoxLayout *topLayout = new QHBoxLayout( this ); | 1718 | QHBoxLayout *topLayout = new QHBoxLayout( this ); |
1719 | topLayout->setSpacing( KDialogBase::spacingHint() ); | 1719 | topLayout->setSpacing( KDialogBase::spacingHint() ); |
1720 | 1720 | ||
1721 | mExtensionBarSplitter = new QSplitter( this ); | 1721 | mExtensionBarSplitter = new QSplitter( this ); |
1722 | mExtensionBarSplitter->setOrientation( Qt::Vertical ); | 1722 | mExtensionBarSplitter->setOrientation( Qt::Vertical ); |
1723 | 1723 | ||
1724 | mDetailsSplitter = new QSplitter( mExtensionBarSplitter ); | 1724 | mDetailsSplitter = new QSplitter( mExtensionBarSplitter ); |
1725 | 1725 | ||
1726 | QVBox *viewSpace = new QVBox( mDetailsSplitter ); | 1726 | QVBox *viewSpace = new QVBox( mDetailsSplitter ); |
1727 | mIncSearchWidget = new IncSearchWidget( viewSpace ); | 1727 | mIncSearchWidget = new IncSearchWidget( viewSpace ); |
1728 | connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ), | 1728 | connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ), |
1729 | SLOT( incrementalSearch( const QString& ) ) ); | 1729 | SLOT( incrementalSearch( const QString& ) ) ); |
1730 | 1730 | ||
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 ); |
1756 | changeMenu= new QPopupMenu( this ); | 1756 | changeMenu= new QPopupMenu( this ); |
1757 | beamMenu= new QPopupMenu( this ); | 1757 | beamMenu= new QPopupMenu( this ); |
1758 | 1758 | ||
1759 | //US since we have no splitter for the embedded system, setup | 1759 | //US since we have no splitter for the embedded system, setup |
1760 | // a layout with two frames. One left and one right. | 1760 | // a layout with two frames. One left and one right. |
1761 | 1761 | ||
1762 | QBoxLayout *topLayout; | 1762 | QBoxLayout *topLayout; |
1763 | 1763 | ||
1764 | // = new QHBoxLayout( this ); | 1764 | // = new QHBoxLayout( this ); |
1765 | // QBoxLayout *topLayout = (QBoxLayout*)layout(); | 1765 | // QBoxLayout *topLayout = (QBoxLayout*)layout(); |
1766 | 1766 | ||
1767 | // QWidget *mainBox = new QWidget( this ); | 1767 | // QWidget *mainBox = new QWidget( this ); |
1768 | // QBoxLayout * mainBoxLayout = new QHBoxLayout(mainBox); | 1768 | // QBoxLayout * mainBoxLayout = new QHBoxLayout(mainBox); |
1769 | 1769 | ||
1770 | #ifdef DESKTOP_VERSION | 1770 | #ifdef DESKTOP_VERSION |
1771 | topLayout = new QHBoxLayout( this ); | 1771 | topLayout = new QHBoxLayout( this ); |
1772 | 1772 | ||
1773 | 1773 | ||
1774 | mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, this); | 1774 | mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, this); |
1775 | mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right ); | 1775 | mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right ); |
1776 | 1776 | ||
1777 | topLayout->addWidget(mMiniSplitter ); | 1777 | topLayout->addWidget(mMiniSplitter ); |
1778 | 1778 | ||
1779 | mExtensionBarSplitter = new KDGanttMinimizeSplitter( Qt::Vertical,mMiniSplitter ); | 1779 | mExtensionBarSplitter = new KDGanttMinimizeSplitter( Qt::Vertical,mMiniSplitter ); |
1780 | mExtensionBarSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down ); | 1780 | mExtensionBarSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down ); |
1781 | mViewManager = new ViewManager( this, mExtensionBarSplitter ); | 1781 | mViewManager = new ViewManager( this, mExtensionBarSplitter ); |
1782 | mDetails = new ViewContainer( mMiniSplitter ); | 1782 | mDetails = new ViewContainer( mMiniSplitter ); |
1783 | mExtensionManager = new ExtensionManager( this, mExtensionBarSplitter ); | 1783 | mExtensionManager = new ExtensionManager( this, mExtensionBarSplitter ); |
1784 | #else | 1784 | #else |
1785 | if ( QApplication::desktop()->width() > 480 ) { | 1785 | if ( QApplication::desktop()->width() > 480 ) { |
1786 | topLayout = new QHBoxLayout( this ); | 1786 | topLayout = new QHBoxLayout( this ); |
1787 | mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, this); | 1787 | mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, this); |
1788 | mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right ); | 1788 | mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right ); |
1789 | } else { | 1789 | } else { |
1790 | 1790 | ||
1791 | topLayout = new QHBoxLayout( this ); | 1791 | topLayout = new QHBoxLayout( this ); |