-rw-r--r-- | kaddressbook/mainembedded.cpp | 15 | ||||
-rw-r--r-- | kmicromail/libmailwrapper/genericwrapper.cpp | 18 | ||||
-rw-r--r-- | kmicromail/opiemail.cpp | 2 | ||||
-rw-r--r-- | korganizer/calendarview.cpp | 6 | ||||
-rw-r--r-- | korganizer/koprefs.cpp | 2 | ||||
-rw-r--r-- | korganizer/koprefsdialog.cpp | 106 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 2 | ||||
-rw-r--r-- | libkdepim/kcmconfigs/kdepimconfigwidget.cpp | 2 | ||||
-rw-r--r-- | libkdepim/kpimglobalprefs.cpp | 17 | ||||
-rw-r--r-- | libkdepim/kpimglobalprefs.h | 4 |
10 files changed, 93 insertions, 81 deletions
diff --git a/kaddressbook/mainembedded.cpp b/kaddressbook/mainembedded.cpp index 10b1013..965fb06 100644 --- a/kaddressbook/mainembedded.cpp +++ b/kaddressbook/mainembedded.cpp | |||
@@ -1,152 +1,141 @@ | |||
1 | #ifndef DESKTOP_VERSION | 1 | #ifndef DESKTOP_VERSION |
2 | #include <qpe/qpeapplication.h> | 2 | #include <qpe/qpeapplication.h> |
3 | #include <stdlib.h> | 3 | #include <stdlib.h> |
4 | #else | 4 | #else |
5 | #include <qapplication.h> | 5 | #include <qapplication.h> |
6 | #include <qwindowsstyle.h> | 6 | #include <qwindowsstyle.h> |
7 | #include <qplatinumstyle.h> | 7 | #include <qplatinumstyle.h> |
8 | #include <qmainwindow.h> | 8 | #include <qmainwindow.h> |
9 | #endif | 9 | #endif |
10 | 10 | ||
11 | #include <kstandarddirs.h> | 11 | #include <kstandarddirs.h> |
12 | #include <qregexp.h> | 12 | #include <qregexp.h> |
13 | #include <kglobal.h> | 13 | #include <kglobal.h> |
14 | #include <stdio.h> | 14 | #include <stdio.h> |
15 | #include <qdir.h> | 15 | #include <qdir.h> |
16 | #include "kaddressbookmain.h" | 16 | #include "kaddressbookmain.h" |
17 | #include "externalapphandler.h" | 17 | #include "externalapphandler.h" |
18 | #include <libkdepim/kpimglobalprefs.h> | ||
18 | 19 | ||
19 | int main( int argc, char **argv ) | 20 | int main( int argc, char **argv ) |
20 | { | 21 | { |
21 | #ifndef DESKTOP_VERSION | 22 | #ifndef DESKTOP_VERSION |
22 | QPEApplication a( argc, argv ); | 23 | QPEApplication a( argc, argv ); |
23 | a.setKeepRunning (); | 24 | a.setKeepRunning (); |
24 | #else | 25 | #else |
25 | QApplication a( argc, argv ); | 26 | QApplication a( argc, argv ); |
26 | QApplication::setStyle( new QPlatinumStyle ()); | 27 | QApplication::setStyle( new QPlatinumStyle ()); |
27 | QString hdir = QDir::homeDirPath(); | 28 | QString hdir = QDir::homeDirPath(); |
28 | // there is a bug when creating dirs for WIN 98 | 29 | // there is a bug when creating dirs for WIN 98 |
29 | // it is difficult to fix, because we have no WIN 98 runnung | 30 | // it is difficult to fix, because we have no WIN 98 runnung |
30 | // such that we try it to create the dirs at startup here | 31 | // such that we try it to create the dirs at startup here |
31 | if ( hdir == "C:\\" ) { // win 98 or ME | 32 | if ( hdir == "C:\\" ) { // win 98 or ME |
32 | QDir app_dir; | 33 | QDir app_dir; |
33 | if ( !app_dir.exists("C:\\kdepim") ) | 34 | if ( !app_dir.exists("C:\\kdepim") ) |
34 | app_dir.mkdir ("C:\\kdepim"); | 35 | app_dir.mkdir ("C:\\kdepim"); |
35 | if ( !app_dir.exists("C:\\kdepim\\apps") ) | 36 | if ( !app_dir.exists("C:\\kdepim\\apps") ) |
36 | app_dir.mkdir ("C:\\kdepim\\apps"); | 37 | app_dir.mkdir ("C:\\kdepim\\apps"); |
37 | if ( !app_dir.exists("C:\\kdepim\\config") ) | 38 | if ( !app_dir.exists("C:\\kdepim\\config") ) |
38 | app_dir.mkdir ("C:\\kdepim\\config"); | 39 | app_dir.mkdir ("C:\\kdepim\\config"); |
39 | if ( !app_dir.exists("C:\\kdepim\\apps\\kaddressbook") ) | 40 | if ( !app_dir.exists("C:\\kdepim\\apps\\kaddressbook") ) |
40 | app_dir.mkdir ("C:\\kdepim\\apps\\kaddressbook"); | 41 | app_dir.mkdir ("C:\\kdepim\\apps\\kaddressbook"); |
41 | } | 42 | } |
42 | #endif | 43 | #endif |
43 | 44 | ||
44 | bool exitHelp = false; | 45 | bool exitHelp = false; |
45 | if ( argc > 1 ) { | 46 | if ( argc > 1 ) { |
46 | QString command = argv[1]; | 47 | QString command = argv[1]; |
47 | if ( command == "-help" ){ | 48 | if ( command == "-help" ){ |
48 | printf("KA/E command line commands:\n"); | 49 | printf("KA/E command line commands:\n"); |
49 | printf(" no command: Start KA/E in usual way\n"); | 50 | printf(" no command: Start KA/E in usual way\n"); |
50 | printf(" -help: This output\n"); | 51 | printf(" -help: This output\n"); |
51 | printf(" KA/E is exiting now. Bye!\n"); | 52 | printf(" KA/E is exiting now. Bye!\n"); |
52 | exitHelp = true; | 53 | exitHelp = true; |
53 | } | 54 | } |
54 | } | 55 | } |
55 | if ( ! exitHelp ) { | 56 | if ( ! exitHelp ) { |
56 | 57 | ||
57 | KGlobal::setAppName( "kaddressbook" ); | 58 | KGlobal::setAppName( "kaddressbook" ); |
58 | #ifndef DESKTOP_VERSION | 59 | #ifndef DESKTOP_VERSION |
59 | if ( QApplication::desktop()->width() > 320 ) | 60 | if ( QApplication::desktop()->width() > 320 ) |
60 | KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/kaddressbook/icons22/"); | 61 | KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/kaddressbook/icons22/"); |
61 | else | 62 | else |
62 | KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/kaddressbook/icons16/"); | 63 | KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/kaddressbook/icons16/"); |
63 | #else | 64 | #else |
64 | QString fileName ; | 65 | QString fileName ; |
65 | fileName = qApp->applicationDirPath () + "/kdepim/kaddressbook/icons22/"; | 66 | fileName = qApp->applicationDirPath () + "/kdepim/kaddressbook/icons22/"; |
66 | KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName)); | 67 | KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName)); |
67 | QApplication::addLibraryPath ( qApp->applicationDirPath () ); | 68 | QApplication::addLibraryPath ( qApp->applicationDirPath () ); |
68 | 69 | ||
69 | #endif | 70 | #endif |
70 | KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "kaddressbook"))); | 71 | KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "kaddressbook"))); |
71 | KAddressBookMain m ; | 72 | KAddressBookMain m ; |
72 | //US MainWindow m; | 73 | //US MainWindow m; |
73 | QObject::connect(&a, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & ))); | 74 | QObject::connect(&a, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & ))); |
74 | 75 | ||
75 | { | 76 | { |
76 | KConfig kon ( locateLocal( "config", "korganizerrc" ) ); | 77 | KPimGlobalPrefs::instance()->setGlobalConfig(); |
77 | kon.setGroup("Locale"); | ||
78 | KGlobal::locale()->setIntDateFormat( (KLocale::IntDateFormat)kon.readNumEntry( "PreferredDate",0) ); | ||
79 | QString dummy = kon.readEntry( "UserDateFormatShort","%aK %d.%m.%y" );// kon.readEntry( ""); | ||
80 | KGlobal::locale()->setHore24Format( !kon.readNumEntry( "PreferredTime",0 ) ); | ||
81 | KGlobal::locale()->setDateFormatShort(dummy.replace( QRegExp("K"), QString(",") )); | ||
82 | dummy = kon.readEntry( "UserDateFormatLong","%A %d %b %y" ); | ||
83 | KGlobal::locale()->setDateFormat(dummy.replace( QRegExp("K"), QString(",") )); | ||
84 | kon.setGroup("Time & Date"); | ||
85 | KGlobal::locale()->setDaylightSaving( kon.readBoolEntry( "UseDaylightsaving", true ), | ||
86 | kon.readNumEntry( "DaylightsavingStart", 90), | ||
87 | kon.readNumEntry( "DaylightsavingEnd",304) ); | ||
88 | KGlobal::locale()->setTimezone( kon.readEntry( "TimeZoneName" ," 00:00 Europe/London(UTC)") ); | ||
89 | } | 78 | } |
90 | #ifndef DESKTOP_VERSION | 79 | #ifndef DESKTOP_VERSION |
91 | a.showMainWidget( &m ); | 80 | a.showMainWidget( &m ); |
92 | #else | 81 | #else |
93 | a.setMainWidget( &m ); | 82 | a.setMainWidget( &m ); |
94 | m.resize (640, 480 ); | 83 | m.resize (640, 480 ); |
95 | m.show(); | 84 | m.show(); |
96 | #endif | 85 | #endif |
97 | a.exec(); | 86 | a.exec(); |
98 | 87 | ||
99 | } | 88 | } |
100 | qDebug("KA: Bye! "); | 89 | qDebug("KA: Bye! "); |
101 | } | 90 | } |
102 | 91 | ||
103 | /* | 92 | /* |
104 | #include <stdlib.h> | 93 | #include <stdlib.h> |
105 | 94 | ||
106 | #include <qstring.h> | 95 | #include <qstring.h> |
107 | 96 | ||
108 | #include <kabc/stdaddressbook.h> | 97 | #include <kabc/stdaddressbook.h> |
109 | #include <kaboutdata.h> | 98 | #include <kaboutdata.h> |
110 | #include <kcmdlineargs.h> | 99 | #include <kcmdlineargs.h> |
111 | #include <kcrash.h> | 100 | #include <kcrash.h> |
112 | #include <kdebug.h> | 101 | #include <kdebug.h> |
113 | #include <klocale.h> | 102 | #include <klocale.h> |
114 | #include <kstartupinfo.h> | 103 | #include <kstartupinfo.h> |
115 | #include <kuniqueapplication.h> | 104 | #include <kuniqueapplication.h> |
116 | #include <kwin.h> | 105 | #include <kwin.h> |
117 | 106 | ||
118 | #include "kaddressbookmain.h" | 107 | #include "kaddressbookmain.h" |
119 | #include "kabcore.h" | 108 | #include "kabcore.h" |
120 | 109 | ||
121 | extern "C" { | 110 | extern "C" { |
122 | 111 | ||
123 | void crashHandler( int ) | 112 | void crashHandler( int ) |
124 | { | 113 | { |
125 | KABC::StdAddressBook::handleCrash(); | 114 | KABC::StdAddressBook::handleCrash(); |
126 | ::exit( 0 ); | 115 | ::exit( 0 ); |
127 | } | 116 | } |
128 | 117 | ||
129 | } | 118 | } |
130 | 119 | ||
131 | class KAddressBookApp : public KUniqueApplication { | 120 | class KAddressBookApp : public KUniqueApplication { |
132 | public: | 121 | public: |
133 | KAddressBookApp() : mMainWin( 0 ) {} | 122 | KAddressBookApp() : mMainWin( 0 ) {} |
134 | ~KAddressBookApp() {} | 123 | ~KAddressBookApp() {} |
135 | 124 | ||
136 | int newInstance(); | 125 | int newInstance(); |
137 | 126 | ||
138 | private: | 127 | private: |
139 | KAddressBookMain *mMainWin; | 128 | KAddressBookMain *mMainWin; |
140 | }; | 129 | }; |
141 | 130 | ||
142 | int KAddressBookApp::newInstance() | 131 | int KAddressBookApp::newInstance() |
143 | { | 132 | { |
144 | if ( isRestored() ) { | 133 | if ( isRestored() ) { |
145 | // There can only be one main window | 134 | // There can only be one main window |
146 | if ( KMainWindow::canBeRestored( 1 ) ) { | 135 | if ( KMainWindow::canBeRestored( 1 ) ) { |
147 | mMainWin = new KAddressBookMain; | 136 | mMainWin = new KAddressBookMain; |
148 | mMainWin->show(); | 137 | mMainWin->show(); |
149 | mMainWin->restore( 1 ); | 138 | mMainWin->restore( 1 ); |
150 | } | 139 | } |
151 | } else { | 140 | } else { |
152 | KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); | 141 | KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); |
diff --git a/kmicromail/libmailwrapper/genericwrapper.cpp b/kmicromail/libmailwrapper/genericwrapper.cpp index 09a6447..e691082 100644 --- a/kmicromail/libmailwrapper/genericwrapper.cpp +++ b/kmicromail/libmailwrapper/genericwrapper.cpp | |||
@@ -1,114 +1,96 @@ | |||
1 | // CHANGED 2004-09-31 Lutz Rogowski | 1 | // CHANGED 2004-09-31 Lutz Rogowski |
2 | #include "genericwrapper.h" | 2 | #include "genericwrapper.h" |
3 | #include <libetpan/libetpan.h> | 3 | #include <libetpan/libetpan.h> |
4 | #include "mailtypes.h" | 4 | #include "mailtypes.h" |
5 | 5 | ||
6 | #include <kconfig.h> | 6 | #include <kconfig.h> |
7 | #include <kglobal.h> | 7 | #include <kglobal.h> |
8 | #include <kstandarddirs.h> | 8 | #include <kstandarddirs.h> |
9 | 9 | ||
10 | 10 | ||
11 | using namespace Opie::Core; | 11 | using namespace Opie::Core; |
12 | Genericwrapper::Genericwrapper() | 12 | Genericwrapper::Genericwrapper() |
13 | : AbstractMail() | 13 | : AbstractMail() |
14 | { | 14 | { |
15 | bodyCache.clear(); | 15 | bodyCache.clear(); |
16 | m_storage = 0; | 16 | m_storage = 0; |
17 | m_folder = 0; | 17 | m_folder = 0; |
18 | } | 18 | } |
19 | 19 | ||
20 | Genericwrapper::~Genericwrapper() | 20 | Genericwrapper::~Genericwrapper() |
21 | { | 21 | { |
22 | if (m_folder) { | 22 | if (m_folder) { |
23 | mailfolder_free(m_folder); | 23 | mailfolder_free(m_folder); |
24 | } | 24 | } |
25 | if (m_storage) { | 25 | if (m_storage) { |
26 | mailstorage_free(m_storage); | 26 | mailstorage_free(m_storage); |
27 | } | 27 | } |
28 | cleanMimeCache(); | 28 | cleanMimeCache(); |
29 | } | 29 | } |
30 | const QDateTime Genericwrapper::parseDateTime( mailimf_date_time *date ) | 30 | const QDateTime Genericwrapper::parseDateTime( mailimf_date_time *date ) |
31 | { | 31 | { |
32 | static bool init = false ; | ||
33 | if ( ! init ) { | ||
34 | KConfig kon ( locateLocal( "config", "korganizerrc" ) ); | ||
35 | kon.setGroup("Locale"); | ||
36 | KGlobal::locale()->setIntDateFormat( (KLocale::IntDateFormat)kon.readNumEntry( "PreferredDate",0) ); | ||
37 | QString dummy = kon.readEntry( "UserDateFormatShort","%aK %d.%m.%y" );// kon.readEntry( ""); | ||
38 | KGlobal::locale()->setHore24Format( !kon.readNumEntry( "PreferredTime",0 ) ); | ||
39 | KGlobal::locale()->setDateFormatShort(dummy.replace( QRegExp("K"), QString(",") )); | ||
40 | dummy = kon.readEntry( "UserDateFormatLong","%A %d %b %y" ); | ||
41 | KGlobal::locale()->setDateFormat(dummy.replace( QRegExp("K"), QString(",") )); | ||
42 | kon.setGroup("Time & Date"); | ||
43 | KGlobal::locale()->setDaylightSaving( kon.readBoolEntry( "UseDaylightsaving", true ), | ||
44 | kon.readNumEntry( "DaylightsavingStart", 90), | ||
45 | kon.readNumEntry( "DaylightsavingEnd",304) ); | ||
46 | KGlobal::locale()->setTimezone( kon.readEntry( "TimeZoneName" ," 00:00 Europe/London(UTC)") ); | ||
47 | |||
48 | init = true; | ||
49 | 32 | ||
50 | } | ||
51 | QDate da (date->dt_year,date->dt_month, date->dt_day ); | 33 | QDate da (date->dt_year,date->dt_month, date->dt_day ); |
52 | QTime ti ( date->dt_hour, date->dt_min, date->dt_sec ); | 34 | QTime ti ( date->dt_hour, date->dt_min, date->dt_sec ); |
53 | QDateTime dt ( da ,ti ); | 35 | QDateTime dt ( da ,ti ); |
54 | int addsec = -date->dt_zone*36; | 36 | int addsec = -date->dt_zone*36; |
55 | //qDebug("adsec1 %d ",addsec ); | 37 | //qDebug("adsec1 %d ",addsec ); |
56 | dt = dt.addSecs( addsec ); | 38 | dt = dt.addSecs( addsec ); |
57 | int off = KGlobal::locale()->localTimeOffset( dt ); | 39 | int off = KGlobal::locale()->localTimeOffset( dt ); |
58 | //qDebug("adsec2 %d ",off*60 ); | 40 | //qDebug("adsec2 %d ",off*60 ); |
59 | 41 | ||
60 | dt = dt.addSecs( off*60 ); | 42 | dt = dt.addSecs( off*60 ); |
61 | return dt; | 43 | return dt; |
62 | #if 0 | 44 | #if 0 |
63 | QString ret; | 45 | QString ret; |
64 | if ( dt.date() == QDate::currentDate () ) | 46 | if ( dt.date() == QDate::currentDate () ) |
65 | ret = KGlobal::locale()->formatTime( dt.time(),true); | 47 | ret = KGlobal::locale()->formatTime( dt.time(),true); |
66 | 48 | ||
67 | else { | 49 | else { |
68 | ret = KGlobal::locale()->formatDateTime( dt,true,true); | 50 | ret = KGlobal::locale()->formatDateTime( dt,true,true); |
69 | } | 51 | } |
70 | #endif | 52 | #endif |
71 | #if 0 | 53 | #if 0 |
72 | if ( off < 0 ) | 54 | if ( off < 0 ) |
73 | ret += " -"; | 55 | ret += " -"; |
74 | else | 56 | else |
75 | ret += " +"; | 57 | ret += " +"; |
76 | ret += QString::number( off / 60 ); | 58 | ret += QString::number( off / 60 ); |
77 | ret += "h"; | 59 | ret += "h"; |
78 | #endif | 60 | #endif |
79 | #if 0 | 61 | #if 0 |
80 | char tmp[23]; | 62 | char tmp[23]; |
81 | 63 | ||
82 | // snprintf( tmp, 23, "%02i.%02i.%04i %02i:%02i:%02i %+05i", | 64 | // snprintf( tmp, 23, "%02i.%02i.%04i %02i:%02i:%02i %+05i", |
83 | // date->dt_day, date->dt_month, date->dt_year, date->dt_hour, date->dt_min, date->dt_sec, date->dt_zone ); | 65 | // date->dt_day, date->dt_month, date->dt_year, date->dt_hour, date->dt_min, date->dt_sec, date->dt_zone ); |
84 | snprintf( tmp, 23, "%04i-%02i-%02i %02i:%02i:%02i %+05i", | 66 | snprintf( tmp, 23, "%04i-%02i-%02i %02i:%02i:%02i %+05i", |
85 | date->dt_year,date->dt_month, date->dt_day, date->dt_hour, date->dt_min, date->dt_sec, date->dt_zone ); | 67 | date->dt_year,date->dt_month, date->dt_day, date->dt_hour, date->dt_min, date->dt_sec, date->dt_zone ); |
86 | 68 | ||
87 | 69 | ||
88 | return QString( tmp ); | 70 | return QString( tmp ); |
89 | #endif | 71 | #endif |
90 | //return ret; | 72 | //return ret; |
91 | } | 73 | } |
92 | 74 | ||
93 | void Genericwrapper::fillSingleBody(RecPartP&target,mailmessage*,mailmime*mime) | 75 | void Genericwrapper::fillSingleBody(RecPartP&target,mailmessage*,mailmime*mime) |
94 | { | 76 | { |
95 | if (!mime) { | 77 | if (!mime) { |
96 | return; | 78 | return; |
97 | } | 79 | } |
98 | mailmime_field*field = 0; | 80 | mailmime_field*field = 0; |
99 | mailmime_single_fields fields; | 81 | mailmime_single_fields fields; |
100 | memset(&fields, 0, sizeof(struct mailmime_single_fields)); | 82 | memset(&fields, 0, sizeof(struct mailmime_single_fields)); |
101 | if (mime->mm_mime_fields != NULL) { | 83 | if (mime->mm_mime_fields != NULL) { |
102 | mailmime_single_fields_init(&fields, mime->mm_mime_fields, | 84 | mailmime_single_fields_init(&fields, mime->mm_mime_fields, |
103 | mime->mm_content_type); | 85 | mime->mm_content_type); |
104 | } | 86 | } |
105 | 87 | ||
106 | mailmime_content*type = fields.fld_content; | 88 | mailmime_content*type = fields.fld_content; |
107 | clistcell*current; | 89 | clistcell*current; |
108 | if (!type) { | 90 | if (!type) { |
109 | target->setType("text"); | 91 | target->setType("text"); |
110 | target->setSubtype("plain"); | 92 | target->setSubtype("plain"); |
111 | } else { | 93 | } else { |
112 | target->setSubtype(type->ct_subtype); | 94 | target->setSubtype(type->ct_subtype); |
113 | switch(type->ct_type->tp_data.tp_discrete_type->dt_type) { | 95 | switch(type->ct_type->tp_data.tp_discrete_type->dt_type) { |
114 | case MAILMIME_DISCRETE_TYPE_TEXT: | 96 | case MAILMIME_DISCRETE_TYPE_TEXT: |
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp index 9a1a750..164988c 100644 --- a/kmicromail/opiemail.cpp +++ b/kmicromail/opiemail.cpp | |||
@@ -1,98 +1,100 @@ | |||
1 | // CHANGED 2004-09-31 Lutz Rogowski | 1 | // CHANGED 2004-09-31 Lutz Rogowski |
2 | // CHANGED 2004-08-06 Lutz Rogowski | 2 | // CHANGED 2004-08-06 Lutz Rogowski |
3 | 3 | ||
4 | #include "settingsdialog.h" | 4 | #include "settingsdialog.h" |
5 | #include "opiemail.h" | 5 | #include "opiemail.h" |
6 | #include "editaccounts.h" | 6 | #include "editaccounts.h" |
7 | #include "composemail.h" | 7 | #include "composemail.h" |
8 | #include "mailistviewitem.h" | 8 | #include "mailistviewitem.h" |
9 | #include "viewmail.h" | 9 | #include "viewmail.h" |
10 | #include "selectstore.h" | 10 | #include "selectstore.h" |
11 | #include "selectsmtp.h" | 11 | #include "selectsmtp.h" |
12 | #include "accountitem.h" | 12 | #include "accountitem.h" |
13 | #include "koprefsdialog.h" | 13 | #include "koprefsdialog.h" |
14 | 14 | ||
15 | #include <qmessagebox.h> | 15 | #include <qmessagebox.h> |
16 | #include <qtimer.h> | 16 | #include <qtimer.h> |
17 | #include <libkdepim/externalapphandler.h> | 17 | #include <libkdepim/externalapphandler.h> |
18 | #include <libkdepim/kpimglobalprefs.h> | ||
18 | 19 | ||
19 | #include <qpe/qpeapplication.h> | 20 | #include <qpe/qpeapplication.h> |
20 | #include <libmailwrapper/smtpwrapper.h> | 21 | #include <libmailwrapper/smtpwrapper.h> |
21 | #include <libmailwrapper/mailtypes.h> | 22 | #include <libmailwrapper/mailtypes.h> |
22 | #include <libmailwrapper/abstractmail.h> | 23 | #include <libmailwrapper/abstractmail.h> |
23 | /* OPIE */ | 24 | /* OPIE */ |
24 | //#include <qpe/resource.h> | 25 | //#include <qpe/resource.h> |
25 | //#include <qpe/qpeapplication.h> | 26 | //#include <qpe/qpeapplication.h> |
26 | 27 | ||
27 | /* QT */ | 28 | /* QT */ |
28 | 29 | ||
29 | //using namespace Opie::Core; | 30 | //using namespace Opie::Core; |
30 | 31 | ||
31 | OpieMail::OpieMail( QWidget *parent, const char *name ) | 32 | OpieMail::OpieMail( QWidget *parent, const char *name ) |
32 | : MainWindow( parent, name) //, WStyle_ContextHelp ) | 33 | : MainWindow( parent, name) //, WStyle_ContextHelp ) |
33 | { | 34 | { |
34 | settings = new Settings(); | 35 | settings = new Settings(); |
36 | KPimGlobalPrefs::instance()->setGlobalConfig(); | ||
35 | 37 | ||
36 | folderView->populate( settings->getAccounts() ); | 38 | folderView->populate( settings->getAccounts() ); |
37 | 39 | ||
38 | } | 40 | } |
39 | 41 | ||
40 | OpieMail::~OpieMail() | 42 | OpieMail::~OpieMail() |
41 | { | 43 | { |
42 | if (settings) delete settings; | 44 | if (settings) delete settings; |
43 | } | 45 | } |
44 | 46 | ||
45 | void OpieMail::appMessage(const QCString &msg, const QByteArray &data) | 47 | void OpieMail::appMessage(const QCString &msg, const QByteArray &data) |
46 | { | 48 | { |
47 | 49 | ||
48 | } | 50 | } |
49 | #include <stdlib.h> | 51 | #include <stdlib.h> |
50 | void OpieMail::message(const QCString &msg, const QByteArray &data) | 52 | void OpieMail::message(const QCString &msg, const QByteArray &data) |
51 | { | 53 | { |
52 | // copied from old mail2 | 54 | // copied from old mail2 |
53 | static int ii = 0; | 55 | static int ii = 0; |
54 | //qDebug("QCOP CALL ############################# %d ", ii); | 56 | //qDebug("QCOP CALL ############################# %d ", ii); |
55 | //QString mess ( msg ); | 57 | //QString mess ( msg ); |
56 | //qDebug("Message = %s ",mess.latin1()); | 58 | //qDebug("Message = %s ",mess.latin1()); |
57 | ++ii; | 59 | ++ii; |
58 | //qDebug("KM:appMessage %d *%s* %x", ii, msg.data(), this); | 60 | //qDebug("KM:appMessage %d *%s* %x", ii, msg.data(), this); |
59 | 61 | ||
60 | mPendingEmail = QString::null; | 62 | mPendingEmail = QString::null; |
61 | mPendingName = QString::null; | 63 | mPendingName = QString::null; |
62 | if (msg == "writeMail(QString,QString)") | 64 | if (msg == "writeMail(QString,QString)") |
63 | { | 65 | { |
64 | //qDebug("writeMail(QString,QString) "); | 66 | //qDebug("writeMail(QString,QString) "); |
65 | QDataStream stream(data,IO_ReadOnly); | 67 | QDataStream stream(data,IO_ReadOnly); |
66 | stream >> mPendingName >> mPendingEmail; | 68 | stream >> mPendingName >> mPendingEmail; |
67 | // removing the whitespaces at beginning and end is needed! | 69 | // removing the whitespaces at beginning and end is needed! |
68 | QTimer::singleShot ( 50, this, SLOT(slotComposeMail() ) ); | 70 | QTimer::singleShot ( 50, this, SLOT(slotComposeMail() ) ); |
69 | } | 71 | } |
70 | else if (msg == "newMail()") | 72 | else if (msg == "newMail()") |
71 | { | 73 | { |
72 | //qDebug("slotComposeMail() "); | 74 | //qDebug("slotComposeMail() "); |
73 | // we cannot call slotComposeMail(); directly, because may be executing a QCOP call | 75 | // we cannot call slotComposeMail(); directly, because may be executing a QCOP call |
74 | // and a QCOP call does not like a processevents in his execution | 76 | // and a QCOP call does not like a processevents in his execution |
75 | // with the Qtimer we call slotComposeMail() after we reached the main event loop | 77 | // with the Qtimer we call slotComposeMail() after we reached the main event loop |
76 | QTimer::singleShot ( 50, this, SLOT(slotComposeMail() ) ); | 78 | QTimer::singleShot ( 50, this, SLOT(slotComposeMail() ) ); |
77 | // slotComposeMail(); | 79 | // slotComposeMail(); |
78 | } | 80 | } |
79 | else if (msg == "newMail(QString)") | 81 | else if (msg == "newMail(QString)") |
80 | { | 82 | { |
81 | //qDebug(" newMail(QString)"); | 83 | //qDebug(" newMail(QString)"); |
82 | QDataStream stream(data,IO_ReadOnly); | 84 | QDataStream stream(data,IO_ReadOnly); |
83 | stream >> mPendingName; | 85 | stream >> mPendingName; |
84 | // the format is | 86 | // the format is |
85 | // NAME <EMAIL>:SUBJECT | 87 | // NAME <EMAIL>:SUBJECT |
86 | QTimer::singleShot ( 50, this, SLOT(slotComposeMail() ) ); | 88 | QTimer::singleShot ( 50, this, SLOT(slotComposeMail() ) ); |
87 | } else { | 89 | } else { |
88 | mPendingData = data; | 90 | mPendingData = data; |
89 | mPendingMessage = msg; | 91 | mPendingMessage = msg; |
90 | QTimer::singleShot ( 50, this, SLOT(slotExtAppHandler() ) ); | 92 | QTimer::singleShot ( 50, this, SLOT(slotExtAppHandler() ) ); |
91 | } | 93 | } |
92 | 94 | ||
93 | //qDebug("END OpieMail::message "); | 95 | //qDebug("END OpieMail::message "); |
94 | } | 96 | } |
95 | void OpieMail::slotExtAppHandler() | 97 | void OpieMail::slotExtAppHandler() |
96 | { | 98 | { |
97 | ExternalAppHandler::instance()->appMessage ( mPendingMessage, mPendingData ); | 99 | ExternalAppHandler::instance()->appMessage ( mPendingMessage, mPendingData ); |
98 | } | 100 | } |
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index bc8625d..3635cfa 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -2,128 +2,129 @@ | |||
2 | This file is part of KOrganizer. | 2 | This file is part of KOrganizer. |
3 | 3 | ||
4 | Requires the Qt and KDE widget libraries, available at no cost at | 4 | Requires the Qt and KDE widget libraries, available at no cost at |
5 | http://www.troll.no and http://www.kde.org respectively | 5 | http://www.troll.no and http://www.kde.org respectively |
6 | 6 | ||
7 | Copyright (c) 1997, 1998, 1999 | 7 | Copyright (c) 1997, 1998, 1999 |
8 | Preston Brown (preston.brown@yale.edu) | 8 | Preston Brown (preston.brown@yale.edu) |
9 | Fester Zigterman (F.J.F.ZigtermanRustenburg@student.utwente.nl) | 9 | Fester Zigterman (F.J.F.ZigtermanRustenburg@student.utwente.nl) |
10 | Ian Dawes (iadawes@globalserve.net) | 10 | Ian Dawes (iadawes@globalserve.net) |
11 | Laszlo Boloni (boloni@cs.purdue.edu) | 11 | Laszlo Boloni (boloni@cs.purdue.edu) |
12 | 12 | ||
13 | Copyright (c) 2000, 2001, 2002 | 13 | Copyright (c) 2000, 2001, 2002 |
14 | Cornelius Schumacher <schumacher@kde.org> | 14 | Cornelius Schumacher <schumacher@kde.org> |
15 | 15 | ||
16 | This program is free software; you can redistribute it and/or modify | 16 | This program is free software; you can redistribute it and/or modify |
17 | it under the terms of the GNU General Public License as published by | 17 | it under the terms of the GNU General Public License as published by |
18 | the Free Software Foundation; either version 2 of the License, or | 18 | the Free Software Foundation; either version 2 of the License, or |
19 | (at your option) any later version. | 19 | (at your option) any later version. |
20 | 20 | ||
21 | This program is distributed in the hope that it will be useful, | 21 | This program is distributed in the hope that it will be useful, |
22 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 22 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
23 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the | 23 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the |
24 | GNU General Public License for more details. | 24 | GNU General Public License for more details. |
25 | 25 | ||
26 | You should have received a copy of the GNU General Public License | 26 | You should have received a copy of the GNU General Public License |
27 | along with this program; if not, write to the Free Software | 27 | along with this program; if not, write to the Free Software |
28 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 28 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include <stdlib.h> | 31 | #include <stdlib.h> |
32 | 32 | ||
33 | #include <qapplication.h> | 33 | #include <qapplication.h> |
34 | #include <qradiobutton.h> | 34 | #include <qradiobutton.h> |
35 | #include <qbuttongroup.h> | 35 | #include <qbuttongroup.h> |
36 | #include <qlayout.h> | 36 | #include <qlayout.h> |
37 | #include <qclipboard.h> | 37 | #include <qclipboard.h> |
38 | #include <qcursor.h> | 38 | #include <qcursor.h> |
39 | #include <qmessagebox.h> | 39 | #include <qmessagebox.h> |
40 | #include <qprogressbar.h> | 40 | #include <qprogressbar.h> |
41 | #include <qmultilineedit.h> | 41 | #include <qmultilineedit.h> |
42 | #include <qtimer.h> | 42 | #include <qtimer.h> |
43 | #include <qwidgetstack.h> | 43 | #include <qwidgetstack.h> |
44 | #include <qptrlist.h> | 44 | #include <qptrlist.h> |
45 | #include <qregexp.h> | 45 | #include <qregexp.h> |
46 | #include <qgroupbox.h> | 46 | #include <qgroupbox.h> |
47 | #include <qfile.h> | 47 | #include <qfile.h> |
48 | #include <qdir.h> | 48 | #include <qdir.h> |
49 | #ifndef KORG_NOSPLITTER | 49 | #ifndef KORG_NOSPLITTER |
50 | #include <qsplitter.h> | 50 | #include <qsplitter.h> |
51 | #endif | 51 | #endif |
52 | 52 | ||
53 | #include <kglobal.h> | 53 | #include <kglobal.h> |
54 | #include <kdebug.h> | 54 | #include <kdebug.h> |
55 | #include <kstandarddirs.h> | 55 | #include <kstandarddirs.h> |
56 | #include <kfiledialog.h> | 56 | #include <kfiledialog.h> |
57 | #include <kmessagebox.h> | 57 | #include <kmessagebox.h> |
58 | #include <knotifyclient.h> | 58 | #include <knotifyclient.h> |
59 | #include <kconfig.h> | 59 | #include <kconfig.h> |
60 | 60 | ||
61 | #include <libkdepim/ksyncprefsdialog.h> | 61 | #include <libkdepim/ksyncprefsdialog.h> |
62 | #include <krun.h> | 62 | #include <krun.h> |
63 | #include <kdirwatch.h> | 63 | #include <kdirwatch.h> |
64 | #include <libkdepim/kdatepicker.h> | 64 | #include <libkdepim/kdatepicker.h> |
65 | #include <libkdepim/ksyncprofile.h> | 65 | #include <libkdepim/ksyncprofile.h> |
66 | #include <libkdepim/kpimglobalprefs.h> | ||
66 | 67 | ||
67 | #include <libkcal/vcaldrag.h> | 68 | #include <libkcal/vcaldrag.h> |
68 | #include <libkcal/icaldrag.h> | 69 | #include <libkcal/icaldrag.h> |
69 | #include <libkcal/icalformat.h> | 70 | #include <libkcal/icalformat.h> |
70 | #include <libkcal/vcalformat.h> | 71 | #include <libkcal/vcalformat.h> |
71 | #include <libkcal/scheduler.h> | 72 | #include <libkcal/scheduler.h> |
72 | #include <libkcal/calendarlocal.h> | 73 | #include <libkcal/calendarlocal.h> |
73 | #include <libkcal/journal.h> | 74 | #include <libkcal/journal.h> |
74 | #include <libkcal/calfilter.h> | 75 | #include <libkcal/calfilter.h> |
75 | #include <libkcal/attendee.h> | 76 | #include <libkcal/attendee.h> |
76 | #include <libkcal/dndfactory.h> | 77 | #include <libkcal/dndfactory.h> |
77 | #include <libkcal/freebusy.h> | 78 | #include <libkcal/freebusy.h> |
78 | #include <libkcal/filestorage.h> | 79 | #include <libkcal/filestorage.h> |
79 | #include <libkcal/calendarresources.h> | 80 | #include <libkcal/calendarresources.h> |
80 | #include <libkcal/qtopiaformat.h> | 81 | #include <libkcal/qtopiaformat.h> |
81 | #include "../kalarmd/alarmdialog.h" | 82 | #include "../kalarmd/alarmdialog.h" |
82 | 83 | ||
83 | #ifndef DESKTOP_VERSION | 84 | #ifndef DESKTOP_VERSION |
84 | #include <libkcal/sharpformat.h> | 85 | #include <libkcal/sharpformat.h> |
85 | #endif | 86 | #endif |
86 | #include <libkcal/phoneformat.h> | 87 | #include <libkcal/phoneformat.h> |
87 | #ifndef KORG_NOMAIL | 88 | #ifndef KORG_NOMAIL |
88 | #include "komailclient.h" | 89 | #include "komailclient.h" |
89 | #endif | 90 | #endif |
90 | #ifndef KORG_NOPRINTER | 91 | #ifndef KORG_NOPRINTER |
91 | #include "calprinter.h" | 92 | #include "calprinter.h" |
92 | #endif | 93 | #endif |
93 | #ifndef KORG_NOPLUGINS | 94 | #ifndef KORG_NOPLUGINS |
94 | #include "kocore.h" | 95 | #include "kocore.h" |
95 | #endif | 96 | #endif |
96 | #include "koeventeditor.h" | 97 | #include "koeventeditor.h" |
97 | #include "kotodoeditor.h" | 98 | #include "kotodoeditor.h" |
98 | #include "koprefs.h" | 99 | #include "koprefs.h" |
99 | #include "koeventviewerdialog.h" | 100 | #include "koeventviewerdialog.h" |
100 | #include "publishdialog.h" | 101 | #include "publishdialog.h" |
101 | #include "kofilterview.h" | 102 | #include "kofilterview.h" |
102 | #include "koglobals.h" | 103 | #include "koglobals.h" |
103 | #include "koviewmanager.h" | 104 | #include "koviewmanager.h" |
104 | #include "koagendaview.h" | 105 | #include "koagendaview.h" |
105 | #include "kodialogmanager.h" | 106 | #include "kodialogmanager.h" |
106 | #include "outgoingdialog.h" | 107 | #include "outgoingdialog.h" |
107 | #include "incomingdialog.h" | 108 | #include "incomingdialog.h" |
108 | #include "statusdialog.h" | 109 | #include "statusdialog.h" |
109 | #include "kdatenavigator.h" | 110 | #include "kdatenavigator.h" |
110 | #include "kotodoview.h" | 111 | #include "kotodoview.h" |
111 | #include "datenavigator.h" | 112 | #include "datenavigator.h" |
112 | #include "resourceview.h" | 113 | #include "resourceview.h" |
113 | #include "navigatorbar.h" | 114 | #include "navigatorbar.h" |
114 | #include "searchdialog.h" | 115 | #include "searchdialog.h" |
115 | #include "mainwindow.h" | 116 | #include "mainwindow.h" |
116 | 117 | ||
117 | #include "calendarview.h" | 118 | #include "calendarview.h" |
118 | #ifndef DESKTOP_VERSION | 119 | #ifndef DESKTOP_VERSION |
119 | #include <qtopia/alarmserver.h> | 120 | #include <qtopia/alarmserver.h> |
120 | #endif | 121 | #endif |
121 | #ifndef _WIN32_ | 122 | #ifndef _WIN32_ |
122 | #include <stdlib.h> | 123 | #include <stdlib.h> |
123 | #include <stdio.h> | 124 | #include <stdio.h> |
124 | #include <unistd.h> | 125 | #include <unistd.h> |
125 | #else | 126 | #else |
126 | #include <qprocess.h> | 127 | #include <qprocess.h> |
127 | #endif | 128 | #endif |
128 | using namespace KOrg; | 129 | using namespace KOrg; |
129 | using namespace KCal; | 130 | using namespace KCal; |
@@ -1823,142 +1824,145 @@ void CalendarView::readFilterSettings(KConfig *config) | |||
1823 | } | 1824 | } |
1824 | 1825 | ||
1825 | if (mFilters.count() == 0) { | 1826 | if (mFilters.count() == 0) { |
1826 | CalFilter *filter = new CalFilter(i18n("Default")); | 1827 | CalFilter *filter = new CalFilter(i18n("Default")); |
1827 | mFilters.append(filter); | 1828 | mFilters.append(filter); |
1828 | } | 1829 | } |
1829 | mFilterView->updateFilters(); | 1830 | mFilterView->updateFilters(); |
1830 | config->setGroup("FilterView"); | 1831 | config->setGroup("FilterView"); |
1831 | 1832 | ||
1832 | mFilterView->blockSignals(true); | 1833 | mFilterView->blockSignals(true); |
1833 | mFilterView->setFiltersEnabled(config->readBoolEntry("FilterEnabled")); | 1834 | mFilterView->setFiltersEnabled(config->readBoolEntry("FilterEnabled")); |
1834 | mFilterView->setSelectedFilter(config->readEntry("Current Filter")); | 1835 | mFilterView->setSelectedFilter(config->readEntry("Current Filter")); |
1835 | mFilterView->blockSignals(false); | 1836 | mFilterView->blockSignals(false); |
1836 | // We do it manually to avoid it being done twice by the above calls | 1837 | // We do it manually to avoid it being done twice by the above calls |
1837 | updateFilter(); | 1838 | updateFilter(); |
1838 | } | 1839 | } |
1839 | 1840 | ||
1840 | void CalendarView::writeFilterSettings(KConfig *config) | 1841 | void CalendarView::writeFilterSettings(KConfig *config) |
1841 | { | 1842 | { |
1842 | // kdDebug() << "CalendarView::writeFilterSettings()" << endl; | 1843 | // kdDebug() << "CalendarView::writeFilterSettings()" << endl; |
1843 | 1844 | ||
1844 | QStringList filterList; | 1845 | QStringList filterList; |
1845 | 1846 | ||
1846 | CalFilter *filter = mFilters.first(); | 1847 | CalFilter *filter = mFilters.first(); |
1847 | while(filter) { | 1848 | while(filter) { |
1848 | // kdDebug() << " fn: " << filter->name() << endl; | 1849 | // kdDebug() << " fn: " << filter->name() << endl; |
1849 | filterList << filter->name(); | 1850 | filterList << filter->name(); |
1850 | config->setGroup("Filter_" + filter->name()); | 1851 | config->setGroup("Filter_" + filter->name()); |
1851 | config->writeEntry("Criteria",filter->criteria()); | 1852 | config->writeEntry("Criteria",filter->criteria()); |
1852 | config->writeEntry("CategoryList",filter->categoryList()); | 1853 | config->writeEntry("CategoryList",filter->categoryList()); |
1853 | filter = mFilters.next(); | 1854 | filter = mFilters.next(); |
1854 | } | 1855 | } |
1855 | config->setGroup("General"); | 1856 | config->setGroup("General"); |
1856 | config->writeEntry("CalendarFilters",filterList); | 1857 | config->writeEntry("CalendarFilters",filterList); |
1857 | 1858 | ||
1858 | config->setGroup("FilterView"); | 1859 | config->setGroup("FilterView"); |
1859 | config->writeEntry("FilterEnabled",mFilterView->filtersEnabled()); | 1860 | config->writeEntry("FilterEnabled",mFilterView->filtersEnabled()); |
1860 | config->writeEntry("Current Filter",mFilterView->selectedFilter()->name()); | 1861 | config->writeEntry("Current Filter",mFilterView->selectedFilter()->name()); |
1861 | } | 1862 | } |
1862 | 1863 | ||
1863 | 1864 | ||
1864 | void CalendarView::goToday() | 1865 | void CalendarView::goToday() |
1865 | { | 1866 | { |
1866 | mNavigator->selectToday(); | 1867 | mNavigator->selectToday(); |
1867 | } | 1868 | } |
1868 | 1869 | ||
1869 | void CalendarView::goNext() | 1870 | void CalendarView::goNext() |
1870 | { | 1871 | { |
1871 | mNavigator->selectNext(); | 1872 | mNavigator->selectNext(); |
1872 | } | 1873 | } |
1873 | 1874 | ||
1874 | void CalendarView::goPrevious() | 1875 | void CalendarView::goPrevious() |
1875 | { | 1876 | { |
1876 | mNavigator->selectPrevious(); | 1877 | mNavigator->selectPrevious(); |
1877 | } | 1878 | } |
1878 | void CalendarView::goNextMonth() | 1879 | void CalendarView::goNextMonth() |
1879 | { | 1880 | { |
1880 | mNavigator->selectNextMonth(); | 1881 | mNavigator->selectNextMonth(); |
1881 | } | 1882 | } |
1882 | 1883 | ||
1883 | void CalendarView::goPreviousMonth() | 1884 | void CalendarView::goPreviousMonth() |
1884 | { | 1885 | { |
1885 | mNavigator->selectPreviousMonth(); | 1886 | mNavigator->selectPreviousMonth(); |
1886 | } | 1887 | } |
1887 | void CalendarView::writeLocale() | 1888 | void CalendarView::writeLocale() |
1888 | { | 1889 | { |
1890 | //KPimGlobalPrefs::instance()->setGlobalConfig(); | ||
1891 | #if 0 | ||
1889 | KGlobal::locale()->setHore24Format( !KOPrefs::instance()->mPreferredTime ); | 1892 | KGlobal::locale()->setHore24Format( !KOPrefs::instance()->mPreferredTime ); |
1890 | KGlobal::locale()->setWeekStartMonday( !KOPrefs::instance()->mWeekStartsOnSunday ); | 1893 | KGlobal::locale()->setWeekStartMonday( !KOPrefs::instance()->mWeekStartsOnSunday ); |
1891 | KGlobal::locale()->setIntDateFormat( (KLocale::IntDateFormat)KOPrefs::instance()->mPreferredDate ); | 1894 | KGlobal::locale()->setIntDateFormat( (KLocale::IntDateFormat)KOPrefs::instance()->mPreferredDate ); |
1892 | KGlobal::locale()->setLanguage( KOPrefs::instance()->mPreferredLanguage ); | 1895 | KGlobal::locale()->setLanguage( KOPrefs::instance()->mPreferredLanguage ); |
1893 | QString dummy = KOPrefs::instance()->mUserDateFormatLong; | 1896 | QString dummy = KOPrefs::instance()->mUserDateFormatLong; |
1894 | KGlobal::locale()->setDateFormat(dummy.replace( QRegExp("K"), QString(",") )); | 1897 | KGlobal::locale()->setDateFormat(dummy.replace( QRegExp("K"), QString(",") )); |
1895 | dummy = KOPrefs::instance()->mUserDateFormatShort; | 1898 | dummy = KOPrefs::instance()->mUserDateFormatShort; |
1896 | KGlobal::locale()->setDateFormatShort(dummy.replace( QRegExp("K"), QString(",") )); | 1899 | KGlobal::locale()->setDateFormatShort(dummy.replace( QRegExp("K"), QString(",") )); |
1897 | KGlobal::locale()->setDaylightSaving( KOPrefs::instance()->mUseDaylightsaving, | 1900 | KGlobal::locale()->setDaylightSaving( KOPrefs::instance()->mUseDaylightsaving, |
1898 | KOPrefs::instance()->mDaylightsavingStart, | 1901 | KOPrefs::instance()->mDaylightsavingStart, |
1899 | KOPrefs::instance()->mDaylightsavingEnd ); | 1902 | KOPrefs::instance()->mDaylightsavingEnd ); |
1900 | KGlobal::locale()->setTimezone( KOPrefs::instance()->mTimeZoneId ); | 1903 | KGlobal::locale()->setTimezone( KOPrefs::instance()->mTimeZoneId ); |
1904 | #endif | ||
1901 | } | 1905 | } |
1902 | void CalendarView::updateConfig() | 1906 | void CalendarView::updateConfig() |
1903 | { | 1907 | { |
1904 | writeLocale(); | 1908 | writeLocale(); |
1905 | if ( KOPrefs::instance()->mUseAppColors ) | 1909 | if ( KOPrefs::instance()->mUseAppColors ) |
1906 | QApplication::setPalette( QPalette (KOPrefs::instance()->mAppColor1, KOPrefs::instance()->mAppColor2), true ); | 1910 | QApplication::setPalette( QPalette (KOPrefs::instance()->mAppColor1, KOPrefs::instance()->mAppColor2), true ); |
1907 | emit configChanged(); | 1911 | emit configChanged(); |
1908 | mTodoList->updateConfig(); | 1912 | mTodoList->updateConfig(); |
1909 | // mDateNavigator->setFont ( KOPrefs::instance()->mDateNavigatorFont); | 1913 | // mDateNavigator->setFont ( KOPrefs::instance()->mDateNavigatorFont); |
1910 | mCalendar->setTimeZoneId(KOPrefs::instance()->mTimeZoneId); | 1914 | mCalendar->setTimeZoneId(KOPrefs::instance()->mTimeZoneId); |
1911 | // To make the "fill window" configurations work | 1915 | // To make the "fill window" configurations work |
1912 | //mViewManager->raiseCurrentView(); | 1916 | //mViewManager->raiseCurrentView(); |
1913 | } | 1917 | } |
1914 | 1918 | ||
1915 | 1919 | ||
1916 | void CalendarView::eventChanged(Event *event) | 1920 | void CalendarView::eventChanged(Event *event) |
1917 | { | 1921 | { |
1918 | changeEventDisplay(event,KOGlobals::EVENTEDITED); | 1922 | changeEventDisplay(event,KOGlobals::EVENTEDITED); |
1919 | //updateUnmanagedViews(); | 1923 | //updateUnmanagedViews(); |
1920 | } | 1924 | } |
1921 | 1925 | ||
1922 | void CalendarView::eventAdded(Event *event) | 1926 | void CalendarView::eventAdded(Event *event) |
1923 | { | 1927 | { |
1924 | changeEventDisplay(event,KOGlobals::EVENTADDED); | 1928 | changeEventDisplay(event,KOGlobals::EVENTADDED); |
1925 | } | 1929 | } |
1926 | 1930 | ||
1927 | void CalendarView::eventToBeDeleted(Event *) | 1931 | void CalendarView::eventToBeDeleted(Event *) |
1928 | { | 1932 | { |
1929 | kdDebug() << "CalendarView::eventToBeDeleted(): to be implemented" << endl; | 1933 | kdDebug() << "CalendarView::eventToBeDeleted(): to be implemented" << endl; |
1930 | } | 1934 | } |
1931 | 1935 | ||
1932 | void CalendarView::eventDeleted() | 1936 | void CalendarView::eventDeleted() |
1933 | { | 1937 | { |
1934 | changeEventDisplay(0,KOGlobals::EVENTDELETED); | 1938 | changeEventDisplay(0,KOGlobals::EVENTDELETED); |
1935 | } | 1939 | } |
1936 | void CalendarView::changeTodoDisplay(Todo *which, int action) | 1940 | void CalendarView::changeTodoDisplay(Todo *which, int action) |
1937 | { | 1941 | { |
1938 | changeIncidenceDisplay((Incidence *)which, action); | 1942 | changeIncidenceDisplay((Incidence *)which, action); |
1939 | mDateNavigator->updateView(); //LR | 1943 | mDateNavigator->updateView(); //LR |
1940 | //mDialogManager->updateSearchDialog(); | 1944 | //mDialogManager->updateSearchDialog(); |
1941 | 1945 | ||
1942 | if (which) { | 1946 | if (which) { |
1943 | mViewManager->updateWNview(); | 1947 | mViewManager->updateWNview(); |
1944 | //mTodoList->updateView(); | 1948 | //mTodoList->updateView(); |
1945 | } | 1949 | } |
1946 | 1950 | ||
1947 | } | 1951 | } |
1948 | 1952 | ||
1949 | void CalendarView::changeIncidenceDisplay(Incidence *which, int action) | 1953 | void CalendarView::changeIncidenceDisplay(Incidence *which, int action) |
1950 | { | 1954 | { |
1951 | updateUnmanagedViews(); | 1955 | updateUnmanagedViews(); |
1952 | //qDebug(" CalendarView::changeIncidenceDisplay++++++++++++++++++++++++++ %d %d ",which, action ); | 1956 | //qDebug(" CalendarView::changeIncidenceDisplay++++++++++++++++++++++++++ %d %d ",which, action ); |
1953 | if ( action == KOGlobals::EVENTDELETED ) { //delete | 1957 | if ( action == KOGlobals::EVENTDELETED ) { //delete |
1954 | mCalendar->checkAlarmForIncidence( 0, true ); | 1958 | mCalendar->checkAlarmForIncidence( 0, true ); |
1955 | if ( mEventViewerDialog ) | 1959 | if ( mEventViewerDialog ) |
1956 | mEventViewerDialog->hide(); | 1960 | mEventViewerDialog->hide(); |
1957 | } | 1961 | } |
1958 | else | 1962 | else |
1959 | mCalendar->checkAlarmForIncidence( which , false ); | 1963 | mCalendar->checkAlarmForIncidence( which , false ); |
1960 | } | 1964 | } |
1961 | 1965 | ||
1962 | // most of the changeEventDisplays() right now just call the view's | 1966 | // most of the changeEventDisplays() right now just call the view's |
1963 | // total update mode, but they SHOULD be recoded to be more refresh-efficient. | 1967 | // total update mode, but they SHOULD be recoded to be more refresh-efficient. |
1964 | void CalendarView::changeEventDisplay(Event *which, int action) | 1968 | void CalendarView::changeEventDisplay(Event *which, int action) |
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp index dd978bf..5d7db4f 100644 --- a/korganizer/koprefs.cpp +++ b/korganizer/koprefs.cpp | |||
@@ -1,107 +1,108 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of KOrganizer. | 2 | This file is part of KOrganizer. |
3 | Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org> | 3 | Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org> |
4 | 4 | ||
5 | This program is free software; you can redistribute it and/or modify | 5 | This program is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published by | 6 | it under the terms of the GNU General Public License as published by |
7 | the Free Software Foundation; either version 2 of the License, or | 7 | the Free Software Foundation; either version 2 of the License, or |
8 | (at your option) any later version. | 8 | (at your option) any later version. |
9 | 9 | ||
10 | This program is distributed in the hope that it will be useful, | 10 | This program is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
13 | GNU General Public License for more details. | 13 | GNU General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License |
16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
18 | 18 | ||
19 | As a special exception, permission is given to link this program | 19 | As a special exception, permission is given to link this program |
20 | with any edition of Qt, and distribute the resulting executable, | 20 | with any edition of Qt, and distribute the resulting executable, |
21 | without including the source code for Qt in the source distribution. | 21 | without including the source code for Qt in the source distribution. |
22 | */ | 22 | */ |
23 | 23 | ||
24 | #include <time.h> | 24 | #include <time.h> |
25 | #ifndef _WIN32_ | 25 | #ifndef _WIN32_ |
26 | #include <unistd.h> | 26 | #include <unistd.h> |
27 | #endif | 27 | #endif |
28 | #include <qdir.h> | 28 | #include <qdir.h> |
29 | #include <qtextstream.h> | 29 | #include <qtextstream.h> |
30 | #include <qtextcodec.h> | 30 | #include <qtextcodec.h> |
31 | #include <qstring.h> | 31 | #include <qstring.h> |
32 | #include <qregexp.h> | 32 | #include <qregexp.h> |
33 | #include <qfont.h> | 33 | #include <qfont.h> |
34 | #include <qcolor.h> | 34 | #include <qcolor.h> |
35 | #include <qstringlist.h> | 35 | #include <qstringlist.h> |
36 | #include <stdlib.h> | 36 | #include <stdlib.h> |
37 | 37 | ||
38 | #include <kglobal.h> | 38 | #include <kglobal.h> |
39 | #include <kconfig.h> | 39 | #include <kconfig.h> |
40 | #include <klocale.h> | 40 | #include <klocale.h> |
41 | #include <kdebug.h> | 41 | #include <kdebug.h> |
42 | #include <kemailsettings.h> | 42 | #include <kemailsettings.h> |
43 | #include <kstaticdeleter.h> | 43 | #include <kstaticdeleter.h> |
44 | #include <libkdepim/kpimglobalprefs.h> | ||
44 | 45 | ||
45 | #include "koprefs.h" | 46 | #include "koprefs.h" |
46 | #include "mainwindow.h" | 47 | #include "mainwindow.h" |
47 | 48 | ||
48 | const char *germanwords[][2] = { | 49 | const char *germanwords[][2] = { |
49 | #include "wordsgerman.h" | 50 | #include "wordsgerman.h" |
50 | "", "" | 51 | "", "" |
51 | }; | 52 | }; |
52 | 53 | ||
53 | KOPrefs *KOPrefs::mInstance = 0; | 54 | KOPrefs *KOPrefs::mInstance = 0; |
54 | static KStaticDeleter<KOPrefs> insd; | 55 | static KStaticDeleter<KOPrefs> insd; |
55 | 56 | ||
56 | KOPrefs::KOPrefs() : | 57 | KOPrefs::KOPrefs() : |
57 | KPimPrefs("korganizerrc") | 58 | KPimPrefs("korganizerrc") |
58 | { | 59 | { |
59 | mCategoryColors.setAutoDelete(true); | 60 | mCategoryColors.setAutoDelete(true); |
60 | mLocaleDict = 0; | 61 | mLocaleDict = 0; |
61 | fillMailDefaults(); | 62 | fillMailDefaults(); |
62 | mDefaultCategoryColor = QColor(175,210,255);//196,196,196); | 63 | mDefaultCategoryColor = QColor(175,210,255);//196,196,196); |
63 | QColor defaultHolidayColor = QColor(255,0,0); | 64 | QColor defaultHolidayColor = QColor(255,0,0); |
64 | QColor defaultHighlightColor = QColor(129,112,255);//64,64,255); | 65 | QColor defaultHighlightColor = QColor(129,112,255);//64,64,255); |
65 | QColor defaultAgendaBgColor = QColor(239,241,169);//128,128,128); | 66 | QColor defaultAgendaBgColor = QColor(239,241,169);//128,128,128); |
66 | QColor defaultWorkingHoursColor = QColor(170,223,150);//160,160,160); | 67 | QColor defaultWorkingHoursColor = QColor(170,223,150);//160,160,160); |
67 | QColor defaultTodoDueTodayColor = QColor(255,220,100); | 68 | QColor defaultTodoDueTodayColor = QColor(255,220,100); |
68 | QColor defaultTodoOverdueColor = QColor(255,153,125); | 69 | QColor defaultTodoOverdueColor = QColor(255,153,125); |
69 | 70 | ||
70 | mTimeBarFont = QFont("helvetica",10);//,QFont::Bold); | 71 | mTimeBarFont = QFont("helvetica",10);//,QFont::Bold); |
71 | mDefaultViewFont = QFont("helvetica",10); | 72 | mDefaultViewFont = QFont("helvetica",10); |
72 | mDefaultMonthViewFont = QFont("helvetica",8); | 73 | mDefaultMonthViewFont = QFont("helvetica",8); |
73 | mMarcusBainsFont= QFont("helvetica",10); | 74 | mMarcusBainsFont= QFont("helvetica",10); |
74 | mDateNavigatorFont= QFont("helvetica",10, QFont::Bold); | 75 | mDateNavigatorFont= QFont("helvetica",10, QFont::Bold); |
75 | mEditBoxFont = QFont("helvetica",12); | 76 | mEditBoxFont = QFont("helvetica",12); |
76 | mJornalViewFont = QFont("helvetica",12); | 77 | mJornalViewFont = QFont("helvetica",12); |
77 | 78 | ||
78 | KPrefs::setCurrentGroup("General"); | 79 | KPrefs::setCurrentGroup("General"); |
79 | addItemBool("Enable Group Scheduling",&mEnableGroupScheduling,false); | 80 | addItemBool("Enable Group Scheduling",&mEnableGroupScheduling,false); |
80 | 81 | ||
81 | addItemBool("ShowIconNewTodo",&mShowIconNewTodo,true); | 82 | addItemBool("ShowIconNewTodo",&mShowIconNewTodo,true); |
82 | addItemBool("ShowIconNewEvent",&mShowIconNewEvent,true); | 83 | addItemBool("ShowIconNewEvent",&mShowIconNewEvent,true); |
83 | addItemBool("ShowIconSearch",&mShowIconSearch,true); | 84 | addItemBool("ShowIconSearch",&mShowIconSearch,true); |
84 | addItemBool("ShowIconList",&mShowIconList,true); | 85 | addItemBool("ShowIconList",&mShowIconList,true); |
85 | addItemBool("ShowIconDay1",&mShowIconDay1,true); | 86 | addItemBool("ShowIconDay1",&mShowIconDay1,true); |
86 | addItemBool("ShowIconDay5",&mShowIconDay5,true); | 87 | addItemBool("ShowIconDay5",&mShowIconDay5,true); |
87 | addItemBool("ShowIconDay7",&mShowIconDay7,true); | 88 | addItemBool("ShowIconDay7",&mShowIconDay7,true); |
88 | addItemBool("ShowIconMonth",&mShowIconMonth,true); | 89 | addItemBool("ShowIconMonth",&mShowIconMonth,true); |
89 | addItemBool("ShowIconTodoview",&mShowIconTodoview,true); | 90 | addItemBool("ShowIconTodoview",&mShowIconTodoview,true); |
90 | addItemBool("ShowIconBackFast",&mShowIconBackFast,true); | 91 | addItemBool("ShowIconBackFast",&mShowIconBackFast,true); |
91 | addItemBool("ShowIconBack",&mShowIconBack,true); | 92 | addItemBool("ShowIconBack",&mShowIconBack,true); |
92 | addItemBool("ShowIconToday",&mShowIconToday,true); | 93 | addItemBool("ShowIconToday",&mShowIconToday,true); |
93 | addItemBool("ShowIconForward",&mShowIconForward,true); | 94 | addItemBool("ShowIconForward",&mShowIconForward,true); |
94 | addItemBool("ShowIconForwardFast",&mShowIconForwardFast,true); | 95 | addItemBool("ShowIconForwardFast",&mShowIconForwardFast,true); |
95 | addItemBool("ShowIconWhatsThis",&mShowIconWhatsThis,false); | 96 | addItemBool("ShowIconWhatsThis",&mShowIconWhatsThis,false); |
96 | addItemBool("ShowIconNextDays",&mShowIconNextDays,true); | 97 | addItemBool("ShowIconNextDays",&mShowIconNextDays,true); |
97 | addItemBool("ShowIconNext",&mShowIconNext,true); | 98 | addItemBool("ShowIconNext",&mShowIconNext,true); |
98 | addItemBool("ShowIconJournal",&mShowIconJournal,true); | 99 | addItemBool("ShowIconJournal",&mShowIconJournal,true); |
99 | addItemBool("ShowIconStretch",&mShowIconStretch,true); | 100 | addItemBool("ShowIconStretch",&mShowIconStretch,true); |
100 | addItemBool("LanguageChanged",&mLanguageChanged,false); | 101 | addItemBool("LanguageChanged",&mLanguageChanged,false); |
101 | 102 | ||
102 | addItemBool("AskForQuit",&mAskForQuit,false); | 103 | addItemBool("AskForQuit",&mAskForQuit,false); |
103 | 104 | ||
104 | #ifndef DESKTOP_VERSION | 105 | #ifndef DESKTOP_VERSION |
105 | addItemBool("ShowFullMenu",&mShowFullMenu,false); | 106 | addItemBool("ShowFullMenu",&mShowFullMenu,false); |
106 | #else | 107 | #else |
107 | addItemBool("ShowFullMenu",&mShowFullMenu,true); | 108 | addItemBool("ShowFullMenu",&mShowFullMenu,true); |
@@ -329,128 +330,129 @@ KOPrefs::~KOPrefs() | |||
329 | { | 330 | { |
330 | if (mInstance == this) | 331 | if (mInstance == this) |
331 | mInstance = insd.setObject(0); | 332 | mInstance = insd.setObject(0); |
332 | setLocaleDict( 0 ); | 333 | setLocaleDict( 0 ); |
333 | if ( mLocaleDict ) | 334 | if ( mLocaleDict ) |
334 | delete mLocaleDict; | 335 | delete mLocaleDict; |
335 | //qDebug("KOPrefs::~KOPrefs() "); | 336 | //qDebug("KOPrefs::~KOPrefs() "); |
336 | } | 337 | } |
337 | 338 | ||
338 | 339 | ||
339 | KOPrefs *KOPrefs::instance() | 340 | KOPrefs *KOPrefs::instance() |
340 | { | 341 | { |
341 | if (!mInstance) { | 342 | if (!mInstance) { |
342 | mInstance = insd.setObject(new KOPrefs()); | 343 | mInstance = insd.setObject(new KOPrefs()); |
343 | mInstance->readConfig(); | 344 | mInstance->readConfig(); |
344 | } | 345 | } |
345 | 346 | ||
346 | return mInstance; | 347 | return mInstance; |
347 | } | 348 | } |
348 | 349 | ||
349 | void KOPrefs::usrSetDefaults() | 350 | void KOPrefs::usrSetDefaults() |
350 | { | 351 | { |
351 | 352 | ||
352 | } | 353 | } |
353 | 354 | ||
354 | void KOPrefs::fillMailDefaults() | 355 | void KOPrefs::fillMailDefaults() |
355 | { | 356 | { |
356 | if (mName.isEmpty()) mName = i18n("Anonymous"); | 357 | if (mName.isEmpty()) mName = i18n("Anonymous"); |
357 | if (mEmail.isEmpty()) mEmail = i18n("nobody@nowhere"); | 358 | if (mEmail.isEmpty()) mEmail = i18n("nobody@nowhere"); |
358 | } | 359 | } |
359 | 360 | ||
360 | void KOPrefs::setTimeZoneIdDefault() | 361 | void KOPrefs::setTimeZoneIdDefault() |
361 | { | 362 | { |
362 | mTimeZoneId = i18n("+01:00 Europe/Oslo(CET)"); | 363 | mTimeZoneId = i18n("+01:00 Europe/Oslo(CET)"); |
363 | } | 364 | } |
364 | 365 | ||
365 | void KOPrefs::setCategoryDefaults() | 366 | void KOPrefs::setCategoryDefaults() |
366 | { | 367 | { |
367 | mCustomCategories.clear(); | 368 | mCustomCategories.clear(); |
368 | mCustomCategories = getDefaultList(); | 369 | mCustomCategories = getDefaultList(); |
369 | 370 | ||
370 | QStringList::Iterator it; | 371 | QStringList::Iterator it; |
371 | for (it = mCustomCategories.begin();it != mCustomCategories.end();++it ) { | 372 | for (it = mCustomCategories.begin();it != mCustomCategories.end();++it ) { |
372 | setCategoryColor(*it,mDefaultCategoryColor); | 373 | setCategoryColor(*it,mDefaultCategoryColor); |
373 | } | 374 | } |
374 | } | 375 | } |
375 | 376 | ||
376 | QStringList KOPrefs::getDefaultList() | 377 | QStringList KOPrefs::getDefaultList() |
377 | { | 378 | { |
378 | QStringList retval ; | 379 | QStringList retval ; |
379 | retval << i18n("Anniversary") << i18n("Appointment") << i18n("Birthday") << i18n("Business") << i18n("Business Travel") << i18n("Cinema") << i18n("Customer") | 380 | retval << i18n("Anniversary") << i18n("Appointment") << i18n("Birthday") << i18n("Business") << i18n("Business Travel") << i18n("Cinema") << i18n("Customer") |
380 | << i18n("Break")<< i18n("Breakfast")<< i18n("Competition")<< i18n("Dinner") | 381 | << i18n("Break")<< i18n("Breakfast")<< i18n("Competition")<< i18n("Dinner") |
381 | << i18n("Education")<< i18n("Family") << i18n("Favorites") << i18n("Festival")<< i18n("Fishing")<< i18n("Flight") << i18n("Gifts") | 382 | << i18n("Education")<< i18n("Family") << i18n("Favorites") << i18n("Festival")<< i18n("Fishing")<< i18n("Flight") << i18n("Gifts") |
382 | << i18n("Holiday") << i18n("Holiday Cards")<< i18n("Hot Contacts") << i18n("Hiking") << i18n("Hunting") << i18n("Key Customer") << i18n("Kids") | 383 | << i18n("Holiday") << i18n("Holiday Cards")<< i18n("Hot Contacts") << i18n("Hiking") << i18n("Hunting") << i18n("Key Customer") << i18n("Kids") |
383 | << i18n("Lunch") << i18n("Meeting") << i18n("Miscellaneous") << i18n("Partner")<< i18n("Party") << i18n("Personal") << i18n("Personal Travel") | 384 | << i18n("Lunch") << i18n("Meeting") << i18n("Miscellaneous") << i18n("Partner")<< i18n("Party") << i18n("Personal") << i18n("Personal Travel") |
384 | << i18n("PHB") << i18n("Phone Calls") << i18n("Projects") << i18n("Recurring") << i18n("School") << i18n("Shopping") | 385 | << i18n("PHB") << i18n("Phone Calls") << i18n("Projects") << i18n("Recurring") << i18n("School") << i18n("Shopping") |
385 | << i18n("Speach") << i18n("Special Occasion") << i18n("Sports") << i18n("Talk") << i18n("Travel") << i18n("TV")<< i18n("University") | 386 | << i18n("Speach") << i18n("Special Occasion") << i18n("Sports") << i18n("Talk") << i18n("Travel") << i18n("TV")<< i18n("University") |
386 | << i18n("Vacation") << i18n("VIP") << i18n("SyncEvent") ; | 387 | << i18n("Vacation") << i18n("VIP") << i18n("SyncEvent") ; |
387 | retval.sort(); | 388 | retval.sort(); |
388 | return retval; | 389 | return retval; |
389 | } | 390 | } |
390 | 391 | ||
391 | void KOPrefs::usrReadConfig() | 392 | void KOPrefs::usrReadConfig() |
392 | { | 393 | { |
394 | mPreferredLanguage = KPimGlobalPrefs::instance()->mPreferredLanguage; | ||
393 | mLocaleDict = 0; | 395 | mLocaleDict = 0; |
394 | // pending LR fix translation | 396 | // pending LR fix translation |
395 | // qDebug("KOPrefs::usrReadConfig() fix translation "); | 397 | // qDebug("KOPrefs::usrReadConfig() fix translation "); |
396 | if ( mPreferredLanguage > 0 && mPreferredLanguage < 4 ) { | 398 | if ( mPreferredLanguage > 0 && mPreferredLanguage < 4 ) { |
397 | if ( mPreferredLanguage == 1 ) { | 399 | if ( mPreferredLanguage == 1 ) { |
398 | mLocaleDict = new QDict<QString>; | 400 | mLocaleDict = new QDict<QString>; |
399 | int i = 0; | 401 | int i = 0; |
400 | QString fw ( germanwords[i] [0]); | 402 | QString fw ( germanwords[i] [0]); |
401 | while ( !fw.isEmpty() ) { | 403 | while ( !fw.isEmpty() ) { |
402 | mLocaleDict->insert( fw, new QString (germanwords[i] [1] )); | 404 | mLocaleDict->insert( fw, new QString (germanwords[i] [1] )); |
403 | ++i; | 405 | ++i; |
404 | fw = germanwords[i] [0]; | 406 | fw = germanwords[i] [0]; |
405 | } | 407 | } |
406 | 408 | ||
407 | setLocaleDict( mLocaleDict ); | 409 | setLocaleDict( mLocaleDict ); |
408 | } else { | 410 | } else { |
409 | QString fileName ; | 411 | QString fileName ; |
410 | if ( mPreferredLanguage == 3 ) | 412 | if ( mPreferredLanguage == 3 ) |
411 | fileName = MainWindow::resourcePath()+"usertranslation.txt"; | 413 | fileName = MainWindow::resourcePath()+"usertranslation.txt"; |
412 | else if ( mPreferredLanguage == 2 ) | 414 | else if ( mPreferredLanguage == 2 ) |
413 | fileName = MainWindow::resourcePath()+"frenchtranslation.txt"; | 415 | fileName = MainWindow::resourcePath()+"frenchtranslation.txt"; |
414 | QFile file( fileName ); | 416 | QFile file( fileName ); |
415 | if (file.open( IO_ReadOnly ) ) { | 417 | if (file.open( IO_ReadOnly ) ) { |
416 | QTextStream ts( &file ); | 418 | QTextStream ts( &file ); |
417 | ts.setEncoding( QTextStream::Latin1 ); | 419 | ts.setEncoding( QTextStream::Latin1 ); |
418 | //ts.setCodec( QTextCodec::latin1 ); | 420 | //ts.setCodec( QTextCodec::latin1 ); |
419 | QString text = ts.read(); | 421 | QString text = ts.read(); |
420 | file.close(); | 422 | file.close(); |
421 | text.replace( QRegExp("\\\\n"), "\n" ); | 423 | text.replace( QRegExp("\\\\n"), "\n" ); |
422 | QString line; | 424 | QString line; |
423 | QString we; | 425 | QString we; |
424 | QString wt; | 426 | QString wt; |
425 | int br = 0; | 427 | int br = 0; |
426 | int nbr; | 428 | int nbr; |
427 | nbr = text.find ( "},", br ); | 429 | nbr = text.find ( "},", br ); |
428 | line = text.mid( br, nbr - br ); | 430 | line = text.mid( br, nbr - br ); |
429 | br = nbr+1; | 431 | br = nbr+1; |
430 | int se, ee, st, et; | 432 | int se, ee, st, et; |
431 | mLocaleDict = new QDict<QString>; | 433 | mLocaleDict = new QDict<QString>; |
432 | QString end = "{ \"\",\"\" }"; | 434 | QString end = "{ \"\",\"\" }"; |
433 | while ( (line != end) && (br > 1) ) { | 435 | while ( (line != end) && (br > 1) ) { |
434 | //qDebug("%d *%s* ", br, line.latin1()); | 436 | //qDebug("%d *%s* ", br, line.latin1()); |
435 | se = line.find("\"")+1; | 437 | se = line.find("\"")+1; |
436 | et = line.findRev("\"",-1); | 438 | et = line.findRev("\"",-1); |
437 | ee = line.find("\",\""); | 439 | ee = line.find("\",\""); |
438 | st = ee+3; | 440 | st = ee+3; |
439 | we = line.mid( se, ee-se ); | 441 | we = line.mid( se, ee-se ); |
440 | wt = line.mid( st, et-st ); | 442 | wt = line.mid( st, et-st ); |
441 | //qDebug("*%s* *%s* ", we.latin1(), wt.latin1()); | 443 | //qDebug("*%s* *%s* ", we.latin1(), wt.latin1()); |
442 | mLocaleDict->insert( we, new QString (wt) ); | 444 | mLocaleDict->insert( we, new QString (wt) ); |
443 | nbr = text.find ( "}", br ); | 445 | nbr = text.find ( "}", br ); |
444 | line = text.mid( br, nbr - br ); | 446 | line = text.mid( br, nbr - br ); |
445 | br = nbr+1; | 447 | br = nbr+1; |
446 | } | 448 | } |
447 | //qDebug("end *%s* ", end.latin1()); | 449 | //qDebug("end *%s* ", end.latin1()); |
448 | 450 | ||
449 | setLocaleDict( mLocaleDict ); | 451 | setLocaleDict( mLocaleDict ); |
450 | } else { | 452 | } else { |
451 | qDebug("KO: Cannot find translation file %s",fileName.latin1() ); | 453 | qDebug("KO: Cannot find translation file %s",fileName.latin1() ); |
452 | } | 454 | } |
453 | 455 | ||
454 | } | 456 | } |
455 | } | 457 | } |
456 | config()->setGroup("General"); | 458 | config()->setGroup("General"); |
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp index 7dafcd8..b4b3b27 100644 --- a/korganizer/koprefsdialog.cpp +++ b/korganizer/koprefsdialog.cpp | |||
@@ -20,270 +20,274 @@ | |||
20 | with any edition of Qt, and distribute the resulting executable, | 20 | with any edition of Qt, and distribute the resulting executable, |
21 | without including the source code for Qt in the source distribution. | 21 | without including the source code for Qt in the source distribution. |
22 | */ | 22 | */ |
23 | 23 | ||
24 | #include <qlayout.h> | 24 | #include <qlayout.h> |
25 | #include <qlabel.h> | 25 | #include <qlabel.h> |
26 | #include <qgroupbox.h> | 26 | #include <qgroupbox.h> |
27 | #include <qbuttongroup.h> | 27 | #include <qbuttongroup.h> |
28 | #include <qlineedit.h> | 28 | #include <qlineedit.h> |
29 | #include <qfont.h> | 29 | #include <qfont.h> |
30 | #include <qslider.h> | 30 | #include <qslider.h> |
31 | #include <qfile.h> | 31 | #include <qfile.h> |
32 | #include <qtextstream.h> | 32 | #include <qtextstream.h> |
33 | #include <qcombobox.h> | 33 | #include <qcombobox.h> |
34 | #include <qvbox.h> | 34 | #include <qvbox.h> |
35 | #include <qhbox.h> | 35 | #include <qhbox.h> |
36 | #include <qregexp.h> | 36 | #include <qregexp.h> |
37 | #include <qspinbox.h> | 37 | #include <qspinbox.h> |
38 | #include <qdatetime.h> | 38 | #include <qdatetime.h> |
39 | #include <qcheckbox.h> | 39 | #include <qcheckbox.h> |
40 | #include <qradiobutton.h> | 40 | #include <qradiobutton.h> |
41 | #include <qpushbutton.h> | 41 | #include <qpushbutton.h> |
42 | #include <qstrlist.h> | 42 | #include <qstrlist.h> |
43 | #include <qapplication.h> | 43 | #include <qapplication.h> |
44 | 44 | ||
45 | #include <kcolorbutton.h> | 45 | #include <kcolorbutton.h> |
46 | #include <kdebug.h> | 46 | #include <kdebug.h> |
47 | #include <klocale.h> | 47 | #include <klocale.h> |
48 | #include <kglobal.h> | 48 | #include <kglobal.h> |
49 | #include <kfontdialog.h> | 49 | #include <kfontdialog.h> |
50 | #include <kfiledialog.h> | 50 | #include <kfiledialog.h> |
51 | #include <kmessagebox.h> | 51 | #include <kmessagebox.h> |
52 | #include <kcolordialog.h> | 52 | #include <kcolordialog.h> |
53 | #include <kiconloader.h> | 53 | #include <kiconloader.h> |
54 | #include <kemailsettings.h> | 54 | #include <kemailsettings.h> |
55 | #include <kstandarddirs.h> | 55 | #include <kstandarddirs.h> |
56 | 56 | ||
57 | #include <kurlrequester.h> | 57 | #include <kurlrequester.h> |
58 | #include <klineedit.h> | 58 | #include <klineedit.h> |
59 | 59 | ||
60 | #if defined(USE_SOLARIS) | 60 | #if defined(USE_SOLARIS) |
61 | #include <sys/param.h> | 61 | #include <sys/param.h> |
62 | 62 | ||
63 | #define ZONEINFODIR "/usr/share/lib/zoneinfo" | 63 | #define ZONEINFODIR "/usr/share/lib/zoneinfo" |
64 | #define INITFILE "/etc/default/init" | 64 | #define INITFILE "/etc/default/init" |
65 | #endif | 65 | #endif |
66 | 66 | ||
67 | #include "koprefs.h" | 67 | #include "koprefs.h" |
68 | 68 | ||
69 | #include "koprefsdialog.h" | 69 | #include "koprefsdialog.h" |
70 | #include "kpimglobalprefs.h" | 70 | #include "kpimglobalprefs.h" |
71 | 71 | ||
72 | 72 | ||
73 | KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) : | 73 | KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) : |
74 | KPrefsDialog(KOPrefs::instance(),parent,name,true) | 74 | KPrefsDialog(KOPrefs::instance(),parent,name,true) |
75 | { | 75 | { |
76 | 76 | ||
77 | setCaption( i18n("Preferences - some settings need a restart (nr)")); | 77 | setCaption( i18n("Preferences - some settings need a restart (nr)")); |
78 | mCategoryDict.setAutoDelete(true); | 78 | mCategoryDict.setAutoDelete(true); |
79 | 79 | ||
80 | KGlobal::locale()->insertCatalogue("timezones"); | 80 | KGlobal::locale()->insertCatalogue("timezones"); |
81 | 81 | ||
82 | setupGlobalTab(); | 82 | setupGlobalTab(); |
83 | setupMainTab(); | 83 | setupMainTab(); |
84 | setupLocaleTab(); | 84 | // setupLocaleTab(); |
85 | setupTimeZoneTab(); | 85 | //setupTimeZoneTab(); |
86 | setupTimeTab(); | 86 | setupTimeTab(); |
87 | setupLocaleDateTab(); | 87 | //setupLocaleDateTab(); |
88 | setupFontsTab(); | 88 | setupFontsTab(); |
89 | setupColorsTab(); | 89 | setupColorsTab(); |
90 | setupViewsTab(); | 90 | setupViewsTab(); |
91 | //setupSyncTab(); | 91 | //setupSyncTab(); |
92 | //setupSyncAlgTab(); | 92 | //setupSyncAlgTab(); |
93 | //setupPrinterTab(); | 93 | //setupPrinterTab(); |
94 | //setupGroupSchedulingTab(); | 94 | //setupGroupSchedulingTab(); |
95 | //setupGroupAutomationTab(); | 95 | //setupGroupAutomationTab(); |
96 | } | 96 | } |
97 | 97 | ||
98 | 98 | ||
99 | KOPrefsDialog::~KOPrefsDialog() | 99 | KOPrefsDialog::~KOPrefsDialog() |
100 | { | 100 | { |
101 | } | 101 | } |
102 | void KOPrefsDialog::setupGlobalTab() | 102 | void KOPrefsDialog::setupGlobalTab() |
103 | { | 103 | { |
104 | QFrame *topFrame = addPage(i18n("Global"),0,0); | 104 | QFrame *topFrame = addPage(i18n("Global"),0,0); |
105 | kdelibcfg = new KDEPIMConfigWidget( KPimGlobalPrefs::instance(), topFrame, "KCMKdeLibConfig" ); | 105 | kdelibcfg = new KDEPIMConfigWidget( KPimGlobalPrefs::instance(), topFrame, "KCMKdeLibConfig" ); |
106 | QVBoxLayout *topLayout = new QVBoxLayout(topFrame); | 106 | QVBoxLayout *topLayout = new QVBoxLayout(topFrame); |
107 | topLayout->addWidget( kdelibcfg ); | 107 | topLayout->addWidget( kdelibcfg ); |
108 | 108 | ||
109 | 109 | ||
110 | } | 110 | } |
111 | void KOPrefsDialog::setupLocaleDateTab() | 111 | void KOPrefsDialog::setupLocaleDateTab() |
112 | { | 112 | { |
113 | #if 0 | ||
113 | QFrame *topFrame = addPage(i18n("Date Format"),0,0); | 114 | QFrame *topFrame = addPage(i18n("Date Format"),0,0); |
114 | QGridLayout *topLayout = new QGridLayout(topFrame,3,2); | 115 | QGridLayout *topLayout = new QGridLayout(topFrame,3,2); |
115 | topLayout->setSpacing(spacingHint()); | 116 | topLayout->setSpacing(spacingHint()); |
116 | topLayout->setMargin(marginHint()); | 117 | topLayout->setMargin(marginHint()); |
117 | int iii = 0; | 118 | int iii = 0; |
118 | 119 | ||
119 | 120 | ||
120 | KPrefsDialogWidRadios *syncPrefsGroup = | 121 | KPrefsDialogWidRadios *syncPrefsGroup = |
121 | addWidRadios(i18n("Date Format:"),&(KOPrefs::instance()->mPreferredDate),topFrame); | 122 | addWidRadios(i18n("Date Format:"),&(KOPrefs::instance()->mPreferredDate),topFrame); |
122 | QString format; | 123 | QString format; |
123 | if ( QApplication::desktop()->width() < 480 ) | 124 | if ( QApplication::desktop()->width() < 480 ) |
124 | format = "(%d.%m.%Y)"; | 125 | format = "(%d.%m.%Y)"; |
125 | else | 126 | else |
126 | format = "(%d.%m.%Y|%A %d %B %Y)"; | 127 | format = "(%d.%m.%Y|%A %d %B %Y)"; |
127 | syncPrefsGroup->addRadio(i18n("24.03.2004 "+format)); | 128 | syncPrefsGroup->addRadio(i18n("24.03.2004 "+format)); |
128 | if ( QApplication::desktop()->width() < 480 ) | 129 | if ( QApplication::desktop()->width() < 480 ) |
129 | format = "(%m.%d.%Y)"; | 130 | format = "(%m.%d.%Y)"; |
130 | else | 131 | else |
131 | format = "(%m.%d.%Y|%A %B %d %Y)"; | 132 | format = "(%m.%d.%Y|%A %B %d %Y)"; |
132 | syncPrefsGroup->addRadio(i18n("03.24.2004 "+format)); | 133 | syncPrefsGroup->addRadio(i18n("03.24.2004 "+format)); |
133 | if ( QApplication::desktop()->width() < 480 ) | 134 | if ( QApplication::desktop()->width() < 480 ) |
134 | format = "(%Y-%m-%d)"; | 135 | format = "(%Y-%m-%d)"; |
135 | else | 136 | else |
136 | format = "(%Y-%m-%d|%A %Y %B %d)"; | 137 | format = "(%Y-%m-%d|%A %Y %B %d)"; |
137 | syncPrefsGroup->addRadio(i18n("2004-03-24 "+format)); | 138 | syncPrefsGroup->addRadio(i18n("2004-03-24 "+format)); |
138 | syncPrefsGroup->addRadio(i18n("User defined")); | 139 | syncPrefsGroup->addRadio(i18n("User defined")); |
139 | topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1); | 140 | topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1); |
140 | ++iii; | 141 | ++iii; |
141 | ++iii; | 142 | ++iii; |
142 | QLabel * lab; | 143 | QLabel * lab; |
143 | mUserDateFormatLong = new QLineEdit(topFrame); | 144 | mUserDateFormatLong = new QLineEdit(topFrame); |
144 | lab = new QLabel(mUserDateFormatLong, i18n("User long date:"), topFrame); | 145 | lab = new QLabel(mUserDateFormatLong, i18n("User long date:"), topFrame); |
145 | topLayout->addWidget(lab ,iii,0); | 146 | topLayout->addWidget(lab ,iii,0); |
146 | topLayout->addWidget(mUserDateFormatLong,iii,1); | 147 | topLayout->addWidget(mUserDateFormatLong,iii,1); |
147 | ++iii; | 148 | ++iii; |
148 | mUserDateFormatShort = new QLineEdit(topFrame); | 149 | mUserDateFormatShort = new QLineEdit(topFrame); |
149 | lab = new QLabel(mUserDateFormatShort, i18n("User short date:"), topFrame); | 150 | lab = new QLabel(mUserDateFormatShort, i18n("User short date:"), topFrame); |
150 | topLayout->addWidget(lab ,iii,0); | 151 | topLayout->addWidget(lab ,iii,0); |
151 | topLayout->addWidget(mUserDateFormatShort,iii,1); | 152 | topLayout->addWidget(mUserDateFormatShort,iii,1); |
152 | ++iii; | 153 | ++iii; |
153 | lab = new QLabel( i18n("Monday 19 April 2004: %A %d %B %Y"), topFrame); | 154 | lab = new QLabel( i18n("Monday 19 April 2004: %A %d %B %Y"), topFrame); |
154 | topLayout->addMultiCellWidget(lab ,iii,iii,0,1); | 155 | topLayout->addMultiCellWidget(lab ,iii,iii,0,1); |
155 | ++iii; | 156 | ++iii; |
156 | lab = new QLabel( i18n("Mon 19.04.04: %a %d.%m.%y"), topFrame); | 157 | lab = new QLabel( i18n("Mon 19.04.04: %a %d.%m.%y"), topFrame); |
157 | topLayout->addMultiCellWidget(lab ,iii,iii,0,1); | 158 | topLayout->addMultiCellWidget(lab ,iii,iii,0,1); |
158 | ++iii; | 159 | ++iii; |
159 | lab = new QLabel( i18n("Mon, 19.Apr.04: %a, %d.%b.%y"), topFrame); | 160 | lab = new QLabel( i18n("Mon, 19.Apr.04: %a, %d.%b.%y"), topFrame); |
160 | topLayout->addMultiCellWidget(lab ,iii,iii,0,1); | 161 | topLayout->addMultiCellWidget(lab ,iii,iii,0,1); |
161 | ++iii; | 162 | ++iii; |
163 | #endif | ||
162 | 164 | ||
163 | } | 165 | } |
164 | 166 | ||
165 | void KOPrefsDialog::setupLocaleTab() | 167 | void KOPrefsDialog::setupLocaleTab() |
166 | { | 168 | { |
169 | #if 0 | ||
167 | QFrame *topFrame = addPage(i18n("Locale"),0,0); | 170 | QFrame *topFrame = addPage(i18n("Locale"),0,0); |
168 | QGridLayout *topLayout = new QGridLayout(topFrame,4,2); | 171 | QGridLayout *topLayout = new QGridLayout(topFrame,4,2); |
169 | topLayout->setSpacing(spacingHint()); | 172 | topLayout->setSpacing(spacingHint()); |
170 | topLayout->setMargin(marginHint()); | 173 | topLayout->setMargin(marginHint()); |
171 | int iii = 0; | 174 | int iii = 0; |
172 | KPrefsDialogWidRadios *syncPrefsGroup = | 175 | KPrefsDialogWidRadios *syncPrefsGroup = |
173 | addWidRadios(i18n("Language:(needs restart)"),&(KOPrefs::instance()->mPreferredLanguage),topFrame); | 176 | addWidRadios(i18n("Language:(needs restart)"),&(KOPrefs::instance()->mPreferredLanguage),topFrame); |
174 | syncPrefsGroup->addRadio(i18n("English")); | 177 | syncPrefsGroup->addRadio(i18n("English")); |
175 | syncPrefsGroup->addRadio(i18n("German")); | 178 | syncPrefsGroup->addRadio(i18n("German")); |
176 | syncPrefsGroup->addRadio(i18n("French")); | 179 | syncPrefsGroup->addRadio(i18n("French")); |
177 | syncPrefsGroup->addRadio(i18n("User defined (usertranslation.txt)")); | 180 | syncPrefsGroup->addRadio(i18n("User defined (usertranslation.txt)")); |
178 | if ( QApplication::desktop()->width() < 300 ) | 181 | if ( QApplication::desktop()->width() < 300 ) |
179 | ;// syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical); | 182 | ;// syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical); |
180 | topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1); | 183 | topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1); |
181 | ++iii; | 184 | ++iii; |
182 | 185 | ||
183 | syncPrefsGroup = | 186 | syncPrefsGroup = |
184 | addWidRadios(i18n("Time Format(nr):"),&(KOPrefs::instance()->mPreferredTime),topFrame); | 187 | addWidRadios(i18n("Time Format(nr):"),&(KOPrefs::instance()->mPreferredTime),topFrame); |
185 | if ( QApplication::desktop()->width() > 300 ) | 188 | if ( QApplication::desktop()->width() > 300 ) |
186 | syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical); | 189 | syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical); |
187 | syncPrefsGroup->addRadio(i18n("24:00")); | 190 | syncPrefsGroup->addRadio(i18n("24:00")); |
188 | syncPrefsGroup->addRadio(i18n("12:00am")); | 191 | syncPrefsGroup->addRadio(i18n("12:00am")); |
189 | syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical); | 192 | syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical); |
190 | topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1); | 193 | topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1); |
191 | ++iii; | 194 | ++iii; |
192 | KPrefsDialogWidBool *sb; | 195 | KPrefsDialogWidBool *sb; |
193 | if ( QApplication::desktop()->width() < 300 ) { | 196 | if ( QApplication::desktop()->width() < 300 ) { |
194 | sb = | 197 | sb = |
195 | addWidBool(i18n("Week starts on Sunday"), | 198 | addWidBool(i18n("Week starts on Sunday"), |
196 | &(KOPrefs::instance()->mWeekStartsOnSunday),topFrame); | 199 | &(KOPrefs::instance()->mWeekStartsOnSunday),topFrame); |
197 | topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); | 200 | topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); |
198 | ++iii; | 201 | ++iii; |
199 | sb = | 202 | sb = |
200 | addWidBool(i18n("Use short date in (WN/E) view"), | 203 | addWidBool(i18n("Use short date in (WN/E) view"), |
201 | &(KOPrefs::instance()->mShortDateInViewer),topFrame); | 204 | &(KOPrefs::instance()->mShortDateInViewer),topFrame); |
202 | topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); | 205 | topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); |
203 | } | 206 | } |
204 | else { | 207 | else { |
205 | QWidget * hb = new QWidget( topFrame ); | 208 | QWidget * hb = new QWidget( topFrame ); |
206 | QHBoxLayout *hbLayout = new QHBoxLayout(hb); | 209 | QHBoxLayout *hbLayout = new QHBoxLayout(hb); |
207 | sb = | 210 | sb = |
208 | addWidBool(i18n("Week starts on Sunday"), | 211 | addWidBool(i18n("Week starts on Sunday"), |
209 | &(KOPrefs::instance()->mWeekStartsOnSunday),hb); | 212 | &(KOPrefs::instance()->mWeekStartsOnSunday),hb); |
210 | hbLayout->addWidget(sb->checkBox() ); | 213 | hbLayout->addWidget(sb->checkBox() ); |
211 | sb = | 214 | sb = |
212 | addWidBool(i18n("Use short date in (WN/E) view"), | 215 | addWidBool(i18n("Use short date in (WN/E) view"), |
213 | &(KOPrefs::instance()->mShortDateInViewer),hb); | 216 | &(KOPrefs::instance()->mShortDateInViewer),hb); |
214 | hbLayout->addWidget(sb->checkBox() ); | 217 | hbLayout->addWidget(sb->checkBox() ); |
215 | topLayout->addMultiCellWidget(hb, iii,iii,0,1); | 218 | topLayout->addMultiCellWidget(hb, iii,iii,0,1); |
216 | 219 | ||
217 | } | 220 | } |
218 | // KPrefsDialogWidBool *sb; //#ifndef DESKTOP_VERSION | 221 | // KPrefsDialogWidBool *sb; //#ifndef DESKTOP_VERSION |
219 | #if 0 | 222 | #if 0 |
220 | ++iii; | 223 | ++iii; |
221 | sb = | 224 | sb = |
222 | addWidBool(i18n("Quick load/save (w/o Unicode)"), | 225 | addWidBool(i18n("Quick load/save (w/o Unicode)"), |
223 | &(KOPrefs::instance()->mUseQuicksave),topFrame); | 226 | &(KOPrefs::instance()->mUseQuicksave),topFrame); |
224 | topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); | 227 | topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); |
225 | #endif | 228 | #endif |
229 | #endif | ||
226 | } | 230 | } |
227 | void KOPrefsDialog::showSyncPage() | 231 | void KOPrefsDialog::showSyncPage() |
228 | { | 232 | { |
229 | showPage ( 2 ) ; | 233 | showPage ( 2 ) ; |
230 | 234 | ||
231 | } | 235 | } |
232 | void KOPrefsDialog::setupSyncAlgTab() | 236 | void KOPrefsDialog::setupSyncAlgTab() |
233 | { | 237 | { |
234 | #if 0 | 238 | #if 0 |
235 | QLabel * lab; | 239 | QLabel * lab; |
236 | QFrame *topFrame = addPage(i18n("Sync Prefs"),0,0); | 240 | QFrame *topFrame = addPage(i18n("Sync Prefs"),0,0); |
237 | mSetupSyncAlgTab = topFrame; | 241 | mSetupSyncAlgTab = topFrame; |
238 | QGridLayout *topLayout = new QGridLayout(topFrame,6,2); | 242 | QGridLayout *topLayout = new QGridLayout(topFrame,6,2); |
239 | topLayout->setSpacing(spacingHint()); | 243 | topLayout->setSpacing(spacingHint()); |
240 | topLayout->setMargin(marginHint()); | 244 | topLayout->setMargin(marginHint()); |
241 | int iii = 0; | 245 | int iii = 0; |
242 | 246 | ||
243 | KPrefsDialogWidBool *sb = | 247 | KPrefsDialogWidBool *sb = |
244 | addWidBool(i18n("Ask for preferences before syncing"), | 248 | addWidBool(i18n("Ask for preferences before syncing"), |
245 | &(KOPrefs::instance()->mAskForPreferences),topFrame); | 249 | &(KOPrefs::instance()->mAskForPreferences),topFrame); |
246 | topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); | 250 | topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); |
247 | 251 | ||
248 | ++iii; | 252 | ++iii; |
249 | 253 | ||
250 | KPrefsDialogWidRadios *syncPrefsGroup = | 254 | KPrefsDialogWidRadios *syncPrefsGroup = |
251 | addWidRadios(i18n("Sync preferences:"),&(KOPrefs::instance()->mSyncAlgoPrefs), | 255 | addWidRadios(i18n("Sync preferences:"),&(KOPrefs::instance()->mSyncAlgoPrefs), |
252 | topFrame); | 256 | topFrame); |
253 | syncPrefsGroup->addRadio(i18n("Take local entry on conflict")); | 257 | syncPrefsGroup->addRadio(i18n("Take local entry on conflict")); |
254 | syncPrefsGroup->addRadio(i18n("Take remote entry on conflict")); | 258 | syncPrefsGroup->addRadio(i18n("Take remote entry on conflict")); |
255 | syncPrefsGroup->addRadio(i18n("Take newest entry on conflict")); | 259 | syncPrefsGroup->addRadio(i18n("Take newest entry on conflict")); |
256 | syncPrefsGroup->addRadio(i18n("Ask for every entry on conflict")); | 260 | syncPrefsGroup->addRadio(i18n("Ask for every entry on conflict")); |
257 | syncPrefsGroup->addRadio(i18n("Force take local entry always")); | 261 | syncPrefsGroup->addRadio(i18n("Force take local entry always")); |
258 | syncPrefsGroup->addRadio(i18n("Force take remote entry always")); | 262 | syncPrefsGroup->addRadio(i18n("Force take remote entry always")); |
259 | topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1); | 263 | topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1); |
260 | ++iii; | 264 | ++iii; |
261 | sb = | 265 | sb = |
262 | addWidBool(i18n("Show summary after syncing"), | 266 | addWidBool(i18n("Show summary after syncing"), |
263 | &(KOPrefs::instance()->mShowSyncSummary),topFrame); | 267 | &(KOPrefs::instance()->mShowSyncSummary),topFrame); |
264 | topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); | 268 | topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); |
265 | 269 | ||
266 | ++iii; | 270 | ++iii; |
267 | #endif | 271 | #endif |
268 | 272 | ||
269 | 273 | ||
270 | 274 | ||
271 | } | 275 | } |
272 | 276 | ||
273 | 277 | ||
274 | void KOPrefsDialog::setupSyncTab() | 278 | void KOPrefsDialog::setupSyncTab() |
275 | { | 279 | { |
276 | #if 0 | 280 | #if 0 |
277 | QLabel * lab; | 281 | QLabel * lab; |
278 | QFrame *topFrame = addPage(i18n("Sync Network"),0,0); | 282 | QFrame *topFrame = addPage(i18n("Sync Network"),0,0); |
279 | QGridLayout *topLayout = new QGridLayout(topFrame,6,2); | 283 | QGridLayout *topLayout = new QGridLayout(topFrame,6,2); |
280 | topLayout->setSpacing(spacingHint()); | 284 | topLayout->setSpacing(spacingHint()); |
281 | topLayout->setMargin(marginHint()); | 285 | topLayout->setMargin(marginHint()); |
282 | lab = new QLabel(i18n("Remote syncing (via ssh/scp)\nnetwork settings "), topFrame); | 286 | lab = new QLabel(i18n("Remote syncing (via ssh/scp)\nnetwork settings "), topFrame); |
283 | int iii = 0; | 287 | int iii = 0; |
284 | topLayout->addMultiCellWidget(lab , iii,iii,0,1); | 288 | topLayout->addMultiCellWidget(lab , iii,iii,0,1); |
285 | ++iii; | 289 | ++iii; |
286 | 290 | ||
287 | mRemoteIPEdit = new QLineEdit(topFrame); | 291 | mRemoteIPEdit = new QLineEdit(topFrame); |
288 | lab = new QLabel(mRemoteIPEdit, i18n("Remote IP:"), topFrame); | 292 | lab = new QLabel(mRemoteIPEdit, i18n("Remote IP:"), topFrame); |
289 | topLayout->addWidget(lab ,iii,0); | 293 | topLayout->addWidget(lab ,iii,0); |
@@ -562,144 +566,129 @@ void KOPrefsDialog::setupTimeTab() | |||
562 | } | 566 | } |
563 | 567 | ||
564 | 568 | ||
565 | void KOPrefsDialog::setupViewsTab() | 569 | void KOPrefsDialog::setupViewsTab() |
566 | { | 570 | { |
567 | 571 | ||
568 | QFrame *topFrame = addPage(i18n("Views"),0,0); | 572 | QFrame *topFrame = addPage(i18n("Views"),0,0); |
569 | // DesktopIcon("viewmag",KIcon::SizeMedium)); | 573 | // DesktopIcon("viewmag",KIcon::SizeMedium)); |
570 | 574 | ||
571 | QGridLayout *topLayout = new QGridLayout(topFrame,6,1); | 575 | QGridLayout *topLayout = new QGridLayout(topFrame,6,1); |
572 | topLayout->setSpacing(spacingHint()); | 576 | topLayout->setSpacing(spacingHint()); |
573 | topLayout->setMargin(marginHint()); | 577 | topLayout->setMargin(marginHint()); |
574 | 578 | ||
575 | // QBoxLayout *dayBeginsLayout = new QHBoxLayout; | 579 | // QBoxLayout *dayBeginsLayout = new QHBoxLayout; |
576 | // topLayout->addLayout(dayBeginsLayout,0,0); | 580 | // topLayout->addLayout(dayBeginsLayout,0,0); |
577 | 581 | ||
578 | // KPrefsDialogWidTime *dayBegins = | 582 | // KPrefsDialogWidTime *dayBegins = |
579 | // addWidTime(i18n("Day begins at:"),&(KOPrefs::instance()->mDayBegins), | 583 | // addWidTime(i18n("Day begins at:"),&(KOPrefs::instance()->mDayBegins), |
580 | // topFrame); | 584 | // topFrame); |
581 | // dayBeginsLayout->addWidget(dayBegins->label()); | 585 | // dayBeginsLayout->addWidget(dayBegins->label()); |
582 | // dayBeginsLayout->addStretch(1); | 586 | // dayBeginsLayout->addStretch(1); |
583 | // dayBeginsLayout->addWidget(dayBegins->spinBox()); | 587 | // dayBeginsLayout->addWidget(dayBegins->spinBox()); |
584 | 588 | ||
585 | // QBoxLayout *nextDaysLayout = new QHBoxLayout; | 589 | // QBoxLayout *nextDaysLayout = new QHBoxLayout; |
586 | // topLayout->addLayout(nextDaysLayout,1,0); | 590 | // topLayout->addLayout(nextDaysLayout,1,0); |
587 | // nextDaysLayout->addWidget(new QLabel(i18n("Days to show in Next-X-Days view:"),topFrame)); | 591 | // nextDaysLayout->addWidget(new QLabel(i18n("Days to show in Next-X-Days view:"),topFrame)); |
588 | // mNextXDaysSpin = new QSpinBox(2,14,1,topFrame); | 592 | // mNextXDaysSpin = new QSpinBox(2,14,1,topFrame); |
589 | // nextDaysLayout->addStretch(1); | 593 | // nextDaysLayout->addStretch(1); |
590 | // nextDaysLayout->addWidget(mNextXDaysSpin); | 594 | // nextDaysLayout->addWidget(mNextXDaysSpin); |
591 | 595 | ||
592 | 596 | ||
593 | int ii = 0; | 597 | int ii = 0; |
594 | KPrefsDialogWidBool *dummy = | 598 | KPrefsDialogWidBool *dummy = |
595 | addWidBool(i18n("Edit item on doubleclick (if not, show)"), | 599 | addWidBool(i18n("Edit item on doubleclick (if not, show)"), |
596 | &(KOPrefs::instance()->mEditOnDoubleClick),topFrame); | 600 | &(KOPrefs::instance()->mEditOnDoubleClick),topFrame); |
597 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 601 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
598 | 602 | ||
599 | dummy = | 603 | dummy = |
600 | addWidBool(i18n("Highlight current day in agenda"), | 604 | addWidBool(i18n("Highlight current day in agenda"), |
601 | &(KOPrefs::instance()->mHighlightCurrentDay),topFrame); | 605 | &(KOPrefs::instance()->mHighlightCurrentDay),topFrame); |
602 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 606 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
603 | 607 | ||
604 | dummy = | 608 | dummy = |
605 | addWidBool(i18n("Use light color for highlight current day"), | 609 | addWidBool(i18n("Use light color for highlight current day"), |
606 | &(KOPrefs::instance()->mUseHighlightLightColor),topFrame); | 610 | &(KOPrefs::instance()->mUseHighlightLightColor),topFrame); |
607 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 611 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
608 | 612 | ||
609 | KPrefsDialogWidBool *dailyRecur = | 613 | KPrefsDialogWidBool *dailyRecur = |
610 | addWidBool(i18n("Show events that recur daily in date nav."), | 614 | addWidBool(i18n("Show events that recur daily in date nav."), |
611 | &(KOPrefs::instance()->mDailyRecur),topFrame); | 615 | &(KOPrefs::instance()->mDailyRecur),topFrame); |
612 | topLayout->addWidget(dailyRecur->checkBox(),ii++,0); | 616 | topLayout->addWidget(dailyRecur->checkBox(),ii++,0); |
613 | 617 | ||
614 | KPrefsDialogWidBool *weeklyRecur = | 618 | KPrefsDialogWidBool *weeklyRecur = |
615 | addWidBool(i18n("Show ev. that recur weekly in date nav."), | 619 | addWidBool(i18n("Show ev. that recur weekly in date nav."), |
616 | &(KOPrefs::instance()->mWeeklyRecur),topFrame); | 620 | &(KOPrefs::instance()->mWeeklyRecur),topFrame); |
617 | topLayout->addWidget(weeklyRecur->checkBox(),ii++,0); | 621 | topLayout->addWidget(weeklyRecur->checkBox(),ii++,0); |
618 | if ( QApplication::desktop()->width() > 640 ) { | 622 | if ( QApplication::desktop()->width() > 640 ) { |
619 | 623 | ||
620 | KPrefsDialogWidBool *enableToolTips = | 624 | KPrefsDialogWidBool *enableToolTips = |
621 | addWidBool(i18n("Enable tooltips displaying summary of ev."), | 625 | addWidBool(i18n("Enable tooltips displaying summary of ev."), |
622 | &(KOPrefs::instance()->mEnableToolTips),topFrame); | 626 | &(KOPrefs::instance()->mEnableToolTips),topFrame); |
623 | topLayout->addWidget(enableToolTips->checkBox(),ii++,0); | 627 | topLayout->addWidget(enableToolTips->checkBox(),ii++,0); |
624 | 628 | ||
625 | } | 629 | } |
626 | KPrefsDialogWidBool *passwdk = | 630 | |
627 | addWidBool(i18n("Show parent To-Do's in What's Next view"), | ||
628 | &(KOPrefs::instance()->mWNViewShowsParents),topFrame); | ||
629 | topLayout->addWidget(passwdk->checkBox(), ii++,0); | ||
630 | |||
631 | passwdk = | ||
632 | addWidBool(i18n("Show location in What's Next view"), | ||
633 | &(KOPrefs::instance()->mWNViewShowLocation),topFrame); | ||
634 | topLayout->addWidget(passwdk->checkBox(), ii++,0); | ||
635 | |||
636 | passwdk = | ||
637 | addWidBool(i18n("Show Sync Events in WN/Agenda view"), | ||
638 | &(KOPrefs::instance()->mShowSyncEvents),topFrame); | ||
639 | topLayout->addWidget(passwdk->checkBox(), ii++,0); | ||
640 | |||
641 | |||
642 | KPrefsDialogWidBool *marcusBainsEnabled = | 631 | KPrefsDialogWidBool *marcusBainsEnabled = |
643 | addWidBool(i18n("Show Marcus Bains line"), | 632 | addWidBool(i18n("Show Marcus Bains line"), |
644 | &(KOPrefs::instance()->mMarcusBainsEnabled),topFrame); | 633 | &(KOPrefs::instance()->mMarcusBainsEnabled),topFrame); |
645 | topLayout->addWidget(marcusBainsEnabled->checkBox(),ii++,0); | 634 | topLayout->addWidget(marcusBainsEnabled->checkBox(),ii++,0); |
646 | 635 | ||
647 | 636 | ||
648 | // topLayout->addWidget(hourSizeGroup,ii++,0); | 637 | // topLayout->addWidget(hourSizeGroup,ii++,0); |
649 | // topLayout->addMultiCellWidget(hourSizeGroup,ii,ii,0,0); | 638 | // topLayout->addMultiCellWidget(hourSizeGroup,ii,ii,0,0); |
650 | //topLayout->setRowStretch(11,1); | 639 | //topLayout->setRowStretch(11,1); |
651 | 640 | ||
652 | 641 | ||
653 | 642 | ||
654 | 643 | ||
655 | 644 | ||
656 | 645 | ||
657 | topFrame = addPage(i18n("ViewChange"),0,0); | 646 | topFrame = addPage(i18n("ViewChange"),0,0); |
658 | // DesktopIcon("viewmag",KIcon::SizeMedium)); | 647 | // DesktopIcon("viewmag",KIcon::SizeMedium)); |
659 | 648 | ||
660 | topLayout = new QGridLayout(topFrame,6,1); | 649 | topLayout = new QGridLayout(topFrame,6,1); |
661 | topLayout->setSpacing(spacingHint()); | 650 | topLayout->setSpacing(spacingHint()); |
662 | topLayout->setMargin(marginHint()); | 651 | topLayout->setMargin(marginHint()); |
663 | ii = 0; | 652 | ii = 0; |
664 | 653 | ||
665 | 654 | ||
666 | dummy = | 655 | dummy = |
667 | addWidBool(i18n("Hold fullscreen on view change"), | 656 | addWidBool(i18n("Hold fullscreen on view change"), |
668 | &(KOPrefs::instance()->mViewChangeHoldFullscreen),topFrame); | 657 | &(KOPrefs::instance()->mViewChangeHoldFullscreen),topFrame); |
669 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 658 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
670 | 659 | ||
671 | dummy = | 660 | dummy = |
672 | addWidBool(i18n("Hold non-fullscreen on view change"), | 661 | addWidBool(i18n("Hold non-fullscreen on view change"), |
673 | &(KOPrefs::instance()->mViewChangeHoldNonFullscreen),topFrame); | 662 | &(KOPrefs::instance()->mViewChangeHoldNonFullscreen),topFrame); |
674 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 663 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
675 | 664 | ||
676 | 665 | ||
677 | KPrefsDialogWidBool *fullViewTodo = | 666 | KPrefsDialogWidBool *fullViewTodo = |
678 | addWidBool(i18n("Event list view uses full window"), | 667 | addWidBool(i18n("Event list view uses full window"), |
679 | &(KOPrefs::instance()->mFullViewTodo),topFrame); | 668 | &(KOPrefs::instance()->mFullViewTodo),topFrame); |
680 | topLayout->addWidget(fullViewTodo->checkBox(),ii++,0); | 669 | topLayout->addWidget(fullViewTodo->checkBox(),ii++,0); |
681 | 670 | ||
682 | KPrefsDialogWidBool *fullViewMonth = | 671 | KPrefsDialogWidBool *fullViewMonth = |
683 | addWidBool(i18n("Next days view uses full window"), | 672 | addWidBool(i18n("Next days view uses full window"), |
684 | &(KOPrefs::instance()->mFullViewMonth),topFrame); | 673 | &(KOPrefs::instance()->mFullViewMonth),topFrame); |
685 | topLayout->addWidget(fullViewMonth->checkBox(),ii++,0); | 674 | topLayout->addWidget(fullViewMonth->checkBox(),ii++,0); |
686 | 675 | ||
687 | dummy = | 676 | dummy = |
688 | addWidBool(i18n("Set agenda to DayBeginsAt on change"), | 677 | addWidBool(i18n("Set agenda to DayBeginsAt on change"), |
689 | &(KOPrefs::instance()->mSetTimeToDayStartAt),topFrame); | 678 | &(KOPrefs::instance()->mSetTimeToDayStartAt),topFrame); |
690 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 679 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
691 | 680 | ||
692 | dummy = | 681 | dummy = |
693 | addWidBool(i18n("Set agenda to current time on change"), | 682 | addWidBool(i18n("Set agenda to current time on change"), |
694 | &(KOPrefs::instance()->mCenterOnCurrentTime),topFrame); | 683 | &(KOPrefs::instance()->mCenterOnCurrentTime),topFrame); |
695 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 684 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
696 | 685 | ||
697 | dummy = | 686 | dummy = |
698 | addWidBool(i18n("Listview uses monthly timespan"), | 687 | addWidBool(i18n("Listview uses monthly timespan"), |
699 | &(KOPrefs::instance()->mListViewMonthTimespan),topFrame); | 688 | &(KOPrefs::instance()->mListViewMonthTimespan),topFrame); |
700 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 689 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
701 | dummy = | 690 | dummy = |
702 | addWidBool(i18n("Highlight selection in Time Edit"), | 691 | addWidBool(i18n("Highlight selection in Time Edit"), |
703 | &(KOPrefs::instance()->mHightlightDateTimeEdit),topFrame); | 692 | &(KOPrefs::instance()->mHightlightDateTimeEdit),topFrame); |
704 | topLayout->addWidget( dummy->checkBox(), ii++,0); | 693 | topLayout->addWidget( dummy->checkBox(), ii++,0); |
705 | 694 | ||
@@ -738,129 +727,155 @@ void KOPrefsDialog::setupViewsTab() | |||
738 | 727 | ||
739 | 728 | ||
740 | habo = new QHBox( topFrame ); | 729 | habo = new QHBox( topFrame ); |
741 | if ( QApplication::desktop()->width() < 320 ) { | 730 | if ( QApplication::desktop()->width() < 320 ) { |
742 | lab = new QLabel (i18n("Show in every cell ") , topFrame ); | 731 | lab = new QLabel (i18n("Show in every cell ") , topFrame ); |
743 | topLayout->addMultiCellWidget(lab,ii, ii,0,1); | 732 | topLayout->addMultiCellWidget(lab,ii, ii,0,1); |
744 | ii++; | 733 | ii++; |
745 | 734 | ||
746 | } else { | 735 | } else { |
747 | new QLabel ( i18n("Show in every cell "), habo ); | 736 | new QLabel ( i18n("Show in every cell "), habo ); |
748 | } | 737 | } |
749 | weeklyRecur = | 738 | weeklyRecur = |
750 | addWidBool(i18n("short month"), | 739 | addWidBool(i18n("short month"), |
751 | &(KOPrefs::instance()->mMonthShowShort),habo); | 740 | &(KOPrefs::instance()->mMonthShowShort),habo); |
752 | weeklyRecur = | 741 | weeklyRecur = |
753 | addWidBool(i18n("icons"), | 742 | addWidBool(i18n("icons"), |
754 | &(KOPrefs::instance()->mMonthShowIcons),habo); | 743 | &(KOPrefs::instance()->mMonthShowIcons),habo); |
755 | 744 | ||
756 | topLayout->addMultiCellWidget(habo,ii, ii,0,1); | 745 | topLayout->addMultiCellWidget(habo,ii, ii,0,1); |
757 | ii++; | 746 | ii++; |
758 | #ifdef DESKTOP_VERSION | 747 | #ifdef DESKTOP_VERSION |
759 | KPrefsDialogWidBool *enableMonthScroll = | 748 | KPrefsDialogWidBool *enableMonthScroll = |
760 | addWidBool(i18n("Enable scrollbars in month view cells"), | 749 | addWidBool(i18n("Enable scrollbars in month view cells"), |
761 | &(KOPrefs::instance()->mEnableMonthScroll),topFrame); | 750 | &(KOPrefs::instance()->mEnableMonthScroll),topFrame); |
762 | topLayout->addWidget(enableMonthScroll->checkBox(),ii++,0); | 751 | topLayout->addWidget(enableMonthScroll->checkBox(),ii++,0); |
763 | #endif | 752 | #endif |
764 | 753 | ||
765 | dummy = | 754 | dummy = |
766 | addWidBool(i18n("Show Sat/Sun together"), | 755 | addWidBool(i18n("Show Sat/Sun together"), |
767 | &(KOPrefs::instance()->mMonthViewSatSunTog),topFrame); | 756 | &(KOPrefs::instance()->mMonthViewSatSunTog),topFrame); |
768 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 757 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
769 | 758 | ||
770 | KPrefsDialogWidBool *coloredCategoriesInMonthView = | 759 | KPrefsDialogWidBool *coloredCategoriesInMonthView = |
771 | addWidBool(i18n("Month view uses category colors"), | 760 | addWidBool(i18n("Month view uses category colors"), |
772 | &(KOPrefs::instance()->mMonthViewUsesCategoryColor),topFrame); | 761 | &(KOPrefs::instance()->mMonthViewUsesCategoryColor),topFrame); |
773 | topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0); | 762 | topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0); |
774 | 763 | ||
775 | dummy = | 764 | dummy = |
776 | addWidBool(i18n("Categorie colors are applied to text"), | 765 | addWidBool(i18n("Categorie colors are applied to text"), |
777 | &(KOPrefs::instance()->mMonthViewUsesForegroundColor),topFrame); | 766 | &(KOPrefs::instance()->mMonthViewUsesForegroundColor),topFrame); |
778 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 767 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
779 | coloredCategoriesInMonthView = | 768 | coloredCategoriesInMonthView = |
780 | addWidBool(i18n("Month view uses day colors"), | 769 | addWidBool(i18n("Month view uses day colors"), |
781 | &(KOPrefs::instance()->mMonthViewUsesDayColors),topFrame); | 770 | &(KOPrefs::instance()->mMonthViewUsesDayColors),topFrame); |
782 | topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0); | 771 | topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0); |
783 | 772 | ||
784 | KPrefsDialogWidColor *holidayColor = | 773 | KPrefsDialogWidColor *holidayColor = |
785 | addWidColor(i18n("Day color odd months"), | 774 | addWidColor(i18n("Day color odd months"), |
786 | &(KOPrefs::instance()->mMonthViewOddColor),topFrame); | 775 | &(KOPrefs::instance()->mMonthViewOddColor),topFrame); |
787 | topLayout->addWidget(holidayColor->label(),ii,0); | 776 | topLayout->addWidget(holidayColor->label(),ii,0); |
788 | topLayout->addWidget(holidayColor->button(),ii++,1); | 777 | topLayout->addWidget(holidayColor->button(),ii++,1); |
789 | 778 | ||
790 | holidayColor = | 779 | holidayColor = |
791 | addWidColor(i18n("Day color even months"), | 780 | addWidColor(i18n("Day color even months"), |
792 | &(KOPrefs::instance()->mMonthViewEvenColor),topFrame); | 781 | &(KOPrefs::instance()->mMonthViewEvenColor),topFrame); |
793 | topLayout->addWidget(holidayColor->label(),ii,0); | 782 | topLayout->addWidget(holidayColor->label(),ii,0); |
794 | topLayout->addWidget(holidayColor->button(),ii++,1); | 783 | topLayout->addWidget(holidayColor->button(),ii++,1); |
795 | 784 | ||
796 | 785 | ||
797 | holidayColor = | 786 | holidayColor = |
798 | addWidColor(i18n("Color for Sundays + category \"Holiday\""), | 787 | addWidColor(i18n("Color for Sundays + category \"Holiday\""), |
799 | &(KOPrefs::instance()->mMonthViewHolidayColor),topFrame); | 788 | &(KOPrefs::instance()->mMonthViewHolidayColor),topFrame); |
800 | topLayout->addWidget(holidayColor->label(),ii,0); | 789 | topLayout->addWidget(holidayColor->label(),ii,0); |
801 | topLayout->addWidget(holidayColor->button(),ii++,1); | 790 | topLayout->addWidget(holidayColor->button(),ii++,1); |
802 | 791 | // *********************** What'sNext View | |
792 | topFrame = addPage(i18n("What's Next View"),0,0); | ||
793 | // DesktopIcon("viewmag",KIcon::SizeMedium)); | ||
794 | |||
795 | topLayout = new QGridLayout(topFrame,4,1); | ||
796 | topLayout->setSpacing(spacingHint()); | ||
797 | topLayout->setMargin(marginHint()); | ||
798 | ii = 0; | ||
799 | KPrefsDialogWidBool *passwdk = | ||
800 | addWidBool(i18n("Show parent To-Do's in What's Next view"), | ||
801 | &(KOPrefs::instance()->mWNViewShowsParents),topFrame); | ||
802 | topLayout->addWidget(passwdk->checkBox(), ii++,0); | ||
803 | |||
804 | passwdk = | ||
805 | addWidBool(i18n("Show location in What's Next view"), | ||
806 | &(KOPrefs::instance()->mWNViewShowLocation),topFrame); | ||
807 | topLayout->addWidget(passwdk->checkBox(), ii++,0); | ||
808 | |||
809 | passwdk = | ||
810 | addWidBool(i18n("Show Sync Events in \nWhat's Next/Agenda view"), | ||
811 | &(KOPrefs::instance()->mShowSyncEvents),topFrame); | ||
812 | topLayout->addWidget(passwdk->checkBox(), ii++,0); | ||
813 | passwdk = | ||
814 | addWidBool(i18n("Use short date in \nWhat's Next/Event view"), | ||
815 | &(KOPrefs::instance()->mShortDateInViewer),topFrame); | ||
816 | topLayout->addMultiCellWidget(passwdk->checkBox(), ii,ii,0,1); | ||
817 | |||
803 | // *********************** Todo View | 818 | // *********************** Todo View |
804 | 819 | ||
805 | topFrame = addPage(i18n("Todo View"),0,0); | 820 | topFrame = addPage(i18n("Todo View"),0,0); |
806 | // DesktopIcon("viewmag",KIcon::SizeMedium)); | 821 | // DesktopIcon("viewmag",KIcon::SizeMedium)); |
807 | 822 | ||
808 | topLayout = new QGridLayout(topFrame,4,1); | 823 | topLayout = new QGridLayout(topFrame,4,1); |
809 | topLayout->setSpacing(spacingHint()); | 824 | topLayout->setSpacing(spacingHint()); |
810 | topLayout->setMargin(marginHint()); | 825 | topLayout->setMargin(marginHint()); |
811 | ii = 0; | 826 | ii = 0; |
812 | 827 | ||
813 | KPrefsDialogWidBool *showCompletedTodo = | 828 | KPrefsDialogWidBool *showCompletedTodo = |
814 | addWidBool(i18n("To-do view shows completed Todos"), | 829 | addWidBool(i18n("To-do view shows completed Todos"), |
815 | &(KOPrefs::instance()->mShowCompletedTodo),topFrame); | 830 | &(KOPrefs::instance()->mShowCompletedTodo),topFrame); |
816 | topLayout->addWidget(showCompletedTodo->checkBox(),ii++,0); | 831 | topLayout->addWidget(showCompletedTodo->checkBox(),ii++,0); |
817 | dummy = | 832 | dummy = |
818 | addWidBool(i18n("To-do view shows complete as 'xx %'"), | 833 | addWidBool(i18n("To-do view shows complete as 'xx %'"), |
819 | &(KOPrefs::instance()->mTodoViewShowsPercentage),topFrame); | 834 | &(KOPrefs::instance()->mTodoViewShowsPercentage),topFrame); |
820 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 835 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
821 | 836 | ||
822 | dummy = | 837 | dummy = |
823 | addWidBool(i18n("Small To-do view uses smaller font"), | 838 | addWidBool(i18n("Small To-do view uses smaller font"), |
824 | &(KOPrefs::instance()->mTodoViewUsesSmallFont),topFrame); | 839 | &(KOPrefs::instance()->mTodoViewUsesSmallFont),topFrame); |
825 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 840 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
826 | 841 | ||
827 | 842 | ||
828 | 843 | ||
829 | dummy = | 844 | dummy = |
830 | addWidBool(i18n("Todo view uses category colors"), | 845 | addWidBool(i18n("Todo view uses category colors"), |
831 | &(KOPrefs::instance()->mTodoViewUsesCatColors),topFrame); | 846 | &(KOPrefs::instance()->mTodoViewUsesCatColors),topFrame); |
832 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 847 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
833 | 848 | ||
834 | 849 | ||
835 | QWidget* wid = new QWidget( topFrame ); | 850 | QWidget* wid = new QWidget( topFrame ); |
836 | // Todo due today color | 851 | // Todo due today color |
837 | KPrefsDialogWidColor *todoDueTodayColor = | 852 | KPrefsDialogWidColor *todoDueTodayColor = |
838 | addWidColor(i18n("Todo due today color:"), | 853 | addWidColor(i18n("Todo due today color:"), |
839 | &(KOPrefs::instance()->mTodoDueTodayColor),wid); | 854 | &(KOPrefs::instance()->mTodoDueTodayColor),wid); |
840 | QHBoxLayout *widLayout = new QHBoxLayout(wid); | 855 | QHBoxLayout *widLayout = new QHBoxLayout(wid); |
841 | widLayout->addWidget( todoDueTodayColor->label() ); | 856 | widLayout->addWidget( todoDueTodayColor->label() ); |
842 | widLayout->addWidget( todoDueTodayColor->button() ); | 857 | widLayout->addWidget( todoDueTodayColor->button() ); |
843 | topLayout->addWidget(wid,ii++,0); | 858 | topLayout->addWidget(wid,ii++,0); |
844 | //topLayout->addWidget(todoDueTodayColor->button(),ii++,1); | 859 | //topLayout->addWidget(todoDueTodayColor->button(),ii++,1); |
845 | 860 | ||
846 | // Todo overdue color | 861 | // Todo overdue color |
847 | wid = new QWidget( topFrame ); | 862 | wid = new QWidget( topFrame ); |
848 | widLayout = new QHBoxLayout(wid); | 863 | widLayout = new QHBoxLayout(wid); |
849 | KPrefsDialogWidColor *todoOverdueColor = | 864 | KPrefsDialogWidColor *todoOverdueColor = |
850 | addWidColor(i18n("Todo overdue color:"), | 865 | addWidColor(i18n("Todo overdue color:"), |
851 | &(KOPrefs::instance()->mTodoOverdueColor),wid); | 866 | &(KOPrefs::instance()->mTodoOverdueColor),wid); |
852 | widLayout->addWidget(todoOverdueColor->label()); | 867 | widLayout->addWidget(todoOverdueColor->label()); |
853 | widLayout->addWidget(todoOverdueColor->button()); | 868 | widLayout->addWidget(todoOverdueColor->button()); |
854 | topLayout->addWidget(wid,ii++,0); | 869 | topLayout->addWidget(wid,ii++,0); |
855 | 870 | ||
856 | dummy = | 871 | dummy = |
857 | addWidBool(i18n("Colors are applied to text"), | 872 | addWidBool(i18n("Colors are applied to text"), |
858 | &(KOPrefs::instance()->mTodoViewUsesForegroundColor),topFrame); | 873 | &(KOPrefs::instance()->mTodoViewUsesForegroundColor),topFrame); |
859 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 874 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
860 | 875 | ||
861 | dummy = | 876 | dummy = |
862 | addWidBool(i18n("Allday Agenda view shows todos"), | 877 | addWidBool(i18n("Allday Agenda view shows todos"), |
863 | &(KOPrefs::instance()->mShowTodoInAgenda),topFrame); | 878 | &(KOPrefs::instance()->mShowTodoInAgenda),topFrame); |
864 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 879 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
865 | 880 | ||
866 | 881 | ||
@@ -1275,202 +1290,202 @@ void KOPrefsDialog::setupGroupAutomationTab() | |||
1275 | topLayout->addMultiCellWidget(autoRefreshGroup->groupBox(),0,0,0,0); | 1290 | topLayout->addMultiCellWidget(autoRefreshGroup->groupBox(),0,0,0,0); |
1276 | 1291 | ||
1277 | KPrefsDialogWidRadios *autoInsertGroup = | 1292 | KPrefsDialogWidRadios *autoInsertGroup = |
1278 | addWidRadios(i18n("Auto Insert IMIP Replies"), | 1293 | addWidRadios(i18n("Auto Insert IMIP Replies"), |
1279 | &(KOPrefs::instance()->mIMIPAutoInsertReply),topFrame); | 1294 | &(KOPrefs::instance()->mIMIPAutoInsertReply),topFrame); |
1280 | autoInsertGroup->addRadio(i18n("Never")); | 1295 | autoInsertGroup->addRadio(i18n("Never")); |
1281 | autoInsertGroup->addRadio(i18n("If attendee is in addressbook")); | 1296 | autoInsertGroup->addRadio(i18n("If attendee is in addressbook")); |
1282 | //autoInsertGroup->addRadio(i18n("selected emails")); | 1297 | //autoInsertGroup->addRadio(i18n("selected emails")); |
1283 | topLayout->addMultiCellWidget(autoInsertGroup->groupBox(),1,1,0,0); | 1298 | topLayout->addMultiCellWidget(autoInsertGroup->groupBox(),1,1,0,0); |
1284 | 1299 | ||
1285 | KPrefsDialogWidRadios *autoRequestGroup = | 1300 | KPrefsDialogWidRadios *autoRequestGroup = |
1286 | addWidRadios(i18n("Auto Insert IMIP Requests"), | 1301 | addWidRadios(i18n("Auto Insert IMIP Requests"), |
1287 | &(KOPrefs::instance()->mIMIPAutoInsertRequest),topFrame); | 1302 | &(KOPrefs::instance()->mIMIPAutoInsertRequest),topFrame); |
1288 | autoRequestGroup->addRadio(i18n("Never")); | 1303 | autoRequestGroup->addRadio(i18n("Never")); |
1289 | autoRequestGroup->addRadio(i18n("If organizer is in addressbook")); | 1304 | autoRequestGroup->addRadio(i18n("If organizer is in addressbook")); |
1290 | //autoInsertGroup->addRadio(i18n("selected emails")); | 1305 | //autoInsertGroup->addRadio(i18n("selected emails")); |
1291 | topLayout->addMultiCellWidget(autoRequestGroup->groupBox(),2,2,0,0); | 1306 | topLayout->addMultiCellWidget(autoRequestGroup->groupBox(),2,2,0,0); |
1292 | 1307 | ||
1293 | KPrefsDialogWidRadios *autoFreeBusyGroup = | 1308 | KPrefsDialogWidRadios *autoFreeBusyGroup = |
1294 | addWidRadios(i18n("Auto Send FreeBusy Information"), | 1309 | addWidRadios(i18n("Auto Send FreeBusy Information"), |
1295 | &(KOPrefs::instance()->mIMIPAutoFreeBusy),topFrame); | 1310 | &(KOPrefs::instance()->mIMIPAutoFreeBusy),topFrame); |
1296 | autoFreeBusyGroup->addRadio(i18n("Never")); | 1311 | autoFreeBusyGroup->addRadio(i18n("Never")); |
1297 | autoFreeBusyGroup->addRadio(i18n("If requested from an email in addressbook")); | 1312 | autoFreeBusyGroup->addRadio(i18n("If requested from an email in addressbook")); |
1298 | //autoFreeBusyGroup->addRadio(i18n("selected emails")); | 1313 | //autoFreeBusyGroup->addRadio(i18n("selected emails")); |
1299 | topLayout->addMultiCellWidget(autoFreeBusyGroup->groupBox(),3,3,0,0); | 1314 | topLayout->addMultiCellWidget(autoFreeBusyGroup->groupBox(),3,3,0,0); |
1300 | 1315 | ||
1301 | KPrefsDialogWidRadios *autoFreeBusyReplyGroup = | 1316 | KPrefsDialogWidRadios *autoFreeBusyReplyGroup = |
1302 | addWidRadios(i18n("Auto Save FreeBusy Replies"), | 1317 | addWidRadios(i18n("Auto Save FreeBusy Replies"), |
1303 | &(KOPrefs::instance()->mIMIPAutoFreeBusyReply),topFrame); | 1318 | &(KOPrefs::instance()->mIMIPAutoFreeBusyReply),topFrame); |
1304 | autoFreeBusyReplyGroup->addRadio(i18n("Never")); | 1319 | autoFreeBusyReplyGroup->addRadio(i18n("Never")); |
1305 | autoFreeBusyReplyGroup->addRadio(i18n("If attendee is in addressbook")); | 1320 | autoFreeBusyReplyGroup->addRadio(i18n("If attendee is in addressbook")); |
1306 | //autoFreeBusyGroup->addRadio(i18n("selected emails")); | 1321 | //autoFreeBusyGroup->addRadio(i18n("selected emails")); |
1307 | topLayout->addMultiCellWidget(autoFreeBusyReplyGroup->groupBox(),4,4,0,0); | 1322 | topLayout->addMultiCellWidget(autoFreeBusyReplyGroup->groupBox(),4,4,0,0); |
1308 | } | 1323 | } |
1309 | 1324 | ||
1310 | void KOPrefsDialog::showPrinterTab() | 1325 | void KOPrefsDialog::showPrinterTab() |
1311 | { | 1326 | { |
1312 | showPage(pageIndex(mPrinterTab)); | 1327 | showPage(pageIndex(mPrinterTab)); |
1313 | } | 1328 | } |
1314 | 1329 | ||
1315 | 1330 | ||
1316 | void KOPrefsDialog::setCombo(QComboBox *combo, const QString & text, | 1331 | void KOPrefsDialog::setCombo(QComboBox *combo, const QString & text, |
1317 | const QStringList *tags) | 1332 | const QStringList *tags) |
1318 | { | 1333 | { |
1319 | if (tags) { | 1334 | if (tags) { |
1320 | int i = tags->findIndex(text); | 1335 | int i = tags->findIndex(text); |
1321 | if (i > 0) combo->setCurrentItem(i); | 1336 | if (i > 0) combo->setCurrentItem(i); |
1322 | } else { | 1337 | } else { |
1323 | for(int i=0;i<combo->count();++i) { | 1338 | for(int i=0;i<combo->count();++i) { |
1324 | if (combo->text(i) == text) { | 1339 | if (combo->text(i) == text) { |
1325 | combo->setCurrentItem(i); | 1340 | combo->setCurrentItem(i); |
1326 | break; | 1341 | break; |
1327 | } | 1342 | } |
1328 | } | 1343 | } |
1329 | } | 1344 | } |
1330 | } | 1345 | } |
1331 | 1346 | ||
1332 | void KOPrefsDialog::usrReadConfig() | 1347 | void KOPrefsDialog::usrReadConfig() |
1333 | { | 1348 | { |
1334 | kdelibcfg->readConfig(); | 1349 | kdelibcfg->readConfig(); |
1335 | mNameEdit->setText(KOPrefs::instance()->fullName()); | 1350 | mNameEdit->setText(KOPrefs::instance()->fullName()); |
1336 | mEmailEdit->setText(KOPrefs::instance()->email()); | 1351 | mEmailEdit->setText(KOPrefs::instance()->email()); |
1337 | 1352 | ||
1338 | mAutoSaveIntervalSpin->setValue(KOPrefs::instance()->mAutoSaveInterval); | 1353 | mAutoSaveIntervalSpin->setValue(KOPrefs::instance()->mAutoSaveInterval); |
1339 | QDate current ( 2001, 1,1); | 1354 | // QDate current ( 2001, 1,1); |
1340 | mStartDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingStart-1)); | 1355 | //mStartDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingStart-1)); |
1341 | mEndDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingEnd-1)); | 1356 | //mEndDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingEnd-1)); |
1342 | setCombo(mTimeZoneCombo,i18n(KOPrefs::instance()->mTimeZoneId)); | 1357 | //setCombo(mTimeZoneCombo,i18n(KOPrefs::instance()->mTimeZoneId)); |
1343 | //mTimezoneOffsetSpin->setValue( KOPrefs::instance()->mTimeZoneOffset); | 1358 | //mTimezoneOffsetSpin->setValue( KOPrefs::instance()->mTimeZoneOffset); |
1344 | mStartTimeSpin->setValue(KOPrefs::instance()->mStartTime); | 1359 | mStartTimeSpin->setValue(KOPrefs::instance()->mStartTime); |
1345 | mDefaultDurationSpin->setValue(KOPrefs::instance()->mDefaultDuration); | 1360 | mDefaultDurationSpin->setValue(KOPrefs::instance()->mDefaultDuration); |
1346 | mAlarmTimeCombo->setCurrentItem(KOPrefs::instance()->mAlarmTime); | 1361 | mAlarmTimeCombo->setCurrentItem(KOPrefs::instance()->mAlarmTime); |
1347 | // if (KOPrefs::instance()->mAllDaySize > 47 ) | 1362 | // if (KOPrefs::instance()->mAllDaySize > 47 ) |
1348 | // KOPrefs::instance()->mAllDaySize = KOPrefs::instance()->mAllDaySize/2; | 1363 | // KOPrefs::instance()->mAllDaySize = KOPrefs::instance()->mAllDaySize/2; |
1349 | //mHourSizeSlider->setValue(KOPrefs::instance()->mAllDaySize); | 1364 | //mHourSizeSlider->setValue(KOPrefs::instance()->mAllDaySize); |
1350 | 1365 | ||
1351 | mNextXDaysSpin->setValue(KOPrefs::instance()->mNextXDays); | 1366 | mNextXDaysSpin->setValue(KOPrefs::instance()->mNextXDays); |
1352 | mWhatsNextSpin->setValue(KOPrefs::instance()->mWhatsNextDays); | 1367 | mWhatsNextSpin->setValue(KOPrefs::instance()->mWhatsNextDays); |
1353 | mPrioSpin->setValue(KOPrefs::instance()->mWhatsNextPrios); | 1368 | mPrioSpin->setValue(KOPrefs::instance()->mWhatsNextPrios); |
1354 | // mAMails->clear(); | 1369 | // mAMails->clear(); |
1355 | // for ( QStringList::Iterator it = KOPrefs::instance()->mAdditionalMails.begin(); | 1370 | // for ( QStringList::Iterator it = KOPrefs::instance()->mAdditionalMails.begin(); |
1356 | // it != KOPrefs::instance()->mAdditionalMails.end(); ++it ) { | 1371 | // it != KOPrefs::instance()->mAdditionalMails.end(); ++it ) { |
1357 | // QListViewItem *item = new QListViewItem(mAMails); | 1372 | // QListViewItem *item = new QListViewItem(mAMails); |
1358 | // item->setText(0,*it); | 1373 | // item->setText(0,*it); |
1359 | // mAMails->insertItem(item); | 1374 | // mAMails->insertItem(item); |
1360 | // } | 1375 | // } |
1361 | 1376 | ||
1362 | // mRemoteIPEdit->setText(KOPrefs::instance()->mRemoteIP); | 1377 | // mRemoteIPEdit->setText(KOPrefs::instance()->mRemoteIP); |
1363 | //mRemoteUser->setText(KOPrefs::instance()->mRemoteUser); | 1378 | //mRemoteUser->setText(KOPrefs::instance()->mRemoteUser); |
1364 | //mRemotePassWd->setText(KOPrefs::instance()->mRemotePassWd); | 1379 | //mRemotePassWd->setText(KOPrefs::instance()->mRemotePassWd); |
1365 | //mRemoteFile->setText(KOPrefs::instance()->mRemoteFile); | 1380 | //mRemoteFile->setText(KOPrefs::instance()->mRemoteFile); |
1366 | 1381 | ||
1367 | //that soundmLocalTempFile->setText(KOPrefs::instance()->mLocalTempFile); | 1382 | //that soundmLocalTempFile->setText(KOPrefs::instance()->mLocalTempFile); |
1368 | mDefaultAlarmFile->setText(KOPrefs::instance()->mDefaultAlarmFile); | 1383 | mDefaultAlarmFile->setText(KOPrefs::instance()->mDefaultAlarmFile); |
1369 | QString dummy = KOPrefs::instance()->mUserDateFormatLong; | 1384 | //QString dummy = KOPrefs::instance()->mUserDateFormatLong; |
1370 | mUserDateFormatLong->setText(dummy.replace( QRegExp("K"), QString(",") )); | 1385 | //mUserDateFormatLong->setText(dummy.replace( QRegExp("K"), QString(",") )); |
1371 | dummy = KOPrefs::instance()->mUserDateFormatShort; | 1386 | //dummy = KOPrefs::instance()->mUserDateFormatShort; |
1372 | mUserDateFormatShort->setText(dummy.replace( QRegExp("K"), QString(",") )); | 1387 | //mUserDateFormatShort->setText(dummy.replace( QRegExp("K"), QString(",") )); |
1373 | updateCategories(); | 1388 | updateCategories(); |
1374 | mAlarmPlayBeeps->setValue(KOPrefs::instance()->mAlarmPlayBeeps ); | 1389 | mAlarmPlayBeeps->setValue(KOPrefs::instance()->mAlarmPlayBeeps ); |
1375 | mAlarmSuspendTime->setValue(KOPrefs::instance()->mAlarmSuspendTime ); | 1390 | mAlarmSuspendTime->setValue(KOPrefs::instance()->mAlarmSuspendTime ); |
1376 | mAlarmSuspendCount->setValue(KOPrefs::instance()->mAlarmSuspendCount ); | 1391 | mAlarmSuspendCount->setValue(KOPrefs::instance()->mAlarmSuspendCount ); |
1377 | mAlarmBeepInterval->setValue(KOPrefs::instance()->mAlarmBeepInterval ); | 1392 | mAlarmBeepInterval->setValue(KOPrefs::instance()->mAlarmBeepInterval ); |
1378 | } | 1393 | } |
1379 | 1394 | ||
1380 | 1395 | ||
1381 | void KOPrefsDialog::usrWriteConfig() | 1396 | void KOPrefsDialog::usrWriteConfig() |
1382 | { | 1397 | { |
1383 | 1398 | ||
1384 | kdelibcfg->writeConfig(); | 1399 | kdelibcfg->writeConfig(); |
1385 | // KOPrefs::instance()->mRemoteIP = mRemoteIPEdit->text(); | 1400 | // KOPrefs::instance()->mRemoteIP = mRemoteIPEdit->text(); |
1386 | //KOPrefs::instance()->mRemoteUser = mRemoteUser->text(); | 1401 | //KOPrefs::instance()->mRemoteUser = mRemoteUser->text(); |
1387 | //KOPrefs::instance()->mRemotePassWd = mRemotePassWd->text(); | 1402 | //KOPrefs::instance()->mRemotePassWd = mRemotePassWd->text(); |
1388 | //KOPrefs::instance()->mRemoteFile= mRemoteFile->text(); | 1403 | //KOPrefs::instance()->mRemoteFile= mRemoteFile->text(); |
1389 | //KOPrefs::instance()->mLocalTempFile =mLocalTempFile->text(); | 1404 | //KOPrefs::instance()->mLocalTempFile =mLocalTempFile->text(); |
1390 | KOPrefs::instance()->mDefaultAlarmFile =mDefaultAlarmFile->text(); | 1405 | KOPrefs::instance()->mDefaultAlarmFile =mDefaultAlarmFile->text(); |
1391 | 1406 | ||
1392 | KOPrefs::instance()->mUserDateFormatShort = mUserDateFormatShort->text().replace( QRegExp(","), QString("K") ); | 1407 | //KOPrefs::instance()->mUserDateFormatShort = mUserDateFormatShort->text().replace( QRegExp(","), QString("K") ); |
1393 | KOPrefs::instance()->mUserDateFormatLong = mUserDateFormatLong->text().replace( QRegExp(","), QString("K") ); | 1408 | //KOPrefs::instance()->mUserDateFormatLong = mUserDateFormatLong->text().replace( QRegExp(","), QString("K") ); |
1394 | KOPrefs::instance()->setFullName(mNameEdit->text()); | 1409 | KOPrefs::instance()->setFullName(mNameEdit->text()); |
1395 | KOPrefs::instance()->setEmail(mEmailEdit->text()); | 1410 | KOPrefs::instance()->setEmail(mEmailEdit->text()); |
1396 | 1411 | ||
1397 | KOPrefs::instance()->mAutoSaveInterval = mAutoSaveIntervalSpin->value(); | 1412 | KOPrefs::instance()->mAutoSaveInterval = mAutoSaveIntervalSpin->value(); |
1398 | 1413 | ||
1399 | KOPrefs::instance()->mTimeZoneId = mTimeZoneCombo->currentText(); | 1414 | // KOPrefs::instance()->mTimeZoneId = mTimeZoneCombo->currentText(); |
1400 | QDate date; | 1415 | //QDate date; |
1401 | date = mStartDateSavingEdit->date(); | 1416 | //date = mStartDateSavingEdit->date(); |
1402 | int sub = 0; | 1417 | //int sub = 0; |
1403 | if ( QDate::leapYear( date.year() ) && date.dayOfYear() > 59 ) | 1418 | //if ( QDate::leapYear( date.year() ) && date.dayOfYear() > 59 ) |
1404 | sub = 1; | 1419 | // sub = 1; |
1405 | KOPrefs::instance()->mDaylightsavingStart = date.dayOfYear()-sub; | 1420 | // KOPrefs::instance()->mDaylightsavingStart = date.dayOfYear()-sub; |
1406 | date = mEndDateSavingEdit->date(); | 1421 | // date = mEndDateSavingEdit->date(); |
1407 | if ( QDate::leapYear( date.year() ) && date.dayOfYear() > 59 ) | 1422 | // if ( QDate::leapYear( date.year() ) && date.dayOfYear() > 59 ) |
1408 | sub = 1; | 1423 | // sub = 1; |
1409 | else | 1424 | // else |
1410 | sub = 0; | 1425 | // sub = 0; |
1411 | KOPrefs::instance()->mDaylightsavingEnd = date.dayOfYear()-sub; | 1426 | // KOPrefs::instance()->mDaylightsavingEnd = date.dayOfYear()-sub; |
1412 | // KOPrefs::instance()->mTimeZoneOffset = mTimezoneOffsetSpin->value(); | 1427 | // // KOPrefs::instance()->mTimeZoneOffset = mTimezoneOffsetSpin->value(); |
1413 | 1428 | ||
1414 | KOPrefs::instance()->mStartTime = mStartTimeSpin->value(); | 1429 | KOPrefs::instance()->mStartTime = mStartTimeSpin->value(); |
1415 | KOPrefs::instance()->mDefaultDuration = mDefaultDurationSpin->value(); | 1430 | KOPrefs::instance()->mDefaultDuration = mDefaultDurationSpin->value(); |
1416 | KOPrefs::instance()->mAlarmTime = mAlarmTimeCombo->currentItem(); | 1431 | KOPrefs::instance()->mAlarmTime = mAlarmTimeCombo->currentItem(); |
1417 | 1432 | ||
1418 | //KOPrefs::instance()->mAllDaySize = mHourSizeSlider->value(); | 1433 | //KOPrefs::instance()->mAllDaySize = mHourSizeSlider->value(); |
1419 | 1434 | ||
1420 | QDictIterator<QColor> it(mCategoryDict); | 1435 | QDictIterator<QColor> it(mCategoryDict); |
1421 | while (it.current()) { | 1436 | while (it.current()) { |
1422 | KOPrefs::instance()->setCategoryColor(it.currentKey(),*it.current()); | 1437 | KOPrefs::instance()->setCategoryColor(it.currentKey(),*it.current()); |
1423 | ++it; | 1438 | ++it; |
1424 | } | 1439 | } |
1425 | 1440 | ||
1426 | KOPrefs::instance()->mNextXDays = mNextXDaysSpin->value(); | 1441 | KOPrefs::instance()->mNextXDays = mNextXDaysSpin->value(); |
1427 | KOPrefs::instance()->mWhatsNextDays = mWhatsNextSpin->value(); | 1442 | KOPrefs::instance()->mWhatsNextDays = mWhatsNextSpin->value(); |
1428 | KOPrefs::instance()->mWhatsNextPrios = mPrioSpin->value(); | 1443 | KOPrefs::instance()->mWhatsNextPrios = mPrioSpin->value(); |
1429 | 1444 | ||
1430 | KOPrefs::instance()->mAdditionalMails.clear(); | 1445 | KOPrefs::instance()->mAdditionalMails.clear(); |
1431 | // QListViewItem *item; | 1446 | // QListViewItem *item; |
1432 | // item = mAMails->firstChild(); | 1447 | // item = mAMails->firstChild(); |
1433 | // while (item) | 1448 | // while (item) |
1434 | // { | 1449 | // { |
1435 | // KOPrefs::instance()->mAdditionalMails.append( item->text(0) ); | 1450 | // KOPrefs::instance()->mAdditionalMails.append( item->text(0) ); |
1436 | // item = item->nextSibling(); | 1451 | // item = item->nextSibling(); |
1437 | // } | 1452 | // } |
1438 | KOPrefs::instance()->mAlarmPlayBeeps = mAlarmPlayBeeps->value(); | 1453 | KOPrefs::instance()->mAlarmPlayBeeps = mAlarmPlayBeeps->value(); |
1439 | KOPrefs::instance()->mAlarmSuspendTime = mAlarmSuspendTime->value() ; | 1454 | KOPrefs::instance()->mAlarmSuspendTime = mAlarmSuspendTime->value() ; |
1440 | KOPrefs::instance()->mAlarmSuspendCount= mAlarmSuspendCount->value() ; | 1455 | KOPrefs::instance()->mAlarmSuspendCount= mAlarmSuspendCount->value() ; |
1441 | KOPrefs::instance()->mAlarmBeepInterval= mAlarmBeepInterval->value() ; | 1456 | KOPrefs::instance()->mAlarmBeepInterval= mAlarmBeepInterval->value() ; |
1442 | 1457 | ||
1443 | } | 1458 | } |
1444 | 1459 | ||
1445 | void KOPrefsDialog::updateCategories() | 1460 | void KOPrefsDialog::updateCategories() |
1446 | { | 1461 | { |
1447 | mCategoryCombo->clear(); | 1462 | mCategoryCombo->clear(); |
1448 | mCategoryDict.clear(); | 1463 | mCategoryDict.clear(); |
1449 | mCategoryCombo->insertStringList(KOPrefs::instance()->mCustomCategories); | 1464 | mCategoryCombo->insertStringList(KOPrefs::instance()->mCustomCategories); |
1450 | updateCategoryColor(); | 1465 | updateCategoryColor(); |
1451 | } | 1466 | } |
1452 | 1467 | ||
1453 | void KOPrefsDialog::warningGroupScheduling() | 1468 | void KOPrefsDialog::warningGroupScheduling() |
1454 | { | 1469 | { |
1455 | warningExperimental(mEnableGroupScheduling->checkBox()->isChecked()); | 1470 | warningExperimental(mEnableGroupScheduling->checkBox()->isChecked()); |
1456 | } | 1471 | } |
1457 | 1472 | ||
1458 | void KOPrefsDialog::warningProjectView() | 1473 | void KOPrefsDialog::warningProjectView() |
1459 | { | 1474 | { |
1460 | warningExperimental(mEnableProjectView->checkBox()->isChecked()); | 1475 | warningExperimental(mEnableProjectView->checkBox()->isChecked()); |
1461 | } | 1476 | } |
1462 | 1477 | ||
1463 | void KOPrefsDialog::warningExperimental(bool on) | 1478 | void KOPrefsDialog::warningExperimental(bool on) |
1464 | { | 1479 | { |
1465 | if (on) { | 1480 | if (on) { |
1466 | KMessageBox::information(this,i18n("This is an experimental feature. " | 1481 | KMessageBox::information(this,i18n("This is an experimental feature. " |
1467 | "It may not work, it may do nothing useful and it may cause data loss. " | 1482 | "It may not work, it may do nothing useful and it may cause data loss. " |
1468 | "Use with care.\n" | 1483 | "Use with care.\n" |
1469 | "You have to restart KOrganizer for this setting to take effect.")); | 1484 | "You have to restart KOrganizer for this setting to take effect.")); |
1470 | } else { | 1485 | } else { |
1471 | KMessageBox::information(this, | 1486 | KMessageBox::information(this, |
1472 | i18n("You have to restart KOrganizer for this setting to take effect.")); | 1487 | i18n("You have to restart KOrganizer for this setting to take effect.")); |
1473 | } | 1488 | } |
1474 | } | 1489 | } |
1475 | 1490 | ||
1476 | void KOPrefsDialog::toggleEmailSettings(bool on) | 1491 | void KOPrefsDialog::toggleEmailSettings(bool on) |
@@ -1496,126 +1511,127 @@ void KOPrefsDialog::addItem() | |||
1496 | { | 1511 | { |
1497 | // aEmailsEdit->setEnabled(true); | 1512 | // aEmailsEdit->setEnabled(true); |
1498 | // QListViewItem *item = new QListViewItem(mAMails); | 1513 | // QListViewItem *item = new QListViewItem(mAMails); |
1499 | // mAMails->insertItem(item); | 1514 | // mAMails->insertItem(item); |
1500 | // mAMails->setSelected(item,true); | 1515 | // mAMails->setSelected(item,true); |
1501 | // aEmailsEdit->setText(i18n("(EmptyEmail)")); | 1516 | // aEmailsEdit->setText(i18n("(EmptyEmail)")); |
1502 | } | 1517 | } |
1503 | 1518 | ||
1504 | void KOPrefsDialog::removeItem() | 1519 | void KOPrefsDialog::removeItem() |
1505 | { | 1520 | { |
1506 | // QListViewItem *item; | 1521 | // QListViewItem *item; |
1507 | // item = mAMails->selectedItem(); | 1522 | // item = mAMails->selectedItem(); |
1508 | // if (!item) return; | 1523 | // if (!item) return; |
1509 | // mAMails->takeItem(item); | 1524 | // mAMails->takeItem(item); |
1510 | // item = mAMails->selectedItem(); | 1525 | // item = mAMails->selectedItem(); |
1511 | // if (!item) { | 1526 | // if (!item) { |
1512 | // aEmailsEdit->setText(""); | 1527 | // aEmailsEdit->setText(""); |
1513 | // aEmailsEdit->setEnabled(false); | 1528 | // aEmailsEdit->setEnabled(false); |
1514 | // } | 1529 | // } |
1515 | // if (mAMails->childCount() == 0) { | 1530 | // if (mAMails->childCount() == 0) { |
1516 | // aEmailsEdit->setEnabled(false); | 1531 | // aEmailsEdit->setEnabled(false); |
1517 | // } | 1532 | // } |
1518 | } | 1533 | } |
1519 | 1534 | ||
1520 | void KOPrefsDialog::updateItem() | 1535 | void KOPrefsDialog::updateItem() |
1521 | { | 1536 | { |
1522 | // QListViewItem *item; | 1537 | // QListViewItem *item; |
1523 | // item = mAMails->selectedItem(); | 1538 | // item = mAMails->selectedItem(); |
1524 | // if (!item) return; | 1539 | // if (!item) return; |
1525 | // item->setText(0,aEmailsEdit->text()); | 1540 | // item->setText(0,aEmailsEdit->text()); |
1526 | } | 1541 | } |
1527 | 1542 | ||
1528 | void KOPrefsDialog::updateInput() | 1543 | void KOPrefsDialog::updateInput() |
1529 | { | 1544 | { |
1530 | // QListViewItem *item; | 1545 | // QListViewItem *item; |
1531 | // item = mAMails->selectedItem(); | 1546 | // item = mAMails->selectedItem(); |
1532 | // if (!item) return; | 1547 | // if (!item) return; |
1533 | // aEmailsEdit->setEnabled(true); | 1548 | // aEmailsEdit->setEnabled(true); |
1534 | // aEmailsEdit->setText(item->text(0)); | 1549 | // aEmailsEdit->setText(item->text(0)); |
1535 | } | 1550 | } |
1536 | void KOPrefsDialog::updateTimezoneOffset( int index ) | 1551 | void KOPrefsDialog::updateTimezoneOffset( int index ) |
1537 | { | 1552 | { |
1538 | /* | 1553 | /* |
1539 | qDebug("updateTimezoneOffset %d ", index); | 1554 | qDebug("updateTimezoneOffset %d ", index); |
1540 | if ( index < 24 ) { | 1555 | if ( index < 24 ) { |
1541 | mTimezoneOffsetSpin->setEnabled ( false ); | 1556 | mTimezoneOffsetSpin->setEnabled ( false ); |
1542 | mTimezoneOffsetSpin->setValue( ( index-11 ) * 60 ); | 1557 | mTimezoneOffsetSpin->setValue( ( index-11 ) * 60 ); |
1543 | 1558 | ||
1544 | 1559 | ||
1545 | } else { | 1560 | } else { |
1546 | if ( index == 24 ) { | 1561 | if ( index == 24 ) { |
1547 | mTimezoneOffsetSpin->setEnabled ( true ); | 1562 | mTimezoneOffsetSpin->setEnabled ( true ); |
1548 | mTimezoneOffsetSpin->setValue( KOPrefs::instance()->mTimeZoneOffset); | 1563 | mTimezoneOffsetSpin->setValue( KOPrefs::instance()->mTimeZoneOffset); |
1549 | 1564 | ||
1550 | } else { | 1565 | } else { |
1551 | mTimezoneOffsetSpin->setEnabled ( false ); | 1566 | mTimezoneOffsetSpin->setEnabled ( false ); |
1552 | mTimezoneOffsetSpin->setValue( 0 ); | 1567 | mTimezoneOffsetSpin->setValue( 0 ); |
1553 | } | 1568 | } |
1554 | } | 1569 | } |
1555 | */ | 1570 | */ |
1556 | } | 1571 | } |
1557 | 1572 | ||
1558 | void KOPrefsDialog::setupTimeZoneTab() | 1573 | void KOPrefsDialog::setupTimeZoneTab() |
1559 | { | 1574 | { |
1575 | #if 0 | ||
1560 | QFrame *topFrame = addPage(i18n("Time Zone"),0,0); | 1576 | QFrame *topFrame = addPage(i18n("Time Zone"),0,0); |
1561 | // DesktopIcon("clock",KIcon::SizeMedium)); | 1577 | // DesktopIcon("clock",KIcon::SizeMedium)); |
1562 | 1578 | ||
1563 | QGridLayout *topLayout = new QGridLayout(topFrame,5,2); | 1579 | QGridLayout *topLayout = new QGridLayout(topFrame,5,2); |
1564 | topLayout->setSpacing(spacingHint()); | 1580 | topLayout->setSpacing(spacingHint()); |
1565 | topLayout->setMargin(marginHint()); | 1581 | topLayout->setMargin(marginHint()); |
1566 | 1582 | ||
1567 | QHBox *timeZoneBox = new QHBox( topFrame ); | 1583 | QHBox *timeZoneBox = new QHBox( topFrame ); |
1568 | topLayout->addMultiCellWidget( timeZoneBox, 0, 0, 0, 1 ); | 1584 | topLayout->addMultiCellWidget( timeZoneBox, 0, 0, 0, 1 ); |
1569 | 1585 | ||
1570 | new QLabel( i18n("Timezone:"), timeZoneBox ); | 1586 | new QLabel( i18n("Timezone:"), timeZoneBox ); |
1571 | mTimeZoneCombo = new QComboBox( timeZoneBox ); | 1587 | mTimeZoneCombo = new QComboBox( timeZoneBox ); |
1572 | if ( QApplication::desktop()->width() < 300 ) { | 1588 | if ( QApplication::desktop()->width() < 300 ) { |
1573 | mTimeZoneCombo->setMaximumWidth(150); | 1589 | mTimeZoneCombo->setMaximumWidth(150); |
1574 | } | 1590 | } |
1575 | 1591 | ||
1576 | QStringList list; | 1592 | QStringList list; |
1577 | list = KGlobal::locale()->timeZoneList(); | 1593 | list = KGlobal::locale()->timeZoneList(); |
1578 | mTimeZoneCombo->insertStringList(list); | 1594 | mTimeZoneCombo->insertStringList(list); |
1579 | 1595 | ||
1580 | // find the currently set time zone and select it | 1596 | // find the currently set time zone and select it |
1581 | QString sCurrentlySet = KOPrefs::instance()->mTimeZoneId; | 1597 | QString sCurrentlySet = KOPrefs::instance()->mTimeZoneId; |
1582 | int nCurrentlySet = 11; | 1598 | int nCurrentlySet = 11; |
1583 | for (int i = 0; i < mTimeZoneCombo->count(); i++) | 1599 | for (int i = 0; i < mTimeZoneCombo->count(); i++) |
1584 | { | 1600 | { |
1585 | if (mTimeZoneCombo->text(i) == sCurrentlySet) | 1601 | if (mTimeZoneCombo->text(i) == sCurrentlySet) |
1586 | { | 1602 | { |
1587 | nCurrentlySet = i; | 1603 | nCurrentlySet = i; |
1588 | break; | 1604 | break; |
1589 | } | 1605 | } |
1590 | } | 1606 | } |
1591 | mTimeZoneCombo->setCurrentItem(nCurrentlySet); | 1607 | mTimeZoneCombo->setCurrentItem(nCurrentlySet); |
1592 | int iii = 1; | 1608 | int iii = 1; |
1593 | KPrefsDialogWidBool *sb = | 1609 | KPrefsDialogWidBool *sb = |
1594 | addWidBool(i18n("Timezone has daylight saving"), | 1610 | addWidBool(i18n("Timezone has daylight saving"), |
1595 | &(KOPrefs::instance()->mUseDaylightsaving),topFrame); | 1611 | &(KOPrefs::instance()->mUseDaylightsaving),topFrame); |
1596 | topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); | 1612 | topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); |
1597 | ++iii; | 1613 | ++iii; |
1598 | QLabel* lab = new QLabel( i18n("Actual start and end is the\nsunday before this date."), topFrame ); | 1614 | QLabel* lab = new QLabel( i18n("Actual start and end is the\nsunday before this date."), topFrame ); |
1599 | topLayout->addMultiCellWidget(lab, iii,iii,0,1); | 1615 | topLayout->addMultiCellWidget(lab, iii,iii,0,1); |
1600 | ++iii; | 1616 | ++iii; |
1601 | lab = new QLabel( i18n("The year in the date is ignored."), topFrame ); | 1617 | lab = new QLabel( i18n("The year in the date is ignored."), topFrame ); |
1602 | topLayout->addMultiCellWidget(lab, iii,iii,0,1); | 1618 | topLayout->addMultiCellWidget(lab, iii,iii,0,1); |
1603 | ++iii; | 1619 | ++iii; |
1604 | lab = new QLabel( i18n("Daylight start:"), topFrame ); | 1620 | lab = new QLabel( i18n("Daylight start:"), topFrame ); |
1605 | topLayout->addWidget(lab, iii,0); | 1621 | topLayout->addWidget(lab, iii,0); |
1606 | mStartDateSavingEdit = new KDateEdit(topFrame); | 1622 | mStartDateSavingEdit = new KDateEdit(topFrame); |
1607 | topLayout->addWidget(mStartDateSavingEdit, iii,1); | 1623 | topLayout->addWidget(mStartDateSavingEdit, iii,1); |
1608 | ++iii; | 1624 | ++iii; |
1609 | 1625 | ||
1610 | lab = new QLabel( i18n("Daylight end:"), topFrame ); | 1626 | lab = new QLabel( i18n("Daylight end:"), topFrame ); |
1611 | topLayout->addWidget(lab, iii,0); | 1627 | topLayout->addWidget(lab, iii,0); |
1612 | mEndDateSavingEdit = new KDateEdit(topFrame); | 1628 | mEndDateSavingEdit = new KDateEdit(topFrame); |
1613 | topLayout->addWidget(mEndDateSavingEdit, iii,1); | 1629 | topLayout->addWidget(mEndDateSavingEdit, iii,1); |
1614 | ++iii; | 1630 | ++iii; |
1615 | QDate current ( 2001, 1,1); | 1631 | QDate current ( 2001, 1,1); |
1616 | mStartDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingStart-1)); | 1632 | mStartDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingStart-1)); |
1617 | mEndDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingEnd-1)); | 1633 | mEndDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingEnd-1)); |
1618 | 1634 | #endif | |
1619 | 1635 | ||
1620 | } | 1636 | } |
1621 | 1637 | ||
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index b597a6a..1c4a186 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -1,147 +1,149 @@ | |||
1 | #include <stdlib.h> | 1 | #include <stdlib.h> |
2 | 2 | ||
3 | #include <qaction.h> | 3 | #include <qaction.h> |
4 | #include <qpopupmenu.h> | 4 | #include <qpopupmenu.h> |
5 | #include <qpainter.h> | 5 | #include <qpainter.h> |
6 | #include <qwhatsthis.h> | 6 | #include <qwhatsthis.h> |
7 | #include <qmessagebox.h> | 7 | #include <qmessagebox.h> |
8 | #include <qlineedit.h> | 8 | #include <qlineedit.h> |
9 | #include <qfile.h> | 9 | #include <qfile.h> |
10 | #include <qdir.h> | 10 | #include <qdir.h> |
11 | #include <qapp.h> | 11 | #include <qapp.h> |
12 | #include <qfileinfo.h> | 12 | #include <qfileinfo.h> |
13 | #include <qlabel.h> | 13 | #include <qlabel.h> |
14 | #include <qmap.h> | 14 | #include <qmap.h> |
15 | #include <qwmatrix.h> | 15 | #include <qwmatrix.h> |
16 | #include <qtextbrowser.h> | 16 | #include <qtextbrowser.h> |
17 | #include <qtextstream.h> | 17 | #include <qtextstream.h> |
18 | #ifndef DESKTOP_VERSION | 18 | #ifndef DESKTOP_VERSION |
19 | #include <qpe/global.h> | 19 | #include <qpe/global.h> |
20 | #include <qpe/qpemenubar.h> | 20 | #include <qpe/qpemenubar.h> |
21 | #include <qpe/qpetoolbar.h> | 21 | #include <qpe/qpetoolbar.h> |
22 | #include <qpe/resource.h> | 22 | #include <qpe/resource.h> |
23 | #include <qpe/qpeapplication.h> | 23 | #include <qpe/qpeapplication.h> |
24 | #include <qtopia/alarmserver.h> | 24 | #include <qtopia/alarmserver.h> |
25 | #include <qtopia/qcopenvelope_qws.h> | 25 | #include <qtopia/qcopenvelope_qws.h> |
26 | #else | 26 | #else |
27 | #include <qmenubar.h> | 27 | #include <qmenubar.h> |
28 | #include <qtoolbar.h> | 28 | #include <qtoolbar.h> |
29 | #include <qapplication.h> | 29 | #include <qapplication.h> |
30 | //#include <resource.h> | 30 | //#include <resource.h> |
31 | 31 | ||
32 | #endif | 32 | #endif |
33 | #include <libkcal/calendarlocal.h> | 33 | #include <libkcal/calendarlocal.h> |
34 | #include <libkcal/todo.h> | 34 | #include <libkcal/todo.h> |
35 | #include <libkdepim/ksyncprofile.h> | 35 | #include <libkdepim/ksyncprofile.h> |
36 | #include <libkcal/kincidenceformatter.h> | 36 | #include <libkcal/kincidenceformatter.h> |
37 | #include <libkdepim/kpimglobalprefs.h> | ||
37 | 38 | ||
38 | #include "calendarview.h" | 39 | #include "calendarview.h" |
39 | #include "koviewmanager.h" | 40 | #include "koviewmanager.h" |
40 | #include "datenavigator.h" | 41 | #include "datenavigator.h" |
41 | #include "koagendaview.h" | 42 | #include "koagendaview.h" |
42 | #include "koagenda.h" | 43 | #include "koagenda.h" |
43 | #include "kodialogmanager.h" | 44 | #include "kodialogmanager.h" |
44 | #include "kdialogbase.h" | 45 | #include "kdialogbase.h" |
45 | #include "kapplication.h" | 46 | #include "kapplication.h" |
46 | #include "kofilterview.h" | 47 | #include "kofilterview.h" |
47 | #include "kstandarddirs.h" | 48 | #include "kstandarddirs.h" |
48 | #include "koprefs.h" | 49 | #include "koprefs.h" |
49 | #include "kfiledialog.h" | 50 | #include "kfiledialog.h" |
50 | #include "koglobals.h" | 51 | #include "koglobals.h" |
51 | #include "kglobal.h" | 52 | #include "kglobal.h" |
52 | #include "klocale.h" | 53 | #include "klocale.h" |
53 | #include "kconfig.h" | 54 | #include "kconfig.h" |
54 | #include "simplealarmclient.h" | 55 | #include "simplealarmclient.h" |
55 | #include "externalapphandler.h" | 56 | #include "externalapphandler.h" |
56 | 57 | ||
57 | using namespace KCal; | 58 | using namespace KCal; |
58 | #ifndef _WIN32_ | 59 | #ifndef _WIN32_ |
59 | #include <unistd.h> | 60 | #include <unistd.h> |
60 | #else | 61 | #else |
61 | #include "koimportoldialog.h" | 62 | #include "koimportoldialog.h" |
62 | #endif | 63 | #endif |
63 | #include "mainwindow.h" | 64 | #include "mainwindow.h" |
64 | 65 | ||
65 | int globalFlagBlockStartup; | 66 | int globalFlagBlockStartup; |
66 | MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : | 67 | MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : |
67 | QMainWindow( parent, name ) | 68 | QMainWindow( parent, name ) |
68 | { | 69 | { |
69 | 70 | ||
70 | #ifdef DESKTOP_VERSION | 71 | #ifdef DESKTOP_VERSION |
71 | setFont( QFont("Arial"), 14 ); | 72 | setFont( QFont("Arial"), 14 ); |
72 | #endif | 73 | #endif |
73 | 74 | ||
74 | mClosed = false; | 75 | mClosed = false; |
75 | //QString confFile = KStandardDirs::appDir() + "config/korganizerrc"; | 76 | //QString confFile = KStandardDirs::appDir() + "config/korganizerrc"; |
76 | QString confFile = locateLocal("config","korganizerrc"); | 77 | QString confFile = locateLocal("config","korganizerrc"); |
77 | QFileInfo finf ( confFile ); | 78 | QFileInfo finf ( confFile ); |
78 | bool showWarning = !finf.exists(); | 79 | bool showWarning = !finf.exists(); |
79 | setIcon(SmallIcon( "ko24" ) ); | 80 | setIcon(SmallIcon( "ko24" ) ); |
80 | mBlockAtStartup = true; | 81 | mBlockAtStartup = true; |
81 | mFlagKeyPressed = false; | 82 | mFlagKeyPressed = false; |
82 | setCaption("KOrganizer/Pi"); | 83 | setCaption("KOrganizer/Pi"); |
83 | KOPrefs *p = KOPrefs::instance(); | 84 | KOPrefs *p = KOPrefs::instance(); |
85 | KPimGlobalPrefs::instance()->setGlobalConfig(); | ||
84 | // if ( QApplication::desktop()->height() > 480 ) { | 86 | // if ( QApplication::desktop()->height() > 480 ) { |
85 | // if ( p->mHourSize == 4 ) | 87 | // if ( p->mHourSize == 4 ) |
86 | // p->mHourSize = 6; | 88 | // p->mHourSize = 6; |
87 | // } | 89 | // } |
88 | if ( p->mHourSize > 18 ) | 90 | if ( p->mHourSize > 18 ) |
89 | p->mHourSize = 18; | 91 | p->mHourSize = 18; |
90 | QMainWindow::ToolBarDock tbd; | 92 | QMainWindow::ToolBarDock tbd; |
91 | if ( p->mToolBarHor ) { | 93 | if ( p->mToolBarHor ) { |
92 | if ( p->mToolBarUp ) | 94 | if ( p->mToolBarUp ) |
93 | tbd = Bottom; | 95 | tbd = Bottom; |
94 | else | 96 | else |
95 | tbd = Top; | 97 | tbd = Top; |
96 | } | 98 | } |
97 | else { | 99 | else { |
98 | if ( p->mToolBarUp ) | 100 | if ( p->mToolBarUp ) |
99 | tbd = Right; | 101 | tbd = Right; |
100 | else | 102 | else |
101 | tbd = Left; | 103 | tbd = Left; |
102 | } | 104 | } |
103 | if ( KOPrefs::instance()->mUseAppColors ) | 105 | if ( KOPrefs::instance()->mUseAppColors ) |
104 | QApplication::setPalette( QPalette (KOPrefs::instance()->mAppColor1, KOPrefs::instance()->mAppColor2), true ); | 106 | QApplication::setPalette( QPalette (KOPrefs::instance()->mAppColor1, KOPrefs::instance()->mAppColor2), true ); |
105 | globalFlagBlockStartup = 1; | 107 | globalFlagBlockStartup = 1; |
106 | iconToolBar = new QPEToolBar( this ); | 108 | iconToolBar = new QPEToolBar( this ); |
107 | addToolBar (iconToolBar , tbd ); | 109 | addToolBar (iconToolBar , tbd ); |
108 | mBlockSaveFlag = false; | 110 | mBlockSaveFlag = false; |
109 | mCalendarModifiedFlag = false; | 111 | mCalendarModifiedFlag = false; |
110 | 112 | ||
111 | QLabel* splash = new QLabel(i18n("KO/Pi is starting ... "), this ); | 113 | QLabel* splash = new QLabel(i18n("KO/Pi is starting ... "), this ); |
112 | splash->setAlignment ( AlignCenter ); | 114 | splash->setAlignment ( AlignCenter ); |
113 | setCentralWidget( splash ); | 115 | setCentralWidget( splash ); |
114 | #ifndef DESKTOP_VERSION | 116 | #ifndef DESKTOP_VERSION |
115 | showMaximized(); | 117 | showMaximized(); |
116 | #endif | 118 | #endif |
117 | //qDebug("Mainwidget x %d y %d w %d h %d", x(), y(), width(), height ()); | 119 | //qDebug("Mainwidget x %d y %d w %d h %d", x(), y(), width(), height ()); |
118 | setDefaultPreferences(); | 120 | setDefaultPreferences(); |
119 | mCalendar = new CalendarLocal(); | 121 | mCalendar = new CalendarLocal(); |
120 | mView = new CalendarView( mCalendar, this,"mCalendar " ); | 122 | mView = new CalendarView( mCalendar, this,"mCalendar " ); |
121 | mView->hide(); | 123 | mView->hide(); |
122 | //mView->resize(splash->size() ); | 124 | //mView->resize(splash->size() ); |
123 | initActions(); | 125 | initActions(); |
124 | #ifndef DESKTOP_VERSION | 126 | #ifndef DESKTOP_VERSION |
125 | iconToolBar->show(); | 127 | iconToolBar->show(); |
126 | qApp->processEvents(); | 128 | qApp->processEvents(); |
127 | #endif | 129 | #endif |
128 | //qDebug("Splashwidget x %d y %d w %d h %d", splash-> x(), splash->y(), splash->width(),splash-> height ()); | 130 | //qDebug("Splashwidget x %d y %d w %d h %d", splash-> x(), splash->y(), splash->width(),splash-> height ()); |
129 | int vh = height() ; | 131 | int vh = height() ; |
130 | int vw = width(); | 132 | int vw = width(); |
131 | //qDebug("Toolbar hei %d ",iconToolBar->height() ); | 133 | //qDebug("Toolbar hei %d ",iconToolBar->height() ); |
132 | if ( iconToolBar->orientation () == Qt:: Horizontal ) { | 134 | if ( iconToolBar->orientation () == Qt:: Horizontal ) { |
133 | vh -= iconToolBar->height(); | 135 | vh -= iconToolBar->height(); |
134 | } else { | 136 | } else { |
135 | vw -= iconToolBar->height(); | 137 | vw -= iconToolBar->height(); |
136 | } | 138 | } |
137 | //mView->setMaximumSize( splash->size() ); | 139 | //mView->setMaximumSize( splash->size() ); |
138 | //mView->resize( splash->size() ); | 140 | //mView->resize( splash->size() ); |
139 | //qDebug("MainView x %d y %d w %d h %d", mView->x(),mView-> y(), mView->width(), mView->height ()); | 141 | //qDebug("MainView x %d y %d w %d h %d", mView->x(),mView-> y(), mView->width(), mView->height ()); |
140 | mView->readSettings(); | 142 | mView->readSettings(); |
141 | bool oldOpened = false; | 143 | bool oldOpened = false; |
142 | bool newFile = false; | 144 | bool newFile = false; |
143 | if( !QFile::exists( defaultFileName() ) ) { | 145 | if( !QFile::exists( defaultFileName() ) ) { |
144 | QFileInfo finfo ( defaultFileName() ); | 146 | QFileInfo finfo ( defaultFileName() ); |
145 | QString oldFile = QDir::convertSeparators( QDir::homeDirPath()+"/Applications/korganizer/mycalendar.ics"); | 147 | QString oldFile = QDir::convertSeparators( QDir::homeDirPath()+"/Applications/korganizer/mycalendar.ics"); |
146 | qDebug("oldfile %s ", oldFile.latin1()); | 148 | qDebug("oldfile %s ", oldFile.latin1()); |
147 | QString message = "You are starting KO/Pi for the\nfirst time after updating to a\nversion >= 1.9.1. The location of the\ndefault calendar file has changed.\nA mycalendar.ics file was detected\nat the old location.\nThis file will be loaded now\nand stored at the new location!\n(Config file location has changed, too!)\nPlease read menu Help-What's New!\n"; | 149 | QString message = "You are starting KO/Pi for the\nfirst time after updating to a\nversion >= 1.9.1. The location of the\ndefault calendar file has changed.\nA mycalendar.ics file was detected\nat the old location.\nThis file will be loaded now\nand stored at the new location!\n(Config file location has changed, too!)\nPlease read menu Help-What's New!\n"; |
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp index 00a07d9..2819ab1 100644 --- a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp +++ b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp | |||
@@ -683,89 +683,89 @@ void KDEPIMConfigWidget::usrReadConfig() | |||
683 | blockSignals( blocked ); | 683 | blockSignals( blocked ); |
684 | 684 | ||
685 | } | 685 | } |
686 | 686 | ||
687 | void KDEPIMConfigWidget::usrWriteConfig() | 687 | void KDEPIMConfigWidget::usrWriteConfig() |
688 | { | 688 | { |
689 | KPimGlobalPrefs* prefs = KPimGlobalPrefs::instance(); | 689 | KPimGlobalPrefs* prefs = KPimGlobalPrefs::instance(); |
690 | 690 | ||
691 | saveEditFieldSettings(); | 691 | saveEditFieldSettings(); |
692 | 692 | ||
693 | 693 | ||
694 | prefs->mUserDateFormatShort = mUserDateFormatShort->text().replace( QRegExp(","), QString("K") ); | 694 | prefs->mUserDateFormatShort = mUserDateFormatShort->text().replace( QRegExp(","), QString("K") ); |
695 | prefs->mUserDateFormatLong = mUserDateFormatLong->text().replace( QRegExp(","), QString("K") ); | 695 | prefs->mUserDateFormatLong = mUserDateFormatLong->text().replace( QRegExp(","), QString("K") ); |
696 | 696 | ||
697 | prefs->mTimeZoneId = mTimeZoneCombo->currentText(); | 697 | prefs->mTimeZoneId = mTimeZoneCombo->currentText(); |
698 | QDate date; | 698 | QDate date; |
699 | date = mStartDateSavingEdit->date(); | 699 | date = mStartDateSavingEdit->date(); |
700 | int sub = 0; | 700 | int sub = 0; |
701 | if ( QDate::leapYear( date.year() ) && date.dayOfYear() > 59 ) | 701 | if ( QDate::leapYear( date.year() ) && date.dayOfYear() > 59 ) |
702 | sub = 1; | 702 | sub = 1; |
703 | prefs->mDaylightsavingStart = date.dayOfYear()-sub; | 703 | prefs->mDaylightsavingStart = date.dayOfYear()-sub; |
704 | date = mEndDateSavingEdit->date(); | 704 | date = mEndDateSavingEdit->date(); |
705 | if ( QDate::leapYear( date.year() ) && date.dayOfYear() > 59 ) | 705 | if ( QDate::leapYear( date.year() ) && date.dayOfYear() > 59 ) |
706 | sub = 1; | 706 | sub = 1; |
707 | else | 707 | else |
708 | sub = 0; | 708 | sub = 0; |
709 | prefs->mDaylightsavingEnd = date.dayOfYear()-sub; | 709 | prefs->mDaylightsavingEnd = date.dayOfYear()-sub; |
710 | 710 | ||
711 | 711 | ||
712 | prefs->mEmailClient = mEmailClient; | 712 | prefs->mEmailClient = mEmailClient; |
713 | prefs->mEmailOtherChannel = mEmailOtherChannel; | 713 | prefs->mEmailOtherChannel = mEmailOtherChannel; |
714 | prefs->mEmailOtherMessage = mEmailOtherMessage; | 714 | prefs->mEmailOtherMessage = mEmailOtherMessage; |
715 | prefs->mEmailOtherMessageParameters = mEmailOtherMessageParameters; | 715 | prefs->mEmailOtherMessageParameters = mEmailOtherMessageParameters; |
716 | prefs->mEmailOtherMessage2 = mEmailOtherMessage2; | 716 | prefs->mEmailOtherMessage2 = mEmailOtherMessage2; |
717 | prefs->mEmailOtherMessageParameters2 = mEmailOtherMessageParameters2; | 717 | prefs->mEmailOtherMessageParameters2 = mEmailOtherMessageParameters2; |
718 | 718 | ||
719 | prefs->mPhoneClient = mPhoneClient; | 719 | prefs->mPhoneClient = mPhoneClient; |
720 | prefs->mPhoneOtherChannel = mPhoneOtherChannel; | 720 | prefs->mPhoneOtherChannel = mPhoneOtherChannel; |
721 | prefs->mPhoneOtherMessage = mPhoneOtherMessage; | 721 | prefs->mPhoneOtherMessage = mPhoneOtherMessage; |
722 | prefs->mPhoneOtherMessageParameters = mPhoneOtherMessageParameters; | 722 | prefs->mPhoneOtherMessageParameters = mPhoneOtherMessageParameters; |
723 | 723 | ||
724 | prefs->mFaxClient = mFaxClient; | 724 | prefs->mFaxClient = mFaxClient; |
725 | prefs->mFaxOtherChannel = mFaxOtherChannel; | 725 | prefs->mFaxOtherChannel = mFaxOtherChannel; |
726 | prefs->mFaxOtherMessage = mFaxOtherMessage; | 726 | prefs->mFaxOtherMessage = mFaxOtherMessage; |
727 | prefs->mFaxOtherMessageParameters = mFaxOtherMessageParameters; | 727 | prefs->mFaxOtherMessageParameters = mFaxOtherMessageParameters; |
728 | 728 | ||
729 | prefs->mSMSClient = mSMSClient; | 729 | prefs->mSMSClient = mSMSClient; |
730 | prefs->mSMSOtherChannel = mSMSOtherChannel; | 730 | prefs->mSMSOtherChannel = mSMSOtherChannel; |
731 | prefs->mSMSOtherMessage = mSMSOtherMessage; | 731 | prefs->mSMSOtherMessage = mSMSOtherMessage; |
732 | prefs->mSMSOtherMessageParameters = mSMSOtherMessageParameters; | 732 | prefs->mSMSOtherMessageParameters = mSMSOtherMessageParameters; |
733 | 733 | ||
734 | prefs->mPagerClient = mPagerClient; | 734 | prefs->mPagerClient = mPagerClient; |
735 | prefs->mPagerOtherChannel = mPagerOtherChannel; | 735 | prefs->mPagerOtherChannel = mPagerOtherChannel; |
736 | prefs->mPagerOtherMessage = mPagerOtherMessage; | 736 | prefs->mPagerOtherMessage = mPagerOtherMessage; |
737 | prefs->mPagerOtherMessageParameters = mPagerOtherMessageParameters; | 737 | prefs->mPagerOtherMessageParameters = mPagerOtherMessageParameters; |
738 | 738 | ||
739 | 739 | ||
740 | prefs->mSipClient = mSipClient; | 740 | prefs->mSipClient = mSipClient; |
741 | prefs->mSipOtherChannel = mSipOtherChannel; | 741 | prefs->mSipOtherChannel = mSipOtherChannel; |
742 | prefs->mSipOtherMessage = mSipOtherMessage; | 742 | prefs->mSipOtherMessage = mSipOtherMessage; |
743 | prefs->mSipOtherMessageParameters = mSipOtherMessageParameters; | 743 | prefs->mSipOtherMessageParameters = mSipOtherMessageParameters; |
744 | 744 | ||
745 | //release the cache that other views can access the changed values instantanious | 745 | //release the cache that other views can access the changed values instantanious |
746 | ExternalAppHandler::instance()->loadConfig(); | 746 | ExternalAppHandler::instance()->loadConfig(); |
747 | 747 | KPimGlobalPrefs::instance()->setGlobalConfig(); | |
748 | } | 748 | } |
749 | 749 | ||
750 | 750 | ||
751 | void KDEPIMConfigWidget::setCombo(QComboBox *combo, const QString & text, | 751 | void KDEPIMConfigWidget::setCombo(QComboBox *combo, const QString & text, |
752 | const QStringList *tags) | 752 | const QStringList *tags) |
753 | { | 753 | { |
754 | if (tags) { | 754 | if (tags) { |
755 | int i = tags->findIndex(text); | 755 | int i = tags->findIndex(text); |
756 | if (i > 0) combo->setCurrentItem(i); | 756 | if (i > 0) combo->setCurrentItem(i); |
757 | } else { | 757 | } else { |
758 | for(int i=0;i<combo->count();++i) { | 758 | for(int i=0;i<combo->count();++i) { |
759 | if (combo->text(i) == text) { | 759 | if (combo->text(i) == text) { |
760 | combo->setCurrentItem(i); | 760 | combo->setCurrentItem(i); |
761 | break; | 761 | break; |
762 | } | 762 | } |
763 | } | 763 | } |
764 | } | 764 | } |
765 | } | 765 | } |
766 | 766 | ||
767 | 767 | ||
768 | void KDEPIMConfigWidget::textChanged( const QString& text ) | 768 | void KDEPIMConfigWidget::textChanged( const QString& text ) |
769 | { | 769 | { |
770 | emit changed( true ); | 770 | emit changed( true ); |
771 | } | 771 | } |
diff --git a/libkdepim/kpimglobalprefs.cpp b/libkdepim/kpimglobalprefs.cpp index 12a503d..a896a0f 100644 --- a/libkdepim/kpimglobalprefs.cpp +++ b/libkdepim/kpimglobalprefs.cpp | |||
@@ -39,77 +39,94 @@ $Id$ | |||
39 | KPimGlobalPrefs *KPimGlobalPrefs::sInstance = 0; | 39 | KPimGlobalPrefs *KPimGlobalPrefs::sInstance = 0; |
40 | static KStaticDeleter<KPimGlobalPrefs> staticDeleter; | 40 | static KStaticDeleter<KPimGlobalPrefs> staticDeleter; |
41 | 41 | ||
42 | 42 | ||
43 | KPimGlobalPrefs::KPimGlobalPrefs( const QString &name ) | 43 | KPimGlobalPrefs::KPimGlobalPrefs( const QString &name ) |
44 | : KPrefs("microkdeglobalrc") | 44 | : KPrefs("microkdeglobalrc") |
45 | { | 45 | { |
46 | 46 | ||
47 | KPrefs::setCurrentGroup("Locale"); | 47 | KPrefs::setCurrentGroup("Locale"); |
48 | addItemInt("PreferredLanguage",&mPreferredLanguage,0); | 48 | addItemInt("PreferredLanguage",&mPreferredLanguage,0); |
49 | addItemInt("PreferredTime",&mPreferredTime,0); | 49 | addItemInt("PreferredTime",&mPreferredTime,0); |
50 | addItemInt("PreferredDate",&mPreferredDate,0); | 50 | addItemInt("PreferredDate",&mPreferredDate,0); |
51 | addItemBool("WeekStartsOnSunday",&mWeekStartsOnSunday,false); | 51 | addItemBool("WeekStartsOnSunday",&mWeekStartsOnSunday,false); |
52 | //addItemBool("QuickSavingWOUnicode",&mUseQuicksave,false); | 52 | //addItemBool("QuickSavingWOUnicode",&mUseQuicksave,false); |
53 | // addItemBool("ShortDateInViewer",&mShortDateInViewer,false); | 53 | // addItemBool("ShortDateInViewer",&mShortDateInViewer,false); |
54 | addItemString("UserDateFormatLong", &mUserDateFormatLong, "%A %d %b %y"); | 54 | addItemString("UserDateFormatLong", &mUserDateFormatLong, "%A %d %b %y"); |
55 | addItemString("UserDateFormatShort", &mUserDateFormatShort, "%aK %d.%m.%y"); | 55 | addItemString("UserDateFormatShort", &mUserDateFormatShort, "%aK %d.%m.%y"); |
56 | 56 | ||
57 | KPrefs::setCurrentGroup("Time & Date"); | 57 | KPrefs::setCurrentGroup("Time & Date"); |
58 | 58 | ||
59 | addItemString("TimeZoneName",&mTimeZoneId,i18n ("+01:00 Europe/Oslo(CET)") ); | 59 | addItemString("TimeZoneName",&mTimeZoneId,i18n ("+01:00 Europe/Oslo(CET)") ); |
60 | addItemBool("UseDaylightsaving",&mUseDaylightsaving,true); | 60 | addItemBool("UseDaylightsaving",&mUseDaylightsaving,true); |
61 | addItemInt("DaylightsavingStart",&mDaylightsavingStart,90); | 61 | addItemInt("DaylightsavingStart",&mDaylightsavingStart,90); |
62 | addItemInt("DaylightsavingEnd",&mDaylightsavingEnd,304); | 62 | addItemInt("DaylightsavingEnd",&mDaylightsavingEnd,304); |
63 | 63 | ||
64 | 64 | ||
65 | 65 | ||
66 | 66 | ||
67 | KPrefs::setCurrentGroup( "ExternalApplications" ); | 67 | KPrefs::setCurrentGroup( "ExternalApplications" ); |
68 | 68 | ||
69 | addItemInt( "EmailChannelType", &mEmailClient, OMPI_EMC ); | 69 | addItemInt( "EmailChannelType", &mEmailClient, OMPI_EMC ); |
70 | addItemString( "EmailChannel", &mEmailOtherChannel, "" ); | 70 | addItemString( "EmailChannel", &mEmailOtherChannel, "" ); |
71 | addItemString( "EmailChannelMessage", &mEmailOtherMessage, "" ); | 71 | addItemString( "EmailChannelMessage", &mEmailOtherMessage, "" ); |
72 | addItemString( "EmailChannelParameters", &mEmailOtherMessageParameters, "" ); | 72 | addItemString( "EmailChannelParameters", &mEmailOtherMessageParameters, "" ); |
73 | addItemString( "EmailChannelMessage2", &mEmailOtherMessage2, "" ); | 73 | addItemString( "EmailChannelMessage2", &mEmailOtherMessage2, "" ); |
74 | addItemString( "EmailChannelParameters2", &mEmailOtherMessageParameters2, "" ); | 74 | addItemString( "EmailChannelParameters2", &mEmailOtherMessageParameters2, "" ); |
75 | 75 | ||
76 | addItemInt( "PhoneChannelType", &mPhoneClient, KPPI_PHC ); | 76 | addItemInt( "PhoneChannelType", &mPhoneClient, KPPI_PHC ); |
77 | addItemString( "PhoneChannel", &mPhoneOtherChannel, "" ); | 77 | addItemString( "PhoneChannel", &mPhoneOtherChannel, "" ); |
78 | addItemString( "PhoneChannelMessage", &mPhoneOtherMessage, "" ); | 78 | addItemString( "PhoneChannelMessage", &mPhoneOtherMessage, "" ); |
79 | addItemString( "PhoneChannelParameters", &mPhoneOtherMessageParameters, "" ); | 79 | addItemString( "PhoneChannelParameters", &mPhoneOtherMessageParameters, "" ); |
80 | 80 | ||
81 | addItemInt( "FaxChannelType", &mFaxClient, NONE_FAC ); | 81 | addItemInt( "FaxChannelType", &mFaxClient, NONE_FAC ); |
82 | addItemString( "FaxChannel", &mFaxOtherChannel, "" ); | 82 | addItemString( "FaxChannel", &mFaxOtherChannel, "" ); |
83 | addItemString( "FaxChannelMessage", &mFaxOtherMessage, "" ); | 83 | addItemString( "FaxChannelMessage", &mFaxOtherMessage, "" ); |
84 | addItemString( "FaxChannelParameters", &mFaxOtherMessageParameters, "" ); | 84 | addItemString( "FaxChannelParameters", &mFaxOtherMessageParameters, "" ); |
85 | 85 | ||
86 | addItemInt( "SMSChannelType", &mSMSClient, NONE_SMC ); | 86 | addItemInt( "SMSChannelType", &mSMSClient, NONE_SMC ); |
87 | addItemString( "SMSChannel", &mSMSOtherChannel, "" ); | 87 | addItemString( "SMSChannel", &mSMSOtherChannel, "" ); |
88 | addItemString( "SMSChannelMessage", &mSMSOtherMessage, "" ); | 88 | addItemString( "SMSChannelMessage", &mSMSOtherMessage, "" ); |
89 | addItemString( "SMSChannelParameters", &mSMSOtherMessageParameters, "" ); | 89 | addItemString( "SMSChannelParameters", &mSMSOtherMessageParameters, "" ); |
90 | 90 | ||
91 | addItemInt( "PagerChannelType", &mPagerClient, NONE_PAC ); | 91 | addItemInt( "PagerChannelType", &mPagerClient, NONE_PAC ); |
92 | addItemString( "PagerChannel", &mPagerOtherChannel, "" ); | 92 | addItemString( "PagerChannel", &mPagerOtherChannel, "" ); |
93 | addItemString( "PagerChannelMessage", &mPagerOtherMessage, "" ); | 93 | addItemString( "PagerChannelMessage", &mPagerOtherMessage, "" ); |
94 | addItemString( "PagerChannelParameters", &mPagerOtherMessageParameters, "" ); | 94 | addItemString( "PagerChannelParameters", &mPagerOtherMessageParameters, "" ); |
95 | 95 | ||
96 | addItemInt( "SIPChannelType", &mSipClient, NONE_SIC ); | 96 | addItemInt( "SIPChannelType", &mSipClient, NONE_SIC ); |
97 | addItemString( "SIPChannel", &mSipOtherChannel, "" ); | 97 | addItemString( "SIPChannel", &mSipOtherChannel, "" ); |
98 | addItemString( "SIPChannelMessage", &mSipOtherMessage, "" ); | 98 | addItemString( "SIPChannelMessage", &mSipOtherMessage, "" ); |
99 | addItemString( "SIPChannelParameters", &mSipOtherMessageParameters, "" ); | 99 | addItemString( "SIPChannelParameters", &mSipOtherMessageParameters, "" ); |
100 | 100 | ||
101 | } | 101 | } |
102 | 102 | ||
103 | void KPimGlobalPrefs::setGlobalConfig() | ||
104 | { | ||
105 | |||
106 | KGlobal::locale()->setHore24Format( !mPreferredTime ); | ||
107 | KGlobal::locale()->setWeekStartMonday( !mWeekStartsOnSunday ); | ||
108 | KGlobal::locale()->setIntDateFormat( (KLocale::IntDateFormat)mPreferredDate ); | ||
109 | KGlobal::locale()->setLanguage( mPreferredLanguage ); | ||
110 | QString dummy = mUserDateFormatLong; | ||
111 | KGlobal::locale()->setDateFormat(dummy.replace( QRegExp("K"), QString(",") )); | ||
112 | dummy = mUserDateFormatShort; | ||
113 | KGlobal::locale()->setDateFormatShort(dummy.replace( QRegExp("K"), QString(",") )); | ||
114 | KGlobal::locale()->setDaylightSaving( mUseDaylightsaving, | ||
115 | mDaylightsavingStart, | ||
116 | mDaylightsavingEnd ); | ||
117 | KGlobal::locale()->setTimezone( mTimeZoneId ); | ||
118 | |||
119 | } | ||
103 | KPimGlobalPrefs::~KPimGlobalPrefs() | 120 | KPimGlobalPrefs::~KPimGlobalPrefs() |
104 | { | 121 | { |
105 | } | 122 | } |
106 | 123 | ||
107 | KPimGlobalPrefs *KPimGlobalPrefs::instance() | 124 | KPimGlobalPrefs *KPimGlobalPrefs::instance() |
108 | { | 125 | { |
109 | if ( !sInstance ) { | 126 | if ( !sInstance ) { |
110 | sInstance = staticDeleter.setObject( new KPimGlobalPrefs() ); | 127 | sInstance = staticDeleter.setObject( new KPimGlobalPrefs() ); |
111 | sInstance->readConfig(); | 128 | sInstance->readConfig(); |
112 | } | 129 | } |
113 | 130 | ||
114 | return sInstance; | 131 | return sInstance; |
115 | } | 132 | } |
diff --git a/libkdepim/kpimglobalprefs.h b/libkdepim/kpimglobalprefs.h index dad78e6..84ba689 100644 --- a/libkdepim/kpimglobalprefs.h +++ b/libkdepim/kpimglobalprefs.h | |||
@@ -1,137 +1,135 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of libkdepim. | 2 | This file is part of libkdepim. |
3 | Copyright (c) 2004 Ulf Schenk | 3 | Copyright (c) 2004 Ulf Schenk |
4 | 4 | ||
5 | This program is free software; you can redistribute it and/or modify | 5 | This program is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published by | 6 | it under the terms of the GNU General Public License as published by |
7 | the Free Software Foundation; either version 2 of the License, or | 7 | the Free Software Foundation; either version 2 of the License, or |
8 | (at your option) any later version. | 8 | (at your option) any later version. |
9 | 9 | ||
10 | This program is distributed in the hope that it will be useful, | 10 | This program is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
13 | GNU General Public License for more details. | 13 | GNU General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License |
16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
18 | 18 | ||
19 | As a special exception, permission is given to link this program | 19 | As a special exception, permission is given to link this program |
20 | with any edition of Qt, and distribute the resulting executable, | 20 | with any edition of Qt, and distribute the resulting executable, |
21 | without including the source code for Qt in the source distribution. | 21 | without including the source code for Qt in the source distribution. |
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 | #ifndef KPIMGLOBALPREFS_H | 31 | #ifndef KPIMGLOBALPREFS_H |
32 | #define KPIMGLOBALPREFS_H | 32 | #define KPIMGLOBALPREFS_H |
33 | 33 | ||
34 | #include "kprefs.h" | 34 | #include "kprefs.h" |
35 | 35 | ||
36 | class KPimGlobalPrefs : public KPrefs | 36 | class KPimGlobalPrefs : public KPrefs |
37 | { | 37 | { |
38 | public: | 38 | public: |
39 | 39 | ||
40 | void setGlobalConfig(); | ||
40 | static KPimGlobalPrefs *instance(); | 41 | static KPimGlobalPrefs *instance(); |
41 | 42 | ||
42 | 43 | ||
43 | virtual ~KPimGlobalPrefs(); | 44 | virtual ~KPimGlobalPrefs(); |
44 | 45 | ||
45 | 46 | ||
46 | enum EMailClients { | 47 | enum EMailClients { |
47 | NONE_EMC = 0, | 48 | NONE_EMC = 0, |
48 | OTHER_EMC = 1, | 49 | OTHER_EMC = 1, |
49 | OMPI_EMC = 2, | 50 | OMPI_EMC = 2, |
50 | QTOPIA_EMC = 3, | 51 | QTOPIA_EMC = 3, |
51 | OPIE_EMC = 4 | 52 | OPIE_EMC = 4 |
52 | }; | 53 | }; |
53 | 54 | ||
54 | enum PhoneClients { | 55 | enum PhoneClients { |
55 | NONE_PHC = 0, | 56 | NONE_PHC = 0, |
56 | OTHER_PHC = 1, | 57 | OTHER_PHC = 1, |
57 | KPPI_PHC = 2 | 58 | KPPI_PHC = 2 |
58 | }; | 59 | }; |
59 | 60 | ||
60 | enum FaxClients { | 61 | enum FaxClients { |
61 | NONE_FAC = 0, | 62 | NONE_FAC = 0, |
62 | OTHER_FAC = 1 | 63 | OTHER_FAC = 1 |
63 | }; | 64 | }; |
64 | 65 | ||
65 | enum SMSClients { | 66 | enum SMSClients { |
66 | NONE_SMC = 0, | 67 | NONE_SMC = 0, |
67 | OTHER_SMC = 1 | 68 | OTHER_SMC = 1 |
68 | }; | 69 | }; |
69 | 70 | ||
70 | enum PagerClients { | 71 | enum PagerClients { |
71 | NONE_PAC = 0, | 72 | NONE_PAC = 0, |
72 | OTHER_PAC = 1 | 73 | OTHER_PAC = 1 |
73 | }; | 74 | }; |
74 | 75 | ||
75 | enum SIPClients { | 76 | enum SIPClients { |
76 | NONE_SIC = 0, | 77 | NONE_SIC = 0, |
77 | OTHER_SIC = 1 | 78 | OTHER_SIC = 1 |
78 | }; | 79 | }; |
79 | 80 | ||
80 | private: | 81 | private: |
81 | KPimGlobalPrefs( const QString &name = QString::null ); | 82 | KPimGlobalPrefs( const QString &name = QString::null ); |
82 | 83 | ||
83 | static KPimGlobalPrefs *sInstance; | 84 | static KPimGlobalPrefs *sInstance; |
84 | 85 | ||
85 | 86 | ||
86 | public: | 87 | public: |
87 | //US I copied the following "locale" settings from KOPrefs | 88 | //US I copied the following "locale" settings from KOPrefs |
88 | int mPreferredDate; | 89 | int mPreferredDate; |
89 | QString mUserDateFormatLong; | 90 | QString mUserDateFormatLong; |
90 | QString mUserDateFormatShort; | 91 | QString mUserDateFormatShort; |
91 | int mPreferredLanguage; | 92 | int mPreferredLanguage; |
92 | int mPreferredTime; | 93 | int mPreferredTime; |
93 | bool mWeekStartsOnSunday; | 94 | bool mWeekStartsOnSunday; |
94 | QString mTimeZoneId; | 95 | QString mTimeZoneId; |
95 | bool mUseDaylightsaving; | 96 | bool mUseDaylightsaving; |
96 | int mDaylightsavingStart; | 97 | int mDaylightsavingStart; |
97 | int mDaylightsavingEnd; | 98 | int mDaylightsavingEnd; |
98 | 99 | ||
99 | |||
100 | |||
101 | |||
102 | int mEmailClient; | 100 | int mEmailClient; |
103 | QString mEmailOtherChannel; | 101 | QString mEmailOtherChannel; |
104 | QString mEmailOtherMessage; | 102 | QString mEmailOtherMessage; |
105 | QString mEmailOtherMessageParameters; | 103 | QString mEmailOtherMessageParameters; |
106 | QString mEmailOtherMessage2; | 104 | QString mEmailOtherMessage2; |
107 | QString mEmailOtherMessageParameters2; | 105 | QString mEmailOtherMessageParameters2; |
108 | 106 | ||
109 | int mPhoneClient; | 107 | int mPhoneClient; |
110 | QString mPhoneOtherChannel; | 108 | QString mPhoneOtherChannel; |
111 | QString mPhoneOtherMessage; | 109 | QString mPhoneOtherMessage; |
112 | QString mPhoneOtherMessageParameters; | 110 | QString mPhoneOtherMessageParameters; |
113 | 111 | ||
114 | int mFaxClient; | 112 | int mFaxClient; |
115 | QString mFaxOtherChannel; | 113 | QString mFaxOtherChannel; |
116 | QString mFaxOtherMessage; | 114 | QString mFaxOtherMessage; |
117 | QString mFaxOtherMessageParameters; | 115 | QString mFaxOtherMessageParameters; |
118 | 116 | ||
119 | int mSMSClient; | 117 | int mSMSClient; |
120 | QString mSMSOtherChannel; | 118 | QString mSMSOtherChannel; |
121 | QString mSMSOtherMessage; | 119 | QString mSMSOtherMessage; |
122 | QString mSMSOtherMessageParameters; | 120 | QString mSMSOtherMessageParameters; |
123 | 121 | ||
124 | int mPagerClient; | 122 | int mPagerClient; |
125 | QString mPagerOtherChannel; | 123 | QString mPagerOtherChannel; |
126 | QString mPagerOtherMessage; | 124 | QString mPagerOtherMessage; |
127 | QString mPagerOtherMessageParameters; | 125 | QString mPagerOtherMessageParameters; |
128 | 126 | ||
129 | int mSipClient; | 127 | int mSipClient; |
130 | QString mSipOtherChannel; | 128 | QString mSipOtherChannel; |
131 | QString mSipOtherMessage; | 129 | QString mSipOtherMessage; |
132 | QString mSipOtherMessageParameters; | 130 | QString mSipOtherMessageParameters; |
133 | 131 | ||
134 | 132 | ||
135 | }; | 133 | }; |
136 | 134 | ||
137 | #endif | 135 | #endif |