author | drw <drw> | 2005-01-30 00:32:33 (UTC) |
---|---|---|
committer | drw <drw> | 2005-01-30 00:32:33 (UTC) |
commit | 114c5c468032a08205b2d8b7da3966bff6d47875 (patch) (unidiff) | |
tree | bbd79021246e747f7292eda140e424cf9d750ac5 /core/pim/todo | |
parent | 43f82d5c68e1d7a5b26f862c26a76253a85e7518 (diff) | |
download | opie-114c5c468032a08205b2d8b7da3966bff6d47875.zip opie-114c5c468032a08205b2d8b7da3966bff6d47875.tar.gz opie-114c5c468032a08205b2d8b7da3966bff6d47875.tar.bz2 |
Convert Todo to use new OPimMainWindow functionality, plus some other code clean-ups
-rw-r--r-- | core/pim/todo/mainwindow.cpp | 425 | ||||
-rw-r--r-- | core/pim/todo/mainwindow.h | 77 | ||||
-rw-r--r-- | core/pim/todo/newtaskdlg.cpp | 78 | ||||
-rw-r--r-- | core/pim/todo/newtaskdlg.h | 56 | ||||
-rw-r--r-- | core/pim/todo/tableview.cpp | 88 | ||||
-rw-r--r-- | core/pim/todo/tableview.h | 52 | ||||
-rw-r--r-- | core/pim/todo/templateeditor.cpp | 38 | ||||
-rw-r--r-- | core/pim/todo/templateeditor.h | 31 | ||||
-rw-r--r-- | core/pim/todo/todo.pro | 8 | ||||
-rw-r--r-- | core/pim/todo/todomanager.cpp | 43 |
10 files changed, 375 insertions, 521 deletions
diff --git a/core/pim/todo/mainwindow.cpp b/core/pim/todo/mainwindow.cpp index 9424c23..75da27c 100644 --- a/core/pim/todo/mainwindow.cpp +++ b/core/pim/todo/mainwindow.cpp | |||
@@ -1,24 +1,24 @@ | |||
1 | /* | 1 | /* |
2 | =. This file is part of the OPIE Project | 2 | =. This file is part of the OPIE Project |
3 | .=l. Copyright (c) 2002 <> | 3 | .=l. Copyright (c) 2002 <> |
4 | .>+-= | 4 | .>+-= |
5 | _;:, .> :=|. This program is free software; you can | 5 | _;:, .> :=|. This program is free software; you can |
6 | .> <`_, > . <= redistribute it and/or modify it under | 6 | .> <`_, > . <= redistribute it and/or modify it under |
7 | :`=1 )Y*s>-.-- : the terms of the GNU General Public | 7 | :`=1 )Y*s>-.-- : the terms of the GNU General Public |
8 | .="- .-=="i, .._ License as published by the Free Software | 8 | .="- .-=="i, .._ License as published by the Free Software |
9 | - . .-<_> .<> Foundation; either version 2 of the License, | 9 | - . .-<_> .<> Foundation; either version 2 of the License, |
10 | ._= =} : or (at your option) any later version. | 10 | ._= =} : or (at your option) any later version. |
11 | .%`+i> _;_. | 11 | .%`+i> _;_. |
12 | .i_,=:_. -<s. This program is distributed in the hope that | 12 | .i_,=:_. -<s. This program is distributed in the hope that |
13 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 13 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
14 | : .. .:, . . . without even the implied warranty of | 14 | : .. .:, . . . without even the implied warranty of |
15 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 15 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
16 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 16 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
17 | ..}^=.= = ; Library General Public License for more | 17 | ..}^=.= = ; Library General Public License for more |
18 | ++= -. .` .: details. | 18 | ++= -. .` .: details. |
19 | : = ...= . :.=- | 19 | : = ...= . :.=- |
20 | -. .:....=;==+<; You should have received a copy of the GNU | 20 | -. .:....=;==+<; You should have received a copy of the GNU |
21 | -_. . . )=. = General Public License along with | 21 | -_. . . )=. = General Public License along with |
22 | -- :-=` this library; see the file COPYING.LIB. | 22 | -- :-=` this library; see the file COPYING.LIB. |
23 | If not, write to the Free Software Foundation, | 23 | If not, write to the Free Software Foundation, |
24 | Inc., 59 Temple Place - Suite 330, | 24 | Inc., 59 Temple Place - Suite 330, |
@@ -43,19 +43,21 @@ | |||
43 | #include <qpe/qpeapplication.h> | 43 | #include <qpe/qpeapplication.h> |
44 | 44 | ||
45 | #include <qaction.h> | ||
46 | #include <qlayout.h> | ||
45 | #include <qmenubar.h> | 47 | #include <qmenubar.h> |
46 | #include <qmessagebox.h> | 48 | #include <qmessagebox.h> |
47 | #include <qpushbutton.h> | 49 | #include <qpushbutton.h> |
48 | #include <qaction.h> | 50 | #include <qstringlist.h> |
49 | #include <qtimer.h> | 51 | #include <qtimer.h> |
50 | #include <qlayout.h> | ||
51 | #include <qwhatsthis.h> | 52 | #include <qwhatsthis.h> |
52 | 53 | ||
53 | #include "quickeditimpl.h" | 54 | #include "quickeditimpl.h" |
54 | #include "todotemplatemanager.h" | 55 | #include "todotemplatemanager.h" |
55 | #include "templateeditor.h" | 56 | #include "templatedialogimpl.h" |
56 | #include "tableview.h" | 57 | #include "tableview.h" |
57 | 58 | ||
58 | #include "textviewshow.h" | 59 | #include "textviewshow.h" |
59 | #include "todoeditor.h" | 60 | #include "todoeditor.h" |
61 | #include "newtaskdlg.h" | ||
60 | #include "mainwindow.h" | 62 | #include "mainwindow.h" |
61 | 63 | ||
@@ -68,5 +70,6 @@ using namespace Todo; | |||
68 | MainWindow::MainWindow( QWidget* parent, | 70 | MainWindow::MainWindow( QWidget* parent, |
69 | const char* name, WFlags ) | 71 | const char* name, WFlags ) |
70 | : Opie::OPimMainWindow( "Todolist", parent, name, WType_TopLevel | WStyle_ContextHelp ) | 72 | : Opie::OPimMainWindow( "Todolist", tr( "Todo List" ), "Todo List", tr( "Task" ), "todo", |
73 | parent, name, WType_TopLevel | WStyle_ContextHelp ) | ||
71 | { | 74 | { |
72 | if (!name) | 75 | if (!name) |
@@ -79,136 +82,53 @@ MainWindow::MainWindow( QWidget* parent, | |||
79 | m_tempManager->load(); | 82 | m_tempManager->load(); |
80 | 83 | ||
81 | initUI(); | ||
82 | initConfig(); | 84 | initConfig(); |
85 | initUI(); | ||
83 | initViews(); | 86 | initViews(); |
84 | initActions(); | 87 | initActions(); |
85 | initEditor(); | 88 | initEditor(); |
86 | initShow(); | 89 | initShow(); |
87 | initTemplate(); | ||
88 | 90 | ||
89 | populateTemplates(); | ||
90 | raiseCurrentView(); | 91 | raiseCurrentView(); |
91 | QTimer::singleShot(0, this, SLOT(populateCategories() ) ); | 92 | QTimer::singleShot( 0, this, SLOT(initStuff()) ); |
92 | } | 93 | } |
93 | void MainWindow::initTemplate() { | 94 | void MainWindow::initStuff() { |
94 | m_curTempEd = new TemplateEditor( this, templateManager() ); | 95 | m_todoMgr.load(); |
96 | setViewCategory( m_curCat ); | ||
97 | setCategory( m_curCat ); | ||
95 | } | 98 | } |
96 | void MainWindow::initActions() { | 99 | void MainWindow::initActions() { |
97 | 100 | // Insert Task menu items | |
98 | // Data menu | 101 | QActionGroup *items = new QActionGroup( this, QString::null, false ); |
99 | m_edit->insertItem(QWidget::tr("New from template"), m_template, | 102 | |
100 | -1, 0 ); | 103 | m_deleteCompleteAction = new QAction( QString::null, QWidget::tr( "Delete completed" ), |
101 | 104 | 0, items, 0 ); | |
102 | QAction* a = new QAction( QWidget::tr("New Task" ), Resource::loadPixmap( "new" ), | 105 | connect( m_deleteCompleteAction, SIGNAL(activated()), this, SLOT(slotDeleteCompleted()) ); |
103 | QString::null, 0, this, 0 ); | 106 | |
104 | connect(a, SIGNAL( activated() ), | 107 | insertItemMenuItems( items ); |
105 | this, SLOT( slotNew() ) ); | 108 | |
106 | a->setWhatsThis( QWidget::tr( "Click here to create a new task." ) ); | 109 | // Insert View menu items |
107 | a->addTo(m_tool ); | 110 | items = new QActionGroup( this, QString::null, false ); |
108 | a->addTo(m_edit ); | 111 | |
109 | |||
110 | a = new QAction( QWidget::tr("Edit Task"), Resource::loadIconSet( "edit" ), | ||
111 | QString::null, 0, this, 0 ); | ||
112 | connect(a, SIGNAL(activated() ), | ||
113 | this, SLOT( slotEdit() ) ); | ||
114 | a->setWhatsThis( QWidget::tr( "Click here to modify the current task." ) ); | ||
115 | a->addTo( m_tool ); | ||
116 | a->addTo( m_edit ); | ||
117 | m_editAction = a; | ||
118 | |||
119 | a = new QAction( QString::null, QWidget::tr("View Task"), 0, this, 0 ); | ||
120 | connect(a, SIGNAL( activated() ), | ||
121 | this, SLOT( slotShowDetails() ) ); | ||
122 | a->addTo( m_edit ); | ||
123 | |||
124 | m_edit->insertSeparator(); | ||
125 | |||
126 | a = new QAction( QWidget::tr("Delete..."), Resource::loadIconSet( "trash" ), | ||
127 | QString::null, 0, this, 0 ); | ||
128 | connect(a, SIGNAL(activated() ), | ||
129 | this, SLOT(slotDelete() ) ); | ||
130 | a->setWhatsThis( QWidget::tr( "Click here to remove the current task." ) ); | ||
131 | a->addTo( m_tool ); | ||
132 | a->addTo( m_edit ); | ||
133 | m_deleteAction = a; | ||
134 | |||
135 | a = new QAction( QString::null, QWidget::tr("Delete all..."), 0, this, 0 ); | ||
136 | connect(a, SIGNAL( activated() ), | ||
137 | this, SLOT( slotDeleteAll() ) ); | ||
138 | a->addTo(m_edit ); | ||
139 | m_deleteAllAction = a; | ||
140 | |||
141 | a = new QAction( QString::null, QWidget::tr("Delete completed"), | ||
142 | 0, this, 0 ); | ||
143 | connect(a, SIGNAL( activated() ), | ||
144 | this, SLOT( slotDeleteCompleted() ) ); | ||
145 | a->addTo(m_edit ); | ||
146 | a->setEnabled( TRUE ); | ||
147 | m_deleteCompleteAction = a; | ||
148 | |||
149 | m_edit->insertSeparator(); | ||
150 | |||
151 | a = new QAction( QString::null, QWidget::tr("Duplicate"), 0, this, 0 ); | ||
152 | connect(a, SIGNAL( activated() ), | ||
153 | this, SLOT( slotDuplicate() ) ); | ||
154 | a->addTo(m_edit ); | ||
155 | m_duplicateAction = a; | ||
156 | |||
157 | m_edit->insertSeparator(); | ||
158 | |||
159 | if ( Ir::supported() ) { | ||
160 | a = new QAction( QWidget::tr( "Beam" ), Resource::loadPixmap( "beam" ), QString::null, 0, this, 0 ); | ||
161 | connect( a, SIGNAL( activated() ), this, SLOT( slotBeam() ) ); | ||
162 | a->setWhatsThis( QWidget::tr( "Click here to send the current task to another device." ) ); | ||
163 | a->addTo( m_edit ); | ||
164 | a->addTo( m_tool ); | ||
165 | } | ||
166 | |||
167 | #if 0 | ||
168 | // Options menu | ||
169 | a = new QAction( QWidget::tr("Find"), Resource::loadIconSet( "mag" ), | ||
170 | QString::null, 0, this, 0 ); | ||
171 | connect(a, SIGNAL( activated() ), this, SLOT( slotFind() ) ); | ||
172 | a->addTo( m_options ); | ||
173 | m_findAction = a; | ||
174 | |||
175 | |||
176 | m_options->insertSeparator(); | ||
177 | #endif | ||
178 | |||
179 | m_completedAction = new QAction( QString::null, QWidget::tr("Show completed tasks"), | 112 | m_completedAction = new QAction( QString::null, QWidget::tr("Show completed tasks"), |
180 | 0, this, 0, TRUE ); | 113 | 0, items, 0, true ); |
181 | m_completedAction->addTo( m_options ); | ||
182 | m_completedAction->setOn( showCompleted() ); | 114 | m_completedAction->setOn( showCompleted() ); |
183 | connect(m_completedAction, SIGNAL( toggled(bool) ), this, SLOT(slotShowCompleted(bool) ) ); | 115 | connect( m_completedAction, SIGNAL(toggled(bool)), this, SLOT(slotShowCompleted(bool)) ); |
184 | 116 | ||
185 | a = new QAction( QString::null, QWidget::tr("Show only over-due tasks"), | 117 | QAction *a = new QAction( QString::null, QWidget::tr("Show only over-due tasks"), |
186 | 0, this, 0, TRUE ); | 118 | 0, items, 0, true ); |
187 | a->addTo( m_options ); | ||
188 | a->setOn( showOverDue() ); | 119 | a->setOn( showOverDue() ); |
189 | connect(a, SIGNAL(toggled(bool)), this, SLOT(slotShowDue(bool) ) ); | 120 | connect( a, SIGNAL(toggled(bool)), this, SLOT(slotShowDue(bool)) ); |
190 | 121 | ||
191 | m_showDeadLineAction = new QAction( QString::null, QWidget::tr("Show task deadlines"), | 122 | m_showDeadLineAction = new QAction( QString::null, QWidget::tr("Show task deadlines"), |
192 | 0, this, 0, TRUE ); | 123 | 0, items, 0, true ); |
193 | m_showDeadLineAction->addTo( m_options ); | ||
194 | m_showDeadLineAction->setOn( showDeadline() ); | 124 | m_showDeadLineAction->setOn( showDeadline() ); |
195 | connect(m_showDeadLineAction, SIGNAL(toggled(bool) ), this, SLOT( slotShowDeadLine(bool) ) ); | 125 | connect( m_showDeadLineAction, SIGNAL(toggled(bool)), this, SLOT(slotShowDeadLine(bool)) ); |
196 | 126 | ||
197 | m_showQuickTaskAction = new QAction( QString::null, QWidget::tr("Show quick task bar"), | 127 | m_showQuickTaskAction = new QAction( QString::null, QWidget::tr("Show quick task bar"), |
198 | 0, this, 0, TRUE ); | 128 | 0, items, 0, true ); |
199 | m_showQuickTaskAction->addTo( m_options ); | ||
200 | m_showQuickTaskAction->setOn( showQuickTask() ); | 129 | m_showQuickTaskAction->setOn( showQuickTask() ); |
201 | connect(m_showQuickTaskAction, SIGNAL( toggled(bool) ), this, SLOT(slotShowQuickTask(bool) ) ); | 130 | connect( m_showQuickTaskAction, SIGNAL(toggled(bool)), this, SLOT(slotShowQuickTask(bool)) ); |
202 | 131 | ||
203 | m_options->insertSeparator(); | 132 | insertViewMenuItems( items ); |
204 | |||
205 | m_bar->insertItem( QWidget::tr("Data") ,m_edit ); | ||
206 | m_bar->insertItem( QWidget::tr("Category"), m_catMenu ); | ||
207 | m_bar->insertItem( QWidget::tr("Options"), m_options ); | ||
208 | |||
209 | m_curQuick = new QuickEditImpl( this, m_quicktask ); | ||
210 | addToolBar( (QToolBar *)m_curQuick->widget(), QWidget::tr( "QuickEdit" ), QMainWindow::Top, TRUE ); | ||
211 | m_curQuick->signal()->connect( this, SLOT(slotQuickEntered() ) ); | ||
212 | |||
213 | } | 133 | } |
214 | /* m_curCat from Config */ | 134 | /* m_curCat from Config */ |
@@ -216,37 +136,22 @@ void MainWindow::initConfig() { | |||
216 | Config config( "todo" ); | 136 | Config config( "todo" ); |
217 | config.setGroup( "View" ); | 137 | config.setGroup( "View" ); |
218 | m_completed = config.readBoolEntry( "ShowComplete", TRUE ); | 138 | m_completed = config.readBoolEntry( "ShowComplete", true ); |
219 | m_curCat = config.readEntry( "Category", QString::null ); | 139 | m_curCat = config.readEntry( "Category", QString::null ); |
220 | m_deadline = config.readBoolEntry( "ShowDeadLine", TRUE); | 140 | m_deadline = config.readBoolEntry( "ShowDeadLine", true); |
221 | m_overdue = config.readBoolEntry("ShowOverDue", FALSE ); | 141 | m_overdue = config.readBoolEntry("ShowOverDue", false ); |
222 | m_quicktask = config.readBoolEntry("ShowQuickTask", TRUE); | 142 | m_quicktask = config.readBoolEntry("ShowQuickTask", true); |
223 | } | 143 | } |
224 | void MainWindow::initUI() { | 144 | void MainWindow::initUI() { |
225 | 145 | // Create main widget stack | |
226 | m_stack = new Opie::Ui::OWidgetStack(this, "main stack"); | 146 | m_stack = new Opie::Ui::OWidgetStack(this, "main stack"); |
227 | |||
228 | setCentralWidget( m_stack ); | 147 | setCentralWidget( m_stack ); |
229 | 148 | connect( this, SIGNAL(categorySelected(const QString&)), | |
230 | setToolBarsMovable( FALSE ); | 149 | this, SLOT(setCategory(const QString&)) ); |
231 | 150 | ||
232 | QToolBar *menubarholder = new QToolBar( this ); | 151 | // Create quick task toolbar |
233 | menubarholder->setHorizontalStretchable( TRUE ); | 152 | m_curQuick = new QuickEditImpl( this, m_quicktask ); |
234 | m_bar = new QMenuBar( menubarholder ); | 153 | addToolBar( (QToolBar *)m_curQuick->widget(), QWidget::tr( "QuickEdit" ), |
235 | 154 | QMainWindow::Top, true ); | |
236 | m_tool = new QToolBar( this ); | 155 | m_curQuick->signal()->connect( this, SLOT(slotQuickEntered()) ); |
237 | |||
238 | /** QPopupMenu */ | ||
239 | m_edit = new QPopupMenu( this ); | ||
240 | m_options = new QPopupMenu( this ); | ||
241 | m_catMenu = new QPopupMenu( this ); | ||
242 | m_template = new QPopupMenu( this ); | ||
243 | |||
244 | m_catMenu->setCheckable( TRUE ); | ||
245 | m_template->setCheckable( TRUE ); | ||
246 | |||
247 | connect(m_catMenu, SIGNAL(activated(int) ), | ||
248 | this, SLOT(setCategory(int) ) ); | ||
249 | connect(m_template, SIGNAL(activated(int) ), | ||
250 | this, SLOT(slotNewFromTemplate(int) ) ); | ||
251 | } | 156 | } |
252 | void MainWindow::initViews() { | 157 | void MainWindow::initViews() { |
@@ -276,32 +181,6 @@ void MainWindow::connectBase( ViewBase* ) { | |||
276 | // once templates and signals mix we'll use it again | 181 | // once templates and signals mix we'll use it again |
277 | } | 182 | } |
278 | QPopupMenu* MainWindow::contextMenu( int , bool recur ) { | 183 | QPopupMenu* MainWindow::contextMenu( int , bool /*recur*/ ) { |
279 | QPopupMenu* menu = new QPopupMenu(); | 184 | return itemContextMenu(); |
280 | |||
281 | m_editAction->addTo( menu ); | ||
282 | m_deleteAction->addTo( menu ); | ||
283 | m_duplicateAction->addTo( menu ); | ||
284 | |||
285 | menu->insertSeparator(); | ||
286 | |||
287 | /* | ||
288 | * if this event recurs we allow | ||
289 | * to detach it. | ||
290 | * remove all | ||
291 | */ | ||
292 | if ( recur ) { | ||
293 | ; // FIXME | ||
294 | } | ||
295 | |||
296 | return menu; | ||
297 | } | ||
298 | QPopupMenu* MainWindow::options() { | ||
299 | return m_options; | ||
300 | } | ||
301 | QPopupMenu* MainWindow::edit() { | ||
302 | return m_edit; | ||
303 | } | ||
304 | QToolBar* MainWindow::toolbar() { | ||
305 | return m_tool; | ||
306 | } | 185 | } |
307 | OPimTodoAccess::List MainWindow::list()const { | 186 | OPimTodoAccess::List MainWindow::list()const { |
@@ -310,7 +189,7 @@ OPimTodoAccess::List MainWindow::list()const { | |||
310 | OPimTodoAccess::List MainWindow::sorted( bool asc, int sortOrder ) { | 189 | OPimTodoAccess::List MainWindow::sorted( bool asc, int sortOrder ) { |
311 | int cat = 0; | 190 | int cat = 0; |
312 | if ( m_curCat != QWidget::tr("All Categories") ) | 191 | if ( m_curCat != tr( "All" ) ) |
313 | cat = currentCatId(); | 192 | cat = currentCatId(); |
314 | if ( m_curCat == QWidget::tr("Unfiled") ) | 193 | if ( m_curCat == tr( "Unfiled" ) ) |
315 | cat = -1; | 194 | cat = -1; |
316 | 195 | ||
@@ -321,15 +200,15 @@ OPimTodoAccess::List MainWindow::sorted( bool asc, int sortOrder ) { | |||
321 | if (m_overdue) | 200 | if (m_overdue) |
322 | filter |= OPimTodoAccess::OnlyOverDue; | 201 | filter |= OPimTodoAccess::OnlyOverDue; |
323 | 202 | ||
324 | return m_todoMgr.sorted( asc, sortOrder, filter, cat ); | 203 | return m_todoMgr.sorted( asc, sortOrder, filter, cat ); |
325 | } | 204 | } |
326 | OPimTodoAccess::List MainWindow::sorted( bool asc, int sortOrder, int addFilter) { | 205 | OPimTodoAccess::List MainWindow::sorted( bool asc, int sortOrder, int addFilter) { |
327 | int cat = 0; | 206 | int cat = 0; |
328 | if ( m_curCat != QWidget::tr("All Categories") ) | 207 | if ( m_curCat != tr( "All" ) ) |
329 | cat = currentCatId(); | 208 | cat = currentCatId(); |
330 | 209 | ||
331 | if ( m_curCat == QWidget::tr("Unfiled") ) | 210 | if ( m_curCat == tr( "Unfiled" ) ) |
332 | cat = -1; | 211 | cat = -1; |
333 | 212 | ||
334 | return m_todoMgr.sorted(asc, sortOrder, addFilter, cat ); | 213 | return m_todoMgr.sorted(asc, sortOrder, addFilter, cat ); |
335 | } | 214 | } |
@@ -350,5 +229,5 @@ TodoShow* MainWindow::currentShow() { | |||
350 | } | 229 | } |
351 | void MainWindow::slotReload() { | 230 | void MainWindow::slotReload() { |
352 | m_syncing = FALSE; | 231 | m_syncing = false; |
353 | m_todoMgr.reload(); | 232 | m_todoMgr.reload(); |
354 | currentView()->updateView( ); | 233 | currentView()->updateView( ); |
@@ -404,44 +283,31 @@ void MainWindow::closeEvent( QCloseEvent* e ) { | |||
404 | } | 283 | } |
405 | } | 284 | } |
406 | void MainWindow::populateTemplates() { | 285 | void MainWindow::slotItemNew() { |
407 | m_template->clear(); | 286 | NewTaskDlg dlg( templateManager()->templates(), this ); |
408 | QStringList list = templateManager()->templates(); | 287 | if ( QPEApplication::execDialog( &dlg ) == QDialog::Accepted ) { |
409 | QStringList::Iterator it; | 288 | QString tempName = dlg.tempSelected(); |
410 | for ( it = list.begin(); it != list.end(); ++it ) { | 289 | if ( tempName.isNull() ) |
411 | m_template->insertItem( (*it) ); | 290 | // Create new, blank task |
412 | } | 291 | create(); |
413 | } | 292 | else { |
414 | /* | 293 | // Create new task from the template selected |
415 | * slotNewFromTemplate | 294 | OPimTodo event = templateManager()->templateEvent( tempName ); |
416 | * We use the edit widget to do | 295 | event = currentEditor()->edit( this, event ); |
417 | * the config but we setUid(1) | 296 | if ( currentEditor()->accepted() ) { |
418 | * to get a new uid | 297 | event.setUid( 1 ); |
419 | */ | 298 | handleAlarms( OPimTodo(), event ); |
420 | /* | 299 | m_todoMgr.add( event ); |
421 | * first we get the name of the template | 300 | currentView()->addEvent( event ); |
422 | * then we will use the TemplateManager | 301 | |
423 | */ | 302 | reloadCategories(); |
424 | void MainWindow::slotNewFromTemplate( int id ) { | 303 | } |
425 | QString name = m_template->text( id ); | 304 | raiseCurrentView(); |
426 | 305 | } | |
427 | OPimTodo event = templateManager()->templateEvent( name ); | ||
428 | event = currentEditor()->edit(this, | ||
429 | event ); | ||
430 | |||
431 | if ( currentEditor()->accepted() ) { | ||
432 | /* assign new todo */ | ||
433 | event.setUid( 1 ); | ||
434 | handleAlarms( OPimTodo(), event ); | ||
435 | m_todoMgr.add( event ); | ||
436 | currentView()->addEvent( event ); | ||
437 | |||
438 | populateCategories(); | ||
439 | } | 306 | } |
440 | raiseCurrentView(); | ||
441 | } | 307 | } |
442 | void MainWindow::slotNew() { | 308 | void MainWindow::slotItemEdit() { |
443 | create(); | 309 | slotEdit( currentView()->current() ); |
444 | } | 310 | } |
445 | void MainWindow::slotDuplicate() { | 311 | void MainWindow::slotItemDuplicate() { |
446 | if(m_syncing) { | 312 | if(m_syncing) { |
447 | QMessageBox::warning(this, QWidget::tr("Todo"), | 313 | QMessageBox::warning(this, QWidget::tr("Todo"), |
@@ -457,5 +323,5 @@ void MainWindow::slotDuplicate() { | |||
457 | raiseCurrentView(); | 323 | raiseCurrentView(); |
458 | } | 324 | } |
459 | void MainWindow::slotDelete() { | 325 | void MainWindow::slotItemDelete() { |
460 | if (!currentView()->current() ) | 326 | if (!currentView()->current() ) |
461 | return; | 327 | return; |
@@ -475,4 +341,16 @@ void MainWindow::slotDelete() { | |||
475 | raiseCurrentView(); | 341 | raiseCurrentView(); |
476 | } | 342 | } |
343 | |||
344 | static const char *beamfile = "/tmp/opie-todo.vcs"; | ||
345 | void MainWindow::slotItemBeam() { | ||
346 | beam( currentView()->current() ); | ||
347 | } | ||
348 | void MainWindow::slotItemFind() { | ||
349 | } | ||
350 | void MainWindow::slotConfigure() { | ||
351 | TemplateDialogImpl dlg( this, m_tempManager ); | ||
352 | if ( QPEApplication::execDialog( &dlg ) != QDialog::Accepted ) | ||
353 | m_tempManager->load(); | ||
354 | } | ||
477 | void MainWindow::slotDelete(int uid ) { | 355 | void MainWindow::slotDelete(int uid ) { |
478 | if( uid == 0 ) return; | 356 | if( uid == 0 ) return; |
@@ -521,33 +399,12 @@ void MainWindow::slotDeleteCompleted() { | |||
521 | currentView()->updateView( ); | 399 | currentView()->updateView( ); |
522 | } | 400 | } |
523 | void MainWindow::slotFind() { | ||
524 | |||
525 | } | ||
526 | void MainWindow::slotEdit() { | ||
527 | slotEdit( currentView()->current() ); | ||
528 | } | ||
529 | /* | 401 | /* |
530 | * set the category | 402 | * set the category |
531 | */ | 403 | */ |
532 | void MainWindow::setCategory( int c) { | 404 | void MainWindow::setCategory( const QString &category ) { |
533 | if ( c <= 0 ) return; | 405 | m_curCat = category; |
534 | 406 | if ( m_curCat == tr( "All" ) ) | |
535 | |||
536 | for ( unsigned int i = 1; i < m_catMenu->count(); i++ ) | ||
537 | m_catMenu->setItemChecked(i, c == (int)i ); | ||
538 | |||
539 | if (c == 1 ) { | ||
540 | m_curCat = QString::null; | 407 | m_curCat = QString::null; |
541 | setCaption( QWidget::tr("Todo") + " - " + QWidget::tr("All Categories" ) ); | 408 | |
542 | |||
543 | }else if ( c == (int)m_catMenu->count() - 1 ) { | ||
544 | m_curCat = QWidget::tr("Unfiled"); | ||
545 | setCaption( QWidget::tr("Todo") + " - " + QWidget::tr("Unfiled") ); | ||
546 | }else { | ||
547 | m_curCat = m_todoMgr.categories()[c-2]; | ||
548 | setCaption( QWidget::tr("Todo") + " - " + m_curCat ); | ||
549 | } | ||
550 | m_catMenu->setItemChecked( c, true ); | ||
551 | |||
552 | currentView()->setShowCategory( m_curCat ); | 409 | currentView()->setShowCategory( m_curCat ); |
553 | raiseCurrentView(); | 410 | raiseCurrentView(); |
@@ -578,9 +435,4 @@ void MainWindow::setDocument( const QString& fi) { | |||
578 | receiveFile(fi ); | 435 | receiveFile(fi ); |
579 | } | 436 | } |
580 | |||
581 | static const char *beamfile = "/tmp/opie-todo.vcs"; | ||
582 | void MainWindow::slotBeam() { | ||
583 | beam( currentView()->current() ); | ||
584 | } | ||
585 | void MainWindow::beamDone( Ir* ir) { | 437 | void MainWindow::beamDone( Ir* ir) { |
586 | delete ir; | 438 | delete ir; |
@@ -611,5 +463,5 @@ void MainWindow::receiveFile( const QString& filename ) { | |||
611 | 463 | ||
612 | void MainWindow::slotFlush() { | 464 | void MainWindow::slotFlush() { |
613 | m_syncing = TRUE; | 465 | m_syncing = true; |
614 | m_todoMgr.save(); | 466 | m_todoMgr.save(); |
615 | } | 467 | } |
@@ -617,29 +469,4 @@ void MainWindow::slotShowDetails() { | |||
617 | slotShow( currentView()->current() ); | 469 | slotShow( currentView()->current() ); |
618 | } | 470 | } |
619 | /* | ||
620 | * populate the Categories | ||
621 | * Menu | ||
622 | */ | ||
623 | void MainWindow::populateCategories() { | ||
624 | m_todoMgr.load(); | ||
625 | |||
626 | m_catMenu->clear(); | ||
627 | int id, rememberId; | ||
628 | id = 1; | ||
629 | rememberId = 1; | ||
630 | |||
631 | m_catMenu->insertItem( QWidget::tr( "All Categories" ), id++ ); | ||
632 | m_catMenu->insertSeparator(); | ||
633 | QStringList categories = m_todoMgr.categories(); | ||
634 | categories.append( QWidget::tr( "Unfiled" ) ); | ||
635 | for ( QStringList::Iterator it = categories.begin(); | ||
636 | it != categories.end(); ++it ) { | ||
637 | m_catMenu->insertItem( *it, id ); | ||
638 | if ( *it == currentCategory() ) | ||
639 | rememberId = id; | ||
640 | ++id; | ||
641 | } | ||
642 | setCategory( rememberId ); | ||
643 | } | ||
644 | bool MainWindow::showCompleted()const { | 471 | bool MainWindow::showCompleted()const { |
645 | return m_completed; | 472 | return m_completed; |
@@ -710,5 +537,5 @@ void MainWindow::slotEdit( int uid ) { | |||
710 | currentView()->replaceEvent( todo ); | 537 | currentView()->replaceEvent( todo ); |
711 | /* a Category might have changed */ | 538 | /* a Category might have changed */ |
712 | populateCategories(); | 539 | reloadCategories(); |
713 | } | 540 | } |
714 | 541 | ||
@@ -859,5 +686,5 @@ int MainWindow::create() { | |||
859 | // spend expensive time comparing all these strings... | 686 | // spend expensive time comparing all these strings... |
860 | // but only call if we changed something -zecke | 687 | // but only call if we changed something -zecke |
861 | populateCategories(); | 688 | reloadCategories(); |
862 | } | 689 | } |
863 | raiseCurrentView( ); | 690 | raiseCurrentView( ); |
@@ -916,5 +743,5 @@ void MainWindow::add( const OPimRecord& rec) { | |||
916 | // spend expensive time comparing all these strings... | 743 | // spend expensive time comparing all these strings... |
917 | // but only call if we changed something -zecke | 744 | // but only call if we changed something -zecke |
918 | populateCategories(); | 745 | reloadCategories(); |
919 | } | 746 | } |
920 | void MainWindow::slotReturnFromView() { | 747 | void MainWindow::slotReturnFromView() { |
@@ -1005,5 +832,5 @@ void MainWindow::doAlarm( const QDateTime& dt, int uid ) { | |||
1005 | startAlarm(); | 832 | startAlarm(); |
1006 | 833 | ||
1007 | QDialog dlg(this, 0, TRUE ); | 834 | QDialog dlg(this, 0, true ); |
1008 | QVBoxLayout* lay = new QVBoxLayout( &dlg ); | 835 | QVBoxLayout* lay = new QVBoxLayout( &dlg ); |
1009 | QTextView* view = new QTextView( &dlg ); | 836 | QTextView* view = new QTextView( &dlg ); |
diff --git a/core/pim/todo/mainwindow.h b/core/pim/todo/mainwindow.h index f0d6a42..c0fe805 100644 --- a/core/pim/todo/mainwindow.h +++ b/core/pim/todo/mainwindow.h | |||
@@ -1,24 +1,24 @@ | |||
1 | /* | 1 | /* |
2 | =. This file is part of the OPIE Project | 2 | =. This file is part of the OPIE Project |
3 | .=l. Copyright (c) 2002 Holger Freyther <zecke@handhelds.org> | 3 | .=l. Copyright (c) 2002 Holger Freyther <zecke@handhelds.org> |
4 | .>+-= | 4 | .>+-= |
5 | _;:, .> :=|. This program is free software; you can | 5 | _;:, .> :=|. This program is free software; you can |
6 | .> <`_, > . <= redistribute it and/or modify it under | 6 | .> <`_, > . <= redistribute it and/or modify it under |
7 | :`=1 )Y*s>-.-- : the terms of the GNU General Public | 7 | :`=1 )Y*s>-.-- : the terms of the GNU General Public |
8 | .="- .-=="i, .._ License as published by the Free Software | 8 | .="- .-=="i, .._ License as published by the Free Software |
9 | - . .-<_> .<> Foundation; either version 2 of the License, | 9 | - . .-<_> .<> Foundation; either version 2 of the License, |
10 | ._= =} : or (at your option) any later version. | 10 | ._= =} : or (at your option) any later version. |
11 | .%`+i> _;_. | 11 | .%`+i> _;_. |
12 | .i_,=:_. -<s. This program is distributed in the hope that | 12 | .i_,=:_. -<s. This program is distributed in the hope that |
13 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 13 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
14 | : .. .:, . . . without even the implied warranty of | 14 | : .. .:, . . . without even the implied warranty of |
15 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 15 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
16 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 16 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
17 | ..}^=.= = ; Library General Public License for more | 17 | ..}^=.= = ; Library General Public License for more |
18 | ++= -. .` .: details. | 18 | ++= -. .` .: details. |
19 | : = ...= . :.=- | 19 | : = ...= . :.=- |
20 | -. .:....=;==+<; You should have received a copy of the GNU | 20 | -. .:....=;==+<; You should have received a copy of the GNU |
21 | -_. . . )=. = Library General Public License along with | 21 | -_. . . )=. = Library General Public License along with |
22 | -- :-=` this library; see the file COPYING.LIB. | 22 | -- :-=` this library; see the file COPYING.LIB. |
23 | If not, write to the Free Software Foundation, | 23 | If not, write to the Free Software Foundation, |
24 | Inc., 59 Temple Place - Suite 330, | 24 | Inc., 59 Temple Place - Suite 330, |
@@ -55,5 +55,4 @@ namespace Todo { | |||
55 | class Editor; | 55 | class Editor; |
56 | class TodoShow; | 56 | class TodoShow; |
57 | class TemplateEditor; | ||
58 | struct QuickEditBase; | 57 | struct QuickEditBase; |
59 | 58 | ||
@@ -72,8 +71,4 @@ namespace Todo { | |||
72 | /** return a context menu for an OPimTodo */ | 71 | /** return a context menu for an OPimTodo */ |
73 | QPopupMenu* contextMenu(int uid, bool doesRecur = FALSE ); | 72 | QPopupMenu* contextMenu(int uid, bool doesRecur = FALSE ); |
74 | QPopupMenu* options(); | ||
75 | QPopupMenu* edit(); | ||
76 | QToolBar* toolbar(); | ||
77 | |||
78 | 73 | ||
79 | void updateList(); | 74 | void updateList(); |
@@ -95,10 +90,8 @@ namespace Todo { | |||
95 | 90 | ||
96 | void updateTodo( const OPimTodo& ); | 91 | void updateTodo( const OPimTodo& ); |
97 | void populateTemplates(); | ||
98 | Editor* currentEditor(); | 92 | Editor* currentEditor(); |
99 | void setReadAhead(uint count ); | 93 | void setReadAhead(uint count ); |
100 | private slots: | 94 | private slots: |
101 | void slotQuickEntered(); | 95 | void slotQuickEntered(); |
102 | void populateCategories(); | ||
103 | void slotReload(); | 96 | void slotReload(); |
104 | void slotFlush(); | 97 | void slotFlush(); |
@@ -118,5 +111,4 @@ private slots: | |||
118 | void initEditor(); | 111 | void initEditor(); |
119 | void initShow(); | 112 | void initShow(); |
120 | void initTemplate(); | ||
121 | void raiseCurrentView(); | 113 | void raiseCurrentView(); |
122 | ViewBase* currentView(); | 114 | ViewBase* currentView(); |
@@ -127,9 +119,5 @@ private slots: | |||
127 | TodoShow* currentShow(); | 119 | TodoShow* currentShow(); |
128 | TodoShow* m_curShow; | 120 | TodoShow* m_curShow; |
129 | TemplateEditor* currentTemplateEditor(); | ||
130 | TemplateEditor* m_curTempEd; | ||
131 | 121 | ||
132 | QMenuBar* m_bar; | ||
133 | QToolBar* m_tool; | ||
134 | QAction* m_editAction, | 122 | QAction* m_editAction, |
135 | *m_deleteAction, | 123 | *m_deleteAction, |
@@ -144,8 +132,4 @@ private slots: | |||
144 | *m_effectiveAction; | 132 | *m_effectiveAction; |
145 | Opie::Ui::OWidgetStack *m_stack; | 133 | Opie::Ui::OWidgetStack *m_stack; |
146 | QPopupMenu* m_catMenu, | ||
147 | *m_edit, | ||
148 | *m_options, | ||
149 | *m_template; | ||
150 | 134 | ||
151 | bool m_syncing:1; | 135 | bool m_syncing:1; |
@@ -162,4 +146,14 @@ private slots: | |||
162 | 146 | ||
163 | private slots: | 147 | private slots: |
148 | void initStuff(); | ||
149 | |||
150 | void slotItemNew(); | ||
151 | void slotItemEdit(); | ||
152 | void slotItemDuplicate(); | ||
153 | void slotItemDelete(); | ||
154 | void slotItemBeam(); | ||
155 | void slotItemFind(); | ||
156 | void slotConfigure(); | ||
157 | |||
164 | void slotShow(int); | 158 | void slotShow(int); |
165 | void slotEdit(int); | 159 | void slotEdit(int); |
@@ -167,17 +161,11 @@ private slots: | |||
167 | void slotComplete( int uid ); | 161 | void slotComplete( int uid ); |
168 | void slotComplete( const OPimTodo& ev ); | 162 | void slotComplete( const OPimTodo& ev ); |
169 | void slotNewFromTemplate(int id ); | ||
170 | void slotNew(); | ||
171 | void slotDuplicate(); | ||
172 | 163 | ||
173 | void slotDelete(); | ||
174 | void slotDelete(int uid ); | 164 | void slotDelete(int uid ); |
175 | void slotDeleteAll(); | 165 | void slotDeleteAll(); |
176 | void slotDeleteCompleted(); | 166 | void slotDeleteCompleted(); |
177 | 167 | ||
178 | void slotEdit(); | ||
179 | void slotFind(); | ||
180 | 168 | ||
181 | void setCategory( int ); | 169 | void setCategory( const QString &category ); |
182 | 170 | ||
183 | void slotShowDeadLine( bool ); | 171 | void slotShowDeadLine( bool ); |
@@ -188,5 +176,4 @@ private slots: | |||
188 | 176 | ||
189 | 177 | ||
190 | void slotBeam(); | ||
191 | void beamDone( Ir* ); | 178 | void beamDone( Ir* ); |
192 | void slotShowDetails(); | 179 | void slotShowDetails(); |
diff --git a/core/pim/todo/newtaskdlg.cpp b/core/pim/todo/newtaskdlg.cpp new file mode 100644 index 0000000..0b5a29d --- a/dev/null +++ b/core/pim/todo/newtaskdlg.cpp | |||
@@ -0,0 +1,78 @@ | |||
1 | /* | ||
2 | =. This file is part of the OPIE Project | ||
3 | .=l. Copyright (c) 2005 Dan Williams <drw@handhelds.org> | ||
4 | .>+-= | ||
5 | _;:, .> :=|. This program is free software; you can | ||
6 | .> <`_, > . <= redistribute it and/or modify it under | ||
7 | :`=1 )Y*s>-.-- : the terms of the GNU General Public | ||
8 | .="- .-=="i, .._ License as published by the Free Software | ||
9 | - . .-<_> .<> Foundation; either version 2 of the License, | ||
10 | ._= =} : or (at your option) any later version. | ||
11 | .%`+i> _;_. | ||
12 | .i_,=:_. -<s. This program is distributed in the hope that | ||
13 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | ||
14 | : .. .:, . . . without even the implied warranty of | ||
15 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | ||
16 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | ||
17 | ..}^=.= = ; Library General Public License for more | ||
18 | ++= -. .` .: details. | ||
19 | : = ...= . :.=- | ||
20 | -. .:....=;==+<; You should have received a copy of the GNU | ||
21 | -_. . . )=. = General Public License along with | ||
22 | -- :-=` this library; see the file COPYING.LIB. | ||
23 | If not, write to the Free Software Foundation, | ||
24 | Inc., 59 Temple Place - Suite 330, | ||
25 | Boston, MA 02111-1307, USA. | ||
26 | |||
27 | */ | ||
28 | |||
29 | #include "newtaskdlg.h" | ||
30 | |||
31 | #include <qbuttongroup.h> | ||
32 | #include <qcombobox.h> | ||
33 | #include <qlayout.h> | ||
34 | #include <qradiobutton.h> | ||
35 | |||
36 | NewTaskDlg::NewTaskDlg( const QStringList &templates, QWidget *parent ) | ||
37 | : QDialog( parent, QString::null, true, WStyle_ContextHelp ) | ||
38 | { | ||
39 | setCaption( tr( "New Task" ) ); | ||
40 | |||
41 | QButtonGroup *bg = new QButtonGroup( this ); | ||
42 | bg->hide(); | ||
43 | |||
44 | QVBoxLayout *layout = new QVBoxLayout( this, 10, 3 ); | ||
45 | |||
46 | QRadioButton *btn = new QRadioButton( tr( "Blank task" ), this ); | ||
47 | btn->setChecked( true ); | ||
48 | bg->insert( btn ); | ||
49 | layout->addWidget( btn ); | ||
50 | |||
51 | layout->addStretch(); | ||
52 | |||
53 | m_useTemplate = new QRadioButton( tr( "Using template:" ), this ); | ||
54 | connect( m_useTemplate, SIGNAL(toggled(bool)), this, SLOT(slotUseTemplate(bool)) ); | ||
55 | bg->insert( m_useTemplate ); | ||
56 | layout->addWidget( m_useTemplate ); | ||
57 | |||
58 | m_templateList = new QComboBox( this ); | ||
59 | m_templateList->insertStringList( templates ); | ||
60 | m_templateList->setEnabled( false ); | ||
61 | layout->addWidget( m_templateList ); | ||
62 | |||
63 | layout->addStretch(); | ||
64 | } | ||
65 | |||
66 | QString NewTaskDlg::tempSelected() { | ||
67 | QString tempStr; | ||
68 | if ( m_useTemplate->isChecked() ) | ||
69 | tempStr = m_templateList->currentText(); | ||
70 | |||
71 | return tempStr; | ||
72 | } | ||
73 | |||
74 | void NewTaskDlg::slotUseTemplate( bool on ) { | ||
75 | m_templateList->setEnabled( on ); | ||
76 | if ( on ) | ||
77 | m_templateList->setFocus(); | ||
78 | } | ||
diff --git a/core/pim/todo/newtaskdlg.h b/core/pim/todo/newtaskdlg.h new file mode 100644 index 0000000..31398b3 --- a/dev/null +++ b/core/pim/todo/newtaskdlg.h | |||
@@ -0,0 +1,56 @@ | |||
1 | /* | ||
2 | =. This file is part of the OPIE Project | ||
3 | .=l. Copyright (c) 2002 <> | ||
4 | .>+-= | ||
5 | _;:, .> :=|. This program is free software; you can | ||
6 | .> <`_, > . <= redistribute it and/or modify it under | ||
7 | :`=1 )Y*s>-.-- : the terms of the GNU General Public | ||
8 | .="- .-=="i, .._ License as published by the Free Software | ||
9 | - . .-<_> .<> Foundation; either version 2 of the License, | ||
10 | ._= =} : or (at your option) any later version. | ||
11 | .%`+i> _;_. | ||
12 | .i_,=:_. -<s. This program is distributed in the hope that | ||
13 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | ||
14 | : .. .:, . . . without even the implied warranty of | ||
15 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | ||
16 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | ||
17 | ..}^=.= = ; Library General Public License for more | ||
18 | ++= -. .` .: details. | ||
19 | : = ...= . :.=- | ||
20 | -. .:....=;==+<; You should have received a copy of the GNU | ||
21 | -_. . . )=. = General Public License along with | ||
22 | -- :-=` this library; see the file COPYING.LIB. | ||
23 | If not, write to the Free Software Foundation, | ||
24 | Inc., 59 Temple Place - Suite 330, | ||
25 | Boston, MA 02111-1307, USA. | ||
26 | |||
27 | */ | ||
28 | |||
29 | #ifndef NEWTASKDLG_H | ||
30 | #define NEWTASKDLG_H | ||
31 | |||
32 | #include <qdialog.h> | ||
33 | |||
34 | #include <qstringlist.h> | ||
35 | |||
36 | class QComboBox; | ||
37 | class QRadioButton; | ||
38 | |||
39 | class NewTaskDlg : public QDialog | ||
40 | { | ||
41 | Q_OBJECT | ||
42 | |||
43 | public: | ||
44 | NewTaskDlg( const QStringList &templates, QWidget *parent = 0l ); | ||
45 | |||
46 | QString tempSelected(); | ||
47 | |||
48 | private: | ||
49 | QRadioButton *m_useTemplate; | ||
50 | QComboBox *m_templateList; | ||
51 | |||
52 | private slots: | ||
53 | void slotUseTemplate( bool on ); | ||
54 | }; | ||
55 | |||
56 | #endif | ||
diff --git a/core/pim/todo/tableview.cpp b/core/pim/todo/tableview.cpp index 221faca..c64ad46 100644 --- a/core/pim/todo/tableview.cpp +++ b/core/pim/todo/tableview.cpp | |||
@@ -1,24 +1,24 @@ | |||
1 | /* | 1 | /* |
2 | =. This file is part of the OPIE Project | 2 | =. This file is part of the OPIE Project |
3 | .=l. Copyright (c) 2002 <zecke> | 3 | .=l. Copyright (c) 2002 <zecke> |
4 | .>+-= | 4 | .>+-= |
5 | _;:, .> :=|. This program is free software; you can | 5 | _;:, .> :=|. This program is free software; you can |
6 | .> <`_, > . <= redistribute it and/or modify it under | 6 | .> <`_, > . <= redistribute it and/or modify it under |
7 | :`=1 )Y*s>-.-- : the terms of the GNU General Public | 7 | :`=1 )Y*s>-.-- : the terms of the GNU General Public |
8 | .="- .-=="i, .._ License as published by the Free Software | 8 | .="- .-=="i, .._ License as published by the Free Software |
9 | - . .-<_> .<> Foundation; either version 2 of the License, | 9 | - . .-<_> .<> Foundation; either version 2 of the License, |
10 | ._= =} : or (at your option) any later version. | 10 | ._= =} : or (at your option) any later version. |
11 | .%`+i> _;_. | 11 | .%`+i> _;_. |
12 | .i_,=:_. -<s. This program is distributed in the hope that | 12 | .i_,=:_. -<s. This program is distributed in the hope that |
13 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 13 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
14 | : .. .:, . . . without even the implied warranty of | 14 | : .. .:, . . . without even the implied warranty of |
15 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 15 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
16 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 16 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
17 | ..}^=.= = ; Library General Public License for more | 17 | ..}^=.= = ; Library General Public License for more |
18 | ++= -. .` .: details. | 18 | ++= -. .` .: details. |
19 | : = ...= . :.=- | 19 | : = ...= . :.=- |
20 | -. .:....=;==+<; You should have received a copy of the GNU | 20 | -. .:....=;==+<; You should have received a copy of the GNU |
21 | -_. . . )=. = Library General Public License along with | 21 | -_. . . )=. = Library General Public License along with |
22 | -- :-=` this library; see the file COPYING.LIB. | 22 | -- :-=` this library; see the file COPYING.LIB. |
23 | If not, write to the Free Software Foundation, | 23 | If not, write to the Free Software Foundation, |
24 | Inc., 59 Temple Place - Suite 330, | 24 | Inc., 59 Temple Place - Suite 330, |
@@ -34,9 +34,9 @@ | |||
34 | 34 | ||
35 | #include <qpe/config.h> | 35 | #include <qpe/config.h> |
36 | #include <qpe/qpeapplication.h> | ||
36 | #include <qpe/resource.h> | 37 | #include <qpe/resource.h> |
37 | 38 | ||
38 | #include <qcombobox.h> | 39 | #include <qcombobox.h> |
39 | #include <qlineedit.h> | 40 | #include <qlineedit.h> |
40 | #include <qtimer.h> | ||
41 | #include <qpopupmenu.h> | 41 | #include <qpopupmenu.h> |
42 | 42 | ||
@@ -118,8 +118,7 @@ TableView::TableView( MainWindow* window, QWidget* wid ) | |||
118 | verticalHeader()->hide(); | 118 | verticalHeader()->hide(); |
119 | 119 | ||
120 | QPEApplication::setStylusOperation( viewport(), QPEApplication::RightOnHold ); | ||
120 | connect((QTable*)this, SIGNAL( clicked(int,int,int,const QPoint&) ), | 121 | connect((QTable*)this, SIGNAL( clicked(int,int,int,const QPoint&) ), |
121 | this, SLOT( slotClicked(int,int,int,const QPoint&) ) ); | 122 | this, SLOT( slotClicked(int,int,int,const QPoint&) ) ); |
122 | connect((QTable*)this, SIGNAL( pressed(int,int,int,const QPoint&) ), | ||
123 | this, SLOT( slotPressed(int,int,int,const QPoint&) ) ); | ||
124 | connect((QTable*)this, SIGNAL(valueChanged(int,int) ), | 123 | connect((QTable*)this, SIGNAL(valueChanged(int,int) ), |
125 | this, SLOT( slotValueChanged(int,int) ) ); | 124 | this, SLOT( slotValueChanged(int,int) ) ); |
@@ -127,8 +126,4 @@ TableView::TableView( MainWindow* window, QWidget* wid ) | |||
127 | this, SLOT( slotCurrentChanged(int,int) ) ); | 126 | this, SLOT( slotCurrentChanged(int,int) ) ); |
128 | 127 | ||
129 | m_menuTimer = new QTimer( this ); | ||
130 | connect( m_menuTimer, SIGNAL(timeout()), | ||
131 | this, SLOT(slotShowMenu()) ); | ||
132 | |||
133 | /* now let's init the config */ | 128 | /* now let's init the config */ |
134 | initConfig(); | 129 | initConfig(); |
@@ -158,9 +153,4 @@ TableView::~TableView() { | |||
158 | config.writeEntry("Width"+QString::number(i), columnWidth(i) ); | 153 | config.writeEntry("Width"+QString::number(i), columnWidth(i) ); |
159 | } | 154 | } |
160 | void TableView::slotShowMenu() { | ||
161 | QPopupMenu *menu = todoWindow()->contextMenu( current(), sorted()[currentRow()].recurrence().doesRecur() ); | ||
162 | menu->exec(QCursor::pos() ); | ||
163 | delete menu; | ||
164 | } | ||
165 | QString TableView::type() const { | 155 | QString TableView::type() const { |
166 | return QString::fromLatin1( tr("Table View") ); | 156 | return QString::fromLatin1( tr("Table View") ); |
@@ -281,8 +271,7 @@ void TableView::setShowCategory( const QString& str) { | |||
281 | if ( str != m_oleCat || m_first ) | 271 | if ( str != m_oleCat || m_first ) |
282 | updateView(); | 272 | updateView(); |
283 | 273 | ||
284 | m_oleCat = str; | 274 | m_oleCat = str; |
285 | m_first = false; | 275 | m_first = false; |
286 | |||
287 | } | 276 | } |
288 | void TableView::clear() { | 277 | void TableView::clear() { |
@@ -327,10 +316,8 @@ void TableView::slotClicked(int row, int col, int, | |||
327 | 316 | ||
328 | case 2: { | 317 | case 2: { |
329 | m_menuTimer->stop(); | ||
330 | showTodo( ui ); | 318 | showTodo( ui ); |
331 | break; | 319 | break; |
332 | } | 320 | } |
333 | case 3: { | 321 | case 3: { |
334 | m_menuTimer->stop(); | ||
335 | TodoView::edit( ui ); | 322 | TodoView::edit( ui ); |
336 | break; | 323 | break; |
@@ -340,17 +327,4 @@ void TableView::slotClicked(int row, int col, int, | |||
340 | 327 | ||
341 | } | 328 | } |
342 | void TableView::slotPressed(int row, int col, int, | ||
343 | const QPoint& point) { | ||
344 | |||
345 | m_prevP = point; | ||
346 | /* TextColumn column */ | ||
347 | if ( col == 2 && cellGeometry( row, col ).contains( point ) ) | ||
348 | m_menuTimer->start( 750, TRUE ); | ||
349 | } | ||
350 | void TableView::slotValueChanged( int, int ) { | ||
351 | } | ||
352 | void TableView::slotCurrentChanged(int, int ) { | ||
353 | m_menuTimer->stop(); | ||
354 | } | ||
355 | QWidget* TableView::widget() { | 329 | QWidget* TableView::widget() { |
356 | return this; | 330 | return this; |
@@ -580,5 +554,5 @@ void TableView::timerEvent( QTimerEvent* ) { | |||
580 | * row and two columns! | 554 | * row and two columns! |
581 | */ | 555 | */ |
582 | void TableView::contentsMouseReleaseEvent( QMouseEvent* e) { | 556 | void TableView::contentsMouseReleaseEvent( QMouseEvent *e ) { |
583 | int row = rowAt(m_prevP.y()); | 557 | int row = rowAt(m_prevP.y()); |
584 | int colOld = columnAt(m_prevP.x() ); | 558 | int colOld = columnAt(m_prevP.x() ); |
@@ -591,7 +565,13 @@ void TableView::contentsMouseReleaseEvent( QMouseEvent* e) { | |||
591 | QTable::contentsMouseReleaseEvent( e ); | 565 | QTable::contentsMouseReleaseEvent( e ); |
592 | } | 566 | } |
593 | void TableView::contentsMouseMoveEvent( QMouseEvent* e ) { | 567 | void TableView::contentsMousePressEvent( QMouseEvent *e ) { |
594 | m_menuTimer->stop(); | 568 | if ( e->button() == RightButton ) { |
595 | QTable::contentsMouseMoveEvent( e ); | 569 | QPopupMenu *menu = todoWindow()->contextMenu( current(), sorted()[currentRow()].recurrence().doesRecur() ); |
570 | menu->exec( QCursor::pos() ); | ||
571 | } | ||
572 | else { | ||
573 | m_prevP = e->pos(); | ||
574 | QTable::contentsMousePressEvent( e ); | ||
575 | } | ||
596 | } | 576 | } |
597 | void TableView::keyPressEvent( QKeyEvent* event) { | 577 | void TableView::keyPressEvent( QKeyEvent* event) { |
diff --git a/core/pim/todo/tableview.h b/core/pim/todo/tableview.h index 7f78255..46c16e1 100644 --- a/core/pim/todo/tableview.h +++ b/core/pim/todo/tableview.h | |||
@@ -1,24 +1,24 @@ | |||
1 | /* | 1 | /* |
2 | =. This file is part of the OPIE Project | 2 | =. This file is part of the OPIE Project |
3 | .=l. Copyright (c) 2002 <> | 3 | .=l. Copyright (c) 2002 <> |
4 | .>+-= | 4 | .>+-= |
5 | _;:, .> :=|. This program is free software; you can | 5 | _;:, .> :=|. This program is free software; you can |
6 | .> <`_, > . <= redistribute it and/or modify it under | 6 | .> <`_, > . <= redistribute it and/or modify it under |
7 | :`=1 )Y*s>-.-- : the terms of the GNU General Public | 7 | :`=1 )Y*s>-.-- : the terms of the GNU General Public |
8 | .="- .-=="i, .._ License as published by the Free Software | 8 | .="- .-=="i, .._ License as published by the Free Software |
9 | - . .-<_> .<> Foundation; either version 2 of the License, | 9 | - . .-<_> .<> Foundation; either version 2 of the License, |
10 | ._= =} : or (at your option) any later version. | 10 | ._= =} : or (at your option) any later version. |
11 | .%`+i> _;_. | 11 | .%`+i> _;_. |
12 | .i_,=:_. -<s. This program is distributed in the hope that | 12 | .i_,=:_. -<s. This program is distributed in the hope that |
13 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 13 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
14 | : .. .:, . . . without even the implied warranty of | 14 | : .. .:, . . . without even the implied warranty of |
15 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 15 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
16 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 16 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
17 | ..}^=.= = ; Library General Public License for more | 17 | ..}^=.= = ; Library General Public License for more |
18 | ++= -. .` .: details. | 18 | ++= -. .` .: details. |
19 | : = ...= . :.=- | 19 | : = ...= . :.=- |
20 | -. .:....=;==+<; You should have received a copy of the GNU | 20 | -. .:....=;==+<; You should have received a copy of the GNU |
21 | -_. . . )=. = Library General Public License along with | 21 | -_. . . )=. = Library General Public License along with |
22 | -- :-=` this library; see the file COPYING.LIB. | 22 | -- :-=` this library; see the file COPYING.LIB. |
23 | If not, write to the Free Software Foundation, | 23 | If not, write to the Free Software Foundation, |
24 | Inc., 59 Temple Place - Suite 330, | 24 | Inc., 59 Temple Place - Suite 330, |
@@ -79,5 +79,4 @@ namespace Todo { | |||
79 | /* reimplented for internal reasons */ | 79 | /* reimplented for internal reasons */ |
80 | void viewportPaintEvent( QPaintEvent* ); | 80 | void viewportPaintEvent( QPaintEvent* ); |
81 | QTimer *m_menuTimer; | ||
82 | bool m_enablePaint:1; | 81 | bool m_enablePaint:1; |
83 | QString m_oleCat; | 82 | QString m_oleCat; |
@@ -89,6 +88,6 @@ namespace Todo { | |||
89 | protected: | 88 | protected: |
90 | void keyPressEvent( QKeyEvent* ); | 89 | void keyPressEvent( QKeyEvent* ); |
91 | void contentsMouseReleaseEvent( QMouseEvent* ); | 90 | void contentsMouseReleaseEvent( QMouseEvent *e ); |
92 | void contentsMouseMoveEvent( QMouseEvent* ); | 91 | void contentsMousePressEvent( QMouseEvent *e ); |
93 | void timerEvent( QTimerEvent* e ); | 92 | void timerEvent( QTimerEvent* e ); |
94 | QWidget* createEditor(int row, int col, bool initFromCell )const; | 93 | QWidget* createEditor(int row, int col, bool initFromCell )const; |
@@ -112,11 +111,6 @@ namespace Todo { | |||
112 | 111 | ||
113 | private slots: | 112 | private slots: |
114 | void slotShowMenu(); | ||
115 | void slotClicked(int, int, int, | 113 | void slotClicked(int, int, int, |
116 | const QPoint& ); | 114 | const QPoint& ); |
117 | void slotPressed(int, int, int, | ||
118 | const QPoint& ); | ||
119 | void slotValueChanged(int, int); | ||
120 | void slotCurrentChanged(int, int ); | ||
121 | void slotPriority(); | 115 | void slotPriority(); |
122 | private: | 116 | private: |
diff --git a/core/pim/todo/templateeditor.cpp b/core/pim/todo/templateeditor.cpp deleted file mode 100644 index ca02173..0000000 --- a/core/pim/todo/templateeditor.cpp +++ b/dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | #include <qaction.h> | ||
2 | #include <qpopupmenu.h> | ||
3 | |||
4 | #include "mainwindow.h" | ||
5 | #include "todotemplatemanager.h" | ||
6 | |||
7 | #include "templatedialogimpl.h" | ||
8 | #include "templateeditor.h" | ||
9 | |||
10 | using namespace Todo; | ||
11 | |||
12 | TemplateEditor::TemplateEditor( MainWindow* main, | ||
13 | TemplateManager* manager ) | ||
14 | : QObject( main ), m_main( main ), m_man( manager ) | ||
15 | { | ||
16 | init(); | ||
17 | |||
18 | } | ||
19 | TemplateEditor::~TemplateEditor() { | ||
20 | |||
21 | } | ||
22 | /* ok we add us to the Menubar */ | ||
23 | void TemplateEditor::init() { | ||
24 | QAction* a = new QAction( QString::null, QWidget::tr("Configure Templates"), | ||
25 | 0, this, 0, FALSE ); | ||
26 | connect(a, SIGNAL(activated() ), | ||
27 | this, SLOT(setUp() ) ); | ||
28 | |||
29 | a->addTo( m_main->options() ); | ||
30 | } | ||
31 | void TemplateEditor::setUp() { | ||
32 | TemplateDialogImpl dlg(m_main, m_man ); | ||
33 | int ret= dlg.exec(); | ||
34 | if (QDialog::Accepted != ret ) | ||
35 | m_man->load(); | ||
36 | else | ||
37 | m_main->populateTemplates(); | ||
38 | } | ||
diff --git a/core/pim/todo/templateeditor.h b/core/pim/todo/templateeditor.h deleted file mode 100644 index e551328..0000000 --- a/core/pim/todo/templateeditor.h +++ b/dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | #ifndef OPIE_TEMPLATE_EDITOR_H | ||
2 | #define OPIE_TEMPLATE_EDITOR_H | ||
3 | |||
4 | #include <qobject.h> | ||
5 | #include <qdialog.h> | ||
6 | #include <qstring.h> | ||
7 | |||
8 | namespace Todo { | ||
9 | |||
10 | class MainWindow; | ||
11 | class TemplateManager; | ||
12 | class TemplateEditor : public QObject{ | ||
13 | Q_OBJECT | ||
14 | public: | ||
15 | TemplateEditor( MainWindow* win, | ||
16 | TemplateManager* man); | ||
17 | ~TemplateEditor(); | ||
18 | |||
19 | signals: | ||
20 | void configChanged(); | ||
21 | private: | ||
22 | void init(); | ||
23 | MainWindow* m_main; | ||
24 | TemplateManager* m_man; | ||
25 | private slots: | ||
26 | void setUp(); | ||
27 | |||
28 | }; | ||
29 | }; | ||
30 | |||
31 | #endif | ||
diff --git a/core/pim/todo/todo.pro b/core/pim/todo/todo.pro index 6c082cf..9b60818 100644 --- a/core/pim/todo/todo.pro +++ b/core/pim/todo/todo.pro | |||
@@ -12,5 +12,4 @@ HEADERS = smalltodo.h \ | |||
12 | todoshow.h \ | 12 | todoshow.h \ |
13 | textviewshow.h \ | 13 | textviewshow.h \ |
14 | templateeditor.h \ | ||
15 | templatedialog.h \ | 14 | templatedialog.h \ |
16 | templatedialogimpl.h \ | 15 | templatedialogimpl.h \ |
@@ -20,5 +19,6 @@ HEADERS = smalltodo.h \ | |||
20 | taskeditoroverview.h \ | 19 | taskeditoroverview.h \ |
21 | taskeditorstatus.h \ | 20 | taskeditorstatus.h \ |
22 | taskeditoralarms.h | 21 | taskeditoralarms.h \ |
22 | newtaskdlg.h | ||
23 | 23 | ||
24 | SOURCES= smalltodo.cpp \ | 24 | SOURCES= smalltodo.cpp \ |
@@ -32,5 +32,4 @@ SOURCES = smalltodo.cpp \ | |||
32 | todoshow.cpp \ | 32 | todoshow.cpp \ |
33 | textviewshow.cpp \ | 33 | textviewshow.cpp \ |
34 | templateeditor.cpp \ | ||
35 | templatedialog.cpp \ | 34 | templatedialog.cpp \ |
36 | templatedialogimpl.cpp \ | 35 | templatedialogimpl.cpp \ |
@@ -40,5 +39,6 @@ SOURCES = smalltodo.cpp \ | |||
40 | taskeditoroverview.cpp \ | 39 | taskeditoroverview.cpp \ |
41 | taskeditorstatus.cpp \ | 40 | taskeditorstatus.cpp \ |
42 | taskeditoralarms.cpp | 41 | taskeditoralarms.cpp \ |
42 | newtaskdlg.cpp | ||
43 | 43 | ||
44 | TARGET = todolist | 44 | TARGET = todolist |
diff --git a/core/pim/todo/todomanager.cpp b/core/pim/todo/todomanager.cpp index 7136f9a..fcd5f0e 100644 --- a/core/pim/todo/todomanager.cpp +++ b/core/pim/todo/todomanager.cpp | |||
@@ -1,24 +1,24 @@ | |||
1 | /* | 1 | /* |
2 | =. This file is part of the OPIE Project | 2 | =. This file is part of the OPIE Project |
3 | .=l. Copyright (c) 2002 <> | 3 | .=l. Copyright (c) 2002 <> |
4 | .>+-= | 4 | .>+-= |
5 | _;:, .> :=|. This program is free software; you can | 5 | _;:, .> :=|. This program is free software; you can |
6 | .> <`_, > . <= redistribute it and/or modify it under | 6 | .> <`_, > . <= redistribute it and/or modify it under |
7 | :`=1 )Y*s>-.-- : the terms of the GNU General Public | 7 | :`=1 )Y*s>-.-- : the terms of the GNU General Public |
8 | .="- .-=="i, .._ License as published by the Free Software | 8 | .="- .-=="i, .._ License as published by the Free Software |
9 | - . .-<_> .<> Foundation; either version 2 of the License, | 9 | - . .-<_> .<> Foundation; either version 2 of the License, |
10 | ._= =} : or (at your option) any later version. | 10 | ._= =} : or (at your option) any later version. |
11 | .%`+i> _;_. | 11 | .%`+i> _;_. |
12 | .i_,=:_. -<s. This program is distributed in the hope that | 12 | .i_,=:_. -<s. This program is distributed in the hope that |
13 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 13 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
14 | : .. .:, . . . without even the implied warranty of | 14 | : .. .:, . . . without even the implied warranty of |
15 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 15 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
16 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 16 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
17 | ..}^=.= = ; Library General Public License for more | 17 | ..}^=.= = ; Library General Public License for more |
18 | ++= -. .` .: details. | 18 | ++= -. .` .: details. |
19 | : = ...= . :.=- | 19 | : = ...= . :.=- |
20 | -. .:....=;==+<; You should have received a copy of the GNU | 20 | -. .:....=;==+<; You should have received a copy of the GNU |
21 | -_. . . )=. = Library General Public License along with | 21 | -_. . . )=. = Library General Public License along with |
22 | -- :-=` this library; see the file COPYING.LIB. | 22 | -- :-=` this library; see the file COPYING.LIB. |
23 | If not, write to the Free Software Foundation, | 23 | If not, write to the Free Software Foundation, |
24 | Inc., 59 Temple Place - Suite 330, | 24 | Inc., 59 Temple Place - Suite 330, |
@@ -38,4 +38,5 @@ TodoManager::TodoManager( QObject *obj ) | |||
38 | : QObject( obj ) { | 38 | : QObject( obj ) { |
39 | m_db = 0l; | 39 | m_db = 0l; |
40 | m_cat.load( categoryFileName() ); | ||
40 | } | 41 | } |
41 | TodoManager::~TodoManager() { | 42 | TodoManager::~TodoManager() { |