-rw-r--r-- | korganizer/koagendaitem.cpp | 8 | ||||
-rw-r--r-- | korganizer/kodaymatrix.cpp | 2 | ||||
-rw-r--r-- | korganizer/kolistview.cpp | 8 | ||||
-rw-r--r-- | korganizer/kolistview.h | 3 | ||||
-rw-r--r-- | korganizer/komonthview.cpp | 6 | ||||
-rw-r--r-- | korganizer/kotodoview.cpp | 8 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 6 | ||||
-rw-r--r-- | korganizer/mainwindow.h | 1 |
8 files changed, 35 insertions, 7 deletions
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp index 1801d7e..df2e478 100644 --- a/korganizer/koagendaitem.cpp +++ b/korganizer/koagendaitem.cpp | |||
@@ -152,14 +152,18 @@ void KOAgendaItem::init ( Incidence *incidence, QDate qd ) | |||
152 | yPaintCoord = -1; | 152 | yPaintCoord = -1; |
153 | } | 153 | } |
154 | 154 | ||
155 | 155 | ||
156 | KOAgendaItem::~KOAgendaItem() | 156 | KOAgendaItem::~KOAgendaItem() |
157 | { | 157 | { |
158 | // qDebug("deleteKOAgendaItem::~KOAgendaItem( "); | 158 | #if QT_VERSION >= 0x030000 |
159 | // delete mKOAgendaItemWhatsThis; | 159 | |
160 | #else | ||
161 | delete mKOAgendaItemWhatsThis; | ||
162 | #endif | ||
163 | |||
160 | } | 164 | } |
161 | 165 | ||
162 | void KOAgendaItem::recreateIncidence() | 166 | void KOAgendaItem::recreateIncidence() |
163 | { | 167 | { |
164 | #if 0 | 168 | #if 0 |
165 | Incidence* newInc = mIncidence->clone(); | 169 | Incidence* newInc = mIncidence->clone(); |
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index c32a2a4..53ebdb2 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp | |||
@@ -60,13 +60,13 @@ DynamicTip::DynamicTip( QWidget * parent ) | |||
60 | } | 60 | } |
61 | 61 | ||
62 | class KODaymatrixWhatsThis :public QWhatsThis | 62 | class KODaymatrixWhatsThis :public QWhatsThis |
63 | { | 63 | { |
64 | public: | 64 | public: |
65 | KODaymatrixWhatsThis( KODayMatrix* view ) : QWhatsThis( view ),_view (view) { ;}; | 65 | KODaymatrixWhatsThis( KODayMatrix* view ) : QWhatsThis( view ),_view (view) { ;}; |
66 | ~KODaymatrixWhatsThis() { qDebug("DELETE KODaymatrixWhatsThis "); }; | 66 | ~KODaymatrixWhatsThis() { ; }; |
67 | 67 | ||
68 | protected: | 68 | protected: |
69 | virtual QString text( const QPoint& p ) | 69 | virtual QString text( const QPoint& p ) |
70 | { | 70 | { |
71 | return _view->getWhatsThisText( p ) ; | 71 | return _view->getWhatsThisText( p ) ; |
72 | } | 72 | } |
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index fd86095..b94916a 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp | |||
@@ -258,13 +258,13 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent, | |||
258 | mListView->setColumnAlignment(6,AlignLeft); | 258 | mListView->setColumnAlignment(6,AlignLeft); |
259 | mListView->setColumnAlignment(7,AlignLeft); | 259 | mListView->setColumnAlignment(7,AlignLeft); |
260 | mListView->setColumnAlignment(8,AlignLeft); | 260 | mListView->setColumnAlignment(8,AlignLeft); |
261 | mListView->setColumnAlignment(9,AlignLeft); | 261 | mListView->setColumnAlignment(9,AlignLeft); |
262 | mListView->setColumnAlignment(10,AlignLeft); | 262 | mListView->setColumnAlignment(10,AlignLeft); |
263 | mListView->setColumnWidthMode(10, QListView::Manual); | 263 | mListView->setColumnWidthMode(10, QListView::Manual); |
264 | new KOListViewWhatsThis(mListView->viewport(),this); | 264 | mKOListViewWhatsThis = new KOListViewWhatsThis(mListView->viewport(),this); |
265 | 265 | ||
266 | int iii = 0; | 266 | int iii = 0; |
267 | for ( iii = 0; iii< 10 ; ++iii ) | 267 | for ( iii = 0; iii< 10 ; ++iii ) |
268 | mListView->setColumnWidthMode( iii, QListView::Manual ); | 268 | mListView->setColumnWidthMode( iii, QListView::Manual ); |
269 | 269 | ||
270 | QBoxLayout *layoutTop = new QVBoxLayout(this); | 270 | QBoxLayout *layoutTop = new QVBoxLayout(this); |
@@ -335,12 +335,17 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent, | |||
335 | readSettings(KOGlobals::config(),"KOListView Layout"); | 335 | readSettings(KOGlobals::config(),"KOListView Layout"); |
336 | } | 336 | } |
337 | 337 | ||
338 | KOListView::~KOListView() | 338 | KOListView::~KOListView() |
339 | { | 339 | { |
340 | delete mPopupMenu; | 340 | delete mPopupMenu; |
341 | #if QT_VERSION >= 0x030000 | ||
342 | |||
343 | #else | ||
344 | delete mKOListViewWhatsThis; | ||
345 | #endif | ||
341 | } | 346 | } |
342 | 347 | ||
343 | QString KOListView::getWhatsThisText(QPoint p) | 348 | QString KOListView::getWhatsThisText(QPoint p) |
344 | { | 349 | { |
345 | KOListViewItem* item = ( KOListViewItem* ) mListView->itemAt( p ); | 350 | KOListViewItem* item = ( KOListViewItem* ) mListView->itemAt( p ); |
346 | if ( item ) | 351 | if ( item ) |
@@ -1178,12 +1183,13 @@ void KOListViewListView::keyPressEvent ( QKeyEvent *e) | |||
1178 | e->ignore(); | 1183 | e->ignore(); |
1179 | } | 1184 | } |
1180 | } | 1185 | } |
1181 | KOListViewListView::KOListViewListView(KOListView * lv ) | 1186 | KOListViewListView::KOListViewListView(KOListView * lv ) |
1182 | : KListView( lv, "kolistlistview", false ) | 1187 | : KListView( lv, "kolistlistview", false ) |
1183 | { | 1188 | { |
1189 | mYMousePos = 0; | ||
1184 | mPopupTimer = new QTimer(this); | 1190 | mPopupTimer = new QTimer(this); |
1185 | connect(mPopupTimer , SIGNAL(timeout()), this, SLOT(popupMenu())); | 1191 | connect(mPopupTimer , SIGNAL(timeout()), this, SLOT(popupMenu())); |
1186 | #ifndef DESKTOP_VERSION | 1192 | #ifndef DESKTOP_VERSION |
1187 | //QPEApplication::setStylusOperation(viewport(), QPEApplication::RightOnHold ); | 1193 | //QPEApplication::setStylusOperation(viewport(), QPEApplication::RightOnHold ); |
1188 | #endif | 1194 | #endif |
1189 | setSelectionMode( QListView::Multi ); | 1195 | setSelectionMode( QListView::Multi ); |
diff --git a/korganizer/kolistview.h b/korganizer/kolistview.h index eb5bb6e..2051d60 100644 --- a/korganizer/kolistview.h +++ b/korganizer/kolistview.h | |||
@@ -39,13 +39,13 @@ | |||
39 | 39 | ||
40 | #include "koeventview.h" | 40 | #include "koeventview.h" |
41 | #include "customlistviewitem.h" | 41 | #include "customlistviewitem.h" |
42 | 42 | ||
43 | using namespace KCal; | 43 | using namespace KCal; |
44 | 44 | ||
45 | 45 | class KOListViewWhatsThis; | |
46 | 46 | ||
47 | #include <qpushbutton.h> | 47 | #include <qpushbutton.h> |
48 | #include <qlayout.h> | 48 | #include <qlayout.h> |
49 | #include <qdialog.h> | 49 | #include <qdialog.h> |
50 | #include <qtimer.h> | 50 | #include <qtimer.h> |
51 | #include <qcombobox.h> | 51 | #include <qcombobox.h> |
@@ -297,12 +297,13 @@ class KOListView : public KOEventView | |||
297 | void writeToFile( bool iCal ); | 297 | void writeToFile( bool iCal ); |
298 | void addEvents(QPtrList<Event> eventList); | 298 | void addEvents(QPtrList<Event> eventList); |
299 | void addIncidence(Incidence *); | 299 | void addIncidence(Incidence *); |
300 | KOListViewItem *getItemForEvent(Event *event); | 300 | KOListViewItem *getItemForEvent(Event *event); |
301 | 301 | ||
302 | private: | 302 | private: |
303 | KOListViewWhatsThis *mKOListViewWhatsThis; | ||
303 | KOListViewListView *mListView; | 304 | KOListViewListView *mListView; |
304 | KOEventPopupMenu *mPopupMenu; | 305 | KOEventPopupMenu *mPopupMenu; |
305 | KOListViewItem *mActiveItem; | 306 | KOListViewItem *mActiveItem; |
306 | QDict<Incidence> mUidDict; | 307 | QDict<Incidence> mUidDict; |
307 | QDate mStartDate; | 308 | QDate mStartDate; |
308 | void keyPressEvent ( QKeyEvent * ) ; | 309 | void keyPressEvent ( QKeyEvent * ) ; |
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index ae61db6..7927307 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp | |||
@@ -86,13 +86,17 @@ KNoScrollListBox::KNoScrollListBox(QWidget *parent,const char *name) | |||
86 | resetOnFocusIn = true; | 86 | resetOnFocusIn = true; |
87 | setVScrollBarMode(QScrollView::AlwaysOff); | 87 | setVScrollBarMode(QScrollView::AlwaysOff); |
88 | setHScrollBarMode(QScrollView::AlwaysOff); | 88 | setHScrollBarMode(QScrollView::AlwaysOff); |
89 | } | 89 | } |
90 | KNoScrollListBox::~KNoScrollListBox() | 90 | KNoScrollListBox::~KNoScrollListBox() |
91 | { | 91 | { |
92 | 92 | #if QT_VERSION >= 0x030000 | |
93 | |||
94 | #else | ||
95 | delete mWT; | ||
96 | #endif | ||
93 | } | 97 | } |
94 | 98 | ||
95 | 99 | ||
96 | void KNoScrollListBox::focusInEvent ( QFocusEvent * e ) | 100 | void KNoScrollListBox::focusInEvent ( QFocusEvent * e ) |
97 | { | 101 | { |
98 | QListBox::focusInEvent ( e ); | 102 | QListBox::focusInEvent ( e ); |
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp index f26d16d..e95039d 100644 --- a/korganizer/kotodoview.cpp +++ b/korganizer/kotodoview.cpp | |||
@@ -585,13 +585,19 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) : | |||
585 | SLOT( addQuickTodo() ) ); | 585 | SLOT( addQuickTodo() ) ); |
586 | 586 | ||
587 | } | 587 | } |
588 | 588 | ||
589 | KOTodoView::~KOTodoView() | 589 | KOTodoView::~KOTodoView() |
590 | { | 590 | { |
591 | // delete mKOTodoViewWhatsThis; | 591 | |
592 | #if QT_VERSION >= 0x030000 | ||
593 | |||
594 | #else | ||
595 | delete mKOTodoViewWhatsThis; | ||
596 | #endif | ||
597 | |||
592 | delete mDocPrefs; | 598 | delete mDocPrefs; |
593 | } | 599 | } |
594 | QString KOTodoView::getWhatsThisText(QPoint p) | 600 | QString KOTodoView::getWhatsThisText(QPoint p) |
595 | { | 601 | { |
596 | KOTodoViewItem* item = ( KOTodoViewItem* ) mTodoListView->itemAt( p ); | 602 | KOTodoViewItem* item = ( KOTodoViewItem* ) mTodoListView->itemAt( p ); |
597 | if ( item ) | 603 | if ( item ) |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 87cef20..68e5e5a 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -587,12 +587,18 @@ void MainWindow::recieve( const QCString& cmsg, const QByteArray& data ) | |||
587 | 587 | ||
588 | QPixmap MainWindow::loadPixmap( QString name ) | 588 | QPixmap MainWindow::loadPixmap( QString name ) |
589 | { | 589 | { |
590 | return SmallIcon( name ); | 590 | return SmallIcon( name ); |
591 | 591 | ||
592 | } | 592 | } |
593 | void MainWindow::setUsesBigPixmaps ( bool b ) | ||
594 | { | ||
595 | qDebug("KO: MainWindow::setUsesBigPixmaps %d called", b); | ||
596 | if ( b ) | ||
597 | qDebug("KO: BigPixmaps are not supported "); | ||
598 | } | ||
593 | void MainWindow::initActions() | 599 | void MainWindow::initActions() |
594 | { | 600 | { |
595 | //KOPrefs::instance()->mShowFullMenu | 601 | //KOPrefs::instance()->mShowFullMenu |
596 | iconToolBar->clear(); | 602 | iconToolBar->clear(); |
597 | KOPrefs *p = KOPrefs::instance(); | 603 | KOPrefs *p = KOPrefs::instance(); |
598 | //QPEMenuBar *menuBar1;// = new QPEMenuBar( iconToolBar ); | 604 | //QPEMenuBar *menuBar1;// = new QPEMenuBar( iconToolBar ); |
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h index 8fd3d24..6895e36 100644 --- a/korganizer/mainwindow.h +++ b/korganizer/mainwindow.h | |||
@@ -40,12 +40,13 @@ class MainWindow : public QMainWindow | |||
40 | ~MainWindow(); | 40 | ~MainWindow(); |
41 | bool beamReceiveEnabled(); | 41 | bool beamReceiveEnabled(); |
42 | static QString defaultFileName(); | 42 | static QString defaultFileName(); |
43 | static QString syncFileName(); | 43 | static QString syncFileName(); |
44 | static QString resourcePath(); | 44 | static QString resourcePath(); |
45 | public slots: | 45 | public slots: |
46 | void setUsesBigPixmaps ( bool ); | ||
46 | void setCaption ( const QString & ); | 47 | void setCaption ( const QString & ); |
47 | void updateWeekNum(const KCal::DateList &); | 48 | void updateWeekNum(const KCal::DateList &); |
48 | void updateWeek(QDate); | 49 | void updateWeek(QDate); |
49 | void updateFilterToolbar(); | 50 | void updateFilterToolbar(); |
50 | virtual void showMaximized (); | 51 | virtual void showMaximized (); |
51 | void configureAgenda( int ); | 52 | void configureAgenda( int ); |