Diffstat (limited to 'kaddressbook/addresseeeditorwidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | kaddressbook/addresseeeditorwidget.cpp | 32 |
1 files changed, 26 insertions, 6 deletions
diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp index 29abd6f..310d628 100644 --- a/kaddressbook/addresseeeditorwidget.cpp +++ b/kaddressbook/addresseeeditorwidget.cpp | |||
@@ -185,27 +185,31 @@ void AddresseeEditorWidget::setupTab1() | |||
185 | mNameLabel->hide(); | 185 | mNameLabel->hide(); |
186 | 186 | ||
187 | layout->addWidget( button, 0, 0 ); | 187 | layout->addWidget( button, 0, 0 ); |
188 | layout->addWidget( mNameEdit, 0, 1 ); | 188 | layout->addWidget( mNameEdit, 0, 1 ); |
189 | layout->addWidget( mNameLabel, 0, 1 ); | 189 | layout->addWidget( mNameLabel, 0, 1 ); |
190 | 190 | ||
191 | label = new QLabel( i18n( "Role:" ), tab1 ); | 191 | button = new QPushButton( i18n( "Role:" ), tab1 ); |
192 | connect( button, SIGNAL( clicked() ), SLOT( setRole2FN() ) ); | ||
193 | //label = new QLabel( i18n( "Role:" ), tab1 ); | ||
192 | mRoleEdit = new KLineEdit( tab1 ); | 194 | mRoleEdit = new KLineEdit( tab1 ); |
193 | connect( mRoleEdit, SIGNAL( textChanged( const QString& ) ), | 195 | connect( mRoleEdit, SIGNAL( textChanged( const QString& ) ), |
194 | SLOT( textChanged( const QString& ) ) ); | 196 | SLOT( textChanged( const QString& ) ) ); |
195 | label->setBuddy( mRoleEdit ); | 197 | //label->setBuddy( mRoleEdit ); |
196 | layout->addWidget( label, 1, 0 ); | 198 | layout->addWidget( button, 1, 0 ); |
197 | layout->addWidget( mRoleEdit, 1, 1 ); | 199 | layout->addWidget( mRoleEdit, 1, 1 ); |
198 | 200 | ||
199 | // Organization | 201 | // Organization |
200 | label = new QLabel( i18n( "Organization:" ), tab1 ); | 202 | button = new QPushButton( i18n( "Organization:" ), tab1 ); |
203 | connect( button, SIGNAL( clicked() ), SLOT( setCompany2FN() ) ); | ||
204 | //label = new QLabel( i18n( "Organization:" ), tab1 ); | ||
201 | mOrgEdit = new KLineEdit( tab1 ); | 205 | mOrgEdit = new KLineEdit( tab1 ); |
202 | label->setBuddy( mOrgEdit ); | 206 | //label->setBuddy( mOrgEdit ); |
203 | connect( mOrgEdit, SIGNAL( textChanged( const QString& ) ), | 207 | connect( mOrgEdit, SIGNAL( textChanged( const QString& ) ), |
204 | SLOT( textChanged( const QString& ) ) ); | 208 | SLOT( textChanged( const QString& ) ) ); |
205 | layout->addWidget( label, 2, 0 ); | 209 | layout->addWidget( button, 2, 0 ); |
206 | layout->addWidget( mOrgEdit, 2, 1 ); | 210 | layout->addWidget( mOrgEdit, 2, 1 ); |
207 | 211 | ||
208 | // File as (formatted name) | 212 | // File as (formatted name) |
209 | label = new QLabel( i18n( "Formatted name:" ), tab1 ); | 213 | label = new QLabel( i18n( "Formatted name:" ), tab1 ); |
210 | mFormattedNameLabel = new KSqueezedTextLabel( tab1 ); | 214 | mFormattedNameLabel = new KSqueezedTextLabel( tab1 ); |
211 | layout->addWidget( label, 3, 0 ); | 215 | layout->addWidget( label, 3, 0 ); |
@@ -322,12 +326,28 @@ void AddresseeEditorWidget::setupTab1() | |||
322 | // Build the layout and add to the tab widget | 326 | // Build the layout and add to the tab widget |
323 | layout->activate(); // required | 327 | layout->activate(); // required |
324 | 328 | ||
325 | mTabWidget->addTab( tab1, i18n( "&General" ) ); | 329 | mTabWidget->addTab( tab1, i18n( "&General" ) ); |
326 | } | 330 | } |
327 | 331 | ||
332 | void AddresseeEditorWidget::setRole2FN() | ||
333 | { | ||
334 | if ( mRoleEdit->text().isEmpty() ) return; | ||
335 | mFormattedNameType = NameEditDialog::CustomName; | ||
336 | mAddressee.setFormattedName( mRoleEdit->text() ); | ||
337 | mFormattedNameLabel->setText( mRoleEdit->text() ); | ||
338 | mDirty = true; | ||
339 | } | ||
340 | void AddresseeEditorWidget::setCompany2FN() | ||
341 | { | ||
342 | if ( mOrgEdit->text().isEmpty() ) return; | ||
343 | mFormattedNameType = NameEditDialog::CustomName; | ||
344 | mAddressee.setFormattedName( mOrgEdit->text() ); | ||
345 | mFormattedNameLabel->setText( mOrgEdit->text() ); | ||
346 | mDirty = true; | ||
347 | } | ||
328 | 348 | ||
329 | void AddresseeEditorWidget::setupTab1_1() | 349 | void AddresseeEditorWidget::setupTab1_1() |
330 | { | 350 | { |
331 | // This is the Address tab | 351 | // This is the Address tab |
332 | QWidget *tab1_1 = new QWidget( mTabWidget ); | 352 | QWidget *tab1_1 = new QWidget( mTabWidget ); |
333 | 353 | ||