summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/today/todaybase.cpp2
-rw-r--r--core/pim/today/todayconfig.cpp12
-rw-r--r--core/pim/today/todayconfig.h2
3 files changed, 11 insertions, 5 deletions
diff --git a/core/pim/today/todaybase.cpp b/core/pim/today/todaybase.cpp
index 1424b95..352c9c1 100644
--- a/core/pim/today/todaybase.cpp
+++ b/core/pim/today/todaybase.cpp
@@ -60,17 +60,17 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl )
// Today text
QLabel* TodayLabel = new QLabel( Frame, "TodayText" );
TodayLabel->setGeometry( QRect( 10, 0, 168, 40 ) );
QFont TodayLabel_font( TodayLabel->font() );
TodayLabel_font.setBold( TRUE );
TodayLabel_font.setPointSize( 40 );
TodayLabel->setFont( TodayLabel_font );
TodayLabel->setBackgroundOrigin( QLabel::ParentOrigin );
- TodayLabel->setText( "<font color=#FFFFFF>" + tr("Today²") +"</font>" );
+ TodayLabel->setText( "<font color=#FFFFFF>" + tr("Today") +"</font>" );
// date
DateLabel = new QLabel( Frame, "TextLabel1" );
DateLabel->setGeometry( QRect( 10, 35, 168, 12 ) );
QFont DateLabel_font( DateLabel->font() );
DateLabel_font.setBold( TRUE );
DateLabel->setFont( DateLabel_font );
DateLabel->setBackgroundOrigin( QLabel::ParentOrigin );
diff --git a/core/pim/today/todayconfig.cpp b/core/pim/today/todayconfig.cpp
index 097965b..d15e2ab 100644
--- a/core/pim/today/todayconfig.cpp
+++ b/core/pim/today/todayconfig.cpp
@@ -25,16 +25,17 @@
#include <qspinbox.h>
#include <qtabwidget.h>
#include <qlayout.h>
#include <qheader.h>
#include <qhbox.h>
#include <qvbox.h>
#include <qtoolbutton.h>
#include <qtooltip.h>
+#include <qwhatsthis.h>
class ToolButton : public QToolButton {
public:
ToolButton( QWidget *parent, const char *name, const QString& icon, QObject *handler, const QString& slot, bool t = FALSE )
: QToolButton( parent, name ) {
setPixmap( Resource::loadPixmap( icon ) );
setAutoRaise( TRUE );
@@ -45,18 +46,18 @@ public:
};
/**
* The class has currently quite some duplicate code.
* By that way it would be real easy to have it as seperate app in settings tab
*
*/
-TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal, WFlags fl )
- : QDialog( parent, name, modal, fl ) {
+TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal )
+ : QDialog( parent, name, modal, WStyle_ContextHelp ) {
setCaption( tr( "Today config" ) );
QVBoxLayout *layout = new QVBoxLayout( this );
TabWidget3 = new OTabWidget ( this, "tabwidget", OTabWidget::Global, OTabWidget::Bottom );
layout->addWidget( TabWidget3 );
tab_2 = new QWidget( TabWidget3, "tab_2" );
@@ -75,27 +76,32 @@ TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal, WFlags
TabWidget3->addTab( tab_2, "pass", tr( "active/order" ) );
tab_3 = new QWidget( TabWidget3, "tab_3" );
QVBoxLayout *tab3Layout = new QVBoxLayout( tab_3 );
tab3Layout->setMargin( 20 );
QHBox *hbox_auto = new QHBox( tab_3 );
TextLabel2 = new QLabel( hbox_auto, "AutoStart" );
TextLabel2->setText( tr( "autostart on \nresume?\n (Opie only)" ) );
+ QWhatsThis::add( TextLabel2 , tr( "Check this if today should be autostarted on resume." ) );
CheckBoxAuto = new QCheckBox( hbox_auto, "CheckBoxAuto" );
+ QWhatsThis::add( CheckBoxAuto, tr( "Check this if today should be autostarted on resume." ) );
QHBox *hbox_inactive = new QHBox( tab_3 );
TimeLabel = new QLabel( hbox_inactive, "TimeLabel" );
TimeLabel->setText( tr( "minutes inactive" ) );
+ QWhatsThis::add( TimeLabel , tr( "How many minutes has the PDA been suspended before the autostart feature kicks in on resume" ) );
SpinBoxTime = new QSpinBox( hbox_inactive, "TimeSpinner" );
+ QWhatsThis::add( SpinBoxTime , tr( "How many minutes has the PDA been suspended before the autostart feature kicks in on resume" ) );
QHBox *hbox_iconSize = new QHBox( tab_3 );
QLabel *iconSizeLabel = new QLabel( hbox_iconSize, "iconSizeLabel" );
iconSizeLabel->setText( tr( "Icon size" ) );
- // iconSizeLabel->setToolTip( tr( "Set the icon size in pixel" ) );
+ QWhatsThis::add( iconSizeLabel, tr( "Set the icon size in pixel" ) );
SpinBoxIconSize = new QSpinBox( hbox_iconSize, "TimeSpinner" );
SpinBoxIconSize->setMaxValue( 32 );
+ QWhatsThis::add( SpinBoxIconSize, tr( "Set the icon size in pixel" ) );
tab3Layout->addWidget( hbox_auto );
tab3Layout->addWidget( hbox_inactive );
tab3Layout->addWidget( hbox_iconSize );
TabWidget3->addTab( tab_3, "SettingsIcon", tr( "Misc" ) );
m_applets_changed = false;
diff --git a/core/pim/today/todayconfig.h b/core/pim/today/todayconfig.h
index aa227dd..827e106 100644
--- a/core/pim/today/todayconfig.h
+++ b/core/pim/today/todayconfig.h
@@ -27,17 +27,17 @@ class QLabel;
class QSpinBox;
class QTabWidget;
class TodayConfig : public QDialog {
Q_OBJECT
public:
- TodayConfig( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+ TodayConfig( QWidget* parent = 0, const char* name = 0, bool modal = FALSE );
~TodayConfig();
OTabWidget* TabWidget3;
void writeConfig();
void pluginManagement( QString libName, QString name, QPixmap icon );