summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kabc/addressee.cpp17
-rw-r--r--kabc/addressee.h3
-rw-r--r--kabc/field.cpp6
-rw-r--r--kalarmd/simplealarmdaemonimpl.cpp2
-rw-r--r--korganizer/koagendaitem.cpp28
-rw-r--r--korganizer/komonthview.cpp21
6 files changed, 36 insertions, 41 deletions
diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp
index 7f592e9..155ce24 100644
--- a/kabc/addressee.cpp
+++ b/kabc/addressee.cpp
@@ -53,3 +53,2 @@ struct Addressee::AddresseeData : public KShared
QString formattedName;
- QString defaultFormattedName;
QString familyName;
@@ -750,9 +749,2 @@ void Addressee::setFormattedName( const QString &formattedName )
}
-void Addressee::setDefaultFormattedName( const QString &formattedName )
-{
- if ( formattedName == mData->defaultFormattedName ) return;
- detach();
- mData->empty = false;
- mData->defaultFormattedName = formattedName;
-}
@@ -762,6 +754,2 @@ QString Addressee::formattedName() const
}
-QString Addressee::defaultFormattedName() const
-{
- return mData->defaultFormattedName;
-}
@@ -772,7 +760,2 @@ QString Addressee::formattedNameLabel()
-QString Addressee::defaultFormattedNameLabel()
-{
- return i18n("Def.Formatted Name");
-}
-
diff --git a/kabc/addressee.h b/kabc/addressee.h
index 0d688f8..a2fbcf5 100644
--- a/kabc/addressee.h
+++ b/kabc/addressee.h
@@ -156,3 +156,2 @@ class Addressee
void setFormattedName( const QString &formattedName );
- void setDefaultFormattedName( const QString &formattedName );
/**
@@ -161,3 +160,2 @@ class Addressee
QString formattedName() const;
- QString defaultFormattedName() const;
/**
@@ -166,3 +164,2 @@ class Addressee
static QString formattedNameLabel();
- static QString defaultFormattedNameLabel();
diff --git a/kabc/field.cpp b/kabc/field.cpp
index 5c561c3..fd51026 100644
--- a/kabc/field.cpp
+++ b/kabc/field.cpp
@@ -89,3 +89,2 @@ class Field::FieldImpl
Sip,
- DefaultFormattedName,
MobileWorkPhone,
@@ -131,4 +130,2 @@ QString Field::label()
return Addressee::formattedNameLabel();
- case FieldImpl::DefaultFormattedName:
- return Addressee::defaultFormattedNameLabel();
case FieldImpl::FamilyName:
@@ -250,4 +247,2 @@ QString Field::value( const KABC::Addressee &a )
return a.formattedName();
- case FieldImpl::DefaultFormattedName:
- return a.defaultFormattedName();
case FieldImpl::FamilyName:
@@ -410,3 +405,2 @@ Field::List Field::allFields()
createField( FieldImpl::FormattedName, Frequent );
- createField( FieldImpl::DefaultFormattedName, Frequent );
createField( FieldImpl::FamilyName, Frequent );
diff --git a/kalarmd/simplealarmdaemonimpl.cpp b/kalarmd/simplealarmdaemonimpl.cpp
index b3da428..294ce7d 100644
--- a/kalarmd/simplealarmdaemonimpl.cpp
+++ b/kalarmd/simplealarmdaemonimpl.cpp
@@ -58,3 +58,3 @@ SimpleAlarmDaemonImpl::SimpleAlarmDaemonImpl( QWidget *parent )
mPopUp->insertSeparator();
- mPopUp->insertItem( "What's Todo?", this, SLOT ( showTodo() ) );
+ mPopUp->insertItem( "Todo List", this, SLOT ( showTodo() ) );
mPopUp->insertSeparator();
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp
index 23afe7a..e545ca8 100644
--- a/korganizer/koagendaitem.cpp
+++ b/korganizer/koagendaitem.cpp
@@ -445,4 +445,7 @@ QPixmap * KOAgendaItem::paintPix()
static QPixmap* mPaintPix = 0;
- if ( ! mPaintPix )
- mPaintPix = new QPixmap(1,1);
+ if ( ! mPaintPix ) {
+ int w = QApplication::desktop()->width();
+ int h = QApplication::desktop()->height();
+ mPaintPix = new QPixmap(w,h);
+ }
return mPaintPix ;
@@ -452,4 +455,7 @@ QPixmap * KOAgendaItem::paintPixAllday()
static QPixmap* mPaintPixA = 0;
- if ( ! mPaintPixA )
- mPaintPixA = new QPixmap(1,1);
+ if ( ! mPaintPixA ) {
+ int w = QApplication::desktop()->width();
+ int h = QApplication::desktop()->height()/3;
+ mPaintPixA = new QPixmap(w,h);
+ }
return mPaintPixA ;
@@ -459,4 +465,7 @@ QPixmap * KOAgendaItem::paintPixSel()
static QPixmap* mPaintPixSel = 0;
- if ( ! mPaintPixSel )
- mPaintPixSel = new QPixmap(1,1);
+ if ( ! mPaintPixSel ) {
+ int w = QApplication::desktop()->width();
+ int h = QApplication::desktop()->height();
+ mPaintPixSel = new QPixmap(w,h);
+ }
return mPaintPixSel ;
@@ -527,3 +536,2 @@ void KOAgendaItem::computeText()
{
-
mDisplayedText = mIncidence->summary();
@@ -538,3 +546,3 @@ void KOAgendaItem::computeText()
if ( !(mIncidence->doesFloat()) && KOPrefs::instance()->mShowTimeInAgenda)
- mDisplayedText += ": " +KGlobal::locale()->formatTime((static_cast<Event*>(mIncidence))->dtStart().time()) + "-" + KGlobal::locale()->formatTime((static_cast<Event*>(mIncidence))->dtEnd().time()) ;
+ mDisplayedText += ": " +KGlobal::locale()->formatTime((static_cast<Event*>(mIncidence))->dtStart().time()) + " - " + KGlobal::locale()->formatTime((static_cast<Event*>(mIncidence))->dtEnd().time()) ;
@@ -555,3 +563,3 @@ void KOAgendaItem::computeText()
}
-
+#ifdef DESKTOP_VERSION
QString tipText = mIncidence->summary();
@@ -585,3 +593,3 @@ void KOAgendaItem::computeText()
QToolTip::add(this,tipText,toolTipGroup(),"");
-
+#endif
}
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 4dfb9df..65d6acf 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -643,2 +643,6 @@ int MonthViewCell::insertEvent(Event *event)
{
+ bool useToolTips = true;
+#ifndef DEKSTOP_VERSION
+ useToolTips = false;
+#endif
QString mToolTipText;
@@ -689,3 +693,4 @@ int MonthViewCell::insertEvent(Event *event)
text = time + event->summary();
- mToolTipText += prefix + text;
+ if ( useToolTips )
+ mToolTipText += prefix + text;
} else {
@@ -693,3 +698,4 @@ int MonthViewCell::insertEvent(Event *event)
text = event->summary();
- mToolTipText += text;
+ if ( useToolTips )
+ mToolTipText += text;
}
@@ -698,5 +704,9 @@ int MonthViewCell::insertEvent(Event *event)
text += " " + event->summary();
- mToolTipText += KGlobal::locale()->formatTime(event->dtStart().time()) +"-"+KGlobal::locale()->formatTime(event->dtEnd().time())+" " + event->summary();
+ if ( useToolTips )
+ mToolTipText += KGlobal::locale()->formatTime(event->dtStart().time()) +"-"+KGlobal::locale()->formatTime(event->dtEnd().time())+" " + event->summary();
}
}
+ if ( useToolTips && ! event->location().isEmpty() ) {
+ mToolTipText += " (" + event->location() +")";
+ }
MonthViewItem *item ;
@@ -766,3 +776,4 @@ int MonthViewCell::insertEvent(Event *event)
}
- mToolTip.append( mToolTipText );
+ if ( useToolTips )
+ mToolTip.append( mToolTipText );
return mdayCount;
@@ -818,3 +829,5 @@ void MonthViewCell::insertTodo(Todo *todo)
insertItem( item , count());
+#ifdef DESKTOP_VERSION
mToolTip.append( text );
+#endif
}