summaryrefslogtreecommitdiffabout
path: root/korganizer
authorzautrix <zautrix>2005-03-26 13:36:19 (UTC)
committer zautrix <zautrix>2005-03-26 13:36:19 (UTC)
commit98444f8937b151a3deb71b7ae0da495872c52855 (patch) (side-by-side diff)
tree26856e27b5d9aca9d428142cbbd15fef030957a7 /korganizer
parent93d1be2c6eead07300e7f90f3b417fcef0f109d3 (diff)
downloadkdepimpi-98444f8937b151a3deb71b7ae0da495872c52855.zip
kdepimpi-98444f8937b151a3deb71b7ae0da495872c52855.tar.gz
kdepimpi-98444f8937b151a3deb71b7ae0da495872c52855.tar.bz2
icons added
Diffstat (limited to 'korganizer') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koagendaview.cpp28
-rw-r--r--korganizer/koagendaview.h3
-rw-r--r--korganizer/koviewmanager.cpp4
-rw-r--r--korganizer/navigatorbar.cpp8
4 files changed, 14 insertions, 29 deletions
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index 8001c8f..acf43bd 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -367,13 +367,11 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
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);
@@ -393,12 +391,13 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
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);
@@ -1456,15 +1455,6 @@ 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();
diff --git a/korganizer/koagendaview.h b/korganizer/koagendaview.h
index 0cb9310..57b4e46 100644
--- a/korganizer/koagendaview.h
+++ b/korganizer/koagendaview.h
@@ -203,7 +203,6 @@ class KOAgendaView : public KOEventView {
void setContentsPos(int y);
- void setExpandedButton( bool expanded );
void scrollOneHourUp();
void scrollOneHourDown();
void addToCalSlot(Incidence *, Incidence *);
@@ -280,8 +279,6 @@ class KOAgendaView : public KOEventView {
QMemArray<bool> mHolidayMask;
- QPixmap mExpandedPixmap;
- QPixmap mNotExpandedPixmap;
QPtrList<KOAgendaButton> mDayLabelsList;
QDateTime mTimeSpanBegin;
QDateTime mTimeSpanEnd;
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index 5a2dce3..31ee5e2 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -396,9 +396,7 @@ 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 *) ),
diff --git a/korganizer/navigatorbar.cpp b/korganizer/navigatorbar.cpp
index 06f5ef8..eca7c14 100644
--- a/korganizer/navigatorbar.cpp
+++ b/korganizer/navigatorbar.cpp
@@ -74,16 +74,16 @@ NavigatorBar::NavigatorBar( const QDate & date, QWidget *parent, const char *nam
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 );
@@ -96,7 +96,7 @@ NavigatorBar::NavigatorBar( const QDate & date, QWidget *parent, const char *nam
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