-rw-r--r-- | kaddressbook/xxport/csvimportdialog.cpp | 4 | ||||
-rw-r--r-- | microkde/kresources/configpage.cpp | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp index 1093f9c..cc55a24 100644 --- a/kaddressbook/xxport/csvimportdialog.cpp +++ b/kaddressbook/xxport/csvimportdialog.cpp | |||
@@ -1,81 +1,85 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of KAddressBook. | 2 | This file is part of KAddressBook. |
3 | Copyright (C) 2003 Tobias Koenig <tokoe@kde.org> | 3 | Copyright (C) 2003 Tobias Koenig <tokoe@kde.org> |
4 | based on the code of KSpread's CSV Import Dialog | 4 | based on the code of KSpread's CSV Import Dialog |
5 | 5 | ||
6 | This library is free software; you can redistribute it and/or | 6 | This library is free software; you can redistribute it and/or |
7 | modify it under the terms of the GNU Library General Public | 7 | modify it under the terms of the GNU Library General Public |
8 | License as published by the Free Software Foundation; either | 8 | License as published by the Free Software Foundation; either |
9 | version 2 of the License, or (at your option) any later version. | 9 | version 2 of the License, or (at your option) any later version. |
10 | 10 | ||
11 | This library is distributed in the hope that it will be useful, | 11 | This library is distributed in the hope that it will be useful, |
12 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 12 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
13 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 13 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
14 | Library General Public License for more details. | 14 | Library General Public License for more details. |
15 | 15 | ||
16 | You should have received a copy of the GNU Library General Public License | 16 | You should have received a copy of the GNU Library General Public License |
17 | along with this library; see the file COPYING.LIB. If not, write to | 17 | along with this library; see the file COPYING.LIB. If not, write to |
18 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 18 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
19 | Boston, MA 02111-1307, USA. | 19 | Boston, MA 02111-1307, USA. |
20 | */ | 20 | */ |
21 | 21 | ||
22 | /* | 22 | /* |
23 | Enhanced Version of the file for platform independent KDE tools. | 23 | Enhanced Version of the file for platform independent KDE tools. |
24 | Copyright (c) 2004 Ulf Schenk | 24 | Copyright (c) 2004 Ulf Schenk |
25 | 25 | ||
26 | $Id$ | 26 | $Id$ |
27 | */ | 27 | */ |
28 | 28 | ||
29 | 29 | ||
30 | #include <qbuttongroup.h> | 30 | #include <qbuttongroup.h> |
31 | #include <qcheckbox.h> | 31 | #include <qcheckbox.h> |
32 | #include <qcombobox.h> | 32 | #include <qcombobox.h> |
33 | #ifdef DESKTOP_VERSION | ||
33 | #include <qinputdialog.h> | 34 | #include <qinputdialog.h> |
35 | #else | ||
36 | #include <qtcompat/qinputdialog.h> | ||
37 | #endif | ||
34 | #include <qlabel.h> | 38 | #include <qlabel.h> |
35 | #include <qlineedit.h> | 39 | #include <qlineedit.h> |
36 | #include <qpushbutton.h> | 40 | #include <qpushbutton.h> |
37 | #include <qradiobutton.h> | 41 | #include <qradiobutton.h> |
38 | #include <qtable.h> | 42 | #include <qtable.h> |
39 | #include <qlayout.h> | 43 | #include <qlayout.h> |
40 | #include <qtextstream.h> | 44 | #include <qtextstream.h> |
41 | #include <qfile.h> | 45 | #include <qfile.h> |
42 | 46 | ||
43 | #include <kapplication.h> | 47 | #include <kapplication.h> |
44 | #include <kdebug.h> | 48 | #include <kdebug.h> |
45 | #include <kdialogbase.h> | 49 | #include <kdialogbase.h> |
46 | #include <kfiledialog.h> | 50 | #include <kfiledialog.h> |
47 | #include <klineedit.h> | 51 | #include <klineedit.h> |
48 | #include <klocale.h> | 52 | #include <klocale.h> |
49 | #include <kglobal.h> | 53 | #include <kglobal.h> |
50 | #include <kmessagebox.h> | 54 | #include <kmessagebox.h> |
51 | #include <kstandarddirs.h> | 55 | #include <kstandarddirs.h> |
52 | #include <kurlrequester.h> | 56 | #include <kurlrequester.h> |
53 | 57 | ||
54 | #ifdef DESKTOP_VERSION | 58 | #ifdef DESKTOP_VERSION |
55 | #include "qtable.h" | 59 | #include "qtable.h" |
56 | #else | 60 | #else |
57 | #include "qcombotableitem.h" | 61 | #include "qcombotableitem.h" |
58 | #endif | 62 | #endif |
59 | #include "csvimportdialog.h" | 63 | #include "csvimportdialog.h" |
60 | 64 | ||
61 | CSVImportDialog::CSVImportDialog( KABC::AddressBook *ab, QWidget *parent, | 65 | CSVImportDialog::CSVImportDialog( KABC::AddressBook *ab, QWidget *parent, |
62 | const char * name ) | 66 | const char * name ) |
63 | : KDialogBase( Plain, i18n ( "CSV Import Dialog" ), Ok | Cancel | User1 | | 67 | : KDialogBase( Plain, i18n ( "CSV Import Dialog" ), Ok | Cancel | User1 | |
64 | User2, Ok, parent, name, true, true ), | 68 | User2, Ok, parent, name, true, true ), |
65 | mAdjustRows( false ), | 69 | mAdjustRows( false ), |
66 | mStartLine( 0 ), | 70 | mStartLine( 0 ), |
67 | mTextQuote( '"' ), | 71 | mTextQuote( '"' ), |
68 | mDelimiter( "," ), | 72 | mDelimiter( "," ), |
69 | mAddressBook( ab ) | 73 | mAddressBook( ab ) |
70 | { | 74 | { |
71 | initGUI(); | 75 | initGUI(); |
72 | 76 | ||
73 | mTypeMap.insert( i18n( "Undefined" ), Undefined ); | 77 | mTypeMap.insert( i18n( "Undefined" ), Undefined ); |
74 | mTypeMap.insert( KABC::Addressee::formattedNameLabel(), FormattedName ); | 78 | mTypeMap.insert( KABC::Addressee::formattedNameLabel(), FormattedName ); |
75 | mTypeMap.insert( KABC::Addressee::familyNameLabel(), FamilyName ); | 79 | mTypeMap.insert( KABC::Addressee::familyNameLabel(), FamilyName ); |
76 | mTypeMap.insert( KABC::Addressee::givenNameLabel(), GivenName ); | 80 | mTypeMap.insert( KABC::Addressee::givenNameLabel(), GivenName ); |
77 | mTypeMap.insert( KABC::Addressee::additionalNameLabel(), AdditionalName ); | 81 | mTypeMap.insert( KABC::Addressee::additionalNameLabel(), AdditionalName ); |
78 | mTypeMap.insert( KABC::Addressee::prefixLabel(), Prefix ); | 82 | mTypeMap.insert( KABC::Addressee::prefixLabel(), Prefix ); |
79 | mTypeMap.insert( KABC::Addressee::suffixLabel(), Suffix ); | 83 | mTypeMap.insert( KABC::Addressee::suffixLabel(), Suffix ); |
80 | mTypeMap.insert( KABC::Addressee::nickNameLabel(), NickName ); | 84 | mTypeMap.insert( KABC::Addressee::nickNameLabel(), NickName ); |
81 | mTypeMap.insert( KABC::Addressee::birthdayLabel(), Birthday ); | 85 | mTypeMap.insert( KABC::Addressee::birthdayLabel(), Birthday ); |
diff --git a/microkde/kresources/configpage.cpp b/microkde/kresources/configpage.cpp index 011e47e..fc7a42e 100644 --- a/microkde/kresources/configpage.cpp +++ b/microkde/kresources/configpage.cpp | |||
@@ -1,83 +1,87 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of libkresources. | 2 | This file is part of libkresources. |
3 | 3 | ||
4 | Copyright (c) 2002 Tobias Koenig <tokoe@kde.org> | 4 | Copyright (c) 2002 Tobias Koenig <tokoe@kde.org> |
5 | Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org> | 5 | Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org> |
6 | Copyright (c) 2003 Cornelius Schumacher <schumacher@kde.org> | 6 | Copyright (c) 2003 Cornelius Schumacher <schumacher@kde.org> |
7 | 7 | ||
8 | This library is free software; you can redistribute it and/or | 8 | This library is free software; you can redistribute it and/or |
9 | modify it under the terms of the GNU Library General Public | 9 | modify it under the terms of the GNU Library General Public |
10 | License as published by the Free Software Foundation; either | 10 | License as published by the Free Software Foundation; either |
11 | version 2 of the License, or (at your option) any later version. | 11 | version 2 of the License, or (at your option) any later version. |
12 | 12 | ||
13 | This library is distributed in the hope that it will be useful, | 13 | This library is distributed in the hope that it will be useful, |
14 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 14 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
15 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 15 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
16 | Library General Public License for more details. | 16 | Library General Public License for more details. |
17 | 17 | ||
18 | You should have received a copy of the GNU Library General Public License | 18 | You should have received a copy of the GNU Library General Public License |
19 | along with this library; see the file COPYING.LIB. If not, write to | 19 | along with this library; see the file COPYING.LIB. If not, write to |
20 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 20 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
21 | Boston, MA 02111-1307, USA. | 21 | Boston, MA 02111-1307, USA. |
22 | */ | 22 | */ |
23 | 23 | ||
24 | /* | 24 | /* |
25 | Enhanced Version of the file for platform independent KDE tools. | 25 | Enhanced Version of the file for platform independent KDE tools. |
26 | Copyright (c) 2004 Ulf Schenk | 26 | Copyright (c) 2004 Ulf Schenk |
27 | 27 | ||
28 | $Id$ | 28 | $Id$ |
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include <qgroupbox.h> | 31 | #include <qgroupbox.h> |
32 | |||
33 | #ifdef DESKTOP_VERSION | ||
32 | #include <qinputdialog.h> | 34 | #include <qinputdialog.h> |
35 | #else | ||
36 | #include <qtcompat/qinputdialog.h> | ||
37 | #endif | ||
33 | #include <qlabel.h> | 38 | #include <qlabel.h> |
34 | #include <qlayout.h> | 39 | #include <qlayout.h> |
35 | |||
36 | #include <kapplication.h> | 40 | #include <kapplication.h> |
37 | #include <kcombobox.h> | 41 | #include <kcombobox.h> |
38 | #include <kdebug.h> | 42 | #include <kdebug.h> |
39 | #include <klocale.h> | 43 | #include <klocale.h> |
40 | #include <kmessagebox.h> | 44 | #include <kmessagebox.h> |
41 | #include <ksimpleconfig.h> | 45 | #include <ksimpleconfig.h> |
42 | #include <kstandarddirs.h> | 46 | #include <kstandarddirs.h> |
43 | #include <kurlrequester.h> | 47 | #include <kurlrequester.h> |
44 | #include <klistview.h> | 48 | #include <klistview.h> |
45 | #include <kbuttonbox.h> | 49 | #include <kbuttonbox.h> |
46 | //US #include <ktrader.h> | 50 | //US #include <ktrader.h> |
47 | 51 | ||
48 | #include "resource.h" | 52 | #include "resource.h" |
49 | #include "configdialog.h" | 53 | #include "configdialog.h" |
50 | 54 | ||
51 | #include "configpage.h" | 55 | #include "configpage.h" |
52 | 56 | ||
53 | //US | 57 | //US |
54 | #include <qpushbutton.h> | 58 | #include <qpushbutton.h> |
55 | #include <qfile.h> | 59 | #include <qfile.h> |
56 | #include <kglobal.h> | 60 | #include <kglobal.h> |
57 | 61 | ||
58 | using namespace KRES; | 62 | using namespace KRES; |
59 | 63 | ||
60 | class ConfigViewItem : public QCheckListItem | 64 | class ConfigViewItem : public QCheckListItem |
61 | { | 65 | { |
62 | public: | 66 | public: |
63 | ConfigViewItem( QListView *parent, Resource* resource ) : | 67 | ConfigViewItem( QListView *parent, Resource* resource ) : |
64 | QCheckListItem( parent, resource->resourceName(), CheckBox ), | 68 | QCheckListItem( parent, resource->resourceName(), CheckBox ), |
65 | mResource( resource ), | 69 | mResource( resource ), |
66 | mIsStandard( false ) | 70 | mIsStandard( false ) |
67 | { | 71 | { |
68 | setText( 1, mResource->type() ); | 72 | setText( 1, mResource->type() ); |
69 | setOn( mResource->isActive() ); | 73 | setOn( mResource->isActive() ); |
70 | } | 74 | } |
71 | 75 | ||
72 | void setStandard( bool value ) | 76 | void setStandard( bool value ) |
73 | { | 77 | { |
74 | setText( 2, ( value ? i18n( "Yes" ) : QString::null ) ); | 78 | setText( 2, ( value ? i18n( "Yes" ) : QString::null ) ); |
75 | mIsStandard = value; | 79 | mIsStandard = value; |
76 | } | 80 | } |
77 | 81 | ||
78 | bool standard() const { return mIsStandard; } | 82 | bool standard() const { return mIsStandard; } |
79 | bool readOnly() const { return mResource->readOnly(); } | 83 | bool readOnly() const { return mResource->readOnly(); } |
80 | 84 | ||
81 | Resource *resource() { return mResource; } | 85 | Resource *resource() { return mResource; } |
82 | 86 | ||
83 | private: | 87 | private: |