summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/today/today.cpp24
-rw-r--r--core/pim/today/today.h1
-rw-r--r--core/pim/today/todaybase.cpp4
-rw-r--r--core/pim/today/todaybase.h2
-rw-r--r--core/pim/today/todayconfig.cpp13
-rw-r--r--core/pim/today/todayconfig.h4
6 files changed, 40 insertions, 8 deletions
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index 5e5d373..0b61bf8 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -25,8 +25,9 @@
#include <qpe/resource.h>
#include <qpe/global.h>
#include <qpe/qpeapplication.h>
#include <qpe/contact.h>
+#include <qpe/timestring.h>
#include <qdir.h>
#include <qfile.h>
#include <qtimer.h>
@@ -129,18 +130,35 @@ void Today::init() {
m_allApplets = cfg.readListEntry( "AllApplets", ',' );
cfg.setGroup( "General" );
m_iconSize = cfg.readNumEntry( "IconSize", 18 );
+ m_hideBanner = cfg.readNumEntry( "HideBanner", 0 );
setRefreshTimer( cfg.readNumEntry( "checkinterval", 15000 ) );
// set the date in top label
QDate date = QDate::currentDate();
- QString time = ( tr( date.toString() ) );
- DateLabel->setText( QString( "<font color=#FFFFFF>" + time + "</font>" ) );
+ DateLabel->setText( QString( "<font color=#FFFFFF>" + TimeString::longDateString( date ) + "</font>" ) );
if ( layout ) {
delete layout;
}
+
+ if ( m_hideBanner ) {
+ Opiezilla->hide();
+ TodayLabel->hide();
+ Frame->setMaximumHeight( 18 );
+ Frame->setMinimumHeight( 18 );
+ DateLabel->setGeometry( QRect( 10, 2, 168, 12 ) );
+ ConfigButton->setGeometry( QRect( QApplication::desktop()->width()-20, 0, 25, 20 ) );
+ } else {
+ Opiezilla->show();
+ TodayLabel->show();
+ Frame->setMaximumHeight( 50 );
+ Frame->setMinimumHeight( 50 );
+ DateLabel->setGeometry( QRect( 10, 35, 168, 12 ) );
+ ConfigButton->setGeometry( QRect( QApplication::desktop()->width()-80, 29, 25, 20 ) );
+ }
+
layout = new QVBoxLayout( this );
layout->addWidget( Frame );
layout->addWidget( OwnerField );
}
@@ -318,9 +336,9 @@ void Today::startConfig() {
TodayPlugin plugin;
QList<TodayConfigWidget> configWidgetList;
- for ( int i = pluginList.count() - 1 ; i >= 0; i-- ) {
+ for ( int i = pluginList.count() - 1; i >= 0; i-- ) {
plugin = pluginList[i];
// load the config widgets in the tabs
if ( plugin.guiPart->configWidget( this ) != 0l ) {
diff --git a/core/pim/today/today.h b/core/pim/today/today.h
index 3802feb..b28ac96 100644
--- a/core/pim/today/today.h
+++ b/core/pim/today/today.h
@@ -65,7 +65,8 @@ private slots:
bool m_refreshTimerEnabled;
int m_newStart;
int m_iconSize;
int m_maxCharClip;
+ int m_hideBanner;
};
#endif
diff --git a/core/pim/today/todaybase.cpp b/core/pim/today/todaybase.cpp
index da4efa3..a36ecaa 100644
--- a/core/pim/today/todaybase.cpp
+++ b/core/pim/today/todaybase.cpp
@@ -57,9 +57,9 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags )
Frame->setMaximumHeight( 50 );
Frame->setMinimumHeight( 50 );
// Today text
- QLabel* TodayLabel = new QLabel( Frame, "TodayText" );
+ TodayLabel = new QLabel( Frame, "TodayText" );
TodayLabel->setGeometry( QRect( 10, 1, 168, 40 ) );
QFont TodayLabel_font( TodayLabel->font() );
TodayLabel_font.setBold( TRUE );
TodayLabel_font.setPointSize( 40 );
@@ -76,9 +76,9 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags )
DateLabel->setBackgroundOrigin( QLabel::ParentOrigin );
DateLabel->setTextFormat( RichText );
// Opiezilla
- QLabel* Opiezilla = new QLabel( Frame, "OpieZilla" );
+ Opiezilla = new QLabel( Frame, "OpieZilla" );
Opiezilla->setPixmap( opiezilla );
Opiezilla->setGeometry( QApplication::desktop()->width()-50 ,1, 45, 47 );
QWhatsThis::add( Opiezilla , tr( "Today by Maximilian Reiß" ) );
Opiezilla->setBackgroundOrigin( QLabel::ParentOrigin );
diff --git a/core/pim/today/todaybase.h b/core/pim/today/todaybase.h
index 340c7a6..b0b2e14 100644
--- a/core/pim/today/todaybase.h
+++ b/core/pim/today/todaybase.h
@@ -42,8 +42,10 @@ public:
OClickableLabel* OwnerField;
QLabel* Frame;
QLabel* DateLabel;
QFrame* Frame15;
+ QLabel* Opiezilla;
+ QLabel* TodayLabel;
OClickableLabel* ConfigButton;
protected:
diff --git a/core/pim/today/todayconfig.cpp b/core/pim/today/todayconfig.cpp
index 0774ccb..a60f1d2 100644
--- a/core/pim/today/todayconfig.cpp
+++ b/core/pim/today/todayconfig.cpp
@@ -53,9 +53,9 @@ public:
*/
TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal )
: QDialog( parent, name, modal, WStyle_ContextHelp ) {
- setCaption( tr( "Today config" ) );
+ setCaption( tr( "Today Config" ) );
QVBoxLayout *layout = new QVBoxLayout( this );
TabWidget3 = new OTabWidget ( this, "tabwidget", OTabWidget::Global, OTabWidget::Bottom );
layout->addWidget( TabWidget3 );
@@ -84,8 +84,16 @@ TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal )
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_hide = new QHBox( tab_3 );
+ TextLabel4 = new QLabel( hbox_hide, "HideBanner" );
+ TextLabel4->setText( tr( "Tiny Banner" ) );
+ //QWhatsThis::add( TextLabel2 , tr( "Check this if today should be autostarted on resume." ) );
+ CheckBoxHide = new QCheckBox( hbox_hide, "CheckBoxHide" );
+ // 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" ) );
@@ -111,8 +119,9 @@ TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal )
SpinRefresh->setSpecialValueText ( tr("never") );
QWhatsThis::add( SpinRefresh, tr( "How often should Today refresh itself" ) );
tab3Layout->addWidget( hbox_auto );
+ tab3Layout->addWidget( hbox_hide );
tab3Layout->addWidget( hbox_inactive );
tab3Layout->addWidget( hbox_iconSize );
tab3Layout->addWidget( hbox_refresh );
TabWidget3->addTab( tab_3, "SettingsIcon", tr( "Misc" ) );
@@ -159,8 +168,9 @@ void TodayConfig::readConfig() {
cfg.setGroup( "General" );
m_iconSize = cfg.readNumEntry( "IconSize", 18 );
SpinBoxIconSize->setValue( m_iconSize );
SpinRefresh->setValue( cfg.readNumEntry( "checkinterval", 15000 ) / 1000 );
+ CheckBoxHide->setChecked( cfg.readNumEntry( "HideBanner", 0 ) );
cfg.setGroup( "Plugins" );
m_excludeApplets = cfg.readListEntry( "ExcludeApplets", ',' );
@@ -206,8 +216,9 @@ void TodayConfig::writeConfig() {
m_iconSize = SpinBoxIconSize->value();
cfg.setGroup( "General" );
cfg.writeEntry( "IconSize", m_iconSize );
+ cfg.writeEntry( "HideBanner", CheckBoxHide->isChecked() );
cfg.writeEntry( "checkinterval", SpinRefresh->value()*1000 );
// set autostart settings
setAutoStart();
diff --git a/core/pim/today/todayconfig.h b/core/pim/today/todayconfig.h
index 68483c2..41bd44b 100644
--- a/core/pim/today/todayconfig.h
+++ b/core/pim/today/todayconfig.h
@@ -59,12 +59,12 @@ private:
QStringList m_excludeApplets;
bool m_applets_changed;
QLabel* TextLabel2;
- QCheckBox* CheckBoxAuto;
+ QCheckBox* CheckBoxAuto, *CheckBoxHide;
QWidget* tab_2;
QWidget* tab_3;
- QLabel* TextLabel1;
+ QLabel* TextLabel1, *TextLabel4;
QSpinBox* SpinBox7;
QLabel* TimeLabel;
QSpinBox* SpinBoxTime;
QSpinBox* SpinRefresh;