Diffstat (limited to 'kaddressbook/phoneeditwidget.h') (more/less context) (ignore whitespace changes)
-rw-r--r-- | kaddressbook/phoneeditwidget.h | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/kaddressbook/phoneeditwidget.h b/kaddressbook/phoneeditwidget.h index c730c7b..df5aff9 100644 --- a/kaddressbook/phoneeditwidget.h +++ b/kaddressbook/phoneeditwidget.h | |||
@@ -22,16 +22,17 @@ | |||
22 | with any edition of Qt, and distribute the resulting executable, | 22 | with any edition of Qt, and distribute the resulting executable, |
23 | without including the source code for Qt in the source distribution. | 23 | without including the source code for Qt in the source distribution. |
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include <kdialogbase.h> | 26 | #include <kdialogbase.h> |
27 | #include <kiconloader.h> | 27 | #include <kiconloader.h> |
28 | #include <qpushbutton.h> | 28 | #include <qpushbutton.h> |
29 | #include <qlayout.h> | 29 | #include <qlayout.h> |
30 | #include <qpopupmenu.h> | ||
30 | 31 | ||
31 | #include <qptrlist.h> | 32 | #include <qptrlist.h> |
32 | #include <qscrollview.h> | 33 | #include <qscrollview.h> |
33 | 34 | ||
34 | #include "addresseeconfig.h" | 35 | #include "addresseeconfig.h" |
35 | #include "typecombo.h" | 36 | #include "typecombo.h" |
36 | 37 | ||
37 | class QButtonGroup; | 38 | class QButtonGroup; |
@@ -42,17 +43,17 @@ class PhoneTypeNumberEdit; | |||
42 | #include <kcombobox.h> | 43 | #include <kcombobox.h> |
43 | #include <kabc/phonenumber.h> | 44 | #include <kabc/phonenumber.h> |
44 | 45 | ||
45 | typedef TypeCombo<KABC::PhoneNumber> PhoneTypeCombo; | 46 | typedef TypeCombo<KABC::PhoneNumber> PhoneTypeCombo; |
46 | 47 | ||
47 | /** | 48 | /** |
48 | Widget for editing phone numbers. | 49 | Widget for editing phone numbers. |
49 | */ | 50 | */ |
50 | class PhoneEditWidget : public QScrollView | 51 | class PhoneEditWidget : public QWidget |
51 | { | 52 | { |
52 | Q_OBJECT | 53 | Q_OBJECT |
53 | 54 | ||
54 | public: | 55 | public: |
55 | PhoneEditWidget( QWidget *parent, const char *name = 0 ); | 56 | PhoneEditWidget( QWidget *parent, const char *name = 0 ); |
56 | ~PhoneEditWidget(); | 57 | ~PhoneEditWidget(); |
57 | 58 | ||
58 | void setPhoneNumbers( const KABC::PhoneNumber::List &list ); | 59 | void setPhoneNumbers( const KABC::PhoneNumber::List &list ); |
@@ -61,22 +62,27 @@ class PhoneEditWidget : public QScrollView | |||
61 | // void updateTypeCombo( const KABC::PhoneNumber::List&, KComboBox* ); | 62 | // void updateTypeCombo( const KABC::PhoneNumber::List&, KComboBox* ); |
62 | //KABC::PhoneNumber currentPhoneNumber( KComboBox*, int ); | 63 | //KABC::PhoneNumber currentPhoneNumber( KComboBox*, int ); |
63 | 64 | ||
64 | signals: | 65 | signals: |
65 | void modified(); | 66 | void modified(); |
66 | void typeChange( int oldType, int newType ); | 67 | void typeChange( int oldType, int newType ); |
67 | 68 | ||
68 | private slots: | 69 | private slots: |
70 | void bottomVisible(); | ||
71 | void addNumberInt( int ); | ||
69 | void deleteEdit( PhoneTypeNumberEdit* ew ); | 72 | void deleteEdit( PhoneTypeNumberEdit* ew ); |
70 | void addNumber(); | 73 | void addNumber(); |
71 | void pendingDelete(); | 74 | void pendingDelete(); |
72 | protected: | 75 | protected: |
73 | 76 | ||
74 | private: | 77 | private: |
78 | QScrollView* sv; | ||
79 | QPopupMenu *mPopup; | ||
80 | int mPopupCount; | ||
75 | PhoneTypeNumberEdit* mPendingDelete; | 81 | PhoneTypeNumberEdit* mPendingDelete; |
76 | void setDefaults(); | 82 | void setDefaults(); |
77 | PhoneTypeNumberEdit* appendEditCombo(); | 83 | PhoneTypeNumberEdit* appendEditCombo(); |
78 | QWidget* mw; | 84 | QWidget* mw; |
79 | QVBoxLayout* mainLayout; | 85 | QVBoxLayout* mainLayout; |
80 | QPtrList <PhoneTypeNumberEdit> mTypeNumberEditList; | 86 | QPtrList <PhoneTypeNumberEdit> mTypeNumberEditList; |
81 | 87 | ||
82 | KABC::PhoneNumber::List mPhoneList; | 88 | KABC::PhoneNumber::List mPhoneList; |
@@ -221,30 +227,34 @@ public: | |||
221 | } | 227 | } |
222 | void setPhoneNumber( const KABC::PhoneNumber &phoneNumber ) | 228 | void setPhoneNumber( const KABC::PhoneNumber &phoneNumber ) |
223 | { | 229 | { |
224 | mPhoneNumber = phoneNumber; | 230 | mPhoneNumber = phoneNumber; |
225 | int index = PhoneNumber::typeListIndex4Type( mPhoneNumber.type() ); | 231 | int index = PhoneNumber::typeListIndex4Type( mPhoneNumber.type() ); |
226 | mCombo->setCurrentItem( index ); | 232 | mCombo->setCurrentItem( index ); |
227 | mNumber->setText( mPhoneNumber.number() ); | 233 | mNumber->setText( mPhoneNumber.number() ); |
228 | show(); | 234 | show(); |
229 | 235 | mNumber->setFocus(); | |
230 | } | 236 | } |
231 | KABC::PhoneNumber phoneNumber() | 237 | KABC::PhoneNumber phoneNumber() |
232 | { | 238 | { |
233 | mPhoneNumber.setNumber( mNumber->text() ); | 239 | mPhoneNumber.setNumber( mNumber->text() ); |
234 | int index = mCombo->currentItem(); | 240 | int index = mCombo->currentItem(); |
235 | mPhoneNumber.setType( PhoneNumber::supportedTypeList()[index] ); | 241 | mPhoneNumber.setType( PhoneNumber::supportedTypeList()[index] ); |
236 | return mPhoneNumber; | 242 | return mPhoneNumber; |
237 | } | 243 | } |
238 | bool isValid() | 244 | bool isValid() |
239 | { | 245 | { |
240 | if ( mNumber->text().isEmpty() )return false; | 246 | if ( mNumber->text().isEmpty() )return false; |
241 | return true; | 247 | return true; |
242 | } | 248 | } |
249 | int currentType() | ||
250 | { | ||
251 | return mCombo->currentItem(); | ||
252 | } | ||
243 | private slots: | 253 | private slots: |
244 | void typeExternalChanged( int oldType, int newType ) | 254 | void typeExternalChanged( int oldType, int newType ) |
245 | { | 255 | { |
246 | if ( mPhoneNumber.type() == newType ) { | 256 | if ( mPhoneNumber.type() == newType ) { |
247 | mPhoneNumber.setType(oldType); | 257 | mPhoneNumber.setType(oldType); |
248 | int index = PhoneNumber::typeListIndex4Type( mPhoneNumber.type() ); | 258 | int index = PhoneNumber::typeListIndex4Type( mPhoneNumber.type() ); |
249 | mCombo->setCurrentItem( index ); | 259 | mCombo->setCurrentItem( index ); |
250 | } | 260 | } |
@@ -254,25 +264,22 @@ public: | |||
254 | emit deleteMe( this ); | 264 | emit deleteMe( this ); |
255 | } | 265 | } |
256 | void comboTypeChange( int index ) | 266 | void comboTypeChange( int index ) |
257 | { | 267 | { |
258 | int old = mPhoneNumber.type(); | 268 | int old = mPhoneNumber.type(); |
259 | int newT = PhoneNumber::supportedTypeList()[index]; | 269 | int newT = PhoneNumber::supportedTypeList()[index]; |
260 | if ( old != newT ) { | 270 | if ( old != newT ) { |
261 | emit modified(); | 271 | emit modified(); |
262 | emit typeChange ( old, newT ); | 272 | if ( newT != PhoneNumber::Voice ) |
273 | emit typeChange ( old, newT ); | ||
263 | mPhoneNumber.setType(newT ); | 274 | mPhoneNumber.setType(newT ); |
264 | } | 275 | } |
265 | 276 | ||
266 | } | 277 | } |
267 | int currentType() | ||
268 | { | ||
269 | return mCombo->currentItem(); | ||
270 | } | ||
271 | void textChanged ( const QString & ) | 278 | void textChanged ( const QString & ) |
272 | { | 279 | { |
273 | emit modified(); | 280 | emit modified(); |
274 | } | 281 | } |
275 | signals: | 282 | signals: |
276 | void typeChange( int oldType, int newType ); | 283 | void typeChange( int oldType, int newType ); |
277 | void modified(); | 284 | void modified(); |
278 | void deleteMe( PhoneTypeNumberEdit* ); | 285 | void deleteMe( PhoneTypeNumberEdit* ); |