icons added

9 files changed, 5 insertions, 1 deletions

diff --git a/bin/kdepim/korganizer/1leftrightarrow.png b/bin/kdepim/korganizer/1leftrightarrow.png
new file mode 100644
index 0000000..867f1f0
--- a/dev/null
+++ b/bin/kdepim/korganizer/1leftrightarrow.png
diff --git a/bin/kdepim/korganizer/1updownarrow.png b/bin/kdepim/korganizer/1updownarrow.png
new file mode 100644
index 0000000..8171ec1
--- a/dev/null
+++ b/bin/kdepim/korganizer/1updownarrow.png
diff --git a/bin/kdepim/korganizer/3leftarrow.png b/bin/kdepim/korganizer/3leftarrow.png
new file mode 100644
index 0000000..32ceec1
--- a/dev/null
+++ b/bin/kdepim/korganizer/3leftarrow.png
diff --git a/bin/kdepim/korganizer/3leftarrowB.png b/bin/kdepim/korganizer/3leftarrowB.png
new file mode 100644
index 0000000..5f8fc82
--- a/dev/null
+++ b/bin/kdepim/korganizer/3leftarrowB.png
diff --git a/bin/kdepim/korganizer/3rightarrow.png b/bin/kdepim/korganizer/3rightarrow.png
new file mode 100644
index 0000000..a1db245
--- a/dev/null
+++ b/bin/kdepim/korganizer/3rightarrow.png
diff --git a/bin/kdepim/korganizer/3rightarrowB.png b/bin/kdepim/korganizer/3rightarrowB.png
new file mode 100644
index 0000000..7fc4b0c
--- a/dev/null
+++ b/bin/kdepim/korganizer/3rightarrowB.png
diff --git a/bin/kdepim/pwmanager/icons22/decrypted.png b/bin/kdepim/pwmanager/icons22/decrypted.png
index ea770ea..de67872 100644
--- a/bin/kdepim/pwmanager/icons22/decrypted.png
+++ b/bin/kdepim/pwmanager/icons22/decrypted.png
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index b9c7dec..8001c8f 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -126,24 +126,26 @@ void TimeLabels::drawContents(QPainter *p,int cx, int cy, int cw, int ch)
     QString hour;
     QString suffix;
     QString fullTime;
     int tW = fm.width("24:00i");
     int timeHeight =  fm.height();
     timeHeight -= (timeHeight/4-2);
     int borderWidth = 2;
     QFont nFont = p->font();
     QFont sFont = nFont;
     sFont.setPointSize( sFont.pointSize()/2+2 );
     if (!KGlobal::locale()->use12Clock())
         suffix = "00";
+    else
+        borderWidth = 0;
     QFontMetrics fmS(  sFont );
     int sHei = fmS.height();
     if ( timeHeight >  mCellHeight ) {
         timeHeight = mCellHeight-1;
         sHei -= 2;
     }
 
     while (y < cy + ch) {
         p->drawLine(cx,y,cx+tW,y);
         hour.setNum(cell);
 
         // handle 24h and am/pm time formats
diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp
index cf0d4ae..92fcd1c 100644
--- a/korganizer/koeditorgeneral.cpp
+++ b/korganizer/koeditorgeneral.cpp
@@ -377,25 +377,27 @@ void KOEditorGeneral::setDefaults(bool allDay)
     mLocationEdit->setEditText("");
     mDescriptionEdit->setText("");
     mAlarmSound = KOPrefs::instance()->mDefaultAlarmFile;
     setCategories("");
 }
 void KOEditorGeneral::setSecrecy( int num )
 {
     mSecrecyCombo->setCurrentItem(num);
 }
 void KOEditorGeneral::readIncidence(Incidence *event)
 {
 
-    mAlarmMessage = event->summary();
+    mAlarmMessage = event->summary(); 
+    if ( ! event->location().isEmpty() )
+        mAlarmMessage += " ("+event->location()+")";
     mAlarmIncrCombo->setCurrentItem(0);
     mSummaryEdit->setEditText(event->summary());
     mLocationEdit->setEditText(event->location());
     mDescriptionEdit->setText(event->description());
 
 #if 0
     // organizer information
     mOwnerLabel->setText(i18n("Owner: ") + event->organizer());
 #endif
   
     enableAlarmEdit( event->isAlarmEnabled() );
     //qDebug("KOEditorGeneral::readIncidence(Incidence *event) ");