summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/pim/today/TODO9
-rw-r--r--core/pim/today/changelog4
-rw-r--r--core/pim/today/today.cpp149
-rw-r--r--core/pim/today/today.h25
-rw-r--r--core/pim/today/today.pro5
-rw-r--r--core/pim/today/todaybase.cpp16
-rw-r--r--core/pim/today/todaybase.h6
-rw-r--r--core/pim/today/todayconfig.h2
8 files changed, 141 insertions, 75 deletions
diff --git a/core/pim/today/TODO b/core/pim/today/TODO
index 5876e2b..a3b01d2 100644
--- a/core/pim/today/TODO
+++ b/core/pim/today/TODO
@@ -1,13 +1,14 @@
TODO for today:
-* start the app on "resume"
+* start the app on "resume" (partly done)
-* show alarm icons on alarm events
+* show alarm icons on alarm events (partly done)
* add am/pm mode instead of 24 h, take system default
-* fix 23 pm bug (done??)
-
* qcop integration for updating events?
* sort todos by pri. \ No newline at end of file
+
+* make Opiezilla a clickable label wich is allway on the far right side of
+the screen , klick will open credits ,) \ No newline at end of file
diff --git a/core/pim/today/changelog b/core/pim/today/changelog
index 7111154..333326d 100644
--- a/core/pim/today/changelog
+++ b/core/pim/today/changelog
@@ -1,52 +1,56 @@
+
+* Appointments are now clickable (connection to datebook still missing)
+* autostart support (opie only)
+
0.2.7
* check if todolist.xml was changed before parsing it
* check only every 30 sec for changes.
* some visual stuff
* as usual many little improvements .-)
0.2.6
* added scrollbars to dates and todo
* all day detection
* some smaller bugfixes
0.2.5
* some other minor fixes regarding autoupdate
* fixed segfault with todolist > 7 entries
* fixed the "ugly grey border around buttons" issue
* fixed the "empty calendar field" "bug"
* shown only later appointments as option
0.2.4
* added support for email
* autoupdates after 1 min
* QCopEnvelope instead of system()
* starting to use qvbox in gui
0.2.3
* the 4 am release
* several bugfixes
0.2.2
* started working on calling other apps
* and finished it
0.2.1
* images no more inline
* config dialog
0.1.1
* started changelog.
* fixed segfault on empty/nonexistant todolist.xml
* better handling for file location
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index d715fc1..69bcb68 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -1,443 +1,478 @@
/*
* today.cpp : main class
*
* ---------------------
*
* begin : Sun 10 17:20:00 CEST 2002
* copyright : (c) 2002 by Maximilian Reiß
* email : max.reiss@gmx.de
*
*/
/***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/
#include "today.h"
#include "minidom.h"
#include "TodoItem.h"
#include <qpe/datebookdb.h>
#include <qpe/timestring.h>
#include <qpe/config.h>
#include <qpe/qcopenvelope_qws.h>
#include <qpe/qprocess.h>
#include <qpe/resource.h>
#include <qdir.h>
#include <qfile.h>
#include <qdatetime.h>
#include <qtextstream.h>
#include <qcheckbox.h>
#include <qspinbox.h>
#include <qpushbutton.h>
#include <qlabel.h>
#include <qtimer.h>
#include <qpixmap.h>
#include <qfileinfo.h>
+#include <qlayout.h>
//#include <iostream.h>
//#include <unistd.h>
#include <stdlib.h>
+
int MAX_LINES_TASK;
int MAX_CHAR_CLIP;
int MAX_LINES_MEET;
int SHOW_LOCATION;
int SHOW_NOTES;
// show only later dates
int ONLY_LATER;
int AUTOSTART;
+
+int NEW_START=1;
/*
* Constructs a Example which is a child of 'parent', with the
* name 'name' and widget flags set to 'f'
*/
Today::Today( QWidget* parent, const char* name, WFlags fl )
: TodayBase( parent, name, fl ) {
QObject::connect( (QObject*)PushButton1, SIGNAL( clicked() ), this, SLOT(startConfig() ) );
QObject::connect( (QObject*)TodoButton, SIGNAL( clicked() ), this, SLOT(startTodo() ) );
QObject::connect( (QObject*)DatesButton, SIGNAL( clicked() ), this, SLOT(startDatebook() ) );
QObject::connect( (QObject*)MailButton, SIGNAL( clicked() ), this, SLOT(startMail() ) );
autoStart();
draw();
}
-
void Today::autoStart() {
Config cfg("today");
cfg.setGroup("Autostart");
AUTOSTART = cfg.readNumEntry("autostart",1);
if (AUTOSTART) {
QCopEnvelope e("QPE/System", "autoStart(QString,QString)");
e << QString("add");
e << QString("today");
} else {
QCopEnvelope e("QPE/System", "autoStart(QString,QString)");
e << QString("remove");
e << QString("today");
}
}
void Today::draw() {
init();
getDates();
getMail();
getTodo();
// how often refresh
QTimer::singleShot( 30*1000, this, SLOT(draw()) );
}
/*
* Check if the todolist.xml was modified (if there are new entries.
* Returns true if it was modified.
*/
bool Today::checkIfModified() {
QDir dir;
QString homedir = dir.homeDirPath ();
QString time;
Config cfg("today");
cfg.setGroup("Files");
time = cfg.readEntry("todolisttimestamp", "");
QFileInfo file = (homedir +"/Applications/todolist/todolist.xml");
QDateTime fileTime = file.lastModified();
if (time.compare(fileTime.toString()) == 0) {
return false;
} else {
cfg.writeEntry("todolisttimestamp", fileTime.toString() );
cfg.write();
return true;
}
}
void Today::init() {
QDate date = QDate::currentDate();
QString time = (tr( date.toString()) );
// QString time = (tr( date.toString()) , white);
TextLabel1->setText(time);
db = new DateBookDB;
// read config
Config cfg("today");
cfg.setGroup("BaseConfig");
// how many lines should be showed in the task section
MAX_LINES_TASK = cfg.readNumEntry("maxlinestask",5);
// after how many chars should the be cut off on tasks and notes
MAX_CHAR_CLIP = cfg.readNumEntry("maxcharclip",30);
// how many lines should be showed in the datebook section
MAX_LINES_MEET = cfg.readNumEntry("maxlinesmeet",5);
// If location is to be showed too, 1 to activate it.
SHOW_LOCATION = cfg.readNumEntry("showlocation",1);
// if notes should be shown
SHOW_NOTES = cfg.readNumEntry("shownotes",0);
ONLY_LATER = cfg.readNumEntry("onlylater",1);
}
void Today::startConfig() {
conf = new todayconfig ( this, "", true );
//Config cfg = new Config("today");
// read the config
Config cfg("today");
cfg.setGroup("BaseConfig");
//init();
conf->SpinBox1->setValue(MAX_LINES_MEET);
// location show box
conf->CheckBox1->setChecked(SHOW_LOCATION);
// notes show box
conf->CheckBox2->setChecked(SHOW_NOTES);
// task lines
conf->SpinBox2->setValue(MAX_LINES_TASK);
// clip when?
conf->SpinBox7->setValue(MAX_CHAR_CLIP);
// only later
conf->CheckBox3->setChecked(ONLY_LATER);
conf->CheckBoxAuto->setChecked(AUTOSTART);
conf->exec();
int maxlinestask = conf->SpinBox2->value();
int maxmeet = conf->SpinBox1->value();
int location = conf->CheckBox1->isChecked();
int notes = conf->CheckBox2->isChecked();
int maxcharclip = conf->SpinBox7->value();
int onlylater = conf->CheckBox3->isChecked();
int autostart =conf->CheckBoxAuto->isChecked();
cfg.writeEntry("maxlinestask",maxlinestask);
cfg.writeEntry("maxcharclip", maxcharclip);
cfg.writeEntry("maxlinesmeet",maxmeet);
cfg.writeEntry("showlocation",location);
cfg.writeEntry("shownotes", notes);
cfg.writeEntry("onlylater", onlylater);
cfg.setGroup("Autostart");
cfg.writeEntry("autostart", autostart);
// sync it to "disk"
cfg.write();
autoStart();
draw();
}
/*
* Get all events that are in the datebook xml file for today
*/
void Today::getDates() {
QDate date = QDate::currentDate();
- QTime time = QTime::currentTime();
+ QWidget* AllDateBookEvents = new QWidget( );
+ QVBoxLayout* layoutDates = new QVBoxLayout(AllDateBookEvents);
+ //QTime time = QTime::currentTime();
+
QValueList<EffectiveEvent> list = db->getEffectiveEvents(date, date);
Config config( "qpe" );
// if 24 h format
//bool ampm = config.readBoolEntry( "AMPM", TRUE );
int count=0;
if ( list.count() > 0 ) {
QString msg;
for ( QValueList<EffectiveEvent>::ConstIterator it=list.begin();
it!=list.end(); ++it ) {
count++;
if ( count <= MAX_LINES_MEET ) {
- //cout << time.toString() << endl;
- //cout << TimeString::dateString((*it).event().end()) << endl;
- // decide if to get all day or only later appointments
- if (!ONLY_LATER) {
- msg += "<B>" + (*it).description() + "</B>";
- if ( (*it).event().hasAlarm() ) {
- msg += " <b>[with alarm]</b>";
- }
- // include location or not
- if (SHOW_LOCATION == 1) {
- msg += "<BR><i>" + (*it).location();
- msg += "</i>";
- }
- if ( (TimeString::timeString(QTime((*it).event().start().time()) ) == "00:00") && (TimeString::timeString(QTime((*it).event().end().time()) ) == "23:59") ) {
- msg += "<br>All day";
- } else {
- // start time of event
- msg += "<br>" + TimeString::timeString(QTime((*it).event().start().time()) )
- // end time of event
- + "<b> - </b>" + TimeString::timeString(QTime((*it).event().end().time()) );
- }
- msg += "<BR>";
- // include possible note or not
- if (SHOW_NOTES == 1) {
- msg += " <i>note</i>:" +((*it).notes()).mid(0, MAX_CHAR_CLIP) + "<br>";
- }
- } else if ((time.toString() <= TimeString::dateString((*it).event().end())) ) {
- msg += "<B>" + (*it).description() + "</B>";
- if ( (*it).event().hasAlarm() ) {
- msg += " <b>[with alarm]</b>";
- }
- // include location or not
- if (SHOW_LOCATION == 1) {
- msg+= "<BR><i>" + (*it).location();
- msg += "</i>";
+ DateBookEvent *l=new DateBookEvent(*it, AllDateBookEvents);
+ layoutDates->addWidget(l);
+ connect (l, SIGNAL(editEvent(const Event &)),
+ this, SIGNAL(editEvent(const Event &)));
}
- if ( (TimeString::timeString(QTime((*it).event().start().time()) ) == "00:00") && (TimeString::timeString(QTime((*it).event().end().time()) ) == "23:59") ) {
- msg += "<br>All day";
- } else {
- // start time of event
- msg += "<br>" + TimeString::timeString(QTime((*it).event().start().time()) )
- // end time of event
- + "<b> - </b>" + TimeString::timeString(QTime((*it).event().end().time()) );
}
- msg += "<BR>";
- // include possible note or not
- if (SHOW_NOTES == 1) {
- msg += " <i>note</i>:" +((*it).notes()).mid(0, MAX_CHAR_CLIP) + "<br>";
- }
- }
- }
- }
- if (msg.isEmpty()) {
- msg = tr("No more appointments today");
- }
- DatesField->setText(msg);
+ layoutDates->addItem(new QSpacerItem(1,1, QSizePolicy::Minimum, QSizePolicy::Expanding));
+ sv1->addChild(AllDateBookEvents);
+
+ //if (msg.isEmpty()) {
+ // msg = tr("No more appointments today");
+ //}
+ //DatesField->setText(msg);
}
}
/*
* Parse in the todolist.xml
*/
QList<TodoItem> Today::loadTodo(const char *filename) {
DOM *todo;
ELE *tasks;
ELE **tasklist;
ATT **attlist;
int i, j;
char *description;
int completed;
int priority;
TodoItem *tmp;
QList<TodoItem> loadtodolist;
todo = minidom_load(filename);
tasks = todo->el;
tasks = tasks->el[0]; /*!DOCTYPE-quickhack*/
if(tasks) {
tasklist = tasks->el;
i = 0;
while((tasklist) && (tasklist[i])) {
attlist = tasklist[i]->at;
j = 0;
description = NULL;
priority = -1;
completed = -1;
while((attlist) && (attlist[j])) {
if(!attlist[j]->name) {
continue;
}
if(!strcmp(attlist[j]->name, "Description")) {
description = attlist[j]->value;
}
// get Completed tag (0 or 1)
if(!strcmp(attlist[j]->name, "Completed")) {
QString s = attlist[j]->name;
if(s == "Completed") {
completed = QString(attlist[j]->value).toInt();
}
}
// get Priority (1 to 5)
if(!strcmp(attlist[j]->name, "Priority")) {
QString s = attlist[j]->name;
if(s == "Priority") {
priority = QString(attlist[j]->value).toInt();
}
}
j++;
}
if(description) {
tmp = new TodoItem(description, completed, priority);
loadtodolist.append(tmp);
}
i++;
}
}
minidom_free(todo);
return loadtodolist;
}
void Today::getMail() {
Config cfg("opiemail");
cfg.setGroup("today");
// how many lines should be showed in the task section
int NEW_MAILS = cfg.readNumEntry("newmails",0);
int OUTGOING = cfg.readNumEntry("outgoing",0);
QString output = tr("<b>%1</b> new mail(s), <b>%2</b> outgoing").arg(NEW_MAILS).arg(OUTGOING);
MailField->setText(output);
}
/*
* Get the todos
*
*/
void Today::getTodo() {
// if the todolist.xml file was not modified in between, do not parse it.
- if (!checkIfModified()) {
+ if (!checkIfModified() && !NEW_START) {
return;
}
+ NEW_START=0;
QString output;
QString tmpout;
int count = 0;
QDir dir;
QString homedir = dir.homeDirPath ();
// see if todolist.xml does exist.
QFile f(homedir +"/Applications/todolist/todolist.xml");
if ( f.exists() ) {
QList<TodoItem> todolist = loadTodo(homedir +"/Applications/todolist/todolist.xml");
TodoItem *item;
for( item = todolist.first(); item; item = todolist.next()) {
if (!(item->getCompleted() == 1) ) {
count++;
if (count <= MAX_LINES_TASK) {
tmpout += "<b>- </b>" + QString(((item)->getDescription().mid(0, MAX_CHAR_CLIP) + ("<br>")));
}
}
}
}
if (count > 0) {
if( count == 1 ) {
output = tr("There is <b> 1</b> active task: <br>" );
} else {
output = tr("There are <b> %1</b> active tasks: <br>").arg(count);
}
output += tmpout;
} else {
output = tr("No active tasks");
}
TodoField->setText(tr(output));
}
/*
* launches datebook
*/
void Today::startDatebook() {
QCopEnvelope e("QPE/System", "execute(QString)");
e << QString("datebook");
}
/*
* launches todolist
*/
void Today::startTodo() {
QCopEnvelope e("QPE/System", "execute(QString)");
e << QString("todolist");
}
/*
* launch opiemail
*/
void Today::startMail() {
QCopEnvelope e("QPE/System", "execute(QString)");
e << QString("opiemail");
}
/*
* Destroys the object and frees any allocated resources
*/
Today::~Today() {
// no need to delete child widgets, Qt does it all for us
}
+
+
+DateBookEvent::DateBookEvent(const EffectiveEvent &ev,
+ QWidget* parent = 0,
+ const char* name = 0,
+ WFlags fl = 0) :
+ ClickableLabel(parent,name,fl), event(ev) {
+
+ QString msg;
+ QTime time = QTime::currentTime();
+
+ if (!ONLY_LATER) {
+ msg += "<B>" + (ev).description() + "</B>";
+ if ( (ev).event().hasAlarm() ) {
+ msg += " <b>[with alarm]</b>";
+ }
+ // include location or not
+ if (SHOW_LOCATION == 1) {
+ msg += "<BR><i>" + (ev).location();
+ msg += "</i>";
+ }
+
+ if ( (TimeString::timeString(QTime((ev).event().start().time()) ) == "00:00") && (TimeString::timeString(QTime((ev).event().end().time()) ) == "23:59") ) {
+ msg += "<br>All day";
+ } else {
+ // start time of event
+ msg += "<br>" + TimeString::timeString(QTime((ev).event().start().time()) )
+ // end time of event
+ + "<b> - </b>" + TimeString::timeString(QTime((ev).event().end().time()) );
+ }
+ msg += "<BR>";
+ // include possible note or not
+ if (SHOW_NOTES == 1) {
+ msg += " <i>note</i>:" +((ev).notes()).mid(0, MAX_CHAR_CLIP) + "<br>";
+ }
+ } else if ((time.toString() <= TimeString::dateString((ev).event().end())) ) {
+ msg += "<B>" + (ev).description() + "</B>";
+ if ( (ev).event().hasAlarm() ) {
+ msg += " <b>[with alarm]</b>";
+ }
+ // include location or not
+ if (SHOW_LOCATION == 1) {
+ msg+= "<BR><i>" + (ev).location();
+ msg += "</i>";
+ }
+
+ if ( (TimeString::timeString(QTime((ev).event().start().time()) ) == "00:00") && (TimeString::timeString(QTime((ev).event().end().time()) ) == "23:59") ) {
+ msg += "<br>All day";
+ } else {
+ // start time of event
+ msg += "<br>" + TimeString::timeString(QTime((ev).event().start().time()) )
+ // end time of event
+ + "<b> - </b>" + TimeString::timeString(QTime((ev).event().end().time()) );
+ }
+ // include possible note or not
+ if (SHOW_NOTES == 1) {
+ msg += "<br> <i>note</i>:" +((ev).notes()).mid(0, MAX_CHAR_CLIP) + "<br>";
+ }
+ }
+
+ setText(msg);
+ connect(this, SIGNAL(clicked()), this, SLOT(editMe()));
+ setAlignment( int( QLabel::WordBreak | QLabel::AlignLeft ) );
+}
+
+void DateBookEvent::editMe() {
+ emit editEvent(event.event());
+}
+
+
+
diff --git a/core/pim/today/today.h b/core/pim/today/today.h
index b3b7d01..0a0837c 100644
--- a/core/pim/today/today.h
+++ b/core/pim/today/today.h
@@ -1,65 +1,84 @@
/*
* today.h
*
* ---------------------
*
* begin : Sun 10 17:20:00 CEST 2002
* copyright : (c) 2002 by Maximilian Reiß
* email : max.reiss@gmx.de
*
*/
/***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/
#ifndef TODAY_H
#define TODAY_H
-#include "todaybase.h"
#include <qpe/datebookdb.h>
+#include <qpe/event.h>
#include <qdatetime.h>
#include <qlist.h>
+
#include "TodoItem.h"
#include "todayconfig.h"
+#include "todaybase.h"
+#include "clickablelabel.h"
-class Today : public TodayBase
-{
+class QVBoxLayout;
+
+class Today : public TodayBase {
Q_OBJECT
public:
Today( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
~Today();
private slots:
void startConfig();
void startTodo();
void startDatebook();
void startMail();
void draw();
private:
void init();
void getDates();
void getTodo();
void getMail();
void autoStart();
bool checkIfModified();
QList<TodoItem> loadTodo(const char *filename);
private:
DateBookDB *db;
todayconfig *conf;
//Config cfg;
int MAX_LINES_TASK;
int MAX_CHAR_CLIP;
int MAX_LINES_MEET;
int SHOW_LOCATION;
int SHOW_NOTES;
};
+
+class DateBookEvent: public ClickableLabel {
+ Q_OBJECT
+public:
+ DateBookEvent(const EffectiveEvent &ev,
+ QWidget* parent = 0, const char* name = 0,
+ WFlags fl = 0);
+signals:
+ void editEvent(const Event &e);
+private slots:
+ void editMe();
+private:
+ const EffectiveEvent event;
+};
+
#endif // TODAY_H
diff --git a/core/pim/today/today.pro b/core/pim/today/today.pro
index 7d56e71..454b3ff 100644
--- a/core/pim/today/today.pro
+++ b/core/pim/today/today.pro
@@ -1,11 +1,12 @@
TEMPLATE = app
#CONFIG = qt warn_on debug
CONFIG = qt warn_on release
-HEADERS = today.h TodoItem.h minidom.h todaybase.h todayconfig.h
-SOURCES = main.cpp today.cpp todaybase.cpp todayconfig.cpp minidom.c TodoItem.cpp
+HEADERS = today.h TodoItem.h minidom.h todaybase.h todayconfig.h clickablelabel.h
+SOURCES = main.cpp today.cpp todaybase.cpp todayconfig.cpp minidom.c TodoItem.cpp clickablelabel.cpp
+
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe
INTERFACES =
TARGET = today
DESTDIR = $(OPIEDIR)/bin
diff --git a/core/pim/today/todaybase.cpp b/core/pim/today/todaybase.cpp
index 5c1dc24..552e2eb 100644
--- a/core/pim/today/todaybase.cpp
+++ b/core/pim/today/todaybase.cpp
@@ -1,193 +1,197 @@
/*
* todaybase.cpp *
* ---------------------
*
* begin : Sun 10 17:20:00 CEST 2002
* copyright : (c) 2002 by Maximilian Reiß
* email : max.reiss@gmx.de
*
*/
/***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/
#include "todaybase.h"
#include <qframe.h>
#include <qlabel.h>
#include <qpushbutton.h>
#include <qlayout.h>
#include <qvariant.h>
#include <qtooltip.h>
#include <qwhatsthis.h>
#include <qimage.h>
#include <qpixmap.h>
#include <qscrollview.h>
#include <qvbox.h>
#include <qapplication.h>
#include <qpe/resource.h>
/*
* Constructs a TodayBase which is a child of 'parent', with the
* name 'name' and widget flags set to 'f'
*/
TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl )
: QWidget( parent, name, fl )
{
QPixmap logo = Resource::loadPixmap( "today/today_logo"); // logo
QPixmap datebook = Resource::loadPixmap("DateBook"); // datebook
QPixmap todo = Resource::loadPixmap( "TodoList" ); // todo
QPixmap config = Resource::loadPixmap( "today/config" ); // config icon
QPixmap mail = Resource::loadPixmap( "today/mail" ); // mail icon
QPalette pal = this->palette();
QColor col = pal.color(QPalette::Active, QColorGroup::Background);
pal.setColor(QPalette::Active, QColorGroup::Button, col);
this->setPalette(pal);
+
QWidget *d = QApplication::desktop();
int w=d->width();
int h=d->height();
resize( w , h );
// hehe, qt is ...
getridoffuckingstrippeldlinesbutton = new QPushButton (this, "asdfsad" );
getridoffuckingstrippeldlinesbutton->setGeometry( QRect( -5, 10, 0, 0 ) );
QVBoxLayout * layout = new QVBoxLayout(this);
// --- logo Section ---
QPalette pal2;
QColorGroup cg;
cg.setColor( QColorGroup::Text, white );
cg.setBrush( QColorGroup::Background, QBrush( QColor( 238, 238, 230), logo ) );
pal2.setActive( cg );
// today logo
Frame = new QLabel( this, "Frame" );
Frame->setPalette( pal2 );
Frame->setFrameShape( QFrame::StyledPanel );
Frame->setFrameShadow( QFrame::Raised );
Frame->setLineWidth( 0 );
Frame->setMaximumHeight(50);
Frame->setMinimumHeight(50);
// date
TextLabel1 = new QLabel( Frame, "TextLabel1" );
TextLabel1->setGeometry( QRect( 10, 35, 168, 12 ) );
QFont TextLabel1_font( TextLabel1->font() );
TextLabel1_font.setBold( TRUE );
TextLabel1->setFont( TextLabel1_font );
TextLabel1->setBackgroundOrigin( QLabel::ParentOrigin );
TextLabel1->setTextFormat( RichText );
// --- dates section ---
Frame4 = new QFrame( this, "Frame4" );
Frame4->setPalette( pal );
Frame4->setFrameShape( QScrollView::StyledPanel );
Frame4->setFrameShadow( QScrollView::Sunken );
Frame4->setBackgroundOrigin( QScrollView::ParentOrigin );
Frame4->setFrameStyle( QFrame::NoFrame );
Frame4->setGeometry (QRect( 0, 0, this->width() , this->height()) );
- QScrollView* sv1 = new QScrollView( Frame4 );
+ // QScrollView* sv1 = new QScrollView( Frame4 );
+ sv1 = new QScrollView( Frame4 );
sv1->setResizePolicy(QScrollView::AutoOneFit);
sv1->setHScrollBarMode( QScrollView::AlwaysOff );
// need to find a better way!!!
sv1->setGeometry (QRect( 40, 2, Frame4->width()-40 , (Frame4->height()/3)+20 ) );
sv1->setFrameShape(QFrame::NoFrame);
DatesButton = new QPushButton (Frame4, "DatesButton" );
DatesButton->setGeometry( QRect( 2, 4, 36, 32 ) );
DatesButton->setBackgroundOrigin( QPushButton::WidgetOrigin );
DatesButton->setPalette( pal );
DatesButton->setPixmap( datebook );
DatesButton->setFlat( TRUE );
- DatesField = new QLabel( sv1->viewport(), "DatesField" );
- sv1->addChild(DatesField);
- DatesField->setText( tr( "No appointments today" ) );
- DatesField->setAlignment( int( QLabel::AlignTop | QLabel::AlignLeft ) );
+ //DatesField = new QLabel( sv1->viewport(), "DatesField" );
+ //DatesField = new QVBox(sv1->viewport());
+ //QWidget *dummy = new QWidget(sv1->viewport());
+ //sv1->addChild(DatesField);
+ //DatesField->setText( tr( "No appointments today" ) );
+ // DatesField->setAlignment( int( QLabel::AlignTop | QLabel::AlignLeft ) );
- // --- mail section ---
+ // --- mail section ---)
MailFrame = new QFrame( this ,"MailFrame" );
MailFrame->setBackgroundOrigin( QScrollView::ParentOrigin );
MailFrame->setGeometry (QRect( 0, 0, this->width() , 15) );
MailFrame->setFrameStyle( QFrame::NoFrame );
QFrame* Line1 = new QFrame( MailFrame);
Line1->setGeometry( QRect( -5, 0, MailFrame->width()+5, 5 ) );
Line1->setFrameStyle( QFrame::HLine | QFrame::Sunken );
MailButton = new QPushButton (MailFrame, "MailButton" );
MailButton->setGeometry( QRect( 2, 3, 36, 19 ) );
MailButton->setPalette( pal );
MailButton->setPixmap( mail );
MailButton->setFlat( TRUE );
MailField = new QLabel( MailFrame, "MailField" );
MailField->setGeometry( QRect( 40, 4, MailFrame->width(), 12) );
MailField->setText( tr( "Opiemail not installed" ) );
MailField->setAlignment( int( QLabel::AlignTop | QLabel::AlignLeft ) );
MailField->setMaximumHeight(40);
MailField->setMinimumHeight(15);
// --- todo section --
Frame15 = new QFrame( this, "Frame15" );
Frame15->setFrameStyle( QFrame::NoFrame );
Frame15->setGeometry (QRect( 40, 3, this->width() , this->height()) );
QFrame* Line2 = new QFrame( Frame15);
Line2->setGeometry( QRect( -5, 0, MailFrame->width()+5, 5 ) );
Line2->setFrameStyle( QFrame::HLine | QFrame::Sunken );
TodoButton = new QPushButton (Frame15, "TodoButton" );
TodoButton->setGeometry( QRect( 2, 4, 36, 32 ) );
TodoButton->setPalette( pal );
TodoButton->setPixmap( todo );
TodoButton->setFlat( TRUE );
QScrollView* sv2 = new QScrollView( Frame15 );
sv2->setResizePolicy(QScrollView::AutoOneFit);
sv2->setHScrollBarMode( QScrollView::AlwaysOff );
sv2->setGeometry (QRect( 40, 3, Frame15->width()-40 , (Frame15->height()/3) ) );
sv2->setFrameShape(QFrame::NoFrame);
TodoField = new QLabel( sv2->viewport(), "TodoField" );
sv2->addChild(TodoField);
TodoField->setFrameShadow( QLabel::Plain );
//TodoField->setText( tr( "No current todos" ) );
TodoField->setAlignment( int( QLabel::AlignTop | QLabel::AlignLeft ) );
PushButton1 = new QPushButton (Frame15, "PushButton1" );
PushButton1->setGeometry( QRect( 2, 68, 25, 21 ) );
PushButton1->setPixmap( config );
PushButton1->setPalette( pal );
PushButton1->setAutoDefault( TRUE );
PushButton1->setFlat( TRUE );
// -- layout --
layout->addWidget(Frame);
layout->addWidget(Frame4);
layout->addWidget(MailFrame);
layout->addWidget(Frame15);
layout->setStretchFactor(Frame4,5);
layout->setStretchFactor(MailFrame,1);
layout->setStretchFactor(Frame15,4);
}
/*
* Destroys the object and frees any allocated resources
*/
TodayBase::~TodayBase()
{
}
diff --git a/core/pim/today/todaybase.h b/core/pim/today/todaybase.h
index 13fbb8d..8840125 100644
--- a/core/pim/today/todaybase.h
+++ b/core/pim/today/todaybase.h
@@ -1,52 +1,54 @@
/****************************************************************************
** Form interface generated from reading ui file 'todaybase.ui'
**
** Created: Wed Feb 13 19:36:45 2002
** by: The User Interface Compiler (uic)
**
** WARNING! All changes made in this file will be lost!
****************************************************************************/
#ifndef TODAYBASE_H
#define TODAYBASE_H
#include <qvariant.h>
#include <qwidget.h>
#include <qscrollview.h>
#include <qsplitter.h>
-class QVBoxLayout;
+class QVBox;
class QHBoxLayout;
class QGridLayout;
class QFrame;
class QLabel;
class QPushButton;
class TodayBase : public QWidget
{
Q_OBJECT
public:
TodayBase( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
~TodayBase();
//QScrollView* Frame4;
QFrame* Frame4;
QPushButton* DatesButton;
- QLabel* DatesField;
+ //QLabel* DatesField;
QLabel* Frame;
QFrame* MailFrame;
QLabel* TextLabel1;
+ QScrollView* sv1;
+ QVBox* DatesField;
QFrame* Frame15;
QLabel* TodoField;
QLabel* MailField;
QPushButton* PushButton1;
QPushButton* TodoButton;
QPushButton* MailButton;
QPushButton* getridoffuckingstrippeldlinesbutton;
protected:
};
#endif // TODAYBASE_H
diff --git a/core/pim/today/todayconfig.h b/core/pim/today/todayconfig.h
index 020097d..4739b5a 100644
--- a/core/pim/today/todayconfig.h
+++ b/core/pim/today/todayconfig.h
@@ -1,55 +1,55 @@
/****************************************************************************
** Form interface generated from reading ui file 'todayconfig.ui'
**
** Created: Thu Feb 14 15:04:33 2002
** by: The User Interface Compiler (uic)
**
** WARNING! All changes made in this file will be lost!
****************************************************************************/
#ifndef TODAYCONFIG_H
#define TODAYCONFIG_H
#include <qvariant.h>
#include <qdialog.h>
-class QVBoxLayout;
+//class QVBoxLayout;
class QHBoxLayout;
class QGridLayout;
class QCheckBox;
class QFrame;
class QLabel;
class QSpinBox;
class QTabWidget;
class QWidget;
class todayconfig : public QDialog
{
Q_OBJECT
public:
todayconfig( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
~todayconfig();
QTabWidget* TabWidget3;
QWidget* tab;
QFrame* Frame8;
QLabel* TextLabel4;
QLabel* TextLabel5;
QLabel* TextLabel2;
QCheckBox* CheckBox3;
QCheckBox* CheckBox2;
QCheckBox* CheckBox1;
QCheckBox* CheckBoxAuto;
QSpinBox* SpinBox1;
QLabel* TextLabel3;
QWidget* tab_2;
QFrame* Frame9;
QLabel* TextLabel6;
QSpinBox* SpinBox2;
QWidget* tab_3;
QFrame* Frame14;
QLabel* TextLabel1;
QSpinBox* SpinBox7;
};
#endif // TODAYCONFIG_H