summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile9
-rw-r--r--Makefile.Embedded9
-rw-r--r--bin/kdepim/kopiemail/germantranslation.txt10
-rw-r--r--kmicromail/koprefs.cpp5
-rw-r--r--kmicromail/koprefs.h1
-rw-r--r--kmicromail/koprefsdialog.cpp19
-rw-r--r--kmicromail/mainwindow.cpp64
-rw-r--r--kmicromail/opiemail.cpp3
-rw-r--r--korganizer/kowhatsnextview.cpp2
-rw-r--r--microkde/KDGanttMinimizeSplitter.cpp10
-rw-r--r--microkde/KDGanttMinimizeSplitter.h2
11 files changed, 101 insertions, 33 deletions
diff --git a/Makefile b/Makefile
index 68619b9..9656532 100644
--- a/Makefile
+++ b/Makefile
@@ -245,3 +245,4 @@ dist:
rm -f *~
- cd ..;mkdir -p new_$(KDEPIM_VERSION)
+ cd ..;mkdir -p kdepimpi_$(KDEPIM_VERSION)
+ cd ../kdepimpi_$(KDEPIM_VERSION);mkdir -p ipk
cd ..; tar czf kdepimpi-$(KDEPIM_VERSION).tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia kdepim
@@ -265,5 +266,5 @@ dist:
zip kdepim_$(KDEPIM_VERSION)_for_SharpRom.ipk.zip *.ipk ReleaseNotes.txt
- mv *.ipk ../new_$(KDEPIM_VERSION)/
- mv *for_SharpRom.ipk.zip ../new_$(KDEPIM_VERSION)/
- mv ../kdepimpi-$(KDEPIM_VERSION).tar.gz ../new_$(KDEPIM_VERSION)/
+ mv *.ipk ../kdepimpi_$(KDEPIM_VERSION)/ipk/
+ mv *for_SharpRom.ipk.zip ../kdepimpi_$(KDEPIM_VERSION)/
+ mv ../kdepimpi-$(KDEPIM_VERSION).tar.gz ../kdepimpi_$(KDEPIM_VERSION)/
diff --git a/Makefile.Embedded b/Makefile.Embedded
index 68619b9..9656532 100644
--- a/Makefile.Embedded
+++ b/Makefile.Embedded
@@ -245,3 +245,4 @@ dist:
rm -f *~
- cd ..;mkdir -p new_$(KDEPIM_VERSION)
+ cd ..;mkdir -p kdepimpi_$(KDEPIM_VERSION)
+ cd ../kdepimpi_$(KDEPIM_VERSION);mkdir -p ipk
cd ..; tar czf kdepimpi-$(KDEPIM_VERSION).tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia kdepim
@@ -265,5 +266,5 @@ dist:
zip kdepim_$(KDEPIM_VERSION)_for_SharpRom.ipk.zip *.ipk ReleaseNotes.txt
- mv *.ipk ../new_$(KDEPIM_VERSION)/
- mv *for_SharpRom.ipk.zip ../new_$(KDEPIM_VERSION)/
- mv ../kdepimpi-$(KDEPIM_VERSION).tar.gz ../new_$(KDEPIM_VERSION)/
+ mv *.ipk ../kdepimpi_$(KDEPIM_VERSION)/ipk/
+ mv *for_SharpRom.ipk.zip ../kdepimpi_$(KDEPIM_VERSION)/
+ mv ../kdepimpi-$(KDEPIM_VERSION).tar.gz ../kdepimpi_$(KDEPIM_VERSION)/
diff --git a/bin/kdepim/kopiemail/germantranslation.txt b/bin/kdepim/kopiemail/germantranslation.txt
index 86819b7..68dc6db 100644
--- a/bin/kdepim/kopiemail/germantranslation.txt
+++ b/bin/kdepim/kopiemail/germantranslation.txt
@@ -260,2 +260,12 @@
{ "View Source","Zeige Source" },
+{ "Show "To" field in list view","Zeige "An" Feld in Listenansicht" },
+{ "Show info fields at startup","Zeige Info Felder beim Start" },
+{ "Show "Subject" info field","Zeige "Betreff" Info Feld" },
+{ "Show "From" info field","Zeige "Von" Info Feld" },
+{ "Show "To" info field","Zeige "An" Info Feld" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
{ "","" },
diff --git a/kmicromail/koprefs.cpp b/kmicromail/koprefs.cpp
index 2bae5f6..7b1e169 100644
--- a/kmicromail/koprefs.cpp
+++ b/kmicromail/koprefs.cpp
@@ -67,3 +67,6 @@ KOPrefs::KOPrefs() :
addItemInt("CurrentCodec",&mCurrentCodec,0);
-
+ addItemBool("ShowInfoSub",&mShowInfoSub,true);
+ addItemBool("ShowInfoFrom",&mShowInfoFrom,true);
+ addItemBool("ShowInfoTo",&mShowInfoTo,true);
+ addItemBool("ShowInfoStart",&mShowInfoStart,true);
KPrefs::setCurrentGroup("Fonts");
diff --git a/kmicromail/koprefs.h b/kmicromail/koprefs.h
index f2c4fbb..f2501e3 100644
--- a/kmicromail/koprefs.h
+++ b/kmicromail/koprefs.h
@@ -75,2 +75,3 @@ class KOPrefs : public KPimPrefs
bool mSendLater, mViewAsHtml, mUseKapi, isDirty, mShowToField;
+ bool mShowInfoSub, mShowInfoFrom, mShowInfoTo, mShowInfoStart;
private:
diff --git a/kmicromail/koprefsdialog.cpp b/kmicromail/koprefsdialog.cpp
index 5c8a5a9..4af4a8c 100644
--- a/kmicromail/koprefsdialog.cpp
+++ b/kmicromail/koprefsdialog.cpp
@@ -152,2 +152,21 @@ void KOPrefsDialog::setupMailTab()
topLayout->addMultiCellWidget(ttt->checkBox(),2,2,0,1);
+
+ int iii =3;
+ ttt = addWidBool(i18n("Show info fields at startup"),
+ &(KOPrefs::instance()->mShowInfoStart),topFrame);
+ topLayout->addMultiCellWidget(ttt->checkBox(),iii,iii,0,1);
+ ++iii;
+ ttt = addWidBool(i18n("Show \"Subject\" info field"),
+ &(KOPrefs::instance()->mShowInfoSub),topFrame);
+ topLayout->addMultiCellWidget(ttt->checkBox(),iii,iii,0,1);
+ ++iii;
+ ttt = addWidBool(i18n("Show \"From\" info field"),
+ &(KOPrefs::instance()->mShowInfoFrom),topFrame);
+ topLayout->addMultiCellWidget(ttt->checkBox(),iii,iii,0,1);
+ ++iii;
+ ttt = addWidBool(i18n("Show \"To\" info field"),
+ &(KOPrefs::instance()->mShowInfoTo),topFrame);
+ topLayout->addMultiCellWidget(ttt->checkBox(),iii,iii,0,1);
+ ++iii;
+
/*
diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp
index 250d114..0794e00 100644
--- a/kmicromail/mainwindow.cpp
+++ b/kmicromail/mainwindow.cpp
@@ -21,2 +21,3 @@ extern QStatusBar* globalSstatusBarMainWindow;
#include "defines.h"
+#include "koprefs.h"
#include "mainwindow.h"
@@ -86,3 +87,3 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
0, 0, this );
- searchMails->addTo( toolBar );
+ searchMails->kopddTo( toolBar );
searchMails->addTo( mailMenu );
@@ -124,11 +125,27 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
//layout = new QBoxLayout ( split, QBoxLayout::LeftToRight );
- QWidget* infoBox = new QWidget( splithor );
- QGridLayout *griLay = new QGridLayout( infoBox, 2,2);
- griLay->addWidget( new QLabel ( i18n("Su:"), infoBox ),0,0 );
- griLay->addWidget( new QLabel ( i18n("Fr:"), infoBox ),1,0 );
- griLay->addWidget( new QLabel ( i18n("To:"), infoBox ),2,0 );
- griLay->addWidget( subLE = new QLineEdit( infoBox ),0,1) ;
- griLay->addWidget( fromLE = new QLineEdit( infoBox ),1,1) ;
- griLay->addWidget( toLE = new QLineEdit( infoBox ),2,1) ;
- infoBox->setMaximumHeight( infoBox->sizeHint().height() );
+ subLE = 0;
+ fromLE = 0;
+ toLE = 0;
+ if ( KOPrefs::instance()->mShowInfoSub || KOPrefs::instance()->mShowInfoFrom || KOPrefs::instance()->mShowInfoTo ) {
+ QWidget* infoBox = new QWidget( splithor );
+ QGridLayout *griLay = new QGridLayout( infoBox, 2,2);
+ if ( KOPrefs::instance()->mShowInfoSub ) {
+ griLay->addWidget( new QLabel ( i18n("Su:"), infoBox ),0,0 );
+ griLay->addWidget( subLE = new QLineEdit( infoBox ),0,1) ;
+ }
+ if ( KOPrefs::instance()->mShowInfoFrom ) {
+ griLay->addWidget( new QLabel ( i18n("Fr:"), infoBox ),1,0 );
+ griLay->addWidget( fromLE = new QLineEdit( infoBox ),1,1) ;
+ }
+ if ( KOPrefs::instance()->mShowInfoTo ) {
+ griLay->addWidget( new QLabel ( i18n("To:"), infoBox ),2,0 );
+ griLay->addWidget( toLE = new QLineEdit( infoBox ),2,1) ;
+ }
+ infoBox->setMaximumHeight( infoBox->sizeHint().height() );
+ if ( !KOPrefs::instance()->mShowInfoStart ) {
+ QTimer::singleShot( 1,splithor, SLOT ( toggle() ) );
+ }
+ }
+
+
folderView = new AccountView( split );
@@ -162,5 +179,8 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
QPEApplication::setStylusOperation( folderView->viewport(),QPEApplication::RightOnHold);
- QPEApplication::setStylusOperation( subLE ,QPEApplication::RightOnHold);
- QPEApplication::setStylusOperation( fromLE ,QPEApplication::RightOnHold);
- QPEApplication::setStylusOperation( toLE ,QPEApplication::RightOnHold);
+ if ( subLE )
+ QPEApplication::setStylusOperation( subLE ,QPEApplication::RightOnHold);
+ if ( fromLE )
+ QPEApplication::setStylusOperation( fromLE ,QPEApplication::RightOnHold);
+ if ( toLE )
+ QPEApplication::setStylusOperation( toLE ,QPEApplication::RightOnHold);
#endif
@@ -229,5 +249,5 @@ void MainWindow::setInfoFields(QListViewItem* item )
if ( item == 0) {
- subLE->setText("");
- fromLE->setText("");
- toLE->setText("");
+ if ( subLE ) subLE->setText("");
+ if ( fromLE ) fromLE->setText("");
+ if ( toLE ) toLE->setText("");
return;
@@ -235,8 +255,8 @@ void MainWindow::setInfoFields(QListViewItem* item )
RecMailP mail = ((MailListViewItem*)item)->data();
- subLE->setText(mail->getSubject());
- fromLE->setText(mail->getFrom());
- toLE->setText(mail->To().join(";" ));
- subLE->setCursorPosition(0);
- fromLE->setCursorPosition(0);
- toLE->setCursorPosition(0);
+ if ( subLE ) subLE->setText(mail->getSubject());
+ if ( fromLE ) fromLE->setText(mail->getFrom());
+ if ( toLE ) toLE->setText(mail->To().join(";" ));
+ if ( subLE ) subLE->setCursorPosition(0);
+ if ( fromLE ) fromLE->setCursorPosition(0);
+ if ( toLE ) toLE->setCursorPosition(0);
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp
index 68f0eb3..f56711d 100644
--- a/kmicromail/opiemail.cpp
+++ b/kmicromail/opiemail.cpp
@@ -497,4 +497,4 @@ void OpieMail::mailHold(int button, QListViewItem *item,const QPoint&,int )
m->insertItem(i18n("Reply to this mail"),this,SLOT(replyMail()));
- m->insertSeparator();
m->insertItem(i18n("Read this mail"),this,SLOT(displayMail()));
+ m->insertSeparator();
m->insertItem(i18n("Move/Copy this mail"),this,SLOT(slotMoveCopyMail()));
@@ -504,2 +504,3 @@ void OpieMail::mailHold(int button, QListViewItem *item,const QPoint&,int )
m->insertItem(i18n("Delete all selected mails"),this,SLOT(slotDeleteAllMail()));
+ m->insertSeparator();
m->insertItem(i18n("Clear selection"),this,SLOT(clearSelection()));
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp
index 57623e6..d7ff9f2 100644
--- a/korganizer/kowhatsnextview.cpp
+++ b/korganizer/kowhatsnextview.cpp
@@ -614,3 +614,3 @@ bool KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed, bool a
if ( bDay ) {
- noc = ev->getNextOccurence( cdt, &ok );
+ noc = ev->getNextOccurence( cdt.addDays(-1), &ok );
if ( ok ) {
diff --git a/microkde/KDGanttMinimizeSplitter.cpp b/microkde/KDGanttMinimizeSplitter.cpp
index 567ae54..84edc0d 100644
--- a/microkde/KDGanttMinimizeSplitter.cpp
+++ b/microkde/KDGanttMinimizeSplitter.cpp
@@ -168,2 +168,3 @@ void KDGanttSplitterHandle::toggle()
}
+ repaint();
}
@@ -482,2 +483,11 @@ void KDGanttMinimizeSplitter::init()
+void KDGanttMinimizeSplitter::toggle()
+{
+ if ( mFirstHandle )
+ mFirstHandle->toggle();
+ else
+ qDebug("KDGanttMinimizeSplitter::toggle::sorry, handle not available ");
+
+}
+
diff --git a/microkde/KDGanttMinimizeSplitter.h b/microkde/KDGanttMinimizeSplitter.h
index 75e0443..8120d14 100644
--- a/microkde/KDGanttMinimizeSplitter.h
+++ b/microkde/KDGanttMinimizeSplitter.h
@@ -82,2 +82,4 @@ public:
void expandPos( int id, int* min, int* max );
+public slots:
+ void toggle();
protected: