-rw-r--r-- | bin/kdepim/kaddressbook/germantranslation.txt | 4 | ||||
-rw-r--r-- | kabc/addressee.cpp | 4 | ||||
-rw-r--r-- | kabc/addresseeview.cpp | 2 | ||||
-rw-r--r-- | kaddressbook/phoneeditwidget.cpp | 112 | ||||
-rw-r--r-- | kaddressbook/phoneeditwidget.h | 87 |
5 files changed, 193 insertions, 16 deletions
diff --git a/bin/kdepim/kaddressbook/germantranslation.txt b/bin/kdepim/kaddressbook/germantranslation.txt index dcf43c1..f12f880 100644 --- a/bin/kdepim/kaddressbook/germantranslation.txt +++ b/bin/kdepim/kaddressbook/germantranslation.txt | |||
@@ -823,4 +823,4 @@ | |||
823 | { "Company","Firma" }, | 823 | { "Company","Firma" }, |
824 | { "Mobile2 (work)","Handy2 (Arbeit)" }, | 824 | { "Mobile2 (Work)","Handy2 (Arbeit)" }, |
825 | { "Mobile2 (car)","Handy2 (Auto)" }, | 825 | { "Mobile2 (Car)","Handy2 (Auto)" }, |
826 | { "Callback","Rückruf" }, | 826 | { "Callback","Rückruf" }, |
diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp index 19c78ee..789a694 100644 --- a/kabc/addressee.cpp +++ b/kabc/addressee.cpp | |||
@@ -1061,3 +1061,3 @@ QString Addressee::mobileWorkPhoneLabel() | |||
1061 | { | 1061 | { |
1062 | return i18n("Mobile2 (work)"); | 1062 | return i18n("Mobile2 (Work)"); |
1063 | } | 1063 | } |
@@ -1083,3 +1083,3 @@ QString Addressee::carPhoneLabel() | |||
1083 | { | 1083 | { |
1084 | return i18n("Mobile2 (car)"); | 1084 | return i18n("Mobile2 (Car)"); |
1085 | } | 1085 | } |
diff --git a/kabc/addresseeview.cpp b/kabc/addresseeview.cpp index 05d604f..aae923c 100644 --- a/kabc/addresseeview.cpp +++ b/kabc/addresseeview.cpp | |||
@@ -586,2 +586,3 @@ QString AddresseeView::getPhoneNumbers( KABC::PhoneNumber::List phones ,bool pr | |||
586 | } | 586 | } |
587 | #if 0 | ||
587 | else if ((phonetype & KABC::PhoneNumber::Sip) == KABC::PhoneNumber::Sip) { | 588 | else if ((phonetype & KABC::PhoneNumber::Sip) == KABC::PhoneNumber::Sip) { |
@@ -589,2 +590,3 @@ QString AddresseeView::getPhoneNumbers( KABC::PhoneNumber::List phones ,bool pr | |||
589 | } | 590 | } |
591 | #endif | ||
590 | else if (kphoneAvail) { | 592 | else if (kphoneAvail) { |
diff --git a/kaddressbook/phoneeditwidget.cpp b/kaddressbook/phoneeditwidget.cpp index 2bce39a..b20275d 100644 --- a/kaddressbook/phoneeditwidget.cpp +++ b/kaddressbook/phoneeditwidget.cpp | |||
@@ -32,2 +32,3 @@ | |||
32 | #include <qbuttongroup.h> | 32 | #include <qbuttongroup.h> |
33 | #include <qhbox.h> | ||
33 | 34 | ||
@@ -52,2 +53,111 @@ | |||
52 | PhoneEditWidget::PhoneEditWidget( QWidget *parent, const char *name ) | 53 | PhoneEditWidget::PhoneEditWidget( QWidget *parent, const char *name ) |
54 | : QScrollView(parent,name) | ||
55 | { | ||
56 | setFrameStyle ( QFrame::Panel | QFrame::Plain ); | ||
57 | setLineWidth ( 1 ); | ||
58 | setMidLineWidth ( 1 ); | ||
59 | mw = new QWidget ( viewport() ); | ||
60 | addChild(mw); | ||
61 | setResizePolicy( AutoOneFit ); | ||
62 | mainLayout = new QVBoxLayout ( mw ); | ||
63 | mainLayout->setMargin( 2 ); | ||
64 | mainLayout->setSpacing( 2 ); | ||
65 | QWidget* hb = new QWidget ( mw ); | ||
66 | mainLayout->add( hb ); | ||
67 | QHBoxLayout* hbLayout = new QHBoxLayout ( hb ); | ||
68 | QPushButton *addBut = new QPushButton ( "add", hb ); | ||
69 | hbLayout->add( addBut ); | ||
70 | addBut->setPixmap ( SmallIcon("plus")); | ||
71 | addBut->setMaximumSize( addBut->sizeHint().height(),addBut->sizeHint().height() ); | ||
72 | connect(addBut,SIGNAL(clicked()),SLOT(addNumber())); | ||
73 | //QLabel * temp = new QLabel( i18n("Phone Type"), hb ); | ||
74 | QLabel *temp = new QLabel( i18n("Phone Number"),hb ); | ||
75 | temp->setAlignment( Qt::AlignCenter ); | ||
76 | temp->setPixmap( KGlobal::iconLoader()->loadIcon( "kaddressbook", KIcon::Desktop, 0 ) ); | ||
77 | hbLayout->add( temp ); | ||
78 | appendEditCombo(); | ||
79 | appendEditCombo(); | ||
80 | appendEditCombo(); | ||
81 | setDefaults(); | ||
82 | } | ||
83 | |||
84 | PhoneEditWidget::~PhoneEditWidget() | ||
85 | { | ||
86 | } | ||
87 | void PhoneEditWidget::setDefaults() | ||
88 | { | ||
89 | PhoneTypeNumberEdit* edit = mTypeNumberEditList.first(); | ||
90 | KABC::PhoneNumber phoneNumber; | ||
91 | phoneNumber.setType( KABC::PhoneNumber::Home | KABC::PhoneNumber::Pref ); | ||
92 | edit->setPhoneNumber( phoneNumber ); | ||
93 | edit = mTypeNumberEditList.next(); | ||
94 | phoneNumber.setType( KABC::PhoneNumber::Work | KABC::PhoneNumber::Pref ); | ||
95 | edit->setPhoneNumber( phoneNumber ); | ||
96 | edit = mTypeNumberEditList.next(); | ||
97 | phoneNumber.setType( KABC::PhoneNumber::Cell ); | ||
98 | edit->setPhoneNumber( phoneNumber ); | ||
99 | edit = mTypeNumberEditList.next(); | ||
100 | while ( edit ) { | ||
101 | edit->hide(); | ||
102 | edit = mTypeNumberEditList.next(); | ||
103 | } | ||
104 | } | ||
105 | void PhoneEditWidget::addNumber() | ||
106 | { | ||
107 | |||
108 | } | ||
109 | PhoneTypeNumberEdit* PhoneEditWidget::appendEditCombo() | ||
110 | { | ||
111 | PhoneTypeNumberEdit* edit = new PhoneTypeNumberEdit( mw ); | ||
112 | connect ( edit, SIGNAL ( typeChange( int , int) ), this, SIGNAL ( typeChange( int , int)) ); | ||
113 | connect ( edit, SIGNAL ( modified() ), this, SIGNAL ( modified() ) ); | ||
114 | connect ( this, SIGNAL ( typeChange( int , int)), edit, SLOT ( typeExternalChanged( int, int)) ); | ||
115 | |||
116 | mainLayout->add( edit ); | ||
117 | mTypeNumberEditList.append( edit ); | ||
118 | return edit; | ||
119 | } | ||
120 | |||
121 | void PhoneEditWidget::setPhoneNumbers( const KABC::PhoneNumber::List &li ) | ||
122 | { | ||
123 | if ( li.isEmpty() ) { | ||
124 | setDefaults(); | ||
125 | return; | ||
126 | } | ||
127 | KABC::PhoneNumber::List::Iterator it; | ||
128 | KABC::PhoneNumber::List list = li; | ||
129 | PhoneTypeNumberEdit* edit = mTypeNumberEditList.first(); | ||
130 | for ( it = list.begin(); it != list.end(); ++it ) { | ||
131 | if ( edit ) { | ||
132 | edit->setPhoneNumber( (*it ) ); | ||
133 | edit = mTypeNumberEditList.next(); | ||
134 | } else { | ||
135 | PhoneTypeNumberEdit* editNew = appendEditCombo(); | ||
136 | editNew->setPhoneNumber( (*it ) ); | ||
137 | } | ||
138 | } | ||
139 | while ( edit ) { | ||
140 | edit->hide(); | ||
141 | edit = mTypeNumberEditList.next(); | ||
142 | } | ||
143 | //mainLayout->invalidate (); | ||
144 | mw->update(); | ||
145 | } | ||
146 | KABC::PhoneNumber::List PhoneEditWidget::phoneNumbers() | ||
147 | { | ||
148 | KABC::PhoneNumber::List retList; | ||
149 | |||
150 | PhoneTypeNumberEdit* edit = mTypeNumberEditList.first(); | ||
151 | while ( edit ) { | ||
152 | if ( edit->isValid() ) { | ||
153 | retList.append( edit->phoneNumber()); | ||
154 | } | ||
155 | edit = mTypeNumberEditList.next(); | ||
156 | |||
157 | } | ||
158 | return retList; | ||
159 | } | ||
160 | |||
161 | #if 0 | ||
162 | PhoneEditWidget::PhoneEditWidget( QWidget *parent, const char *name ) | ||
53 | : QWidget( parent, name ) | 163 | : QWidget( parent, name ) |
@@ -552,3 +662,3 @@ KABC::PhoneNumber PhoneTypeDialog::phoneNumber() | |||
552 | } | 662 | } |
553 | 663 | #endif | |
554 | #ifndef KAB_EMBEDDED | 664 | #ifndef KAB_EMBEDDED |
diff --git a/kaddressbook/phoneeditwidget.h b/kaddressbook/phoneeditwidget.h index 0241cf0..6a514ed 100644 --- a/kaddressbook/phoneeditwidget.h +++ b/kaddressbook/phoneeditwidget.h | |||
@@ -30,2 +30,4 @@ | |||
30 | 30 | ||
31 | #include <qptrlist.h> | ||
32 | #include <qscrollview.h> | ||
31 | 33 | ||
@@ -36,2 +38,3 @@ class QButtonGroup; | |||
36 | class QCheckBox; | 38 | class QCheckBox; |
39 | class PhoneTypeNumberEdit; | ||
37 | 40 | ||
@@ -39,3 +42,3 @@ class QCheckBox; | |||
39 | #include <kcombobox.h> | 42 | #include <kcombobox.h> |
40 | class KListView; | 43 | #include <kabc/phonenumber.h> |
41 | 44 | ||
@@ -46,3 +49,3 @@ typedef TypeCombo<KABC::PhoneNumber> PhoneTypeCombo; | |||
46 | */ | 49 | */ |
47 | class PhoneEditWidget : public QWidget | 50 | class PhoneEditWidget : public QScrollView |
48 | { | 51 | { |
@@ -57,4 +60,4 @@ class PhoneEditWidget : public QWidget | |||
57 | 60 | ||
58 | void updateTypeCombo( const KABC::PhoneNumber::List&, KComboBox* ); | 61 | // void updateTypeCombo( const KABC::PhoneNumber::List&, KComboBox* ); |
59 | KABC::PhoneNumber currentPhoneNumber( KComboBox*, int ); | 62 | //KABC::PhoneNumber currentPhoneNumber( KComboBox*, int ); |
60 | 63 | ||
@@ -62,4 +65,42 @@ class PhoneEditWidget : public QWidget | |||
62 | void modified(); | 65 | void modified(); |
66 | void typeChange( int oldType, int newType ); | ||
63 | 67 | ||
64 | private slots: | 68 | private slots: |
69 | void addNumber(); | ||
70 | protected: | ||
71 | |||
72 | private: | ||
73 | void setDefaults(); | ||
74 | PhoneTypeNumberEdit* appendEditCombo(); | ||
75 | QWidget* mw; | ||
76 | QVBoxLayout* mainLayout; | ||
77 | QPtrList <PhoneTypeNumberEdit> mTypeNumberEditList; | ||
78 | |||
79 | KABC::PhoneNumber::List mPhoneList; | ||
80 | }; | ||
81 | |||
82 | |||
83 | |||
84 | |||
85 | |||
86 | #if 0 | ||
87 | class PhoneEditWidget : public QWidget | ||
88 | { | ||
89 | Q___OBJECT | ||
90 | |||
91 | public: | ||
92 | PhoneEditWidget( QWidget *parent, const char *name = 0 ); | ||
93 | ~PhoneEditWidget(); | ||
94 | |||
95 | void setPhoneNumbers( const KABC::PhoneNumber::List &list ); | ||
96 | KABC::PhoneNumber::List phoneNumbers(); | ||
97 | |||
98 | void updateTypeCombo( const KABC::PhoneNumber::List&, KComboBox* ); | ||
99 | KABC::PhoneNumber currentPhoneNumber( KComboBox*, int ); | ||
100 | |||
101 | sig_nals: | ||
102 | void modified(); | ||
103 | void typeChange( int oldType, int newType ); | ||
104 | |||
105 | private sl_ots: | ||
65 | void edit(); | 106 | void edit(); |
@@ -81,2 +122,3 @@ class PhoneEditWidget : public QWidget | |||
81 | private: | 122 | private: |
123 | QPtrList <PhoneTypeNumberEdit> mTypeNumberEditList; | ||
82 | void updateEdit( PhoneTypeCombo *combo ); | 124 | void updateEdit( PhoneTypeCombo *combo ); |
@@ -103,3 +145,3 @@ class PhoneEditDialog : public KDialogBase | |||
103 | { | 145 | { |
104 | Q_OBJECT | 146 | Q___OBJECT |
105 | 147 | ||
@@ -112,3 +154,3 @@ class PhoneEditDialog : public KDialogBase | |||
112 | 154 | ||
113 | protected slots: | 155 | protected s__lots: |
114 | void slotAddPhoneNumber(); | 156 | void slotAddPhoneNumber(); |
@@ -135,3 +177,3 @@ class PhoneTypeDialog : public KDialogBase | |||
135 | { | 177 | { |
136 | Q_OBJECT | 178 | Q___OBJECT |
137 | public: | 179 | public: |
@@ -149,2 +191,4 @@ private: | |||
149 | }; | 191 | }; |
192 | #endif | ||
193 | |||
150 | class PhoneTypeNumberEdit : public QWidget | 194 | class PhoneTypeNumberEdit : public QWidget |
@@ -153,3 +197,3 @@ class PhoneTypeNumberEdit : public QWidget | |||
153 | public: | 197 | public: |
154 | PhoneTypeNumberEdit( QWidget *parent, const char *name = 0 ) | 198 | PhoneTypeNumberEdit( QWidget *parent, const char *name = 0 ) :QWidget( parent ) |
155 | { | 199 | { |
@@ -167,3 +211,6 @@ public: | |||
167 | connect( mCombo , SIGNAL ( activated ( int ) ), this, SLOT ( comboTypeChange( int ) ) ); | 211 | connect( mCombo , SIGNAL ( activated ( int ) ), this, SLOT ( comboTypeChange( int ) ) ); |
212 | connect( mNumber , SIGNAL ( textChanged ( const QString & ) ), | ||
213 | this, SLOT ( textChanged ( const QString & ) ) ); | ||
168 | mCombo->insertStringList( PhoneNumber::supportedTypeListNames() ); | 214 | mCombo->insertStringList( PhoneNumber::supportedTypeListNames() ); |
215 | mIsValid = true; | ||
169 | } | 216 | } |
@@ -176,2 +223,3 @@ public: | |||
176 | mNumber->setText( mPhoneNumber.number() ); | 223 | mNumber->setText( mPhoneNumber.number() ); |
224 | mIsValid = true; | ||
177 | show(); | 225 | show(); |
@@ -185,4 +233,9 @@ public: | |||
185 | return mPhoneNumber; | 233 | return mPhoneNumber; |
186 | |||
187 | } | 234 | } |
235 | bool isValid() | ||
236 | { | ||
237 | if ( !mIsValid ) return false; | ||
238 | if ( mNumber->text().isEmpty() )return false; | ||
239 | return true; | ||
240 | } | ||
188 | private slots: | 241 | private slots: |
@@ -195,3 +248,2 @@ public: | |||
195 | } | 248 | } |
196 | |||
197 | } | 249 | } |
@@ -199,3 +251,5 @@ public: | |||
199 | { | 251 | { |
252 | emit modified(); | ||
200 | hide(); | 253 | hide(); |
254 | mIsValid = false; | ||
201 | } | 255 | } |
@@ -206,4 +260,5 @@ public: | |||
206 | if ( old != newT ) { | 260 | if ( old != newT ) { |
207 | mPhoneNumber.setType(newT ); | 261 | emit modified(); |
208 | emit typeChange ( old, newT ); | 262 | emit typeChange ( old, newT ); |
263 | mPhoneNumber.setType(newT ); | ||
209 | } | 264 | } |
@@ -211,6 +266,16 @@ public: | |||
211 | } | 266 | } |
267 | int currentType() | ||
268 | { | ||
269 | return mCombo->currentItem(); | ||
270 | } | ||
271 | void textChanged ( const QString & ) | ||
272 | { | ||
273 | emit modified(); | ||
274 | } | ||
212 | signals: | 275 | signals: |
213 | void typeChange( int oldType, int newType ); | 276 | void typeChange( int oldType, int newType ); |
277 | void modified(); | ||
214 | 278 | ||
215 | private: | 279 | private: |
280 | bool mIsValid; | ||
216 | KABC::PhoneNumber mPhoneNumber; | 281 | KABC::PhoneNumber mPhoneNumber; |