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 | |||
@@ -87,51 +87,51 @@ void MainWindow::initTemplate() { | |||
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 ); |
@@ -139,65 +139,65 @@ void MainWindow::initActions() { | |||
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 */ |
@@ -236,9 +236,9 @@ void MainWindow::initUI() { | |||
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 ); |
@@ -294,9 +294,9 @@ 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 | ||
@@ -308,9 +308,9 @@ OTodoAccess::List MainWindow::sorted( bool asc, int sortOrder ) { | |||
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 | } |
@@ -352,10 +352,10 @@ void MainWindow::closeEvent( QCloseEvent* e ) { | |||
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?"), |
@@ -420,10 +420,10 @@ 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 */ |
@@ -437,29 +437,29 @@ 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(); |
@@ -467,14 +467,14 @@ void MainWindow::slotDeleteAll() { | |||
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(); |
@@ -498,16 +498,16 @@ void MainWindow::setCategory( int c) { | |||
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 ); |
@@ -552,11 +552,11 @@ void MainWindow::receiveFile( const QString& 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 ) |
@@ -584,12 +584,12 @@ void MainWindow::populateCategories() { | |||
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() ) |
@@ -630,10 +630,10 @@ void MainWindow::slotShow( int 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 ); |
@@ -748,10 +748,10 @@ void MainWindow::reload() { | |||
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 | ||
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 | |||
@@ -76,12 +76,12 @@ TableView::TableView( MainWindow* window, QWidget* wid ) | |||
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 ); |
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 | |||
@@ -86,9 +86,9 @@ TaskEditorOverView::TaskEditorOverView( QWidget* parent, const char* name, WFla | |||
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 ); |
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 | |||
@@ -20,9 +20,9 @@ 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 | ||