-rw-r--r-- | bin/kdepim/WhatsNew.txt | 9 | ||||
-rw-r--r-- | bin/kdepim/kaddressbook/germantranslation.txt | 8 | ||||
-rw-r--r-- | kaddressbook/xxport/csvimportdialog.cpp | 67 | ||||
-rw-r--r-- | kaddressbook/xxport/csvimportdialog.h | 4 | ||||
-rw-r--r-- | microkde/kfiledialog.cpp | 3 | ||||
-rw-r--r-- | microkde/kio/kfile/kurlrequester.cpp | 2 |
6 files changed, 75 insertions, 18 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index fdcfab1..41b2a81 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt | |||
@@ -1,18 +1,27 @@ | |||
1 | Info about the changes in new versions of KDE-Pim/Pi | 1 | Info about the changes in new versions of KDE-Pim/Pi |
2 | 2 | ||
3 | ********** VERSION 2.1.3 ************ | ||
4 | |||
5 | Changed the menu structure of the alarm applet: | ||
6 | Moved "Simulate" to " Play Beeps" submenu and re-added "Todo List". | ||
7 | |||
8 | Fixed several problems in the KA/Pi CSV import dialog: | ||
9 | Added "Category", made codec configureable and made it possible to map many fields to the "Note" field. | ||
10 | |||
11 | |||
3 | ********** VERSION 2.1.2 ************ | 12 | ********** VERSION 2.1.2 ************ |
4 | 13 | ||
5 | Fixed a problem closing the alarm dialog on Zaurus with "OK" button. | 14 | Fixed a problem closing the alarm dialog on Zaurus with "OK" button. |
6 | 15 | ||
7 | Fixed a problem when importing data from Outlook with mutiple categories set. | 16 | Fixed a problem when importing data from Outlook with mutiple categories set. |
8 | 17 | ||
9 | Changed display of days in datenavigator: | 18 | Changed display of days in datenavigator: |
10 | Birthdays are now blue, not dark green. | 19 | Birthdays are now blue, not dark green. |
11 | When todo view is shown, no birtdays are shown and days with due todos are shown blue. | 20 | When todo view is shown, no birtdays are shown and days with due todos are shown blue. |
12 | When journal view is shown, only holidays are shown and days with journals are blue. | 21 | When journal view is shown, only holidays are shown and days with journals are blue. |
13 | 22 | ||
14 | Added Backup options to global config: | 23 | Added Backup options to global config: |
15 | You can create now x-daily backups for KO/Pi, KA/Pi (for file resources only, file resource is the standard type) and PwM/Pi ( all files you will open ). | 24 | You can create now x-daily backups for KO/Pi, KA/Pi (for file resources only, file resource is the standard type) and PwM/Pi ( all files you will open ). |
16 | It is recommended to use another HDD/Memory card for the backup directory. If (very useful on the Zaurus) the specified backup directory does not exist you are asked if you want to try again to create a backup. That makes it possible to insert your memory card in the Zaurus and then trying again. | 25 | It is recommended to use another HDD/Memory card for the backup directory. If (very useful on the Zaurus) the specified backup directory does not exist you are asked if you want to try again to create a backup. That makes it possible to insert your memory card in the Zaurus and then trying again. |
17 | The backup is created when the application wants to save for the first time on a backup-day. You can specify the amount of backups and the day interval of backups. | 26 | The backup is created when the application wants to save for the first time on a backup-day. You can specify the amount of backups and the day interval of backups. |
18 | 27 | ||
diff --git a/bin/kdepim/kaddressbook/germantranslation.txt b/bin/kdepim/kaddressbook/germantranslation.txt index ef4ab3f..899203e 100644 --- a/bin/kdepim/kaddressbook/germantranslation.txt +++ b/bin/kdepim/kaddressbook/germantranslation.txt | |||
@@ -272,57 +272,57 @@ | |||
272 | { "&Add...","Hinzufügen..." }, | 272 | { "&Add...","Hinzufügen..." }, |
273 | { "&Edit...","B&earbeiten..." }, | 273 | { "&Edit...","B&earbeiten..." }, |
274 | { "&Remove","Entfe&rne" }, | 274 | { "&Remove","Entfe&rne" }, |
275 | { "Modify View: ","Ansicht ändern: " }, | 275 | { "Modify View: ","Ansicht ändern: " }, |
276 | { "Fields","Felder" }, | 276 | { "Fields","Felder" }, |
277 | { "Select Fields to Display","Wähle anzuzeigende Felder" }, | 277 | { "Select Fields to Display","Wähle anzuzeigende Felder" }, |
278 | { "All","Alles" }, | 278 | { "All","Alles" }, |
279 | { "Frequent","Frequent" }, | 279 | { "Frequent","Frequent" }, |
280 | { "Address","Adresse" }, | 280 | { "Address","Adresse" }, |
281 | { "Email","E-Mail" }, | 281 | { "Email","E-Mail" }, |
282 | { "Personal","Persönl." }, | 282 | { "Personal","Persönl." }, |
283 | { "Organization","Organisation" }, | 283 | { "Organization","Organisation" }, |
284 | { "Custom","Benutzerdefiniert" }, | 284 | { "Custom","Benutzerdefiniert" }, |
285 | { "&Selected\nfields:","&Selektierte\nFelder:" }, | 285 | { "&Selected\nfields:","&Selektierte\nFelder:" }, |
286 | { "Formatted Name","Format. Name" }, | 286 | { "Formatted Name","Format. Name" }, |
287 | { "Additional Names","Mittelname" }, | 287 | { "Additional Names","Mittelname" }, |
288 | { "Honorific Prefixes","Namen Prefix" }, | 288 | { "Honorific Prefixes","Namensprefix" }, |
289 | { "Honorific Suffixes","Namen Suffix" }, | 289 | { "Honorific Suffixes","Namenssuffix" }, |
290 | { "Nick Name","Sptitzname" }, | 290 | { "Nick Name","Spitzname" }, |
291 | { "Birthday","Geburtstag" }, | 291 | { "Birthday","Geburtstag" }, |
292 | { "Home Address Street","Privat Adresse Strasse" }, | 292 | { "Home Address Street","Privat Adresse Strasse" }, |
293 | { "Home Address Locality","Privat Adresse Stadt" }, | 293 | { "Home Address Locality","Privat Adresse Stadt" }, |
294 | { "Home Address Region","Privat Adresse Bundesland" }, | 294 | { "Home Address Region","Privat Adresse Bundesland" }, |
295 | { "Home Address Postal Code","Privat Adresse PLZ" }, | 295 | { "Home Address Postal Code","Privat Adresse PLZ" }, |
296 | { "Home Address Country","Privat Adresse Land" }, | 296 | { "Home Address Country","Privat Adresse Land" }, |
297 | { "Home Address Label","Privat Adresse Label" }, | 297 | { "Home Address Label","Privat Adresse Label" }, |
298 | { "Business Address Street","Büro Adresse Strasse" }, | 298 | { "Business Address Street","Büro Adresse Strasse" }, |
299 | { "Business Address Locality","Büro Adresse Stadt" }, | 299 | { "Business Address Locality","Büro Adresse Stadt" }, |
300 | { "Business Address Region","Büro Adresse Bundesland" }, | 300 | { "Business Address Region","Büro Adresse Bundesland" }, |
301 | { "Business Address Postal Code","Büro Adresse PLZ" }, | 301 | { "Business Address Postal Code","Büro Adresse PLZ" }, |
302 | { "Business Address Country","Büro Adresse Land" }, | 302 | { "Business Address Country","Büro Adresse Land" }, |
303 | { "Business Address Label","Büro Adresse Label" }, | 303 | { "Business Address Label","Büro Adresse Label" }, |
304 | { "Home Phone","Privat Telefon" }, | 304 | { "Home Phone","Privat Telefon" }, |
305 | { "Business Phone","Büro Telefon" }, | 305 | { "Business Phone","Büro Telefon" }, |
306 | { "Mobile Phone","Handy" }, | 306 | { "Mobile Phone","Handy" }, |
307 | { "Home Fax","Privat Fax" }, | 307 | { "Home Fax","Privat Fax" }, |
308 | { "Business Fax","Büro Fax" }, | 308 | { "Business Fax","Büro Fax" }, |
309 | { "Car Phone","Autotelefon" }, | 309 | { "Car Phone","Autotelefon" }, |
310 | { "ISDN","ISDN" }, | 310 | { "ISDN","ISDN" }, |
311 | { "Pager","Pager" }, | 311 | { "Pager","Pager" }, |
312 | { "Mail Client","Mail Client" }, | 312 | { "Mail Client","Mail Klient" }, |
313 | { "Title","Titel" }, | 313 | { "Title","Titel" }, |
314 | { "Role","Rolle" }, | 314 | { "Role","Rolle" }, |
315 | { "Note","Notiz" }, | 315 | { "Note","Notiz" }, |
316 | { "URL","URL" }, | 316 | { "URL","URL" }, |
317 | { "Resource","Resource" }, | 317 | { "Resource","Resource" }, |
318 | { "SIP","SIP" }, | 318 | { "SIP","SIP" }, |
319 | { "Default Filter","Default Filter" }, | 319 | { "Default Filter","Default Filter" }, |
320 | { "The default filter will be activated whenever this view is displayed. This feature allows you to configure views that only interact with certain types of information based on the filter. Once the view is activated, the filter can be changed at anytime.","#The default filter will be activated whenever this view is displayed. This feature allows you to configure views that only interact with certain types of information based on the filter. Once the view is activated, the filter can be changed at anytime." }, | 320 | { "The default filter will be activated whenever this view is displayed. This feature allows you to configure views that only interact with certain types of information based on the filter. Once the view is activated, the filter can be changed at anytime.","#The default filter will be activated whenever this view is displayed. This feature allows you to configure views that only interact with certain types of information based on the filter. Once the view is activated, the filter can be changed at anytime." }, |
321 | { "No default filter","Kein default Filter" }, | 321 | { "No default filter","Kein default Filter" }, |
322 | { "Use last active filter","Nutze letzen aktiven Filter" }, | 322 | { "Use last active filter","Nutze letzen aktiven Filter" }, |
323 | { "Use filter:","Nutze Filter:" }, | 323 | { "Use filter:","Nutze Filter:" }, |
324 | { "Look & Feel","Look & Feel" }, | 324 | { "Look & Feel","Look & Feel" }, |
325 | { "Row Separator","Reihen Separator" }, | 325 | { "Row Separator","Reihen Separator" }, |
326 | { "Alternating backgrounds","Abwechselnder Hintergrund" }, | 326 | { "Alternating backgrounds","Abwechselnder Hintergrund" }, |
327 | { "Single line","Einzelne Zeile" }, | 327 | { "Single line","Einzelne Zeile" }, |
328 | { "Enable background image:","Hintergrundbild:" }, | 328 | { "Enable background image:","Hintergrundbild:" }, |
diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp index cc55a24..41e2612 100644 --- a/kaddressbook/xxport/csvimportdialog.cpp +++ b/kaddressbook/xxport/csvimportdialog.cpp | |||
@@ -109,49 +109,52 @@ CSVImportDialog::CSVImportDialog( KABC::AddressBook *ab, QWidget *parent, | |||
109 | 109 | ||
110 | mTypeMap.insert( KABC::Addressee::homePhoneLabel(), HomePhone ); | 110 | mTypeMap.insert( KABC::Addressee::homePhoneLabel(), HomePhone ); |
111 | mTypeMap.insert( KABC::Addressee::businessPhoneLabel(), BusinessPhone ); | 111 | mTypeMap.insert( KABC::Addressee::businessPhoneLabel(), BusinessPhone ); |
112 | mTypeMap.insert( KABC::Addressee::mobilePhoneLabel(), MobilePhone ); | 112 | mTypeMap.insert( KABC::Addressee::mobilePhoneLabel(), MobilePhone ); |
113 | mTypeMap.insert( KABC::Addressee::homeFaxLabel(), HomeFax ); | 113 | mTypeMap.insert( KABC::Addressee::homeFaxLabel(), HomeFax ); |
114 | mTypeMap.insert( KABC::Addressee::businessFaxLabel(), BusinessFax ); | 114 | mTypeMap.insert( KABC::Addressee::businessFaxLabel(), BusinessFax ); |
115 | mTypeMap.insert( KABC::Addressee::carPhoneLabel(), CarPhone ); | 115 | mTypeMap.insert( KABC::Addressee::carPhoneLabel(), CarPhone ); |
116 | mTypeMap.insert( KABC::Addressee::isdnLabel(), Isdn ); | 116 | mTypeMap.insert( KABC::Addressee::isdnLabel(), Isdn ); |
117 | mTypeMap.insert( KABC::Addressee::pagerLabel(), Pager ); | 117 | mTypeMap.insert( KABC::Addressee::pagerLabel(), Pager ); |
118 | mTypeMap.insert( KABC::Addressee::emailLabel(), Email ); | 118 | mTypeMap.insert( KABC::Addressee::emailLabel(), Email ); |
119 | mTypeMap.insert( KABC::Addressee::mailerLabel(), Mailer ); | 119 | mTypeMap.insert( KABC::Addressee::mailerLabel(), Mailer ); |
120 | mTypeMap.insert( KABC::Addressee::titleLabel(), Title ); | 120 | mTypeMap.insert( KABC::Addressee::titleLabel(), Title ); |
121 | mTypeMap.insert( KABC::Addressee::roleLabel(), Role ); | 121 | mTypeMap.insert( KABC::Addressee::roleLabel(), Role ); |
122 | mTypeMap.insert( KABC::Addressee::organizationLabel(), Organization ); | 122 | mTypeMap.insert( KABC::Addressee::organizationLabel(), Organization ); |
123 | mTypeMap.insert( KABC::Addressee::noteLabel(), Note ); | 123 | mTypeMap.insert( KABC::Addressee::noteLabel(), Note ); |
124 | mTypeMap.insert( KABC::Addressee::urlLabel(), URL ); | 124 | mTypeMap.insert( KABC::Addressee::urlLabel(), URL ); |
125 | mTypeMap.insert( KABC::Addressee::categoryLabel(), Categories ); | ||
125 | 126 | ||
126 | mCustomCounter = mTypeMap.count(); | 127 | mCustomCounter = mTypeMap.count(); |
127 | int count = mCustomCounter; | 128 | int count = mCustomCounter; |
128 | 129 | ||
129 | KABC::Field::List fields = mAddressBook->fields( KABC::Field::CustomCategory ); | 130 | KABC::Field::List fields = mAddressBook->fields( KABC::Field::CustomCategory ); |
130 | KABC::Field::List::Iterator it; | 131 | KABC::Field::List::Iterator it; |
131 | for ( it = fields.begin(); it != fields.end(); ++it, ++count ) | 132 | for ( it = fields.begin(); it != fields.end(); ++it, ++count ) |
132 | mTypeMap.insert( (*it)->label(), count ); | 133 | mTypeMap.insert( (*it)->label(), count ); |
133 | 134 | ||
134 | connect( mDelimiterBox, SIGNAL( clicked( int ) ), | 135 | connect( mDelimiterBox, SIGNAL( clicked( int ) ), |
135 | this, SLOT( delimiterClicked( int ) ) ); | 136 | this, SLOT( delimiterClicked( int ) ) ); |
136 | connect( mDelimiterEdit, SIGNAL( returnPressed() ), | 137 | connect( mDelimiterEdit, SIGNAL( returnPressed() ), |
137 | this, SLOT( returnPressed() ) ); | 138 | this, SLOT( returnPressed() ) ); |
138 | connect( mDelimiterEdit, SIGNAL( textChanged ( const QString& ) ), | 139 | connect( mDelimiterEdit, SIGNAL( textChanged ( const QString& ) ), |
139 | this, SLOT( textChanged ( const QString& ) ) ); | 140 | this, SLOT( textChanged ( const QString& ) ) ); |
140 | connect( mComboLine, SIGNAL( activated( const QString& ) ), | 141 | connect( mComboLine, SIGNAL( activated( const QString& ) ), |
141 | this, SLOT( lineSelected( const QString& ) ) ); | 142 | this, SLOT( lineSelected( const QString& ) ) ); |
143 | connect( mComboCodec, SIGNAL( activated( const QString& ) ), | ||
144 | this, SLOT( codecChanged( const QString& ) ) ); | ||
142 | connect( mComboQuote, SIGNAL( activated( const QString& ) ), | 145 | connect( mComboQuote, SIGNAL( activated( const QString& ) ), |
143 | this, SLOT( textquoteSelected( const QString& ) ) ); | 146 | this, SLOT( textquoteSelected( const QString& ) ) ); |
144 | connect( mIgnoreDuplicates, SIGNAL( stateChanged( int ) ), | 147 | connect( mIgnoreDuplicates, SIGNAL( stateChanged( int ) ), |
145 | this, SLOT( ignoreDuplicatesChanged( int ) ) ); | 148 | this, SLOT( ignoreDuplicatesChanged( int ) ) ); |
146 | 149 | ||
147 | connect( mUrlRequester, SIGNAL( returnPressed( const QString& ) ), | 150 | connect( mUrlRequester, SIGNAL( returnPressed( const QString& ) ), |
148 | this, SLOT( setFile( const QString& ) ) ); | 151 | this, SLOT( setFile( const QString& ) ) ); |
149 | connect( mUrlRequester, SIGNAL( urlSelected( const QString& ) ), | 152 | connect( mUrlRequester, SIGNAL( urlSelected( const QString& ) ), |
150 | this, SLOT( setFile( const QString& ) ) ); | 153 | this, SLOT( setFile( const QString& ) ) ); |
151 | connect( mUrlRequester->lineEdit(), SIGNAL( textChanged ( const QString& ) ), | 154 | connect( mUrlRequester->lineEdit(), SIGNAL( textChanged ( const QString& ) ), |
152 | this, SLOT( urlChanged( const QString& ) ) ); | 155 | this, SLOT( urlChanged( const QString& ) ) ); |
153 | 156 | ||
154 | connect( this, SIGNAL( user1Clicked() ), | 157 | connect( this, SIGNAL( user1Clicked() ), |
155 | this, SLOT( applyTemplate() ) ); | 158 | this, SLOT( applyTemplate() ) ); |
156 | 159 | ||
157 | connect( this, SIGNAL( user2Clicked() ), | 160 | connect( this, SIGNAL( user2Clicked() ), |
@@ -236,35 +239,41 @@ KABC::AddresseeList CSVImportDialog::contacts() const | |||
236 | case Role: | 239 | case Role: |
237 | a.setRole( value ); | 240 | a.setRole( value ); |
238 | break; | 241 | break; |
239 | case Title: | 242 | case Title: |
240 | a.setTitle( value ); | 243 | a.setTitle( value ); |
241 | break; | 244 | break; |
242 | case Mailer: | 245 | case Mailer: |
243 | a.setMailer( value ); | 246 | a.setMailer( value ); |
244 | break; | 247 | break; |
245 | case URL: | 248 | case URL: |
246 | a.setUrl( value ); | 249 | a.setUrl( value ); |
247 | break; | 250 | break; |
248 | case Organization: | 251 | case Organization: |
249 | a.setOrganization( value ); | 252 | a.setOrganization( value ); |
250 | break; | 253 | break; |
251 | case Note: | 254 | case Note: |
255 | if ( a.note().isEmpty() ) | ||
252 | a.setNote( value ); | 256 | a.setNote( value ); |
257 | else { | ||
258 | a.setNote( a.note()+"\n"+value ); | ||
259 | } | ||
260 | break; | ||
261 | case Categories: | ||
262 | a.insertCategory( value ); | ||
253 | break; | 263 | break; |
254 | |||
255 | case HomePhone: | 264 | case HomePhone: |
256 | if ( !value.isEmpty() ) { | 265 | if ( !value.isEmpty() ) { |
257 | KABC::PhoneNumber number( value, KABC::PhoneNumber::Home ); | 266 | KABC::PhoneNumber number( value, KABC::PhoneNumber::Home ); |
258 | a.insertPhoneNumber( number ); | 267 | a.insertPhoneNumber( number ); |
259 | } | 268 | } |
260 | break; | 269 | break; |
261 | case BusinessPhone: | 270 | case BusinessPhone: |
262 | if ( !value.isEmpty() ) { | 271 | if ( !value.isEmpty() ) { |
263 | KABC::PhoneNumber number( value, KABC::PhoneNumber::Work ); | 272 | KABC::PhoneNumber number( value, KABC::PhoneNumber::Work ); |
264 | a.insertPhoneNumber( number ); | 273 | a.insertPhoneNumber( number ); |
265 | } | 274 | } |
266 | break; | 275 | break; |
267 | case MobilePhone: | 276 | case MobilePhone: |
268 | if ( !value.isEmpty() ) { | 277 | if ( !value.isEmpty() ) { |
269 | KABC::PhoneNumber number( value, KABC::PhoneNumber::Cell ); | 278 | KABC::PhoneNumber number( value, KABC::PhoneNumber::Cell ); |
270 | a.insertPhoneNumber( number ); | 279 | a.insertPhoneNumber( number ); |
@@ -372,134 +381,153 @@ KABC::AddresseeList CSVImportDialog::contacts() const | |||
372 | void CSVImportDialog::initGUI() | 381 | void CSVImportDialog::initGUI() |
373 | { | 382 | { |
374 | QWidget* page = plainPage(); | 383 | QWidget* page = plainPage(); |
375 | 384 | ||
376 | QGridLayout *layout = new QGridLayout( page, 1, 1, marginHintSmall(), | 385 | QGridLayout *layout = new QGridLayout( page, 1, 1, marginHintSmall(), |
377 | spacingHintSmall() ); | 386 | spacingHintSmall() ); |
378 | QHBoxLayout *hbox = new QHBoxLayout(); | 387 | QHBoxLayout *hbox = new QHBoxLayout(); |
379 | hbox->setSpacing( spacingHint() ); | 388 | hbox->setSpacing( spacingHint() ); |
380 | 389 | ||
381 | QLabel *label = new QLabel( i18n( "File to import:" ), page ); | 390 | QLabel *label = new QLabel( i18n( "File to import:" ), page ); |
382 | hbox->addWidget( label ); | 391 | hbox->addWidget( label ); |
383 | 392 | ||
384 | mUrlRequester = new KURLRequester( page ); | 393 | mUrlRequester = new KURLRequester( page ); |
385 | mUrlRequester->setFilter( "*.csv" ); | 394 | mUrlRequester->setFilter( "*.csv" ); |
386 | hbox->addWidget( mUrlRequester ); | 395 | hbox->addWidget( mUrlRequester ); |
387 | 396 | ||
388 | layout->addMultiCellLayout( hbox, 0, 0, 0, 1 ); | 397 | layout->addMultiCellLayout( hbox, 0, 0, 0, 2 ); |
389 | 398 | ||
390 | // Delimiter: comma, semicolon, tab, space, other | 399 | // Delimiter: comma, semicolon, tab, space, other |
391 | mDelimiterBox = new QButtonGroup( i18n( "Delimiter" ), page ); | 400 | mDelimiterBox = new QButtonGroup( i18n( "Delimiter" ), page ); |
392 | mDelimiterBox->setColumnLayout( 0, Qt::Vertical ); | 401 | mDelimiterBox->setColumnLayout( 0, Qt::Vertical ); |
393 | mDelimiterBox->layout()->setSpacing( spacingHint() ); | 402 | mDelimiterBox->layout()->setSpacing( spacingHint() ); |
394 | mDelimiterBox->layout()->setMargin( marginHint() ); | 403 | mDelimiterBox->layout()->setMargin( marginHint() ); |
395 | QGridLayout *delimiterLayout = new QGridLayout( mDelimiterBox->layout() ); | 404 | QGridLayout *delimiterLayout = new QGridLayout( mDelimiterBox->layout() ); |
396 | delimiterLayout->setAlignment( Qt::AlignTop ); | 405 | delimiterLayout->setAlignment( Qt::AlignTop ); |
397 | layout->addMultiCellWidget( mDelimiterBox, 1, 1, 0, 1 ); | 406 | layout->addMultiCellWidget( mDelimiterBox, 1, 1, 0, 2 ); |
398 | 407 | ||
399 | mRadioComma = new QRadioButton( i18n( "Comma" ), mDelimiterBox ); | 408 | mRadioComma = new QRadioButton( i18n( "Comma" ), mDelimiterBox ); |
400 | mRadioComma->setChecked( true ); | 409 | mRadioComma->setChecked( true ); |
401 | delimiterLayout->addWidget( mRadioComma, 0, 0 ); | 410 | delimiterLayout->addWidget( mRadioComma, 0, 0 ); |
402 | 411 | ||
403 | mRadioSemicolon = new QRadioButton( i18n( "Semicolon" ), mDelimiterBox ); | 412 | mRadioSemicolon = new QRadioButton( i18n( "Semicolon" ), mDelimiterBox ); |
404 | delimiterLayout->addWidget( mRadioSemicolon, 0, 1 ); | 413 | delimiterLayout->addWidget( mRadioSemicolon, 0, 1 ); |
405 | 414 | ||
406 | mRadioTab = new QRadioButton( i18n( "Tabulator" ), mDelimiterBox ); | 415 | mRadioTab = new QRadioButton( i18n( "Tabulator" ), mDelimiterBox ); |
407 | delimiterLayout->addWidget( mRadioTab, 1, 0 ); | 416 | delimiterLayout->addWidget( mRadioTab, 1, 0 ); |
408 | 417 | ||
409 | mRadioSpace = new QRadioButton( i18n( "Space" ), mDelimiterBox ); | 418 | mRadioSpace = new QRadioButton( i18n( "Space" ), mDelimiterBox ); |
410 | delimiterLayout->addWidget( mRadioSpace, 1, 1 ); | 419 | delimiterLayout->addWidget( mRadioSpace, 1, 1 ); |
411 | 420 | ||
412 | mRadioOther = new QRadioButton( i18n( "Other" ), mDelimiterBox ); | 421 | mRadioOther = new QRadioButton( i18n( "Other" ), mDelimiterBox ); |
413 | delimiterLayout->addWidget( mRadioOther, 0, 2 ); | 422 | delimiterLayout->addWidget( mRadioOther, 0, 2 ); |
414 | 423 | ||
415 | mDelimiterEdit = new QLineEdit( mDelimiterBox ); | 424 | mDelimiterEdit = new QLineEdit( mDelimiterBox ); |
416 | delimiterLayout->addWidget( mDelimiterEdit, 1, 2 ); | 425 | delimiterLayout->addWidget( mDelimiterEdit, 1, 2 ); |
417 | 426 | ||
418 | mComboLine = new QComboBox( false, page ); | 427 | mComboLine = new QComboBox( false, page ); |
419 | mComboLine->insertItem( i18n( "1" ) ); | 428 | mComboLine->insertItem( i18n( "1" ) ); |
420 | layout->addWidget( mComboLine, 3, 1 ); | 429 | layout->addWidget( mComboLine, 3, 1 ); |
421 | 430 | ||
422 | mComboQuote = new QComboBox( false, page ); | 431 | mComboQuote = new QComboBox( false, page ); |
423 | mComboQuote->insertItem( i18n( "\"" ), 0 ); | 432 | mComboQuote->insertItem( i18n( "\"" ), 0 ); |
424 | mComboQuote->insertItem( i18n( "'" ), 1 ); | 433 | mComboQuote->insertItem( i18n( "'" ), 1 ); |
425 | mComboQuote->insertItem( i18n( "None" ), 2 ); | 434 | mComboQuote->insertItem( i18n( "None" ), 2 ); |
426 | layout->addWidget( mComboQuote, 3, 0 ); | 435 | layout->addWidget( mComboQuote, 3, 0 ); |
427 | 436 | mComboCodec = new QComboBox( false, page ); | |
437 | mComboCodec->insertItem( i18n( "UTF8" ), 0 ); | ||
438 | mComboCodec->insertItem( i18n( "LATIN1" ), 1 ); | ||
439 | mComboCodec->insertItem( i18n( "LOCALE" ), 2 ); | ||
440 | layout->addWidget( mComboCodec, 3, 2 ); | ||
428 | label = new QLabel( i18n( "Start at line:" ), page ); | 441 | label = new QLabel( i18n( "Start at line:" ), page ); |
429 | layout->addWidget( label, 2, 1 ); | 442 | layout->addWidget( label, 2, 1 ); |
430 | 443 | ||
431 | label = new QLabel( i18n( "Textquote:" ), page ); | 444 | label = new QLabel( i18n( "Textquote:" ), page ); |
432 | layout->addWidget( label, 2, 0 ); | 445 | layout->addWidget( label, 2, 0 ); |
446 | label = new QLabel( i18n( "Codec:" ), page ); | ||
447 | layout->addWidget( label, 2, 2 ); | ||
433 | 448 | ||
434 | mIgnoreDuplicates = new QCheckBox( page ); | 449 | mIgnoreDuplicates = new QCheckBox( page ); |
435 | mIgnoreDuplicates->setText( i18n( "Ignore duplicate delimiters" ) ); | 450 | mIgnoreDuplicates->setText( i18n( "Ignore duplicate delimiters" ) ); |
436 | layout->addMultiCellWidget( mIgnoreDuplicates, 4, 4, 0, 1 ); | 451 | layout->addMultiCellWidget( mIgnoreDuplicates, 4, 4, 0, 2 ); |
437 | 452 | ||
438 | mTable = new QTable( 0, 0, page ); | 453 | mTable = new QTable( 0, 0, page ); |
439 | mTable->setSelectionMode( QTable::NoSelection ); | 454 | mTable->setSelectionMode( QTable::NoSelection ); |
440 | //mTable->horizontalHeader()->hide(); | 455 | //mTable->horizontalHeader()->hide(); |
441 | layout->addMultiCellWidget( mTable, 5, 5, 0, 1 ); | 456 | layout->addMultiCellWidget( mTable, 5, 5, 0, 2 ); |
442 | /*US | 457 | /*US |
443 | setButtonText( User1, i18n( "Apply Template" ) ); | 458 | setButtonText( User1, i18n( "Apply Template" ) ); |
444 | setButtonText( User2, i18n( "Save Template" ) ); | 459 | setButtonText( User2, i18n( "Save Template" ) ); |
445 | */ | 460 | */ |
446 | 461 | ||
447 | enableButtonOK( false ); | 462 | enableButtonOK( false ); |
448 | 463 | ||
449 | findButton( User1 )->setEnabled( false ); | 464 | findButton( User1 )->setEnabled( false ); |
450 | findButton( User2 )->setEnabled( false ); | 465 | findButton( User2 )->setEnabled( false ); |
451 | 466 | ||
452 | #ifdef DESKTOP_VERSION | 467 | #ifdef DESKTOP_VERSION |
453 | resize( 500, 300 ); | 468 | resize( 640, 480 ); |
454 | #else | 469 | #else |
455 | showMaximized(); | 470 | showMaximized(); |
456 | #endif | 471 | #endif |
457 | } | 472 | } |
458 | 473 | ||
459 | void CSVImportDialog::fillTable() | 474 | void CSVImportDialog::fillTable() |
460 | { | 475 | { |
461 | int row, column; | 476 | int row, column; |
462 | bool lastCharDelimiter = false; | 477 | bool lastCharDelimiter = false; |
463 | bool ignoreDups = mIgnoreDuplicates->isChecked(); | 478 | bool ignoreDups = mIgnoreDuplicates->isChecked(); |
464 | enum { S_START, S_QUOTED_FIELD, S_MAYBE_END_OF_QUOTED_FIELD, S_END_OF_QUOTED_FIELD, | 479 | enum { S_START, S_QUOTED_FIELD, S_MAYBE_END_OF_QUOTED_FIELD, S_END_OF_QUOTED_FIELD, |
465 | S_MAYBE_NORMAL_FIELD, S_NORMAL_FIELD } state = S_START; | 480 | S_MAYBE_NORMAL_FIELD, S_NORMAL_FIELD } state = S_START; |
466 | 481 | ||
467 | QChar x; | 482 | QChar x; |
468 | QString field = ""; | 483 | QString field = ""; |
469 | 484 | ||
470 | // store previous assignment | 485 | // store previous assignment |
471 | QValueList<int> mTypeOld = mTypeStore; | 486 | QValueList<int> mTypeOld = mTypeStore; |
472 | 487 | ||
473 | mTypeStore.clear(); | 488 | mTypeStore.clear(); |
474 | for ( column = 0; column < mTable->numCols(); ++column ) { | 489 | for ( column = 0; column < mTable->numCols(); ++column ) { |
475 | QComboTableItem *item = static_cast<QComboTableItem*>( mTable->item( 0, column ) ); | 490 | QComboTableItem *item = static_cast<QComboTableItem*>( mTable->item( 0, column ) ); |
476 | 491 | ||
477 | if ( !item || mClearTypeStore ) | 492 | if ( !item || mClearTypeStore ) |
478 | mTypeStore.append( typeToPos( Undefined ) ); | 493 | mTypeStore.append( typeToPos( Undefined ) ); |
479 | else if ( item ) | 494 | else if ( item ) |
480 | mTypeStore.append( item->currentItem() ); | 495 | mTypeStore.append( item->currentItem() ); |
481 | } | 496 | } |
482 | 497 | ||
483 | clearTable(); | 498 | clearTable(); |
484 | 499 | ||
485 | row = column = 1; | 500 | row = column = 1; |
486 | mData = QString( mFileArray ); | 501 | if ( mComboCodec->currentItem () == 0 ) { |
502 | mData = QString::fromUtf8( mFileArray.data() ); | ||
503 | } else if ( mComboCodec->currentItem () == 1 ) { | ||
504 | mData = QString::fromLatin1( mFileArray.data() ); | ||
505 | } else { | ||
506 | mData = QString::fromLocal8Bit( mFileArray.data() ); | ||
507 | } | ||
487 | 508 | ||
488 | QTextStream inputStream( mData, IO_ReadOnly ); | 509 | QTextStream inputStream( mData, IO_ReadOnly ); |
510 | |||
511 | if ( mComboCodec->currentItem () == 0 ) { | ||
512 | inputStream.setEncoding( QTextStream::UnicodeUTF8 ); | ||
513 | } else if ( mComboCodec->currentItem () == 1 ) { | ||
514 | inputStream.setEncoding( QTextStream::Latin1 ); | ||
515 | } else { | ||
489 | inputStream.setEncoding( QTextStream::Locale ); | 516 | inputStream.setEncoding( QTextStream::Locale ); |
517 | } | ||
490 | 518 | ||
491 | int maxColumn = 0; | 519 | int maxColumn = 0; |
492 | while ( !inputStream.atEnd() ) { | 520 | while ( !inputStream.atEnd() ) { |
493 | inputStream >> x; // read one char | 521 | inputStream >> x; // read one char |
494 | 522 | ||
495 | if ( x == '\r' ) inputStream >> x; // eat '\r', to handle DOS/LOSEDOWS files correctly | 523 | if ( x == '\r' ) inputStream >> x; // eat '\r', to handle DOS/LOSEDOWS files correctly |
496 | 524 | ||
497 | switch ( state ) { | 525 | switch ( state ) { |
498 | case S_START : | 526 | case S_START : |
499 | if ( x == mTextQuote ) { | 527 | if ( x == mTextQuote ) { |
500 | state = S_QUOTED_FIELD; | 528 | state = S_QUOTED_FIELD; |
501 | } else if ( x == mDelimiter ) { | 529 | } else if ( x == mDelimiter ) { |
502 | if ( ( ignoreDups == false ) || ( lastCharDelimiter == false ) ) | 530 | if ( ( ignoreDups == false ) || ( lastCharDelimiter == false ) ) |
503 | ++column; | 531 | ++column; |
504 | lastCharDelimiter = true; | 532 | lastCharDelimiter = true; |
505 | } else if ( x == '\n' ) { | 533 | } else if ( x == '\n' ) { |
@@ -595,35 +623,40 @@ void CSVImportDialog::fillTable() | |||
595 | if ( column > maxColumn ) | 623 | if ( column > maxColumn ) |
596 | maxColumn = column; | 624 | maxColumn = column; |
597 | } | 625 | } |
598 | 626 | ||
599 | // file with only one line without '\n' | 627 | // file with only one line without '\n' |
600 | if ( field.length() > 0 ) { | 628 | if ( field.length() > 0 ) { |
601 | setText( row - mStartLine + 1, column, field ); | 629 | setText( row - mStartLine + 1, column, field ); |
602 | ++row; | 630 | ++row; |
603 | field = ""; | 631 | field = ""; |
604 | } | 632 | } |
605 | 633 | ||
606 | adjustRows( row - mStartLine ); | 634 | adjustRows( row - mStartLine ); |
607 | mTable->setNumCols( maxColumn ); | 635 | mTable->setNumCols( maxColumn ); |
608 | 636 | ||
609 | //US begin | 637 | //US begin |
610 | QStringList keys; | 638 | QStringList keys; |
639 | uint iii = 0, count = mTypeMap.count(); | ||
640 | while ( iii < count ) { | ||
641 | keys << "dummy"; | ||
642 | ++iii; | ||
643 | } | ||
611 | QMap<QString, uint>::ConstIterator it; | 644 | QMap<QString, uint>::ConstIterator it; |
612 | for ( it = mTypeMap.begin(); it != mTypeMap.end(); ++it) | 645 | for ( it = mTypeMap.begin(); it != mTypeMap.end(); ++it) |
613 | keys << it.key(); | 646 | keys[( it.data() )] = it.key(); |
614 | //US end | 647 | //US end |
615 | 648 | ||
616 | for ( column = 0; column < mTable->numCols(); ++column ) { | 649 | for ( column = 0; column < mTable->numCols(); ++column ) { |
617 | 650 | ||
618 | //US QComboTableItem *item = new QComboTableItem( mTable, mTypeMap.keys() ); | 651 | //US QComboTableItem *item = new QComboTableItem( mTable, mTypeMap.keys() ); |
619 | QComboTableItem *item = new QComboTableItem( mTable, keys ); | 652 | QComboTableItem *item = new QComboTableItem( mTable, keys ); |
620 | mTable->setItem( 0, column, item ); | 653 | mTable->setItem( 0, column, item ); |
621 | if ( column < mTypeStore.count() ) | 654 | if ( column < mTypeStore.count() ) |
622 | item->setCurrentItem( mTypeStore[ column ] ); | 655 | item->setCurrentItem( mTypeStore[ column ] ); |
623 | else | 656 | else |
624 | item->setCurrentItem( typeToPos( Undefined ) ); | 657 | item->setCurrentItem( typeToPos( Undefined ) ); |
625 | 658 | ||
626 | mTable->adjustColumn( column ); | 659 | mTable->adjustColumn( column ); |
627 | } | 660 | } |
628 | } | 661 | } |
629 | 662 | ||
@@ -669,32 +702,36 @@ void CSVImportDialog::adjustRows( int rows ) | |||
669 | } | 702 | } |
670 | 703 | ||
671 | void CSVImportDialog::returnPressed() | 704 | void CSVImportDialog::returnPressed() |
672 | { | 705 | { |
673 | if ( mDelimiterBox->id( mDelimiterBox->selected() ) != 4 ) | 706 | if ( mDelimiterBox->id( mDelimiterBox->selected() ) != 4 ) |
674 | return; | 707 | return; |
675 | 708 | ||
676 | mDelimiter = mDelimiterEdit->text(); | 709 | mDelimiter = mDelimiterEdit->text(); |
677 | fillTable(); | 710 | fillTable(); |
678 | } | 711 | } |
679 | 712 | ||
680 | void CSVImportDialog::textChanged ( const QString& ) | 713 | void CSVImportDialog::textChanged ( const QString& ) |
681 | { | 714 | { |
682 | mRadioOther->setChecked ( true ); | 715 | mRadioOther->setChecked ( true ); |
683 | delimiterClicked( 4 ); // other | 716 | delimiterClicked( 4 ); // other |
684 | } | 717 | } |
718 | void CSVImportDialog::codecChanged ( const QString& ) | ||
719 | { | ||
720 | fillTable(); | ||
721 | } | ||
685 | 722 | ||
686 | void CSVImportDialog::delimiterClicked( int id ) | 723 | void CSVImportDialog::delimiterClicked( int id ) |
687 | { | 724 | { |
688 | switch ( id ) { | 725 | switch ( id ) { |
689 | case 0: // comma | 726 | case 0: // comma |
690 | mDelimiter = ","; | 727 | mDelimiter = ","; |
691 | break; | 728 | break; |
692 | case 4: // other | 729 | case 4: // other |
693 | mDelimiter = mDelimiterEdit->text(); | 730 | mDelimiter = mDelimiterEdit->text(); |
694 | break; | 731 | break; |
695 | case 2: // tab | 732 | case 2: // tab |
696 | mDelimiter = "\t"; | 733 | mDelimiter = "\t"; |
697 | break; | 734 | break; |
698 | case 3: // space | 735 | case 3: // space |
699 | mDelimiter = " "; | 736 | mDelimiter = " "; |
700 | break; | 737 | break; |
@@ -741,49 +778,49 @@ void CSVImportDialog::slotOk() | |||
741 | 778 | ||
742 | void CSVImportDialog::applyTemplate() | 779 | void CSVImportDialog::applyTemplate() |
743 | { | 780 | { |
744 | QMap<uint,int> columnMap; | 781 | QMap<uint,int> columnMap; |
745 | QMap<QString, QString> fileMap; | 782 | QMap<QString, QString> fileMap; |
746 | QStringList templates; | 783 | QStringList templates; |
747 | 784 | ||
748 | // load all template files | 785 | // load all template files |
749 | /*US QStringList list = KGlobal::dirs()->findAllResources( "data" , QString( kapp->name() ) + | 786 | /*US QStringList list = KGlobal::dirs()->findAllResources( "data" , QString( kapp->name() ) + |
750 | "/csv-templates/*.desktop", true, true ); | 787 | "/csv-templates/*.desktop", true, true ); |
751 | */ | 788 | */ |
752 | QStringList list = KGlobal::dirs()->findAllResources( "data" , KGlobal::getAppName() + | 789 | QStringList list = KGlobal::dirs()->findAllResources( "data" , KGlobal::getAppName() + |
753 | "/csv-templates/*.desktop", true, true ); | 790 | "/csv-templates/*.desktop", true, true ); |
754 | 791 | ||
755 | for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) | 792 | for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) |
756 | { | 793 | { |
757 | qDebug("for "); | 794 | |
758 | //US KSimpleConfig config( *it, true ); | 795 | //US KSimpleConfig config( *it, true ); |
759 | KConfig config( *it ); | 796 | KConfig config( *it ); |
760 | 797 | ||
761 | if ( !config.hasGroup( "csv column map" ) ) | 798 | if ( !config.hasGroup( "csv column map" ) ) |
762 | continue; | 799 | continue; |
763 | 800 | ||
764 | config.setGroup( "Misc" ); | 801 | config.setGroup( "Misc" ); |
765 | templates.append( config.readEntry( "Name" ) ); | 802 | templates.append( config.readEntry( "Name" ) ); |
766 | fileMap.insert( config.readEntry( "Name" ), *it ); | 803 | fileMap.insert( config.readEntry( "Name" ), *it ); |
767 | } | 804 | } |
768 | qDebug("weiter "); | 805 | |
769 | // let the user chose, what to take | 806 | // let the user chose, what to take |
770 | bool ok = false; | 807 | bool ok = false; |
771 | QString tmp; | 808 | QString tmp; |
772 | tmp = QInputDialog::getItem( i18n( "Template Selection" ), | 809 | tmp = QInputDialog::getItem( i18n( "Template Selection" ), |
773 | i18n( "Please select a template, that matches the CSV file." ), | 810 | i18n( "Please select a template\nthat matches the CSV file." ), |
774 | templates, 0, false, &ok, this ); | 811 | templates, 0, false, &ok, this ); |
775 | 812 | ||
776 | if ( !ok ) | 813 | if ( !ok ) |
777 | return; | 814 | return; |
778 | 815 | ||
779 | //US KSimpleConfig config( fileMap[ tmp ], true ); | 816 | //US KSimpleConfig config( fileMap[ tmp ], true ); |
780 | KConfig config( fileMap[ tmp ] ); | 817 | KConfig config( fileMap[ tmp ] ); |
781 | config.setGroup( "General" ); | 818 | config.setGroup( "General" ); |
782 | //US uint numColumns = config.readUnsignedNumEntry( "Columns" ); | 819 | //US uint numColumns = config.readUnsignedNumEntry( "Columns" ); |
783 | uint numColumns = (uint)config.readNumEntry( "Columns" ); | 820 | uint numColumns = (uint)config.readNumEntry( "Columns" ); |
784 | 821 | ||
785 | mDelimiterEdit->setText( config.readEntry( "DelimiterOther" ) ); | 822 | mDelimiterEdit->setText( config.readEntry( "DelimiterOther" ) ); |
786 | mDelimiterBox->setButton( config.readNumEntry( "DelimiterType" ) ); | 823 | mDelimiterBox->setButton( config.readNumEntry( "DelimiterType" ) ); |
787 | delimiterClicked( config.readNumEntry( "DelimiterType" ) ); | 824 | delimiterClicked( config.readNumEntry( "DelimiterType" ) ); |
788 | int quoteType = config.readNumEntry( "QuoteType" ); | 825 | int quoteType = config.readNumEntry( "QuoteType" ); |
789 | mComboQuote->setCurrentItem( quoteType ); | 826 | mComboQuote->setCurrentItem( quoteType ); |
@@ -847,50 +884,56 @@ void CSVImportDialog::saveTemplate() | |||
847 | config.writeEntry( QString::number( column ), posToType( | 884 | config.writeEntry( QString::number( column ), posToType( |
848 | item->currentItem() ) ); | 885 | item->currentItem() ) ); |
849 | else | 886 | else |
850 | config.writeEntry( QString::number( column ), 0 ); | 887 | config.writeEntry( QString::number( column ), 0 ); |
851 | } | 888 | } |
852 | 889 | ||
853 | config.sync(); | 890 | config.sync(); |
854 | } | 891 | } |
855 | 892 | ||
856 | QString CSVImportDialog::getText( int row, int col ) | 893 | QString CSVImportDialog::getText( int row, int col ) |
857 | { | 894 | { |
858 | return mTable->text( row, col ); | 895 | return mTable->text( row, col ); |
859 | } | 896 | } |
860 | 897 | ||
861 | uint CSVImportDialog::posToType( int pos ) const | 898 | uint CSVImportDialog::posToType( int pos ) const |
862 | { | 899 | { |
900 | return pos; | ||
901 | #if 0 | ||
863 | uint counter = 0; | 902 | uint counter = 0; |
864 | QMap<QString, uint>::ConstIterator it; | 903 | QMap<QString, uint>::ConstIterator it; |
865 | for ( it = mTypeMap.begin(); it != mTypeMap.end(); ++it, ++counter ) | 904 | for ( it = mTypeMap.begin(); it != mTypeMap.end(); ++it, ++counter ) |
866 | if ( counter == (uint)pos ) | 905 | if ( counter == (uint)pos ) |
867 | return it.data(); | 906 | return it.data(); |
868 | 907 | ||
869 | return 0; | 908 | return 0; |
909 | #endif | ||
870 | } | 910 | } |
871 | 911 | ||
872 | int CSVImportDialog::typeToPos( uint type ) const | 912 | int CSVImportDialog::typeToPos( uint type ) const |
873 | { | 913 | { |
914 | return type; | ||
915 | #if 0 | ||
874 | uint counter = 0; | 916 | uint counter = 0; |
875 | QMap<QString, uint>::ConstIterator it; | 917 | QMap<QString, uint>::ConstIterator it; |
876 | for ( it = mTypeMap.begin(); it != mTypeMap.end(); ++it, ++counter ) | 918 | for ( it = mTypeMap.begin(); it != mTypeMap.end(); ++it, ++counter ) |
877 | if ( it.data() == type ) | 919 | if ( it.data() == type ) |
878 | return counter; | 920 | return counter; |
879 | 921 | ||
880 | return -1; | 922 | return -1; |
923 | #endif | ||
881 | } | 924 | } |
882 | 925 | ||
883 | void CSVImportDialog::ignoreDuplicatesChanged( int ) | 926 | void CSVImportDialog::ignoreDuplicatesChanged( int ) |
884 | { | 927 | { |
885 | fillTable(); | 928 | fillTable(); |
886 | } | 929 | } |
887 | 930 | ||
888 | void CSVImportDialog::setFile( const QString &fileName ) | 931 | void CSVImportDialog::setFile( const QString &fileName ) |
889 | { | 932 | { |
890 | if ( fileName.isEmpty() ) | 933 | if ( fileName.isEmpty() ) |
891 | return; | 934 | return; |
892 | 935 | ||
893 | QFile file( fileName ); | 936 | QFile file( fileName ); |
894 | if ( !file.open( IO_ReadOnly ) ) { | 937 | if ( !file.open( IO_ReadOnly ) ) { |
895 | KMessageBox::sorry( this, i18n( "Cannot open input file!" ) ); | 938 | KMessageBox::sorry( this, i18n( "Cannot open input file!" ) ); |
896 | file.close(); | 939 | file.close(); |
diff --git a/kaddressbook/xxport/csvimportdialog.h b/kaddressbook/xxport/csvimportdialog.h index 545b5f9..5f55ab2 100644 --- a/kaddressbook/xxport/csvimportdialog.h +++ b/kaddressbook/xxport/csvimportdialog.h | |||
@@ -55,58 +55,60 @@ class CSVImportDialog : public KDialogBase | |||
55 | ~CSVImportDialog(); | 55 | ~CSVImportDialog(); |
56 | 56 | ||
57 | KABC::AddresseeList contacts() const; | 57 | KABC::AddresseeList contacts() const; |
58 | 58 | ||
59 | protected slots: | 59 | protected slots: |
60 | virtual void slotOk(); | 60 | virtual void slotOk(); |
61 | 61 | ||
62 | private slots: | 62 | private slots: |
63 | void returnPressed(); | 63 | void returnPressed(); |
64 | void delimiterClicked( int id ); | 64 | void delimiterClicked( int id ); |
65 | void lineSelected( const QString& line ); | 65 | void lineSelected( const QString& line ); |
66 | void textquoteSelected( const QString& mark ); | 66 | void textquoteSelected( const QString& mark ); |
67 | void textChanged ( const QString & ); | 67 | void textChanged ( const QString & ); |
68 | void ignoreDuplicatesChanged( int ); | 68 | void ignoreDuplicatesChanged( int ); |
69 | void setFile( const QString& ); | 69 | void setFile( const QString& ); |
70 | void urlChanged( const QString& ); | 70 | void urlChanged( const QString& ); |
71 | void codecChanged ( const QString& ); | ||
71 | 72 | ||
72 | void applyTemplate(); | 73 | void applyTemplate(); |
73 | void saveTemplate(); | 74 | void saveTemplate(); |
74 | 75 | ||
75 | private: | 76 | private: |
76 | enum { Undefined, FormattedName, FamilyName, GivenName, AdditionalName, | 77 | enum { Undefined, FormattedName, FamilyName, GivenName, AdditionalName, |
77 | Prefix, Suffix, NickName, Birthday, | 78 | Prefix, Suffix, NickName, Birthday, |
78 | HomeAddressStreet, HomeAddressLocality, HomeAddressRegion, | 79 | HomeAddressStreet, HomeAddressLocality, HomeAddressRegion, |
79 | HomeAddressPostalCode, HomeAddressCountry, HomeAddressLabel, | 80 | HomeAddressPostalCode, HomeAddressCountry, HomeAddressLabel, |
80 | BusinessAddressStreet, BusinessAddressLocality, BusinessAddressRegion, | 81 | BusinessAddressStreet, BusinessAddressLocality, BusinessAddressRegion, |
81 | BusinessAddressPostalCode, BusinessAddressCountry, | 82 | BusinessAddressPostalCode, BusinessAddressCountry, |
82 | BusinessAddressLabel, | 83 | BusinessAddressLabel, |
83 | HomePhone, BusinessPhone, MobilePhone, HomeFax, BusinessFax, CarPhone, | 84 | HomePhone, BusinessPhone, MobilePhone, HomeFax, BusinessFax, CarPhone, |
84 | Isdn, Pager, Email, Mailer, Title, Role, Organization, Note, URL | 85 | Isdn, Pager, Email, Mailer, Title, Role, Organization, Note, URL, Categories |
85 | }; | 86 | }; |
86 | 87 | ||
87 | QTable* mTable; | 88 | QTable* mTable; |
88 | QButtonGroup* mDelimiterBox; | 89 | QButtonGroup* mDelimiterBox; |
89 | QRadioButton* mRadioComma; | 90 | QRadioButton* mRadioComma; |
90 | QRadioButton* mRadioSemicolon; | 91 | QRadioButton* mRadioSemicolon; |
91 | QRadioButton* mRadioTab; | 92 | QRadioButton* mRadioTab; |
92 | QRadioButton* mRadioSpace; | 93 | QRadioButton* mRadioSpace; |
93 | QRadioButton* mRadioOther; | 94 | QRadioButton* mRadioOther; |
94 | QLineEdit* mDelimiterEdit; | 95 | QLineEdit* mDelimiterEdit; |
95 | QComboBox* mComboLine; | 96 | QComboBox* mComboLine; |
96 | QComboBox* mComboQuote; | 97 | QComboBox* mComboQuote; |
98 | QComboBox* mComboCodec; | ||
97 | QCheckBox* mIgnoreDuplicates; | 99 | QCheckBox* mIgnoreDuplicates; |
98 | KURLRequester* mUrlRequester; | 100 | KURLRequester* mUrlRequester; |
99 | 101 | ||
100 | void initGUI(); | 102 | void initGUI(); |
101 | void fillTable(); | 103 | void fillTable(); |
102 | void clearTable(); | 104 | void clearTable(); |
103 | void fillComboBox(); | 105 | void fillComboBox(); |
104 | void setText( int row, int col, const QString& text ); | 106 | void setText( int row, int col, const QString& text ); |
105 | void adjustRows( int rows ); | 107 | void adjustRows( int rows ); |
106 | QString getText( int row, int col ); | 108 | QString getText( int row, int col ); |
107 | uint posToType( int pos ) const; | 109 | uint posToType( int pos ) const; |
108 | int typeToPos( uint type ) const; | 110 | int typeToPos( uint type ) const; |
109 | 111 | ||
110 | bool mAdjustRows; | 112 | bool mAdjustRows; |
111 | int mStartLine; | 113 | int mStartLine; |
112 | QChar mTextQuote; | 114 | QChar mTextQuote; |
diff --git a/microkde/kfiledialog.cpp b/microkde/kfiledialog.cpp index 3f47425..6be1580 100644 --- a/microkde/kfiledialog.cpp +++ b/microkde/kfiledialog.cpp | |||
@@ -13,32 +13,35 @@ QString KFileDialog::getSaveFileName( const QString & fn, | |||
13 | { | 13 | { |
14 | QString retfile = ""; | 14 | QString retfile = ""; |
15 | QDialog dia ( par, "input-dialog", true ); | 15 | QDialog dia ( par, "input-dialog", true ); |
16 | QVBoxLayout lay( &dia ); | 16 | QVBoxLayout lay( &dia ); |
17 | lay.setMargin(7); | 17 | lay.setMargin(7); |
18 | lay.setSpacing(7); | 18 | lay.setSpacing(7); |
19 | QString file = fn; | 19 | QString file = fn; |
20 | if ( file.isEmpty() ) | 20 | if ( file.isEmpty() ) |
21 | file = QDir::homeDirPath()+"/*"; | 21 | file = QDir::homeDirPath()+"/*"; |
22 | QFileInfo fi ( file ); | 22 | QFileInfo fi ( file ); |
23 | OFileSelector o ( &dia,OFileSelector::FileSelector, OFileSelector::Save, fi.dirPath(true), fi.fileName() ); | 23 | OFileSelector o ( &dia,OFileSelector::FileSelector, OFileSelector::Save, fi.dirPath(true), fi.fileName() ); |
24 | QObject::connect ( &o, SIGNAL( ok() ), &dia, SLOT ( accept () ) ); | 24 | QObject::connect ( &o, SIGNAL( ok() ), &dia, SLOT ( accept () ) ); |
25 | lay.addWidget( &o); | 25 | lay.addWidget( &o); |
26 | // o.setNewVisible( true ); | 26 | // o.setNewVisible( true ); |
27 | // o.setNameVisible( true ); | 27 | // o.setNameVisible( true ); |
28 | dia.showMaximized(); | 28 | dia.showMaximized(); |
29 | if ( cap.isEmpty() ) | ||
30 | dia.setCaption( file ); | ||
31 | else | ||
29 | dia.setCaption( cap ); | 32 | dia.setCaption( cap ); |
30 | int res = dia.exec(); | 33 | int res = dia.exec(); |
31 | if ( res ) | 34 | if ( res ) |
32 | retfile = o.selectedName(); | 35 | retfile = o.selectedName(); |
33 | return retfile; | 36 | return retfile; |
34 | } | 37 | } |
35 | 38 | ||
36 | QString KFileDialog::getOpenFileName( const QString & fn, | 39 | QString KFileDialog::getOpenFileName( const QString & fn, |
37 | const QString & cap, QWidget * par ) | 40 | const QString & cap, QWidget * par ) |
38 | { | 41 | { |
39 | QString retfile = ""; | 42 | QString retfile = ""; |
40 | QDialog dia ( par, "input-dialog", true ); | 43 | QDialog dia ( par, "input-dialog", true ); |
41 | // QLineEdit lab ( &dia ); | 44 | // QLineEdit lab ( &dia ); |
42 | QVBoxLayout lay( &dia ); | 45 | QVBoxLayout lay( &dia ); |
43 | lay.setMargin(7); | 46 | lay.setMargin(7); |
44 | lay.setSpacing(7); | 47 | lay.setSpacing(7); |
diff --git a/microkde/kio/kfile/kurlrequester.cpp b/microkde/kio/kfile/kurlrequester.cpp index 6d39308..991c8be 100644 --- a/microkde/kio/kfile/kurlrequester.cpp +++ b/microkde/kio/kfile/kurlrequester.cpp | |||
@@ -259,33 +259,33 @@ void KURLRequester::setCaption( const QString& caption ) | |||
259 | } | 259 | } |
260 | 260 | ||
261 | QString KURLRequester::url() const | 261 | QString KURLRequester::url() const |
262 | { | 262 | { |
263 | return d->url(); | 263 | return d->url(); |
264 | } | 264 | } |
265 | 265 | ||
266 | 266 | ||
267 | void KURLRequester::slotOpenDialog() | 267 | void KURLRequester::slotOpenDialog() |
268 | { | 268 | { |
269 | emit openFileDialog( this ); | 269 | emit openFileDialog( this ); |
270 | 270 | ||
271 | //US use our special KFIleDialog instead | 271 | //US use our special KFIleDialog instead |
272 | KURL u( url() ); | 272 | KURL u( url() ); |
273 | //QString fn = u.url(); | 273 | //QString fn = u.url(); |
274 | QString fn = d->edit->text(); | 274 | QString fn = d->edit->text(); |
275 | fn = KFileDialog::getSaveFileName( fn, "Save backup filename", this ); | 275 | fn = KFileDialog::getSaveFileName( fn, "", this ); |
276 | 276 | ||
277 | if ( fn == "" ) | 277 | if ( fn == "" ) |
278 | return; | 278 | return; |
279 | 279 | ||
280 | setURL( fn ); | 280 | setURL( fn ); |
281 | emit urlSelected( d->url() ); | 281 | emit urlSelected( d->url() ); |
282 | /*US | 282 | /*US |
283 | KFileDialog *dlg = fileDialog(); | 283 | KFileDialog *dlg = fileDialog(); |
284 | if ( !d->url().isEmpty() ) { | 284 | if ( !d->url().isEmpty() ) { |
285 | KURL u( url() ); | 285 | KURL u( url() ); |
286 | // If we won't be able to list it (e.g. http), then don't try :) | 286 | // If we won't be able to list it (e.g. http), then don't try :) |
287 | if ( KProtocolInfo::supportsListing( u.protocol() ) ) | 287 | if ( KProtocolInfo::supportsListing( u.protocol() ) ) |
288 | dlg->setSelection( u.url() ); | 288 | dlg->setSelection( u.url() ); |
289 | } | 289 | } |
290 | 290 | ||
291 | if ( dlg->exec() == QDialog::Accepted ) | 291 | if ( dlg->exec() == QDialog::Accepted ) |