author | groucho <groucho> | 2003-01-29 14:55:41 (UTC) |
---|---|---|
committer | groucho <groucho> | 2003-01-29 14:55:41 (UTC) |
commit | 7f31c266fbd10e41c206e68bdf59ab39bca32067 (patch) (unidiff) | |
tree | d4f171a53313713651e87edeb90a55d68be56ac4 /core | |
parent | 59a67d792570e231d2de14cee78ff75fa79453ec (diff) | |
download | opie-7f31c266fbd10e41c206e68bdf59ab39bca32067.zip opie-7f31c266fbd10e41c206e68bdf59ab39bca32067.tar.gz opie-7f31c266fbd10e41c206e68bdf59ab39bca32067.tar.bz2 |
Changed some code to make all strings translatable
-rw-r--r-- | core/pim/todo/mainwindow.cpp | 100 | ||||
-rw-r--r-- | core/pim/todo/tableview.cpp | 8 | ||||
-rw-r--r-- | core/pim/todo/taskeditoroverview.cpp | 2 | ||||
-rw-r--r-- | core/pim/todo/templateeditor.cpp | 2 |
4 files changed, 56 insertions, 56 deletions
diff --git a/core/pim/todo/mainwindow.cpp b/core/pim/todo/mainwindow.cpp index d16d1ac..c90166b 100644 --- a/core/pim/todo/mainwindow.cpp +++ b/core/pim/todo/mainwindow.cpp | |||
@@ -67,198 +67,198 @@ MainWindow::MainWindow( QWidget* parent, | |||
67 | { | 67 | { |
68 | m_syncing = false; | 68 | m_syncing = false; |
69 | m_counter = 0; | 69 | m_counter = 0; |
70 | m_tempManager = new TemplateManager(); | 70 | m_tempManager = new TemplateManager(); |
71 | m_tempManager->load(); | 71 | m_tempManager->load(); |
72 | 72 | ||
73 | initUI(); | 73 | initUI(); |
74 | initConfig(); | 74 | initConfig(); |
75 | initViews(); | 75 | initViews(); |
76 | initActions(); | 76 | initActions(); |
77 | initEditor(); | 77 | initEditor(); |
78 | initShow(); | 78 | initShow(); |
79 | initTemplate(); | 79 | initTemplate(); |
80 | 80 | ||
81 | populateTemplates(); | 81 | populateTemplates(); |
82 | raiseCurrentView(); | 82 | raiseCurrentView(); |
83 | QTimer::singleShot(0, this, SLOT(populateCategories() ) ); | 83 | QTimer::singleShot(0, this, SLOT(populateCategories() ) ); |
84 | } | 84 | } |
85 | void MainWindow::initTemplate() { | 85 | void MainWindow::initTemplate() { |
86 | m_curTempEd = new TemplateEditor( this, templateManager() ); | 86 | m_curTempEd = new TemplateEditor( this, templateManager() ); |
87 | } | 87 | } |
88 | void MainWindow::initActions() { | 88 | void MainWindow::initActions() { |
89 | 89 | ||
90 | // Data menu | 90 | // Data menu |
91 | m_edit->insertItem(tr("New from template"), m_template, | 91 | m_edit->insertItem(QWidget::tr("New from template"), m_template, |
92 | -1, 0 ); | 92 | -1, 0 ); |
93 | 93 | ||
94 | QAction* a = new QAction( tr("New Task" ), Resource::loadPixmap( "new" ), | 94 | QAction* a = new QAction( QWidget::tr("New Task" ), Resource::loadPixmap( "new" ), |
95 | QString::null, 0, this, 0 ); | 95 | QString::null, 0, this, 0 ); |
96 | connect(a, SIGNAL( activated() ), | 96 | connect(a, SIGNAL( activated() ), |
97 | this, SLOT( slotNew() ) ); | 97 | this, SLOT( slotNew() ) ); |
98 | a->setWhatsThis( tr( "Click here to create a new task." ) ); | 98 | a->setWhatsThis( QWidget::tr( "Click here to create a new task." ) ); |
99 | a->addTo(m_tool ); | 99 | a->addTo(m_tool ); |
100 | a->addTo(m_edit ); | 100 | a->addTo(m_edit ); |
101 | 101 | ||
102 | a = new QAction( tr("Edit Task"), Resource::loadIconSet( "edit" ), | 102 | a = new QAction( QWidget::tr("Edit Task"), Resource::loadIconSet( "edit" ), |
103 | QString::null, 0, this, 0 ); | 103 | QString::null, 0, this, 0 ); |
104 | connect(a, SIGNAL(activated() ), | 104 | connect(a, SIGNAL(activated() ), |
105 | this, SLOT( slotEdit() ) ); | 105 | this, SLOT( slotEdit() ) ); |
106 | a->setWhatsThis( tr( "Click here to modify the current task." ) ); | 106 | a->setWhatsThis( QWidget::tr( "Click here to modify the current task." ) ); |
107 | a->addTo( m_tool ); | 107 | a->addTo( m_tool ); |
108 | a->addTo( m_edit ); | 108 | a->addTo( m_edit ); |
109 | m_editAction = a; | 109 | m_editAction = a; |
110 | 110 | ||
111 | a = new QAction( QString::null, tr("View Task"), 0, this, 0 ); | 111 | a = new QAction( QString::null, QWidget::tr("View Task"), 0, this, 0 ); |
112 | connect(a, SIGNAL( activated() ), | 112 | connect(a, SIGNAL( activated() ), |
113 | this, SLOT( slotShowDetails() ) ); | 113 | this, SLOT( slotShowDetails() ) ); |
114 | a->addTo( m_edit ); | 114 | a->addTo( m_edit ); |
115 | 115 | ||
116 | m_edit->insertSeparator(); | 116 | m_edit->insertSeparator(); |
117 | 117 | ||
118 | a = new QAction( tr("Delete..."), Resource::loadIconSet( "trash" ), | 118 | a = new QAction( QWidget::tr("Delete..."), Resource::loadIconSet( "trash" ), |
119 | QString::null, 0, this, 0 ); | 119 | QString::null, 0, this, 0 ); |
120 | connect(a, SIGNAL(activated() ), | 120 | connect(a, SIGNAL(activated() ), |
121 | this, SLOT(slotDelete() ) ); | 121 | this, SLOT(slotDelete() ) ); |
122 | a->setWhatsThis( tr( "Click here to remove the current task." ) ); | 122 | a->setWhatsThis( QWidget::tr( "Click here to remove the current task." ) ); |
123 | a->addTo( m_tool ); | 123 | a->addTo( m_tool ); |
124 | a->addTo( m_edit ); | 124 | a->addTo( m_edit ); |
125 | m_deleteAction = a; | 125 | m_deleteAction = a; |
126 | 126 | ||
127 | a = new QAction( QString::null, tr("Delete all..."), 0, this, 0 ); | 127 | a = new QAction( QString::null, QWidget::tr("Delete all..."), 0, this, 0 ); |
128 | connect(a, SIGNAL( activated() ), | 128 | connect(a, SIGNAL( activated() ), |
129 | this, SLOT( slotDeleteAll() ) ); | 129 | this, SLOT( slotDeleteAll() ) ); |
130 | a->addTo(m_edit ); | 130 | a->addTo(m_edit ); |
131 | m_deleteAllAction = a; | 131 | m_deleteAllAction = a; |
132 | 132 | ||
133 | a = new QAction( QString::null, tr("Delete completed"), | 133 | a = new QAction( QString::null, QWidget::tr("Delete completed"), |
134 | 0, this, 0 ); | 134 | 0, this, 0 ); |
135 | connect(a, SIGNAL( activated() ), | 135 | connect(a, SIGNAL( activated() ), |
136 | this, SLOT( slotDeleteCompleted() ) ); | 136 | this, SLOT( slotDeleteCompleted() ) ); |
137 | a->addTo(m_edit ); | 137 | a->addTo(m_edit ); |
138 | a->setEnabled( TRUE ); | 138 | a->setEnabled( TRUE ); |
139 | m_deleteCompleteAction = a; | 139 | m_deleteCompleteAction = a; |
140 | 140 | ||
141 | m_edit->insertSeparator(); | 141 | m_edit->insertSeparator(); |
142 | 142 | ||
143 | a = new QAction( QString::null, tr("Duplicate"), 0, this, 0 ); | 143 | a = new QAction( QString::null, QWidget::tr("Duplicate"), 0, this, 0 ); |
144 | connect(a, SIGNAL( activated() ), | 144 | connect(a, SIGNAL( activated() ), |
145 | this, SLOT( slotDuplicate() ) ); | 145 | this, SLOT( slotDuplicate() ) ); |
146 | a->addTo(m_edit ); | 146 | a->addTo(m_edit ); |
147 | m_duplicateAction = a; | 147 | m_duplicateAction = a; |
148 | 148 | ||
149 | m_edit->insertSeparator(); | 149 | m_edit->insertSeparator(); |
150 | 150 | ||
151 | if ( Ir::supported() ) { | 151 | if ( Ir::supported() ) { |
152 | a = new QAction( tr( "Beam" ), Resource::loadPixmap( "beam" ), QString::null, 0, this, 0 ); | 152 | a = new QAction( QWidget::tr( "Beam" ), Resource::loadPixmap( "beam" ), QString::null, 0, this, 0 ); |
153 | connect( a, SIGNAL( activated() ), this, SLOT( slotBeam() ) ); | 153 | connect( a, SIGNAL( activated() ), this, SLOT( slotBeam() ) ); |
154 | a->setWhatsThis( tr( "Click here to send the current task to another device." ) ); | 154 | a->setWhatsThis( QWidget::tr( "Click here to send the current task to another device." ) ); |
155 | a->addTo( m_edit ); | 155 | a->addTo( m_edit ); |
156 | a->addTo( m_tool ); | 156 | a->addTo( m_tool ); |
157 | } | 157 | } |
158 | 158 | ||
159 | // Options menu | 159 | // Options menu |
160 | a = new QAction( tr("Find"), Resource::loadIconSet( "mag" ), | 160 | a = new QAction( QWidget::tr("Find"), Resource::loadIconSet( "mag" ), |
161 | QString::null, 0, this, 0 ); | 161 | QString::null, 0, this, 0 ); |
162 | connect(a, SIGNAL( activated() ), this, SLOT( slotFind() ) ); | 162 | connect(a, SIGNAL( activated() ), this, SLOT( slotFind() ) ); |
163 | a->addTo( m_options ); | 163 | a->addTo( m_options ); |
164 | m_findAction = a; | 164 | m_findAction = a; |
165 | 165 | ||
166 | m_options->insertSeparator(); | 166 | m_options->insertSeparator(); |
167 | 167 | ||
168 | m_completedAction = new QAction( QString::null, tr("Show completed tasks"), | 168 | m_completedAction = new QAction( QString::null, QWidget::tr("Show completed tasks"), |
169 | 0, this, 0, TRUE ); | 169 | 0, this, 0, TRUE ); |
170 | m_completedAction->addTo( m_options ); | 170 | m_completedAction->addTo( m_options ); |
171 | m_completedAction->setOn( showCompleted() ); | 171 | m_completedAction->setOn( showCompleted() ); |
172 | connect(m_completedAction, SIGNAL( toggled(bool) ), this, SLOT(slotShowCompleted(bool) ) ); | 172 | connect(m_completedAction, SIGNAL( toggled(bool) ), this, SLOT(slotShowCompleted(bool) ) ); |
173 | 173 | ||
174 | a = new QAction( QString::null, tr("Show only over-due tasks"), | 174 | a = new QAction( QString::null, QWidget::tr("Show only over-due tasks"), |
175 | 0, this, 0, TRUE ); | 175 | 0, this, 0, TRUE ); |
176 | a->addTo( m_options ); | 176 | a->addTo( m_options ); |
177 | a->setOn( showOverDue() ); | 177 | a->setOn( showOverDue() ); |
178 | connect(a, SIGNAL(toggled(bool)), this, SLOT(slotShowDue(bool) ) ); | 178 | connect(a, SIGNAL(toggled(bool)), this, SLOT(slotShowDue(bool) ) ); |
179 | 179 | ||
180 | m_showDeadLineAction = new QAction( QString::null, tr("Show task deadlines"), | 180 | m_showDeadLineAction = new QAction( QString::null, QWidget::tr("Show task deadlines"), |
181 | 0, this, 0, TRUE ); | 181 | 0, this, 0, TRUE ); |
182 | m_showDeadLineAction->addTo( m_options ); | 182 | m_showDeadLineAction->addTo( m_options ); |
183 | m_showDeadLineAction->setOn( showDeadline() ); | 183 | m_showDeadLineAction->setOn( showDeadline() ); |
184 | connect(m_showDeadLineAction, SIGNAL(toggled(bool) ), this, SLOT( slotShowDeadLine( bool ) ) ); | 184 | connect(m_showDeadLineAction, SIGNAL(toggled(bool) ), this, SLOT( slotShowDeadLine( bool ) ) ); |
185 | 185 | ||
186 | m_showQuickTaskAction = new QAction( QString::null, tr("Show quick task bar"), | 186 | m_showQuickTaskAction = new QAction( QString::null, QWidget::tr("Show quick task bar"), |
187 | 0, this, 0, TRUE ); | 187 | 0, this, 0, TRUE ); |
188 | m_showQuickTaskAction->addTo( m_options ); | 188 | m_showQuickTaskAction->addTo( m_options ); |
189 | m_showQuickTaskAction->setOn( showQuickTask() ); | 189 | m_showQuickTaskAction->setOn( showQuickTask() ); |
190 | connect(m_showQuickTaskAction, SIGNAL( toggled(bool) ), this, SLOT(slotShowQuickTask(bool) ) ); | 190 | connect(m_showQuickTaskAction, SIGNAL( toggled(bool) ), this, SLOT(slotShowQuickTask(bool) ) ); |
191 | 191 | ||
192 | m_options->insertSeparator(); | 192 | m_options->insertSeparator(); |
193 | 193 | ||
194 | m_bar->insertItem( tr("Data") ,m_edit ); | 194 | m_bar->insertItem( QWidget::tr("Data") ,m_edit ); |
195 | m_bar->insertItem( tr("Category"), m_catMenu ); | 195 | m_bar->insertItem( QWidget::tr("Category"), m_catMenu ); |
196 | m_bar->insertItem( tr("Options"), m_options ); | 196 | m_bar->insertItem( QWidget::tr("Options"), m_options ); |
197 | 197 | ||
198 | m_curQuick = new QuickEditImpl( this, m_quicktask ); | 198 | m_curQuick = new QuickEditImpl( this, m_quicktask ); |
199 | addToolBar( (QPEToolBar *)m_curQuick->widget(), tr( "QuickEdit" ), QMainWindow::Top, TRUE ); | 199 | addToolBar( (QPEToolBar *)m_curQuick->widget(), QWidget::tr( "QuickEdit" ), QMainWindow::Top, TRUE ); |
200 | m_curQuick->signal()->connect( this, SLOT(slotQuickEntered() ) ); | 200 | m_curQuick->signal()->connect( this, SLOT(slotQuickEntered() ) ); |
201 | 201 | ||
202 | } | 202 | } |
203 | /* m_curCat from Config */ | 203 | /* m_curCat from Config */ |
204 | void MainWindow::initConfig() { | 204 | void MainWindow::initConfig() { |
205 | Config config( "todo" ); | 205 | Config config( "todo" ); |
206 | config.setGroup( "View" ); | 206 | config.setGroup( "View" ); |
207 | m_completed = config.readBoolEntry( "ShowComplete", TRUE ); | 207 | m_completed = config.readBoolEntry( "ShowComplete", TRUE ); |
208 | m_curCat = config.readEntry( "Category", QString::null ); | 208 | m_curCat = config.readEntry( "Category", QString::null ); |
209 | m_deadline = config.readBoolEntry( "ShowDeadLine", TRUE); | 209 | m_deadline = config.readBoolEntry( "ShowDeadLine", TRUE); |
210 | m_overdue = config.readBoolEntry("ShowOverDue", FALSE ); | 210 | m_overdue = config.readBoolEntry("ShowOverDue", FALSE ); |
211 | m_quicktask = config.readBoolEntry("ShowQuickTask", TRUE); | 211 | m_quicktask = config.readBoolEntry("ShowQuickTask", TRUE); |
212 | } | 212 | } |
213 | void MainWindow::initUI() { | 213 | void MainWindow::initUI() { |
214 | m_stack = new QWidgetStack(this, "main stack"); | 214 | m_stack = new QWidgetStack(this, "main stack"); |
215 | setCentralWidget( m_stack ); | 215 | setCentralWidget( m_stack ); |
216 | 216 | ||
217 | setToolBarsMovable( FALSE ); | 217 | setToolBarsMovable( FALSE ); |
218 | 218 | ||
219 | m_tool = new QPEToolBar( this ); | 219 | m_tool = new QPEToolBar( this ); |
220 | m_tool->setHorizontalStretchable( TRUE ); | 220 | m_tool->setHorizontalStretchable( TRUE ); |
221 | 221 | ||
222 | m_bar = new QMenuBar( m_tool ); | 222 | m_bar = new QMenuBar( m_tool ); |
223 | 223 | ||
224 | /** QPopupMenu */ | 224 | /** QPopupMenu */ |
225 | m_edit = new QPopupMenu( this ); | 225 | m_edit = new QPopupMenu( this ); |
226 | m_options = new QPopupMenu( this ); | 226 | m_options = new QPopupMenu( this ); |
227 | m_catMenu = new QPopupMenu( this ); | 227 | m_catMenu = new QPopupMenu( this ); |
228 | m_template = new QPopupMenu( this ); | 228 | m_template = new QPopupMenu( this ); |
229 | 229 | ||
230 | m_catMenu->setCheckable( TRUE ); | 230 | m_catMenu->setCheckable( TRUE ); |
231 | m_template->setCheckable( TRUE ); | 231 | m_template->setCheckable( TRUE ); |
232 | 232 | ||
233 | connect(m_catMenu, SIGNAL(activated(int) ), | 233 | connect(m_catMenu, SIGNAL(activated(int) ), |
234 | this, SLOT(setCategory(int) ) ); | 234 | this, SLOT(setCategory(int) ) ); |
235 | connect(m_template, SIGNAL(activated(int) ), | 235 | connect(m_template, SIGNAL(activated(int) ), |
236 | this, SLOT(slotNewFromTemplate(int) ) ); | 236 | this, SLOT(slotNewFromTemplate(int) ) ); |
237 | } | 237 | } |
238 | void MainWindow::initViews() { | 238 | void MainWindow::initViews() { |
239 | TableView* tableView = new TableView( this, m_stack ); | 239 | TableView* tableView = new TableView( this, m_stack ); |
240 | QWhatsThis::add( tableView, tr( "This is a listing of all current tasks.\n\nThe list displays the following information:\n1. Completed - A green checkmark indicates task is completed. Click here to complete a task.\n2. Priority - a graphical representation of task priority. Double-click here to modify.\n3. Description - description of task. Click here to select the task.\n4. Deadline - shows when task is due. This column can be shown or hidden by selecting Options->'Show task deadlines' from the menu above." ) ); | 240 | QWhatsThis::add( tableView, QWidget::tr( "This is a listing of all current tasks.\n\nThe list displays the following information:\n1. Completed - A green checkmark indicates task is completed. Click here to complete a task.\n2. Priority - a graphical representation of task priority. Double-click here to modify.\n3. Description - description of task. Click here to select the task.\n4. Deadline - shows when task is due. This column can be shown or hidden by selecting Options->'Show task deadlines' from the menu above." ) ); |
241 | m_stack->addWidget( tableView, m_counter++ ); | 241 | m_stack->addWidget( tableView, m_counter++ ); |
242 | m_views.append( tableView ); | 242 | m_views.append( tableView ); |
243 | m_curView = tableView; | 243 | m_curView = tableView; |
244 | connectBase( tableView ); | 244 | connectBase( tableView ); |
245 | /* add QString type + QString configname to | 245 | /* add QString type + QString configname to |
246 | * the View menu | 246 | * the View menu |
247 | * and subdirs for multiple views | 247 | * and subdirs for multiple views |
248 | */ | 248 | */ |
249 | } | 249 | } |
250 | void MainWindow::initEditor() { | 250 | void MainWindow::initEditor() { |
251 | m_curEdit = new Editor(); | 251 | m_curEdit = new Editor(); |
252 | } | 252 | } |
253 | void MainWindow::initShow() { | 253 | void MainWindow::initShow() { |
254 | m_curShow = new TextViewShow(this); | 254 | m_curShow = new TextViewShow(this); |
255 | m_stack->addWidget( m_curShow->widget() , m_counter++ ); | 255 | m_stack->addWidget( m_curShow->widget() , m_counter++ ); |
256 | } | 256 | } |
257 | MainWindow::~MainWindow() { | 257 | MainWindow::~MainWindow() { |
258 | delete templateManager(); | 258 | delete templateManager(); |
259 | } | 259 | } |
260 | void MainWindow::connectBase( ViewBase* ) { | 260 | void MainWindow::connectBase( ViewBase* ) { |
261 | // once templates and signals mix we'll use it again | 261 | // once templates and signals mix we'll use it again |
262 | } | 262 | } |
263 | QPopupMenu* MainWindow::contextMenu( int , bool recur ) { | 263 | QPopupMenu* MainWindow::contextMenu( int , bool recur ) { |
264 | QPopupMenu* menu = new QPopupMenu(); | 264 | QPopupMenu* menu = new QPopupMenu(); |
@@ -274,108 +274,108 @@ QPopupMenu* MainWindow::contextMenu( int , bool recur ) { | |||
274 | * to detach it. | 274 | * to detach it. |
275 | * remove all | 275 | * remove all |
276 | */ | 276 | */ |
277 | if ( recur ) { | 277 | if ( recur ) { |
278 | ; // FIXME | 278 | ; // FIXME |
279 | } | 279 | } |
280 | 280 | ||
281 | return menu; | 281 | return menu; |
282 | } | 282 | } |
283 | QPopupMenu* MainWindow::options() { | 283 | QPopupMenu* MainWindow::options() { |
284 | qWarning("Options"); | 284 | qWarning("Options"); |
285 | return m_options; | 285 | return m_options; |
286 | } | 286 | } |
287 | QPopupMenu* MainWindow::edit() { | 287 | QPopupMenu* MainWindow::edit() { |
288 | return m_edit; | 288 | return m_edit; |
289 | } | 289 | } |
290 | QToolBar* MainWindow::toolbar() { | 290 | QToolBar* MainWindow::toolbar() { |
291 | return m_tool; | 291 | return m_tool; |
292 | } | 292 | } |
293 | OTodoAccess::List MainWindow::list()const { | 293 | OTodoAccess::List MainWindow::list()const { |
294 | return m_todoMgr.list(); | 294 | return m_todoMgr.list(); |
295 | } | 295 | } |
296 | OTodoAccess::List MainWindow::sorted( bool asc, int sortOrder ) { | 296 | OTodoAccess::List MainWindow::sorted( bool asc, int sortOrder ) { |
297 | int cat = 0; | 297 | int cat = 0; |
298 | if ( m_curCat != tr("All Categories") ) | 298 | if ( m_curCat != QWidget::tr("All Categories") ) |
299 | cat = currentCatId(); | 299 | cat = currentCatId(); |
300 | 300 | ||
301 | int filter = 1; | 301 | int filter = 1; |
302 | 302 | ||
303 | if (!m_completed ) | 303 | if (!m_completed ) |
304 | filter |= 4; | 304 | filter |= 4; |
305 | if (m_overdue) | 305 | if (m_overdue) |
306 | filter |= 2; | 306 | filter |= 2; |
307 | 307 | ||
308 | return m_todoMgr.sorted( asc, sortOrder, filter, cat ); | 308 | return m_todoMgr.sorted( asc, sortOrder, filter, cat ); |
309 | } | 309 | } |
310 | OTodoAccess::List MainWindow::sorted( bool asc, int sortOrder, int addFilter) { | 310 | OTodoAccess::List MainWindow::sorted( bool asc, int sortOrder, int addFilter) { |
311 | int cat = 0; | 311 | int cat = 0; |
312 | if ( m_curCat != tr("All Categories") ) | 312 | if ( m_curCat != QWidget::tr("All Categories") ) |
313 | cat = currentCatId(); | 313 | cat = currentCatId(); |
314 | 314 | ||
315 | return m_todoMgr.sorted(asc, sortOrder, addFilter, cat ); | 315 | return m_todoMgr.sorted(asc, sortOrder, addFilter, cat ); |
316 | } | 316 | } |
317 | OTodo MainWindow::event( int uid ) { | 317 | OTodo MainWindow::event( int uid ) { |
318 | return m_todoMgr.event( uid ); | 318 | return m_todoMgr.event( uid ); |
319 | } | 319 | } |
320 | bool MainWindow::isSyncing()const { | 320 | bool MainWindow::isSyncing()const { |
321 | return m_syncing; | 321 | return m_syncing; |
322 | } | 322 | } |
323 | TemplateManager* MainWindow::templateManager() { | 323 | TemplateManager* MainWindow::templateManager() { |
324 | return m_tempManager; | 324 | return m_tempManager; |
325 | } | 325 | } |
326 | Editor* MainWindow::currentEditor() { | 326 | Editor* MainWindow::currentEditor() { |
327 | return m_curEdit; | 327 | return m_curEdit; |
328 | } | 328 | } |
329 | TodoShow* MainWindow::currentShow() { | 329 | TodoShow* MainWindow::currentShow() { |
330 | return m_curShow; | 330 | return m_curShow; |
331 | } | 331 | } |
332 | void MainWindow::slotReload() { | 332 | void MainWindow::slotReload() { |
333 | m_todoMgr.reload(); | 333 | m_todoMgr.reload(); |
334 | currentView()->updateView( ); | 334 | currentView()->updateView( ); |
335 | raiseCurrentView(); | 335 | raiseCurrentView(); |
336 | } | 336 | } |
337 | void MainWindow::closeEvent( QCloseEvent* e ) { | 337 | void MainWindow::closeEvent( QCloseEvent* e ) { |
338 | if (m_stack->visibleWidget() == currentShow()->widget() ) { | 338 | if (m_stack->visibleWidget() == currentShow()->widget() ) { |
339 | raiseCurrentView(); | 339 | raiseCurrentView(); |
340 | e->ignore(); | 340 | e->ignore(); |
341 | return; | 341 | return; |
342 | } | 342 | } |
343 | /* | 343 | /* |
344 | * we should have flushed and now we're still saving | 344 | * we should have flushed and now we're still saving |
345 | * so there is no need to flush | 345 | * so there is no need to flush |
346 | */ | 346 | */ |
347 | if (m_syncing ) { | 347 | if (m_syncing ) { |
348 | e->accept(); | 348 | e->accept(); |
349 | return; | 349 | return; |
350 | } | 350 | } |
351 | bool quit = false; | 351 | bool quit = false; |
352 | if ( m_todoMgr.saveAll() ){ | 352 | if ( m_todoMgr.saveAll() ){ |
353 | qWarning("saved"); | 353 | qWarning("saved"); |
354 | quit = true; | 354 | quit = true; |
355 | }else { | 355 | }else { |
356 | if ( QMessageBox::critical( this, tr("Out of space"), | 356 | if ( QMessageBox::critical( this, QWidget::tr("Out of space"), |
357 | tr("Todo was unable\n" | 357 | QWidget::tr("Todo was unable\n" |
358 | "to save your changes.\n" | 358 | "to save your changes.\n" |
359 | "Free up some space\n" | 359 | "Free up some space\n" |
360 | "and try again.\n" | 360 | "and try again.\n" |
361 | "\nQuit Anyway?"), | 361 | "\nQuit Anyway?"), |
362 | QMessageBox::Yes|QMessageBox::Escape, | 362 | QMessageBox::Yes|QMessageBox::Escape, |
363 | QMessageBox::No|QMessageBox::Default) | 363 | QMessageBox::No|QMessageBox::Default) |
364 | != QMessageBox::No ) { | 364 | != QMessageBox::No ) { |
365 | e->accept(); | 365 | e->accept(); |
366 | quit = true; | 366 | quit = true; |
367 | }else | 367 | }else |
368 | e->ignore(); | 368 | e->ignore(); |
369 | 369 | ||
370 | } | 370 | } |
371 | 371 | ||
372 | if (quit ) { | 372 | if (quit ) { |
373 | Config config( "todo" ); | 373 | Config config( "todo" ); |
374 | config.setGroup( "View" ); | 374 | config.setGroup( "View" ); |
375 | config.writeEntry( "ShowComplete", showCompleted() ); | 375 | config.writeEntry( "ShowComplete", showCompleted() ); |
376 | config.writeEntry( "Category", currentCategory() ); | 376 | config.writeEntry( "Category", currentCategory() ); |
377 | config.writeEntry( "ShowDeadLine", showDeadline()); | 377 | config.writeEntry( "ShowDeadLine", showDeadline()); |
378 | config.writeEntry( "ShowOverDue", showOverDue() ); | 378 | config.writeEntry( "ShowOverDue", showOverDue() ); |
379 | config.writeEntry( "ShowQuickTask", showQuickTask() ); | 379 | config.writeEntry( "ShowQuickTask", showQuickTask() ); |
380 | /* save templates */ | 380 | /* save templates */ |
381 | templateManager()->save(); | 381 | templateManager()->save(); |
@@ -400,260 +400,260 @@ void MainWindow::populateTemplates() { | |||
400 | * first we get the name of the template | 400 | * first we get the name of the template |
401 | * then we will use the TemplateManager | 401 | * then we will use the TemplateManager |
402 | */ | 402 | */ |
403 | void MainWindow::slotNewFromTemplate( int id ) { | 403 | void MainWindow::slotNewFromTemplate( int id ) { |
404 | QString name = m_template->text( id ); | 404 | QString name = m_template->text( id ); |
405 | 405 | ||
406 | OTodo event = templateManager()->templateEvent( name ); | 406 | OTodo event = templateManager()->templateEvent( name ); |
407 | event = currentEditor()->edit(this, | 407 | event = currentEditor()->edit(this, |
408 | event ); | 408 | event ); |
409 | 409 | ||
410 | if ( currentEditor()->accepted() ) { | 410 | if ( currentEditor()->accepted() ) { |
411 | /* assign new todo */ | 411 | /* assign new todo */ |
412 | event.setUid( -1 ); | 412 | event.setUid( -1 ); |
413 | currentView()->addEvent( event ); | 413 | currentView()->addEvent( event ); |
414 | m_todoMgr.add( event ); | 414 | m_todoMgr.add( event ); |
415 | 415 | ||
416 | populateCategories(); | 416 | populateCategories(); |
417 | } | 417 | } |
418 | } | 418 | } |
419 | void MainWindow::slotNew() { | 419 | void MainWindow::slotNew() { |
420 | create(); | 420 | create(); |
421 | } | 421 | } |
422 | void MainWindow::slotDuplicate() { | 422 | void MainWindow::slotDuplicate() { |
423 | if(m_syncing) { | 423 | if(m_syncing) { |
424 | QMessageBox::warning(this, tr("Todo"), | 424 | QMessageBox::warning(this, QWidget::tr("Todo"), |
425 | tr("Can not edit data, currently syncing")); | 425 | QWidget::tr("Can not edit data, currently syncing")); |
426 | return; | 426 | return; |
427 | } | 427 | } |
428 | OTodo ev = m_todoMgr.event( currentView()->current() ); | 428 | OTodo ev = m_todoMgr.event( currentView()->current() ); |
429 | /* let's generate a new uid */ | 429 | /* let's generate a new uid */ |
430 | ev.setUid(-1); | 430 | ev.setUid(-1); |
431 | m_todoMgr.add( ev ); | 431 | m_todoMgr.add( ev ); |
432 | 432 | ||
433 | currentView()->addEvent( ev ); | 433 | currentView()->addEvent( ev ); |
434 | raiseCurrentView(); | 434 | raiseCurrentView(); |
435 | } | 435 | } |
436 | void MainWindow::slotDelete() { | 436 | void MainWindow::slotDelete() { |
437 | if (!currentView()->current() ) | 437 | if (!currentView()->current() ) |
438 | return; | 438 | return; |
439 | 439 | ||
440 | if(m_syncing) { | 440 | if(m_syncing) { |
441 | QMessageBox::warning(this, tr("Todo"), | 441 | QMessageBox::warning(this, QWidget::tr("Todo"), |
442 | tr("Can not edit data, currently syncing")); | 442 | QWidget::tr("Can not edit data, currently syncing")); |
443 | return; | 443 | return; |
444 | } | 444 | } |
445 | QString strName = currentView()->currentRepresentation(); | 445 | QString strName = currentView()->currentRepresentation(); |
446 | if (!QPEMessageBox::confirmDelete(this, tr("Todo"), strName ) ) | 446 | if (!QPEMessageBox::confirmDelete(this, QWidget::tr("Todo"), strName ) ) |
447 | return; | 447 | return; |
448 | 448 | ||
449 | m_todoMgr.remove( currentView()->current() ); | 449 | m_todoMgr.remove( currentView()->current() ); |
450 | currentView()->removeEvent( currentView()->current() ); | 450 | currentView()->removeEvent( currentView()->current() ); |
451 | raiseCurrentView(); | 451 | raiseCurrentView(); |
452 | } | 452 | } |
453 | void MainWindow::slotDeleteAll() { | 453 | void MainWindow::slotDeleteAll() { |
454 | if(m_syncing) { | 454 | if(m_syncing) { |
455 | QMessageBox::warning(this, tr("Todo"), | 455 | QMessageBox::warning(this, QWidget::tr("Todo"), |
456 | tr("Can not edit data, currently syncing")); | 456 | QWidget::tr("Can not edit data, currently syncing")); |
457 | return; | 457 | return; |
458 | } | 458 | } |
459 | 459 | ||
460 | 460 | ||
461 | if ( !QPEMessageBox::confirmDelete( this, tr( "Todo" ), tr("all tasks?") ) ) | 461 | if ( !QPEMessageBox::confirmDelete( this, QWidget::tr( "Todo" ), QWidget::tr("all tasks?") ) ) |
462 | return; | 462 | return; |
463 | 463 | ||
464 | m_todoMgr.removeAll(); | 464 | m_todoMgr.removeAll(); |
465 | currentView()->clear(); | 465 | currentView()->clear(); |
466 | 466 | ||
467 | raiseCurrentView(); | 467 | raiseCurrentView(); |
468 | } | 468 | } |
469 | void MainWindow::slotDeleteCompleted() { | 469 | void MainWindow::slotDeleteCompleted() { |
470 | if(m_syncing) { | 470 | if(m_syncing) { |
471 | QMessageBox::warning(this, tr("Todo"), | 471 | QMessageBox::warning(this, QWidget::tr("Todo"), |
472 | tr("Can not edit data, currently syncing")); | 472 | QWidget::tr("Can not edit data, currently syncing")); |
473 | return; | 473 | return; |
474 | } | 474 | } |
475 | 475 | ||
476 | if ( !QPEMessageBox::confirmDelete( this, tr( "Todo" ), tr("all completed tasks?") ) ) | 476 | if ( !QPEMessageBox::confirmDelete( this, QWidget::tr( "Todo" ), QWidget::tr("all completed tasks?") ) ) |
477 | return; | 477 | return; |
478 | 478 | ||
479 | 479 | ||
480 | m_todoMgr.removeCompleted(); | 480 | m_todoMgr.removeCompleted(); |
481 | currentView()->updateView( ); | 481 | currentView()->updateView( ); |
482 | } | 482 | } |
483 | void MainWindow::slotFind() { | 483 | void MainWindow::slotFind() { |
484 | 484 | ||
485 | } | 485 | } |
486 | void MainWindow::slotEdit() { | 486 | void MainWindow::slotEdit() { |
487 | slotEdit( currentView()->current() ); | 487 | slotEdit( currentView()->current() ); |
488 | } | 488 | } |
489 | /* | 489 | /* |
490 | * set the category | 490 | * set the category |
491 | */ | 491 | */ |
492 | void MainWindow::setCategory( int c) { | 492 | void MainWindow::setCategory( int c) { |
493 | if ( c <= 0 ) return; | 493 | if ( c <= 0 ) return; |
494 | 494 | ||
495 | 495 | ||
496 | qWarning("Iterating over cats %d", c ); | 496 | qWarning("Iterating over cats %d", c ); |
497 | for ( unsigned int i = 1; i < m_catMenu->count(); i++ ) | 497 | for ( unsigned int i = 1; i < m_catMenu->count(); i++ ) |
498 | m_catMenu->setItemChecked(i, c == (int)i ); | 498 | m_catMenu->setItemChecked(i, c == (int)i ); |
499 | 499 | ||
500 | if (c == 1 ) { | 500 | if (c == 1 ) { |
501 | m_curCat = QString::null; | 501 | m_curCat = QString::null; |
502 | setCaption( tr("Todo") + " - " + tr("All Categories" ) ); | 502 | setCaption( QWidget::tr("Todo") + " - " + QWidget::tr("All Categories" ) ); |
503 | 503 | ||
504 | }else if ( c == (int)m_catMenu->count() - 1 ) { | 504 | }else if ( c == (int)m_catMenu->count() - 1 ) { |
505 | m_curCat = tr("Unfiled"); | 505 | m_curCat = QWidget::tr("Unfiled"); |
506 | setCaption( tr("Todo") + " - " + tr("Unfiled") ); | 506 | setCaption( QWidget::tr("Todo") + " - " + QWidget::tr("Unfiled") ); |
507 | }else { | 507 | }else { |
508 | m_curCat = m_todoMgr.categories()[c-2]; | 508 | m_curCat = m_todoMgr.categories()[c-2]; |
509 | setCaption( tr("Todo") + " - " + m_curCat ); | 509 | setCaption( QWidget::tr("Todo") + " - " + m_curCat ); |
510 | } | 510 | } |
511 | m_catMenu->setItemChecked( c, true ); | 511 | m_catMenu->setItemChecked( c, true ); |
512 | 512 | ||
513 | currentView()->setShowCategory( m_curCat ); | 513 | currentView()->setShowCategory( m_curCat ); |
514 | raiseCurrentView(); | 514 | raiseCurrentView(); |
515 | } | 515 | } |
516 | void MainWindow::slotShowDeadLine( bool dead) { | 516 | void MainWindow::slotShowDeadLine( bool dead) { |
517 | m_deadline = dead; | 517 | m_deadline = dead; |
518 | currentView()->setShowDeadline( dead ); | 518 | currentView()->setShowDeadline( dead ); |
519 | } | 519 | } |
520 | void MainWindow::slotShowCompleted( bool show) { | 520 | void MainWindow::slotShowCompleted( bool show) { |
521 | m_completed = show; | 521 | m_completed = show; |
522 | currentView()->setShowCompleted( m_completed ); | 522 | currentView()->setShowCompleted( m_completed ); |
523 | } | 523 | } |
524 | void MainWindow::slotShowQuickTask( bool show ) { | 524 | void MainWindow::slotShowQuickTask( bool show ) { |
525 | m_quicktask = show; | 525 | m_quicktask = show; |
526 | if ( m_quicktask ) | 526 | if ( m_quicktask ) |
527 | m_curQuick->widget()->show(); | 527 | m_curQuick->widget()->show(); |
528 | else | 528 | else |
529 | m_curQuick->widget()->hide(); | 529 | m_curQuick->widget()->hide(); |
530 | } | 530 | } |
531 | bool MainWindow::showOverDue()const { | 531 | bool MainWindow::showOverDue()const { |
532 | return m_overdue; | 532 | return m_overdue; |
533 | } | 533 | } |
534 | void MainWindow::setDocument( const QString& fi) { | 534 | void MainWindow::setDocument( const QString& fi) { |
535 | DocLnk doc(fi); | 535 | DocLnk doc(fi); |
536 | if (doc.isValid() ) | 536 | if (doc.isValid() ) |
537 | receiveFile(doc.file() ); | 537 | receiveFile(doc.file() ); |
538 | else | 538 | else |
539 | receiveFile(fi ); | 539 | receiveFile(fi ); |
540 | } | 540 | } |
541 | 541 | ||
542 | static const char *beamfile = "/tmp/opie-todo.vcs"; | 542 | static const char *beamfile = "/tmp/opie-todo.vcs"; |
543 | void MainWindow::slotBeam() { | 543 | void MainWindow::slotBeam() { |
544 | beam( currentView()->current() ); | 544 | beam( currentView()->current() ); |
545 | } | 545 | } |
546 | void MainWindow::beamDone( Ir* ir) { | 546 | void MainWindow::beamDone( Ir* ir) { |
547 | delete ir; | 547 | delete ir; |
548 | ::unlink( beamfile ); | 548 | ::unlink( beamfile ); |
549 | } | 549 | } |
550 | void MainWindow::receiveFile( const QString& filename ) { | 550 | void MainWindow::receiveFile( const QString& filename ) { |
551 | OTodoAccessVCal* cal = new OTodoAccessVCal(filename ); | 551 | OTodoAccessVCal* cal = new OTodoAccessVCal(filename ); |
552 | OTodoAccess acc( cal ); | 552 | OTodoAccess acc( cal ); |
553 | acc.load(); | 553 | acc.load(); |
554 | OTodoAccess::List list = acc.allRecords(); | 554 | OTodoAccess::List list = acc.allRecords(); |
555 | 555 | ||
556 | QString message = tr("<P>%1 new tasks arrived.<p>Would you like to add them to your Todolist?").arg(list.count() ); | 556 | QString message = QWidget::tr("<P>%1 new tasks arrived.<p>Would you like to add them to your Todolist?").arg(list.count() ); |
557 | 557 | ||
558 | if ( QMessageBox::information(this, tr("New Tasks"), | 558 | if ( QMessageBox::information(this, QWidget::tr("New Tasks"), |
559 | message, QMessageBox::Ok, | 559 | message, QMessageBox::Ok, |
560 | QMessageBox::Cancel ) == QMessageBox::Ok ) { | 560 | QMessageBox::Cancel ) == QMessageBox::Ok ) { |
561 | OTodoAccess::List::Iterator it; | 561 | OTodoAccess::List::Iterator it; |
562 | for ( it = list.begin(); it != list.end(); ++it ) | 562 | for ( it = list.begin(); it != list.end(); ++it ) |
563 | m_todoMgr.add( (*it) ); | 563 | m_todoMgr.add( (*it) ); |
564 | 564 | ||
565 | currentView()->updateView(); | 565 | currentView()->updateView(); |
566 | } | 566 | } |
567 | } | 567 | } |
568 | 568 | ||
569 | void MainWindow::slotFlush() { | 569 | void MainWindow::slotFlush() { |
570 | m_syncing = FALSE; | 570 | m_syncing = FALSE; |
571 | m_todoMgr.save(); | 571 | m_todoMgr.save(); |
572 | } | 572 | } |
573 | void MainWindow::slotShowDetails() { | 573 | void MainWindow::slotShowDetails() { |
574 | slotShow( currentView()->current() ); | 574 | slotShow( currentView()->current() ); |
575 | } | 575 | } |
576 | /* | 576 | /* |
577 | * populate the Categories | 577 | * populate the Categories |
578 | * Menu | 578 | * Menu |
579 | */ | 579 | */ |
580 | void MainWindow::populateCategories() { | 580 | void MainWindow::populateCategories() { |
581 | m_todoMgr.load(); | 581 | m_todoMgr.load(); |
582 | 582 | ||
583 | m_catMenu->clear(); | 583 | m_catMenu->clear(); |
584 | int id, rememberId; | 584 | int id, rememberId; |
585 | id = 1; | 585 | id = 1; |
586 | rememberId = 1; | 586 | rememberId = 1; |
587 | 587 | ||
588 | m_catMenu->insertItem( tr( "All Categories" ), id++ ); | 588 | m_catMenu->insertItem( QWidget::tr( "All Categories" ), id++ ); |
589 | m_catMenu->insertSeparator(); | 589 | m_catMenu->insertSeparator(); |
590 | QStringList categories = m_todoMgr.categories(); | 590 | QStringList categories = m_todoMgr.categories(); |
591 | categories.append( tr( "Unfiled" ) ); | 591 | categories.append( QWidget::tr( "Unfiled" ) ); |
592 | for ( QStringList::Iterator it = categories.begin(); | 592 | for ( QStringList::Iterator it = categories.begin(); |
593 | it != categories.end(); ++it ) { | 593 | it != categories.end(); ++it ) { |
594 | m_catMenu->insertItem( *it, id ); | 594 | m_catMenu->insertItem( *it, id ); |
595 | if ( *it == currentCategory() ) | 595 | if ( *it == currentCategory() ) |
596 | rememberId = id; | 596 | rememberId = id; |
597 | ++id; | 597 | ++id; |
598 | } | 598 | } |
599 | setCategory( rememberId ); | 599 | setCategory( rememberId ); |
600 | } | 600 | } |
601 | bool MainWindow::showCompleted()const { | 601 | bool MainWindow::showCompleted()const { |
602 | return m_completed; | 602 | return m_completed; |
603 | } | 603 | } |
604 | bool MainWindow::showDeadline()const { | 604 | bool MainWindow::showDeadline()const { |
605 | return m_deadline; | 605 | return m_deadline; |
606 | } | 606 | } |
607 | bool MainWindow::showQuickTask()const { | 607 | bool MainWindow::showQuickTask()const { |
608 | return m_quicktask; | 608 | return m_quicktask; |
609 | } | 609 | } |
610 | QString MainWindow::currentCategory()const { | 610 | QString MainWindow::currentCategory()const { |
611 | return m_curCat; | 611 | return m_curCat; |
612 | } | 612 | } |
613 | int MainWindow::currentCatId() { | 613 | int MainWindow::currentCatId() { |
614 | return m_todoMgr.catId( m_curCat ); | 614 | return m_todoMgr.catId( m_curCat ); |
615 | } | 615 | } |
616 | ViewBase* MainWindow::currentView() { | 616 | ViewBase* MainWindow::currentView() { |
617 | return m_curView; | 617 | return m_curView; |
618 | } | 618 | } |
619 | void MainWindow::raiseCurrentView() { | 619 | void MainWindow::raiseCurrentView() { |
620 | m_stack->raiseWidget( m_curView->widget() ); | 620 | m_stack->raiseWidget( m_curView->widget() ); |
621 | } | 621 | } |
622 | void MainWindow::slotShowDue(bool ov) { | 622 | void MainWindow::slotShowDue(bool ov) { |
623 | m_overdue = ov; | 623 | m_overdue = ov; |
624 | currentView()->showOverDue( ov ); | 624 | currentView()->showOverDue( ov ); |
625 | raiseCurrentView(); | 625 | raiseCurrentView(); |
626 | } | 626 | } |
627 | void MainWindow::slotShow( int uid ) { | 627 | void MainWindow::slotShow( int uid ) { |
628 | qWarning("slotShow"); | 628 | qWarning("slotShow"); |
629 | currentShow()->slotShow( event( uid ) ); | 629 | currentShow()->slotShow( event( uid ) ); |
630 | m_stack->raiseWidget( currentShow()->widget() ); | 630 | m_stack->raiseWidget( currentShow()->widget() ); |
631 | } | 631 | } |
632 | void MainWindow::slotEdit( int uid ) { | 632 | void MainWindow::slotEdit( int uid ) { |
633 | if(m_syncing) { | 633 | if(m_syncing) { |
634 | QMessageBox::warning(this, tr("Todo"), | 634 | QMessageBox::warning(this, QWidget::tr("Todo"), |
635 | tr("Can not edit data, currently syncing")); | 635 | QWidget::tr("Can not edit data, currently syncing")); |
636 | return; | 636 | return; |
637 | } | 637 | } |
638 | 638 | ||
639 | OTodo todo = m_todoMgr.event( uid ); | 639 | OTodo todo = m_todoMgr.event( uid ); |
640 | 640 | ||
641 | todo = currentEditor()->edit(this, todo ); | 641 | todo = currentEditor()->edit(this, todo ); |
642 | 642 | ||
643 | /* if completed */ | 643 | /* if completed */ |
644 | if ( currentEditor()->accepted() ) { | 644 | if ( currentEditor()->accepted() ) { |
645 | qWarning("Replacing now" ); | 645 | qWarning("Replacing now" ); |
646 | m_todoMgr.update( todo.uid(), todo ); | 646 | m_todoMgr.update( todo.uid(), todo ); |
647 | currentView()->replaceEvent( todo ); | 647 | currentView()->replaceEvent( todo ); |
648 | /* a Category might have changed */ | 648 | /* a Category might have changed */ |
649 | populateCategories(); | 649 | populateCategories(); |
650 | } | 650 | } |
651 | 651 | ||
652 | raiseCurrentView(); | 652 | raiseCurrentView(); |
653 | } | 653 | } |
654 | /* | 654 | /* |
655 | void MainWindow::slotUpdate1( int uid, const SmallTodo& ev) { | 655 | void MainWindow::slotUpdate1( int uid, const SmallTodo& ev) { |
656 | m_todoMgr.update( uid, ev ); | 656 | m_todoMgr.update( uid, ev ); |
657 | } | 657 | } |
658 | */ | 658 | */ |
659 | void MainWindow::updateTodo( const OTodo& ev) { | 659 | void MainWindow::updateTodo( const OTodo& ev) { |
@@ -728,50 +728,50 @@ void MainWindow::slotComplete( const OTodo& todo ) { | |||
728 | * and complete date | 728 | * and complete date |
729 | */ | 729 | */ |
730 | to2.setDueDate( date ); | 730 | to2.setDueDate( date ); |
731 | to2.setStartDate( inval ); | 731 | to2.setStartDate( inval ); |
732 | to2.setCompletedDate( inval ); | 732 | to2.setCompletedDate( inval ); |
733 | to2.setCompleted( false ); | 733 | to2.setCompleted( false ); |
734 | updateTodo( to2 ); | 734 | updateTodo( to2 ); |
735 | }else | 735 | }else |
736 | updateTodo( to ); | 736 | updateTodo( to ); |
737 | }else | 737 | }else |
738 | updateTodo( to ); | 738 | updateTodo( to ); |
739 | 739 | ||
740 | currentView()->updateView(); | 740 | currentView()->updateView(); |
741 | raiseCurrentView(); | 741 | raiseCurrentView(); |
742 | } | 742 | } |
743 | void MainWindow::flush() { | 743 | void MainWindow::flush() { |
744 | slotFlush(); | 744 | slotFlush(); |
745 | } | 745 | } |
746 | void MainWindow::reload() { | 746 | void MainWindow::reload() { |
747 | slotReload(); | 747 | slotReload(); |
748 | } | 748 | } |
749 | int MainWindow::create() { | 749 | int MainWindow::create() { |
750 | int uid = 0; | 750 | int uid = 0; |
751 | if(m_syncing) { | 751 | if(m_syncing) { |
752 | QMessageBox::warning(this, tr("Todo"), | 752 | QMessageBox::warning(this, QWidget::tr("Todo"), |
753 | tr("Can not edit data, currently syncing")); | 753 | QWidget::tr("Can not edit data, currently syncing")); |
754 | return uid; | 754 | return uid; |
755 | } | 755 | } |
756 | 756 | ||
757 | 757 | ||
758 | OTodo todo = currentEditor()->newTodo( currentCatId(), | 758 | OTodo todo = currentEditor()->newTodo( currentCatId(), |
759 | this ); | 759 | this ); |
760 | 760 | ||
761 | if ( currentEditor()->accepted() ) { | 761 | if ( currentEditor()->accepted() ) { |
762 | //todo.assignUid(); | 762 | //todo.assignUid(); |
763 | uid = todo.uid(); | 763 | uid = todo.uid(); |
764 | m_todoMgr.add( todo ); | 764 | m_todoMgr.add( todo ); |
765 | currentView()->addEvent( todo ); | 765 | currentView()->addEvent( todo ); |
766 | 766 | ||
767 | 767 | ||
768 | // I'm afraid we must call this every time now, otherwise | 768 | // I'm afraid we must call this every time now, otherwise |
769 | // spend expensive time comparing all these strings... | 769 | // spend expensive time comparing all these strings... |
770 | // but only call if we changed something -zecke | 770 | // but only call if we changed something -zecke |
771 | populateCategories(); | 771 | populateCategories(); |
772 | } | 772 | } |
773 | raiseCurrentView( ); | 773 | raiseCurrentView( ); |
774 | 774 | ||
775 | return uid; | 775 | return uid; |
776 | } | 776 | } |
777 | /* delete it silently... */ | 777 | /* delete it silently... */ |
diff --git a/core/pim/todo/tableview.cpp b/core/pim/todo/tableview.cpp index 48b4dcc..61d1edd 100644 --- a/core/pim/todo/tableview.cpp +++ b/core/pim/todo/tableview.cpp | |||
@@ -56,52 +56,52 @@ void TableView::initConfig() { | |||
56 | config.setGroup( "Options" ); | 56 | config.setGroup( "Options" ); |
57 | m_completeStrokeWidth = config.readNumEntry( "CompleteStrokeWidth", 8 ); | 57 | m_completeStrokeWidth = config.readNumEntry( "CompleteStrokeWidth", 8 ); |
58 | } | 58 | } |
59 | 59 | ||
60 | TableView::TableView( MainWindow* window, QWidget* wid ) | 60 | TableView::TableView( MainWindow* window, QWidget* wid ) |
61 | : QTable( wid ), TodoView( window ) { | 61 | : QTable( wid ), TodoView( window ) { |
62 | 62 | ||
63 | // Load icons | 63 | // Load icons |
64 | // TODO - probably should be done globally somewhere else, | 64 | // TODO - probably should be done globally somewhere else, |
65 | // see also quickeditimpl.cpp/h, taskeditoroverview.cpp/h | 65 | // see also quickeditimpl.cpp/h, taskeditoroverview.cpp/h |
66 | m_pic_completed = Resource::loadPixmap( "todo/completed" ); | 66 | m_pic_completed = Resource::loadPixmap( "todo/completed" ); |
67 | QString namestr; | 67 | QString namestr; |
68 | for ( unsigned int i = 1; i < 6; i++ ) { | 68 | for ( unsigned int i = 1; i < 6; i++ ) { |
69 | namestr = "todo/priority"; | 69 | namestr = "todo/priority"; |
70 | namestr.append( QString::number( i ) ); | 70 | namestr.append( QString::number( i ) ); |
71 | m_pic_priority[ i - 1 ] = Resource::loadPixmap( namestr ); | 71 | m_pic_priority[ i - 1 ] = Resource::loadPixmap( namestr ); |
72 | } | 72 | } |
73 | 73 | ||
74 | setUpdatesEnabled( false ); | 74 | setUpdatesEnabled( false ); |
75 | viewport()->setUpdatesEnabled( false ); | 75 | viewport()->setUpdatesEnabled( false ); |
76 | m_enablePaint = false; | 76 | m_enablePaint = false; |
77 | setNumRows(0); | 77 | setNumRows(0); |
78 | setNumCols(4); | 78 | setNumCols(4); |
79 | 79 | ||
80 | horizontalHeader()->setLabel( 0, tr("C.") ); | 80 | horizontalHeader()->setLabel( 0, QWidget::tr("C.") ); |
81 | horizontalHeader()->setLabel( 1, tr("Priority") ); | 81 | horizontalHeader()->setLabel( 1, QWidget::tr("Priority") ); |
82 | horizontalHeader()->setLabel( 2, tr("Description" ) ); | 82 | horizontalHeader()->setLabel( 2, QWidget::tr("Description" ) ); |
83 | horizontalHeader()->setLabel( 3, tr("Deadline") ); | 83 | horizontalHeader()->setLabel( 3, QWidget::tr("Deadline") ); |
84 | 84 | ||
85 | setShowDeadline( todoWindow()->showDeadline() ); | 85 | setShowDeadline( todoWindow()->showDeadline() ); |
86 | 86 | ||
87 | setSorting( TRUE ); | 87 | setSorting( TRUE ); |
88 | setSelectionMode( NoSelection ); | 88 | setSelectionMode( NoSelection ); |
89 | 89 | ||
90 | setLeftMargin( 0 ); | 90 | setLeftMargin( 0 ); |
91 | verticalHeader()->hide(); | 91 | verticalHeader()->hide(); |
92 | 92 | ||
93 | connect((QTable*)this, SIGNAL( clicked( int, int, int, const QPoint& ) ), | 93 | connect((QTable*)this, SIGNAL( clicked( int, int, int, const QPoint& ) ), |
94 | this, SLOT( slotClicked(int, int, int, const QPoint& ) ) ); | 94 | this, SLOT( slotClicked(int, int, int, const QPoint& ) ) ); |
95 | connect((QTable*)this, SIGNAL( pressed( int, int, int, const QPoint& ) ), | 95 | connect((QTable*)this, SIGNAL( pressed( int, int, int, const QPoint& ) ), |
96 | this, SLOT( slotPressed(int, int, int, const QPoint& ) ) ); | 96 | this, SLOT( slotPressed(int, int, int, const QPoint& ) ) ); |
97 | connect((QTable*)this, SIGNAL(valueChanged(int, int) ), | 97 | connect((QTable*)this, SIGNAL(valueChanged(int, int) ), |
98 | this, SLOT( slotValueChanged(int, int) ) ); | 98 | this, SLOT( slotValueChanged(int, int) ) ); |
99 | connect((QTable*)this, SIGNAL(currentChanged(int, int) ), | 99 | connect((QTable*)this, SIGNAL(currentChanged(int, int) ), |
100 | this, SLOT( slotCurrentChanged(int, int) ) ); | 100 | this, SLOT( slotCurrentChanged(int, int) ) ); |
101 | 101 | ||
102 | m_menuTimer = new QTimer( this ); | 102 | m_menuTimer = new QTimer( this ); |
103 | connect( m_menuTimer, SIGNAL(timeout()), | 103 | connect( m_menuTimer, SIGNAL(timeout()), |
104 | this, SLOT(slotShowMenu()) ); | 104 | this, SLOT(slotShowMenu()) ); |
105 | 105 | ||
106 | m_enablePaint = true; | 106 | m_enablePaint = true; |
107 | setUpdatesEnabled( true ); | 107 | setUpdatesEnabled( true ); |
diff --git a/core/pim/todo/taskeditoroverview.cpp b/core/pim/todo/taskeditoroverview.cpp index 5e2b026..92408ba 100644 --- a/core/pim/todo/taskeditoroverview.cpp +++ b/core/pim/todo/taskeditoroverview.cpp | |||
@@ -66,49 +66,49 @@ TaskEditorOverView::TaskEditorOverView( QWidget* parent, const char* name, WFla | |||
66 | sv->addChild( container ); | 66 | sv->addChild( container ); |
67 | 67 | ||
68 | QGridLayout *layout = new QGridLayout( container, 7, 2, 4, 4 ); | 68 | QGridLayout *layout = new QGridLayout( container, 7, 2, 4, 4 ); |
69 | 69 | ||
70 | // Description | 70 | // Description |
71 | QLabel *label = new QLabel( tr( "Description:" ), container ); | 71 | QLabel *label = new QLabel( tr( "Description:" ), container ); |
72 | layout->addWidget( label, 0, 0 ); | 72 | layout->addWidget( label, 0, 0 ); |
73 | QWhatsThis::add( label, tr( "Enter brief description of the task here." ) ); | 73 | QWhatsThis::add( label, tr( "Enter brief description of the task here." ) ); |
74 | cmbDesc = new QComboBox( TRUE, container ); | 74 | cmbDesc = new QComboBox( TRUE, container ); |
75 | cmbDesc->insertItem( tr( "Complete " ) ); | 75 | cmbDesc->insertItem( tr( "Complete " ) ); |
76 | cmbDesc->insertItem( tr( "Work on " ) ); | 76 | cmbDesc->insertItem( tr( "Work on " ) ); |
77 | cmbDesc->insertItem( tr( "Buy " ) ); | 77 | cmbDesc->insertItem( tr( "Buy " ) ); |
78 | cmbDesc->insertItem( tr( "Organize " ) ); | 78 | cmbDesc->insertItem( tr( "Organize " ) ); |
79 | cmbDesc->insertItem( tr( "Get " ) ); | 79 | cmbDesc->insertItem( tr( "Get " ) ); |
80 | cmbDesc->insertItem( tr( "Update " ) ); | 80 | cmbDesc->insertItem( tr( "Update " ) ); |
81 | cmbDesc->insertItem( tr( "Create " ) ); | 81 | cmbDesc->insertItem( tr( "Create " ) ); |
82 | cmbDesc->insertItem( tr( "Plan " ) ); | 82 | cmbDesc->insertItem( tr( "Plan " ) ); |
83 | cmbDesc->insertItem( tr( "Call " ) ); | 83 | cmbDesc->insertItem( tr( "Call " ) ); |
84 | cmbDesc->insertItem( tr( "Mail " ) ); | 84 | cmbDesc->insertItem( tr( "Mail " ) ); |
85 | cmbDesc->clearEdit(); | 85 | cmbDesc->clearEdit(); |
86 | layout->addMultiCellWidget( cmbDesc, 1, 1, 0, 1 ); | 86 | layout->addMultiCellWidget( cmbDesc, 1, 1, 0, 1 ); |
87 | QWhatsThis::add( cmbDesc, tr( "Enter brief description of the task here." ) ); | 87 | QWhatsThis::add( cmbDesc, tr( "Enter brief description of the task here." ) ); |
88 | 88 | ||
89 | // Priority | 89 | // Priority |
90 | label = new QLabel( tr( "Priority:" ), container ); | 90 | label = new QLabel( QWidget::tr( "Priority:" ), container ); |
91 | layout->addWidget( label, 2, 0 ); | 91 | layout->addWidget( label, 2, 0 ); |
92 | QWhatsThis::add( label, tr( "Select priority of task here." ) ); | 92 | QWhatsThis::add( label, tr( "Select priority of task here." ) ); |
93 | cmbPriority = new QComboBox( FALSE, container ); | 93 | cmbPriority = new QComboBox( FALSE, container ); |
94 | cmbPriority->setMinimumHeight( 26 ); | 94 | cmbPriority->setMinimumHeight( 26 ); |
95 | cmbPriority->insertItem( m_pic_priority[ 0 ], tr( "Very High" ) ); | 95 | cmbPriority->insertItem( m_pic_priority[ 0 ], tr( "Very High" ) ); |
96 | cmbPriority->insertItem( m_pic_priority[ 1 ], tr( "High" ) ); | 96 | cmbPriority->insertItem( m_pic_priority[ 1 ], tr( "High" ) ); |
97 | cmbPriority->insertItem( m_pic_priority[ 2 ], tr( "Normal" ) ); | 97 | cmbPriority->insertItem( m_pic_priority[ 2 ], tr( "Normal" ) ); |
98 | cmbPriority->insertItem( m_pic_priority[ 3 ], tr( "Low" ) ); | 98 | cmbPriority->insertItem( m_pic_priority[ 3 ], tr( "Low" ) ); |
99 | cmbPriority->insertItem( m_pic_priority[ 4 ], tr( "Very Low" ) ); | 99 | cmbPriority->insertItem( m_pic_priority[ 4 ], tr( "Very Low" ) ); |
100 | cmbPriority->setCurrentItem( 2 ); | 100 | cmbPriority->setCurrentItem( 2 ); |
101 | layout->addWidget( cmbPriority, 2, 1 ); | 101 | layout->addWidget( cmbPriority, 2, 1 ); |
102 | QWhatsThis::add( cmbPriority, tr( "Select priority of task here." ) ); | 102 | QWhatsThis::add( cmbPriority, tr( "Select priority of task here." ) ); |
103 | 103 | ||
104 | // Category | 104 | // Category |
105 | label = new QLabel( tr( "Category:" ), container ); | 105 | label = new QLabel( tr( "Category:" ), container ); |
106 | layout->addWidget( label, 3, 0 ); | 106 | layout->addWidget( label, 3, 0 ); |
107 | QWhatsThis::add( label, tr( "Select category to organize this task with." ) ); | 107 | QWhatsThis::add( label, tr( "Select category to organize this task with." ) ); |
108 | cmbCategory = new CategorySelect( container ); | 108 | cmbCategory = new CategorySelect( container ); |
109 | layout->addWidget( cmbCategory, 3, 1 ); | 109 | layout->addWidget( cmbCategory, 3, 1 ); |
110 | QWhatsThis::add( cmbCategory, tr( "Select category to organize this task with." ) ); | 110 | QWhatsThis::add( cmbCategory, tr( "Select category to organize this task with." ) ); |
111 | 111 | ||
112 | // Recurrence | 112 | // Recurrence |
113 | ckbRecurrence = new QCheckBox( tr( "Recurring task" ), container ); | 113 | ckbRecurrence = new QCheckBox( tr( "Recurring task" ), container ); |
114 | layout->addMultiCellWidget( ckbRecurrence, 4, 4, 0, 1 ); | 114 | layout->addMultiCellWidget( ckbRecurrence, 4, 4, 0, 1 ); |
diff --git a/core/pim/todo/templateeditor.cpp b/core/pim/todo/templateeditor.cpp index 1b52d4f..3930428 100644 --- a/core/pim/todo/templateeditor.cpp +++ b/core/pim/todo/templateeditor.cpp | |||
@@ -1,39 +1,39 @@ | |||
1 | #include <qaction.h> | 1 | #include <qaction.h> |
2 | #include <qpopupmenu.h> | 2 | #include <qpopupmenu.h> |
3 | 3 | ||
4 | #include "mainwindow.h" | 4 | #include "mainwindow.h" |
5 | #include "todotemplatemanager.h" | 5 | #include "todotemplatemanager.h" |
6 | 6 | ||
7 | #include "templatedialogimpl.h" | 7 | #include "templatedialogimpl.h" |
8 | #include "templateeditor.h" | 8 | #include "templateeditor.h" |
9 | 9 | ||
10 | using namespace Todo; | 10 | using namespace Todo; |
11 | 11 | ||
12 | TemplateEditor::TemplateEditor( MainWindow* main, | 12 | TemplateEditor::TemplateEditor( MainWindow* main, |
13 | TemplateManager* manager ) | 13 | TemplateManager* manager ) |
14 | : QObject( main ), m_main( main ), m_man( manager ) | 14 | : QObject( main ), m_main( main ), m_man( manager ) |
15 | { | 15 | { |
16 | init(); | 16 | init(); |
17 | 17 | ||
18 | } | 18 | } |
19 | TemplateEditor::~TemplateEditor() { | 19 | TemplateEditor::~TemplateEditor() { |
20 | 20 | ||
21 | } | 21 | } |
22 | /* ok we add us to the Menubar */ | 22 | /* ok we add us to the Menubar */ |
23 | void TemplateEditor::init() { | 23 | void TemplateEditor::init() { |
24 | QAction* a = new QAction( QString::null, tr("Configure Templates"), | 24 | QAction* a = new QAction( QString::null, QWidget::tr("Configure Templates"), |
25 | 0, this, 0, FALSE ); | 25 | 0, this, 0, FALSE ); |
26 | connect(a, SIGNAL(activated() ), | 26 | connect(a, SIGNAL(activated() ), |
27 | this, SLOT(setUp() ) ); | 27 | this, SLOT(setUp() ) ); |
28 | 28 | ||
29 | a->addTo( m_main->options() ); | 29 | a->addTo( m_main->options() ); |
30 | } | 30 | } |
31 | void TemplateEditor::setUp() { | 31 | void TemplateEditor::setUp() { |
32 | qWarning("set up"); | 32 | qWarning("set up"); |
33 | TemplateDialogImpl dlg(m_main, m_man ); | 33 | TemplateDialogImpl dlg(m_main, m_man ); |
34 | int ret= dlg.exec(); | 34 | int ret= dlg.exec(); |
35 | if (QDialog::Accepted != ret ) { | 35 | if (QDialog::Accepted != ret ) { |
36 | m_man->load(); | 36 | m_man->load(); |
37 | }else | 37 | }else |
38 | m_main->populateTemplates(); | 38 | m_main->populateTemplates(); |
39 | } | 39 | } |