-rw-r--r-- | libkdepim/kdatepicker.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/libkdepim/kdatepicker.cpp b/libkdepim/kdatepicker.cpp index d8bc9f5..2be9c9e 100644 --- a/libkdepim/kdatepicker.cpp +++ b/libkdepim/kdatepicker.cpp | |||
@@ -24,50 +24,46 @@ | |||
24 | #include <klocale.h> | 24 | #include <klocale.h> |
25 | #include <kiconloader.h> | 25 | #include <kiconloader.h> |
26 | #include <qframe.h> | 26 | #include <qframe.h> |
27 | #include <qpainter.h> | 27 | #include <qpainter.h> |
28 | #include <qdialog.h> | 28 | #include <qdialog.h> |
29 | #include <qtoolbutton.h> | 29 | #include <qtoolbutton.h> |
30 | #include <qfont.h> | 30 | #include <qfont.h> |
31 | #include <qapplication.h> | 31 | #include <qapplication.h> |
32 | #include <qlineedit.h> | 32 | #include <qlineedit.h> |
33 | #include <qvalidator.h> | 33 | #include <qvalidator.h> |
34 | #include <kdebug.h> | 34 | #include <kdebug.h> |
35 | #include <knotifyclient.h> | 35 | #include <knotifyclient.h> |
36 | #include <kglobalsettings.h> | ||
36 | #include "kdatetbl.h" | 37 | #include "kdatetbl.h" |
37 | #include "kdateedit.h" | 38 | #include "kdateedit.h" |
38 | //#include "kdatepicker.moc" | 39 | //#include "kdatepicker.moc" |
39 | 40 | ||
40 | 41 | ||
41 | KDatePicker::KDatePicker(QWidget *parent, QDate dt, const char *name) | 42 | KDatePicker::KDatePicker(QWidget *parent, QDate dt, const char *name) |
42 | : QFrame(parent,name), | 43 | : QFrame(parent,name), |
43 | yearForward(new QToolButton(this)), | 44 | yearForward(new QToolButton(this)), |
44 | yearBackward(new QToolButton(this)), | 45 | yearBackward(new QToolButton(this)), |
45 | monthForward(new QToolButton(this)), | 46 | monthForward(new QToolButton(this)), |
46 | monthBackward(new QToolButton(this)), | 47 | monthBackward(new QToolButton(this)), |
47 | selectMonth(new QToolButton(this)), | 48 | selectMonth(new QToolButton(this)), |
48 | selectYear(new QToolButton(this)), | 49 | selectYear(new QToolButton(this)), |
49 | //line(new QLineEdit(this)), | 50 | //line(new QLineEdit(this)), |
50 | val(new KDateValidator(this)) | 51 | val(new KDateValidator(this)) |
51 | //table(new KDateTable(this)), | 52 | //table(new KDateTable(this)), |
52 | //fontsize(1) | 53 | //fontsize(1) |
53 | { | 54 | { |
54 | // ----- | 55 | setFont ( KGlobalSettings::generalFont() ); |
55 | int size = 12; | ||
56 | if ( QApplication::desktop()->width() >= 480 ) | ||
57 | size = 18; | ||
58 | fontsize = size; | ||
59 | setFont ( QFont("helvetica",size) ); | ||
60 | table = new KDateTable(this); | 56 | table = new KDateTable(this); |
61 | setFontSize(size); | 57 | setFontSize(font().pointSize()+2); |
62 | //line->setValidator(val); | 58 | //line->setValidator(val); |
63 | lineDate = new KDateEdit( this, "dateediipicker", true ); | 59 | lineDate = new KDateEdit( this, "dateediipicker", true ); |
64 | yearForward->setPixmap(SmallIcon("2rightarrowB")); | 60 | yearForward->setPixmap(SmallIcon("2rightarrowB")); |
65 | yearBackward->setPixmap(SmallIcon("2leftarrowB")); | 61 | yearBackward->setPixmap(SmallIcon("2leftarrowB")); |
66 | monthForward->setPixmap(SmallIcon("1rightarrowB")); | 62 | monthForward->setPixmap(SmallIcon("1rightarrowB")); |
67 | monthBackward->setPixmap(SmallIcon("1leftarrowB")); | 63 | monthBackward->setPixmap(SmallIcon("1leftarrowB")); |
68 | setDate(dt); // set button texts | 64 | setDate(dt); // set button texts |
69 | connect(table, SIGNAL(dateChanged(QDate)), SLOT(dateChangedSlot(QDate))); | 65 | connect(table, SIGNAL(dateChanged(QDate)), SLOT(dateChangedSlot(QDate))); |
70 | connect(table, SIGNAL(tableClicked()), SLOT(tableClickedSlot())); | 66 | connect(table, SIGNAL(tableClicked()), SLOT(tableClickedSlot())); |
71 | connect(monthForward, SIGNAL(clicked()), SLOT(monthForwardClicked())); | 67 | connect(monthForward, SIGNAL(clicked()), SLOT(monthForwardClicked())); |
72 | connect(monthBackward, SIGNAL(clicked()), SLOT(monthBackwardClicked())); | 68 | connect(monthBackward, SIGNAL(clicked()), SLOT(monthBackwardClicked())); |
73 | connect(yearForward, SIGNAL(clicked()), SLOT(yearForwardClicked())); | 69 | connect(yearForward, SIGNAL(clicked()), SLOT(yearForwardClicked())); |