summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/todo/mainwindow.cpp100
-rw-r--r--core/pim/todo/tableview.cpp8
-rw-r--r--core/pim/todo/taskeditoroverview.cpp2
-rw-r--r--core/pim/todo/templateeditor.cpp2
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() {
}
void MainWindow::initActions() {
// Data menu
- m_edit->insertItem(tr("New from template"), m_template,
+ m_edit->insertItem(QWidget::tr("New from template"), m_template,
-1, 0 );
- QAction* a = new QAction( tr("New Task" ), Resource::loadPixmap( "new" ),
+ QAction* a = new QAction( QWidget::tr("New Task" ), Resource::loadPixmap( "new" ),
QString::null, 0, this, 0 );
connect(a, SIGNAL( activated() ),
this, SLOT( slotNew() ) );
- a->setWhatsThis( tr( "Click here to create a new task." ) );
+ a->setWhatsThis( QWidget::tr( "Click here to create a new task." ) );
a->addTo(m_tool );
a->addTo(m_edit );
- a = new QAction( tr("Edit Task"), Resource::loadIconSet( "edit" ),
+ a = new QAction( QWidget::tr("Edit Task"), Resource::loadIconSet( "edit" ),
QString::null, 0, this, 0 );
connect(a, SIGNAL(activated() ),
this, SLOT( slotEdit() ) );
- a->setWhatsThis( tr( "Click here to modify the current task." ) );
+ a->setWhatsThis( QWidget::tr( "Click here to modify the current task." ) );
a->addTo( m_tool );
a->addTo( m_edit );
m_editAction = a;
- a = new QAction( QString::null, tr("View Task"), 0, this, 0 );
+ a = new QAction( QString::null, QWidget::tr("View Task"), 0, this, 0 );
connect(a, SIGNAL( activated() ),
this, SLOT( slotShowDetails() ) );
a->addTo( m_edit );
m_edit->insertSeparator();
- a = new QAction( tr("Delete..."), Resource::loadIconSet( "trash" ),
+ a = new QAction( QWidget::tr("Delete..."), Resource::loadIconSet( "trash" ),
QString::null, 0, this, 0 );
connect(a, SIGNAL(activated() ),
this, SLOT(slotDelete() ) );
- a->setWhatsThis( tr( "Click here to remove the current task." ) );
+ a->setWhatsThis( QWidget::tr( "Click here to remove the current task." ) );
a->addTo( m_tool );
a->addTo( m_edit );
m_deleteAction = a;
- a = new QAction( QString::null, tr("Delete all..."), 0, this, 0 );
+ a = new QAction( QString::null, QWidget::tr("Delete all..."), 0, this, 0 );
connect(a, SIGNAL( activated() ),
this, SLOT( slotDeleteAll() ) );
a->addTo(m_edit );
m_deleteAllAction = a;
- a = new QAction( QString::null, tr("Delete completed"),
+ a = new QAction( QString::null, QWidget::tr("Delete completed"),
0, this, 0 );
connect(a, SIGNAL( activated() ),
this, SLOT( slotDeleteCompleted() ) );
a->addTo(m_edit );
@@ -139,65 +139,65 @@ void MainWindow::initActions() {
m_deleteCompleteAction = a;
m_edit->insertSeparator();
- a = new QAction( QString::null, tr("Duplicate"), 0, this, 0 );
+ a = new QAction( QString::null, QWidget::tr("Duplicate"), 0, this, 0 );
connect(a, SIGNAL( activated() ),
this, SLOT( slotDuplicate() ) );
a->addTo(m_edit );
m_duplicateAction = a;
m_edit->insertSeparator();
if ( Ir::supported() ) {
- a = new QAction( tr( "Beam" ), Resource::loadPixmap( "beam" ), QString::null, 0, this, 0 );
+ a = new QAction( QWidget::tr( "Beam" ), Resource::loadPixmap( "beam" ), QString::null, 0, this, 0 );
connect( a, SIGNAL( activated() ), this, SLOT( slotBeam() ) );
- a->setWhatsThis( tr( "Click here to send the current task to another device." ) );
+ a->setWhatsThis( QWidget::tr( "Click here to send the current task to another device." ) );
a->addTo( m_edit );
a->addTo( m_tool );
}
// Options menu
- a = new QAction( tr("Find"), Resource::loadIconSet( "mag" ),
+ a = new QAction( QWidget::tr("Find"), Resource::loadIconSet( "mag" ),
QString::null, 0, this, 0 );
connect(a, SIGNAL( activated() ), this, SLOT( slotFind() ) );
a->addTo( m_options );
m_findAction = a;
m_options->insertSeparator();
- m_completedAction = new QAction( QString::null, tr("Show completed tasks"),
+ m_completedAction = new QAction( QString::null, QWidget::tr("Show completed tasks"),
0, this, 0, TRUE );
m_completedAction->addTo( m_options );
m_completedAction->setOn( showCompleted() );
connect(m_completedAction, SIGNAL( toggled(bool) ), this, SLOT(slotShowCompleted(bool) ) );
- a = new QAction( QString::null, tr("Show only over-due tasks"),
+ a = new QAction( QString::null, QWidget::tr("Show only over-due tasks"),
0, this, 0, TRUE );
a->addTo( m_options );
a->setOn( showOverDue() );
connect(a, SIGNAL(toggled(bool)), this, SLOT(slotShowDue(bool) ) );
- m_showDeadLineAction = new QAction( QString::null, tr("Show task deadlines"),
+ m_showDeadLineAction = new QAction( QString::null, QWidget::tr("Show task deadlines"),
0, this, 0, TRUE );
m_showDeadLineAction->addTo( m_options );
m_showDeadLineAction->setOn( showDeadline() );
connect(m_showDeadLineAction, SIGNAL(toggled(bool) ), this, SLOT( slotShowDeadLine( bool ) ) );
- m_showQuickTaskAction = new QAction( QString::null, tr("Show quick task bar"),
+ m_showQuickTaskAction = new QAction( QString::null, QWidget::tr("Show quick task bar"),
0, this, 0, TRUE );
m_showQuickTaskAction->addTo( m_options );
m_showQuickTaskAction->setOn( showQuickTask() );
connect(m_showQuickTaskAction, SIGNAL( toggled(bool) ), this, SLOT(slotShowQuickTask(bool) ) );
m_options->insertSeparator();
- m_bar->insertItem( tr("Data") ,m_edit );
- m_bar->insertItem( tr("Category"), m_catMenu );
- m_bar->insertItem( tr("Options"), m_options );
+ m_bar->insertItem( QWidget::tr("Data") ,m_edit );
+ m_bar->insertItem( QWidget::tr("Category"), m_catMenu );
+ m_bar->insertItem( QWidget::tr("Options"), m_options );
m_curQuick = new QuickEditImpl( this, m_quicktask );
- addToolBar( (QPEToolBar *)m_curQuick->widget(), tr( "QuickEdit" ), QMainWindow::Top, TRUE );
+ addToolBar( (QPEToolBar *)m_curQuick->widget(), QWidget::tr( "QuickEdit" ), QMainWindow::Top, TRUE );
m_curQuick->signal()->connect( this, SLOT(slotQuickEntered() ) );
}
/* m_curCat from Config */
@@ -236,9 +236,9 @@ void MainWindow::initUI() {
this, SLOT(slotNewFromTemplate(int) ) );
}
void MainWindow::initViews() {
TableView* tableView = new TableView( this, m_stack );
- 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." ) );
+ 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." ) );
m_stack->addWidget( tableView, m_counter++ );
m_views.append( tableView );
m_curView = tableView;
connectBase( tableView );
@@ -294,9 +294,9 @@ OTodoAccess::List MainWindow::list()const {
return m_todoMgr.list();
}
OTodoAccess::List MainWindow::sorted( bool asc, int sortOrder ) {
int cat = 0;
- if ( m_curCat != tr("All Categories") )
+ if ( m_curCat != QWidget::tr("All Categories") )
cat = currentCatId();
int filter = 1;
@@ -308,9 +308,9 @@ OTodoAccess::List MainWindow::sorted( bool asc, int sortOrder ) {
return m_todoMgr.sorted( asc, sortOrder, filter, cat );
}
OTodoAccess::List MainWindow::sorted( bool asc, int sortOrder, int addFilter) {
int cat = 0;
- if ( m_curCat != tr("All Categories") )
+ if ( m_curCat != QWidget::tr("All Categories") )
cat = currentCatId();
return m_todoMgr.sorted(asc, sortOrder, addFilter, cat );
}
@@ -352,10 +352,10 @@ void MainWindow::closeEvent( QCloseEvent* e ) {
if ( m_todoMgr.saveAll() ){
qWarning("saved");
quit = true;
}else {
- if ( QMessageBox::critical( this, tr("Out of space"),
- tr("Todo was unable\n"
+ if ( QMessageBox::critical( this, QWidget::tr("Out of space"),
+ QWidget::tr("Todo was unable\n"
"to save your changes.\n"
"Free up some space\n"
"and try again.\n"
"\nQuit Anyway?"),
@@ -420,10 +420,10 @@ void MainWindow::slotNew() {
create();
}
void MainWindow::slotDuplicate() {
if(m_syncing) {
- QMessageBox::warning(this, tr("Todo"),
- tr("Can not edit data, currently syncing"));
+ QMessageBox::warning(this, QWidget::tr("Todo"),
+ QWidget::tr("Can not edit data, currently syncing"));
return;
}
OTodo ev = m_todoMgr.event( currentView()->current() );
/* let's generate a new uid */
@@ -437,29 +437,29 @@ void MainWindow::slotDelete() {
if (!currentView()->current() )
return;
if(m_syncing) {
- QMessageBox::warning(this, tr("Todo"),
- tr("Can not edit data, currently syncing"));
+ QMessageBox::warning(this, QWidget::tr("Todo"),
+ QWidget::tr("Can not edit data, currently syncing"));
return;
}
QString strName = currentView()->currentRepresentation();
- if (!QPEMessageBox::confirmDelete(this, tr("Todo"), strName ) )
+ if (!QPEMessageBox::confirmDelete(this, QWidget::tr("Todo"), strName ) )
return;
m_todoMgr.remove( currentView()->current() );
currentView()->removeEvent( currentView()->current() );
raiseCurrentView();
}
void MainWindow::slotDeleteAll() {
if(m_syncing) {
- QMessageBox::warning(this, tr("Todo"),
- tr("Can not edit data, currently syncing"));
+ QMessageBox::warning(this, QWidget::tr("Todo"),
+ QWidget::tr("Can not edit data, currently syncing"));
return;
}
- if ( !QPEMessageBox::confirmDelete( this, tr( "Todo" ), tr("all tasks?") ) )
+ if ( !QPEMessageBox::confirmDelete( this, QWidget::tr( "Todo" ), QWidget::tr("all tasks?") ) )
return;
m_todoMgr.removeAll();
currentView()->clear();
@@ -467,14 +467,14 @@ void MainWindow::slotDeleteAll() {
raiseCurrentView();
}
void MainWindow::slotDeleteCompleted() {
if(m_syncing) {
- QMessageBox::warning(this, tr("Todo"),
- tr("Can not edit data, currently syncing"));
+ QMessageBox::warning(this, QWidget::tr("Todo"),
+ QWidget::tr("Can not edit data, currently syncing"));
return;
}
- if ( !QPEMessageBox::confirmDelete( this, tr( "Todo" ), tr("all completed tasks?") ) )
+ if ( !QPEMessageBox::confirmDelete( this, QWidget::tr( "Todo" ), QWidget::tr("all completed tasks?") ) )
return;
m_todoMgr.removeCompleted();
@@ -498,16 +498,16 @@ void MainWindow::setCategory( int c) {
m_catMenu->setItemChecked(i, c == (int)i );
if (c == 1 ) {
m_curCat = QString::null;
- setCaption( tr("Todo") + " - " + tr("All Categories" ) );
+ setCaption( QWidget::tr("Todo") + " - " + QWidget::tr("All Categories" ) );
}else if ( c == (int)m_catMenu->count() - 1 ) {
- m_curCat = tr("Unfiled");
- setCaption( tr("Todo") + " - " + tr("Unfiled") );
+ m_curCat = QWidget::tr("Unfiled");
+ setCaption( QWidget::tr("Todo") + " - " + QWidget::tr("Unfiled") );
}else {
m_curCat = m_todoMgr.categories()[c-2];
- setCaption( tr("Todo") + " - " + m_curCat );
+ setCaption( QWidget::tr("Todo") + " - " + m_curCat );
}
m_catMenu->setItemChecked( c, true );
currentView()->setShowCategory( m_curCat );
@@ -552,11 +552,11 @@ void MainWindow::receiveFile( const QString& filename ) {
OTodoAccess acc( cal );
acc.load();
OTodoAccess::List list = acc.allRecords();
- QString message = tr("<P>%1 new tasks arrived.<p>Would you like to add them to your Todolist?").arg(list.count() );
+ QString message = QWidget::tr("<P>%1 new tasks arrived.<p>Would you like to add them to your Todolist?").arg(list.count() );
- if ( QMessageBox::information(this, tr("New Tasks"),
+ if ( QMessageBox::information(this, QWidget::tr("New Tasks"),
message, QMessageBox::Ok,
QMessageBox::Cancel ) == QMessageBox::Ok ) {
OTodoAccess::List::Iterator it;
for ( it = list.begin(); it != list.end(); ++it )
@@ -584,12 +584,12 @@ void MainWindow::populateCategories() {
int id, rememberId;
id = 1;
rememberId = 1;
- m_catMenu->insertItem( tr( "All Categories" ), id++ );
+ m_catMenu->insertItem( QWidget::tr( "All Categories" ), id++ );
m_catMenu->insertSeparator();
QStringList categories = m_todoMgr.categories();
- categories.append( tr( "Unfiled" ) );
+ categories.append( QWidget::tr( "Unfiled" ) );
for ( QStringList::Iterator it = categories.begin();
it != categories.end(); ++it ) {
m_catMenu->insertItem( *it, id );
if ( *it == currentCategory() )
@@ -630,10 +630,10 @@ void MainWindow::slotShow( int uid ) {
m_stack->raiseWidget( currentShow()->widget() );
}
void MainWindow::slotEdit( int uid ) {
if(m_syncing) {
- QMessageBox::warning(this, tr("Todo"),
- tr("Can not edit data, currently syncing"));
+ QMessageBox::warning(this, QWidget::tr("Todo"),
+ QWidget::tr("Can not edit data, currently syncing"));
return;
}
OTodo todo = m_todoMgr.event( uid );
@@ -748,10 +748,10 @@ void MainWindow::reload() {
}
int MainWindow::create() {
int uid = 0;
if(m_syncing) {
- QMessageBox::warning(this, tr("Todo"),
- tr("Can not edit data, currently syncing"));
+ QMessageBox::warning(this, QWidget::tr("Todo"),
+ QWidget::tr("Can not edit data, currently syncing"));
return uid;
}
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 )
m_enablePaint = false;
setNumRows(0);
setNumCols(4);
- horizontalHeader()->setLabel( 0, tr("C.") );
- horizontalHeader()->setLabel( 1, tr("Priority") );
- horizontalHeader()->setLabel( 2, tr("Description" ) );
- horizontalHeader()->setLabel( 3, tr("Deadline") );
+ horizontalHeader()->setLabel( 0, QWidget::tr("C.") );
+ horizontalHeader()->setLabel( 1, QWidget::tr("Priority") );
+ horizontalHeader()->setLabel( 2, QWidget::tr("Description" ) );
+ horizontalHeader()->setLabel( 3, QWidget::tr("Deadline") );
setShowDeadline( todoWindow()->showDeadline() );
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
layout->addMultiCellWidget( cmbDesc, 1, 1, 0, 1 );
QWhatsThis::add( cmbDesc, tr( "Enter brief description of the task here." ) );
// Priority
- label = new QLabel( tr( "Priority:" ), container );
+ label = new QLabel( QWidget::tr( "Priority:" ), container );
layout->addWidget( label, 2, 0 );
QWhatsThis::add( label, tr( "Select priority of task here." ) );
cmbPriority = new QComboBox( FALSE, container );
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() {
}
/* ok we add us to the Menubar */
void TemplateEditor::init() {
- QAction* a = new QAction( QString::null, tr("Configure Templates"),
+ QAction* a = new QAction( QString::null, QWidget::tr("Configure Templates"),
0, this, 0, FALSE );
connect(a, SIGNAL(activated() ),
this, SLOT(setUp() ) );