-rw-r--r-- | core/pim/today/TODO | 2 | ||||
-rw-r--r-- | core/pim/today/plugins/datebook/datebookpluginconfig.cpp | 5 | ||||
-rw-r--r-- | core/pim/today/plugins/todolist/todopluginconfig.cpp | 11 | ||||
-rw-r--r-- | core/pim/today/today.cpp | 2 | ||||
-rw-r--r-- | core/pim/today/todaybase.cpp | 7 | ||||
-rw-r--r-- | core/pim/today/todaybase.h | 2 | ||||
-rw-r--r-- | core/pim/today/todayconfig.cpp | 1 |
7 files changed, 21 insertions, 9 deletions
diff --git a/core/pim/today/TODO b/core/pim/today/TODO index 49503bd..4dc22aa 100644 --- a/core/pim/today/TODO +++ b/core/pim/today/TODO | |||
@@ -1,10 +1,8 @@ | |||
1 | TODO for today: | 1 | TODO for today: |
2 | 2 | ||
3 | - all icons clickable | ||
4 | |||
5 | - retail rom mail plugin (z) | 3 | - retail rom mail plugin (z) |
6 | 4 | ||
7 | - autostart on retail rom (Z) | 5 | - autostart on retail rom (Z) |
8 | 6 | ||
9 | * show "upcoming appointents the next days | 7 | * show "upcoming appointents the next days |
10 | 8 | ||
diff --git a/core/pim/today/plugins/datebook/datebookpluginconfig.cpp b/core/pim/today/plugins/datebook/datebookpluginconfig.cpp index 606916b..e93c82c 100644 --- a/core/pim/today/plugins/datebook/datebookpluginconfig.cpp +++ b/core/pim/today/plugins/datebook/datebookpluginconfig.cpp | |||
@@ -5,40 +5,45 @@ | |||
5 | #include <qpe/config.h> | 5 | #include <qpe/config.h> |
6 | 6 | ||
7 | #include <qlayout.h> | 7 | #include <qlayout.h> |
8 | #include <qtoolbutton.h> | 8 | #include <qtoolbutton.h> |
9 | #include <qlabel.h> | 9 | #include <qlabel.h> |
10 | #include <qhbox.h> | 10 | #include <qhbox.h> |
11 | #include <qwhatsthis.h> | ||
11 | #include <qvbox.h> | 12 | #include <qvbox.h> |
12 | 13 | ||
13 | DatebookPluginConfig::DatebookPluginConfig( QWidget* parent, const char* name) | 14 | DatebookPluginConfig::DatebookPluginConfig( QWidget* parent, const char* name) |
14 | : TodayConfigWidget( parent, name ) { | 15 | : TodayConfigWidget( parent, name ) { |
15 | 16 | ||
16 | QVBoxLayout * layout = new QVBoxLayout( this ); | 17 | QVBoxLayout * layout = new QVBoxLayout( this ); |
17 | layout->setMargin( 20 ); | 18 | layout->setMargin( 20 ); |
18 | 19 | ||
19 | QHBox *box1 = new QHBox( this ); | 20 | QHBox *box1 = new QHBox( this ); |
20 | QLabel* TextLabel4 = new QLabel( box1, "TextLabel4" ); | 21 | QLabel* TextLabel4 = new QLabel( box1, "TextLabel4" ); |
21 | TextLabel4->setText( tr( "Show location" ) ); | 22 | TextLabel4->setText( tr( "Show location" ) ); |
22 | CheckBox1 = new QCheckBox( box1, "CheckBox1" ); | 23 | CheckBox1 = new QCheckBox( box1, "CheckBox1" ); |
24 | QWhatsThis::add( CheckBox1 , tr( "Check this if the location of an appointment should be shown for each one" ) ); | ||
23 | 25 | ||
24 | QHBox *box2 = new QHBox( this ); | 26 | QHBox *box2 = new QHBox( this ); |
25 | QLabel* TextLabel5 = new QLabel( box2 , "TextLabel5" ); | 27 | QLabel* TextLabel5 = new QLabel( box2 , "TextLabel5" ); |
26 | TextLabel5->setText( tr( "Show notes" ) ); | 28 | TextLabel5->setText( tr( "Show notes" ) ); |
27 | CheckBox2 = new QCheckBox( box2, "CheckBox2" ); | 29 | CheckBox2 = new QCheckBox( box2, "CheckBox2" ); |
30 | QWhatsThis::add( CheckBox2 , tr( "Check this if the note attached to an appointment should be shown for each one" ) ); | ||
28 | 31 | ||
29 | QHBox *box3 = new QHBox( this ); | 32 | QHBox *box3 = new QHBox( this ); |
30 | QLabel* TextLabel6 = new QLabel( box3, "All Day"); | 33 | QLabel* TextLabel6 = new QLabel( box3, "All Day"); |
31 | TextLabel6->setText( tr( "Show only later\n appointments") ); | 34 | TextLabel6->setText( tr( "Show only later\n appointments") ); |
32 | CheckBox3 = new QCheckBox ( box3, "CheckBox3" ); | 35 | CheckBox3 = new QCheckBox ( box3, "CheckBox3" ); |
36 | QWhatsThis::add( CheckBox3 , tr( "Check this if only appointments later then current time should be shown" ) ); | ||
33 | 37 | ||
34 | QHBox *box4 = new QHBox( this ); | 38 | QHBox *box4 = new QHBox( this ); |
35 | QLabel *TextLabel3 = new QLabel( box4, "TextLabel3" ); | 39 | QLabel *TextLabel3 = new QLabel( box4, "TextLabel3" ); |
36 | TextLabel3->setText( tr( "How many \nappointment\n" | 40 | TextLabel3->setText( tr( "How many \nappointment\n" |
37 | "should be \nshown?" ) ); | 41 | "should be \nshown?" ) ); |
38 | SpinBox1 = new QSpinBox( box4, "SpinBox1" ); | 42 | SpinBox1 = new QSpinBox( box4, "SpinBox1" ); |
43 | QWhatsThis::add( SpinBox1 , tr( "How many appointments should be shown maximal. In chronical order" ) ); | ||
39 | SpinBox1->setMaxValue( 10 ); | 44 | SpinBox1->setMaxValue( 10 ); |
40 | SpinBox1->setValue( 5 ); | 45 | SpinBox1->setValue( 5 ); |
41 | 46 | ||
42 | layout->addWidget( box1 ); | 47 | layout->addWidget( box1 ); |
43 | layout->addWidget( box2 ); | 48 | layout->addWidget( box2 ); |
44 | layout->addWidget( box3 ); | 49 | layout->addWidget( box3 ); |
diff --git a/core/pim/today/plugins/todolist/todopluginconfig.cpp b/core/pim/today/plugins/todolist/todopluginconfig.cpp index 110b2e0..56b7aa2 100644 --- a/core/pim/today/plugins/todolist/todopluginconfig.cpp +++ b/core/pim/today/plugins/todolist/todopluginconfig.cpp | |||
@@ -19,38 +19,41 @@ | |||
19 | #include <qpe/config.h> | 19 | #include <qpe/config.h> |
20 | 20 | ||
21 | #include <qlayout.h> | 21 | #include <qlayout.h> |
22 | #include <qhbox.h> | 22 | #include <qhbox.h> |
23 | #include <qtoolbutton.h> | 23 | #include <qtoolbutton.h> |
24 | #include <qlabel.h> | 24 | #include <qlabel.h> |
25 | #include <qwhatsthis.h> | ||
25 | 26 | ||
26 | 27 | ||
27 | 28 | ||
28 | TodolistPluginConfig::TodolistPluginConfig( QWidget *parent, const char* name) | 29 | TodolistPluginConfig::TodolistPluginConfig( QWidget *parent, const char* name) |
29 | : TodayConfigWidget(parent, name ) { | 30 | : TodayConfigWidget(parent, name ) { |
30 | 31 | ||
31 | QVBoxLayout * layout = new QVBoxLayout( this ); | 32 | QVBoxLayout * layout = new QVBoxLayout( this ); |
32 | layout->setMargin( 20 ); | 33 | layout->setMargin( 20 ); |
33 | 34 | ||
34 | QHBox *box1 = new QHBox( this ); | 35 | QHBox *box1 = new QHBox( this ); |
35 | 36 | ||
36 | QLabel* TextLabel6 = new QLabel( box1, "TextLabel6" ); | 37 | QLabel* TextLabel6 = new QLabel( box1, "TextLabel6" ); |
37 | TextLabel6->setText( tr( "How many\n tasks should \n" | 38 | TextLabel6->setText( tr( "tasks shown " ) ); |
38 | "be shown?" ) ); | ||
39 | 39 | ||
40 | SpinBox2 = new QSpinBox( box1, "SpinBox2" ); | 40 | SpinBox2 = new QSpinBox( box1, "SpinBox2" ); |
41 | SpinBox2->setMaxValue( 40 ); | 41 | SpinBox2->setMaxValue( 40 ); |
42 | QWhatsThis::add( SpinBox2 , tr( "Set the maximum number of task that should be shown" ) ); | ||
43 | |||
44 | |||
42 | 45 | ||
43 | QHBox *box2 = new QHBox( this ); | 46 | QHBox *box2 = new QHBox( this ); |
44 | 47 | ||
45 | QLabel* clipLabel = new QLabel( box2, "" ); | 48 | QLabel* clipLabel = new QLabel( box2, "" ); |
46 | clipLabel->setText( tr( "Clip line after\n X chars" ) ); | 49 | clipLabel->setText( tr( "Clip line after X chars" ) ); |
47 | 50 | ||
48 | SpinBoxClip = new QSpinBox( box2, "SpinClip" ); | 51 | SpinBoxClip = new QSpinBox( box2, "SpinClip" ); |
49 | SpinBoxClip->setMaxValue( 200 ); | 52 | SpinBoxClip->setMaxValue( 200 ); |
50 | 53 | QWhatsThis::add( SpinBoxClip , tr( "After how many chars should be the info about the task be cut off" ) ); | |
51 | layout->addWidget( box1 ); | 54 | layout->addWidget( box1 ); |
52 | layout->addWidget( box2 ); | 55 | layout->addWidget( box2 ); |
53 | 56 | ||
54 | readConfig(); | 57 | readConfig(); |
55 | } | 58 | } |
56 | 59 | ||
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp index 34ec3cb..dd98824 100644 --- a/core/pim/today/today.cpp +++ b/core/pim/today/today.cpp | |||
@@ -32,12 +32,13 @@ | |||
32 | #include <qtimer.h> | 32 | #include <qtimer.h> |
33 | #include <qpixmap.h> | 33 | #include <qpixmap.h> |
34 | #include <qlayout.h> | 34 | #include <qlayout.h> |
35 | #include <qhbox.h> | 35 | #include <qhbox.h> |
36 | #include <opie/otabwidget.h> | 36 | #include <opie/otabwidget.h> |
37 | #include <qdialog.h> | 37 | #include <qdialog.h> |
38 | #include <qwhatsthis.h> | ||
38 | 39 | ||
39 | 40 | ||
40 | struct TodayPlugin { | 41 | struct TodayPlugin { |
41 | QLibrary *library; | 42 | QLibrary *library; |
42 | TodayPluginInterface *iface; | 43 | TodayPluginInterface *iface; |
43 | TodayPluginObject *guiPart; | 44 | TodayPluginObject *guiPart; |
@@ -164,12 +165,13 @@ void Today::loadPlugins() { | |||
164 | plugin.guiBox = new QWidget( this ); | 165 | plugin.guiBox = new QWidget( this ); |
165 | QHBoxLayout *boxLayout = new QHBoxLayout( plugin.guiBox ); | 166 | QHBoxLayout *boxLayout = new QHBoxLayout( plugin.guiBox ); |
166 | QPixmap plugPix; | 167 | QPixmap plugPix; |
167 | plugPix.convertFromImage( Resource::loadImage( plugin.guiPart->pixmapNameWidget() ).smoothScale( m_iconSize, m_iconSize ), 0 ); | 168 | plugPix.convertFromImage( Resource::loadImage( plugin.guiPart->pixmapNameWidget() ).smoothScale( m_iconSize, m_iconSize ), 0 ); |
168 | OClickableLabel* plugIcon = new OClickableLabel( plugin.guiBox ); | 169 | OClickableLabel* plugIcon = new OClickableLabel( plugin.guiBox ); |
169 | plugIcon->setPixmap( plugPix ); | 170 | plugIcon->setPixmap( plugPix ); |
171 | QWhatsThis::add( plugIcon, tr("Click here to launch the associated app") ); | ||
170 | plugIcon->setName( plugin.guiPart->appName() ); | 172 | plugIcon->setName( plugin.guiPart->appName() ); |
171 | connect( plugIcon, SIGNAL( clicked() ), this, SLOT( startApplication() ) ); | 173 | connect( plugIcon, SIGNAL( clicked() ), this, SLOT( startApplication() ) ); |
172 | // a scrollview for each plugin | 174 | // a scrollview for each plugin |
173 | QScrollView* sv = new QScrollView( plugin.guiBox ); | 175 | QScrollView* sv = new QScrollView( plugin.guiBox ); |
174 | QWidget *plugWidget = plugin.guiPart->widget( sv->viewport() ); | 176 | QWidget *plugWidget = plugin.guiPart->widget( sv->viewport() ); |
175 | // not sure if that is good .-) | 177 | // not sure if that is good .-) |
diff --git a/core/pim/today/todaybase.cpp b/core/pim/today/todaybase.cpp index 352c9c1..12e8411 100644 --- a/core/pim/today/todaybase.cpp +++ b/core/pim/today/todaybase.cpp | |||
@@ -18,18 +18,19 @@ | |||
18 | 18 | ||
19 | #include <qframe.h> | 19 | #include <qframe.h> |
20 | #include <qlabel.h> | 20 | #include <qlabel.h> |
21 | #include <qimage.h> | 21 | #include <qimage.h> |
22 | #include <qpixmap.h> | 22 | #include <qpixmap.h> |
23 | #include <qapplication.h> | 23 | #include <qapplication.h> |
24 | #include <qwhatsthis.h> | ||
24 | 25 | ||
25 | #include <qpe/resource.h> | 26 | #include <qpe/resource.h> |
26 | 27 | ||
27 | 28 | ||
28 | TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl ) | 29 | TodayBase::TodayBase( QWidget* parent, const char* name, WFlags ) |
29 | : QWidget( parent, name, fl ) { | 30 | : QWidget( parent, name, WStyle_ContextHelp ) { |
30 | 31 | ||
31 | QPixmap logo = Resource::loadPixmap( "today/today_logo"); // logo | 32 | QPixmap logo = Resource::loadPixmap( "today/today_logo"); // logo |
32 | QPixmap opiezilla = Resource::loadPixmap("today/opiezilla" ); //the opiezilla | 33 | QPixmap opiezilla = Resource::loadPixmap("today/opiezilla" ); //the opiezilla |
33 | QPixmap config = Resource::loadPixmap( "today/config" ); // config icon | 34 | QPixmap config = Resource::loadPixmap( "today/config" ); // config icon |
34 | 35 | ||
35 | layout = new QVBoxLayout( this ); | 36 | layout = new QVBoxLayout( this ); |
@@ -77,24 +78,26 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl ) | |||
77 | DateLabel->setTextFormat( RichText ); | 78 | DateLabel->setTextFormat( RichText ); |
78 | 79 | ||
79 | // Opiezilla | 80 | // Opiezilla |
80 | QLabel* Opiezilla = new QLabel( Frame, "OpieZilla" ); | 81 | QLabel* Opiezilla = new QLabel( Frame, "OpieZilla" ); |
81 | Opiezilla->setPixmap( opiezilla ); | 82 | Opiezilla->setPixmap( opiezilla ); |
82 | Opiezilla->setGeometry( QApplication::desktop()->width()-50 ,1, 45, 47 ); | 83 | Opiezilla->setGeometry( QApplication::desktop()->width()-50 ,1, 45, 47 ); |
84 | QWhatsThis::add( Opiezilla , tr( "Today by Maximilian Reiß" ) ); | ||
83 | Opiezilla->setBackgroundOrigin( QLabel::ParentOrigin ); | 85 | Opiezilla->setBackgroundOrigin( QLabel::ParentOrigin ); |
84 | 86 | ||
85 | // Ownerfield | 87 | // Ownerfield |
86 | OwnerField = new OClickableLabel( this , "Owner" ); | 88 | OwnerField = new OClickableLabel( this , "Owner" ); |
87 | OwnerField->setGeometry( QRect( 0, 0, this->width(), 12 ) ); | 89 | OwnerField->setGeometry( QRect( 0, 0, this->width(), 12 ) ); |
88 | OwnerField->setAlignment( int (QLabel::AlignTop | QLabel::AlignLeft ) ); | 90 | OwnerField->setAlignment( int (QLabel::AlignTop | QLabel::AlignLeft ) ); |
89 | OwnerField->setMaximumHeight(12); | 91 | OwnerField->setMaximumHeight(12); |
90 | 92 | ||
91 | // config | 93 | // config |
92 | ConfigButton = new OClickableLabel ( Frame, "PushButton1" ); | 94 | ConfigButton = new OClickableLabel ( Frame, "PushButton1" ); |
93 | ConfigButton->setGeometry( QRect( QApplication::desktop()->width()-80, 30, 25, 21 ) ); | 95 | ConfigButton->setGeometry( QRect( QApplication::desktop()->width()-80, 30, 25, 21 ) ); |
94 | ConfigButton->setPixmap( config ); | 96 | ConfigButton->setPixmap( config ); |
97 | QWhatsThis::add( ConfigButton, tr( "Click here to get to the config dialog" ) ); | ||
95 | ConfigButton->setBackgroundOrigin( QLabel::ParentOrigin ); | 98 | ConfigButton->setBackgroundOrigin( QLabel::ParentOrigin ); |
96 | } | 99 | } |
97 | 100 | ||
98 | /** | 101 | /** |
99 | * D' tor | 102 | * D' tor |
100 | */ | 103 | */ |
diff --git a/core/pim/today/todaybase.h b/core/pim/today/todaybase.h index 7c50f32..340c7a6 100644 --- a/core/pim/today/todaybase.h +++ b/core/pim/today/todaybase.h | |||
@@ -30,13 +30,13 @@ class QBoxLayout; | |||
30 | 30 | ||
31 | class TodayBase : public QWidget | 31 | class TodayBase : public QWidget |
32 | { | 32 | { |
33 | Q_OBJECT | 33 | Q_OBJECT |
34 | 34 | ||
35 | public: | 35 | public: |
36 | TodayBase( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); | 36 | TodayBase( QWidget* parent = 0, const char* name = 0, WFlags = 0 ); |
37 | ~TodayBase(); | 37 | ~TodayBase(); |
38 | 38 | ||
39 | QFrame* Frame4; | 39 | QFrame* Frame4; |
40 | QPushButton* DatesButton; | 40 | QPushButton* DatesButton; |
41 | QVBoxLayout* layout; | 41 | QVBoxLayout* layout; |
42 | OClickableLabel* OwnerField; | 42 | OClickableLabel* OwnerField; |
diff --git a/core/pim/today/todayconfig.cpp b/core/pim/today/todayconfig.cpp index d15e2ab..f9dd8f7 100644 --- a/core/pim/today/todayconfig.cpp +++ b/core/pim/today/todayconfig.cpp | |||
@@ -66,12 +66,13 @@ TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal ) | |||
66 | tab2Layout->addWidget( l ); | 66 | tab2Layout->addWidget( l ); |
67 | QHBox *hbox1 = new QHBox( tab_2 ); | 67 | QHBox *hbox1 = new QHBox( tab_2 ); |
68 | m_appletListView = new QListView( hbox1 ); | 68 | m_appletListView = new QListView( hbox1 ); |
69 | m_appletListView->addColumn( "PluginList" ); | 69 | m_appletListView->addColumn( "PluginList" ); |
70 | m_appletListView->header()->hide(); | 70 | m_appletListView->header()->hide(); |
71 | m_appletListView->setSorting( -1 ); | 71 | m_appletListView->setSorting( -1 ); |
72 | QWhatsThis::add( m_appletListView, tr( "Check a checkbox to activate/deactivate a plugin ore use the arrow buttons on the right to change the appearance order" ) ); | ||
72 | QVBox *vbox1 = new QVBox( hbox1 ); | 73 | QVBox *vbox1 = new QVBox( hbox1 ); |
73 | new ToolButton( vbox1, tr( "Move Up" ), "up", this , SLOT( moveSelectedUp() ) ); | 74 | new ToolButton( vbox1, tr( "Move Up" ), "up", this , SLOT( moveSelectedUp() ) ); |
74 | new ToolButton( vbox1, tr( "Move Down" ), "down", this , SLOT( moveSelectedDown() ) ); | 75 | new ToolButton( vbox1, tr( "Move Down" ), "down", this , SLOT( moveSelectedDown() ) ); |
75 | tab2Layout->addWidget( hbox1 ); | 76 | tab2Layout->addWidget( hbox1 ); |
76 | TabWidget3->addTab( tab_2, "pass", tr( "active/order" ) ); | 77 | TabWidget3->addTab( tab_2, "pass", tr( "active/order" ) ); |
77 | 78 | ||