author | Michael Krelin <hacker@klever.net> | 2007-07-04 11:23:42 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2007-07-04 11:23:42 (UTC) |
commit | a08aff328d4393031d5ba7d622c2b05705a89d73 (patch) (unidiff) | |
tree | 8ee90d686081c52e7c69b5ce946e9b1a7d690001 /korganizer/kotodoeditor.cpp | |
parent | 11edc920afe4f274c0964436633aa632c8288a40 (diff) | |
download | kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.zip kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.tar.gz kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.tar.bz2 |
initial public commit of qt4 portp1
-rw-r--r-- | korganizer/kotodoeditor.cpp | 43 |
1 files changed, 24 insertions, 19 deletions
diff --git a/korganizer/kotodoeditor.cpp b/korganizer/kotodoeditor.cpp index 20a35d2..aeab92a 100644 --- a/korganizer/kotodoeditor.cpp +++ b/korganizer/kotodoeditor.cpp | |||
@@ -20,21 +20,26 @@ | |||
20 | As a special exception, permission is given to link this program | 20 | As a special exception, permission is given to link this program |
21 | with any edition of Qt, and distribute the resulting executable, | 21 | with any edition of Qt, and distribute the resulting executable, |
22 | without including the source code for Qt in the source distribution. | 22 | without including the source code for Qt in the source distribution. |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include <qtooltip.h> | 25 | #include <qtooltip.h> |
26 | #include <qframe.h> | 26 | #include <q3frame.h> |
27 | #include <qpixmap.h> | 27 | #include <qpixmap.h> |
28 | #include <qlayout.h> | 28 | #include <qlayout.h> |
29 | #include <qhbox.h> | 29 | #include <q3hbox.h> |
30 | #include <qtimer.h> | 30 | #include <qtimer.h> |
31 | #include <qdir.h> | 31 | #include <qdir.h> |
32 | #include <qdatetime.h> | 32 | #include <qdatetime.h> |
33 | #include <qapplication.h> | 33 | #include <qapplication.h> |
34 | #include <QDesktopWidget> | ||
34 | #include <qtabwidget.h> | 35 | #include <qtabwidget.h> |
36 | //Added by qt3to4: | ||
37 | #include <Q3HBoxLayout> | ||
38 | #include <Q3PtrList> | ||
39 | #include <Q3VBoxLayout> | ||
35 | 40 | ||
36 | #include <kiconloader.h> | 41 | #include <kiconloader.h> |
37 | #include <klocale.h> | 42 | #include <klocale.h> |
38 | #include <kfiledialog.h> | 43 | #include <kfiledialog.h> |
39 | #include <kstandarddirs.h> | 44 | #include <kstandarddirs.h> |
40 | #include <kmessagebox.h> | 45 | #include <kmessagebox.h> |
@@ -78,14 +83,14 @@ void KOTodoEditor::init() | |||
78 | mRecurrence->setDateTimeStr( i18n("<i>The recurrence is computed from the start datetime!</i>") ); | 83 | mRecurrence->setDateTimeStr( i18n("<i>The recurrence is computed from the start datetime!</i>") ); |
79 | connect(mGeneral,SIGNAL(dateTimesChanged(QDateTime,QDateTime)), | 84 | connect(mGeneral,SIGNAL(dateTimesChanged(QDateTime,QDateTime)), |
80 | mRecurrence,SLOT(setDefaultsDates(QDateTime,QDateTime))); | 85 | mRecurrence,SLOT(setDefaultsDates(QDateTime,QDateTime))); |
81 | } | 86 | } |
82 | void KOTodoEditor::setupRecurrence() | 87 | void KOTodoEditor::setupRecurrence() |
83 | { | 88 | { |
84 | QFrame *topFrame = addPage( i18n("Recurrence") ); | 89 | Q3Frame *topFrame = addPage( i18n("Recurrence") ); |
85 | QBoxLayout *topLayout = new QVBoxLayout( topFrame ); | 90 | Q3BoxLayout *topLayout = new Q3VBoxLayout( topFrame ); |
86 | 91 | ||
87 | mRecurrence = new KOEditorRecurrence( topFrame ); | 92 | mRecurrence = new KOEditorRecurrence( topFrame ); |
88 | topLayout->addWidget( mRecurrence ); | 93 | topLayout->addWidget( mRecurrence ); |
89 | } | 94 | } |
90 | 95 | ||
91 | void KOTodoEditor::setCategories( QString s ) | 96 | void KOTodoEditor::setCategories( QString s ) |
@@ -108,15 +113,15 @@ void KOTodoEditor::setupGeneral() | |||
108 | 113 | ||
109 | // connect(mGeneral,SIGNAL(openCategoryDialog()),mCategoryDialog,SLOT(show())); | 114 | // connect(mGeneral,SIGNAL(openCategoryDialog()),mCategoryDialog,SLOT(show())); |
110 | //connect(mCategoryDialog, SIGNAL(categoriesSelected(const QString &)), | 115 | //connect(mCategoryDialog, SIGNAL(categoriesSelected(const QString &)), |
111 | // mGeneral,SLOT(setCategories(const QString &))); | 116 | // mGeneral,SLOT(setCategories(const QString &))); |
112 | 117 | ||
113 | if (KOPrefs::instance()->mCompactDialogs) { | 118 | if (KOPrefs::instance()->mCompactDialogs) { |
114 | QFrame *topFrame = addPage(i18n("General")); | 119 | Q3Frame *topFrame = addPage(i18n("General")); |
115 | 120 | ||
116 | QBoxLayout *topLayout = new QVBoxLayout(topFrame); | 121 | Q3BoxLayout *topLayout = new Q3VBoxLayout(topFrame); |
117 | if ( QApplication::desktop()->width() < 480 ) { | 122 | if ( QApplication::desktop()->width() < 480 ) { |
118 | topLayout->setMargin(marginHintSmall()); | 123 | topLayout->setMargin(marginHintSmall()); |
119 | topLayout->setSpacing(spacingHintSmall()); | 124 | topLayout->setSpacing(spacingHintSmall()); |
120 | } else { | 125 | } else { |
121 | topLayout->setMargin(marginHint()); | 126 | topLayout->setMargin(marginHint()); |
122 | topLayout->setSpacing(spacingHint()); | 127 | topLayout->setSpacing(spacingHint()); |
@@ -128,23 +133,23 @@ void KOTodoEditor::setupGeneral() | |||
128 | topLayout->addStretch( 1 ); | 133 | topLayout->addStretch( 1 ); |
129 | mGeneral->initAlarm(topFrame,topLayout); | 134 | mGeneral->initAlarm(topFrame,topLayout); |
130 | topLayout->addStretch( 1 ); | 135 | topLayout->addStretch( 1 ); |
131 | mGeneral->enableAlarm( false ); | 136 | mGeneral->enableAlarm( false ); |
132 | 137 | ||
133 | 138 | ||
134 | QBoxLayout *priorityLayout; | 139 | Q3BoxLayout *priorityLayout; |
135 | if ( QApplication::desktop()->width() < 500 ) | 140 | if ( QApplication::desktop()->width() < 500 ) |
136 | priorityLayout = new QVBoxLayout( topLayout ); | 141 | priorityLayout = new Q3VBoxLayout( topLayout ); |
137 | else | 142 | else |
138 | priorityLayout = new QHBoxLayout( topLayout ); | 143 | priorityLayout = new Q3HBoxLayout( topLayout ); |
139 | QWidget* prioWidget = new QWidget (topFrame); | 144 | QWidget* prioWidget = new QWidget (topFrame); |
140 | priorityLayout->addWidget( prioWidget ); | 145 | priorityLayout->addWidget( prioWidget ); |
141 | QHBoxLayout* priorityLayout2 = new QHBoxLayout( prioWidget); | 146 | Q3HBoxLayout* priorityLayout2 = new Q3HBoxLayout( prioWidget); |
142 | 147 | ||
143 | 148 | ||
144 | QIconSet icon; | 149 | QIcon icon; |
145 | if ( QApplication::desktop()->width() < 321 ) | 150 | if ( QApplication::desktop()->width() < 321 ) |
146 | icon = SmallIcon("fileimport16"); | 151 | icon = SmallIcon("fileimport16"); |
147 | else | 152 | else |
148 | icon = SmallIcon("fileimport"); | 153 | icon = SmallIcon("fileimport"); |
149 | QPushButton * loadTemplate = new QPushButton( prioWidget); | 154 | QPushButton * loadTemplate = new QPushButton( prioWidget); |
150 | loadTemplate->setIconSet (icon ) ; | 155 | loadTemplate->setIconSet (icon ) ; |
@@ -161,19 +166,19 @@ void KOTodoEditor::setupGeneral() | |||
161 | priorityLayout2->addWidget(loadTemplate); | 166 | priorityLayout2->addWidget(loadTemplate); |
162 | priorityLayout2->addWidget(saveTemplate); | 167 | priorityLayout2->addWidget(saveTemplate); |
163 | mGeneral->initPriority(prioWidget,priorityLayout2); | 168 | mGeneral->initPriority(prioWidget,priorityLayout2); |
164 | mGeneral->initCategories( topFrame, priorityLayout ); | 169 | mGeneral->initCategories( topFrame, priorityLayout ); |
165 | topLayout->addStretch(1); | 170 | topLayout->addStretch(1); |
166 | 171 | ||
167 | QFrame *topFrame2 = addPage(i18n("Details")); | 172 | Q3Frame *topFrame2 = addPage(i18n("Details")); |
168 | 173 | ||
169 | QBoxLayout *topLayout2 = new QVBoxLayout(topFrame2); | 174 | Q3BoxLayout *topLayout2 = new Q3VBoxLayout(topFrame2); |
170 | topLayout2->setMargin(marginHint()); | 175 | topLayout2->setMargin(marginHint()); |
171 | topLayout2->setSpacing(spacingHint()); | 176 | topLayout2->setSpacing(spacingHint()); |
172 | 177 | ||
173 | QHBoxLayout *completionLayout = new QHBoxLayout( topLayout2 ); | 178 | Q3HBoxLayout *completionLayout = new Q3HBoxLayout( topLayout2 ); |
174 | mGeneral->initCompletion(topFrame2,completionLayout); | 179 | mGeneral->initCompletion(topFrame2,completionLayout); |
175 | 180 | ||
176 | 181 | ||
177 | mGeneral->initSecrecy( topFrame2, topLayout2 ); | 182 | mGeneral->initSecrecy( topFrame2, topLayout2 ); |
178 | mGeneral->initDescription(topFrame2,topLayout2); | 183 | mGeneral->initDescription(topFrame2,topLayout2); |
179 | 184 | ||
@@ -182,24 +187,24 @@ void KOTodoEditor::setupGeneral() | |||
182 | // hb->setSpacing( 3 ); | 187 | // hb->setSpacing( 3 ); |
183 | 188 | ||
184 | connect( saveTemplate, SIGNAL( clicked() ), this , SLOT( slotSaveTemplate() ) ); | 189 | connect( saveTemplate, SIGNAL( clicked() ), this , SLOT( slotSaveTemplate() ) ); |
185 | connect( loadTemplate, SIGNAL( clicked() ), this , SLOT( slotLoadTemplate() ) ); | 190 | connect( loadTemplate, SIGNAL( clicked() ), this , SLOT( slotLoadTemplate() ) ); |
186 | 191 | ||
187 | } else { | 192 | } else { |
188 | QFrame *topFrame = addPage(i18n("General")); | 193 | Q3Frame *topFrame = addPage(i18n("General")); |
189 | 194 | ||
190 | QBoxLayout *topLayout = new QVBoxLayout(topFrame); | 195 | Q3BoxLayout *topLayout = new Q3VBoxLayout(topFrame); |
191 | topLayout->setSpacing(spacingHint()); | 196 | topLayout->setSpacing(spacingHint()); |
192 | 197 | ||
193 | mGeneral->initHeader(topFrame,topLayout); | 198 | mGeneral->initHeader(topFrame,topLayout); |
194 | mGeneral->initTime(topFrame,topLayout); | 199 | mGeneral->initTime(topFrame,topLayout); |
195 | mGeneral->initStatus(topFrame,topLayout); | 200 | mGeneral->initStatus(topFrame,topLayout); |
196 | QBoxLayout *alarmLineLayout = new QHBoxLayout(topLayout); | 201 | Q3BoxLayout *alarmLineLayout = new Q3HBoxLayout(topLayout); |
197 | mGeneral->initAlarm(topFrame,alarmLineLayout); | 202 | mGeneral->initAlarm(topFrame,alarmLineLayout); |
198 | mGeneral->initDescription(topFrame,topLayout); | 203 | mGeneral->initDescription(topFrame,topLayout); |
199 | QBoxLayout *detailsLayout = new QHBoxLayout(topLayout); | 204 | Q3BoxLayout *detailsLayout = new Q3HBoxLayout(topLayout); |
200 | mGeneral->initCategories( topFrame, detailsLayout ); | 205 | mGeneral->initCategories( topFrame, detailsLayout ); |
201 | mGeneral->initSecrecy( topFrame, detailsLayout ); | 206 | mGeneral->initSecrecy( topFrame, detailsLayout ); |
202 | } | 207 | } |
203 | mGeneral->finishSetup(); | 208 | mGeneral->finishSetup(); |
204 | 209 | ||
205 | } | 210 | } |
@@ -424,13 +429,13 @@ void KOTodoEditor::slotLoadTemplate() | |||
424 | ICalFormat format; | 429 | ICalFormat format; |
425 | if ( !format.load( &cal, fileName ) ) { | 430 | if ( !format.load( &cal, fileName ) ) { |
426 | KMessageBox::error( this, i18n("Error loading template file\n '%1'.") | 431 | KMessageBox::error( this, i18n("Error loading template file\n '%1'.") |
427 | .arg( fileName ) ); | 432 | .arg( fileName ) ); |
428 | return ; | 433 | return ; |
429 | } | 434 | } |
430 | QPtrList<Todo> todos = cal.todos(); | 435 | Q3PtrList<Todo> todos = cal.todos(); |
431 | Todo * todo = todos.first(); | 436 | Todo * todo = todos.first(); |
432 | if ( !todo ) { | 437 | if ( !todo ) { |
433 | KMessageBox::error( this, | 438 | KMessageBox::error( this, |
434 | i18n("Template does not\ncontain a valid Todo.")); | 439 | i18n("Template does not\ncontain a valid Todo.")); |
435 | } else { | 440 | } else { |
436 | readTodo( todo ); | 441 | readTodo( todo ); |