-rw-r--r-- | bin/kdepim/kaddressbook/icons16/3leftarrowB.png | bin | 0 -> 668 bytes | |||
-rw-r--r-- | bin/kdepim/kaddressbook/icons16/3rightarrowB.png | bin | 0 -> 673 bytes | |||
-rw-r--r-- | bin/kdepim/kaddressbook/icons22/3leftarrowB.png | bin | 0 -> 668 bytes | |||
-rw-r--r-- | bin/kdepim/kaddressbook/icons22/3rightarrowB.png | bin | 0 -> 673 bytes | |||
-rw-r--r-- | korganizer/koagendaview.cpp | 28 | ||||
-rw-r--r-- | korganizer/koagendaview.h | 3 | ||||
-rw-r--r-- | korganizer/koviewmanager.cpp | 4 | ||||
-rw-r--r-- | korganizer/navigatorbar.cpp | 8 | ||||
-rw-r--r-- | libkdepim/kdatepicker.cpp | 8 |
9 files changed, 18 insertions, 33 deletions
diff --git a/bin/kdepim/kaddressbook/icons16/3leftarrowB.png b/bin/kdepim/kaddressbook/icons16/3leftarrowB.png new file mode 100644 index 0000000..5f8fc82 --- a/dev/null +++ b/bin/kdepim/kaddressbook/icons16/3leftarrowB.png | |||
Binary files differ | |||
diff --git a/bin/kdepim/kaddressbook/icons16/3rightarrowB.png b/bin/kdepim/kaddressbook/icons16/3rightarrowB.png new file mode 100644 index 0000000..7fc4b0c --- a/dev/null +++ b/bin/kdepim/kaddressbook/icons16/3rightarrowB.png | |||
Binary files differ | |||
diff --git a/bin/kdepim/kaddressbook/icons22/3leftarrowB.png b/bin/kdepim/kaddressbook/icons22/3leftarrowB.png new file mode 100644 index 0000000..5f8fc82 --- a/dev/null +++ b/bin/kdepim/kaddressbook/icons22/3leftarrowB.png | |||
Binary files differ | |||
diff --git a/bin/kdepim/kaddressbook/icons22/3rightarrowB.png b/bin/kdepim/kaddressbook/icons22/3rightarrowB.png new file mode 100644 index 0000000..7fc4b0c --- a/dev/null +++ b/bin/kdepim/kaddressbook/icons22/3rightarrowB.png | |||
Binary files differ | |||
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) : | |||
367 | mDayLabelsFrame = 0; | 367 | mDayLabelsFrame = 0; |
368 | mDayLabels = 0; | 368 | mDayLabels = 0; |
369 | bool isRTL = KOGlobals::self()->reverseLayout(); | 369 | bool isRTL = KOGlobals::self()->reverseLayout(); |
370 | 370 | QPixmap expandPix; | |
371 | if ( KOPrefs::instance()->mVerticalScreen ) { | 371 | if ( KOPrefs::instance()->mVerticalScreen ) { |
372 | mExpandedPixmap = SmallIcon( "1downarrow" ); | 372 | expandPix = SmallIcon( "1updownarrow" ); |
373 | mNotExpandedPixmap = SmallIcon( "1uparrow" ); | ||
374 | } else { | 373 | } else { |
375 | mExpandedPixmap = SmallIcon( isRTL ? "1leftarrow" : "1rightarrow" ); | 374 | expandPix = SmallIcon("1leftrightarrow" ); |
376 | mNotExpandedPixmap = SmallIcon( isRTL ? "1rightarrow" : "1leftarrow" ); | ||
377 | } | 375 | } |
378 | 376 | ||
379 | QBoxLayout *topLayout = new QVBoxLayout(this); | 377 | QBoxLayout *topLayout = new QVBoxLayout(this); |
@@ -393,12 +391,13 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) : | |||
393 | mDummyAllDayLeft = new QVBox( mAllDayFrame ); | 391 | mDummyAllDayLeft = new QVBox( mAllDayFrame ); |
394 | 392 | ||
395 | mExpandButton = new QPushButton(mDummyAllDayLeft); | 393 | mExpandButton = new QPushButton(mDummyAllDayLeft); |
396 | mExpandButton->setPixmap( mNotExpandedPixmap ); | 394 | mExpandButton->setPixmap( expandPix ); |
397 | int widebut = mExpandButton->sizeHint().width(); | 395 | int widebut = mExpandButton->sizeHint().width()+4; |
396 | int heibut = mExpandButton->sizeHint().height()+4; | ||
397 | if ( heibut > widebut ) | ||
398 | widebut = heibut ; | ||
398 | if ( QApplication::desktop()->width() < 480 ) | 399 | if ( QApplication::desktop()->width() < 480 ) |
399 | widebut = widebut*2; | 400 | widebut = widebut*3/2; |
400 | else | ||
401 | widebut = (widebut*3) / 2; | ||
402 | //mExpandButton->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, | 401 | //mExpandButton->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, |
403 | // QSizePolicy::Fixed ) ); | 402 | // QSizePolicy::Fixed ) ); |
404 | mExpandButton->setFixedSize( widebut, widebut); | 403 | mExpandButton->setFixedSize( widebut, widebut); |
@@ -1456,15 +1455,6 @@ void KOAgendaView::setContentsPos(int y) | |||
1456 | mAgenda->setContentsPos(0,y); | 1455 | mAgenda->setContentsPos(0,y); |
1457 | } | 1456 | } |
1458 | 1457 | ||
1459 | void KOAgendaView::setExpandedButton( bool expanded ) | ||
1460 | { | ||
1461 | if ( expanded ) { | ||
1462 | mExpandButton->setPixmap( mExpandedPixmap ); | ||
1463 | } else { | ||
1464 | mExpandButton->setPixmap( mNotExpandedPixmap ); | ||
1465 | } | ||
1466 | } | ||
1467 | |||
1468 | void KOAgendaView::clearSelection() | 1458 | void KOAgendaView::clearSelection() |
1469 | { | 1459 | { |
1470 | mAgenda->deselectItem(); | 1460 | 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 { | |||
203 | 203 | ||
204 | void setContentsPos(int y); | 204 | void setContentsPos(int y); |
205 | 205 | ||
206 | void setExpandedButton( bool expanded ); | ||
207 | void scrollOneHourUp(); | 206 | void scrollOneHourUp(); |
208 | void scrollOneHourDown(); | 207 | void scrollOneHourDown(); |
209 | void addToCalSlot(Incidence *, Incidence *); | 208 | void addToCalSlot(Incidence *, Incidence *); |
@@ -280,8 +279,6 @@ class KOAgendaView : public KOEventView { | |||
280 | 279 | ||
281 | QMemArray<bool> mHolidayMask; | 280 | QMemArray<bool> mHolidayMask; |
282 | 281 | ||
283 | QPixmap mExpandedPixmap; | ||
284 | QPixmap mNotExpandedPixmap; | ||
285 | QPtrList<KOAgendaButton> mDayLabelsList; | 282 | QPtrList<KOAgendaButton> mDayLabelsList; |
286 | QDateTime mTimeSpanBegin; | 283 | QDateTime mTimeSpanBegin; |
287 | QDateTime mTimeSpanEnd; | 284 | 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 ) | |||
396 | 396 | ||
397 | connect(mAgendaView, SIGNAL( toggleExpand() ), | 397 | connect(mAgendaView, SIGNAL( toggleExpand() ), |
398 | mMainView, SLOT( toggleExpand() ) ); | 398 | mMainView, SLOT( toggleExpand() ) ); |
399 | 399 | ||
400 | connect(mMainView, SIGNAL( calendarViewExpanded( bool ) ), | ||
401 | mAgendaView, SLOT( setExpandedButton( bool ) ) ); | ||
402 | connect( mAgendaView, SIGNAL( cloneIncidenceSignal(Incidence *) ), | 400 | connect( mAgendaView, SIGNAL( cloneIncidenceSignal(Incidence *) ), |
403 | mMainView, SLOT(cloneIncidence(Incidence *) ) ) ; | 401 | mMainView, SLOT(cloneIncidence(Incidence *) ) ) ; |
404 | connect( mAgendaView, SIGNAL( cancelIncidenceSignal(Incidence *) ), | 402 | 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 | |||
74 | isDesktop = true; | 74 | isDesktop = true; |
75 | // Create backward navigation buttons | 75 | // Create backward navigation buttons |
76 | mPrevYear = new QPushButton( mCtrlFrame ); | 76 | mPrevYear = new QPushButton( mCtrlFrame ); |
77 | mPrevYear->setPixmap( SmallIcon( isDesktop ? "2leftarrowB" : "2leftarrow" ) ); | 77 | mPrevYear->setPixmap( SmallIcon( isDesktop ? "3leftarrowB" : "3leftarrow" ) ); |
78 | QToolTip::add( mPrevYear, i18n("Previous Year") ); | 78 | QToolTip::add( mPrevYear, i18n("Previous Year") ); |
79 | 79 | ||
80 | mPrevMonth = new QPushButton( mCtrlFrame ); | 80 | mPrevMonth = new QPushButton( mCtrlFrame ); |
81 | mPrevMonth->setPixmap( SmallIcon( isDesktop ? "1leftarrowB" : "1leftarrow") ); | 81 | mPrevMonth->setPixmap( SmallIcon( isDesktop ? "2leftarrowB" : "2leftarrow") ); |
82 | QToolTip::add( mPrevMonth, i18n("Previous Month") ); | 82 | QToolTip::add( mPrevMonth, i18n("Previous Month") ); |
83 | 83 | ||
84 | // Create forward navigation buttons | 84 | // Create forward navigation buttons |
85 | mNextMonth = new QPushButton( mCtrlFrame ); | 85 | mNextMonth = new QPushButton( mCtrlFrame ); |
86 | mNextMonth->setPixmap( SmallIcon( isDesktop ? "1rightarrowB" : "1rightarrow") ); | 86 | mNextMonth->setPixmap( SmallIcon( isDesktop ? "2rightarrowB" : "2rightarrow") ); |
87 | QToolTip::add( mNextMonth, i18n("Next Month") ); | 87 | QToolTip::add( mNextMonth, i18n("Next Month") ); |
88 | 88 | ||
89 | mPrevWeek = new QPushButton( mCtrlFrame ); | 89 | mPrevWeek = new QPushButton( mCtrlFrame ); |
@@ -96,7 +96,7 @@ NavigatorBar::NavigatorBar( const QDate & date, QWidget *parent, const char *nam | |||
96 | QToolTip::add( mNextWeek, i18n("Next Week") ); | 96 | QToolTip::add( mNextWeek, i18n("Next Week") ); |
97 | 97 | ||
98 | mNextYear = new QPushButton( mCtrlFrame ); | 98 | mNextYear = new QPushButton( mCtrlFrame ); |
99 | mNextYear->setPixmap( SmallIcon( isDesktop ? "2rightarrowB": "2rightarrow") ); | 99 | mNextYear->setPixmap( SmallIcon( isDesktop ? "3rightarrowB": "3rightarrow") ); |
100 | QToolTip::add( mNextYear, i18n("Next Year") ); | 100 | QToolTip::add( mNextYear, i18n("Next Year") ); |
101 | mSelectMonth = new QPushButton( mCtrlFrame ); | 101 | mSelectMonth = new QPushButton( mCtrlFrame ); |
102 | // Create month name label | 102 | // Create month name label |
diff --git a/libkdepim/kdatepicker.cpp b/libkdepim/kdatepicker.cpp index 6cb432b..5d83511 100644 --- a/libkdepim/kdatepicker.cpp +++ b/libkdepim/kdatepicker.cpp | |||
@@ -63,10 +63,10 @@ KDatePicker::KDatePicker(QWidget *parent, QDate dt, const char *name) | |||
63 | setFontSize(font().pointSize()); | 63 | setFontSize(font().pointSize()); |
64 | //line->setValidator(val); | 64 | //line->setValidator(val); |
65 | lineDate = new KDateEdit( this, "dateediipicker", true ); | 65 | lineDate = new KDateEdit( this, "dateediipicker", true ); |
66 | yearForward->setPixmap(SmallIcon("2rightarrowB")); | 66 | yearForward->setPixmap(SmallIcon("3rightarrowB")); |
67 | yearBackward->setPixmap(SmallIcon("2leftarrowB")); | 67 | yearBackward->setPixmap(SmallIcon("3leftarrowB")); |
68 | monthForward->setPixmap(SmallIcon("1rightarrowB")); | 68 | monthForward->setPixmap(SmallIcon("2rightarrowB")); |
69 | monthBackward->setPixmap(SmallIcon("1leftarrowB")); | 69 | monthBackward->setPixmap(SmallIcon("2leftarrowB")); |
70 | todayBut->setPixmap(SmallIcon("today")); | 70 | todayBut->setPixmap(SmallIcon("today")); |
71 | setDate(dt); // set button texts | 71 | setDate(dt); // set button texts |
72 | connect(table, SIGNAL(dateChanged(QDate)), SLOT(dateChangedSlot(QDate))); | 72 | connect(table, SIGNAL(dateChanged(QDate)), SLOT(dateChangedSlot(QDate))); |