author | zautrix <zautrix> | 2004-07-07 03:28:52 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-07-07 03:28:52 (UTC) |
commit | 816db8f76a1fd8b5cc586dfd5ebf8d6298221801 (patch) (unidiff) | |
tree | e418207a02e60c0807e75731a19c44a58d0fb896 /kaddressbook | |
parent | 3db5c4e190d1031f2471516f8a52114f06d1a3eb (diff) | |
download | kdepimpi-816db8f76a1fd8b5cc586dfd5ebf8d6298221801.zip kdepimpi-816db8f76a1fd8b5cc586dfd5ebf8d6298221801.tar.gz kdepimpi-816db8f76a1fd8b5cc586dfd5ebf8d6298221801.tar.bz2 |
Changed some strings. Removed some kdebug
-rw-r--r-- | kaddressbook/kabcore.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 3ae23e8..a0fec91 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -38,193 +38,193 @@ | |||
38 | #include <kabc/errorhandler.h> | 38 | #include <kabc/errorhandler.h> |
39 | #include <kabc/resource.h> | 39 | #include <kabc/resource.h> |
40 | #include <kabc/vcardconverter.h> | 40 | #include <kabc/vcardconverter.h> |
41 | #include <kapplication.h> | 41 | #include <kapplication.h> |
42 | #include <kactionclasses.h> | 42 | #include <kactionclasses.h> |
43 | #include <kcmultidialog.h> | 43 | #include <kcmultidialog.h> |
44 | #include <kdebug.h> | 44 | #include <kdebug.h> |
45 | #include <kdeversion.h> | 45 | #include <kdeversion.h> |
46 | #include <kkeydialog.h> | 46 | #include <kkeydialog.h> |
47 | #include <kmessagebox.h> | 47 | #include <kmessagebox.h> |
48 | #include <kprinter.h> | 48 | #include <kprinter.h> |
49 | #include <kprotocolinfo.h> | 49 | #include <kprotocolinfo.h> |
50 | #include <kresources/selectdialog.h> | 50 | #include <kresources/selectdialog.h> |
51 | #include <kstandarddirs.h> | 51 | #include <kstandarddirs.h> |
52 | #include <ktempfile.h> | 52 | #include <ktempfile.h> |
53 | #include <kxmlguiclient.h> | 53 | #include <kxmlguiclient.h> |
54 | #include <kaboutdata.h> | 54 | #include <kaboutdata.h> |
55 | #include <libkdepim/categoryselectdialog.h> | 55 | #include <libkdepim/categoryselectdialog.h> |
56 | 56 | ||
57 | #include "addresseeutil.h" | 57 | #include "addresseeutil.h" |
58 | #include "addresseeeditordialog.h" | 58 | #include "addresseeeditordialog.h" |
59 | #include "extensionmanager.h" | 59 | #include "extensionmanager.h" |
60 | #include "kstdaction.h" | 60 | #include "kstdaction.h" |
61 | #include "kaddressbookservice.h" | 61 | #include "kaddressbookservice.h" |
62 | #include "ldapsearchdialog.h" | 62 | #include "ldapsearchdialog.h" |
63 | #include "printing/printingwizard.h" | 63 | #include "printing/printingwizard.h" |
64 | #else // KAB_EMBEDDED | 64 | #else // KAB_EMBEDDED |
65 | 65 | ||
66 | #include <kapplication.h> | 66 | #include <kapplication.h> |
67 | #include "KDGanttMinimizeSplitter.h" | 67 | #include "KDGanttMinimizeSplitter.h" |
68 | #include "kaddressbookmain.h" | 68 | #include "kaddressbookmain.h" |
69 | #include "kactioncollection.h" | 69 | #include "kactioncollection.h" |
70 | #include <qapp.h> | 70 | #include <qapp.h> |
71 | #include <qmenubar.h> | 71 | #include <qmenubar.h> |
72 | //#include <qtoolbar.h> | 72 | //#include <qtoolbar.h> |
73 | #include <qmessagebox.h> | 73 | #include <qmessagebox.h> |
74 | #include <kdebug.h> | 74 | #include <kdebug.h> |
75 | #include <kiconloader.h> // needed for SmallIcon | 75 | #include <kiconloader.h> // needed for SmallIcon |
76 | #include <kresources/kcmkresources.h> | 76 | #include <kresources/kcmkresources.h> |
77 | #include <ktoolbar.h> | 77 | #include <ktoolbar.h> |
78 | 78 | ||
79 | #include <kcmkabconfig.h> | 79 | #include <kcmkabconfig.h> |
80 | 80 | ||
81 | //US#include <qpe/resource.h> // needed for Resource::loadPixmap | 81 | //US#include <qpe/resource.h> // needed for Resource::loadPixmap |
82 | //#include <qlabel.h> | 82 | //#include <qlabel.h> |
83 | #endif // KAB_EMBEDDED | 83 | #endif // KAB_EMBEDDED |
84 | #include <kcmkabconfig.h> | 84 | #include <kcmkabconfig.h> |
85 | 85 | ||
86 | 86 | ||
87 | #include <kresources/selectdialog.h> | 87 | #include <kresources/selectdialog.h> |
88 | #include <kmessagebox.h> | 88 | #include <kmessagebox.h> |
89 | 89 | ||
90 | #include <picture.h> | 90 | #include <picture.h> |
91 | #include <resource.h> | 91 | #include <resource.h> |
92 | 92 | ||
93 | //US#include <qsplitter.h> | 93 | //US#include <qsplitter.h> |
94 | #include <qvbox.h> | 94 | #include <qvbox.h> |
95 | #include <qlayout.h> | 95 | #include <qlayout.h> |
96 | #include <qclipboard.h> | 96 | #include <qclipboard.h> |
97 | 97 | ||
98 | #include <libkdepim/categoryselectdialog.h> | 98 | #include <libkdepim/categoryselectdialog.h> |
99 | 99 | ||
100 | #include "addresseeutil.h" | 100 | #include "addresseeutil.h" |
101 | #include "undocmds.h" | 101 | #include "undocmds.h" |
102 | #include "addresseeeditordialog.h" | 102 | #include "addresseeeditordialog.h" |
103 | #include "viewmanager.h" | 103 | #include "viewmanager.h" |
104 | #include "details/detailsviewcontainer.h" | 104 | #include "details/detailsviewcontainer.h" |
105 | #include "kabprefs.h" | 105 | #include "kabprefs.h" |
106 | #include "xxportmanager.h" | 106 | #include "xxportmanager.h" |
107 | #include "incsearchwidget.h" | 107 | #include "incsearchwidget.h" |
108 | #include "jumpbuttonbar.h" | 108 | #include "jumpbuttonbar.h" |
109 | #include "extensionmanager.h" | 109 | #include "extensionmanager.h" |
110 | #include "addresseeconfig.h" | 110 | #include "addresseeconfig.h" |
111 | #include <kcmultidialog.h> | 111 | #include <kcmultidialog.h> |
112 | 112 | ||
113 | 113 | ||
114 | #ifdef KAB_EMBEDDED | 114 | #ifdef KAB_EMBEDDED |
115 | KABCore::KABCore( KAddressBookMain *client, bool readWrite, QWidget *parent, const char *name ) | 115 | KABCore::KABCore( KAddressBookMain *client, bool readWrite, QWidget *parent, const char *name ) |
116 | : QWidget( parent, name ), mGUIClient( client ), mViewManager( 0 ), | 116 | : QWidget( parent, name ), mGUIClient( client ), mViewManager( 0 ), |
117 | mExtensionManager( 0 ),mConfigureDialog( 0 ),/*US mLdapSearchDialog( 0 ),*/ | 117 | mExtensionManager( 0 ),mConfigureDialog( 0 ),/*US mLdapSearchDialog( 0 ),*/ |
118 | mReadWrite( readWrite ), mModified( false ), mMainWindow(client) | 118 | mReadWrite( readWrite ), mModified( false ), mMainWindow(client) |
119 | #else //KAB_EMBEDDED | 119 | #else //KAB_EMBEDDED |
120 | KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const char *name ) | 120 | KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const char *name ) |
121 | : QWidget( parent, name ), mGUIClient( client ), mViewManager( 0 ), | 121 | : QWidget( parent, name ), mGUIClient( client ), mViewManager( 0 ), |
122 | mExtensionManager( 0 ), mConfigureDialog( 0 ), mLdapSearchDialog( 0 ), | 122 | mExtensionManager( 0 ), mConfigureDialog( 0 ), mLdapSearchDialog( 0 ), |
123 | mReadWrite( readWrite ), mModified( false ) | 123 | mReadWrite( readWrite ), mModified( false ) |
124 | #endif //KAB_EMBEDDED | 124 | #endif //KAB_EMBEDDED |
125 | { | 125 | { |
126 | #ifdef KAB_EMBEDDED | 126 | #ifdef KAB_EMBEDDED |
127 | //US we define here our own global actioncollection. | 127 | //US we define here our own global actioncollection. |
128 | //mActionCollection = new KActionCollection(this); | 128 | //mActionCollection = new KActionCollection(this); |
129 | #endif //KAB_EMBEDDED | 129 | #endif //KAB_EMBEDDED |
130 | mExtensionBarSplitter = 0; | 130 | mExtensionBarSplitter = 0; |
131 | mIsPart = !parent->inherits( "KAddressBookMain" ); | 131 | mIsPart = !parent->inherits( "KAddressBookMain" ); |
132 | 132 | ||
133 | mAddressBook = KABC::StdAddressBook::self(); | 133 | mAddressBook = KABC::StdAddressBook::self(); |
134 | KABC::StdAddressBook::setAutomaticSave( true ); | 134 | KABC::StdAddressBook::setAutomaticSave( false ); |
135 | 135 | ||
136 | #ifndef KAB_EMBEDDED | 136 | #ifndef KAB_EMBEDDED |
137 | mAddressBook->setErrorHandler( new KABC::GUIErrorHandler ); | 137 | mAddressBook->setErrorHandler( new KABC::GUIErrorHandler ); |
138 | #endif //KAB_EMBEDDED | 138 | #endif //KAB_EMBEDDED |
139 | 139 | ||
140 | connect( mAddressBook, SIGNAL( addressBookChanged( AddressBook * ) ), | 140 | connect( mAddressBook, SIGNAL( addressBookChanged( AddressBook * ) ), |
141 | SLOT( addressBookChanged() ) ); | 141 | SLOT( addressBookChanged() ) ); |
142 | 142 | ||
143 | mAddressBook->addCustomField( i18n( "Department" ), KABC::Field::Organization, | 143 | mAddressBook->addCustomField( i18n( "Department" ), KABC::Field::Organization, |
144 | "X-Department", "KADDRESSBOOK" ); | 144 | "X-Department", "KADDRESSBOOK" ); |
145 | mAddressBook->addCustomField( i18n( "Profession" ), KABC::Field::Organization, | 145 | mAddressBook->addCustomField( i18n( "Profession" ), KABC::Field::Organization, |
146 | "X-Profession", "KADDRESSBOOK" ); | 146 | "X-Profession", "KADDRESSBOOK" ); |
147 | mAddressBook->addCustomField( i18n( "Assistant's Name" ), KABC::Field::Organization, | 147 | mAddressBook->addCustomField( i18n( "Assistant's Name" ), KABC::Field::Organization, |
148 | "X-AssistantsName", "KADDRESSBOOK" ); | 148 | "X-AssistantsName", "KADDRESSBOOK" ); |
149 | mAddressBook->addCustomField( i18n( "Manager's Name" ), KABC::Field::Organization, | 149 | mAddressBook->addCustomField( i18n( "Manager's Name" ), KABC::Field::Organization, |
150 | "X-ManagersName", "KADDRESSBOOK" ); | 150 | "X-ManagersName", "KADDRESSBOOK" ); |
151 | mAddressBook->addCustomField( i18n( "Spouse's Name" ), KABC::Field::Personal, | 151 | mAddressBook->addCustomField( i18n( "Spouse's Name" ), KABC::Field::Personal, |
152 | "X-SpousesName", "KADDRESSBOOK" ); | 152 | "X-SpousesName", "KADDRESSBOOK" ); |
153 | mAddressBook->addCustomField( i18n( "Office" ), KABC::Field::Personal, | 153 | mAddressBook->addCustomField( i18n( "Office" ), KABC::Field::Personal, |
154 | "X-Office", "KADDRESSBOOK" ); | 154 | "X-Office", "KADDRESSBOOK" ); |
155 | mAddressBook->addCustomField( i18n( "IM Address" ), KABC::Field::Personal, | 155 | mAddressBook->addCustomField( i18n( "IM Address" ), KABC::Field::Personal, |
156 | "X-IMAddress", "KADDRESSBOOK" ); | 156 | "X-IMAddress", "KADDRESSBOOK" ); |
157 | mAddressBook->addCustomField( i18n( "Anniversary" ), KABC::Field::Personal, | 157 | mAddressBook->addCustomField( i18n( "Anniversary" ), KABC::Field::Personal, |
158 | "X-Anniversary", "KADDRESSBOOK" ); | 158 | "X-Anniversary", "KADDRESSBOOK" ); |
159 | 159 | ||
160 | //US added this field to become compatible with Opie addressbook | 160 | //US added this field to become compatible with Opie addressbook |
161 | mAddressBook->addCustomField( i18n( "Gender" ), KABC::Field::Personal, | 161 | mAddressBook->addCustomField( i18n( "Gender" ), KABC::Field::Personal, |
162 | "X-Gender", "KADDRESSBOOK" ); | 162 | "X-Gender", "KADDRESSBOOK" ); |
163 | mAddressBook->addCustomField( i18n( "Children" ), KABC::Field::Personal, | 163 | mAddressBook->addCustomField( i18n( "Children" ), KABC::Field::Personal, |
164 | "X-Children", "KADDRESSBOOK" ); | 164 | "X-Children", "KADDRESSBOOK" ); |
165 | 165 | ||
166 | initGUI(); | 166 | initGUI(); |
167 | 167 | ||
168 | mIncSearchWidget->setFocus(); | 168 | mIncSearchWidget->setFocus(); |
169 | 169 | ||
170 | 170 | ||
171 | connect( mViewManager, SIGNAL( selected( const QString& ) ), | 171 | connect( mViewManager, SIGNAL( selected( const QString& ) ), |
172 | SLOT( setContactSelected( const QString& ) ) ); | 172 | SLOT( setContactSelected( const QString& ) ) ); |
173 | connect( mViewManager, SIGNAL( executed( const QString& ) ), | 173 | connect( mViewManager, SIGNAL( executed( const QString& ) ), |
174 | SLOT( editContact( const QString& ) ) ); | 174 | SLOT( editContact( const QString& ) ) ); |
175 | connect( mViewManager, SIGNAL( deleteRequest( ) ), | 175 | connect( mViewManager, SIGNAL( deleteRequest( ) ), |
176 | SLOT( deleteContacts( ) ) ); | 176 | SLOT( deleteContacts( ) ) ); |
177 | connect( mViewManager, SIGNAL( modified() ), | 177 | connect( mViewManager, SIGNAL( modified() ), |
178 | SLOT( setModified() ) ); | 178 | SLOT( setModified() ) ); |
179 | 179 | ||
180 | connect( mExtensionManager, SIGNAL( modified( const KABC::Addressee::List& ) ), this, SLOT( extensionModified( const KABC::Addressee::List& ) ) ); | 180 | connect( mExtensionManager, SIGNAL( modified( const KABC::Addressee::List& ) ), this, SLOT( extensionModified( const KABC::Addressee::List& ) ) ); |
181 | 181 | ||
182 | connect( mXXPortManager, SIGNAL( modified() ), | 182 | connect( mXXPortManager, SIGNAL( modified() ), |
183 | SLOT( setModified() ) ); | 183 | SLOT( setModified() ) ); |
184 | 184 | ||
185 | connect( mJumpButtonBar, SIGNAL( jumpToLetter( const QString& ) ), | 185 | connect( mJumpButtonBar, SIGNAL( jumpToLetter( const QString& ) ), |
186 | SLOT( incrementalSearch( const QString& ) ) ); | 186 | SLOT( incrementalSearch( const QString& ) ) ); |
187 | connect( mIncSearchWidget, SIGNAL( fieldChanged() ), | 187 | connect( mIncSearchWidget, SIGNAL( fieldChanged() ), |
188 | mJumpButtonBar, SLOT( recreateButtons() ) ); | 188 | mJumpButtonBar, SLOT( recreateButtons() ) ); |
189 | 189 | ||
190 | #ifndef KAB_EMBEDDED | 190 | #ifndef KAB_EMBEDDED |
191 | connect( mViewManager, SIGNAL( urlDropped( const KURL& ) ), | 191 | connect( mViewManager, SIGNAL( urlDropped( const KURL& ) ), |
192 | mXXPortManager, SLOT( importVCard( const KURL& ) ) ); | 192 | mXXPortManager, SLOT( importVCard( const KURL& ) ) ); |
193 | 193 | ||
194 | connect( mDetails, SIGNAL( sendEmail( const QString& ) ), | 194 | connect( mDetails, SIGNAL( sendEmail( const QString& ) ), |
195 | SLOT( sendMail( const QString& ) ) ); | 195 | SLOT( sendMail( const QString& ) ) ); |
196 | connect( mDetails, SIGNAL( browse( const QString& ) ), | 196 | connect( mDetails, SIGNAL( browse( const QString& ) ), |
197 | SLOT( browse( const QString& ) ) ); | 197 | SLOT( browse( const QString& ) ) ); |
198 | 198 | ||
199 | mAddressBookService = new KAddressBookService( this ); | 199 | mAddressBookService = new KAddressBookService( this ); |
200 | 200 | ||
201 | #endif //KAB_EMBEDDED | 201 | #endif //KAB_EMBEDDED |
202 | mEditorDialog = 0; | 202 | mEditorDialog = 0; |
203 | createAddresseeEditorDialog( this ); | 203 | createAddresseeEditorDialog( this ); |
204 | setModified( false ); | 204 | setModified( false ); |
205 | } | 205 | } |
206 | 206 | ||
207 | KABCore::~KABCore() | 207 | KABCore::~KABCore() |
208 | { | 208 | { |
209 | // save(); | 209 | // save(); |
210 | //saveSettings(); | 210 | //saveSettings(); |
211 | //KABPrefs::instance()->writeConfig(); | 211 | //KABPrefs::instance()->writeConfig(); |
212 | delete AddresseeConfig::instance(); | 212 | delete AddresseeConfig::instance(); |
213 | mAddressBook = 0; | 213 | mAddressBook = 0; |
214 | KABC::StdAddressBook::close(); | 214 | KABC::StdAddressBook::close(); |
215 | 215 | ||
216 | #ifdef KAB_EMBEDDED | 216 | #ifdef KAB_EMBEDDED |
217 | //US we define here our own global actioncollection. | 217 | //US we define here our own global actioncollection. |
218 | // delete mActionCollection; | 218 | // delete mActionCollection; |
219 | #endif //KAB_EMBEDDED | 219 | #endif //KAB_EMBEDDED |
220 | 220 | ||
221 | } | 221 | } |
222 | 222 | ||
223 | void KABCore::restoreSettings() | 223 | void KABCore::restoreSettings() |
224 | { | 224 | { |
225 | bool state = KABPrefs::instance()->mJumpButtonBarVisible; | 225 | bool state = KABPrefs::instance()->mJumpButtonBarVisible; |
226 | 226 | ||
227 | mActionJumpBar->setChecked( state ); | 227 | mActionJumpBar->setChecked( state ); |
228 | setJumpButtonBarVisible( state ); | 228 | setJumpButtonBarVisible( state ); |
229 | 229 | ||
230 | state = KABPrefs::instance()->mDetailsPageVisible; | 230 | state = KABPrefs::instance()->mDetailsPageVisible; |