author | zautrix <zautrix> | 2005-04-05 23:31:44 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-04-05 23:31:44 (UTC) |
commit | cf4848d972efe96640f2d5f5d52704306d0cbe4c (patch) (unidiff) | |
tree | 123a2075927def5f7f59a20949d6b59174ae79b6 | |
parent | 6add774cf9841377f32613c7aa23161a823aa1da (diff) | |
download | kdepimpi-cf4848d972efe96640f2d5f5d52704306d0cbe4c.zip kdepimpi-cf4848d972efe96640f2d5f5d52704306d0cbe4c.tar.gz kdepimpi-cf4848d972efe96640f2d5f5d52704306d0cbe4c.tar.bz2 |
fixes
-rw-r--r-- | kaddressbook/details/look_details.cpp | 2 | ||||
-rw-r--r-- | kmicromail/koprefsdialog.cpp | 2 | ||||
-rw-r--r-- | korganizer/datenavigatorcontainer.cpp | 3 | ||||
-rw-r--r-- | korganizer/kodaymatrix.cpp | 8 | ||||
-rw-r--r-- | korganizer/koeventviewerdialog.cpp | 16 | ||||
-rw-r--r-- | korganizer/koeventviewerdialog.h | 1 | ||||
-rw-r--r-- | korganizer/koprefsdialog.cpp | 3 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 4 | ||||
-rw-r--r-- | microkde/kglobalsettings.cpp | 16 | ||||
-rw-r--r-- | microkde/kglobalsettings.h | 1 | ||||
-rw-r--r-- | microkde/kutils/kcmultidialog.cpp | 2 |
11 files changed, 38 insertions, 20 deletions
diff --git a/kaddressbook/details/look_details.cpp b/kaddressbook/details/look_details.cpp index 51ec0c0..11d06e9 100644 --- a/kaddressbook/details/look_details.cpp +++ b/kaddressbook/details/look_details.cpp | |||
@@ -1,258 +1,258 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of KAddressBook. | 2 | This file is part of KAddressBook. |
3 | Copyright (c) 1996-2002 Mirko Boehm <mirko@kde.org> | 3 | Copyright (c) 1996-2002 Mirko Boehm <mirko@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 <kconfig.h> | 24 | #include <kconfig.h> |
25 | #include <kdebug.h> | 25 | #include <kdebug.h> |
26 | #include <kglobalsettings.h> | 26 | #include <kglobalsettings.h> |
27 | #include <kinstance.h> | 27 | #include <kinstance.h> |
28 | #include <klocale.h> | 28 | #include <klocale.h> |
29 | #include <kstandarddirs.h> | 29 | #include <kstandarddirs.h> |
30 | 30 | ||
31 | #include <qcursor.h> | 31 | #include <qcursor.h> |
32 | #include <qdir.h> | 32 | #include <qdir.h> |
33 | #include <qpainter.h> | 33 | #include <qpainter.h> |
34 | #include <qpopupmenu.h> | 34 | #include <qpopupmenu.h> |
35 | 35 | ||
36 | #include "global.h" | 36 | #include "global.h" |
37 | #include "kabentrypainter.h" | 37 | #include "kabentrypainter.h" |
38 | 38 | ||
39 | #include "look_details.h" | 39 | #include "look_details.h" |
40 | 40 | ||
41 | #define GRID 5 | 41 | #define GRID 5 |
42 | 42 | ||
43 | const QString KABDetailedView::mBorderedBGDir = "kab3part/backgrounds/bordered/"; | 43 | const QString KABDetailedView::mBorderedBGDir = "kab3part/backgrounds/bordered/"; |
44 | const QString KABDetailedView::mTiledBGDir = "kab3part/backgrounds/tiled/"; | 44 | const QString KABDetailedView::mTiledBGDir = "kab3part/backgrounds/tiled/"; |
45 | 45 | ||
46 | KABDetailedView::KABDetailedView( QWidget *parent, const char *name ) | 46 | KABDetailedView::KABDetailedView( QWidget *parent, const char *name ) |
47 | : KABBasicLook( parent, name ), mPainter( 0 ), mBackgroundStyle( None ), | 47 | : KABBasicLook( parent, name ), mPainter( 0 ), mBackgroundStyle( None ), |
48 | mDefaultBGColor( white ), mHeadLineBGColor( darkBlue ), | 48 | mDefaultBGColor( white ), mHeadLineBGColor( darkBlue ), |
49 | mHeadLineTextColor( yellow ), mGrid( 3 ), mMenuBorderedBG( 0 ), | 49 | mHeadLineTextColor( yellow ), mGrid( 3 ), mMenuBorderedBG( 0 ), |
50 | mMenuTiledBG( 0 ) | 50 | mMenuTiledBG( 0 ) |
51 | { | 51 | { |
52 | KToggleAction** actions[] = { | 52 | KToggleAction** actions[] = { |
53 | &mActionShowAddresses, | 53 | &mActionShowAddresses, |
54 | &mActionShowEmails, | 54 | &mActionShowEmails, |
55 | &mActionShowPhones, | 55 | &mActionShowPhones, |
56 | &mActionShowURLs | 56 | &mActionShowURLs |
57 | }; | 57 | }; |
58 | 58 | ||
59 | QString actionTexts[] = { | 59 | QString actionTexts[] = { |
60 | i18n( "Show Postal Addresses" ), | 60 | i18n( "Show Postal Addresses" ), |
61 | i18n( "Show Email Addresses" ), | 61 | i18n( "Show Email Addresses" ), |
62 | i18n( "Show Telephone Numbers" ), | 62 | i18n( "Show Telephone Numbers" ), |
63 | i18n( "Show Web Pages (URLs)" ) | 63 | i18n( "Show Web Pages (URLs)" ) |
64 | }; | 64 | }; |
65 | 65 | ||
66 | QFont general = KGlobalSettings::generalFont(); | 66 | QFont general = KGlobalSettings::generalMaxFont(); |
67 | QFont fixed = KGlobalSettings::fixedFont(); | 67 | QFont fixed = KGlobalSettings::fixedFont(); |
68 | QString gfont = general.family(); | 68 | QString gfont = general.family(); |
69 | QString ffont = fixed.family(); | 69 | QString ffont = fixed.family(); |
70 | 70 | ||
71 | int gpointsize = general.pixelSize(); | 71 | int gpointsize = general.pixelSize(); |
72 | if ( gpointsize == -1 ) | 72 | if ( gpointsize == -1 ) |
73 | gpointsize = general.pointSize(); | 73 | gpointsize = general.pointSize(); |
74 | 74 | ||
75 | int fpointsize = fixed.pixelSize(); | 75 | int fpointsize = fixed.pixelSize(); |
76 | if ( fpointsize == -1 ) | 76 | if ( fpointsize == -1 ) |
77 | fpointsize = fixed.pointSize(); | 77 | fpointsize = fixed.pointSize(); |
78 | 78 | ||
79 | mPainter = new KABEntryPainter; | 79 | mPainter = new KABEntryPainter; |
80 | 80 | ||
81 | mPainter->setForegroundColor( black ); | 81 | mPainter->setForegroundColor( black ); |
82 | mPainter->setHeaderColor( mHeadLineTextColor ); | 82 | mPainter->setHeaderColor( mHeadLineTextColor ); |
83 | mPainter->setUseHeaderColor( mUseHeadLineBGColor ); | 83 | mPainter->setUseHeaderColor( mUseHeadLineBGColor ); |
84 | mPainter->setBackgroundColor( mHeadLineBGColor ); | 84 | mPainter->setBackgroundColor( mHeadLineBGColor ); |
85 | 85 | ||
86 | mPainter->setHeaderFont( QFont( gfont, gpointsize + 4, QFont::Bold, true ) ); | 86 | mPainter->setHeaderFont( QFont( gfont, gpointsize + 4, QFont::Bold, true ) ); |
87 | mPainter->setHeadLineFont( QFont( gfont, gpointsize + 2, QFont::Bold, true ) ); | 87 | mPainter->setHeadLineFont( QFont( gfont, gpointsize + 2, QFont::Bold, true ) ); |
88 | mPainter->setBodyFont( QFont( gfont, gpointsize, QFont::Normal, false ) ); | 88 | mPainter->setBodyFont( QFont( gfont, gpointsize, QFont::Normal, false ) ); |
89 | mPainter->setFixedFont( QFont( ffont, fpointsize, QFont::Normal, false ) ); | 89 | mPainter->setFixedFont( QFont( ffont, fpointsize, QFont::Normal, false ) ); |
90 | mPainter->setCommentFont( QFont( gfont, gpointsize, QFont::Normal, false ) ); | 90 | mPainter->setCommentFont( QFont( gfont, gpointsize, QFont::Normal, false ) ); |
91 | 91 | ||
92 | const int numActions = sizeof( actions ) / sizeof( actions[ 0 ] ); | 92 | const int numActions = sizeof( actions ) / sizeof( actions[ 0 ] ); |
93 | 93 | ||
94 | for ( int count = 0; count < numActions; ++count ) { | 94 | for ( int count = 0; count < numActions; ++count ) { |
95 | *actions[ count ] = new KToggleAction( actionTexts[ count ] ); | 95 | *actions[ count ] = new KToggleAction( actionTexts[ count ] ); |
96 | (*actions[ count ])->setChecked( true ); | 96 | (*actions[ count ])->setChecked( true ); |
97 | } | 97 | } |
98 | 98 | ||
99 | setMouseTracking( true ); | 99 | setMouseTracking( true ); |
100 | 100 | ||
101 | setBackgroundMode( NoBackground ); | 101 | setBackgroundMode( NoBackground ); |
102 | } | 102 | } |
103 | 103 | ||
104 | KABDetailedView::~KABDetailedView() | 104 | KABDetailedView::~KABDetailedView() |
105 | { | 105 | { |
106 | delete mPainter; | 106 | delete mPainter; |
107 | mPainter = 0; | 107 | mPainter = 0; |
108 | } | 108 | } |
109 | 109 | ||
110 | bool KABDetailedView::getBackground( QString path, QPixmap& image ) | 110 | bool KABDetailedView::getBackground( QString path, QPixmap& image ) |
111 | { | 111 | { |
112 | QMap<QString, QPixmap>::iterator pos; | 112 | QMap<QString, QPixmap>::iterator pos; |
113 | 113 | ||
114 | pos = mBackgroundMap.find( path ); | 114 | pos = mBackgroundMap.find( path ); |
115 | if ( pos == mBackgroundMap.end() ) { // the image has not been loaded previously | 115 | if ( pos == mBackgroundMap.end() ) { // the image has not been loaded previously |
116 | if ( image.load( path ) ) { | 116 | if ( image.load( path ) ) { |
117 | mBackgroundMap[ path ] = image; | 117 | mBackgroundMap[ path ] = image; |
118 | return true; | 118 | return true; |
119 | } else | 119 | } else |
120 | return false; | 120 | return false; |
121 | } else { // image found in cache | 121 | } else { // image found in cache |
122 | image = pos.data(); | 122 | image = pos.data(); |
123 | return true; | 123 | return true; |
124 | } | 124 | } |
125 | } | 125 | } |
126 | 126 | ||
127 | void KABDetailedView::paintEvent( QPaintEvent* ) | 127 | void KABDetailedView::paintEvent( QPaintEvent* ) |
128 | { | 128 | { |
129 | const int BorderSpace = mGrid; | 129 | const int BorderSpace = mGrid; |
130 | QPixmap pm( width(), height() ); | 130 | QPixmap pm( width(), height() ); |
131 | QPainter p; | 131 | QPainter p; |
132 | 132 | ||
133 | QRect entryArea = QRect( BorderSpace, mGrid, width() - mGrid - BorderSpace, | 133 | QRect entryArea = QRect( BorderSpace, mGrid, width() - mGrid - BorderSpace, |
134 | height() - 2 * mGrid ); | 134 | height() - 2 * mGrid ); |
135 | p.begin( &pm ); | 135 | p.begin( &pm ); |
136 | 136 | ||
137 | p.setPen( darkBlue ); | 137 | p.setPen( darkBlue ); |
138 | p.setBrush( mDefaultBGColor ); | 138 | p.setBrush( mDefaultBGColor ); |
139 | p.drawRect( 0, 0, width(), height() ); | 139 | p.drawRect( 0, 0, width(), height() ); |
140 | switch ( mBackgroundStyle ) { | 140 | switch ( mBackgroundStyle ) { |
141 | case Tiled: | 141 | case Tiled: |
142 | p.drawTiledPixmap( 1, 1, width() - 2, height() - 2, mCurrentBackground ); | 142 | p.drawTiledPixmap( 1, 1, width() - 2, height() - 2, mCurrentBackground ); |
143 | break; | 143 | break; |
144 | case Bordered: | 144 | case Bordered: |
145 | p.drawTiledPixmap( 1, 1, QMIN( width() - 2, mCurrentBackground.width() ), | 145 | p.drawTiledPixmap( 1, 1, QMIN( width() - 2, mCurrentBackground.width() ), |
146 | height() - 2, mCurrentBackground ); | 146 | height() - 2, mCurrentBackground ); |
147 | break; | 147 | break; |
148 | case None: // no BG image defined for this entry: | 148 | case None: // no BG image defined for this entry: |
149 | default: | 149 | default: |
150 | if ( mUseDefaultBGImage ) | 150 | if ( mUseDefaultBGImage ) |
151 | p.drawTiledPixmap( 1, 1, width() - 2, height() - 2, mDefaultBGImage ); | 151 | p.drawTiledPixmap( 1, 1, width() - 2, height() - 2, mDefaultBGImage ); |
152 | break; | 152 | break; |
153 | }; | 153 | }; |
154 | 154 | ||
155 | p.setViewport( entryArea ); | 155 | p.setViewport( entryArea ); |
156 | 156 | ||
157 | mPainter->setShowAddresses( mActionShowAddresses->isChecked() ); | 157 | mPainter->setShowAddresses( mActionShowAddresses->isChecked() ); |
158 | mPainter->setShowEmails( mActionShowEmails->isChecked() ); | 158 | mPainter->setShowEmails( mActionShowEmails->isChecked() ); |
159 | mPainter->setShowPhones( mActionShowPhones->isChecked() ); | 159 | mPainter->setShowPhones( mActionShowPhones->isChecked() ); |
160 | mPainter->setShowURLs( mActionShowURLs->isChecked() ); | 160 | mPainter->setShowURLs( mActionShowURLs->isChecked() ); |
161 | mPainter->printAddressee( addressee(), QRect( 0, 0, entryArea.width(), | 161 | mPainter->printAddressee( addressee(), QRect( 0, 0, entryArea.width(), |
162 | entryArea.height() ), &p ); | 162 | entryArea.height() ), &p ); |
163 | p.end(); | 163 | p.end(); |
164 | bitBlt( this, 0, 0, &pm ); | 164 | bitBlt( this, 0, 0, &pm ); |
165 | } | 165 | } |
166 | 166 | ||
167 | void KABDetailedView::mouseMoveEvent( QMouseEvent *e ) | 167 | void KABDetailedView::mouseMoveEvent( QMouseEvent *e ) |
168 | { | 168 | { |
169 | QPoint bias( mGrid, mGrid ); | 169 | QPoint bias( mGrid, mGrid ); |
170 | int rc; | 170 | int rc; |
171 | bool hit = false; | 171 | bool hit = false; |
172 | 172 | ||
173 | if ( ( rc = mPainter->hitsEmail( e->pos() - bias ) ) != -1 ) | 173 | if ( ( rc = mPainter->hitsEmail( e->pos() - bias ) ) != -1 ) |
174 | hit = true; | 174 | hit = true; |
175 | else if ( ( rc = mPainter->hitsURL( e->pos() - bias ) ) != -1 ) | 175 | else if ( ( rc = mPainter->hitsURL( e->pos() - bias ) ) != -1 ) |
176 | hit = true; | 176 | hit = true; |
177 | else if ( ( rc = mPainter->hitsPhone( e->pos() - bias ) ) != -1 ) | 177 | else if ( ( rc = mPainter->hitsPhone( e->pos() - bias ) ) != -1 ) |
178 | hit = true; | 178 | hit = true; |
179 | else if ( ( rc = mPainter->hitsTalk( e->pos() - bias ) ) != -1 ) | 179 | else if ( ( rc = mPainter->hitsTalk( e->pos() - bias ) ) != -1 ) |
180 | hit = true; | 180 | hit = true; |
181 | 181 | ||
182 | if ( hit ) { | 182 | if ( hit ) { |
183 | if ( cursor().shape() != PointingHandCursor ) | 183 | if ( cursor().shape() != PointingHandCursor ) |
184 | setCursor( PointingHandCursor ); | 184 | setCursor( PointingHandCursor ); |
185 | else if( cursor().shape() != ArrowCursor ) | 185 | else if( cursor().shape() != ArrowCursor ) |
186 | setCursor(ArrowCursor); | 186 | setCursor(ArrowCursor); |
187 | } | 187 | } |
188 | } | 188 | } |
189 | 189 | ||
190 | void KABDetailedView::mousePressEvent( QMouseEvent *e ) | 190 | void KABDetailedView::mousePressEvent( QMouseEvent *e ) |
191 | { | 191 | { |
192 | QPopupMenu menu( this ); | 192 | QPopupMenu menu( this ); |
193 | QPopupMenu *menuBG = new QPopupMenu( &menu ); | 193 | QPopupMenu *menuBG = new QPopupMenu( &menu ); |
194 | mMenuBorderedBG = new QPopupMenu( &menu ); | 194 | mMenuBorderedBG = new QPopupMenu( &menu ); |
195 | mMenuTiledBG = new QPopupMenu( &menu ); | 195 | mMenuTiledBG = new QPopupMenu( &menu ); |
196 | 196 | ||
197 | menu.insertItem( i18n( "Select Background" ), menuBG ); | 197 | menu.insertItem( i18n( "Select Background" ), menuBG ); |
198 | menuBG->insertItem( i18n( "Bordered Backgrounds" ), mMenuBorderedBG ); | 198 | menuBG->insertItem( i18n( "Bordered Backgrounds" ), mMenuBorderedBG ); |
199 | menuBG->insertItem( i18n( "Tiled Backgrounds" ), mMenuTiledBG ); | 199 | menuBG->insertItem( i18n( "Tiled Backgrounds" ), mMenuTiledBG ); |
200 | menu.insertSeparator(); | 200 | menu.insertSeparator(); |
201 | 201 | ||
202 | QPoint point = e->pos() - QPoint( mGrid, mGrid ); | 202 | QPoint point = e->pos() - QPoint( mGrid, mGrid ); |
203 | int rc; | 203 | int rc; |
204 | QStringList dirsBorderedBG, dirsTiledBG; | 204 | QStringList dirsBorderedBG, dirsTiledBG; |
205 | QDir dir; | 205 | QDir dir; |
206 | 206 | ||
207 | switch( e->button() ) { | 207 | switch( e->button() ) { |
208 | case QMouseEvent::RightButton: | 208 | case QMouseEvent::RightButton: |
209 | if ( isReadOnly() ) | 209 | if ( isReadOnly() ) |
210 | menu.setItemEnabled( menu.idAt( 0 ), false ); | 210 | menu.setItemEnabled( menu.idAt( 0 ), false ); |
211 | else { | 211 | else { |
212 | // TODO: settings need to be saved in view options | 212 | // TODO: settings need to be saved in view options |
213 | dirsBorderedBG = KGlobal::instance()->dirs()->findDirs( "data", mBorderedBGDir ); | 213 | dirsBorderedBG = KGlobal::instance()->dirs()->findDirs( "data", mBorderedBGDir ); |
214 | if ( dirsBorderedBG.count() > 0 ) { | 214 | if ( dirsBorderedBG.count() > 0 ) { |
215 | dir.setPath( dirsBorderedBG[ 0 ] ); | 215 | dir.setPath( dirsBorderedBG[ 0 ] ); |
216 | mBorders = dir.entryList( QDir::Files ); | 216 | mBorders = dir.entryList( QDir::Files ); |
217 | for ( uint count = 0; count < mBorders.count(); ++count ) | 217 | for ( uint count = 0; count < mBorders.count(); ++count ) |
218 | mMenuBorderedBG->insertItem( mBorders[ count ], count ); | 218 | mMenuBorderedBG->insertItem( mBorders[ count ], count ); |
219 | 219 | ||
220 | connect( mMenuBorderedBG, SIGNAL( activated( int ) ), | 220 | connect( mMenuBorderedBG, SIGNAL( activated( int ) ), |
221 | SLOT( slotBorderedBGSelected( int ) ) ); | 221 | SLOT( slotBorderedBGSelected( int ) ) ); |
222 | } else | 222 | } else |
223 | menuBG->setItemEnabled( menuBG->idAt( 0 ), false ); | 223 | menuBG->setItemEnabled( menuBG->idAt( 0 ), false ); |
224 | 224 | ||
225 | dirsTiledBG = KGlobal::instance()->dirs()->findDirs( "data", mTiledBGDir ); | 225 | dirsTiledBG = KGlobal::instance()->dirs()->findDirs( "data", mTiledBGDir ); |
226 | if ( dirsTiledBG.count() > 0 ) { | 226 | if ( dirsTiledBG.count() > 0 ) { |
227 | dir.setPath( dirsTiledBG[ 0 ] ); | 227 | dir.setPath( dirsTiledBG[ 0 ] ); |
228 | mTiles = dir.entryList( QDir::Files ); | 228 | mTiles = dir.entryList( QDir::Files ); |
229 | for ( uint count = 0; count < mTiles.count(); ++count ) | 229 | for ( uint count = 0; count < mTiles.count(); ++count ) |
230 | mMenuTiledBG->insertItem( mTiles[ count ], count ); | 230 | mMenuTiledBG->insertItem( mTiles[ count ], count ); |
231 | 231 | ||
232 | connect( mMenuTiledBG, SIGNAL( activated( int ) ), | 232 | connect( mMenuTiledBG, SIGNAL( activated( int ) ), |
233 | SLOT( slotTiledBGSelected( int ) ) ); | 233 | SLOT( slotTiledBGSelected( int ) ) ); |
234 | } else | 234 | } else |
235 | menuBG->setItemEnabled( menuBG->idAt( 1 ), false ); | 235 | menuBG->setItemEnabled( menuBG->idAt( 1 ), false ); |
236 | } | 236 | } |
237 | 237 | ||
238 | mActionShowAddresses->plug( &menu ); | 238 | mActionShowAddresses->plug( &menu ); |
239 | mActionShowEmails->plug( &menu ); | 239 | mActionShowEmails->plug( &menu ); |
240 | mActionShowPhones->plug( &menu ); | 240 | mActionShowPhones->plug( &menu ); |
241 | mActionShowURLs->plug( &menu ); | 241 | mActionShowURLs->plug( &menu ); |
242 | 242 | ||
243 | menu.exec( e->globalPos() ); | 243 | menu.exec( e->globalPos() ); |
244 | break; | 244 | break; |
245 | 245 | ||
246 | case QMouseEvent::LeftButton: | 246 | case QMouseEvent::LeftButton: |
247 | // find whether the pointer touches an email address, URL, | 247 | // find whether the pointer touches an email address, URL, |
248 | // talk address or telephone number: | 248 | // talk address or telephone number: |
249 | if ( ( rc = mPainter->hitsEmail( point ) ) != -1 ) { | 249 | if ( ( rc = mPainter->hitsEmail( point ) ) != -1 ) { |
250 | emit sendEmail( addressee().emails()[ rc ] ); | 250 | emit sendEmail( addressee().emails()[ rc ] ); |
251 | break; | 251 | break; |
252 | } | 252 | } |
253 | if ( ( rc = mPainter->hitsURL( point ) ) != -1 ) { | 253 | if ( ( rc = mPainter->hitsURL( point ) ) != -1 ) { |
254 | emit browse( addressee().url().prettyURL() ); | 254 | emit browse( addressee().url().prettyURL() ); |
255 | break; | 255 | break; |
256 | } | 256 | } |
257 | if ( ( rc = mPainter->hitsPhone( point ) ) != -1 ) { | 257 | if ( ( rc = mPainter->hitsPhone( point ) ) != -1 ) { |
258 | // not implemented yet | 258 | // not implemented yet |
diff --git a/kmicromail/koprefsdialog.cpp b/kmicromail/koprefsdialog.cpp index 9cde5cf..7de7064 100644 --- a/kmicromail/koprefsdialog.cpp +++ b/kmicromail/koprefsdialog.cpp | |||
@@ -1,263 +1,263 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of KOrganizer. | 2 | This file is part of KOrganizer. |
3 | Copyright (c) 2000,2001 Cornelius Schumacher <schumacher@kde.org> | 3 | Copyright (c) 2000,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 | #include <kdialog.h> | 23 | #include <kdialog.h> |
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 | #include <kglobalsettings.h> | 56 | #include <kglobalsettings.h> |
57 | 57 | ||
58 | #include <klineedit.h> | 58 | #include <klineedit.h> |
59 | 59 | ||
60 | 60 | ||
61 | #include "koprefs.h" | 61 | #include "koprefs.h" |
62 | 62 | ||
63 | #include "koprefsdialog.h" | 63 | #include "koprefsdialog.h" |
64 | //#include <kprefswidget.h> | 64 | //#include <kprefswidget.h> |
65 | 65 | ||
66 | 66 | ||
67 | KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) : | 67 | KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) : |
68 | KPrefsDialog(KOPrefs::instance(),parent,name,true) | 68 | KPrefsDialog(KOPrefs::instance(),parent,name,true) |
69 | { | 69 | { |
70 | 70 | ||
71 | setFont( KGlobalSettings::generalFont() ); | 71 | setFont( KGlobalSettings::generalMaxFont() ); |
72 | setCaption( i18n("Settings - some need a restart (nr)")); | 72 | setCaption( i18n("Settings - some need a restart (nr)")); |
73 | setupGlobalTab(); | 73 | setupGlobalTab(); |
74 | setupMainTab(); | 74 | setupMainTab(); |
75 | setupMailTab();; | 75 | setupMailTab();; |
76 | setupFontsTab(); | 76 | setupFontsTab(); |
77 | readConfig(); | 77 | readConfig(); |
78 | #ifndef DESKTOP_VERSION | 78 | #ifndef DESKTOP_VERSION |
79 | if ( QApplication::desktop()->height() == 480 ) | 79 | if ( QApplication::desktop()->height() == 480 ) |
80 | hideButtons(); | 80 | hideButtons(); |
81 | #endif | 81 | #endif |
82 | 82 | ||
83 | #if 0 | 83 | #if 0 |
84 | 84 | ||
85 | setupMainTab(); | 85 | setupMainTab(); |
86 | setupLocaleTab(); | 86 | setupLocaleTab(); |
87 | setupTimeZoneTab(); | 87 | setupTimeZoneTab(); |
88 | setupTimeTab(); | 88 | setupTimeTab(); |
89 | setupLocaleDateTab(); | 89 | setupLocaleDateTab(); |
90 | setupFontsTab(); | 90 | setupFontsTab(); |
91 | setupColorsTab(); | 91 | setupColorsTab(); |
92 | setupViewsTab(); | 92 | setupViewsTab(); |
93 | //setupSyncTab(); | 93 | //setupSyncTab(); |
94 | //setupSyncAlgTab(); | 94 | //setupSyncAlgTab(); |
95 | //setupPrinterTab(); | 95 | //setupPrinterTab(); |
96 | //setupGroupSchedulingTab(); | 96 | //setupGroupSchedulingTab(); |
97 | //setupGroupAutomationTab(); | 97 | //setupGroupAutomationTab(); |
98 | #endif | 98 | #endif |
99 | } | 99 | } |
100 | 100 | ||
101 | #include "kpimglobalprefs.h" | 101 | #include "kpimglobalprefs.h" |
102 | 102 | ||
103 | KOPrefsDialog::~KOPrefsDialog() | 103 | KOPrefsDialog::~KOPrefsDialog() |
104 | { | 104 | { |
105 | } | 105 | } |
106 | void KOPrefsDialog::setupGlobalTab() | 106 | void KOPrefsDialog::setupGlobalTab() |
107 | { | 107 | { |
108 | QFrame *topFrame = addPage(i18n("Global"),0,0); | 108 | QFrame *topFrame = addPage(i18n("Global"),0,0); |
109 | kdelibcfg = new KDEPIMConfigWidget( KPimGlobalPrefs::instance(), topFrame, "KCMKdeLibConfig" ); | 109 | kdelibcfg = new KDEPIMConfigWidget( KPimGlobalPrefs::instance(), topFrame, "KCMKdeLibConfig" ); |
110 | QVBoxLayout *topLayout = new QVBoxLayout(topFrame); | 110 | QVBoxLayout *topLayout = new QVBoxLayout(topFrame); |
111 | topLayout->addWidget( kdelibcfg ); | 111 | topLayout->addWidget( kdelibcfg ); |
112 | 112 | ||
113 | 113 | ||
114 | } | 114 | } |
115 | void KOPrefsDialog::setupMainTab() | 115 | void KOPrefsDialog::setupMainTab() |
116 | { | 116 | { |
117 | QFrame *topFrame = addPage(i18n("General"),0,0); | 117 | QFrame *topFrame = addPage(i18n("General"),0,0); |
118 | 118 | ||
119 | QGridLayout *topLayout = new QGridLayout(topFrame,6,2); | 119 | QGridLayout *topLayout = new QGridLayout(topFrame,6,2); |
120 | topLayout->setSpacing(spacingHint()); | 120 | topLayout->setSpacing(spacingHint()); |
121 | topLayout->setMargin(marginHint()); | 121 | topLayout->setMargin(marginHint()); |
122 | 122 | ||
123 | 123 | ||
124 | mNameEdit = new QLineEdit(topFrame); | 124 | mNameEdit = new QLineEdit(topFrame); |
125 | mNameLabel = new QLabel(mNameEdit, i18n("Full &name:"), topFrame); | 125 | mNameLabel = new QLabel(mNameEdit, i18n("Full &name:"), topFrame); |
126 | topLayout->addWidget(mNameLabel,0,0); | 126 | topLayout->addWidget(mNameLabel,0,0); |
127 | topLayout->addWidget(mNameEdit,0,1); | 127 | topLayout->addWidget(mNameEdit,0,1); |
128 | 128 | ||
129 | mEmailEdit = new QLineEdit(topFrame); | 129 | mEmailEdit = new QLineEdit(topFrame); |
130 | mEmailLabel = new QLabel(mEmailEdit, i18n("E&mail address:"),topFrame); | 130 | mEmailLabel = new QLabel(mEmailEdit, i18n("E&mail address:"),topFrame); |
131 | topLayout->addWidget(mEmailLabel,1,0); | 131 | topLayout->addWidget(mEmailLabel,1,0); |
132 | topLayout->addWidget(mEmailEdit,1,1); | 132 | topLayout->addWidget(mEmailEdit,1,1); |
133 | QLabel *lab = new QLabel( i18n("HINT: Separate multiple\neMail addresses by \";\""), topFrame); | 133 | QLabel *lab = new QLabel( i18n("HINT: Separate multiple\neMail addresses by \";\""), topFrame); |
134 | topLayout->addMultiCellWidget(lab,2,2,0,1); | 134 | topLayout->addMultiCellWidget(lab,2,2,0,1); |
135 | KPrefsDialogWidBool* ttt = addWidBool(i18n("Ignore above settings and\nuse KA/Pi \"Who am I\" instead!"), | 135 | KPrefsDialogWidBool* ttt = addWidBool(i18n("Ignore above settings and\nuse KA/Pi \"Who am I\" instead!"), |
136 | &(KOPrefs::instance()->mUseKapi),topFrame); | 136 | &(KOPrefs::instance()->mUseKapi),topFrame); |
137 | topLayout->addMultiCellWidget(ttt->checkBox(),3,3,0,1); | 137 | topLayout->addMultiCellWidget(ttt->checkBox(),3,3,0,1); |
138 | } | 138 | } |
139 | 139 | ||
140 | void KOPrefsDialog::setupMailTab() | 140 | void KOPrefsDialog::setupMailTab() |
141 | { | 141 | { |
142 | QFrame *topFrame = addPage(i18n("Mail"),0,0); | 142 | QFrame *topFrame = addPage(i18n("Mail"),0,0); |
143 | 143 | ||
144 | QGridLayout *topLayout = new QGridLayout(topFrame,4,2); | 144 | QGridLayout *topLayout = new QGridLayout(topFrame,4,2); |
145 | topLayout->setSpacing(spacingHint()); | 145 | topLayout->setSpacing(spacingHint()); |
146 | topLayout->setMargin(marginHint()); | 146 | topLayout->setMargin(marginHint()); |
147 | 147 | ||
148 | KPrefsDialogWidBool* ttt = addWidBool(i18n("View mail as html"), | 148 | KPrefsDialogWidBool* ttt = addWidBool(i18n("View mail as html"), |
149 | &(KOPrefs::instance()->mViewAsHtml),topFrame); | 149 | &(KOPrefs::instance()->mViewAsHtml),topFrame); |
150 | topLayout->addMultiCellWidget(ttt->checkBox(),0,0,0,1); | 150 | topLayout->addMultiCellWidget(ttt->checkBox(),0,0,0,1); |
151 | 151 | ||
152 | 152 | ||
153 | ttt = addWidBool(i18n("Send mails later"), | 153 | ttt = addWidBool(i18n("Send mails later"), |
154 | &(KOPrefs::instance()->mSendLater),topFrame); | 154 | &(KOPrefs::instance()->mSendLater),topFrame); |
155 | topLayout->addMultiCellWidget(ttt->checkBox(),1,1,0,1); | 155 | topLayout->addMultiCellWidget(ttt->checkBox(),1,1,0,1); |
156 | ttt = addWidBool(i18n("Show \"To\" field in list view"), | 156 | ttt = addWidBool(i18n("Show \"To\" field in list view"), |
157 | &(KOPrefs::instance()->mShowToField),topFrame); | 157 | &(KOPrefs::instance()->mShowToField),topFrame); |
158 | topLayout->addMultiCellWidget(ttt->checkBox(),2,2,0,1); | 158 | topLayout->addMultiCellWidget(ttt->checkBox(),2,2,0,1); |
159 | 159 | ||
160 | int iii =3; | 160 | int iii =3; |
161 | ttt = addWidBool(i18n("Show info fields at startup"), | 161 | ttt = addWidBool(i18n("Show info fields at startup"), |
162 | &(KOPrefs::instance()->mShowInfoStart),topFrame); | 162 | &(KOPrefs::instance()->mShowInfoStart),topFrame); |
163 | topLayout->addMultiCellWidget(ttt->checkBox(),iii,iii,0,1); | 163 | topLayout->addMultiCellWidget(ttt->checkBox(),iii,iii,0,1); |
164 | ++iii; | 164 | ++iii; |
165 | ttt = addWidBool(i18n("Show \"Subject\" info field"), | 165 | ttt = addWidBool(i18n("Show \"Subject\" info field"), |
166 | &(KOPrefs::instance()->mShowInfoSub),topFrame); | 166 | &(KOPrefs::instance()->mShowInfoSub),topFrame); |
167 | topLayout->addMultiCellWidget(ttt->checkBox(),iii,iii,0,1); | 167 | topLayout->addMultiCellWidget(ttt->checkBox(),iii,iii,0,1); |
168 | ++iii; | 168 | ++iii; |
169 | ttt = addWidBool(i18n("Show \"From\" info field"), | 169 | ttt = addWidBool(i18n("Show \"From\" info field"), |
170 | &(KOPrefs::instance()->mShowInfoFrom),topFrame); | 170 | &(KOPrefs::instance()->mShowInfoFrom),topFrame); |
171 | topLayout->addMultiCellWidget(ttt->checkBox(),iii,iii,0,1); | 171 | topLayout->addMultiCellWidget(ttt->checkBox(),iii,iii,0,1); |
172 | ++iii; | 172 | ++iii; |
173 | ttt = addWidBool(i18n("Show \"To\" info field"), | 173 | ttt = addWidBool(i18n("Show \"To\" info field"), |
174 | &(KOPrefs::instance()->mShowInfoTo),topFrame); | 174 | &(KOPrefs::instance()->mShowInfoTo),topFrame); |
175 | topLayout->addMultiCellWidget(ttt->checkBox(),iii,iii,0,1); | 175 | topLayout->addMultiCellWidget(ttt->checkBox(),iii,iii,0,1); |
176 | ++iii; | 176 | ++iii; |
177 | 177 | ||
178 | /* | 178 | /* |
179 | mCodecEdit = new QLineEdit(topFrame); | 179 | mCodecEdit = new QLineEdit(topFrame); |
180 | topLayout->addMultiCellWidget( new QLabel(mCodecEdit, i18n("User defined codec for new mails:"), topFrame),2,2,0,1); | 180 | topLayout->addMultiCellWidget( new QLabel(mCodecEdit, i18n("User defined codec for new mails:"), topFrame),2,2,0,1); |
181 | topLayout->addMultiCellWidget(mCodecEdit,3,3,0,1); | 181 | topLayout->addMultiCellWidget(mCodecEdit,3,3,0,1); |
182 | topLayout->addMultiCellWidget( new QLabel(0, i18n("Example: iso-8859-15"), topFrame),4,4,0,1); | 182 | topLayout->addMultiCellWidget( new QLabel(0, i18n("Example: iso-8859-15"), topFrame),4,4,0,1); |
183 | */ | 183 | */ |
184 | } | 184 | } |
185 | void KOPrefsDialog::setupFontsTab() | 185 | void KOPrefsDialog::setupFontsTab() |
186 | { | 186 | { |
187 | 187 | ||
188 | QFrame *topFrame = addPage(i18n("Fonts"),0,0); | 188 | QFrame *topFrame = addPage(i18n("Fonts"),0,0); |
189 | // DesktopIcon("fonts",KIcon::SizeMedium)); | 189 | // DesktopIcon("fonts",KIcon::SizeMedium)); |
190 | 190 | ||
191 | QGridLayout *topLayout = new QGridLayout(topFrame,7,3); | 191 | QGridLayout *topLayout = new QGridLayout(topFrame,7,3); |
192 | topLayout->setSpacing(1); | 192 | topLayout->setSpacing(1); |
193 | topLayout->setMargin(3); | 193 | topLayout->setMargin(3); |
194 | KPrefsDialogWidFont * tVFont; | 194 | KPrefsDialogWidFont * tVFont; |
195 | int i = 0; | 195 | int i = 0; |
196 | KPrefsDialogWidFont *timeLabelsFont = | 196 | KPrefsDialogWidFont *timeLabelsFont = |
197 | addWidFont(i18n("OK"),i18n("Application(nr)"), | 197 | addWidFont(i18n("OK"),i18n("Application(nr)"), |
198 | &(KOPrefs::instance()->mAppFont),topFrame); | 198 | &(KOPrefs::instance()->mAppFont),topFrame); |
199 | topLayout->addWidget(timeLabelsFont->label(),i,0); | 199 | topLayout->addWidget(timeLabelsFont->label(),i,0); |
200 | topLayout->addWidget(timeLabelsFont->preview(),i,1); | 200 | topLayout->addWidget(timeLabelsFont->preview(),i,1); |
201 | topLayout->addWidget(timeLabelsFont->button(),i,2); | 201 | topLayout->addWidget(timeLabelsFont->button(),i,2); |
202 | ++i; | 202 | ++i; |
203 | 203 | ||
204 | 204 | ||
205 | timeLabelsFont = | 205 | timeLabelsFont = |
206 | addWidFont(i18n("Dear Mr."),i18n("Compose mail:"), | 206 | addWidFont(i18n("Dear Mr."),i18n("Compose mail:"), |
207 | &(KOPrefs::instance()->mComposeFont),topFrame); | 207 | &(KOPrefs::instance()->mComposeFont),topFrame); |
208 | topLayout->addWidget(timeLabelsFont->label(),i,0); | 208 | topLayout->addWidget(timeLabelsFont->label(),i,0); |
209 | topLayout->addWidget(timeLabelsFont->preview(),i,1); | 209 | topLayout->addWidget(timeLabelsFont->preview(),i,1); |
210 | topLayout->addWidget(timeLabelsFont->button(),i,2); | 210 | topLayout->addWidget(timeLabelsFont->button(),i,2); |
211 | ++i; | 211 | ++i; |
212 | 212 | ||
213 | KPrefsDialogWidFont *timeBarFont = | 213 | KPrefsDialogWidFont *timeBarFont = |
214 | addWidFont(i18n("Hello"),i18n("Read mail:"), | 214 | addWidFont(i18n("Hello"),i18n("Read mail:"), |
215 | &(KOPrefs::instance()->mReadFont),topFrame); | 215 | &(KOPrefs::instance()->mReadFont),topFrame); |
216 | topLayout->addWidget(timeBarFont->label(),i,0); | 216 | topLayout->addWidget(timeBarFont->label(),i,0); |
217 | topLayout->addWidget(timeBarFont->preview(),i,1); | 217 | topLayout->addWidget(timeBarFont->preview(),i,1); |
218 | topLayout->addWidget(timeBarFont->button(),i,2); | 218 | topLayout->addWidget(timeBarFont->button(),i,2); |
219 | ++i; | 219 | ++i; |
220 | 220 | ||
221 | topLayout->setColStretch(1,1); | 221 | topLayout->setColStretch(1,1); |
222 | topLayout->setRowStretch(4,1); | 222 | topLayout->setRowStretch(4,1); |
223 | 223 | ||
224 | } | 224 | } |
225 | void KOPrefsDialog::usrReadConfig() | 225 | void KOPrefsDialog::usrReadConfig() |
226 | { | 226 | { |
227 | 227 | ||
228 | mNameEdit->setText(KOPrefs::instance()->mName); | 228 | mNameEdit->setText(KOPrefs::instance()->mName); |
229 | mEmailEdit->setText(KOPrefs::instance()->mEmail); | 229 | mEmailEdit->setText(KOPrefs::instance()->mEmail); |
230 | //mCodecEdit->setText(KOPrefs::instance()->mSendCodec); | 230 | //mCodecEdit->setText(KOPrefs::instance()->mSendCodec); |
231 | kdelibcfg->readConfig(); | 231 | kdelibcfg->readConfig(); |
232 | } | 232 | } |
233 | void KOPrefsDialog::usrWriteConfig() | 233 | void KOPrefsDialog::usrWriteConfig() |
234 | { | 234 | { |
235 | KOPrefs::instance()->mName = mNameEdit->text(); | 235 | KOPrefs::instance()->mName = mNameEdit->text(); |
236 | KOPrefs::instance()->mEmail = mEmailEdit->text(); | 236 | KOPrefs::instance()->mEmail = mEmailEdit->text(); |
237 | //KOPrefs::instance()->mSendCodec = mCodecEdit->text(); | 237 | //KOPrefs::instance()->mSendCodec = mCodecEdit->text(); |
238 | kdelibcfg->writeConfig(); | 238 | kdelibcfg->writeConfig(); |
239 | 239 | ||
240 | 240 | ||
241 | } | 241 | } |
242 | 242 | ||
243 | #if 0 | 243 | #if 0 |
244 | void KOPrefsDialog::setupLocaleDateTab() | 244 | void KOPrefsDialog::setupLocaleDateTab() |
245 | { | 245 | { |
246 | QFrame *topFrame = addPage(i18n("Date Format"),0,0); | 246 | QFrame *topFrame = addPage(i18n("Date Format"),0,0); |
247 | QGridLayout *topLayout = new QGridLayout(topFrame,3,2); | 247 | QGridLayout *topLayout = new QGridLayout(topFrame,3,2); |
248 | topLayout->setSpacing(spacingHint()); | 248 | topLayout->setSpacing(spacingHint()); |
249 | topLayout->setMargin(marginHint()); | 249 | topLayout->setMargin(marginHint()); |
250 | int iii = 0; | 250 | int iii = 0; |
251 | 251 | ||
252 | 252 | ||
253 | KPrefsWidRadios *syncPrefsGroup = | 253 | KPrefsWidRadios *syncPrefsGroup = |
254 | addWidRadios(i18n("Date Format:"),&(KOPrefs::instance()->mPreferredDate),topFrame); | 254 | addWidRadios(i18n("Date Format:"),&(KOPrefs::instance()->mPreferredDate),topFrame); |
255 | QString format; | 255 | QString format; |
256 | if ( QApplication::desktop()->width() < 480 ) | 256 | if ( QApplication::desktop()->width() < 480 ) |
257 | format = "(%d.%m.%Y)"; | 257 | format = "(%d.%m.%Y)"; |
258 | else | 258 | else |
259 | format = "(%d.%m.%Y|%A %d %B %Y)"; | 259 | format = "(%d.%m.%Y|%A %d %B %Y)"; |
260 | syncPrefsGroup->addRadio(i18n("24.03.2004 "+format)); | 260 | syncPrefsGroup->addRadio(i18n("24.03.2004 "+format)); |
261 | if ( QApplication::desktop()->width() < 480 ) | 261 | if ( QApplication::desktop()->width() < 480 ) |
262 | format = "(%m.%d.%Y)"; | 262 | format = "(%m.%d.%Y)"; |
263 | else | 263 | else |
diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp index e57daa4..f9c8b73 100644 --- a/korganizer/datenavigatorcontainer.cpp +++ b/korganizer/datenavigatorcontainer.cpp | |||
@@ -1,327 +1,326 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of KOrganizer. | 2 | This file is part of KOrganizer. |
3 | 3 | ||
4 | Copyright (c) 2001,2002,2003 Cornelius Schumacher <schumacher@kde.org> | 4 | Copyright (c) 2001,2002,2003 Cornelius Schumacher <schumacher@kde.org> |
5 | Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com> | 5 | Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com> |
6 | 6 | ||
7 | This program is free software; you can redistribute it and/or modify | 7 | This program is free software; you can redistribute it and/or modify |
8 | it under the terms of the GNU General Public License as published by | 8 | it under the terms of the GNU General Public License as published by |
9 | the Free Software Foundation; either version 2 of the License, or | 9 | the Free Software Foundation; either version 2 of the License, or |
10 | (at your option) any later version. | 10 | (at your option) any later version. |
11 | 11 | ||
12 | This program is distributed in the hope that it will be useful, | 12 | This program is distributed in the hope that it will be useful, |
13 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 13 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 14 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | GNU General Public License for more details. | 15 | GNU General Public License for more details. |
16 | 16 | ||
17 | You should have received a copy of the GNU General Public License | 17 | You should have received a copy of the GNU General Public License |
18 | along with this program; if not, write to the Free Software | 18 | along with this program; if not, write to the Free Software |
19 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 19 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
20 | 20 | ||
21 | As a special exception, permission is given to link this program | 21 | As a special exception, permission is given to link this program |
22 | with any edition of Qt, and distribute the resulting executable, | 22 | with any edition of Qt, and distribute the resulting executable, |
23 | without including the source code for Qt in the source distribution. | 23 | without including the source code for Qt in the source distribution. |
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include <kdebug.h> | 26 | #include <kdebug.h> |
27 | #include <klocale.h> | 27 | #include <klocale.h> |
28 | 28 | ||
29 | //#include "koglobals.h" | 29 | //#include "koglobals.h" |
30 | #include "navigatorbar.h" | 30 | #include "navigatorbar.h" |
31 | #include "kdatenavigator.h" | 31 | #include "kdatenavigator.h" |
32 | 32 | ||
33 | #include <kcalendarsystem.h> | 33 | #include <kcalendarsystem.h> |
34 | 34 | ||
35 | #include "datenavigatorcontainer.h" | 35 | #include "datenavigatorcontainer.h" |
36 | #include "koprefs.h" | 36 | #include "koprefs.h" |
37 | 37 | ||
38 | DateNavigatorContainer::DateNavigatorContainer( QWidget *parent, | 38 | DateNavigatorContainer::DateNavigatorContainer( QWidget *parent, |
39 | const char *name ) | 39 | const char *name ) |
40 | : QWidget( parent, name ), mCalendar( 0 ), | 40 | : QWidget( parent, name ), mCalendar( 0 ), |
41 | mHorizontalCount( 1 ), mVerticalCount( 1 ) | 41 | mHorizontalCount( 1 ), mVerticalCount( 1 ) |
42 | { | 42 | { |
43 | mResizeEnabled = false; | 43 | mResizeEnabled = false; |
44 | mExtraViews.setAutoDelete( true ); | 44 | mExtraViews.setAutoDelete( true ); |
45 | 45 | ||
46 | mNavigatorView = new KDateNavigator( this, name ); | 46 | mNavigatorView = new KDateNavigator( this, name ); |
47 | mNavigatorView->hide(); | 47 | mNavigatorView->hide(); |
48 | connectNavigatorView( mNavigatorView ); | 48 | connectNavigatorView( mNavigatorView ); |
49 | //setSizePolicy( QSizePolicy (QSizePolicy::Expanding,QSizePolicy::Expanding) ); | 49 | //setSizePolicy( QSizePolicy (QSizePolicy::Expanding,QSizePolicy::Expanding) ); |
50 | mLastDisplayedDN = 0; | 50 | mLastDisplayedDN = 0; |
51 | mUpdateTimer; | 51 | mUpdateTimer; |
52 | mUpdateTimer = new QTimer( this ); | 52 | mUpdateTimer = new QTimer( this ); |
53 | connect (mUpdateTimer ,SIGNAL(timeout()), this, SLOT ( checkUpdateDayMatrixDates() )); | 53 | connect (mUpdateTimer ,SIGNAL(timeout()), this, SLOT ( checkUpdateDayMatrixDates() )); |
54 | mFirstSelectedDate = QDate::currentDate(); | 54 | mFirstSelectedDate = QDate::currentDate(); |
55 | mSelectedDateCount = 1; | 55 | mSelectedDateCount = 1; |
56 | } | 56 | } |
57 | 57 | ||
58 | DateNavigatorContainer::~DateNavigatorContainer() | 58 | DateNavigatorContainer::~DateNavigatorContainer() |
59 | { | 59 | { |
60 | } | 60 | } |
61 | 61 | ||
62 | void DateNavigatorContainer::connectNavigatorView( KDateNavigator *v ) | 62 | void DateNavigatorContainer::connectNavigatorView( KDateNavigator *v ) |
63 | { | 63 | { |
64 | connect( v, SIGNAL( datesSelected( const KCal::DateList & ) ), | 64 | connect( v, SIGNAL( datesSelected( const KCal::DateList & ) ), |
65 | SIGNAL( datesSelected( const KCal::DateList & ) ) ); | 65 | SIGNAL( datesSelected( const KCal::DateList & ) ) ); |
66 | #if 0 | 66 | #if 0 |
67 | connect( v, SIGNAL( incidenceDropped( Incidence *, const QDate & ) ), | 67 | connect( v, SIGNAL( incidenceDropped( Incidence *, const QDate & ) ), |
68 | SIGNAL( incidenceDropped( Incidence *, const QDate & ) ) ); | 68 | SIGNAL( incidenceDropped( Incidence *, const QDate & ) ) ); |
69 | connect( v, SIGNAL( incidenceDroppedMove( Incidence *, const QDate & ) ), | 69 | connect( v, SIGNAL( incidenceDroppedMove( Incidence *, const QDate & ) ), |
70 | SIGNAL( incidenceDroppedMove( Incidence *, const QDate & ) ) ); | 70 | SIGNAL( incidenceDroppedMove( Incidence *, const QDate & ) ) ); |
71 | #endif | 71 | #endif |
72 | connect( v, SIGNAL( weekClicked( const QDate & ) ), | 72 | connect( v, SIGNAL( weekClicked( const QDate & ) ), |
73 | SIGNAL( weekClicked( const QDate & ) ) ); | 73 | SIGNAL( weekClicked( const QDate & ) ) ); |
74 | connect( v, SIGNAL( showMonth( const QDate & ) ), | 74 | connect( v, SIGNAL( showMonth( const QDate & ) ), |
75 | SIGNAL( showMonth( const QDate & ) ) ); | 75 | SIGNAL( showMonth( const QDate & ) ) ); |
76 | 76 | ||
77 | connect( v, SIGNAL( goPrevious() ), SIGNAL( goPrevious() ) ); | 77 | connect( v, SIGNAL( goPrevious() ), SIGNAL( goPrevious() ) ); |
78 | connect( v, SIGNAL( goNext() ), SIGNAL( goNext() ) ); | 78 | connect( v, SIGNAL( goNext() ), SIGNAL( goNext() ) ); |
79 | 79 | ||
80 | connect( v, SIGNAL( goNextMonth() ), SLOT( slotgoNextMonth() ) ); | 80 | connect( v, SIGNAL( goNextMonth() ), SLOT( slotgoNextMonth() ) ); |
81 | connect( v, SIGNAL( goPrevMonth() ), SLOT( slotgoPrevMonth() ) ); | 81 | connect( v, SIGNAL( goPrevMonth() ), SLOT( slotgoPrevMonth() ) ); |
82 | connect( v, SIGNAL( goNextYear() ), SLOT( slotgoNextYear() ) ); | 82 | connect( v, SIGNAL( goNextYear() ), SLOT( slotgoNextYear() ) ); |
83 | connect( v, SIGNAL( goPrevYear() ), SLOT( slotgoPrevYear() ) ); | 83 | connect( v, SIGNAL( goPrevYear() ), SLOT( slotgoPrevYear() ) ); |
84 | 84 | ||
85 | connect( v, SIGNAL( monthSelected( int ) ), SLOT( slotMonthSelected( int ) ) ); | 85 | connect( v, SIGNAL( monthSelected( int ) ), SLOT( slotMonthSelected( int ) ) ); |
86 | } | 86 | } |
87 | void DateNavigatorContainer::slotgoNextYear() | 87 | void DateNavigatorContainer::slotgoNextYear() |
88 | { | 88 | { |
89 | jumpMonth( 12 ); | 89 | jumpMonth( 12 ); |
90 | emit goNextYear(); | 90 | emit goNextYear(); |
91 | 91 | ||
92 | } | 92 | } |
93 | void DateNavigatorContainer::slotgoPrevYear() | 93 | void DateNavigatorContainer::slotgoPrevYear() |
94 | { | 94 | { |
95 | jumpMonth( -12 ); | 95 | jumpMonth( -12 ); |
96 | emit goPrevYear(); | 96 | emit goPrevYear(); |
97 | 97 | ||
98 | } | 98 | } |
99 | void DateNavigatorContainer::slotgoPrevMonth() | 99 | void DateNavigatorContainer::slotgoPrevMonth() |
100 | { | 100 | { |
101 | jumpMonth( -1 ); | 101 | jumpMonth( -1 ); |
102 | emit goPrevMonth(); | 102 | emit goPrevMonth(); |
103 | 103 | ||
104 | } | 104 | } |
105 | void DateNavigatorContainer::slotgoNextMonth() | 105 | void DateNavigatorContainer::slotgoNextMonth() |
106 | { | 106 | { |
107 | jumpMonth( 1 ); | 107 | jumpMonth( 1 ); |
108 | emit goNextMonth(); | 108 | emit goNextMonth(); |
109 | } | 109 | } |
110 | void DateNavigatorContainer::jumpMonth( int month ) | 110 | void DateNavigatorContainer::jumpMonth( int month ) |
111 | { | 111 | { |
112 | 112 | ||
113 | QDate baseDate = mNavigatorView->baseDate(); | 113 | QDate baseDate = mNavigatorView->baseDate(); |
114 | computeMonthSelected( baseDate.month() + month, false ); | 114 | computeMonthSelected( baseDate.month() + month, false ); |
115 | } | 115 | } |
116 | void DateNavigatorContainer::slotMonthSelected( int month ) | 116 | void DateNavigatorContainer::slotMonthSelected( int month ) |
117 | { | 117 | { |
118 | computeMonthSelected( month, true ); | 118 | computeMonthSelected( month, true ); |
119 | } | 119 | } |
120 | void DateNavigatorContainer::computeMonthSelected( int month , bool forceEmit ) | 120 | void DateNavigatorContainer::computeMonthSelected( int month , bool forceEmit ) |
121 | { | 121 | { |
122 | //qDebug("slotMonthSelected %d ", month); | 122 | //qDebug("slotMonthSelected %d ", month); |
123 | QDate baseDate = mNavigatorView->baseDate(); | 123 | QDate baseDate = mNavigatorView->baseDate(); |
124 | if ( baseDate.month() == month ) | 124 | if ( baseDate.month() == month ) |
125 | return; | 125 | return; |
126 | //qDebug("month %d %d ",baseDate.month(),month); | 126 | //qDebug("month %d %d ",baseDate.month(),month); |
127 | QDate date = QDate ( baseDate.year(), baseDate.month() , 15 ); | 127 | QDate date = QDate ( baseDate.year(), baseDate.month() , 15 ); |
128 | date = date.addDays( -(baseDate.month()-month ) *30 ); | 128 | date = date.addDays( -(baseDate.month()-month ) *30 ); |
129 | QDate newBase = QDate ( date.year(), date.month() ,1 ); | 129 | QDate newBase = QDate ( date.year(), date.month() ,1 ); |
130 | 130 | ||
131 | //qDebug("NEW BASE %s", newBase.toString().latin1()); | 131 | //qDebug("NEW BASE %s", newBase.toString().latin1()); |
132 | mNavigatorView->setBaseDate( newBase ); | 132 | mNavigatorView->setBaseDate( newBase ); |
133 | QDate last = lastAvailableDate(); | 133 | QDate last = lastAvailableDate(); |
134 | QDate first = firstAvailableDate(); | 134 | QDate first = firstAvailableDate(); |
135 | |||
136 | QDate selFirst = mFirstSelectedDate; | 135 | QDate selFirst = mFirstSelectedDate; |
137 | QDate selLast = selFirst.addDays( mSelectedDateCount-1 ); | 136 | QDate selLast = selFirst.addDays( mSelectedDateCount-1 ); |
138 | if ( selFirst >= first && selLast <= last ) { | 137 | if ( selFirst >= first && selLast <= last ) { |
139 | setBaseDates(); | 138 | setBaseDates(); |
140 | if ( forceEmit ) | 139 | if ( forceEmit ) |
141 | updateDayMatrixDates(); | 140 | updateDayMatrixDates(); |
142 | } | 141 | } |
143 | else { | 142 | else { |
144 | setBaseDates(); | 143 | setBaseDates(); |
145 | if ( forceEmit ) | 144 | if ( forceEmit ) |
146 | updateDayMatrixDates(); | 145 | updateDayMatrixDates(); |
147 | if ( forceEmit ) | 146 | if ( forceEmit ) |
148 | emit monthSelected( month ); | 147 | emit monthSelected( month ); |
149 | } | 148 | } |
150 | } | 149 | } |
151 | void DateNavigatorContainer::setCalendar( Calendar *cal ) | 150 | void DateNavigatorContainer::setCalendar( Calendar *cal ) |
152 | { | 151 | { |
153 | mCalendar = cal; | 152 | mCalendar = cal; |
154 | mNavigatorView->setCalendar( cal ); | 153 | mNavigatorView->setCalendar( cal ); |
155 | for( uint i = 0; i < mLastDisplayedDN; ++i ) { | 154 | for( uint i = 0; i < mLastDisplayedDN; ++i ) { |
156 | KDateNavigator *n = mExtraViews.at( i ); | 155 | KDateNavigator *n = mExtraViews.at( i ); |
157 | n->setCalendar( cal ); | 156 | n->setCalendar( cal ); |
158 | } | 157 | } |
159 | } | 158 | } |
160 | void DateNavigatorContainer::checkUpdateDayMatrixDates() | 159 | void DateNavigatorContainer::checkUpdateDayMatrixDates() |
161 | { | 160 | { |
162 | //qDebug("KODNC: wid %d hei %d ", width(), height()); | 161 | //qDebug("KODNC: wid %d hei %d ", width(), height()); |
163 | mUpdateTimer->stop(); | 162 | mUpdateTimer->stop(); |
164 | //return; | 163 | //return; |
165 | if ( width() < 3 || height() < 3 ) | 164 | if ( width() < 3 || height() < 3 ) |
166 | return; | 165 | return; |
167 | static int lastWid = 0; | 166 | static int lastWid = 0; |
168 | static int lastHei = 0; | 167 | static int lastHei = 0; |
169 | if ( lastWid == width() && height() == lastHei ) { | 168 | if ( lastWid == width() && height() == lastHei ) { |
170 | qDebug("KODNC: No layout computing needed. "); | 169 | qDebug("KODNC: No layout computing needed. "); |
171 | } else { | 170 | } else { |
172 | lastWid = width(); | 171 | lastWid = width(); |
173 | lastHei = height(); | 172 | lastHei = height(); |
174 | 173 | ||
175 | QSize minSize = mNavigatorView->yourSizeHint(); | 174 | QSize minSize = mNavigatorView->yourSizeHint(); |
176 | 175 | ||
177 | int verticalCount = size().height() / minSize.height(); | 176 | int verticalCount = size().height() / minSize.height(); |
178 | int horizontalCount = size().width() / minSize.width(); | 177 | int horizontalCount = size().width() / minSize.width(); |
179 | //qDebug(" wattdatt %d new %d %d ", size().width() ,e->size().width() , minSize.width() ); | 178 | //qDebug(" wattdatt %d new %d %d ", size().width() ,e->size().width() , minSize.width() ); |
180 | //qDebug("COUNT %d %d %d %d ", verticalCount, horizontalCount , mVerticalCount, mHorizontalCount ); | 179 | //qDebug("COUNT %d %d %d %d ", verticalCount, horizontalCount , mVerticalCount, mHorizontalCount ); |
181 | bool fontchange = false; | 180 | bool fontchange = false; |
182 | if ( horizontalCount == 1) | 181 | if ( horizontalCount == 1) |
183 | horizontalCount = size().width() / mNavigatorView->yourFullSizeHint().width(); | 182 | horizontalCount = size().width() / mNavigatorView->yourFullSizeHint().width(); |
184 | QFont fo; | 183 | QFont fo; |
185 | if ( horizontalCount != mHorizontalCount || | 184 | if ( horizontalCount != mHorizontalCount || |
186 | verticalCount != mVerticalCount ) { | 185 | verticalCount != mVerticalCount ) { |
187 | uint count = horizontalCount * verticalCount; | 186 | uint count = horizontalCount * verticalCount; |
188 | if ( count == 0 ) { | 187 | if ( count == 0 ) { |
189 | bool ok; | 188 | bool ok; |
190 | fo = mNavigatorView->yourFontHint( size() , &ok ); | 189 | fo = mNavigatorView->yourFontHint( size() , &ok ); |
191 | //mNavigatorView->resize( size() ); | 190 | //mNavigatorView->resize( size() ); |
192 | //if ( ! ok ) | 191 | //if ( ! ok ) |
193 | // return; | 192 | // return; |
194 | int butt = 2; | 193 | int butt = 2; |
195 | horizontalCount = size().width() / mNavigatorView->sizeHintTwoButtons( ).width(); | 194 | horizontalCount = size().width() / mNavigatorView->sizeHintTwoButtons( ).width(); |
196 | if ( horizontalCount <= 1 ) | 195 | if ( horizontalCount <= 1 ) |
197 | minSize = mNavigatorView->sizeHintTwoButtons( 4 ); | 196 | minSize = mNavigatorView->sizeHintTwoButtons( 4 ); |
198 | else | 197 | else |
199 | minSize = mNavigatorView->sizeHintTwoButtons(); | 198 | minSize = mNavigatorView->sizeHintTwoButtons(); |
200 | verticalCount = size().height() / minSize.height(); | 199 | verticalCount = size().height() / minSize.height(); |
201 | horizontalCount = size().width() / minSize.width(); | 200 | horizontalCount = size().width() / minSize.width(); |
202 | if ( horizontalCount == 0 ) | 201 | if ( horizontalCount == 0 ) |
203 | horizontalCount = 1; | 202 | horizontalCount = 1; |
204 | if ( verticalCount == 0 ) | 203 | if ( verticalCount == 0 ) |
205 | verticalCount = 1; | 204 | verticalCount = 1; |
206 | fontchange = true; | 205 | fontchange = true; |
207 | count = horizontalCount * verticalCount; | 206 | count = horizontalCount * verticalCount; |
208 | } else { | 207 | } else { |
209 | if ( mNavigatorView->fontChanged() ) { | 208 | if ( mNavigatorView->fontChanged() ) { |
210 | fontchange = true; | 209 | fontchange = true; |
211 | fo = KOPrefs::instance()->mDateNavigatorFont; | 210 | fo = KOPrefs::instance()->mDateNavigatorFont; |
212 | mNavigatorView->changeFont( fo ); | 211 | mNavigatorView->changeFont( fo ); |
213 | mNavigatorView->unsetFontChanged(); | 212 | mNavigatorView->unsetFontChanged(); |
214 | } | 213 | } |
215 | } | 214 | } |
216 | mLastDisplayedDN = horizontalCount*verticalCount-1; | 215 | mLastDisplayedDN = horizontalCount*verticalCount-1; |
217 | while ( count > ( mExtraViews.count() + 1 ) ) { | 216 | while ( count > ( mExtraViews.count() + 1 ) ) { |
218 | KDateNavigator *n = new KDateNavigator( this ); | 217 | KDateNavigator *n = new KDateNavigator( this ); |
219 | n->setMonthSignalOffset ( mExtraViews.count()+1 ); | 218 | n->setMonthSignalOffset ( mExtraViews.count()+1 ); |
220 | mExtraViews.append( n ); | 219 | mExtraViews.append( n ); |
221 | n->setCalendar( mCalendar ); | 220 | n->setCalendar( mCalendar ); |
222 | connectNavigatorView( n ); | 221 | connectNavigatorView( n ); |
223 | // n->show(); | 222 | // n->show(); |
224 | } | 223 | } |
225 | 224 | ||
226 | setBaseDates(); | 225 | setBaseDates(); |
227 | if ( fontchange ) { | 226 | if ( fontchange ) { |
228 | //mNavigatorView->changeFont( fo ); | 227 | //mNavigatorView->changeFont( fo ); |
229 | uint i; | 228 | uint i; |
230 | for( i = 0; i < mExtraViews.count(); ++i ) { | 229 | for( i = 0; i < mExtraViews.count(); ++i ) { |
231 | KDateNavigator *view = mExtraViews.at( i ); | 230 | KDateNavigator *view = mExtraViews.at( i ); |
232 | view->changeFont( fo ); | 231 | view->changeFont( fo ); |
233 | } | 232 | } |
234 | } | 233 | } |
235 | mHorizontalCount = horizontalCount; | 234 | mHorizontalCount = horizontalCount; |
236 | mVerticalCount = verticalCount; | 235 | mVerticalCount = verticalCount; |
237 | 236 | ||
238 | } | 237 | } |
239 | if ( mNavigatorView->fontChanged() && ! fontchange ) { | 238 | if ( mNavigatorView->fontChanged() && ! fontchange ) { |
240 | qDebug("KDNC: Resetting all fonts "); | 239 | qDebug("KDNC: Resetting all fonts "); |
241 | fo = KOPrefs::instance()->mDateNavigatorFont; | 240 | fo = KOPrefs::instance()->mDateNavigatorFont; |
242 | mNavigatorView->changeFont( fo ); | 241 | mNavigatorView->changeFont( fo ); |
243 | mNavigatorView->unsetFontChanged(); | 242 | mNavigatorView->unsetFontChanged(); |
244 | uint i; | 243 | uint i; |
245 | for( i = 0; i < mExtraViews.count(); ++i ) { | 244 | for( i = 0; i < mExtraViews.count(); ++i ) { |
246 | KDateNavigator *view = mExtraViews.at( i ); | 245 | KDateNavigator *view = mExtraViews.at( i ); |
247 | view->changeFont( fo ); | 246 | view->changeFont( fo ); |
248 | } | 247 | } |
249 | } | 248 | } |
250 | int theight = height() / mVerticalCount; | 249 | int theight = height() / mVerticalCount; |
251 | int twidth = width() / mHorizontalCount; | 250 | int twidth = width() / mHorizontalCount; |
252 | 251 | ||
253 | NavigatorBar *bar = mNavigatorView->navigatorBar(); | 252 | NavigatorBar *bar = mNavigatorView->navigatorBar(); |
254 | if ( mHorizontalCount > 1 ) bar->showButtons( true, false ); | 253 | if ( mHorizontalCount > 1 ) bar->showButtons( true, false ); |
255 | else bar->showButtons( true, true ); | 254 | else bar->showButtons( true, true ); |
256 | 255 | ||
257 | mNavigatorView->setGeometry(0, | 256 | mNavigatorView->setGeometry(0, |
258 | 0, twidth, theight ); | 257 | 0, twidth, theight ); |
259 | for( uint i = 0; i < mLastDisplayedDN; ++i ) { | 258 | for( uint i = 0; i < mLastDisplayedDN; ++i ) { |
260 | int x = ( i + 1 ) % mHorizontalCount; | 259 | int x = ( i + 1 ) % mHorizontalCount; |
261 | int y = ( i + 1 ) / mHorizontalCount; | 260 | int y = ( i + 1 ) / mHorizontalCount; |
262 | 261 | ||
263 | KDateNavigator *view = mExtraViews.at( i ); | 262 | KDateNavigator *view = mExtraViews.at( i ); |
264 | bar = view->navigatorBar(); | 263 | bar = view->navigatorBar(); |
265 | if ( y > 0 ) bar->showButtons( false, false ); | 264 | if ( y > 0 ) bar->showButtons( false, false ); |
266 | else { | 265 | else { |
267 | if ( x + 1 == mHorizontalCount ) bar->showButtons( false, true ); | 266 | if ( x + 1 == mHorizontalCount ) bar->showButtons( false, true ); |
268 | else bar->showButtons( false, false ); | 267 | else bar->showButtons( false, false ); |
269 | } | 268 | } |
270 | view->setGeometry( x * twidth, | 269 | view->setGeometry( x * twidth, |
271 | y * theight, twidth, theight ); | 270 | y * theight, twidth, theight ); |
272 | } | 271 | } |
273 | int iii = 0; | 272 | int iii = 0; |
274 | int ccc = mHorizontalCount * mVerticalCount; | 273 | int ccc = mHorizontalCount * mVerticalCount; |
275 | mNavigatorView->show(); | 274 | mNavigatorView->show(); |
276 | while ( iii < ( mExtraViews.count() ) ) { | 275 | while ( iii < ( mExtraViews.count() ) ) { |
277 | if ( iii < ccc-1 ) | 276 | if ( iii < ccc-1 ) |
278 | mExtraViews.at( iii )->show(); | 277 | mExtraViews.at( iii )->show(); |
279 | else | 278 | else |
280 | mExtraViews.at( iii )->hide(); | 279 | mExtraViews.at( iii )->hide(); |
281 | ++iii; | 280 | ++iii; |
282 | } | 281 | } |
283 | } | 282 | } |
284 | 283 | ||
285 | QDate last = lastAvailableDate(); | 284 | QDate last = lastAvailableDate(); |
286 | QDate first = firstAvailableDate(); | 285 | QDate first = firstAvailableDate(); |
287 | 286 | ||
288 | QDate selFirst = mFirstSelectedDate; | 287 | QDate selFirst = mFirstSelectedDate; |
289 | QDate selLast = selFirst.addDays( mSelectedDateCount-1 ); | 288 | QDate selLast = selFirst.addDays( mSelectedDateCount-1 ); |
290 | if ( selFirst >= first && selLast <= last ) { | 289 | if ( selFirst >= first && selLast <= last ) { |
291 | updateDayMatrixDates(); | 290 | updateDayMatrixDates(); |
292 | } | 291 | } |
293 | else { | 292 | else { |
294 | updateDayMatrixDates(); | 293 | updateDayMatrixDates(); |
295 | emit monthSelected( mFirstSelectedDate.month() ); | 294 | emit monthSelected( mFirstSelectedDate.month() ); |
296 | } | 295 | } |
297 | } | 296 | } |
298 | void DateNavigatorContainer::updateDayMatrixDates() | 297 | void DateNavigatorContainer::updateDayMatrixDates() |
299 | { | 298 | { |
300 | QDate fDate = mFirstSelectedDate; | 299 | QDate fDate = mFirstSelectedDate; |
301 | QDate lDate = fDate.addDays( mSelectedDateCount - 1 ); | 300 | QDate lDate = fDate.addDays( mSelectedDateCount - 1 ); |
302 | mNavigatorView->dayMatrix()->setSelectedDaysFrom( fDate , lDate ); | 301 | mNavigatorView->dayMatrix()->setSelectedDaysFrom( fDate , lDate ); |
303 | mNavigatorView->dayMatrix()->repaint( false ); | 302 | mNavigatorView->dayMatrix()->repaint( false ); |
304 | for( uint i = 0; i < mLastDisplayedDN; ++i ) { | 303 | for( uint i = 0; i < mLastDisplayedDN; ++i ) { |
305 | KDateNavigator *n = mExtraViews.at( i ); | 304 | KDateNavigator *n = mExtraViews.at( i ); |
306 | if ( n->dayMatrix()->setSelectedDaysFrom( fDate , lDate ) ) { | 305 | if ( n->dayMatrix()->setSelectedDaysFrom( fDate , lDate ) ) { |
307 | n->dayMatrix()->repaint( false ); | 306 | n->dayMatrix()->repaint( false ); |
308 | } | 307 | } |
309 | } | 308 | } |
310 | } | 309 | } |
311 | 310 | ||
312 | void DateNavigatorContainer::updateDayMatrix() | 311 | void DateNavigatorContainer::updateDayMatrix() |
313 | { | 312 | { |
314 | mNavigatorView->updateDayMatrix(); | 313 | mNavigatorView->updateDayMatrix(); |
315 | for( uint i = 0; i < mLastDisplayedDN; ++i ) { | 314 | for( uint i = 0; i < mLastDisplayedDN; ++i ) { |
316 | KDateNavigator *n = mExtraViews.at( i ); | 315 | KDateNavigator *n = mExtraViews.at( i ); |
317 | n->updateDayMatrix(); | 316 | n->updateDayMatrix(); |
318 | } | 317 | } |
319 | } | 318 | } |
320 | 319 | ||
321 | void DateNavigatorContainer::updateToday() | 320 | void DateNavigatorContainer::updateToday() |
322 | { | 321 | { |
323 | qDebug("DateNavigatorContainer::updateToday() NOT IMPL "); | 322 | qDebug("DateNavigatorContainer::updateToday() NOT IMPL "); |
324 | #if 0 | 323 | #if 0 |
325 | mNavigatorView->updateToday(); | 324 | mNavigatorView->updateToday(); |
326 | KDateNavigator *n; | 325 | KDateNavigator *n; |
327 | for( n = mExtraViews.first(); n; n = mExtraViews.next() ) { | 326 | for( n = mExtraViews.first(); n; n = mExtraViews.next() ) { |
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index 322131f..ecca374 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp | |||
@@ -151,388 +151,388 @@ QString KODayMatrix::getWhatsThisText( QPoint p ) | |||
151 | 151 | ||
152 | int tmp = getDayIndexFrom(p.x(), p.y()); | 152 | int tmp = getDayIndexFrom(p.x(), p.y()); |
153 | if ( tmp < 0 || tmp > NUMDAYS-1 || !mCalendar ) | 153 | if ( tmp < 0 || tmp > NUMDAYS-1 || !mCalendar ) |
154 | return QString(); | 154 | return QString(); |
155 | QDate mDate = days[tmp]; | 155 | QDate mDate = days[tmp]; |
156 | QPtrList<Event> eventlist = mCalendar->events(mDate); | 156 | QPtrList<Event> eventlist = mCalendar->events(mDate); |
157 | Event *event; | 157 | Event *event; |
158 | QStringList mToolTip; | 158 | QStringList mToolTip; |
159 | for(event=eventlist.first();event != 0;event=eventlist.next()) { | 159 | for(event=eventlist.first();event != 0;event=eventlist.next()) { |
160 | QString mToolTipText; | 160 | QString mToolTipText; |
161 | QString text; | 161 | QString text; |
162 | int multiday = 0;// 1 = start, 2 = midddle, 3 = end day | 162 | int multiday = 0;// 1 = start, 2 = midddle, 3 = end day |
163 | if (event->isMultiDay()) { | 163 | if (event->isMultiDay()) { |
164 | QString prefix = "<->";multiday = 2; | 164 | QString prefix = "<->";multiday = 2; |
165 | QString time; | 165 | QString time; |
166 | if ( event->doesRecur() ) { | 166 | if ( event->doesRecur() ) { |
167 | if ( event->recursOn( mDate) ) { | 167 | if ( event->recursOn( mDate) ) { |
168 | prefix ="->" ;multiday = 1; | 168 | prefix ="->" ;multiday = 1; |
169 | } | 169 | } |
170 | else { | 170 | else { |
171 | int days = event->dtStart().date().daysTo ( event->dtEnd().date() ); | 171 | int days = event->dtStart().date().daysTo ( event->dtEnd().date() ); |
172 | if ( event->recursOn( mDate.addDays( -days)) ) { | 172 | if ( event->recursOn( mDate.addDays( -days)) ) { |
173 | prefix ="<-" ;multiday = 3; | 173 | prefix ="<-" ;multiday = 3; |
174 | } | 174 | } |
175 | } | 175 | } |
176 | } else { | 176 | } else { |
177 | if (mDate == event->dtStart().date()) { | 177 | if (mDate == event->dtStart().date()) { |
178 | prefix ="->" ;multiday = 1; | 178 | prefix ="->" ;multiday = 1; |
179 | } else if (mDate == event->dtEnd().date()) { | 179 | } else if (mDate == event->dtEnd().date()) { |
180 | prefix ="<-" ;multiday = 3; | 180 | prefix ="<-" ;multiday = 3; |
181 | } | 181 | } |
182 | } | 182 | } |
183 | if ( !event->doesFloat() ) { | 183 | if ( !event->doesFloat() ) { |
184 | if ( mDate == event->dtStart().date () ) | 184 | if ( mDate == event->dtStart().date () ) |
185 | time = KGlobal::locale()->formatTime(event->dtStart().time())+" "; | 185 | time = KGlobal::locale()->formatTime(event->dtStart().time())+" "; |
186 | else if ( mDate == event->dtEnd().date () ) | 186 | else if ( mDate == event->dtEnd().date () ) |
187 | time = KGlobal::locale()->formatTime(event->dtEnd().time())+" "; | 187 | time = KGlobal::locale()->formatTime(event->dtEnd().time())+" "; |
188 | 188 | ||
189 | } | 189 | } |
190 | text = time + event->summary(); | 190 | text = time + event->summary(); |
191 | mToolTipText += prefix + text; | 191 | mToolTipText += prefix + text; |
192 | } else { | 192 | } else { |
193 | if (event->doesFloat()) { | 193 | if (event->doesFloat()) { |
194 | text = event->summary(); | 194 | text = event->summary(); |
195 | mToolTipText += text; | 195 | mToolTipText += text; |
196 | } | 196 | } |
197 | else { | 197 | else { |
198 | text = KGlobal::locale()->formatTime(event->dtStart().time()); | 198 | text = KGlobal::locale()->formatTime(event->dtStart().time()); |
199 | text += " " + event->summary(); | 199 | text += " " + event->summary(); |
200 | mToolTipText += KGlobal::locale()->formatTime(event->dtStart().time()) +"-"+KGlobal::locale()->formatTime(event->dtEnd().time())+" " + event->summary(); | 200 | mToolTipText += KGlobal::locale()->formatTime(event->dtStart().time()) +"-"+KGlobal::locale()->formatTime(event->dtEnd().time())+" " + event->summary(); |
201 | } | 201 | } |
202 | } | 202 | } |
203 | if ( !event->location().isEmpty() ) | 203 | if ( !event->location().isEmpty() ) |
204 | mToolTipText += " (" + event->location() + ")"; | 204 | mToolTipText += " (" + event->location() + ")"; |
205 | #if QT_VERSION >= 0x030000 | 205 | #if QT_VERSION >= 0x030000 |
206 | mToolTipText.replace( '<' , "<" ); | 206 | mToolTipText.replace( '<' , "<" ); |
207 | mToolTipText.replace( '>' , ">" ); | 207 | mToolTipText.replace( '>' , ">" ); |
208 | #else | 208 | #else |
209 | if ( mToolTipText.find ('<') >= 0 ) { | 209 | if ( mToolTipText.find ('<') >= 0 ) { |
210 | mToolTipText.replace( QRegExp("<") , "<" ); | 210 | mToolTipText.replace( QRegExp("<") , "<" ); |
211 | } | 211 | } |
212 | if ( mToolTipText.find ('>') >= 0 ) { | 212 | if ( mToolTipText.find ('>') >= 0 ) { |
213 | mToolTipText.replace( QRegExp(">") , ">" ); | 213 | mToolTipText.replace( QRegExp(">") , ">" ); |
214 | } | 214 | } |
215 | #endif | 215 | #endif |
216 | //qDebug("TTT: %s ", mToolTipText.latin1()); | 216 | //qDebug("TTT: %s ", mToolTipText.latin1()); |
217 | mToolTip.append( mToolTipText ); | 217 | mToolTip.append( mToolTipText ); |
218 | } | 218 | } |
219 | mToolTip.sort(); | 219 | mToolTip.sort(); |
220 | return "<b>"+KGlobal::locale()->formatDate(days[tmp]) + "</b><br>" + mToolTip.join("<br>"); | 220 | return "<b>"+KGlobal::locale()->formatDate(days[tmp]) + "</b><br>" + mToolTip.join("<br>"); |
221 | } | 221 | } |
222 | void KODayMatrix::setCalendar( Calendar *cal ) | 222 | void KODayMatrix::setCalendar( Calendar *cal ) |
223 | { | 223 | { |
224 | mCalendar = cal; | 224 | mCalendar = cal; |
225 | 225 | ||
226 | setAcceptDrops( mCalendar ); | 226 | setAcceptDrops( mCalendar ); |
227 | 227 | ||
228 | updateEvents(); | 228 | updateEvents(); |
229 | } | 229 | } |
230 | 230 | ||
231 | QColor KODayMatrix::getShadedColor(QColor color) | 231 | QColor KODayMatrix::getShadedColor(QColor color) |
232 | { | 232 | { |
233 | QColor shaded; | 233 | QColor shaded; |
234 | int h=0; | 234 | int h=0; |
235 | int s=0; | 235 | int s=0; |
236 | int v=0; | 236 | int v=0; |
237 | color.hsv(&h,&s,&v); | 237 | color.hsv(&h,&s,&v); |
238 | s = s/4; | 238 | s = s/4; |
239 | v = 192+v/4; | 239 | v = 192+v/4; |
240 | shaded.setHsv(h,s,v); | 240 | shaded.setHsv(h,s,v); |
241 | 241 | ||
242 | return shaded; | 242 | return shaded; |
243 | } | 243 | } |
244 | 244 | ||
245 | KODayMatrix::~KODayMatrix() | 245 | KODayMatrix::~KODayMatrix() |
246 | { | 246 | { |
247 | // delete mKODaymatrixWhatsThis; | 247 | // delete mKODaymatrixWhatsThis; |
248 | delete [] days; | 248 | delete [] days; |
249 | delete [] daylbls; | 249 | delete [] daylbls; |
250 | //delete [] events; | 250 | //delete [] events; |
251 | delete mToolTip; | 251 | delete mToolTip; |
252 | } | 252 | } |
253 | 253 | ||
254 | /* | 254 | /* |
255 | void KODayMatrix::setStartDate(QDate start) | 255 | void KODayMatrix::setStartDate(QDate start) |
256 | { | 256 | { |
257 | updateView(start); | 257 | updateView(start); |
258 | } | 258 | } |
259 | */ | 259 | */ |
260 | 260 | ||
261 | void KODayMatrix::addSelectedDaysTo(DateList& selDays) | 261 | void KODayMatrix::addSelectedDaysTo(DateList& selDays) |
262 | { | 262 | { |
263 | 263 | ||
264 | if (mSelStart == NOSELECTION) { | 264 | if (mSelStart == NOSELECTION) { |
265 | return; | 265 | return; |
266 | } | 266 | } |
267 | 267 | ||
268 | //cope with selection being out of matrix limits at top (< 0) | 268 | //cope with selection being out of matrix limits at top (< 0) |
269 | int i0 = mSelStart; | 269 | int i0 = mSelStart; |
270 | if (i0 < 0) { | 270 | if (i0 < 0) { |
271 | for (int i = i0; i < 0; i++) { | 271 | for (int i = i0; i < 0; i++) { |
272 | selDays.append(days[0].addDays(i)); | 272 | selDays.append(days[0].addDays(i)); |
273 | } | 273 | } |
274 | i0 = 0; | 274 | i0 = 0; |
275 | } | 275 | } |
276 | 276 | ||
277 | //cope with selection being out of matrix limits at bottom (> NUMDAYS-1) | 277 | //cope with selection being out of matrix limits at bottom (> NUMDAYS-1) |
278 | if (mSelEnd > NUMDAYS-1) { | 278 | if (mSelEnd > NUMDAYS-1) { |
279 | for (int i = i0; i <= NUMDAYS-1; i++) { | 279 | for (int i = i0; i <= NUMDAYS-1; i++) { |
280 | selDays.append(days[i]); | 280 | selDays.append(days[i]); |
281 | } | 281 | } |
282 | for (int i = NUMDAYS; i < mSelEnd; i++) { | 282 | for (int i = NUMDAYS; i < mSelEnd; i++) { |
283 | selDays.append(days[0].addDays(i)); | 283 | selDays.append(days[0].addDays(i)); |
284 | } | 284 | } |
285 | 285 | ||
286 | // apply normal routine to selection being entirely within matrix limits | 286 | // apply normal routine to selection being entirely within matrix limits |
287 | } else { | 287 | } else { |
288 | for (int i = i0; i <= mSelEnd; i++) { | 288 | for (int i = i0; i <= mSelEnd; i++) { |
289 | selDays.append(days[i]); | 289 | selDays.append(days[i]); |
290 | } | 290 | } |
291 | } | 291 | } |
292 | } | 292 | } |
293 | 293 | ||
294 | bool KODayMatrix::setSelectedDaysFrom(const QDate& start, const QDate& end) | 294 | bool KODayMatrix::setSelectedDaysFrom(const QDate& start, const QDate& end) |
295 | { | 295 | { |
296 | mRedrawNeeded = true; | 296 | mRedrawNeeded = true; |
297 | bool noSel = (mSelEnd == NOSELECTION && mSelStart == NOSELECTION ); | 297 | bool noSel = (mSelEnd == NOSELECTION && mSelStart == NOSELECTION ); |
298 | mSelStart = startdate.daysTo(start); | 298 | mSelStart = startdate.daysTo(start); |
299 | if ( mSelStart < 0 ) | 299 | if ( mSelStart < 0 ) |
300 | mSelStart = 0; | 300 | mSelStart = 0; |
301 | mSelEnd = startdate.daysTo(end); | 301 | mSelEnd = startdate.daysTo(end); |
302 | if ( mSelEnd > NUMDAYS-1 ) | 302 | if ( mSelEnd > NUMDAYS-1 ) |
303 | mSelEnd = NUMDAYS-1; | 303 | mSelEnd = NUMDAYS-1; |
304 | if ( mSelEnd < 0 || mSelStart > NUMDAYS-1 ) { | 304 | if ( mSelEnd < 0 || mSelStart > NUMDAYS-1 ) { |
305 | clearSelection(); | 305 | clearSelection(); |
306 | if ( noSel ) | 306 | if ( noSel ) |
307 | return false; | 307 | return false; |
308 | } | 308 | } |
309 | 309 | ||
310 | return true; | 310 | return true; |
311 | } | 311 | } |
312 | void KODayMatrix::clearSelection() | 312 | void KODayMatrix::clearSelection() |
313 | { | 313 | { |
314 | mSelEnd = mSelStart = NOSELECTION; | 314 | mSelEnd = mSelStart = NOSELECTION; |
315 | } | 315 | } |
316 | 316 | ||
317 | 317 | ||
318 | void KODayMatrix::recalculateToday() | 318 | void KODayMatrix::recalculateToday() |
319 | { | 319 | { |
320 | today = -1; | 320 | today = -1; |
321 | for (int i=0; i<NUMDAYS; i++) { | 321 | for (int i=0; i<NUMDAYS; i++) { |
322 | //events[i] = 0; | 322 | //events[i] = 0; |
323 | days[i] = startdate.addDays(i); | 323 | days[i] = startdate.addDays(i); |
324 | daylbls[i] = QString::number( KOGlobals::self()->calendarSystem()->day( days[i] )); | 324 | daylbls[i] = QString::number( KOGlobals::self()->calendarSystem()->day( days[i] )); |
325 | 325 | ||
326 | // if today is in the currently displayed month, hilight today | 326 | // if today is in the currently displayed month, hilight today |
327 | if (days[i].year() == QDate::currentDate().year() && | 327 | if (days[i].year() == QDate::currentDate().year() && |
328 | days[i].month() == QDate::currentDate().month() && | 328 | days[i].month() == QDate::currentDate().month() && |
329 | days[i].day() == QDate::currentDate().day()) { | 329 | days[i].day() == QDate::currentDate().day()) { |
330 | today = i; | 330 | today = i; |
331 | } | 331 | } |
332 | } | 332 | } |
333 | // qDebug(QString("Today is visible at %1.").arg(today)); | 333 | // qDebug(QString("Today is visible at %1.").arg(today)); |
334 | } | 334 | } |
335 | 335 | ||
336 | void KODayMatrix::updateView() | 336 | void KODayMatrix::updateView() |
337 | { | 337 | { |
338 | updateView(startdate); | 338 | updateView(startdate); |
339 | } | 339 | } |
340 | void KODayMatrix::repaintViewTimed() | 340 | void KODayMatrix::repaintViewTimed() |
341 | { | 341 | { |
342 | mRedrawNeeded = true; | 342 | mRedrawNeeded = true; |
343 | bDays.fill( false); | 343 | // bDays.fill( false); |
344 | pDays.fill( false); | 344 | //pDays.fill( false); |
345 | hDays.fill( false); | 345 | //hDays.fill( false); |
346 | eDays.fill( false); | 346 | //eDays.fill( false); |
347 | mRepaintTimer->stop(); | 347 | mRepaintTimer->stop(); |
348 | int startDay = days[0].dayOfWeek(); // 1...7 7 = sunday | 348 | int startDay = days[0].dayOfWeek(); // 1...7 7 = sunday |
349 | int i; | 349 | int i; |
350 | for(i = 0; i < NUMDAYS; i++) { | 350 | for(i = 0; i < NUMDAYS; i++) { |
351 | if ( ( (i+startDay) % 7 == 0 ) ) { | 351 | if ( ( (i+startDay) % 7 == 0 ) ) { |
352 | pDays.setBit(i); | 352 | pDays.setBit(i); |
353 | } | 353 | } |
354 | } | 354 | } |
355 | repaint(false); | 355 | repaint(false); |
356 | } | 356 | } |
357 | void KODayMatrix::computeEvent(Event *event, int i ) | 357 | void KODayMatrix::computeEvent(Event *event, int i ) |
358 | { | 358 | { |
359 | QString holiStr = mHolidays[i]; | 359 | QString holiStr = mHolidays[i]; |
360 | if ( event->isHoliday()) { | 360 | if ( event->isHoliday()) { |
361 | pDays.setBit(i); | 361 | pDays.setBit(i); |
362 | hDays.setBit(i); | 362 | hDays.setBit(i); |
363 | if ( !holiStr.isEmpty() ) | 363 | if ( !holiStr.isEmpty() ) |
364 | holiStr += "\n"; | 364 | holiStr += "\n"; |
365 | holiStr += event->summary(); | 365 | holiStr += event->summary(); |
366 | if ( !event->location().isEmpty() ) | 366 | if ( !event->location().isEmpty() ) |
367 | holiStr += " (" + event->location() + ")"; | 367 | holiStr += " (" + event->location() + ")"; |
368 | mHolidays[i] =holiStr ; | 368 | mHolidays[i] =holiStr ; |
369 | } | 369 | } |
370 | if ( event->isBirthday()) { | 370 | if ( event->isBirthday()) { |
371 | pDays.setBit(i); | 371 | pDays.setBit(i); |
372 | if ( !holiStr.isEmpty() ) | 372 | if ( !holiStr.isEmpty() ) |
373 | holiStr += "\n"; | 373 | holiStr += "\n"; |
374 | holiStr += i18n("Birthday") + ": "+event->summary(); | 374 | holiStr += i18n("Birthday") + ": "+event->summary(); |
375 | if ( !event->location().isEmpty() ) | 375 | if ( !event->location().isEmpty() ) |
376 | holiStr += " (" + event->location() + ")"; | 376 | holiStr += " (" + event->location() + ")"; |
377 | bDays.setBit(i); | 377 | bDays.setBit(i); |
378 | mHolidays[i] =holiStr ; | 378 | mHolidays[i] =holiStr ; |
379 | } | 379 | } |
380 | eDays.setBit(i); | 380 | eDays.setBit(i); |
381 | } | 381 | } |
382 | void KODayMatrix::updateViewTimed() | 382 | void KODayMatrix::updateViewTimed() |
383 | { | 383 | { |
384 | mUpdateTimer->stop(); | 384 | mUpdateTimer->stop(); |
385 | if ( !mCalendar ) { | 385 | if ( !mCalendar ) { |
386 | qDebug("NOT CAL "); | 386 | qDebug("NOT CAL "); |
387 | return; | 387 | return; |
388 | } | 388 | } |
389 | #if 1 | 389 | #if 1 |
390 | 390 | ||
391 | int i; | 391 | int i; |
392 | int timeSpan = NUMDAYS-1; | 392 | int timeSpan = NUMDAYS-1; |
393 | QPtrList<Event> events = mCalendar->events(); | 393 | QPtrList<Event> events = mCalendar->events(); |
394 | Event *event; | 394 | Event *event; |
395 | QDateTime dt; | 395 | QDateTime dt; |
396 | bool ok; | 396 | bool ok; |
397 | bDays.fill( false); | 397 | bDays.fill( false); |
398 | pDays.fill( false); | 398 | pDays.fill( false); |
399 | hDays.fill( false); | 399 | hDays.fill( false); |
400 | eDays.fill( false); | 400 | eDays.fill( false); |
401 | mHolidays.clear(); | 401 | mHolidays.clear(); |
402 | QDate mStartDate = days[0]; | 402 | QDate mStartDate = days[0]; |
403 | QDate endDate = mStartDate.addDays( timeSpan ); | 403 | QDate endDate = mStartDate.addDays( timeSpan ); |
404 | for( event = events.first(); event; event = events.next() ) { // for event | 404 | for( event = events.first(); event; event = events.next() ) { // for event |
405 | ushort recurType = event->recurrence()->doesRecur(); | 405 | ushort recurType = event->recurrence()->doesRecur(); |
406 | if ((recurType == Recurrence::rDaily && !KOPrefs::instance()->mDailyRecur) || | 406 | if ((recurType == Recurrence::rDaily && !KOPrefs::instance()->mDailyRecur) || |
407 | (recurType == Recurrence::rWeekly && !KOPrefs::instance()->mWeeklyRecur)) { | 407 | (recurType == Recurrence::rWeekly && !KOPrefs::instance()->mWeeklyRecur)) { |
408 | continue; | 408 | continue; |
409 | } | 409 | } |
410 | if ( event->doesRecur() ) { | 410 | if ( event->doesRecur() ) { |
411 | bool last; | 411 | bool last; |
412 | QDateTime incidenceStart = event->recurrence()->getPreviousDateTime( QDateTime( mStartDate ) , &last ); | 412 | QDateTime incidenceStart = event->recurrence()->getPreviousDateTime( QDateTime( mStartDate ) , &last ); |
413 | QDateTime incidenceEnd; | 413 | QDateTime incidenceEnd; |
414 | int eventlen = event->dtStart().date().daysTo ( event->dtEnd().date() ); | 414 | int eventlen = event->dtStart().date().daysTo ( event->dtEnd().date() ); |
415 | bool invalid = false; | 415 | bool invalid = false; |
416 | while( true ) { | 416 | while( true ) { |
417 | if ( incidenceStart.isValid() ) { | 417 | if ( incidenceStart.isValid() ) { |
418 | incidenceEnd = incidenceStart.addDays( eventlen ); | 418 | incidenceEnd = incidenceStart.addDays( eventlen ); |
419 | int st = incidenceStart.date().daysTo( endDate ); | 419 | int st = incidenceStart.date().daysTo( endDate ); |
420 | if ( st >= 0 ) { // start before timeend | 420 | if ( st >= 0 ) { // start before timeend |
421 | int end = mStartDate.daysTo( incidenceEnd.date() ); | 421 | int end = mStartDate.daysTo( incidenceEnd.date() ); |
422 | if ( end >= 0 ) { // end after timestart --- got one! | 422 | if ( end >= 0 ) { // end after timestart --- got one! |
423 | //normalize | 423 | //normalize |
424 | st = timeSpan - st; | 424 | st = timeSpan - st; |
425 | if ( st < 0 ) st = 0; | 425 | if ( st < 0 ) st = 0; |
426 | if ( end > timeSpan ) end = timeSpan; | 426 | if ( end > timeSpan ) end = timeSpan; |
427 | int iii; | 427 | int iii; |
428 | //qDebug("found %s %d %d ",event->summary().latin1(), st, end ); | 428 | //qDebug("found %s %d %d ",event->summary().latin1(), st, end ); |
429 | for ( iii = st;iii<= end;++iii) { | 429 | for ( iii = st;iii<= end;++iii) { |
430 | computeEvent( event, iii ); | 430 | computeEvent( event, iii ); |
431 | } | 431 | } |
432 | } | 432 | } |
433 | } | 433 | } |
434 | } else { | 434 | } else { |
435 | if ( invalid ) | 435 | if ( invalid ) |
436 | break; | 436 | break; |
437 | invalid = true; | 437 | invalid = true; |
438 | //qDebug("invalid %s", event->summary().latin1()); | 438 | //qDebug("invalid %s", event->summary().latin1()); |
439 | incidenceStart = QDateTime( mStartDate ).addSecs( -2 );; | 439 | incidenceStart = QDateTime( mStartDate ).addSecs( -2 );; |
440 | } | 440 | } |
441 | if ( last ) | 441 | if ( last ) |
442 | break; | 442 | break; |
443 | bool ok; | 443 | bool ok; |
444 | incidenceStart = event->getNextOccurence( incidenceStart.addSecs( 1 ) ,&ok ); | 444 | incidenceStart = event->getNextOccurence( incidenceStart.addSecs( 1 ) ,&ok ); |
445 | if ( ! ok ) | 445 | if ( ! ok ) |
446 | break; | 446 | break; |
447 | if ( incidenceStart.date() > endDate ) | 447 | if ( incidenceStart.date() > endDate ) |
448 | break; | 448 | break; |
449 | } | 449 | } |
450 | } else { // no recur | 450 | } else { // no recur |
451 | int st = event->dtStart().date().daysTo( endDate ); | 451 | int st = event->dtStart().date().daysTo( endDate ); |
452 | if ( st >= 0 ) { // start before timeend | 452 | if ( st >= 0 ) { // start before timeend |
453 | int end = mStartDate.daysTo( event->dtEnd().date() ); | 453 | int end = mStartDate.daysTo( event->dtEnd().date() ); |
454 | if ( end >= 0 ) { // end after timestart --- got one! | 454 | if ( end >= 0 ) { // end after timestart --- got one! |
455 | //normalize | 455 | //normalize |
456 | st = timeSpan - st; | 456 | st = timeSpan - st; |
457 | if ( st < 0 ) st = 0; | 457 | if ( st < 0 ) st = 0; |
458 | if ( end > timeSpan ) end = timeSpan; | 458 | if ( end > timeSpan ) end = timeSpan; |
459 | int iii; | 459 | int iii; |
460 | for ( iii = st;iii<= end;++iii) | 460 | for ( iii = st;iii<= end;++iii) |
461 | computeEvent( event, iii ); | 461 | computeEvent( event, iii ); |
462 | } | 462 | } |
463 | } | 463 | } |
464 | } | 464 | } |
465 | } | 465 | } |
466 | int startDay = days[0].dayOfWeek(); // 1...7 7 = sunday | 466 | int startDay = days[0].dayOfWeek(); // 1...7 7 = sunday |
467 | for(i = 0; i < NUMDAYS; i++) { | 467 | for(i = 0; i < NUMDAYS; i++) { |
468 | if ( ( (i+startDay) % 7 == 0 ) ) { | 468 | if ( ( (i+startDay) % 7 == 0 ) ) { |
469 | pDays.setBit(i); | 469 | pDays.setBit(i); |
470 | } | 470 | } |
471 | } | 471 | } |
472 | 472 | ||
473 | #if 0 | 473 | #if 0 |
474 | // insert due todos | 474 | // insert due todos |
475 | QPtrList<Todo> todos = calendar()->todos( ); | 475 | QPtrList<Todo> todos = calendar()->todos( ); |
476 | Todo *todo; | 476 | Todo *todo; |
477 | for(todo = todos.first(); todo; todo = todos.next()) { | 477 | for(todo = todos.first(); todo; todo = todos.next()) { |
478 | //insertTodo( todo ); | 478 | //insertTodo( todo ); |
479 | if ( todo->hasDueDate() ) { | 479 | if ( todo->hasDueDate() ) { |
480 | int day = mStartDate.daysTo( todo->dtDue().date() ); | 480 | int day = mStartDate.daysTo( todo->dtDue().date() ); |
481 | if ( day >= 0 && day < timeSpan + 1) { | 481 | if ( day >= 0 && day < timeSpan + 1) { |
482 | (*cells)[day]->insertTodo( todo ); | 482 | (*cells)[day]->insertTodo( todo ); |
483 | } | 483 | } |
484 | } | 484 | } |
485 | } | 485 | } |
486 | #endif | 486 | #endif |
487 | 487 | ||
488 | #else | 488 | #else |
489 | //qDebug("KODayMatrix::updateViewTimed "); | 489 | //qDebug("KODayMatrix::updateViewTimed "); |
490 | for(int i = 0; i < NUMDAYS; i++) { | 490 | for(int i = 0; i < NUMDAYS; i++) { |
491 | // if events are set for the day then remember to draw it bold | 491 | // if events are set for the day then remember to draw it bold |
492 | QPtrList<Event> eventlist = mCalendar->events(days[i]); | 492 | QPtrList<Event> eventlist = mCalendar->events(days[i]); |
493 | Event *event; | 493 | Event *event; |
494 | int numEvents = eventlist.count(); | 494 | int numEvents = eventlist.count(); |
495 | QString holiStr = ""; | 495 | QString holiStr = ""; |
496 | bDays.clearBit(i); | 496 | bDays.clearBit(i); |
497 | hDays.clearBit(i); | 497 | hDays.clearBit(i); |
498 | eDays.clearBit(i); | 498 | eDays.clearBit(i); |
499 | for(event=eventlist.first();event != 0;event=eventlist.next()) { | 499 | for(event=eventlist.first();event != 0;event=eventlist.next()) { |
500 | qDebug("FFFFFFFFFFFFFFFFFFFFFFFFF "); | 500 | qDebug("FFFFFFFFFFFFFFFFFFFFFFFFF "); |
501 | ushort recurType = event->recurrence()->doesRecur(); | 501 | ushort recurType = event->recurrence()->doesRecur(); |
502 | if ((recurType == Recurrence::rDaily && !KOPrefs::instance()->mDailyRecur) || | 502 | if ((recurType == Recurrence::rDaily && !KOPrefs::instance()->mDailyRecur) || |
503 | (recurType == Recurrence::rWeekly && !KOPrefs::instance()->mWeeklyRecur)) { | 503 | (recurType == Recurrence::rWeekly && !KOPrefs::instance()->mWeeklyRecur)) { |
504 | numEvents--; | 504 | numEvents--; |
505 | } | 505 | } |
506 | if ( event->isHoliday()) { | 506 | if ( event->isHoliday()) { |
507 | hDays.setBit(i); | 507 | hDays.setBit(i); |
508 | if ( !holiStr.isEmpty() ) | 508 | if ( !holiStr.isEmpty() ) |
509 | holiStr += "\n"; | 509 | holiStr += "\n"; |
510 | holiStr += event->summary(); | 510 | holiStr += event->summary(); |
511 | if ( !event->location().isEmpty() ) | 511 | if ( !event->location().isEmpty() ) |
512 | holiStr += " (" + event->location() + ")"; | 512 | holiStr += " (" + event->location() + ")"; |
513 | } | 513 | } |
514 | if ( event->isBirthday()) { | 514 | if ( event->isBirthday()) { |
515 | if ( !holiStr.isEmpty() ) | 515 | if ( !holiStr.isEmpty() ) |
516 | holiStr += "\n"; | 516 | holiStr += "\n"; |
517 | holiStr += i18n("Birthday") + ": "+event->summary(); | 517 | holiStr += i18n("Birthday") + ": "+event->summary(); |
518 | if ( !event->location().isEmpty() ) | 518 | if ( !event->location().isEmpty() ) |
519 | holiStr += " (" + event->location() + ")"; | 519 | holiStr += " (" + event->location() + ")"; |
520 | bDays.setBit(i); | 520 | bDays.setBit(i); |
521 | } | 521 | } |
522 | } | 522 | } |
523 | if ( numEvents ) | 523 | if ( numEvents ) |
524 | eDays.setBit(i); | 524 | eDays.setBit(i); |
525 | //if it is a holy day then draw it red. Sundays are consider holidays, too | 525 | //if it is a holy day then draw it red. Sundays are consider holidays, too |
526 | if ( (KOGlobals::self()->calendarSystem()->dayOfWeek(days[i]) == KOGlobals::self()->calendarSystem()->weekDayOfPray()) || | 526 | if ( (KOGlobals::self()->calendarSystem()->dayOfWeek(days[i]) == KOGlobals::self()->calendarSystem()->weekDayOfPray()) || |
527 | !holiStr.isEmpty()) { | 527 | !holiStr.isEmpty()) { |
528 | mHolidays[i] = holiStr; | 528 | mHolidays[i] = holiStr; |
529 | } else { | 529 | } else { |
530 | mHolidays[i] = QString::null; | 530 | mHolidays[i] = QString::null; |
531 | } | 531 | } |
532 | } | 532 | } |
533 | #endif | 533 | #endif |
534 | mRedrawNeeded = true; | 534 | mRedrawNeeded = true; |
535 | if ( ! mPendingUpdateBeforeRepaint ) | 535 | if ( ! mPendingUpdateBeforeRepaint ) |
536 | repaint(false); | 536 | repaint(false); |
537 | } | 537 | } |
538 | void KODayMatrix::updateView(QDate actdate) | 538 | void KODayMatrix::updateView(QDate actdate) |
diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp index 35d084d..1dce841 100644 --- a/korganizer/koeventviewerdialog.cpp +++ b/korganizer/koeventviewerdialog.cpp | |||
@@ -1,308 +1,314 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of KOrganizer. | 2 | This file is part of KOrganizer. |
3 | Copyright (c) 2000,2001 Cornelius Schumacher <schumacher@kde.org> | 3 | Copyright (c) 2000,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 | 19 | ||
20 | #include <klocale.h> | 20 | #include <klocale.h> |
21 | 21 | ||
22 | #include <libkcal/event.h> | 22 | #include <libkcal/event.h> |
23 | #include <qtimer.h> | 23 | #include <qtimer.h> |
24 | #include <qpushbutton.h> | 24 | #include <qpushbutton.h> |
25 | 25 | ||
26 | #include "koeventviewer.h" | 26 | #include "koeventviewer.h" |
27 | #include <kmessagebox.h> | 27 | #include <kmessagebox.h> |
28 | #include "koprefs.h" | 28 | #include "koprefs.h" |
29 | #include <libkcal/todo.h> | 29 | #include <libkcal/todo.h> |
30 | #include "qapp.h" | 30 | #include "qapp.h" |
31 | 31 | ||
32 | #include "koeventviewerdialog.h" | 32 | #include "koeventviewerdialog.h" |
33 | extern int globalFlagBlockAgenda; | 33 | extern int globalFlagBlockAgenda; |
34 | 34 | ||
35 | KOEventViewerDialog::KOEventViewerDialog(QWidget *parent,const char *name) | 35 | KOEventViewerDialog::KOEventViewerDialog(QWidget *parent,const char *name) |
36 | : KDialogBase(parent,name, | 36 | : KDialogBase(parent,name, |
37 | #ifndef DESKTOP_VERSION | 37 | #ifndef DESKTOP_VERSION |
38 | true , | 38 | true , |
39 | #else | 39 | #else |
40 | false, | 40 | false, |
41 | #endif | 41 | #endif |
42 | i18n("Event Viewer"),Ok|User1|Close,Close, false, i18n("Agenda")) | 42 | i18n("Event Viewer"),Ok|User1|Close,Close, false, i18n("Agenda")) |
43 | { | 43 | { |
44 | sendSignalViewerClosed = true; | 44 | sendSignalViewerClosed = true; |
45 | mEventViewer = new KOEventViewer(this); | 45 | mEventViewer = new KOEventViewer(this); |
46 | mEventViewer->setFont( KOPrefs::instance()->mEventViewFont ); | 46 | mEventViewer->setFont( KOPrefs::instance()->mEventViewFont ); |
47 | setMainWidget(mEventViewer); | 47 | setMainWidget(mEventViewer); |
48 | setButtonText(Ok, i18n("Edit") ); | 48 | setButtonText(Ok, i18n("Edit") ); |
49 | 49 | ||
50 | QObject::connect(findButton( Ok ),SIGNAL(clicked()), | 50 | QObject::connect(findButton( Ok ),SIGNAL(clicked()), |
51 | SLOT(editIncidence())); | 51 | SLOT(editIncidence())); |
52 | QObject::connect(this,SIGNAL(user1Clicked()), | 52 | QObject::connect(this,SIGNAL(user1Clicked()), |
53 | SLOT(showIncidence())); | 53 | SLOT(showIncidence())); |
54 | mIncidence = 0; | 54 | mIncidence = 0; |
55 | // TODO: Set a sensible size (based on the content?). | 55 | // TODO: Set a sensible size (based on the content?). |
56 | //showMaximized(); | 56 | //showMaximized(); |
57 | //qDebug("++++++++++++KOEventViewerDialog() "); | 57 | //qDebug("++++++++++++KOEventViewerDialog() "); |
58 | // if ( KOPrefs::instance()->mCompactDialogs ) { | 58 | // if ( KOPrefs::instance()->mCompactDialogs ) { |
59 | // setFixedSize( 240,284 ); | 59 | // setFixedSize( 240,284 ); |
60 | // move( 0, 15 ); | 60 | // move( 0, 15 ); |
61 | // } else { | 61 | // } else { |
62 | // setMinimumSize(300,200); | 62 | // setMinimumSize(300,200); |
63 | // resize(320,300); | 63 | // resize(320,300); |
64 | // } | 64 | // } |
65 | mSyncMode = false; | 65 | mSyncMode = false; |
66 | mSyncResult = 0; | 66 | mSyncResult = 0; |
67 | 67 | ||
68 | } | 68 | } |
69 | 69 | ||
70 | KOEventViewerDialog::~KOEventViewerDialog() | 70 | KOEventViewerDialog::~KOEventViewerDialog() |
71 | { | 71 | { |
72 | //qDebug("-------~KOEventViewerDialog() "); | 72 | //qDebug("-------~KOEventViewerDialog() "); |
73 | } | 73 | } |
74 | void KOEventViewerDialog::showMe() | 74 | void KOEventViewerDialog::showMe() |
75 | { | 75 | { |
76 | 76 | ||
77 | #ifdef DESKTOP_VERSION | 77 | #ifdef DESKTOP_VERSION |
78 | int x,y,w,h; | 78 | int x,y,w,h; |
79 | x = geometry().x(); | 79 | x = geometry().x(); |
80 | y = geometry().y(); | 80 | y = geometry().y(); |
81 | w = width(); | 81 | w = width(); |
82 | h = height(); | 82 | h = height(); |
83 | show(); | 83 | show(); |
84 | setGeometry(x,y,w,h); | 84 | setGeometry(x,y,w,h); |
85 | raise(); | ||
85 | #else | 86 | #else |
86 | showMaximized(); | 87 | showMaximized(); |
87 | #endif | 88 | #endif |
88 | raise(); | 89 | QTimer::singleShot( 1, this, SLOT ( setMyFocus() ) ); |
89 | setActiveWindow(); | ||
90 | mEventViewer->setFocus(); | ||
91 | //raise(); | ||
92 | 90 | ||
93 | } | 91 | } |
92 | void KOEventViewerDialog::setMyFocus() | ||
93 | { | ||
94 | |||
95 | setActiveWindow(); | ||
96 | mEventViewer->setFocus(); | ||
97 | |||
98 | } | ||
94 | void KOEventViewerDialog::print() | 99 | void KOEventViewerDialog::print() |
95 | { | 100 | { |
96 | mEventViewer->printMe(); | 101 | mEventViewer->printMe(); |
97 | 102 | ||
98 | } | 103 | } |
99 | void KOEventViewerDialog::setSyncMode( bool b ) | 104 | void KOEventViewerDialog::setSyncMode( bool b ) |
100 | { | 105 | { |
101 | mSyncMode = b; | 106 | mSyncMode = b; |
102 | //qDebug("KOEventViewerDialog::setSyncMode %d ",mSyncMode ); | 107 | //qDebug("KOEventViewerDialog::setSyncMode %d ",mSyncMode ); |
103 | if ( mSyncMode ) { | 108 | if ( mSyncMode ) { |
104 | findButton( Close )->setText( i18n("Cancel Sync")); | 109 | findButton( Close )->setText( i18n("Cancel Sync")); |
105 | findButton( Ok )->setText( i18n("Remote")); | 110 | findButton( Ok )->setText( i18n("Remote")); |
106 | findButton( User1 )->setText( i18n("Local")); | 111 | findButton( User1 )->setText( i18n("Local")); |
107 | } else { | 112 | } else { |
108 | findButton( Close )->setText( i18n("Close")); | 113 | findButton( Close )->setText( i18n("Close")); |
109 | findButton( Ok )->setText( i18n("Edit")); | 114 | findButton( Ok )->setText( i18n("Edit")); |
110 | findButton( User1 )->setText( i18n("Agenda")); | 115 | findButton( User1 )->setText( i18n("Agenda")); |
111 | } | 116 | } |
112 | mEventViewer->setSyncMode( b ); | 117 | mEventViewer->setSyncMode( b ); |
113 | } | 118 | } |
114 | void KOEventViewerDialog::setColorMode( int m ) | 119 | void KOEventViewerDialog::setColorMode( int m ) |
115 | { | 120 | { |
116 | mEventViewer->setColorMode( m ); | 121 | mEventViewer->setColorMode( m ); |
117 | } | 122 | } |
118 | int KOEventViewerDialog::executeS( bool local ) | 123 | int KOEventViewerDialog::executeS( bool local ) |
119 | { | 124 | { |
120 | mSyncResult = 3; | 125 | mSyncResult = 3; |
121 | if ( local ) | 126 | if ( local ) |
122 | findButton( User1 )->setFocus(); | 127 | findButton( User1 )->setFocus(); |
123 | else | 128 | else |
124 | findButton( Ok )->setFocus(); | 129 | findButton( Ok )->setFocus(); |
125 | exec(); | 130 | exec(); |
126 | return mSyncResult; | 131 | return mSyncResult; |
127 | } | 132 | } |
128 | 133 | ||
129 | void KOEventViewerDialog::updateConfig() | 134 | void KOEventViewerDialog::updateConfig() |
130 | { | 135 | { |
131 | mEventViewer->setFont( KOPrefs::instance()->mEventViewFont ); | 136 | mEventViewer->setFont( KOPrefs::instance()->mEventViewFont ); |
132 | 137 | ||
133 | } | 138 | } |
134 | void KOEventViewerDialog::setEvent(Event *event) | 139 | void KOEventViewerDialog::setEvent(Event *event) |
135 | { | 140 | { |
136 | mEventViewer->setEvent(event); | 141 | mEventViewer->setEvent(event); |
137 | mIncidence = event; | 142 | mIncidence = event; |
138 | mEventViewer->setFocus(); | 143 | mEventViewer->setFocus(); |
139 | //findButton( Close )->setFocus(); | 144 | //findButton( Close )->setFocus(); |
140 | if ( !mSyncMode ) { | 145 | if ( !mSyncMode ) { |
141 | findButton( User1 )->setText( i18n("Agenda")); | 146 | findButton( User1 )->setText( i18n("Agenda")); |
142 | } | 147 | } |
143 | } | 148 | } |
144 | void KOEventViewerDialog::setIncidence(Incidence *in ) | 149 | void KOEventViewerDialog::setIncidence(Incidence *in ) |
145 | { | 150 | { |
146 | if ( in->type() == "Event" ) | 151 | if ( in->type() == "Event" ) |
147 | setEvent( (Event*) in ); | 152 | setEvent( (Event*) in ); |
148 | else if ( in->type() =="Todo" ) | 153 | else if ( in->type() =="Todo" ) |
149 | setTodo( (Todo*) in ); | 154 | setTodo( (Todo*) in ); |
150 | else if ( in->type() =="Journal" ) | 155 | else if ( in->type() =="Journal" ) |
151 | setJournal( (Journal*) in ); | 156 | setJournal( (Journal*) in ); |
152 | } | 157 | } |
153 | void KOEventViewerDialog::addIncidence(Incidence *in) | 158 | void KOEventViewerDialog::addIncidence(Incidence *in) |
154 | { | 159 | { |
155 | if ( in->type() == "Event" ) | 160 | if ( in->type() == "Event" ) |
156 | addEvent( (Event*) in ); | 161 | addEvent( (Event*) in ); |
157 | else if ( in->type() =="Todo" ) | 162 | else if ( in->type() =="Todo" ) |
158 | mEventViewer->setTodo( (Todo*) in, false ); | 163 | mEventViewer->setTodo( (Todo*) in, false ); |
159 | else if ( in->type() =="Journal" ) | 164 | else if ( in->type() =="Journal" ) |
160 | mEventViewer->setJournal( (Journal*) in, false ); | 165 | mEventViewer->setJournal( (Journal*) in, false ); |
161 | if ( mSyncMode ) { | 166 | if ( mSyncMode ) { |
162 | findButton( User1 )->setFocus(); | 167 | findButton( User1 )->setFocus(); |
163 | setCaption(i18n("Conflict! Please choose entry")); | 168 | setCaption(i18n("Conflict! Please choose entry")); |
164 | } | 169 | } |
165 | } | 170 | } |
166 | 171 | ||
167 | void KOEventViewerDialog::addEvent(Event *event) | 172 | void KOEventViewerDialog::addEvent(Event *event) |
168 | { | 173 | { |
169 | mEventViewer->addEvent(event); | 174 | mEventViewer->addEvent(event); |
170 | mIncidence = event; | 175 | mIncidence = event; |
171 | mEventViewer->setFocus(); | 176 | mEventViewer->setFocus(); |
172 | //findButton( Close )->setFocus(); | 177 | //findButton( Close )->setFocus(); |
173 | if ( !mSyncMode ) { | 178 | if ( !mSyncMode ) { |
174 | findButton( User1 )->setText( i18n("Agenda")); | 179 | findButton( User1 )->setText( i18n("Agenda")); |
175 | } | 180 | } |
176 | } | 181 | } |
177 | 182 | ||
178 | void KOEventViewerDialog::setTodo(Todo *event) | 183 | void KOEventViewerDialog::setTodo(Todo *event) |
179 | { | 184 | { |
180 | mEventViewer->setTodo(event); | 185 | mEventViewer->setTodo(event); |
181 | mIncidence = (Incidence*)event; | 186 | mIncidence = (Incidence*)event; |
182 | mEventViewer->setFocus(); | 187 | mEventViewer->setFocus(); |
183 | //findButton( Close )->setFocus(); | 188 | //findButton( Close )->setFocus(); |
184 | if ( !mSyncMode ) { | 189 | if ( !mSyncMode ) { |
185 | findButton( User1 )->setText( i18n("Set complete")); | 190 | findButton( User1 )->setText( i18n("Set complete")); |
186 | } | 191 | } |
187 | } | 192 | } |
188 | void KOEventViewerDialog::setJournal(Journal *j) | 193 | void KOEventViewerDialog::setJournal(Journal *j) |
189 | { | 194 | { |
190 | mEventViewer->setJournal(j); | 195 | mEventViewer->setJournal(j); |
191 | mIncidence = (Incidence*)j; | 196 | mIncidence = (Incidence*)j; |
192 | mEventViewer->setFocus(); | 197 | mEventViewer->setFocus(); |
193 | //findButton( Close )->setFocus(); | 198 | //findButton( Close )->setFocus(); |
194 | if ( !mSyncMode ) { | 199 | if ( !mSyncMode ) { |
195 | findButton( User1 )->setText( i18n("Agenda")); | 200 | findButton( User1 )->setText( i18n("Agenda")); |
196 | } | 201 | } |
197 | } | 202 | } |
198 | 203 | ||
199 | void KOEventViewerDialog::addText(QString text) | 204 | void KOEventViewerDialog::addText(QString text) |
200 | { | 205 | { |
201 | mEventViewer->addText(text); | 206 | mEventViewer->addText(text); |
202 | mEventViewer->setFocus(); | 207 | mEventViewer->setFocus(); |
203 | //findButton( Close )->setFocus(); | 208 | //findButton( Close )->setFocus(); |
204 | } | 209 | } |
205 | void KOEventViewerDialog::editIncidence() | 210 | void KOEventViewerDialog::editIncidence() |
206 | { | 211 | { |
207 | sendSignalViewerClosed = false; | 212 | sendSignalViewerClosed = false; |
208 | if ( mSyncMode ) { | 213 | if ( mSyncMode ) { |
209 | mSyncResult = 2; | 214 | mSyncResult = 2; |
210 | accept(); | 215 | accept(); |
211 | return; | 216 | return; |
212 | } | 217 | } |
213 | if ( mIncidence ){ | 218 | if ( mIncidence ){ |
214 | #ifndef DESKTOP_VERSION | 219 | #ifndef DESKTOP_VERSION |
215 | hide(); | 220 | //hide(); |
221 | close(); | ||
216 | #endif | 222 | #endif |
217 | emit editIncidence( mIncidence ); | 223 | emit editIncidence( mIncidence ); |
218 | } | 224 | } |
219 | } | 225 | } |
220 | void KOEventViewerDialog::showIncidence() | 226 | void KOEventViewerDialog::showIncidence() |
221 | { | 227 | { |
222 | sendSignalViewerClosed = false; | 228 | sendSignalViewerClosed = false; |
223 | if ( mSyncMode ) { | 229 | if ( mSyncMode ) { |
224 | mSyncResult = 1; | 230 | mSyncResult = 1; |
225 | accept(); | 231 | accept(); |
226 | return; | 232 | return; |
227 | } | 233 | } |
228 | 234 | ||
229 | if ( mIncidence ){ | 235 | if ( mIncidence ){ |
230 | #ifndef DESKTOP_VERSION | 236 | #ifndef DESKTOP_VERSION |
231 | hide(); | 237 | hide(); |
232 | #endif | 238 | #endif |
233 | QDate date; | 239 | QDate date; |
234 | if ( mIncidence->type() == "Todo" ) { | 240 | if ( mIncidence->type() == "Todo" ) { |
235 | /* | 241 | /* |
236 | if ( ((Todo*)mIncidence)->hasDueDate() ) | 242 | if ( ((Todo*)mIncidence)->hasDueDate() ) |
237 | date = ((Todo*)mIncidence)->dtDue().date(); | 243 | date = ((Todo*)mIncidence)->dtDue().date(); |
238 | else { | 244 | else { |
239 | globalFlagBlockAgenda = 2; | 245 | globalFlagBlockAgenda = 2; |
240 | emit showAgendaView( false ); | 246 | emit showAgendaView( false ); |
241 | return; | 247 | return; |
242 | } | 248 | } |
243 | */ | 249 | */ |
244 | ((Todo*)mIncidence)->setCompleted( true ); | 250 | ((Todo*)mIncidence)->setCompleted( true ); |
245 | ((Todo*)mIncidence)->setCompleted(QDateTime::currentDateTime() ); | 251 | ((Todo*)mIncidence)->setCompleted(QDateTime::currentDateTime() ); |
246 | hide(); | 252 | hide(); |
247 | emit todoCompleted(((Todo*)mIncidence)); | 253 | emit todoCompleted(((Todo*)mIncidence)); |
248 | return; | 254 | return; |
249 | 255 | ||
250 | } else | 256 | } else |
251 | date = mIncidence->dtStart().date(); | 257 | date = mIncidence->dtStart().date(); |
252 | globalFlagBlockAgenda = 1; | 258 | globalFlagBlockAgenda = 1; |
253 | emit showAgendaView( false ); | 259 | emit showAgendaView( false ); |
254 | globalFlagBlockAgenda = 2; | 260 | globalFlagBlockAgenda = 2; |
255 | emit jumpToTime( date ); | 261 | emit jumpToTime( date ); |
256 | } | 262 | } |
257 | } | 263 | } |
258 | void KOEventViewerDialog::keyPressEvent ( QKeyEvent * e ) | 264 | void KOEventViewerDialog::keyPressEvent ( QKeyEvent * e ) |
259 | { | 265 | { |
260 | switch ( e->key() ) { | 266 | switch ( e->key() ) { |
261 | 267 | ||
262 | case Qt::Key_A : | 268 | case Qt::Key_A : |
263 | case Qt::Key_L : | 269 | case Qt::Key_L : |
264 | showIncidence(); | 270 | showIncidence(); |
265 | break; | 271 | break; |
266 | case Qt::Key_E : | 272 | case Qt::Key_E : |
267 | case Qt::Key_R : | 273 | case Qt::Key_R : |
268 | editIncidence(); | 274 | editIncidence(); |
269 | break; | 275 | break; |
270 | case Qt::Key_C: | 276 | case Qt::Key_C: |
271 | case Qt::Key_Escape: | 277 | case Qt::Key_Escape: |
272 | sendSignalViewerClosed = true; | 278 | sendSignalViewerClosed = true; |
273 | close(); | 279 | close(); |
274 | break; | 280 | break; |
275 | case Qt::Key_I: | 281 | case Qt::Key_I: |
276 | #ifndef DESKTOP_VERSION | 282 | #ifndef DESKTOP_VERSION |
277 | sendSignalViewerClosed = true; | 283 | sendSignalViewerClosed = true; |
278 | close(); | 284 | close(); |
279 | #else | 285 | #else |
280 | sendSignalViewerClosed = true; | 286 | sendSignalViewerClosed = true; |
281 | slotViewerClosed(); | 287 | slotViewerClosed(); |
282 | //accept(); | 288 | //accept(); |
283 | #endif | 289 | #endif |
284 | break; | 290 | break; |
285 | default: | 291 | default: |
286 | KDialogBase::keyPressEvent ( e ); | 292 | KDialogBase::keyPressEvent ( e ); |
287 | break; | 293 | break; |
288 | } | 294 | } |
289 | 295 | ||
290 | } | 296 | } |
291 | void KOEventViewerDialog::hideEvent ( QHideEvent * e ) | 297 | void KOEventViewerDialog::hideEvent ( QHideEvent * e ) |
292 | { | 298 | { |
293 | KDialogBase::hideEvent ( e ); | 299 | KDialogBase::hideEvent ( e ); |
294 | QTimer::singleShot( 1, this, SLOT (slotViewerClosed() ) ); | 300 | QTimer::singleShot( 1, this, SLOT (slotViewerClosed() ) ); |
295 | } | 301 | } |
296 | 302 | ||
297 | void KOEventViewerDialog::slotViewerClosed() | 303 | void KOEventViewerDialog::slotViewerClosed() |
298 | { | 304 | { |
299 | if ( mSyncMode ) | 305 | if ( mSyncMode ) |
300 | return; | 306 | return; |
301 | 307 | ||
302 | if ( sendSignalViewerClosed ) { | 308 | if ( sendSignalViewerClosed ) { |
303 | //qDebug("KOEventViewerDialog::hideEvent "); | 309 | //qDebug("KOEventViewerDialog::hideEvent "); |
304 | emit signalViewerClosed(); | 310 | emit signalViewerClosed(); |
305 | } | 311 | } |
306 | sendSignalViewerClosed = true; | 312 | sendSignalViewerClosed = true; |
307 | } | 313 | } |
308 | 314 | ||
diff --git a/korganizer/koeventviewerdialog.h b/korganizer/koeventviewerdialog.h index 8e1cd44..29fee49 100644 --- a/korganizer/koeventviewerdialog.h +++ b/korganizer/koeventviewerdialog.h | |||
@@ -1,76 +1,77 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of KOrganizer. | 2 | This file is part of KOrganizer. |
3 | Copyright (c) 2000, 2001 Cornelius Schumacher <schumacher@kde.org> | 3 | Copyright (c) 2000, 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 | #ifndef KOEVENTVIEWERDIALOG_H | 19 | #ifndef KOEVENTVIEWERDIALOG_H |
20 | #define KOEVENTVIEWERDIALOG_H | 20 | #define KOEVENTVIEWERDIALOG_H |
21 | // | 21 | // |
22 | // Viewer dialog for events. | 22 | // Viewer dialog for events. |
23 | // | 23 | // |
24 | 24 | ||
25 | #include <qtextview.h> | 25 | #include <qtextview.h> |
26 | 26 | ||
27 | #include <kdialogbase.h> | 27 | #include <kdialogbase.h> |
28 | 28 | ||
29 | #include <libkcal/event.h> | 29 | #include <libkcal/event.h> |
30 | 30 | ||
31 | using namespace KCal; | 31 | using namespace KCal; |
32 | 32 | ||
33 | class KOEventViewer; | 33 | class KOEventViewer; |
34 | 34 | ||
35 | class KOEventViewerDialog : public KDialogBase { | 35 | class KOEventViewerDialog : public KDialogBase { |
36 | Q_OBJECT | 36 | Q_OBJECT |
37 | public: | 37 | public: |
38 | KOEventViewerDialog(QWidget *parent=0,const char *name=0); | 38 | KOEventViewerDialog(QWidget *parent=0,const char *name=0); |
39 | virtual ~KOEventViewerDialog(); | 39 | virtual ~KOEventViewerDialog(); |
40 | 40 | ||
41 | void setEvent(Event *event); | 41 | void setEvent(Event *event); |
42 | void addEvent(Event *event); | 42 | void addEvent(Event *event); |
43 | void setTodo(Todo *event); | 43 | void setTodo(Todo *event); |
44 | void setJournal(Journal *journal); | 44 | void setJournal(Journal *journal); |
45 | void setIncidence(Incidence *inc); | 45 | void setIncidence(Incidence *inc); |
46 | void addIncidence(Incidence *inc); | 46 | void addIncidence(Incidence *inc); |
47 | void addText(QString text); | 47 | void addText(QString text); |
48 | void showMe(); | 48 | void showMe(); |
49 | void setSyncMode( bool ); | 49 | void setSyncMode( bool ); |
50 | void setColorMode( int m ); | 50 | void setColorMode( int m ); |
51 | int executeS( bool ); | 51 | int executeS( bool ); |
52 | public slots: | 52 | public slots: |
53 | void updateConfig(); | 53 | void updateConfig(); |
54 | void print(); | 54 | void print(); |
55 | void setMyFocus(); | ||
55 | signals: | 56 | signals: |
56 | void editIncidence( Incidence* ); | 57 | void editIncidence( Incidence* ); |
57 | void jumpToTime( const QDate &); | 58 | void jumpToTime( const QDate &); |
58 | void showAgendaView( bool ); | 59 | void showAgendaView( bool ); |
59 | void todoCompleted(Todo*); | 60 | void todoCompleted(Todo*); |
60 | void signalViewerClosed(); | 61 | void signalViewerClosed(); |
61 | private slots: | 62 | private slots: |
62 | void slotViewerClosed(); | 63 | void slotViewerClosed(); |
63 | void editIncidence(); | 64 | void editIncidence(); |
64 | void showIncidence(); | 65 | void showIncidence(); |
65 | protected: | 66 | protected: |
66 | void hideEvent ( QHideEvent * e ); | 67 | void hideEvent ( QHideEvent * e ); |
67 | private: | 68 | private: |
68 | bool sendSignalViewerClosed; | 69 | bool sendSignalViewerClosed; |
69 | bool mSyncMode; | 70 | bool mSyncMode; |
70 | int mSyncResult; | 71 | int mSyncResult; |
71 | KOEventViewer *mEventViewer; | 72 | KOEventViewer *mEventViewer; |
72 | Incidence* mIncidence; | 73 | Incidence* mIncidence; |
73 | void keyPressEvent ( QKeyEvent * e ); | 74 | void keyPressEvent ( QKeyEvent * e ); |
74 | }; | 75 | }; |
75 | 76 | ||
76 | #endif | 77 | #endif |
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp index e72f94b..0bbb3bf 100644 --- a/korganizer/koprefsdialog.cpp +++ b/korganizer/koprefsdialog.cpp | |||
@@ -1,270 +1,270 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of KOrganizer. | 2 | This file is part of KOrganizer. |
3 | Copyright (c) 2000,2001 Cornelius Schumacher <schumacher@kde.org> | 3 | Copyright (c) 2000,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 <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 | #include <kglobalsettings.h> | 56 | #include <kglobalsettings.h> |
57 | 57 | ||
58 | #include <kurlrequester.h> | 58 | #include <kurlrequester.h> |
59 | #include <klineedit.h> | 59 | #include <klineedit.h> |
60 | 60 | ||
61 | #if defined(USE_SOLARIS) | 61 | #if defined(USE_SOLARIS) |
62 | #include <sys/param.h> | 62 | #include <sys/param.h> |
63 | 63 | ||
64 | #define ZONEINFODIR "/usr/share/lib/zoneinfo" | 64 | #define ZONEINFODIR "/usr/share/lib/zoneinfo" |
65 | #define INITFILE "/etc/default/init" | 65 | #define INITFILE "/etc/default/init" |
66 | #endif | 66 | #endif |
67 | 67 | ||
68 | #include "koprefs.h" | 68 | #include "koprefs.h" |
69 | 69 | ||
70 | #include "koprefsdialog.h" | 70 | #include "koprefsdialog.h" |
71 | #include "kpimglobalprefs.h" | 71 | #include "kpimglobalprefs.h" |
72 | 72 | ||
73 | 73 | ||
74 | KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) : | 74 | KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) : |
75 | KPrefsDialog(KOPrefs::instance(),parent,name,true) | 75 | KPrefsDialog(KOPrefs::instance(),parent,name,true) |
76 | { | 76 | { |
77 | 77 | ||
78 | setFont( KGlobalSettings::generalFont() ); | 78 | setFont( KGlobalSettings::generalMaxFont() ); |
79 | setCaption( i18n("Preferences - some settings need a restart (nr)")); | 79 | setCaption( i18n("Preferences - some settings need a restart (nr)")); |
80 | mCategoryDict.setAutoDelete(true); | 80 | mCategoryDict.setAutoDelete(true); |
81 | 81 | ||
82 | KGlobal::locale()->insertCatalogue("timezones"); | 82 | KGlobal::locale()->insertCatalogue("timezones"); |
83 | mSpacingHint = spacingHintSmall(); | 83 | mSpacingHint = spacingHintSmall(); |
84 | mMarginHint = marginHintSmall(); | 84 | mMarginHint = marginHintSmall(); |
85 | #ifndef DESKTOP_VERSION | 85 | #ifndef DESKTOP_VERSION |
86 | if ( QApplication::desktop()->height() == 480 ) | 86 | if ( QApplication::desktop()->height() == 480 ) |
87 | hideButtons(); | 87 | hideButtons(); |
88 | #endif | 88 | #endif |
89 | 89 | ||
90 | setupGlobalTab(); | 90 | setupGlobalTab(); |
91 | setupMainTab(); | 91 | setupMainTab(); |
92 | // setupLocaleTab(); | 92 | // setupLocaleTab(); |
93 | //setupTimeZoneTab(); | 93 | //setupTimeZoneTab(); |
94 | setupTimeTab(); | 94 | setupTimeTab(); |
95 | //setupLocaleDateTab(); | 95 | //setupLocaleDateTab(); |
96 | setupFontsTab(); | 96 | setupFontsTab(); |
97 | setupColorsTab(); | 97 | setupColorsTab(); |
98 | setupViewsTab(); | 98 | setupViewsTab(); |
99 | //setupSyncTab(); | 99 | //setupSyncTab(); |
100 | //setupSyncAlgTab(); | 100 | //setupSyncAlgTab(); |
101 | //setupPrinterTab(); | 101 | //setupPrinterTab(); |
102 | //setupGroupSchedulingTab(); | 102 | //setupGroupSchedulingTab(); |
103 | //setupGroupAutomationTab(); | 103 | //setupGroupAutomationTab(); |
104 | 104 | ||
105 | 105 | ||
106 | } | 106 | } |
107 | 107 | ||
108 | 108 | ||
109 | KOPrefsDialog::~KOPrefsDialog() | 109 | KOPrefsDialog::~KOPrefsDialog() |
110 | { | 110 | { |
111 | } | 111 | } |
112 | void KOPrefsDialog::setupGlobalTab() | 112 | void KOPrefsDialog::setupGlobalTab() |
113 | { | 113 | { |
114 | QFrame *topFrame = addPage(i18n("Global"),0,0); | 114 | QFrame *topFrame = addPage(i18n("Global"),0,0); |
115 | kdelibcfg = new KDEPIMConfigWidget( KPimGlobalPrefs::instance(), topFrame, "KCMKdeLibConfig" ); | 115 | kdelibcfg = new KDEPIMConfigWidget( KPimGlobalPrefs::instance(), topFrame, "KCMKdeLibConfig" ); |
116 | QVBoxLayout *topLayout = new QVBoxLayout(topFrame); | 116 | QVBoxLayout *topLayout = new QVBoxLayout(topFrame); |
117 | topLayout->addWidget( kdelibcfg ); | 117 | topLayout->addWidget( kdelibcfg ); |
118 | 118 | ||
119 | 119 | ||
120 | } | 120 | } |
121 | void KOPrefsDialog::setupLocaleDateTab() | 121 | void KOPrefsDialog::setupLocaleDateTab() |
122 | { | 122 | { |
123 | #if 0 | 123 | #if 0 |
124 | QFrame *topFrame = addPage(i18n("Date Format"),0,0); | 124 | QFrame *topFrame = addPage(i18n("Date Format"),0,0); |
125 | QGridLayout *topLayout = new QGridLayout(topFrame,3,2); | 125 | QGridLayout *topLayout = new QGridLayout(topFrame,3,2); |
126 | topLayout->setSpacing(mSpacingHint); | 126 | topLayout->setSpacing(mSpacingHint); |
127 | topLayout->setMargin(mMarginHint); | 127 | topLayout->setMargin(mMarginHint); |
128 | int iii = 0; | 128 | int iii = 0; |
129 | 129 | ||
130 | 130 | ||
131 | KPrefsDialogWidRadios *syncPrefsGroup = | 131 | KPrefsDialogWidRadios *syncPrefsGroup = |
132 | addWidRadios(i18n("Date Format:"),&(KOPrefs::instance()->mPreferredDate),topFrame); | 132 | addWidRadios(i18n("Date Format:"),&(KOPrefs::instance()->mPreferredDate),topFrame); |
133 | QString format; | 133 | QString format; |
134 | if ( QApplication::desktop()->width() < 480 ) | 134 | if ( QApplication::desktop()->width() < 480 ) |
135 | format = "(%d.%m.%Y)"; | 135 | format = "(%d.%m.%Y)"; |
136 | else | 136 | else |
137 | format = "(%d.%m.%Y|%A %d %B %Y)"; | 137 | format = "(%d.%m.%Y|%A %d %B %Y)"; |
138 | syncPrefsGroup->addRadio(i18n("24.03.2004 "+format)); | 138 | syncPrefsGroup->addRadio(i18n("24.03.2004 "+format)); |
139 | if ( QApplication::desktop()->width() < 480 ) | 139 | if ( QApplication::desktop()->width() < 480 ) |
140 | format = "(%m.%d.%Y)"; | 140 | format = "(%m.%d.%Y)"; |
141 | else | 141 | else |
142 | format = "(%m.%d.%Y|%A %B %d %Y)"; | 142 | format = "(%m.%d.%Y|%A %B %d %Y)"; |
143 | syncPrefsGroup->addRadio(i18n("03.24.2004 "+format)); | 143 | syncPrefsGroup->addRadio(i18n("03.24.2004 "+format)); |
144 | if ( QApplication::desktop()->width() < 480 ) | 144 | if ( QApplication::desktop()->width() < 480 ) |
145 | format = "(%Y-%m-%d)"; | 145 | format = "(%Y-%m-%d)"; |
146 | else | 146 | else |
147 | format = "(%Y-%m-%d|%A %Y %B %d)"; | 147 | format = "(%Y-%m-%d|%A %Y %B %d)"; |
148 | syncPrefsGroup->addRadio(i18n("2004-03-24 "+format)); | 148 | syncPrefsGroup->addRadio(i18n("2004-03-24 "+format)); |
149 | syncPrefsGroup->addRadio(i18n("User defined")); | 149 | syncPrefsGroup->addRadio(i18n("User defined")); |
150 | topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1); | 150 | topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1); |
151 | ++iii; | 151 | ++iii; |
152 | ++iii; | 152 | ++iii; |
153 | QLabel * lab; | 153 | QLabel * lab; |
154 | mUserDateFormatLong = new QLineEdit(topFrame); | 154 | mUserDateFormatLong = new QLineEdit(topFrame); |
155 | lab = new QLabel(mUserDateFormatLong, i18n("User long date:"), topFrame); | 155 | lab = new QLabel(mUserDateFormatLong, i18n("User long date:"), topFrame); |
156 | topLayout->addWidget(lab ,iii,0); | 156 | topLayout->addWidget(lab ,iii,0); |
157 | topLayout->addWidget(mUserDateFormatLong,iii,1); | 157 | topLayout->addWidget(mUserDateFormatLong,iii,1); |
158 | ++iii; | 158 | ++iii; |
159 | mUserDateFormatShort = new QLineEdit(topFrame); | 159 | mUserDateFormatShort = new QLineEdit(topFrame); |
160 | lab = new QLabel(mUserDateFormatShort, i18n("User short date:"), topFrame); | 160 | lab = new QLabel(mUserDateFormatShort, i18n("User short date:"), topFrame); |
161 | topLayout->addWidget(lab ,iii,0); | 161 | topLayout->addWidget(lab ,iii,0); |
162 | topLayout->addWidget(mUserDateFormatShort,iii,1); | 162 | topLayout->addWidget(mUserDateFormatShort,iii,1); |
163 | ++iii; | 163 | ++iii; |
164 | lab = new QLabel( i18n("Monday 19 April 2004: %A %d %B %Y"), topFrame); | 164 | lab = new QLabel( i18n("Monday 19 April 2004: %A %d %B %Y"), topFrame); |
165 | topLayout->addMultiCellWidget(lab ,iii,iii,0,1); | 165 | topLayout->addMultiCellWidget(lab ,iii,iii,0,1); |
166 | ++iii; | 166 | ++iii; |
167 | lab = new QLabel( i18n("Mon 19.04.04: %a %d.%m.%y"), topFrame); | 167 | lab = new QLabel( i18n("Mon 19.04.04: %a %d.%m.%y"), topFrame); |
168 | topLayout->addMultiCellWidget(lab ,iii,iii,0,1); | 168 | topLayout->addMultiCellWidget(lab ,iii,iii,0,1); |
169 | ++iii; | 169 | ++iii; |
170 | lab = new QLabel( i18n("Mon, 19.Apr.04: %a, %d.%b.%y"), topFrame); | 170 | lab = new QLabel( i18n("Mon, 19.Apr.04: %a, %d.%b.%y"), topFrame); |
171 | topLayout->addMultiCellWidget(lab ,iii,iii,0,1); | 171 | topLayout->addMultiCellWidget(lab ,iii,iii,0,1); |
172 | ++iii; | 172 | ++iii; |
173 | #endif | 173 | #endif |
174 | 174 | ||
175 | } | 175 | } |
176 | 176 | ||
177 | void KOPrefsDialog::setupLocaleTab() | 177 | void KOPrefsDialog::setupLocaleTab() |
178 | { | 178 | { |
179 | #if 0 | 179 | #if 0 |
180 | QFrame *topFrame = addPage(i18n("Locale"),0,0); | 180 | QFrame *topFrame = addPage(i18n("Locale"),0,0); |
181 | QGridLayout *topLayout = new QGridLayout(topFrame,4,2); | 181 | QGridLayout *topLayout = new QGridLayout(topFrame,4,2); |
182 | topLayout->setSpacing(mSpacingHint); | 182 | topLayout->setSpacing(mSpacingHint); |
183 | topLayout->setMargin(mMarginHint); | 183 | topLayout->setMargin(mMarginHint); |
184 | int iii = 0; | 184 | int iii = 0; |
185 | KPrefsDialogWidRadios *syncPrefsGroup = | 185 | KPrefsDialogWidRadios *syncPrefsGroup = |
186 | addWidRadios(i18n("Language:(needs restart)"),&(KOPrefs::instance()->mPreferredLanguage),topFrame); | 186 | addWidRadios(i18n("Language:(needs restart)"),&(KOPrefs::instance()->mPreferredLanguage),topFrame); |
187 | syncPrefsGroup->addRadio(i18n("English")); | 187 | syncPrefsGroup->addRadio(i18n("English")); |
188 | syncPrefsGroup->addRadio(i18n("German")); | 188 | syncPrefsGroup->addRadio(i18n("German")); |
189 | syncPrefsGroup->addRadio(i18n("French")); | 189 | syncPrefsGroup->addRadio(i18n("French")); |
190 | syncPrefsGroup->addRadio(i18n("User defined (usertranslation.txt)")); | 190 | syncPrefsGroup->addRadio(i18n("User defined (usertranslation.txt)")); |
191 | if ( QApplication::desktop()->width() < 300 ) | 191 | if ( QApplication::desktop()->width() < 300 ) |
192 | ;// syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical); | 192 | ;// syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical); |
193 | topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1); | 193 | topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1); |
194 | ++iii; | 194 | ++iii; |
195 | 195 | ||
196 | syncPrefsGroup = | 196 | syncPrefsGroup = |
197 | addWidRadios(i18n("Time Format(nr):"),&(KOPrefs::instance()->mPreferredTime),topFrame); | 197 | addWidRadios(i18n("Time Format(nr):"),&(KOPrefs::instance()->mPreferredTime),topFrame); |
198 | if ( QApplication::desktop()->width() > 300 ) | 198 | if ( QApplication::desktop()->width() > 300 ) |
199 | syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical); | 199 | syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical); |
200 | syncPrefsGroup->addRadio(i18n("24:00")); | 200 | syncPrefsGroup->addRadio(i18n("24:00")); |
201 | syncPrefsGroup->addRadio(i18n("12:00am")); | 201 | syncPrefsGroup->addRadio(i18n("12:00am")); |
202 | syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical); | 202 | syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical); |
203 | topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1); | 203 | topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1); |
204 | ++iii; | 204 | ++iii; |
205 | KPrefsDialogWidBool *sb; | 205 | KPrefsDialogWidBool *sb; |
206 | if ( QApplication::desktop()->width() < 300 ) { | 206 | if ( QApplication::desktop()->width() < 300 ) { |
207 | sb = | 207 | sb = |
208 | addWidBool(i18n("Week starts on Sunday"), | 208 | addWidBool(i18n("Week starts on Sunday"), |
209 | &(KOPrefs::instance()->mWeekStartsOnSunday),topFrame); | 209 | &(KOPrefs::instance()->mWeekStartsOnSunday),topFrame); |
210 | topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); | 210 | topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); |
211 | ++iii; | 211 | ++iii; |
212 | sb = | 212 | sb = |
213 | addWidBool(i18n("Use short date in (WN/E) view"), | 213 | addWidBool(i18n("Use short date in (WN/E) view"), |
214 | &(KOPrefs::instance()->mShortDateInViewer),topFrame); | 214 | &(KOPrefs::instance()->mShortDateInViewer),topFrame); |
215 | topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); | 215 | topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); |
216 | } | 216 | } |
217 | else { | 217 | else { |
218 | QWidget * hb = new QWidget( topFrame ); | 218 | QWidget * hb = new QWidget( topFrame ); |
219 | QHBoxLayout *hbLayout = new QHBoxLayout(hb); | 219 | QHBoxLayout *hbLayout = new QHBoxLayout(hb); |
220 | sb = | 220 | sb = |
221 | addWidBool(i18n("Week starts on Sunday"), | 221 | addWidBool(i18n("Week starts on Sunday"), |
222 | &(KOPrefs::instance()->mWeekStartsOnSunday),hb); | 222 | &(KOPrefs::instance()->mWeekStartsOnSunday),hb); |
223 | hbLayout->addWidget(sb->checkBox() ); | 223 | hbLayout->addWidget(sb->checkBox() ); |
224 | sb = | 224 | sb = |
225 | addWidBool(i18n("Use short date in (WN/E) view"), | 225 | addWidBool(i18n("Use short date in (WN/E) view"), |
226 | &(KOPrefs::instance()->mShortDateInViewer),hb); | 226 | &(KOPrefs::instance()->mShortDateInViewer),hb); |
227 | hbLayout->addWidget(sb->checkBox() ); | 227 | hbLayout->addWidget(sb->checkBox() ); |
228 | topLayout->addMultiCellWidget(hb, iii,iii,0,1); | 228 | topLayout->addMultiCellWidget(hb, iii,iii,0,1); |
229 | 229 | ||
230 | } | 230 | } |
231 | // KPrefsDialogWidBool *sb; //#ifndef DESKTOP_VERSION | 231 | // KPrefsDialogWidBool *sb; //#ifndef DESKTOP_VERSION |
232 | #if 0 | 232 | #if 0 |
233 | ++iii; | 233 | ++iii; |
234 | sb = | 234 | sb = |
235 | addWidBool(i18n("Quick load/save (w/o Unicode)"), | 235 | addWidBool(i18n("Quick load/save (w/o Unicode)"), |
236 | &(KOPrefs::instance()->mUseQuicksave),topFrame); | 236 | &(KOPrefs::instance()->mUseQuicksave),topFrame); |
237 | topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); | 237 | topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); |
238 | #endif | 238 | #endif |
239 | #endif | 239 | #endif |
240 | } | 240 | } |
241 | void KOPrefsDialog::showSyncPage() | 241 | void KOPrefsDialog::showSyncPage() |
242 | { | 242 | { |
243 | showPage ( 0 ) ; | 243 | showPage ( 0 ) ; |
244 | kdelibcfg->showTimeZoneTab() ; | 244 | kdelibcfg->showTimeZoneTab() ; |
245 | 245 | ||
246 | } | 246 | } |
247 | void KOPrefsDialog::setupSyncAlgTab() | 247 | void KOPrefsDialog::setupSyncAlgTab() |
248 | { | 248 | { |
249 | #if 0 | 249 | #if 0 |
250 | QLabel * lab; | 250 | QLabel * lab; |
251 | QFrame *topFrame = addPage(i18n("Sync Prefs"),0,0); | 251 | QFrame *topFrame = addPage(i18n("Sync Prefs"),0,0); |
252 | mSetupSyncAlgTab = topFrame; | 252 | mSetupSyncAlgTab = topFrame; |
253 | QGridLayout *topLayout = new QGridLayout(topFrame,6,2); | 253 | QGridLayout *topLayout = new QGridLayout(topFrame,6,2); |
254 | topLayout->setSpacing(mSpacingHint); | 254 | topLayout->setSpacing(mSpacingHint); |
255 | topLayout->setMargin(mMarginHint); | 255 | topLayout->setMargin(mMarginHint); |
256 | int iii = 0; | 256 | int iii = 0; |
257 | 257 | ||
258 | KPrefsDialogWidBool *sb = | 258 | KPrefsDialogWidBool *sb = |
259 | addWidBool(i18n("Ask for preferences before syncing"), | 259 | addWidBool(i18n("Ask for preferences before syncing"), |
260 | &(KOPrefs::instance()->mAskForPreferences),topFrame); | 260 | &(KOPrefs::instance()->mAskForPreferences),topFrame); |
261 | topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); | 261 | topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); |
262 | 262 | ||
263 | ++iii; | 263 | ++iii; |
264 | 264 | ||
265 | KPrefsDialogWidRadios *syncPrefsGroup = | 265 | KPrefsDialogWidRadios *syncPrefsGroup = |
266 | addWidRadios(i18n("Sync preferences:"),&(KOPrefs::instance()->mSyncAlgoPrefs), | 266 | addWidRadios(i18n("Sync preferences:"),&(KOPrefs::instance()->mSyncAlgoPrefs), |
267 | topFrame); | 267 | topFrame); |
268 | syncPrefsGroup->addRadio(i18n("Take local entry on conflict")); | 268 | syncPrefsGroup->addRadio(i18n("Take local entry on conflict")); |
269 | syncPrefsGroup->addRadio(i18n("Take remote entry on conflict")); | 269 | syncPrefsGroup->addRadio(i18n("Take remote entry on conflict")); |
270 | syncPrefsGroup->addRadio(i18n("Take newest entry on conflict")); | 270 | syncPrefsGroup->addRadio(i18n("Take newest entry on conflict")); |
@@ -530,385 +530,384 @@ void KOPrefsDialog::setupTimeTab() | |||
530 | QGroupBox *workingHoursGroup = new QGroupBox(1,Horizontal, | 530 | QGroupBox *workingHoursGroup = new QGroupBox(1,Horizontal, |
531 | i18n("Working Hours"), | 531 | i18n("Working Hours"), |
532 | topFrame); | 532 | topFrame); |
533 | topLayout->addMultiCellWidget(workingHoursGroup,4,4,0,1); | 533 | topLayout->addMultiCellWidget(workingHoursGroup,4,4,0,1); |
534 | workingHoursGroup->layout()->setSpacing( 0 ); | 534 | workingHoursGroup->layout()->setSpacing( 0 ); |
535 | workingHoursGroup->layout()->setMargin( 4 ); | 535 | workingHoursGroup->layout()->setMargin( 4 ); |
536 | QHBox *workStartBox = new QHBox(workingHoursGroup); | 536 | QHBox *workStartBox = new QHBox(workingHoursGroup); |
537 | // workStartBox->setMargin( 0 ); | 537 | // workStartBox->setMargin( 0 ); |
538 | addWidTime(i18n("Daily starting hour:"), | 538 | addWidTime(i18n("Daily starting hour:"), |
539 | &(KOPrefs::instance()->mWorkingHoursStart),workStartBox); | 539 | &(KOPrefs::instance()->mWorkingHoursStart),workStartBox); |
540 | 540 | ||
541 | QHBox *workEndBox = new QHBox(workingHoursGroup); | 541 | QHBox *workEndBox = new QHBox(workingHoursGroup); |
542 | //workEndBox->setMargin( 0 ); | 542 | //workEndBox->setMargin( 0 ); |
543 | addWidTime(i18n("Daily ending hour:"), | 543 | addWidTime(i18n("Daily ending hour:"), |
544 | &(KOPrefs::instance()->mWorkingHoursEnd),workEndBox); | 544 | &(KOPrefs::instance()->mWorkingHoursEnd),workEndBox); |
545 | QVBox *excludeBox = new QVBox(workingHoursGroup); | 545 | QVBox *excludeBox = new QVBox(workingHoursGroup); |
546 | //excludeBox->setMargin( 0 ); | 546 | //excludeBox->setMargin( 0 ); |
547 | addWidBool(i18n("Exclude holidays"), | 547 | addWidBool(i18n("Exclude holidays"), |
548 | &(KOPrefs::instance()->mExcludeHolidays),excludeBox); | 548 | &(KOPrefs::instance()->mExcludeHolidays),excludeBox); |
549 | 549 | ||
550 | addWidBool(i18n("Exclude Saturdays"), | 550 | addWidBool(i18n("Exclude Saturdays"), |
551 | &(KOPrefs::instance()->mExcludeSaturdays),excludeBox); | 551 | &(KOPrefs::instance()->mExcludeSaturdays),excludeBox); |
552 | 552 | ||
553 | // KPrefsDialogWidBool *marcusBainsShowSeconds = addWidBool(i18n("Show seconds on Marcus Bains line"), | 553 | // KPrefsDialogWidBool *marcusBainsShowSeconds = addWidBool(i18n("Show seconds on Marcus Bains line"), |
554 | // &(KOPrefs::instance()->mMarcusBainsShowSeconds), | 554 | // &(KOPrefs::instance()->mMarcusBainsShowSeconds), |
555 | // topFrame); | 555 | // topFrame); |
556 | // topLayout->addWidget(marcusBainsShowSeconds->checkBox(),5,0); | 556 | // topLayout->addWidget(marcusBainsShowSeconds->checkBox(),5,0); |
557 | 557 | ||
558 | // topLayout->setRowStretch(6,1); | 558 | // topLayout->setRowStretch(6,1); |
559 | } | 559 | } |
560 | 560 | ||
561 | 561 | ||
562 | void KOPrefsDialog::setupViewsTab() | 562 | void KOPrefsDialog::setupViewsTab() |
563 | { | 563 | { |
564 | 564 | ||
565 | QFrame *topFrame = addPage(i18n("Views"),0,0); | 565 | QFrame *topFrame = addPage(i18n("Views"),0,0); |
566 | // DesktopIcon("viewmag",KIcon::SizeMedium)); | 566 | // DesktopIcon("viewmag",KIcon::SizeMedium)); |
567 | 567 | ||
568 | QGridLayout *topLayout = new QGridLayout(topFrame,6,1); | 568 | QGridLayout *topLayout = new QGridLayout(topFrame,6,1); |
569 | topLayout->setSpacing(mSpacingHint); | 569 | topLayout->setSpacing(mSpacingHint); |
570 | topLayout->setMargin(mMarginHint); | 570 | topLayout->setMargin(mMarginHint); |
571 | 571 | ||
572 | // QBoxLayout *dayBeginsLayout = new QHBoxLayout; | 572 | // QBoxLayout *dayBeginsLayout = new QHBoxLayout; |
573 | // topLayout->addLayout(dayBeginsLayout,0,0); | 573 | // topLayout->addLayout(dayBeginsLayout,0,0); |
574 | 574 | ||
575 | // KPrefsDialogWidTime *dayBegins = | 575 | // KPrefsDialogWidTime *dayBegins = |
576 | // addWidTime(i18n("Day begins at:"),&(KOPrefs::instance()->mDayBegins), | 576 | // addWidTime(i18n("Day begins at:"),&(KOPrefs::instance()->mDayBegins), |
577 | // topFrame); | 577 | // topFrame); |
578 | // dayBeginsLayout->addWidget(dayBegins->label()); | 578 | // dayBeginsLayout->addWidget(dayBegins->label()); |
579 | // dayBeginsLayout->addStretch(1); | 579 | // dayBeginsLayout->addStretch(1); |
580 | // dayBeginsLayout->addWidget(dayBegins->spinBox()); | 580 | // dayBeginsLayout->addWidget(dayBegins->spinBox()); |
581 | 581 | ||
582 | // QBoxLayout *nextDaysLayout = new QHBoxLayout; | 582 | // QBoxLayout *nextDaysLayout = new QHBoxLayout; |
583 | // topLayout->addLayout(nextDaysLayout,1,0); | 583 | // topLayout->addLayout(nextDaysLayout,1,0); |
584 | // nextDaysLayout->addWidget(new QLabel(i18n("Days to show in Next-X-Days view:"),topFrame)); | 584 | // nextDaysLayout->addWidget(new QLabel(i18n("Days to show in Next-X-Days view:"),topFrame)); |
585 | // mNextXDaysSpin = new QSpinBox(2,14,1,topFrame); | 585 | // mNextXDaysSpin = new QSpinBox(2,14,1,topFrame); |
586 | // nextDaysLayout->addStretch(1); | 586 | // nextDaysLayout->addStretch(1); |
587 | // nextDaysLayout->addWidget(mNextXDaysSpin); | 587 | // nextDaysLayout->addWidget(mNextXDaysSpin); |
588 | 588 | ||
589 | 589 | ||
590 | int ii = 0; | 590 | int ii = 0; |
591 | KPrefsDialogWidBool *dummy = | 591 | KPrefsDialogWidBool *dummy = |
592 | addWidBool(i18n("Edit item on doubleclick (if not, show)"), | 592 | addWidBool(i18n("Edit item on doubleclick (if not, show)"), |
593 | &(KOPrefs::instance()->mEditOnDoubleClick),topFrame); | 593 | &(KOPrefs::instance()->mEditOnDoubleClick),topFrame); |
594 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 594 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
595 | 595 | ||
596 | 596 | ||
597 | 597 | ||
598 | 598 | ||
599 | 599 | ||
600 | 600 | ||
601 | // topLayout->addWidget(hourSizeGroup,ii++,0); | 601 | // topLayout->addWidget(hourSizeGroup,ii++,0); |
602 | // topLayout->addMultiCellWidget(hourSizeGroup,ii,ii,0,0); | 602 | // topLayout->addMultiCellWidget(hourSizeGroup,ii,ii,0,0); |
603 | //topLayout->setRowStretch(11,1); | 603 | //topLayout->setRowStretch(11,1); |
604 | 604 | ||
605 | 605 | ||
606 | 606 | ||
607 | 607 | ||
608 | #if 0 | 608 | #if 0 |
609 | 609 | ||
610 | topFrame = addPage(i18n("ViewChange"),0,0); | 610 | topFrame = addPage(i18n("ViewChange"),0,0); |
611 | // DesktopIcon("viewmag",KIcon::SizeMedium)); | 611 | // DesktopIcon("viewmag",KIcon::SizeMedium)); |
612 | 612 | ||
613 | topLayout = new QGridLayout(topFrame,6,1); | 613 | topLayout = new QGridLayout(topFrame,6,1); |
614 | topLayout->setSpacing(mSpacingHint); | 614 | topLayout->setSpacing(mSpacingHint); |
615 | topLayout->setMargin(mMarginHint); | 615 | topLayout->setMargin(mMarginHint); |
616 | ii = 0; | 616 | ii = 0; |
617 | 617 | ||
618 | #endif | 618 | #endif |
619 | 619 | ||
620 | dummy = | 620 | dummy = |
621 | addWidBool(i18n("Hold fullscreen on view change"), | 621 | addWidBool(i18n("Hold fullscreen on view change"), |
622 | &(KOPrefs::instance()->mViewChangeHoldFullscreen),topFrame); | 622 | &(KOPrefs::instance()->mViewChangeHoldFullscreen),topFrame); |
623 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 623 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
624 | 624 | ||
625 | dummy = | 625 | dummy = |
626 | addWidBool(i18n("Hold non-fullscreen on view change"), | 626 | addWidBool(i18n("Hold non-fullscreen on view change"), |
627 | &(KOPrefs::instance()->mViewChangeHoldNonFullscreen),topFrame); | 627 | &(KOPrefs::instance()->mViewChangeHoldNonFullscreen),topFrame); |
628 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 628 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
629 | 629 | ||
630 | 630 | ||
631 | 631 | ||
632 | KPrefsDialogWidBool *fullViewMonth = | 632 | KPrefsDialogWidBool *fullViewMonth = |
633 | addWidBool(i18n("Next days view uses full window"), | 633 | addWidBool(i18n("Next days view uses full window"), |
634 | &(KOPrefs::instance()->mFullViewMonth),topFrame); | 634 | &(KOPrefs::instance()->mFullViewMonth),topFrame); |
635 | topLayout->addWidget(fullViewMonth->checkBox(),ii++,0); | 635 | topLayout->addWidget(fullViewMonth->checkBox(),ii++,0); |
636 | 636 | ||
637 | 637 | ||
638 | KPrefsDialogWidBool *fullViewTodo = | 638 | KPrefsDialogWidBool *fullViewTodo = |
639 | addWidBool(i18n("Event list view uses full window"), | 639 | addWidBool(i18n("Event list view uses full window"), |
640 | &(KOPrefs::instance()->mFullViewTodo),topFrame); | 640 | &(KOPrefs::instance()->mFullViewTodo),topFrame); |
641 | topLayout->addWidget(fullViewTodo->checkBox(),ii++,0); | 641 | topLayout->addWidget(fullViewTodo->checkBox(),ii++,0); |
642 | dummy = | 642 | dummy = |
643 | addWidBool(i18n("Listview uses monthly timespan"), | 643 | addWidBool(i18n("Listview uses monthly timespan"), |
644 | &(KOPrefs::instance()->mListViewMonthTimespan),topFrame); | 644 | &(KOPrefs::instance()->mListViewMonthTimespan),topFrame); |
645 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 645 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
646 | dummy = | 646 | dummy = |
647 | addWidBool(i18n("Highlight selection in Time Edit"), | 647 | addWidBool(i18n("Highlight selection in Time Edit"), |
648 | &(KOPrefs::instance()->mHightlightDateTimeEdit),topFrame); | 648 | &(KOPrefs::instance()->mHightlightDateTimeEdit),topFrame); |
649 | topLayout->addWidget( dummy->checkBox(), ii++,0); | 649 | topLayout->addWidget( dummy->checkBox(), ii++,0); |
650 | 650 | ||
651 | KPrefsDialogWidBool *dailyRecur = | 651 | KPrefsDialogWidBool *dailyRecur = |
652 | addWidBool(i18n("Show events that recur daily in date nav."), | 652 | addWidBool(i18n("Show events that recur daily in date nav."), |
653 | &(KOPrefs::instance()->mDailyRecur),topFrame); | 653 | &(KOPrefs::instance()->mDailyRecur),topFrame); |
654 | topLayout->addWidget(dailyRecur->checkBox(),ii++,0); | 654 | topLayout->addWidget(dailyRecur->checkBox(),ii++,0); |
655 | 655 | ||
656 | KPrefsDialogWidBool *weeklyRecur = | 656 | KPrefsDialogWidBool *weeklyRecur = |
657 | addWidBool(i18n("Show ev. that recur weekly in date nav."), | 657 | addWidBool(i18n("Show ev. that recur weekly in date nav."), |
658 | &(KOPrefs::instance()->mWeeklyRecur),topFrame); | 658 | &(KOPrefs::instance()->mWeeklyRecur),topFrame); |
659 | topLayout->addWidget(weeklyRecur->checkBox(),ii++,0); | 659 | topLayout->addWidget(weeklyRecur->checkBox(),ii++,0); |
660 | 660 | ||
661 | #ifdef DESKTOP_VERSION | 661 | #ifdef DESKTOP_VERSION |
662 | KPrefsDialogWidBool *enableToolTips = | 662 | KPrefsDialogWidBool *enableToolTips = |
663 | addWidBool(i18n("Enable tooltips displaying summary of ev."), | 663 | addWidBool(i18n("Enable tooltips displaying summary of ev."), |
664 | &(KOPrefs::instance()->mEnableToolTips),topFrame); | 664 | &(KOPrefs::instance()->mEnableToolTips),topFrame); |
665 | topLayout->addWidget(enableToolTips->checkBox(),ii++,0); | 665 | topLayout->addWidget(enableToolTips->checkBox(),ii++,0); |
666 | #endif | 666 | #endif |
667 | // ********************************************************* | 667 | // ********************************************************* |
668 | 668 | ||
669 | topFrame = addPage(i18n("Agenda View"),0,0); | 669 | topFrame = addPage(i18n("Agenda View"),0,0); |
670 | // DesktopIcon("viewmag",KIcon::SizeMedium)); | 670 | // DesktopIcon("viewmag",KIcon::SizeMedium)); |
671 | 671 | ||
672 | topLayout = new QGridLayout(topFrame,5,1); | 672 | topLayout = new QGridLayout(topFrame,5,1); |
673 | topLayout->setSpacing(mSpacingHint); | 673 | topLayout->setSpacing(mSpacingHint); |
674 | topLayout->setMargin(mMarginHint); | 674 | topLayout->setMargin(mMarginHint); |
675 | ii = 0; | 675 | ii = 0; |
676 | 676 | ||
677 | 677 | ||
678 | dummy = | 678 | dummy = |
679 | addWidBool(i18n("Show time in agenda items"), | 679 | addWidBool(i18n("Show time in agenda items"), |
680 | &(KOPrefs::instance()->mShowTimeInAgenda),topFrame); | 680 | &(KOPrefs::instance()->mShowTimeInAgenda),topFrame); |
681 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 681 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
682 | 682 | ||
683 | dummy = | 683 | dummy = |
684 | addWidBool(i18n("Highlight current day in agenda"), | 684 | addWidBool(i18n("Highlight current day in agenda"), |
685 | &(KOPrefs::instance()->mHighlightCurrentDay),topFrame); | 685 | &(KOPrefs::instance()->mHighlightCurrentDay),topFrame); |
686 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 686 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
687 | 687 | ||
688 | dummy = | 688 | dummy = |
689 | addWidBool(i18n("Use light color for highlight current day"), | 689 | addWidBool(i18n("Use light color for highlight current day"), |
690 | &(KOPrefs::instance()->mUseHighlightLightColor),topFrame); | 690 | &(KOPrefs::instance()->mUseHighlightLightColor),topFrame); |
691 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 691 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
692 | 692 | ||
693 | 693 | ||
694 | KPrefsDialogWidBool *marcusBainsEnabled = | 694 | KPrefsDialogWidBool *marcusBainsEnabled = |
695 | addWidBool(i18n("Show current time"), | 695 | addWidBool(i18n("Show current time"), |
696 | &(KOPrefs::instance()->mMarcusBainsEnabled),topFrame); | 696 | &(KOPrefs::instance()->mMarcusBainsEnabled),topFrame); |
697 | topLayout->addWidget(marcusBainsEnabled->checkBox(),ii++,0); | 697 | topLayout->addWidget(marcusBainsEnabled->checkBox(),ii++,0); |
698 | 698 | ||
699 | 699 | ||
700 | dummy = | 700 | dummy = |
701 | addWidBool(i18n("Set agenda to DayBeginsAt on change"), | 701 | addWidBool(i18n("Set agenda to DayBeginsAt on change"), |
702 | &(KOPrefs::instance()->mSetTimeToDayStartAt),topFrame); | 702 | &(KOPrefs::instance()->mSetTimeToDayStartAt),topFrame); |
703 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 703 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
704 | 704 | ||
705 | dummy = | 705 | dummy = |
706 | addWidBool(i18n("Set agenda to current time on change"), | 706 | addWidBool(i18n("Set agenda to current time on change"), |
707 | &(KOPrefs::instance()->mCenterOnCurrentTime),topFrame); | 707 | &(KOPrefs::instance()->mCenterOnCurrentTime),topFrame); |
708 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 708 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
709 | 709 | ||
710 | 710 | ||
711 | 711 | ||
712 | 712 | ||
713 | 713 | ||
714 | 714 | ||
715 | 715 | ||
716 | topFrame = addPage(i18n("Month View"),0,0); | 716 | topFrame = addPage(i18n("Month View"),0,0); |
717 | // DesktopIcon("viewmag",KIcon::SizeMedium)); | 717 | // DesktopIcon("viewmag",KIcon::SizeMedium)); |
718 | 718 | ||
719 | topLayout = new QGridLayout(topFrame,5,1); | 719 | topLayout = new QGridLayout(topFrame,5,1); |
720 | topLayout->setSpacing(mSpacingHint); | 720 | topLayout->setSpacing(mSpacingHint); |
721 | topLayout->setMargin(mMarginHint); | 721 | topLayout->setMargin(mMarginHint); |
722 | qDebug("%d %d ",mSpacingHint, mMarginHint ); | ||
723 | ii = 0; | 722 | ii = 0; |
724 | QLabel *lab; | 723 | QLabel *lab; |
725 | QHBox *habo = new QHBox( topFrame ); | 724 | QHBox *habo = new QHBox( topFrame ); |
726 | if ( QApplication::desktop()->width() <= 480 ) { | 725 | if ( QApplication::desktop()->width() <= 480 ) { |
727 | lab = new QLabel ( i18n("Show events that recur "), topFrame ); | 726 | lab = new QLabel ( i18n("Show events that recur "), topFrame ); |
728 | topLayout->addMultiCellWidget(lab,ii, ii,0,1); | 727 | topLayout->addMultiCellWidget(lab,ii, ii,0,1); |
729 | ii++; | 728 | ii++; |
730 | } else { | 729 | } else { |
731 | new QLabel ( i18n("Show events that recur "), habo ); | 730 | new QLabel ( i18n("Show events that recur "), habo ); |
732 | } | 731 | } |
733 | dailyRecur = | 732 | dailyRecur = |
734 | addWidBool(i18n("daily"), | 733 | addWidBool(i18n("daily"), |
735 | &(KOPrefs::instance()->mMonthDailyRecur),habo); | 734 | &(KOPrefs::instance()->mMonthDailyRecur),habo); |
736 | // topLayout->addWidget(dailyRecur->checkBox(),ii++,0); | 735 | // topLayout->addWidget(dailyRecur->checkBox(),ii++,0); |
737 | 736 | ||
738 | weeklyRecur = | 737 | weeklyRecur = |
739 | addWidBool(i18n("weekly"), | 738 | addWidBool(i18n("weekly"), |
740 | &(KOPrefs::instance()->mMonthWeeklyRecur),habo); | 739 | &(KOPrefs::instance()->mMonthWeeklyRecur),habo); |
741 | topLayout->addMultiCellWidget(habo,ii, ii,0,1); | 740 | topLayout->addMultiCellWidget(habo,ii, ii,0,1); |
742 | ii++; | 741 | ii++; |
743 | 742 | ||
744 | 743 | ||
745 | habo = new QHBox( topFrame ); | 744 | habo = new QHBox( topFrame ); |
746 | if ( QApplication::desktop()->width() <= 480 ) { | 745 | if ( QApplication::desktop()->width() <= 480 ) { |
747 | lab = new QLabel (i18n("Show in every cell ") , topFrame ); | 746 | lab = new QLabel (i18n("Show in every cell ") , topFrame ); |
748 | topLayout->addMultiCellWidget(lab,ii, ii,0,1); | 747 | topLayout->addMultiCellWidget(lab,ii, ii,0,1); |
749 | ii++; | 748 | ii++; |
750 | 749 | ||
751 | } else { | 750 | } else { |
752 | new QLabel ( i18n("Show in every cell "), habo ); | 751 | new QLabel ( i18n("Show in every cell "), habo ); |
753 | } | 752 | } |
754 | weeklyRecur = | 753 | weeklyRecur = |
755 | addWidBool(i18n("short month"), | 754 | addWidBool(i18n("short month"), |
756 | &(KOPrefs::instance()->mMonthShowShort),habo); | 755 | &(KOPrefs::instance()->mMonthShowShort),habo); |
757 | weeklyRecur = | 756 | weeklyRecur = |
758 | addWidBool(i18n("icons"), | 757 | addWidBool(i18n("icons"), |
759 | &(KOPrefs::instance()->mMonthShowIcons),habo); | 758 | &(KOPrefs::instance()->mMonthShowIcons),habo); |
760 | 759 | ||
761 | topLayout->addMultiCellWidget(habo,ii, ii,0,1); | 760 | topLayout->addMultiCellWidget(habo,ii, ii,0,1); |
762 | ii++; | 761 | ii++; |
763 | #ifdef DESKTOP_VERSION | 762 | #ifdef DESKTOP_VERSION |
764 | KPrefsDialogWidBool *enableMonthScroll = | 763 | KPrefsDialogWidBool *enableMonthScroll = |
765 | addWidBool(i18n("Enable scrollbars in month view cells"), | 764 | addWidBool(i18n("Enable scrollbars in month view cells"), |
766 | &(KOPrefs::instance()->mEnableMonthScroll),topFrame); | 765 | &(KOPrefs::instance()->mEnableMonthScroll),topFrame); |
767 | topLayout->addWidget(enableMonthScroll->checkBox(),ii++,0); | 766 | topLayout->addWidget(enableMonthScroll->checkBox(),ii++,0); |
768 | #endif | 767 | #endif |
769 | dummy = | 768 | dummy = |
770 | addWidBool(i18n("Week view mode uses bigger font"), | 769 | addWidBool(i18n("Week view mode uses bigger font"), |
771 | &(KOPrefs::instance()->mMonthViewUsesBigFont),topFrame); | 770 | &(KOPrefs::instance()->mMonthViewUsesBigFont),topFrame); |
772 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 771 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
773 | dummy = | 772 | dummy = |
774 | addWidBool(i18n("Show Sat/Sun together"), | 773 | addWidBool(i18n("Show Sat/Sun together"), |
775 | &(KOPrefs::instance()->mMonthViewSatSunTog),topFrame); | 774 | &(KOPrefs::instance()->mMonthViewSatSunTog),topFrame); |
776 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 775 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
777 | 776 | ||
778 | KPrefsDialogWidBool *coloredCategoriesInMonthView = | 777 | KPrefsDialogWidBool *coloredCategoriesInMonthView = |
779 | addWidBool(i18n("Month view uses category colors"), | 778 | addWidBool(i18n("Month view uses category colors"), |
780 | &(KOPrefs::instance()->mMonthViewUsesCategoryColor),topFrame); | 779 | &(KOPrefs::instance()->mMonthViewUsesCategoryColor),topFrame); |
781 | topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0); | 780 | topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0); |
782 | 781 | ||
783 | dummy = | 782 | dummy = |
784 | addWidBool(i18n("Categorie colors are applied to text"), | 783 | addWidBool(i18n("Categorie colors are applied to text"), |
785 | &(KOPrefs::instance()->mMonthViewUsesForegroundColor),topFrame); | 784 | &(KOPrefs::instance()->mMonthViewUsesForegroundColor),topFrame); |
786 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 785 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
787 | coloredCategoriesInMonthView = | 786 | coloredCategoriesInMonthView = |
788 | addWidBool(i18n("Month view uses day colors"), | 787 | addWidBool(i18n("Month view uses day colors"), |
789 | &(KOPrefs::instance()->mMonthViewUsesDayColors),topFrame); | 788 | &(KOPrefs::instance()->mMonthViewUsesDayColors),topFrame); |
790 | topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0); | 789 | topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0); |
791 | 790 | ||
792 | KPrefsDialogWidColor *holidayColor = | 791 | KPrefsDialogWidColor *holidayColor = |
793 | addWidColor(i18n("Day color odd months"), | 792 | addWidColor(i18n("Day color odd months"), |
794 | &(KOPrefs::instance()->mMonthViewOddColor),topFrame); | 793 | &(KOPrefs::instance()->mMonthViewOddColor),topFrame); |
795 | topLayout->addWidget(holidayColor->label(),ii,0); | 794 | topLayout->addWidget(holidayColor->label(),ii,0); |
796 | topLayout->addWidget(holidayColor->button(),ii++,1); | 795 | topLayout->addWidget(holidayColor->button(),ii++,1); |
797 | 796 | ||
798 | holidayColor = | 797 | holidayColor = |
799 | addWidColor(i18n("Day color even months"), | 798 | addWidColor(i18n("Day color even months"), |
800 | &(KOPrefs::instance()->mMonthViewEvenColor),topFrame); | 799 | &(KOPrefs::instance()->mMonthViewEvenColor),topFrame); |
801 | topLayout->addWidget(holidayColor->label(),ii,0); | 800 | topLayout->addWidget(holidayColor->label(),ii,0); |
802 | topLayout->addWidget(holidayColor->button(),ii++,1); | 801 | topLayout->addWidget(holidayColor->button(),ii++,1); |
803 | 802 | ||
804 | 803 | ||
805 | holidayColor = | 804 | holidayColor = |
806 | addWidColor(i18n("Color for Sundays + category \"Holiday\""), | 805 | addWidColor(i18n("Color for Sundays + category \"Holiday\""), |
807 | &(KOPrefs::instance()->mMonthViewHolidayColor),topFrame); | 806 | &(KOPrefs::instance()->mMonthViewHolidayColor),topFrame); |
808 | topLayout->addWidget(holidayColor->label(),ii,0); | 807 | topLayout->addWidget(holidayColor->label(),ii,0); |
809 | topLayout->addWidget(holidayColor->button(),ii++,1); | 808 | topLayout->addWidget(holidayColor->button(),ii++,1); |
810 | // *********************** What'sNext View | 809 | // *********************** What'sNext View |
811 | topFrame = addPage(i18n("What's Next View"),0,0); | 810 | topFrame = addPage(i18n("What's Next View"),0,0); |
812 | // DesktopIcon("viewmag",KIcon::SizeMedium)); | 811 | // DesktopIcon("viewmag",KIcon::SizeMedium)); |
813 | 812 | ||
814 | topLayout = new QGridLayout(topFrame,4,1); | 813 | topLayout = new QGridLayout(topFrame,4,1); |
815 | topLayout->setSpacing(mSpacingHint); | 814 | topLayout->setSpacing(mSpacingHint); |
816 | topLayout->setMargin(mMarginHint); | 815 | topLayout->setMargin(mMarginHint); |
817 | ii = 0; | 816 | ii = 0; |
818 | 817 | ||
819 | 818 | ||
820 | QHBox* hdummy = new QHBox(topFrame); | 819 | QHBox* hdummy = new QHBox(topFrame); |
821 | new QLabel(i18n("Days in What's Next:"),hdummy); | 820 | new QLabel(i18n("Days in What's Next:"),hdummy); |
822 | mWhatsNextSpin = new QSpinBox(1,14,1,hdummy); | 821 | mWhatsNextSpin = new QSpinBox(1,14,1,hdummy); |
823 | 822 | ||
824 | topLayout->addWidget(hdummy,ii++,0); | 823 | topLayout->addWidget(hdummy,ii++,0); |
825 | 824 | ||
826 | QHBox *prioBox = new QHBox(topFrame); | 825 | QHBox *prioBox = new QHBox(topFrame); |
827 | // intervalBox->setSpacing(mSpacingHint); | 826 | // intervalBox->setSpacing(mSpacingHint); |
828 | topLayout->addWidget(prioBox,ii++,0); | 827 | topLayout->addWidget(prioBox,ii++,0); |
829 | 828 | ||
830 | QLabel *prioLabel = new QLabel(i18n("Number of max.displayed todo prios:"), prioBox); | 829 | QLabel *prioLabel = new QLabel(i18n("Number of max.displayed todo prios:"), prioBox); |
831 | mPrioSpin = new QSpinBox(0,5,1,prioBox); | 830 | mPrioSpin = new QSpinBox(0,5,1,prioBox); |
832 | if ( QApplication::desktop()->width() < 300 ) | 831 | if ( QApplication::desktop()->width() < 300 ) |
833 | mPrioSpin->setFixedWidth( 40 ); | 832 | mPrioSpin->setFixedWidth( 40 ); |
834 | 833 | ||
835 | KPrefsDialogWidBool *passwdk = | 834 | KPrefsDialogWidBool *passwdk = |
836 | 835 | ||
837 | addWidBool(i18n("Show events, that are done"), | 836 | addWidBool(i18n("Show events, that are done"), |
838 | &(KOPrefs::instance()->mWNViewShowsPast),topFrame); | 837 | &(KOPrefs::instance()->mWNViewShowsPast),topFrame); |
839 | topLayout->addWidget(passwdk->checkBox(), ii++,0); | 838 | topLayout->addWidget(passwdk->checkBox(), ii++,0); |
840 | passwdk = | 839 | passwdk = |
841 | addWidBool(i18n("Show parent To-Do's"), | 840 | addWidBool(i18n("Show parent To-Do's"), |
842 | &(KOPrefs::instance()->mWNViewShowsParents),topFrame); | 841 | &(KOPrefs::instance()->mWNViewShowsParents),topFrame); |
843 | topLayout->addWidget(passwdk->checkBox(), ii++,0); | 842 | topLayout->addWidget(passwdk->checkBox(), ii++,0); |
844 | 843 | ||
845 | passwdk = | 844 | passwdk = |
846 | addWidBool(i18n("Show location"), | 845 | addWidBool(i18n("Show location"), |
847 | &(KOPrefs::instance()->mWNViewShowLocation),topFrame); | 846 | &(KOPrefs::instance()->mWNViewShowLocation),topFrame); |
848 | topLayout->addWidget(passwdk->checkBox(), ii++,0); | 847 | topLayout->addWidget(passwdk->checkBox(), ii++,0); |
849 | 848 | ||
850 | passwdk = | 849 | passwdk = |
851 | addWidBool(i18n("Show Sync Events in WN+Agenda"), | 850 | addWidBool(i18n("Show Sync Events in WN+Agenda"), |
852 | &(KOPrefs::instance()->mShowSyncEvents),topFrame); | 851 | &(KOPrefs::instance()->mShowSyncEvents),topFrame); |
853 | topLayout->addWidget(passwdk->checkBox(), ii++,0); | 852 | topLayout->addWidget(passwdk->checkBox(), ii++,0); |
854 | passwdk = | 853 | passwdk = |
855 | addWidBool(i18n("Use short date in WN+Event view"), | 854 | addWidBool(i18n("Use short date in WN+Event view"), |
856 | &(KOPrefs::instance()->mShortDateInViewer),topFrame); | 855 | &(KOPrefs::instance()->mShortDateInViewer),topFrame); |
857 | topLayout->addWidget(passwdk->checkBox(), ii++,0); | 856 | topLayout->addWidget(passwdk->checkBox(), ii++,0); |
858 | 857 | ||
859 | 858 | ||
860 | 859 | ||
861 | 860 | ||
862 | // *********************** Todo View | 861 | // *********************** Todo View |
863 | 862 | ||
864 | topFrame = addPage(i18n("Todo View"),0,0); | 863 | topFrame = addPage(i18n("Todo View"),0,0); |
865 | // DesktopIcon("viewmag",KIcon::SizeMedium)); | 864 | // DesktopIcon("viewmag",KIcon::SizeMedium)); |
866 | 865 | ||
867 | topLayout = new QGridLayout(topFrame,4,1); | 866 | topLayout = new QGridLayout(topFrame,4,1); |
868 | topLayout->setSpacing(mSpacingHint); | 867 | topLayout->setSpacing(mSpacingHint); |
869 | topLayout->setMargin(mMarginHint); | 868 | topLayout->setMargin(mMarginHint); |
870 | ii = 0; | 869 | ii = 0; |
871 | dummy = | 870 | dummy = |
872 | addWidBool(i18n("Hide not running Todos in To-do view"), | 871 | addWidBool(i18n("Hide not running Todos in To-do view"), |
873 | &(KOPrefs::instance()->mHideNonStartedTodos),topFrame); | 872 | &(KOPrefs::instance()->mHideNonStartedTodos),topFrame); |
874 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 873 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
875 | 874 | ||
876 | 875 | ||
877 | KPrefsDialogWidBool *showCompletedTodo = | 876 | KPrefsDialogWidBool *showCompletedTodo = |
878 | addWidBool(i18n("To-do view shows completed Todos"), | 877 | addWidBool(i18n("To-do view shows completed Todos"), |
879 | &(KOPrefs::instance()->mShowCompletedTodo),topFrame); | 878 | &(KOPrefs::instance()->mShowCompletedTodo),topFrame); |
880 | topLayout->addWidget(showCompletedTodo->checkBox(),ii++,0); | 879 | topLayout->addWidget(showCompletedTodo->checkBox(),ii++,0); |
881 | dummy = | 880 | dummy = |
882 | addWidBool(i18n("To-do view shows complete as 'xx %'"), | 881 | addWidBool(i18n("To-do view shows complete as 'xx %'"), |
883 | &(KOPrefs::instance()->mTodoViewShowsPercentage),topFrame); | 882 | &(KOPrefs::instance()->mTodoViewShowsPercentage),topFrame); |
884 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 883 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
885 | 884 | ||
886 | dummy = | 885 | dummy = |
887 | addWidBool(i18n("Small To-do view uses smaller font"), | 886 | addWidBool(i18n("Small To-do view uses smaller font"), |
888 | &(KOPrefs::instance()->mTodoViewUsesSmallFont),topFrame); | 887 | &(KOPrefs::instance()->mTodoViewUsesSmallFont),topFrame); |
889 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 888 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
890 | 889 | ||
891 | 890 | ||
892 | 891 | ||
893 | dummy = | 892 | dummy = |
894 | addWidBool(i18n("Todo view uses category colors"), | 893 | addWidBool(i18n("Todo view uses category colors"), |
895 | &(KOPrefs::instance()->mTodoViewUsesCatColors),topFrame); | 894 | &(KOPrefs::instance()->mTodoViewUsesCatColors),topFrame); |
896 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 895 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
897 | 896 | ||
898 | 897 | ||
899 | QWidget* wid = new QWidget( topFrame ); | 898 | QWidget* wid = new QWidget( topFrame ); |
900 | // Todo due today color | 899 | // Todo due today color |
901 | KPrefsDialogWidColor *todoDueTodayColor = | 900 | KPrefsDialogWidColor *todoDueTodayColor = |
902 | addWidColor(i18n("Todo due today color:"), | 901 | addWidColor(i18n("Todo due today color:"), |
903 | &(KOPrefs::instance()->mTodoDueTodayColor),wid); | 902 | &(KOPrefs::instance()->mTodoDueTodayColor),wid); |
904 | QHBoxLayout *widLayout = new QHBoxLayout(wid); | 903 | QHBoxLayout *widLayout = new QHBoxLayout(wid); |
905 | widLayout->addWidget( todoDueTodayColor->label() ); | 904 | widLayout->addWidget( todoDueTodayColor->label() ); |
906 | widLayout->addWidget( todoDueTodayColor->button() ); | 905 | widLayout->addWidget( todoDueTodayColor->button() ); |
907 | topLayout->addWidget(wid,ii++,0); | 906 | topLayout->addWidget(wid,ii++,0); |
908 | //topLayout->addWidget(todoDueTodayColor->button(),ii++,1); | 907 | //topLayout->addWidget(todoDueTodayColor->button(),ii++,1); |
909 | 908 | ||
910 | // Todo overdue color | 909 | // Todo overdue color |
911 | wid = new QWidget( topFrame ); | 910 | wid = new QWidget( topFrame ); |
912 | widLayout = new QHBoxLayout(wid); | 911 | widLayout = new QHBoxLayout(wid); |
913 | KPrefsDialogWidColor *todoOverdueColor = | 912 | KPrefsDialogWidColor *todoOverdueColor = |
914 | addWidColor(i18n("Todo overdue color:"), | 913 | addWidColor(i18n("Todo overdue color:"), |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 9505d06..94f4677 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -1585,388 +1585,384 @@ void MainWindow::processIncidenceSelection( Incidence *incidence ) | |||
1585 | 1585 | ||
1586 | } else { | 1586 | } else { |
1587 | if ( incidence->dtStart().time() != incidence->dtEnd().time() ) | 1587 | if ( incidence->dtStart().time() != incidence->dtEnd().time() ) |
1588 | startString = ": "+KGlobal::locale()->formatTime(incidence->dtStart().time())+ | 1588 | startString = ": "+KGlobal::locale()->formatTime(incidence->dtStart().time())+ |
1589 | "-"+KGlobal::locale()->formatTime(incidence->dtEnd().time()); | 1589 | "-"+KGlobal::locale()->formatTime(incidence->dtEnd().time()); |
1590 | if ( incidence->categories().contains( i18n("Birthday") ) || incidence->categories().contains( i18n("Anniversary") ) ) { | 1590 | if ( incidence->categories().contains( i18n("Birthday") ) || incidence->categories().contains( i18n("Anniversary") ) ) { |
1591 | bool ok; | 1591 | bool ok; |
1592 | QDateTime noc = incidence->getNextOccurence( mView->startDate().addDays(-1), &ok ); | 1592 | QDateTime noc = incidence->getNextOccurence( mView->startDate().addDays(-1), &ok ); |
1593 | if ( ok ) { | 1593 | if ( ok ) { |
1594 | int years = noc.date().year() - incidence->dtStart().date().year(); | 1594 | int years = noc.date().year() - incidence->dtStart().date().year(); |
1595 | startString += i18n(" (%1 y.)"). arg( years ); | 1595 | startString += i18n(" (%1 y.)"). arg( years ); |
1596 | } | 1596 | } |
1597 | } | 1597 | } |
1598 | else | 1598 | else |
1599 | startString +=" "+KGlobal::locale()->formatDate( incidence->dtStart().date(), true); | 1599 | startString +=" "+KGlobal::locale()->formatDate( incidence->dtStart().date(), true); |
1600 | } | 1600 | } |
1601 | 1601 | ||
1602 | } | 1602 | } |
1603 | else | 1603 | else |
1604 | startString = i18n(": (Prio ") +QString::number( (( KCal::Todo*)incidence)->priority() ) +") "+QString::number( (( KCal::Todo*)incidence)->percentComplete() ) +i18n("\% completed"); | 1604 | startString = i18n(": (Prio ") +QString::number( (( KCal::Todo*)incidence)->priority() ) +") "+QString::number( (( KCal::Todo*)incidence)->percentComplete() ) +i18n("\% completed"); |
1605 | if ( !incidence->location().isEmpty() ) | 1605 | if ( !incidence->location().isEmpty() ) |
1606 | startString += " (" +incidence->location()+")"; | 1606 | startString += " (" +incidence->location()+")"; |
1607 | setCaption( incidence->summary()+startString); | 1607 | setCaption( incidence->summary()+startString); |
1608 | 1608 | ||
1609 | enableIncidenceActions( true ); | 1609 | enableIncidenceActions( true ); |
1610 | 1610 | ||
1611 | if ( incidence->type() == "Event" ) { | 1611 | if ( incidence->type() == "Event" ) { |
1612 | mShowAction->setText( i18n("Show Event...") ); | 1612 | mShowAction->setText( i18n("Show Event...") ); |
1613 | mEditAction->setText( i18n("Edit Event...") ); | 1613 | mEditAction->setText( i18n("Edit Event...") ); |
1614 | mDeleteAction->setText( i18n("Delete Event...") ); | 1614 | mDeleteAction->setText( i18n("Delete Event...") ); |
1615 | 1615 | ||
1616 | mNewSubTodoAction->setEnabled( false ); | 1616 | mNewSubTodoAction->setEnabled( false ); |
1617 | } else if ( incidence->type() == "Todo" ) { | 1617 | } else if ( incidence->type() == "Todo" ) { |
1618 | mShowAction->setText( i18n("Show Todo...") ); | 1618 | mShowAction->setText( i18n("Show Todo...") ); |
1619 | mEditAction->setText( i18n("Edit Todo...") ); | 1619 | mEditAction->setText( i18n("Edit Todo...") ); |
1620 | mDeleteAction->setText( i18n("Delete Todo...") ); | 1620 | mDeleteAction->setText( i18n("Delete Todo...") ); |
1621 | 1621 | ||
1622 | mNewSubTodoAction->setEnabled( true ); | 1622 | mNewSubTodoAction->setEnabled( true ); |
1623 | } else { | 1623 | } else { |
1624 | mShowAction->setText( i18n("Show...") ); | 1624 | mShowAction->setText( i18n("Show...") ); |
1625 | mShowAction->setText( i18n("Edit...") ); | 1625 | mShowAction->setText( i18n("Edit...") ); |
1626 | mShowAction->setText( i18n("Delete...") ); | 1626 | mShowAction->setText( i18n("Delete...") ); |
1627 | 1627 | ||
1628 | mNewSubTodoAction->setEnabled( false ); | 1628 | mNewSubTodoAction->setEnabled( false ); |
1629 | } | 1629 | } |
1630 | } | 1630 | } |
1631 | 1631 | ||
1632 | void MainWindow::enableIncidenceActions( bool enabled ) | 1632 | void MainWindow::enableIncidenceActions( bool enabled ) |
1633 | { | 1633 | { |
1634 | mShowAction->setEnabled( enabled ); | 1634 | mShowAction->setEnabled( enabled ); |
1635 | mEditAction->setEnabled( enabled ); | 1635 | mEditAction->setEnabled( enabled ); |
1636 | mDeleteAction->setEnabled( enabled ); | 1636 | mDeleteAction->setEnabled( enabled ); |
1637 | 1637 | ||
1638 | mCloneAction->setEnabled( enabled ); | 1638 | mCloneAction->setEnabled( enabled ); |
1639 | mMoveAction->setEnabled( enabled ); | 1639 | mMoveAction->setEnabled( enabled ); |
1640 | mBeamAction->setEnabled( enabled ); | 1640 | mBeamAction->setEnabled( enabled ); |
1641 | mCancelAction->setEnabled( enabled ); | 1641 | mCancelAction->setEnabled( enabled ); |
1642 | } | 1642 | } |
1643 | 1643 | ||
1644 | void MainWindow::importOL() | 1644 | void MainWindow::importOL() |
1645 | { | 1645 | { |
1646 | #ifdef _OL_IMPORT_ | 1646 | #ifdef _OL_IMPORT_ |
1647 | KOImportOLdialog *id = new KOImportOLdialog("Import from OL - select folder!" , mView->calendar(),this ); | 1647 | KOImportOLdialog *id = new KOImportOLdialog("Import from OL - select folder!" , mView->calendar(),this ); |
1648 | id->exec(); | 1648 | id->exec(); |
1649 | delete id; | 1649 | delete id; |
1650 | mView->updateView(); | 1650 | mView->updateView(); |
1651 | #endif | 1651 | #endif |
1652 | } | 1652 | } |
1653 | void MainWindow::importBday() | 1653 | void MainWindow::importBday() |
1654 | { | 1654 | { |
1655 | int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"), | 1655 | int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"), |
1656 | i18n("When importing birthdays twice\nduplicated events will be ignored,\nif the event has not been\nchanged in KO/Pi!\n"), | 1656 | i18n("When importing birthdays twice\nduplicated events will be ignored,\nif the event has not been\nchanged in KO/Pi!\n"), |
1657 | i18n("Import!"), i18n("Cancel"), 0, | 1657 | i18n("Import!"), i18n("Cancel"), 0, |
1658 | 0, 1 ); | 1658 | 0, 1 ); |
1659 | if ( result == 0 ) { | 1659 | if ( result == 0 ) { |
1660 | mView->importBday(); | 1660 | mView->importBday(); |
1661 | 1661 | ||
1662 | } | 1662 | } |
1663 | 1663 | ||
1664 | 1664 | ||
1665 | } | 1665 | } |
1666 | void MainWindow::importQtopia() | 1666 | void MainWindow::importQtopia() |
1667 | { | 1667 | { |
1668 | //#ifndef DESKTOP_VERSION | 1668 | //#ifndef DESKTOP_VERSION |
1669 | QString mess = i18n("When importing a calendar twice\nduplicated events will be ignored!\nYou can create a backup file with\nFile - Save Calendar Backup\nto revert importing"); | 1669 | QString mess = i18n("When importing a calendar twice\nduplicated events will be ignored!\nYou can create a backup file with\nFile - Save Calendar Backup\nto revert importing"); |
1670 | #ifdef DESKTOP_VERSION | 1670 | #ifdef DESKTOP_VERSION |
1671 | mess += i18n("The content of the following files will be\nimported (located in your home directory (hd)):\n(hd)/Applications/datebook/datebook.xml\n(hd)/Applications/todolist/todolist.xml\nThe following category file will be used:\n(hd)/Settings/Categories.xml"); | 1671 | mess += i18n("The content of the following files will be\nimported (located in your home directory (hd)):\n(hd)/Applications/datebook/datebook.xml\n(hd)/Applications/todolist/todolist.xml\nThe following category file will be used:\n(hd)/Settings/Categories.xml"); |
1672 | #endif | 1672 | #endif |
1673 | int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),mess, | 1673 | int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),mess, |
1674 | i18n("Import!"), i18n("Cancel"), 0, | 1674 | i18n("Import!"), i18n("Cancel"), 0, |
1675 | 0, 1 ); | 1675 | 0, 1 ); |
1676 | if ( result == 0 ) { | 1676 | if ( result == 0 ) { |
1677 | #ifndef DESKTOP_VERSION | 1677 | #ifndef DESKTOP_VERSION |
1678 | QString datebook = Global::applicationFileName( "datebook", "datebook.xml"); | 1678 | QString datebook = Global::applicationFileName( "datebook", "datebook.xml"); |
1679 | QString todolist = Global::applicationFileName( "todolist", "todolist.xml"); | 1679 | QString todolist = Global::applicationFileName( "todolist", "todolist.xml"); |
1680 | QString categories = QString( getenv( "HOME" ) ) + "/Settings/Categories.xml"; | 1680 | QString categories = QString( getenv( "HOME" ) ) + "/Settings/Categories.xml"; |
1681 | #else | 1681 | #else |
1682 | QString datebook = QDir::homeDirPath()+ "/Applications/datebook/datebook.xml"; | 1682 | QString datebook = QDir::homeDirPath()+ "/Applications/datebook/datebook.xml"; |
1683 | QString todolist = QDir::homeDirPath()+ "/Applications/todolist/todolist.xml"; | 1683 | QString todolist = QDir::homeDirPath()+ "/Applications/todolist/todolist.xml"; |
1684 | QString categories = QDir::homeDirPath()+ "/Settings/Categories.xml"; | 1684 | QString categories = QDir::homeDirPath()+ "/Settings/Categories.xml"; |
1685 | #endif | 1685 | #endif |
1686 | mView->importQtopia( categories, datebook, todolist ); | 1686 | mView->importQtopia( categories, datebook, todolist ); |
1687 | } | 1687 | } |
1688 | #if 0 | 1688 | #if 0 |
1689 | int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"), | 1689 | int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"), |
1690 | i18n("Not supported \non desktop!\n"), | 1690 | i18n("Not supported \non desktop!\n"), |
1691 | i18n("Ok"), i18n("Cancel"), 0, | 1691 | i18n("Ok"), i18n("Cancel"), 0, |
1692 | 0, 1 ); | 1692 | 0, 1 ); |
1693 | 1693 | ||
1694 | #endif | 1694 | #endif |
1695 | } | 1695 | } |
1696 | 1696 | ||
1697 | void MainWindow::saveOnClose() | 1697 | void MainWindow::saveOnClose() |
1698 | { | 1698 | { |
1699 | KOPrefs *p = KOPrefs::instance(); | 1699 | KOPrefs *p = KOPrefs::instance(); |
1700 | p->mToolBarHor = ( iconToolBar->orientation () == Qt:: Horizontal ); | 1700 | p->mToolBarHor = ( iconToolBar->orientation () == Qt:: Horizontal ); |
1701 | p->mToolBarHorV = ( viewToolBar->orientation () == Qt:: Horizontal ); | 1701 | p->mToolBarHorV = ( viewToolBar->orientation () == Qt:: Horizontal ); |
1702 | p->mToolBarHorN = ( navigatorToolBar->orientation () == Qt:: Horizontal ); | 1702 | p->mToolBarHorN = ( navigatorToolBar->orientation () == Qt:: Horizontal ); |
1703 | if ( filterToolBar ) { | 1703 | if ( filterToolBar ) { |
1704 | p->mToolBarHorF = ( filterToolBar->orientation () == Qt:: Horizontal ); | 1704 | p->mToolBarHorF = ( filterToolBar->orientation () == Qt:: Horizontal ); |
1705 | } | 1705 | } |
1706 | #ifdef DESKTOP_VERSION | 1706 | #ifdef DESKTOP_VERSION |
1707 | 1707 | ||
1708 | QPoint myP; | 1708 | QPoint myP; |
1709 | myP = mapFromGlobal( iconToolBar->mapToGlobal( QPoint( 0,0) ) ); | 1709 | myP = mapFromGlobal( iconToolBar->mapToGlobal( QPoint( 0,0) ) ); |
1710 | if ( p->mToolBarHor ) | 1710 | if ( p->mToolBarHor ) |
1711 | p->mToolBarUp = myP.y() > height()/2; | 1711 | p->mToolBarUp = myP.y() > height()/2; |
1712 | else | 1712 | else |
1713 | p->mToolBarUp = myP.x() > width()/2; | 1713 | p->mToolBarUp = myP.x() > width()/2; |
1714 | myP = mapFromGlobal( viewToolBar->mapToGlobal( QPoint( 0,0) ) ); | 1714 | myP = mapFromGlobal( viewToolBar->mapToGlobal( QPoint( 0,0) ) ); |
1715 | if ( p->mToolBarHorV ) | 1715 | if ( p->mToolBarHorV ) |
1716 | p->mToolBarUpV = myP.y() > height()/2; | 1716 | p->mToolBarUpV = myP.y() > height()/2; |
1717 | else | 1717 | else |
1718 | p->mToolBarUpV = myP.x() > width()/2 ; | 1718 | p->mToolBarUpV = myP.x() > width()/2 ; |
1719 | myP = mapFromGlobal( navigatorToolBar->mapToGlobal( QPoint( 0,0) ) ); | 1719 | myP = mapFromGlobal( navigatorToolBar->mapToGlobal( QPoint( 0,0) ) ); |
1720 | if ( p->mToolBarHorN ) | 1720 | if ( p->mToolBarHorN ) |
1721 | p->mToolBarUpN = myP.y() > height()/2; | 1721 | p->mToolBarUpN = myP.y() > height()/2; |
1722 | else | 1722 | else |
1723 | p->mToolBarUpN = myP.x() > width()/2 ; | 1723 | p->mToolBarUpN = myP.x() > width()/2 ; |
1724 | if ( filterToolBar ) { | 1724 | if ( filterToolBar ) { |
1725 | myP = mapFromGlobal( filterToolBar->mapToGlobal( QPoint( 0,0) ) ); | 1725 | myP = mapFromGlobal( filterToolBar->mapToGlobal( QPoint( 0,0) ) ); |
1726 | if ( p->mToolBarHorF ) | 1726 | if ( p->mToolBarHorF ) |
1727 | p->mToolBarUpF = myP.y() > height()/2; | 1727 | p->mToolBarUpF = myP.y() > height()/2; |
1728 | else | 1728 | else |
1729 | p->mToolBarUpF = myP.x() > width()/2 ; | 1729 | p->mToolBarUpF = myP.x() > width()/2 ; |
1730 | } | 1730 | } |
1731 | #else | 1731 | #else |
1732 | if ( p->mToolBarHor ) | 1732 | if ( p->mToolBarHor ) |
1733 | p->mToolBarUp = iconToolBar->y() > height()/2; | 1733 | p->mToolBarUp = iconToolBar->y() > height()/2; |
1734 | else | 1734 | else |
1735 | p->mToolBarUp = iconToolBar->x() > width()/2; | 1735 | p->mToolBarUp = iconToolBar->x() > width()/2; |
1736 | if ( p->mToolBarHorV ) | 1736 | if ( p->mToolBarHorV ) |
1737 | p->mToolBarUpV = viewToolBar->y() > height()/2; | 1737 | p->mToolBarUpV = viewToolBar->y() > height()/2; |
1738 | else | 1738 | else |
1739 | p->mToolBarUpV = viewToolBar->x() > width()/2 ; | 1739 | p->mToolBarUpV = viewToolBar->x() > width()/2 ; |
1740 | 1740 | ||
1741 | if ( p->mToolBarHorN ) | 1741 | if ( p->mToolBarHorN ) |
1742 | p->mToolBarUpN = navigatorToolBar->y() > height()/2; | 1742 | p->mToolBarUpN = navigatorToolBar->y() > height()/2; |
1743 | else | 1743 | else |
1744 | p->mToolBarUpN = navigatorToolBar->x() > width()/2 ; | 1744 | p->mToolBarUpN = navigatorToolBar->x() > width()/2 ; |
1745 | if ( filterToolBar ) { | 1745 | if ( filterToolBar ) { |
1746 | if ( p->mToolBarHorF ) | 1746 | if ( p->mToolBarHorF ) |
1747 | p->mToolBarUpF = filterToolBar->y() > height()/2; | 1747 | p->mToolBarUpF = filterToolBar->y() > height()/2; |
1748 | else | 1748 | else |
1749 | p->mToolBarUpF = filterToolBar->x() > width()/2 ; | 1749 | p->mToolBarUpF = filterToolBar->x() > width()/2 ; |
1750 | } | 1750 | } |
1751 | #endif | 1751 | #endif |
1752 | 1752 | ||
1753 | 1753 | ||
1754 | mView->writeSettings(); | 1754 | mView->writeSettings(); |
1755 | if ( mCalendarModifiedFlag || mView->checkFileChanged( defaultFileName())) | 1755 | if ( mCalendarModifiedFlag || mView->checkFileChanged( defaultFileName())) |
1756 | save(); | 1756 | save(); |
1757 | } | 1757 | } |
1758 | void MainWindow::slotModifiedChanged( bool changed ) | 1758 | void MainWindow::slotModifiedChanged( bool changed ) |
1759 | { | 1759 | { |
1760 | if ( mBlockAtStartup ) | 1760 | if ( mBlockAtStartup ) |
1761 | return; | 1761 | return; |
1762 | 1762 | ||
1763 | int msec; | 1763 | int msec; |
1764 | // we store the changes after 1 minute, | 1764 | // we store the changes after 1 minute, |
1765 | // and for safety reasons after 10 minutes again | 1765 | // and for safety reasons after 10 minutes again |
1766 | if ( !mSyncManager->blockSave() ) | 1766 | if ( !mSyncManager->blockSave() ) |
1767 | msec = (1000 * 60*KOPrefs::instance()->mAutoSaveInterval) +1000; | 1767 | msec = (1000 * 60*KOPrefs::instance()->mAutoSaveInterval) +1000; |
1768 | else | 1768 | else |
1769 | msec = 1000 * 600; | 1769 | msec = 1000 * 600; |
1770 | mSaveTimer.start( msec, true ); // 1 minute | 1770 | mSaveTimer.start( msec, true ); // 1 minute |
1771 | qDebug("KO: Saving File in %d secs!", msec/1000); | 1771 | qDebug("KO: Saving File in %d secs!", msec/1000); |
1772 | mCalendarModifiedFlag = true; | 1772 | mCalendarModifiedFlag = true; |
1773 | } | 1773 | } |
1774 | void MainWindow::saveStopTimer() | 1774 | void MainWindow::saveStopTimer() |
1775 | { | 1775 | { |
1776 | mSaveTimer.stop(); | 1776 | mSaveTimer.stop(); |
1777 | if (mSaveTimer.isActive() ) | ||
1778 | qDebug("ti active "); | ||
1779 | else | ||
1780 | qDebug("KO: Save timer stopped"); | ||
1781 | } | 1777 | } |
1782 | void MainWindow::save() | 1778 | void MainWindow::save() |
1783 | { | 1779 | { |
1784 | if ( !mCalendarModifiedFlag ) { | 1780 | if ( !mCalendarModifiedFlag ) { |
1785 | qDebug("KO: Calendar not modified. Nothing saved."); | 1781 | qDebug("KO: Calendar not modified. Nothing saved."); |
1786 | return; | 1782 | return; |
1787 | } | 1783 | } |
1788 | if ( mSyncManager->blockSave() ) | 1784 | if ( mSyncManager->blockSave() ) |
1789 | return; | 1785 | return; |
1790 | mSyncManager->setBlockSave(true); | 1786 | mSyncManager->setBlockSave(true); |
1791 | if ( mView->checkFileVersion( defaultFileName()) ) { | 1787 | if ( mView->checkFileVersion( defaultFileName()) ) { |
1792 | QTime neededSaveTime = QDateTime::currentDateTime().time(); | 1788 | QTime neededSaveTime = QDateTime::currentDateTime().time(); |
1793 | setCaption(i18n("KO/Pi:Saving Data to File ..." )); | 1789 | setCaption(i18n("KO/Pi:Saving Data to File ..." )); |
1794 | qDebug("KO: Start saving data to file!"); | 1790 | qDebug("KO: Start saving data to file!"); |
1795 | mView->saveCalendar( defaultFileName() ); | 1791 | mView->saveCalendar( defaultFileName() ); |
1796 | mCalendarModifiedFlag = false; | 1792 | mCalendarModifiedFlag = false; |
1797 | int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() ); | 1793 | int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() ); |
1798 | qDebug("KO: Needed %d ms for saving.",msNeeded ); | 1794 | qDebug("KO: Needed %d ms for saving.",msNeeded ); |
1799 | QString savemes; | 1795 | QString savemes; |
1800 | savemes.sprintf(i18n("KO/Pi:File Saved. Needed %d sec, %d ms"),(msNeeded/1000)%100,msNeeded%1000 ); | 1796 | savemes.sprintf(i18n("KO/Pi:File Saved. Needed %d sec, %d ms"),(msNeeded/1000)%100,msNeeded%1000 ); |
1801 | setCaption(savemes); | 1797 | setCaption(savemes); |
1802 | } else | 1798 | } else |
1803 | setCaption(i18n("Saving cancelled!")); | 1799 | setCaption(i18n("Saving cancelled!")); |
1804 | mSyncManager->setBlockSave( false ); | 1800 | mSyncManager->setBlockSave( false ); |
1805 | } | 1801 | } |
1806 | 1802 | ||
1807 | void MainWindow::keyReleaseEvent ( QKeyEvent * e) | 1803 | void MainWindow::keyReleaseEvent ( QKeyEvent * e) |
1808 | { | 1804 | { |
1809 | if ( !e->isAutoRepeat() ) { | 1805 | if ( !e->isAutoRepeat() ) { |
1810 | mFlagKeyPressed = false; | 1806 | mFlagKeyPressed = false; |
1811 | } | 1807 | } |
1812 | } | 1808 | } |
1813 | void MainWindow::keyPressEvent ( QKeyEvent * e ) | 1809 | void MainWindow::keyPressEvent ( QKeyEvent * e ) |
1814 | { | 1810 | { |
1815 | qApp->processEvents(); | 1811 | qApp->processEvents(); |
1816 | if ( e->isAutoRepeat() && !mFlagKeyPressed ) { | 1812 | if ( e->isAutoRepeat() && !mFlagKeyPressed ) { |
1817 | e->ignore(); | 1813 | e->ignore(); |
1818 | // qDebug(" ignore %d",e->isAutoRepeat() ); | 1814 | // qDebug(" ignore %d",e->isAutoRepeat() ); |
1819 | return; | 1815 | return; |
1820 | } | 1816 | } |
1821 | if (! e->isAutoRepeat() ) | 1817 | if (! e->isAutoRepeat() ) |
1822 | mFlagKeyPressed = true; | 1818 | mFlagKeyPressed = true; |
1823 | KOPrefs *p = KOPrefs::instance(); | 1819 | KOPrefs *p = KOPrefs::instance(); |
1824 | bool showSelectedDates = false; | 1820 | bool showSelectedDates = false; |
1825 | int size; | 1821 | int size; |
1826 | int pro = 0; | 1822 | int pro = 0; |
1827 | //qDebug("MainWindow::keyPressEvent "); | 1823 | //qDebug("MainWindow::keyPressEvent "); |
1828 | switch ( e->key() ) { | 1824 | switch ( e->key() ) { |
1829 | case Qt::Key_Right: | 1825 | case Qt::Key_Right: |
1830 | if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton) | 1826 | if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton) |
1831 | mView->goNextMonth(); | 1827 | mView->goNextMonth(); |
1832 | else | 1828 | else |
1833 | mView->goNext(); | 1829 | mView->goNext(); |
1834 | showSelectedDates = true; | 1830 | showSelectedDates = true; |
1835 | break; | 1831 | break; |
1836 | case Qt::Key_Left: | 1832 | case Qt::Key_Left: |
1837 | if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton ) | 1833 | if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton ) |
1838 | mView->goPreviousMonth(); | 1834 | mView->goPreviousMonth(); |
1839 | else | 1835 | else |
1840 | mView->goPrevious(); | 1836 | mView->goPrevious(); |
1841 | showSelectedDates = true; | 1837 | showSelectedDates = true; |
1842 | break; | 1838 | break; |
1843 | case Qt::Key_Down: | 1839 | case Qt::Key_Down: |
1844 | mView->viewManager()->agendaView()->scrollOneHourDown(); | 1840 | mView->viewManager()->agendaView()->scrollOneHourDown(); |
1845 | break; | 1841 | break; |
1846 | case Qt::Key_Up: | 1842 | case Qt::Key_Up: |
1847 | mView->viewManager()->agendaView()->scrollOneHourUp(); | 1843 | mView->viewManager()->agendaView()->scrollOneHourUp(); |
1848 | break; | 1844 | break; |
1849 | case Qt::Key_K: | 1845 | case Qt::Key_K: |
1850 | mView->viewManager()->showMonthViewWeek(); | 1846 | mView->viewManager()->showMonthViewWeek(); |
1851 | break; | 1847 | break; |
1852 | case Qt::Key_I: | 1848 | case Qt::Key_I: |
1853 | mView->showIncidence(); | 1849 | mView->showIncidence(); |
1854 | break; | 1850 | break; |
1855 | case Qt::Key_Delete: | 1851 | case Qt::Key_Delete: |
1856 | case Qt::Key_Backspace: | 1852 | case Qt::Key_Backspace: |
1857 | mView->deleteIncidence(); | 1853 | mView->deleteIncidence(); |
1858 | break; | 1854 | break; |
1859 | case Qt::Key_D: | 1855 | case Qt::Key_D: |
1860 | mView->viewManager()->showDayView(); | 1856 | mView->viewManager()->showDayView(); |
1861 | showSelectedDates = true; | 1857 | showSelectedDates = true; |
1862 | break; | 1858 | break; |
1863 | case Qt::Key_O: | 1859 | case Qt::Key_O: |
1864 | mView->toggleFilerEnabled( ); | 1860 | mView->toggleFilerEnabled( ); |
1865 | break; | 1861 | break; |
1866 | case Qt::Key_0: | 1862 | case Qt::Key_0: |
1867 | case Qt::Key_1: | 1863 | case Qt::Key_1: |
1868 | case Qt::Key_2: | 1864 | case Qt::Key_2: |
1869 | case Qt::Key_3: | 1865 | case Qt::Key_3: |
1870 | case Qt::Key_4: | 1866 | case Qt::Key_4: |
1871 | case Qt::Key_5: | 1867 | case Qt::Key_5: |
1872 | case Qt::Key_6: | 1868 | case Qt::Key_6: |
1873 | case Qt::Key_7: | 1869 | case Qt::Key_7: |
1874 | case Qt::Key_8: | 1870 | case Qt::Key_8: |
1875 | case Qt::Key_9: | 1871 | case Qt::Key_9: |
1876 | pro = e->key()-48; | 1872 | pro = e->key()-48; |
1877 | if ( pro == 0 ) | 1873 | if ( pro == 0 ) |
1878 | pro = 10; | 1874 | pro = 10; |
1879 | if ( e->state() == Qt::ControlButton) | 1875 | if ( e->state() == Qt::ControlButton) |
1880 | pro += 10; | 1876 | pro += 10; |
1881 | break; | 1877 | break; |
1882 | case Qt::Key_M: | 1878 | case Qt::Key_M: |
1883 | mView->viewManager()->showMonthView(); | 1879 | mView->viewManager()->showMonthView(); |
1884 | showSelectedDates = true; | 1880 | showSelectedDates = true; |
1885 | break; | 1881 | break; |
1886 | case Qt::Key_Insert: | 1882 | case Qt::Key_Insert: |
1887 | mView->newEvent(); | 1883 | mView->newEvent(); |
1888 | break; | 1884 | break; |
1889 | case Qt::Key_S : | 1885 | case Qt::Key_S : |
1890 | if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton) | 1886 | if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton) |
1891 | mView->newSubTodo(); | 1887 | mView->newSubTodo(); |
1892 | else | 1888 | else |
1893 | mView->dialogManager()->showSearchDialog(); | 1889 | mView->dialogManager()->showSearchDialog(); |
1894 | break; | 1890 | break; |
1895 | case Qt::Key_Y : | 1891 | case Qt::Key_Y : |
1896 | case Qt::Key_Z : | 1892 | case Qt::Key_Z : |
1897 | mView->viewManager()->showWorkWeekView(); | 1893 | mView->viewManager()->showWorkWeekView(); |
1898 | showSelectedDates = true; | 1894 | showSelectedDates = true; |
1899 | break; | 1895 | break; |
1900 | case Qt::Key_U : | 1896 | case Qt::Key_U : |
1901 | mView->viewManager()->showWeekView(); | 1897 | mView->viewManager()->showWeekView(); |
1902 | showSelectedDates = true; | 1898 | showSelectedDates = true; |
1903 | break; | 1899 | break; |
1904 | case Qt::Key_H : | 1900 | case Qt::Key_H : |
1905 | keyBindings(); | 1901 | keyBindings(); |
1906 | break; | 1902 | break; |
1907 | case Qt::Key_W: | 1903 | case Qt::Key_W: |
1908 | mView->viewManager()->showWhatsNextView(); | 1904 | mView->viewManager()->showWhatsNextView(); |
1909 | break; | 1905 | break; |
1910 | case Qt::Key_L: | 1906 | case Qt::Key_L: |
1911 | mView->viewManager()->showListView(); | 1907 | mView->viewManager()->showListView(); |
1912 | break; | 1908 | break; |
1913 | case Qt::Key_N: | 1909 | case Qt::Key_N: |
1914 | mView->viewManager()->showNextView(); | 1910 | mView->viewManager()->showNextView(); |
1915 | break; | 1911 | break; |
1916 | case Qt::Key_V: | 1912 | case Qt::Key_V: |
1917 | mView->viewManager()->showTodoView(); | 1913 | mView->viewManager()->showTodoView(); |
1918 | break; | 1914 | break; |
1919 | case Qt::Key_C: | 1915 | case Qt::Key_C: |
1920 | mView->viewManager()->agendaView()->setStartHour( QTime::currentTime ().hour() ); | 1916 | mView->viewManager()->agendaView()->setStartHour( QTime::currentTime ().hour() ); |
1921 | break; | 1917 | break; |
1922 | case Qt::Key_P: | 1918 | case Qt::Key_P: |
1923 | mView->showDatePicker( ); | 1919 | mView->showDatePicker( ); |
1924 | break; | 1920 | break; |
1925 | case Qt::Key_F: | 1921 | case Qt::Key_F: |
1926 | if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton ) | 1922 | if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton ) |
1927 | mView->editFilters(); | 1923 | mView->editFilters(); |
1928 | else | 1924 | else |
1929 | mView->toggleFilter(); | 1925 | mView->toggleFilter(); |
1930 | break; | 1926 | break; |
1931 | case Qt::Key_X: | 1927 | case Qt::Key_X: |
1932 | if ( e->state() == Qt::ControlButton ) | 1928 | if ( e->state() == Qt::ControlButton ) |
1933 | mView->toggleDateNavigatorWidget(); | 1929 | mView->toggleDateNavigatorWidget(); |
1934 | else { | 1930 | else { |
1935 | mView->viewManager()->showNextXView(); | 1931 | mView->viewManager()->showNextXView(); |
1936 | showSelectedDates = true; | 1932 | showSelectedDates = true; |
1937 | } | 1933 | } |
1938 | break; | 1934 | break; |
1939 | case Qt::Key_Space: | 1935 | case Qt::Key_Space: |
1940 | mView->toggleExpand(); | 1936 | mView->toggleExpand(); |
1941 | break; | 1937 | break; |
1942 | case Qt::Key_A: | 1938 | case Qt::Key_A: |
1943 | if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton ) | 1939 | if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton ) |
1944 | mView->showNextAlarms(); | 1940 | mView->showNextAlarms(); |
1945 | else | 1941 | else |
1946 | mView->toggleAllDaySize(); | 1942 | mView->toggleAllDaySize(); |
1947 | break; | 1943 | break; |
1948 | case Qt::Key_T: | 1944 | case Qt::Key_T: |
1949 | if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton ) | 1945 | if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton ) |
1950 | mView->newTodo(); | 1946 | mView->newTodo(); |
1951 | else { | 1947 | else { |
1952 | mView->goToday(); | 1948 | mView->goToday(); |
1953 | showSelectedDates = true; | 1949 | showSelectedDates = true; |
1954 | } | 1950 | } |
1955 | break; | 1951 | break; |
1956 | case Qt::Key_J: | 1952 | case Qt::Key_J: |
1957 | mView->viewManager()->showJournalView(); | 1953 | mView->viewManager()->showJournalView(); |
1958 | break; | 1954 | break; |
1959 | case Qt::Key_B: | 1955 | case Qt::Key_B: |
1960 | mView->editIncidenceDescription();; | 1956 | mView->editIncidenceDescription();; |
1961 | break; | 1957 | break; |
1962 | // case Qt::Key_Return: | 1958 | // case Qt::Key_Return: |
1963 | case Qt::Key_E: | 1959 | case Qt::Key_E: |
1964 | if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton ) | 1960 | if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton ) |
1965 | mView->newEvent(); | 1961 | mView->newEvent(); |
1966 | else | 1962 | else |
1967 | mView->editIncidence(); | 1963 | mView->editIncidence(); |
1968 | break; | 1964 | break; |
1969 | case Qt::Key_Plus: | 1965 | case Qt::Key_Plus: |
1970 | size = p->mHourSize +2; | 1966 | size = p->mHourSize +2; |
1971 | if ( size <= 22 ) | 1967 | if ( size <= 22 ) |
1972 | configureAgenda( size ); | 1968 | configureAgenda( size ); |
diff --git a/microkde/kglobalsettings.cpp b/microkde/kglobalsettings.cpp index b6d2feb..b837b23 100644 --- a/microkde/kglobalsettings.cpp +++ b/microkde/kglobalsettings.cpp | |||
@@ -1,50 +1,66 @@ | |||
1 | #include "kglobalsettings.h" | 1 | #include "kglobalsettings.h" |
2 | #include "kconfig.h" | 2 | #include "kconfig.h" |
3 | #include "kglobal.h" | 3 | #include "kglobal.h" |
4 | #include "kconfigbase.h" | 4 | #include "kconfigbase.h" |
5 | 5 | ||
6 | #include <qapplication.h> | 6 | #include <qapplication.h> |
7 | 7 | ||
8 | QFont KGlobalSettings::generalFont() | 8 | QFont KGlobalSettings::generalFont() |
9 | { | 9 | { |
10 | int size = 12; | 10 | int size = 12; |
11 | if (QApplication::desktop()->width() < 480 ) { | 11 | if (QApplication::desktop()->width() < 480 ) { |
12 | size = 10; | 12 | size = 10; |
13 | } | 13 | } |
14 | #ifndef DESKTOP_VERSION | 14 | #ifndef DESKTOP_VERSION |
15 | else | 15 | else |
16 | if (QApplication::desktop()->width() >= 480 && QApplication::desktop()->width() <= 640 ) | 16 | if (QApplication::desktop()->width() >= 480 && QApplication::desktop()->width() <= 640 ) |
17 | size = 18; | 17 | size = 18; |
18 | #endif | 18 | #endif |
19 | QFont f = QApplication::font(); | 19 | QFont f = QApplication::font(); |
20 | //qDebug("pointsize %d %s", f.pointSize(),f.family().latin1()); | 20 | //qDebug("pointsize %d %s", f.pointSize(),f.family().latin1()); |
21 | f.setPointSize( size ); | 21 | f.setPointSize( size ); |
22 | return f; | 22 | return f; |
23 | } | 23 | } |
24 | QFont KGlobalSettings::generalMaxFont() | ||
25 | { | ||
26 | int size = 12; | ||
27 | if (QApplication::desktop()->width() < 480 ) { | ||
28 | size = 10; | ||
29 | } | ||
30 | #ifndef DESKTOP_VERSION | ||
31 | else | ||
32 | if (QApplication::desktop()->width() >= 480 && QApplication::desktop()->width() <= 640 ) | ||
33 | size = 18; | ||
34 | #endif | ||
35 | QFont f = QApplication::font(); | ||
36 | if ( f.pointSize() > size ) | ||
37 | f.setPointSize( size ); | ||
38 | return f; | ||
39 | } | ||
24 | QFont KGlobalSettings::toolBarFont() | 40 | QFont KGlobalSettings::toolBarFont() |
25 | { | 41 | { |
26 | return QApplication::font(); | 42 | return QApplication::font(); |
27 | } | 43 | } |
28 | 44 | ||
29 | QColor KGlobalSettings::toolBarHighlightColor() | 45 | QColor KGlobalSettings::toolBarHighlightColor() |
30 | { | 46 | { |
31 | return QColor( "black" ); | 47 | return QColor( "black" ); |
32 | } | 48 | } |
33 | 49 | ||
34 | QRect KGlobalSettings::desktopGeometry( QWidget * ) | 50 | QRect KGlobalSettings::desktopGeometry( QWidget * ) |
35 | { | 51 | { |
36 | return QApplication::desktop()->rect(); | 52 | return QApplication::desktop()->rect(); |
37 | } | 53 | } |
38 | 54 | ||
39 | /** | 55 | /** |
40 | * Returns whether KDE runs in single (default) or double click | 56 | * Returns whether KDE runs in single (default) or double click |
41 | * mode. | 57 | * mode. |
42 | * see http://developer.kde.org/documentation/standards/kde/style/mouse/index.html | 58 | * see http://developer.kde.org/documentation/standards/kde/style/mouse/index.html |
43 | * @return true if single click mode, or false if double click mode. | 59 | * @return true if single click mode, or false if double click mode. |
44 | **/ | 60 | **/ |
45 | bool KGlobalSettings::singleClick() | 61 | bool KGlobalSettings::singleClick() |
46 | { | 62 | { |
47 | KConfig *c = KGlobal::config(); | 63 | KConfig *c = KGlobal::config(); |
48 | KConfigGroupSaver cgs( c, "KDE" ); | 64 | KConfigGroupSaver cgs( c, "KDE" ); |
49 | return c->readBoolEntry("SingleClick", KDE_DEFAULT_SINGLECLICK); | 65 | return c->readBoolEntry("SingleClick", KDE_DEFAULT_SINGLECLICK); |
50 | } | 66 | } |
diff --git a/microkde/kglobalsettings.h b/microkde/kglobalsettings.h index 7df8012..075bb1c 100644 --- a/microkde/kglobalsettings.h +++ b/microkde/kglobalsettings.h | |||
@@ -1,30 +1,31 @@ | |||
1 | #ifndef MICROKDE_KGLOBALSETTINGS_H | 1 | #ifndef MICROKDE_KGLOBALSETTINGS_H |
2 | #define MICROKDE_KGLOBALSETTINGS_H | 2 | #define MICROKDE_KGLOBALSETTINGS_H |
3 | 3 | ||
4 | #include <qfont.h> | 4 | #include <qfont.h> |
5 | #include <qrect.h> | 5 | #include <qrect.h> |
6 | 6 | ||
7 | 7 | ||
8 | #define KDE_DEFAULT_SINGLECLICK true | 8 | #define KDE_DEFAULT_SINGLECLICK true |
9 | 9 | ||
10 | 10 | ||
11 | class KGlobalSettings | 11 | class KGlobalSettings |
12 | { | 12 | { |
13 | public: | 13 | public: |
14 | static QFont generalFont(); | 14 | static QFont generalFont(); |
15 | static QFont generalMaxFont(); | ||
15 | static QFont toolBarFont(); | 16 | static QFont toolBarFont(); |
16 | 17 | ||
17 | static QColor toolBarHighlightColor(); | 18 | static QColor toolBarHighlightColor(); |
18 | static QRect desktopGeometry( QWidget * ); | 19 | static QRect desktopGeometry( QWidget * ); |
19 | 20 | ||
20 | /** | 21 | /** |
21 | * Returns whether KDE runs in single (default) or double click | 22 | * Returns whether KDE runs in single (default) or double click |
22 | * mode. | 23 | * mode. |
23 | * see http://developer.kde.org/documentation/standards/kde/style/mouse/index.html | 24 | * see http://developer.kde.org/documentation/standards/kde/style/mouse/index.html |
24 | * @return true if single click mode, or false if double click mode. | 25 | * @return true if single click mode, or false if double click mode. |
25 | **/ | 26 | **/ |
26 | static bool singleClick(); | 27 | static bool singleClick(); |
27 | 28 | ||
28 | }; | 29 | }; |
29 | 30 | ||
30 | #endif | 31 | #endif |
diff --git a/microkde/kutils/kcmultidialog.cpp b/microkde/kutils/kcmultidialog.cpp index bb41b18..9c87682 100644 --- a/microkde/kutils/kcmultidialog.cpp +++ b/microkde/kutils/kcmultidialog.cpp | |||
@@ -1,229 +1,229 @@ | |||
1 | /* | 1 | /* |
2 | Copyright (c) 2000 Matthias Elter <elter@kde.org> | 2 | Copyright (c) 2000 Matthias Elter <elter@kde.org> |
3 | Copyright (c) 2003 Daniel Molkentin <molkentin@kde.org> | 3 | Copyright (c) 2003 Daniel Molkentin <molkentin@kde.org> |
4 | 4 | ||
5 | This library is free software; you can redistribute it and/or | 5 | This library is free software; you can redistribute it and/or |
6 | modify it under the terms of the GNU Library General Public | 6 | modify it under the terms of the GNU Library General Public |
7 | License as published by the Free Software Foundation; either | 7 | License as published by the Free Software Foundation; either |
8 | version 2 of the License, or (at your option) any later version. | 8 | version 2 of the License, or (at your option) any later version. |
9 | 9 | ||
10 | This library is distributed in the hope that it will be useful, | 10 | This library 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 GNU | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
13 | Library General Public License for more details. | 13 | Library General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU Library General Public License | 15 | You should have received a copy of the GNU Library General Public License |
16 | along with this library; see the file COPYING.LIB. If not, write to | 16 | along with this library; see the file COPYING.LIB. If not, write to |
17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | 19 | ||
20 | */ | 20 | */ |
21 | 21 | ||
22 | #include <qhbox.h> | 22 | #include <qhbox.h> |
23 | #include <qvbox.h> | 23 | #include <qvbox.h> |
24 | #include <qcursor.h> | 24 | #include <qcursor.h> |
25 | #include <qlayout.h> | 25 | #include <qlayout.h> |
26 | 26 | ||
27 | #include <klocale.h> | 27 | #include <klocale.h> |
28 | #include <kglobal.h> | 28 | #include <kglobal.h> |
29 | #include <kdebug.h> | 29 | #include <kdebug.h> |
30 | #include <kiconloader.h> | 30 | #include <kiconloader.h> |
31 | #include <kmessagebox.h> | 31 | #include <kmessagebox.h> |
32 | //US #include <klibloader.h> | 32 | //US #include <klibloader.h> |
33 | #include <krun.h> | 33 | #include <krun.h> |
34 | #include <kprocess.h> | 34 | #include <kprocess.h> |
35 | #include <kglobalsettings.h> | 35 | #include <kglobalsettings.h> |
36 | 36 | ||
37 | #include "kcmultidialog.h" | 37 | #include "kcmultidialog.h" |
38 | //US #include "kcmultidialog.moc" | 38 | //US #include "kcmultidialog.moc" |
39 | //US #include "kcmoduleloader.h" | 39 | //US #include "kcmoduleloader.h" |
40 | 40 | ||
41 | KCMultiDialog::KCMultiDialog(const QString& baseGroup, QWidget *parent, const char *name, bool modal) | 41 | KCMultiDialog::KCMultiDialog(const QString& baseGroup, QWidget *parent, const char *name, bool modal) |
42 | : KDialogBase(IconList, i18n("Configure"), Default |Cancel | Apply | Ok, Ok, | 42 | : KDialogBase(IconList, i18n("Configure"), Default |Cancel | Apply | Ok, Ok, |
43 | parent, name, modal, true), d(0L) | 43 | parent, name, modal, true), d(0L) |
44 | { | 44 | { |
45 | setFont( KGlobalSettings::generalFont() ); | 45 | setFont( KGlobalSettings::generalMaxFont() ); |
46 | enableButton(Apply, false); | 46 | enableButton(Apply, false); |
47 | //connect(this, SIGNAL(aboutToShowPage(QWidget *)), this, SLOT(slotAboutToShow(QWidget *))); | 47 | //connect(this, SIGNAL(aboutToShowPage(QWidget *)), this, SLOT(slotAboutToShow(QWidget *))); |
48 | 48 | ||
49 | connect( this, SIGNAL( defaultClicked() ), SLOT( slotDefault() ) ); | 49 | connect( this, SIGNAL( defaultClicked() ), SLOT( slotDefault() ) ); |
50 | 50 | ||
51 | _baseGroup = baseGroup; | 51 | _baseGroup = baseGroup; |
52 | mMainWidget = new KJanusWidget( this, "JanusWidget", KJanusWidget::Tabbed ); | 52 | mMainWidget = new KJanusWidget( this, "JanusWidget", KJanusWidget::Tabbed ); |
53 | setMainWidget(mMainWidget ); | 53 | setMainWidget(mMainWidget ); |
54 | #ifdef DESKTOP_VERSION | 54 | #ifdef DESKTOP_VERSION |
55 | resize(640,480); | 55 | resize(640,480); |
56 | #else | 56 | #else |
57 | //resize(640,480); | 57 | //resize(640,480); |
58 | //setMaximumSize( KMIN(KGlobal::getDesktopWidth()-5, 640), KMIN(KGlobal::getDesktopHeight()-20, 480)); | 58 | //setMaximumSize( KMIN(KGlobal::getDesktopWidth()-5, 640), KMIN(KGlobal::getDesktopHeight()-20, 480)); |
59 | resize(800,800); | 59 | resize(800,800); |
60 | setMaximumSize( 800, 800 ); | 60 | setMaximumSize( 800, 800 ); |
61 | //showMaximized(); | 61 | //showMaximized(); |
62 | #endif | 62 | #endif |
63 | 63 | ||
64 | } | 64 | } |
65 | 65 | ||
66 | KCMultiDialog::~KCMultiDialog() | 66 | KCMultiDialog::~KCMultiDialog() |
67 | { | 67 | { |
68 | //US moduleDict.setAutoDelete(true); | 68 | //US moduleDict.setAutoDelete(true); |
69 | } | 69 | } |
70 | 70 | ||
71 | void KCMultiDialog::slotDefault() | 71 | void KCMultiDialog::slotDefault() |
72 | { | 72 | { |
73 | 73 | ||
74 | int curPageIndex = activePageIndex(); | 74 | int curPageIndex = activePageIndex(); |
75 | 75 | ||
76 | QPtrListIterator<KCModule> it(modules); | 76 | QPtrListIterator<KCModule> it(modules); |
77 | for (; it.current(); ++it) | 77 | for (; it.current(); ++it) |
78 | { | 78 | { |
79 | if (pageIndex((QWidget *)(*it)->parent()) == curPageIndex) | 79 | if (pageIndex((QWidget *)(*it)->parent()) == curPageIndex) |
80 | { | 80 | { |
81 | (*it)->defaults(); | 81 | (*it)->defaults(); |
82 | clientChanged(true); | 82 | clientChanged(true); |
83 | return; | 83 | return; |
84 | } | 84 | } |
85 | } | 85 | } |
86 | 86 | ||
87 | } | 87 | } |
88 | void KCMultiDialog::accept() | 88 | void KCMultiDialog::accept() |
89 | { | 89 | { |
90 | slotOk(); | 90 | slotOk(); |
91 | } | 91 | } |
92 | void KCMultiDialog::slotApply() | 92 | void KCMultiDialog::slotApply() |
93 | { | 93 | { |
94 | QPtrListIterator<KCModule> it(modules); | 94 | QPtrListIterator<KCModule> it(modules); |
95 | for (; it.current(); ++it) | 95 | for (; it.current(); ++it) |
96 | (*it)->save(); | 96 | (*it)->save(); |
97 | clientChanged(false); | 97 | clientChanged(false); |
98 | 98 | ||
99 | emit applyClicked(); | 99 | emit applyClicked(); |
100 | 100 | ||
101 | } | 101 | } |
102 | 102 | ||
103 | 103 | ||
104 | void KCMultiDialog::slotOk() | 104 | void KCMultiDialog::slotOk() |
105 | { | 105 | { |
106 | qDebug("KCMultiDialog::slotOk clicked"); | 106 | qDebug("KCMultiDialog::slotOk clicked"); |
107 | 107 | ||
108 | QPtrListIterator<KCModule> it(modules); | 108 | QPtrListIterator<KCModule> it(modules); |
109 | for (; it.current(); ++it) | 109 | for (; it.current(); ++it) |
110 | (*it)->save(); | 110 | (*it)->save(); |
111 | QDialog::accept(); | 111 | QDialog::accept(); |
112 | 112 | ||
113 | emit okClicked(); | 113 | emit okClicked(); |
114 | } | 114 | } |
115 | 115 | ||
116 | void KCMultiDialog::slotHelp() | 116 | void KCMultiDialog::slotHelp() |
117 | { | 117 | { |
118 | /*US | 118 | /*US |
119 | KURL url( KURL("help:/"), _docPath ); | 119 | KURL url( KURL("help:/"), _docPath ); |
120 | 120 | ||
121 | if (url.protocol() == "help" || url.protocol() == "man" || url.protocol() == "info") { | 121 | if (url.protocol() == "help" || url.protocol() == "man" || url.protocol() == "info") { |
122 | KProcess process; | 122 | KProcess process; |
123 | process << "khelpcenter" | 123 | process << "khelpcenter" |
124 | << url.url(); | 124 | << url.url(); |
125 | process.start(KProcess::DontCare); | 125 | process.start(KProcess::DontCare); |
126 | process.detach(); | 126 | process.detach(); |
127 | } else { | 127 | } else { |
128 | new KRun(url); | 128 | new KRun(url); |
129 | } | 129 | } |
130 | */ | 130 | */ |
131 | } | 131 | } |
132 | 132 | ||
133 | void KCMultiDialog::clientChanged(bool state) | 133 | void KCMultiDialog::clientChanged(bool state) |
134 | { | 134 | { |
135 | enableButton(Apply, state); | 135 | enableButton(Apply, state); |
136 | } | 136 | } |
137 | 137 | ||
138 | /*US | 138 | /*US |
139 | void KCMultiDialog::addModule(const QString& path, bool withfallback) | 139 | void KCMultiDialog::addModule(const QString& path, bool withfallback) |
140 | { | 140 | { |
141 | kdDebug(1208) << "KCMultiDialog::addModule " << path << endl; | 141 | kdDebug(1208) << "KCMultiDialog::addModule " << path << endl; |
142 | 142 | ||
143 | KCModuleInfo info(path, _baseGroup); | 143 | KCModuleInfo info(path, _baseGroup); |
144 | 144 | ||
145 | QHBox* page = addHBoxPage(info.moduleName(), info.comment(), | 145 | QHBox* page = addHBoxPage(info.moduleName(), info.comment(), |
146 | KGlobal::iconLoader()->loadIcon(info.icon(), KIcon::Desktop, KIcon::SizeMedium)); | 146 | KGlobal::iconLoader()->loadIcon(info.icon(), KIcon::Desktop, KIcon::SizeMedium)); |
147 | if(!page) { | 147 | if(!page) { |
148 | KCModuleLoader::unloadModule(info); | 148 | KCModuleLoader::unloadModule(info); |
149 | return; | 149 | return; |
150 | } | 150 | } |
151 | moduleDict.insert(page, new LoadInfo(path, withfallback)); | 151 | moduleDict.insert(page, new LoadInfo(path, withfallback)); |
152 | if (modules.isEmpty()) | 152 | if (modules.isEmpty()) |
153 | slotAboutToShow(page); | 153 | slotAboutToShow(page); |
154 | } | 154 | } |
155 | */ | 155 | */ |
156 | QVBox * KCMultiDialog::getNewVBoxPage( const QString & modulename ) | 156 | QVBox * KCMultiDialog::getNewVBoxPage( const QString & modulename ) |
157 | { | 157 | { |
158 | QVBox *page = mMainWidget->addVBoxPage(modulename , QString::null,QPixmap() ); | 158 | QVBox *page = mMainWidget->addVBoxPage(modulename , QString::null,QPixmap() ); |
159 | return page; | 159 | return page; |
160 | 160 | ||
161 | } | 161 | } |
162 | //US special method for microkde. We dop noty want to load everything dynamically. | 162 | //US special method for microkde. We dop noty want to load everything dynamically. |
163 | void KCMultiDialog::addModule(KCModule* module ) //, const QString& modulename, const QString& iconname) | 163 | void KCMultiDialog::addModule(KCModule* module ) //, const QString& modulename, const QString& iconname) |
164 | { | 164 | { |
165 | 165 | ||
166 | modules.append(module); | 166 | modules.append(module); |
167 | connect(module, SIGNAL(changed(bool)), this, SLOT(clientChanged(bool))); | 167 | connect(module, SIGNAL(changed(bool)), this, SLOT(clientChanged(bool))); |
168 | //US | 168 | //US |
169 | module->load(); | 169 | module->load(); |
170 | 170 | ||
171 | 171 | ||
172 | } | 172 | } |
173 | 173 | ||
174 | void KCMultiDialog::slotAboutToShow(QWidget *page) | 174 | void KCMultiDialog::slotAboutToShow(QWidget *page) |
175 | { | 175 | { |
176 | /*US | 176 | /*US |
177 | LoadInfo *loadInfo = moduleDict[page]; | 177 | LoadInfo *loadInfo = moduleDict[page]; |
178 | if (!loadInfo) | 178 | if (!loadInfo) |
179 | return; | 179 | return; |
180 | 180 | ||
181 | QApplication::setOverrideCursor(Qt::WaitCursor); | 181 | QApplication::setOverrideCursor(Qt::WaitCursor); |
182 | 182 | ||
183 | moduleDict.remove(page); | 183 | moduleDict.remove(page); |
184 | 184 | ||
185 | KCModuleInfo info(loadInfo->path, _baseGroup); | 185 | KCModuleInfo info(loadInfo->path, _baseGroup); |
186 | 186 | ||
187 | KCModule *module = KCModuleLoader::loadModule(info, loadInfo->withfallback); | 187 | KCModule *module = KCModuleLoader::loadModule(info, loadInfo->withfallback); |
188 | 188 | ||
189 | if (!module) | 189 | if (!module) |
190 | { | 190 | { |
191 | QApplication::restoreOverrideCursor(); | 191 | QApplication::restoreOverrideCursor(); |
192 | KCModuleLoader::showLastLoaderError(this); | 192 | KCModuleLoader::showLastLoaderError(this); |
193 | delete loadInfo; | 193 | delete loadInfo; |
194 | return; | 194 | return; |
195 | } | 195 | } |
196 | 196 | ||
197 | module->reparent(page,0,QPoint(0,0),true); | 197 | module->reparent(page,0,QPoint(0,0),true); |
198 | connect(module, SIGNAL(changed(bool)), this, SLOT(clientChanged(bool))); | 198 | connect(module, SIGNAL(changed(bool)), this, SLOT(clientChanged(bool))); |
199 | //setHelp( docpath, QString::null ); | 199 | //setHelp( docpath, QString::null ); |
200 | _docPath = info.docPath(); | 200 | _docPath = info.docPath(); |
201 | modules.append(module); | 201 | modules.append(module); |
202 | 202 | ||
203 | //KCGlobal::repairAccels( topLevelWidget() ); | 203 | //KCGlobal::repairAccels( topLevelWidget() ); |
204 | 204 | ||
205 | delete loadInfo; | 205 | delete loadInfo; |
206 | 206 | ||
207 | QApplication::restoreOverrideCursor(); | 207 | QApplication::restoreOverrideCursor(); |
208 | */ | 208 | */ |
209 | 209 | ||
210 | qDebug("KCMultiDialog::slotAboutToShow not implemented"); | 210 | qDebug("KCMultiDialog::slotAboutToShow not implemented"); |
211 | } | 211 | } |
212 | 212 | ||
213 | 213 | ||
214 | bool KCMultiDialog::showPage( int index ) | 214 | bool KCMultiDialog::showPage( int index ) |
215 | { | 215 | { |
216 | return(mMainWidget->showPage(index) ); | 216 | return(mMainWidget->showPage(index) ); |
217 | } | 217 | } |
218 | 218 | ||
219 | 219 | ||
220 | int KCMultiDialog::activePageIndex() const | 220 | int KCMultiDialog::activePageIndex() const |
221 | { | 221 | { |
222 | return( mMainWidget->activePageIndex() ); | 222 | return( mMainWidget->activePageIndex() ); |
223 | } | 223 | } |
224 | 224 | ||
225 | 225 | ||
226 | int KCMultiDialog::pageIndex( QWidget *widget ) const | 226 | int KCMultiDialog::pageIndex( QWidget *widget ) const |
227 | { | 227 | { |
228 | return( mMainWidget->pageIndex( widget) ); | 228 | return( mMainWidget->pageIndex( widget) ); |
229 | } | 229 | } |