-rw-r--r-- | core/pim/todo/mainwindow.cpp | 16 | ||||
-rw-r--r-- | core/pim/todo/quickeditimpl.cpp | 8 | ||||
-rw-r--r-- | core/pim/todo/tableview.cpp | 21 |
3 files changed, 26 insertions, 19 deletions
diff --git a/core/pim/todo/mainwindow.cpp b/core/pim/todo/mainwindow.cpp index 0ccf73e..d16d1ac 100644 --- a/core/pim/todo/mainwindow.cpp +++ b/core/pim/todo/mainwindow.cpp | |||
@@ -29,3 +29,2 @@ | |||
29 | #include <unistd.h> | 29 | #include <unistd.h> |
30 | #include <stdio.h> | ||
31 | 30 | ||
@@ -40,2 +39,3 @@ | |||
40 | #include <qlineedit.h> | 39 | #include <qlineedit.h> |
40 | #include <qwhatsthis.h> | ||
41 | 41 | ||
@@ -65,5 +65,4 @@ MainWindow::MainWindow( QWidget* parent, | |||
65 | const char* name ) | 65 | const char* name ) |
66 | : OPimMainWindow("Todolist", parent, name) | 66 | : OPimMainWindow( "Todolist", parent, name, WType_TopLevel | WStyle_ContextHelp ) |
67 | { | 67 | { |
68 | |||
69 | m_syncing = false; | 68 | m_syncing = false; |
@@ -98,2 +97,3 @@ void MainWindow::initActions() { | |||
98 | this, SLOT( slotNew() ) ); | 97 | this, SLOT( slotNew() ) ); |
98 | a->setWhatsThis( tr( "Click here to create a new task." ) ); | ||
99 | a->addTo(m_tool ); | 99 | a->addTo(m_tool ); |
@@ -105,2 +105,3 @@ void MainWindow::initActions() { | |||
105 | this, SLOT( slotEdit() ) ); | 105 | this, SLOT( slotEdit() ) ); |
106 | a->setWhatsThis( tr( "Click here to modify the current task." ) ); | ||
106 | a->addTo( m_tool ); | 107 | a->addTo( m_tool ); |
@@ -120,2 +121,3 @@ void MainWindow::initActions() { | |||
120 | this, SLOT(slotDelete() ) ); | 121 | this, SLOT(slotDelete() ) ); |
122 | a->setWhatsThis( tr( "Click here to remove the current task." ) ); | ||
121 | a->addTo( m_tool ); | 123 | a->addTo( m_tool ); |
@@ -149,6 +151,5 @@ void MainWindow::initActions() { | |||
149 | if ( Ir::supported() ) { | 151 | if ( Ir::supported() ) { |
150 | a = new QAction( tr( "Beam" ), Resource::loadPixmap( "beam" ), | 152 | a = new QAction( tr( "Beam" ), Resource::loadPixmap( "beam" ), QString::null, 0, this, 0 ); |
151 | QString::null, 0, this, 0 ); | 153 | connect( a, SIGNAL( activated() ), this, SLOT( slotBeam() ) ); |
152 | connect( a, SIGNAL( activated() ), | 154 | a->setWhatsThis( tr( "Click here to send the current task to another device." ) ); |
153 | this, SLOT( slotBeam() ) ); | ||
154 | a->addTo( m_edit ); | 155 | a->addTo( m_edit ); |
@@ -238,2 +239,3 @@ void MainWindow::initViews() { | |||
238 | 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." ) ); | ||
239 | m_stack->addWidget( tableView, m_counter++ ); | 241 | m_stack->addWidget( tableView, m_counter++ ); |
diff --git a/core/pim/todo/quickeditimpl.cpp b/core/pim/todo/quickeditimpl.cpp index cadec03..7664ee4 100644 --- a/core/pim/todo/quickeditimpl.cpp +++ b/core/pim/todo/quickeditimpl.cpp | |||
@@ -2,2 +2,3 @@ | |||
2 | #include <qlineedit.h> | 2 | #include <qlineedit.h> |
3 | #include <qwhatsthis.h> | ||
3 | 4 | ||
@@ -21,4 +22,2 @@ QuickEditImpl::QuickEditImpl( QWidget* parent, bool visible ) | |||
21 | 22 | ||
22 | |||
23 | // TODO - come up with icons and replace text priority values | ||
24 | m_lbl = new OClickableLabel( this ); | 23 | m_lbl = new OClickableLabel( this ); |
@@ -27,2 +26,3 @@ QuickEditImpl::QuickEditImpl( QWidget* parent, bool visible ) | |||
27 | connect(m_lbl, SIGNAL(clicked() ), this, SLOT(slotPrio()) ); | 26 | connect(m_lbl, SIGNAL(clicked() ), this, SLOT(slotPrio()) ); |
27 | QWhatsThis::add( m_lbl, tr( "Click here to set the priority of new task.\n\nThis area is called the quick task bar.\n\nIt allows you to quickly add a new task to your list. This area can be shown or hidden by selecting Options->'Show quick task bar' from the menu above." ) ); | ||
28 | 28 | ||
@@ -30,2 +30,3 @@ QuickEditImpl::QuickEditImpl( QWidget* parent, bool visible ) | |||
30 | setStretchableWidget( m_edit ); | 30 | setStretchableWidget( m_edit ); |
31 | QWhatsThis::add( m_edit, tr( "Enter description of new task here.\n\nThis area is called the quick task bar.\n\nIt allows you to quickly add a new task to your list. This area can be shown or hidden by selecting Options->'Show quick task bar' from the menu above." ) ); | ||
31 | 32 | ||
@@ -34,2 +35,3 @@ QuickEditImpl::QuickEditImpl( QWidget* parent, bool visible ) | |||
34 | a->addTo( this ); | 35 | a->addTo( this ); |
36 | a->setWhatsThis( tr( "Click here to enter additional information for new task.\n\nThis area is called the quick task bar.\n\nIt allows you to quickly add a new task to your list. This area can be shown or hidden by selecting Options->'Show quick task bar' from the menu above." ) ); | ||
35 | 37 | ||
@@ -38,2 +40,3 @@ QuickEditImpl::QuickEditImpl( QWidget* parent, bool visible ) | |||
38 | a->addTo( this ); | 40 | a->addTo( this ); |
41 | a->setWhatsThis( tr( "Click here to add new task.\n\nThis area is called the quick task bar.\n\nIt allows you to quickly add a new task to your list. This area can be shown or hidden by selecting Options->'Show quick task bar' from the menu above." ) ); | ||
39 | 42 | ||
@@ -42,2 +45,3 @@ QuickEditImpl::QuickEditImpl( QWidget* parent, bool visible ) | |||
42 | a->addTo( this ); | 45 | a->addTo( this ); |
46 | a->setWhatsThis( tr( "Click here to reset new task information.\n\nThis area is called the quick task bar.\n\nIt allows you to quickly add a new task to your list. This area can be shown or hidden by selecting Options->'Show quick task bar' from the menu above." ) ); | ||
43 | 47 | ||
diff --git a/core/pim/todo/tableview.cpp b/core/pim/todo/tableview.cpp index d229f52..cd6740a 100644 --- a/core/pim/todo/tableview.cpp +++ b/core/pim/todo/tableview.cpp | |||
@@ -61,2 +61,13 @@ TableView::TableView( MainWindow* window, QWidget* wid ) | |||
61 | : QTable( wid ), TodoView( window ) { | 61 | : QTable( wid ), TodoView( window ) { |
62 | |||
63 | // Load icons | ||
64 | // TODO - probably should be done globally somewhere else, see also quickeditimpl.cpp/h | ||
65 | m_pic_completed = Resource::loadPixmap( "todo/completed" ); | ||
66 | QString namestr; | ||
67 | for ( unsigned int i = 1; i < 6; i++ ) { | ||
68 | namestr = "todo/priority"; | ||
69 | namestr.append( QString::number( i ) ); | ||
70 | m_pic_priority[ i - 1 ] = Resource::loadPixmap( namestr ); | ||
71 | } | ||
72 | |||
62 | setUpdatesEnabled( false ); | 73 | setUpdatesEnabled( false ); |
@@ -101,12 +112,2 @@ TableView::TableView( MainWindow* window, QWidget* wid ) | |||
101 | 112 | ||
102 | // Load icons | ||
103 | // TODO - probably should be done globally somewhere else, see also quickeditimpl.cpp/h | ||
104 | m_pic_completed = Resource::loadPixmap( "todo/completed" ); | ||
105 | QString namestr; | ||
106 | for ( unsigned int i = 1; i < 6; i++ ) { | ||
107 | namestr = "todo/priority"; | ||
108 | namestr.append( QString::number( i ) ); | ||
109 | m_pic_priority[ i - 1 ] = Resource::loadPixmap( namestr ); | ||
110 | } | ||
111 | |||
112 | /* now let's init the config */ | 113 | /* now let's init the config */ |