icons added

4 files changed, 13 insertions, 28 deletions

diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index 8001c8f..acf43bd 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -366,15 +366,13 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
     mLayoutDayLabels = 0;
     mDayLabelsFrame = 0;
     mDayLabels = 0;
     bool isRTL = KOGlobals::self()->reverseLayout();
-
+    QPixmap expandPix;
     if ( KOPrefs::instance()->mVerticalScreen ) {
-        mExpandedPixmap = SmallIcon( "1downarrow" );
-        mNotExpandedPixmap = SmallIcon( "1uparrow" );
+         expandPix = SmallIcon( "1updownarrow" );
     } else {
-        mExpandedPixmap = SmallIcon( isRTL ? "1leftarrow" : "1rightarrow" );
-        mNotExpandedPixmap = SmallIcon( isRTL ? "1rightarrow" : "1leftarrow" );
+        expandPix = SmallIcon("1leftrightarrow" );
     }
 
     QBoxLayout *topLayout = new QVBoxLayout(this);
 
@@ -392,14 +390,15 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
     // Create all-day agenda widget
     mDummyAllDayLeft = new QVBox( mAllDayFrame );
 
     mExpandButton = new QPushButton(mDummyAllDayLeft);
-    mExpandButton->setPixmap( mNotExpandedPixmap );
-    int widebut = mExpandButton->sizeHint().width();
+    mExpandButton->setPixmap( expandPix );
+    int widebut = mExpandButton->sizeHint().width()+4;
+    int heibut = mExpandButton->sizeHint().height()+4;
+    if ( heibut > widebut  )
+        widebut = heibut ;
     if (   QApplication::desktop()->width() < 480  )
-        widebut = widebut*2;
-    else
-        widebut = (widebut*3) / 2;
+        widebut = widebut*3/2;
     //mExpandButton->setSizePolicy( QSizePolicy( QSizePolicy::Fixed,
     //                                         QSizePolicy::Fixed ) );
     mExpandButton->setFixedSize( widebut, widebut);
     connect( mExpandButton, SIGNAL( clicked() ), SIGNAL( toggleExpand() ) );
@@ -1455,17 +1454,8 @@ void KOAgendaView::setContentsPos(int y)
 {
     mAgenda->setContentsPos(0,y);
 }
 
-void KOAgendaView::setExpandedButton( bool expanded )
-{
-    if ( expanded ) {
-        mExpandButton->setPixmap( mExpandedPixmap );
-    } else {
-        mExpandButton->setPixmap( mNotExpandedPixmap );
-    }
-}
-
 void KOAgendaView::clearSelection()
 {
     mAgenda->deselectItem();
     mAllDayAgenda->deselectItem();
diff --git a/korganizer/koagendaview.h b/korganizer/koagendaview.h
index 0cb9310..57b4e46 100644
--- a/korganizer/koagendaview.h
+++ b/korganizer/koagendaview.h
@@ -202,9 +202,8 @@ class KOAgendaView : public KOEventView {
     void writeSettings(KConfig *);
 
     void setContentsPos(int y);
 
-    void setExpandedButton( bool expanded );
     void scrollOneHourUp();
     void scrollOneHourDown();
     void addToCalSlot(Incidence *, Incidence *);
 
@@ -279,10 +278,8 @@ class KOAgendaView : public KOEventView {
     QMemArray<int> mMaxY;
 
     QMemArray<bool> mHolidayMask;
     
-    QPixmap mExpandedPixmap;
-    QPixmap mNotExpandedPixmap;
     QPtrList<KOAgendaButton> mDayLabelsList;
     QDateTime mTimeSpanBegin;
     QDateTime mTimeSpanEnd;
     bool mTimeSpanInAllDay;
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index 5a2dce3..31ee5e2 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -396,10 +396,8 @@ void KOViewManager::showAgendaView( bool fullScreen )
 
         connect(mAgendaView, SIGNAL( toggleExpand() ),
                 mMainView, SLOT( toggleExpand() ) );
        
-        connect(mMainView, SIGNAL( calendarViewExpanded( bool ) ),
-                mAgendaView, SLOT( setExpandedButton( bool ) ) );
         connect( mAgendaView, SIGNAL( cloneIncidenceSignal(Incidence *) ), 
                  mMainView, SLOT(cloneIncidence(Incidence *) ) ) ;
         connect( mAgendaView, SIGNAL( cancelIncidenceSignal(Incidence *) ), 
                  mMainView, SLOT(cancelIncidence(Incidence *) ) ) ;
diff --git a/korganizer/navigatorbar.cpp b/korganizer/navigatorbar.cpp
index 06f5ef8..eca7c14 100644
--- a/korganizer/navigatorbar.cpp
+++ b/korganizer/navigatorbar.cpp
@@ -73,18 +73,18 @@ NavigatorBar::NavigatorBar( const QDate & date, QWidget *parent, const char *nam
   if ( QString ( name ) == QString("useBigPixmaps") && QApplication::desktop()->width() > 320 )
       isDesktop = true;
   // Create backward navigation buttons
   mPrevYear = new QPushButton( mCtrlFrame );
-  mPrevYear->setPixmap( SmallIcon( isDesktop ? "2leftarrowB" : "2leftarrow" ) );
+  mPrevYear->setPixmap( SmallIcon( isDesktop ? "3leftarrowB" : "3leftarrow" ) );
   QToolTip::add( mPrevYear, i18n("Previous Year") );
 
   mPrevMonth = new QPushButton( mCtrlFrame );
-  mPrevMonth->setPixmap( SmallIcon( isDesktop ? "1leftarrowB" : "1leftarrow") );
+  mPrevMonth->setPixmap( SmallIcon( isDesktop ? "2leftarrowB" : "2leftarrow") );
   QToolTip::add( mPrevMonth, i18n("Previous Month") );
 
   // Create forward navigation buttons
   mNextMonth = new QPushButton( mCtrlFrame );
-  mNextMonth->setPixmap( SmallIcon( isDesktop ? "1rightarrowB" : "1rightarrow") );
+  mNextMonth->setPixmap( SmallIcon( isDesktop ? "2rightarrowB" : "2rightarrow") );
   QToolTip::add( mNextMonth, i18n("Next Month") );
 
   mPrevWeek = new QPushButton( mCtrlFrame );
   mPrevWeek->setPixmap( SmallIcon( isDesktop ? "1leftarrowB" : "1leftarrow") );
@@ -95,9 +95,9 @@ NavigatorBar::NavigatorBar( const QDate & date, QWidget *parent, const char *nam
   mNextWeek->setPixmap( SmallIcon( isDesktop ? "1rightarrowB" : "1rightarrow") );
   QToolTip::add( mNextWeek, i18n("Next Week") );
 
   mNextYear = new QPushButton( mCtrlFrame );
-  mNextYear->setPixmap( SmallIcon( isDesktop ? "2rightarrowB": "2rightarrow") );
+  mNextYear->setPixmap( SmallIcon( isDesktop ? "3rightarrowB": "3rightarrow") );
   QToolTip::add( mNextYear, i18n("Next Year") );
   mSelectMonth = new QPushButton( mCtrlFrame );
   // Create month name label
   //selectMonth->setFont( tfont );