summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/mainwindow.cpp2
-rw-r--r--korganizer/navigatorbar.cpp5
-rw-r--r--libkdepim/kdatepicker.cpp7
-rw-r--r--microkde/kdatetbl.cpp36
-rw-r--r--microkde/kdatetbl.h4
-rw-r--r--microkde/kglobalsettings.cpp1
6 files changed, 32 insertions, 23 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 856f7db..468fd5b 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -2030,7 +2030,7 @@ void MainWindow::weekAction()
{
int month;
KPopupFrame* popup = new KPopupFrame(this);
- KDateInternalWeekPicker* picker = new KDateInternalWeekPicker(10, popup);
+ KDateInternalWeekPicker* picker = new KDateInternalWeekPicker(popup);
// -----
picker->resize(picker->sizeHint());
popup->setMainWidget(picker);
diff --git a/korganizer/navigatorbar.cpp b/korganizer/navigatorbar.cpp
index 4a31c77..2b8fd4f 100644
--- a/korganizer/navigatorbar.cpp
+++ b/korganizer/navigatorbar.cpp
@@ -168,10 +168,7 @@ void NavigatorBar::selectMonth()
int month;
KPopupFrame* popup = new KPopupFrame(this);
- int size = 12;
- if ( QApplication::desktop()->width() >= 480 )
- size = 18;
- KDateInternalMonthPicker* picker = new KDateInternalMonthPicker(size, popup);
+ KDateInternalMonthPicker* picker = new KDateInternalMonthPicker(popup);
// -----
picker->resize(picker->sizeHint());
popup->setMainWidget(picker);
diff --git a/libkdepim/kdatepicker.cpp b/libkdepim/kdatepicker.cpp
index 2be9c9e..d6e9b51 100644
--- a/libkdepim/kdatepicker.cpp
+++ b/libkdepim/kdatepicker.cpp
@@ -54,7 +54,10 @@ KDatePicker::KDatePicker(QWidget *parent, QDate dt, const char *name)
{
setFont ( KGlobalSettings::generalFont() );
table = new KDateTable(this);
- setFontSize(font().pointSize()+2);
+ int add = 2;
+ if ( QApplication::desktop()->width() >= 480 && QApplication::desktop()->width() <= 640 )
+ add += 4;
+ setFontSize(font().pointSize()+add);
//line->setValidator(val);
lineDate = new KDateEdit( this, "dateediipicker", true );
yearForward->setPixmap(SmallIcon("2rightarrowB"));
@@ -283,7 +286,7 @@ KDatePicker::selectMonthClicked()
{
int month;
KPopupFrame* popup = new KPopupFrame(this);
- KDateInternalMonthPicker* picker = new KDateInternalMonthPicker(fontsize, popup);
+ KDateInternalMonthPicker* picker = new KDateInternalMonthPicker(popup);
// -----
picker->resize(picker->sizeHint());
popup->setMainWidget(picker);
diff --git a/microkde/kdatetbl.cpp b/microkde/kdatetbl.cpp
index e827412..990cfb9 100644
--- a/microkde/kdatetbl.cpp
+++ b/microkde/kdatetbl.cpp
@@ -81,7 +81,7 @@ KDateValidator::fixup( QString& ) const
KDateTable::KDateTable(QWidget *parent, QDate date_, const char* name, WFlags f)
: QGridView(parent, name, f)
{
- setFontSize(10);
+ setFont( KGlobalSettings::generalFont() );
if(!date_.isValid())
{
date_=QDate::currentDate();
@@ -110,13 +110,12 @@ KDateTable::paintCell(QPainter *painter, int row, int col)
int pos;
QBrush brushBlue(blue);
QBrush brushLightblue(QColor(220,245,255));
- QFont font=KGlobalSettings::generalFont();
+ QFont _font=font();
// -----
- font.setPointSize(fontsize);
if(row==0)
{ // we are drawing the headline
- font.setBold(true);
- painter->setFont(font);
+ _font.setBold(true);
+ painter->setFont(_font);
bool normalday = true;
QString daystr;
if (KGlobal::locale()->weekStartsMonday())
@@ -148,7 +147,7 @@ KDateTable::paintCell(QPainter *painter, int row, int col)
painter->lineTo(w-1, h-1);
// ----- draw the weekday:
} else {
- painter->setFont(font);
+ painter->setFont(_font);
pos=7*(row-1)+col;
if (KGlobal::locale()->weekStartsMonday())
pos++;
@@ -300,10 +299,11 @@ KDateTable::setFontSize(int size)
QRect rect;
// ----- store rectangles:
fontsize=size;
- QFont font = KGlobalSettings::generalFont();
- font.setPointSize(fontsize);
- font.setBold( true );
- QFontMetrics metrics(font);
+ QFont _font = font();
+ _font.setPointSize(fontsize);
+ setFont( _font );
+ _font.setBold( true );
+ QFontMetrics metrics(_font);
// ----- find largest day name:
maxCell.setWidth(0);
@@ -443,7 +443,7 @@ KDateTable::sizeHint() const
}
KDateInternalMonthPicker::KDateInternalMonthPicker
-(int fontsize, QWidget* parent, const char* name)
+(QWidget* parent, const char* name)
: QGridView(parent, name),
result(0) // invalid
{
@@ -453,7 +453,11 @@ KDateInternalMonthPicker::KDateInternalMonthPicker
activeCol = -1;
activeRow = -1;
font=KGlobalSettings::generalFont();
- //font.setPointSize(fontsize);
+ int fontsize = 10;
+ int add = 2;
+ if ( QApplication::desktop()->width() >= 480 && QApplication::desktop()->width() <= 640 )
+ add += 6;
+ font.setPointSize(fontsize+add);
setFont(font);
setHScrollBarMode(AlwaysOff);
setVScrollBarMode(AlwaysOff);
@@ -761,7 +765,7 @@ void KDateTable::virtual_hook( int, void* )
KDateInternalWeekPicker::KDateInternalWeekPicker
-(int fontsize, QWidget* parent, const char* name)
+(QWidget* parent, const char* name)
: QGridView(parent, name),
result(0) // invalid
{
@@ -771,7 +775,11 @@ KDateInternalWeekPicker::KDateInternalWeekPicker
activeCol = -1;
activeRow = -1;
font=KGlobalSettings::generalFont();
- //font.setPointSize(fontsize);
+ int fontsize = 10;
+ int add = 2;
+ if ( QApplication::desktop()->width() >= 480 && QApplication::desktop()->width() <= 640 )
+ add += 4;
+ font.setPointSize(fontsize+add);
setFont(font);
setHScrollBarMode(AlwaysOff);
setVScrollBarMode(AlwaysOff);
diff --git a/microkde/kdatetbl.h b/microkde/kdatetbl.h
index 2efa532..87808df 100644
--- a/microkde/kdatetbl.h
+++ b/microkde/kdatetbl.h
@@ -57,7 +57,7 @@ public:
/**
* The constructor.
*/
- KDateInternalMonthPicker(int fontsize, QWidget* parent, const char* name=0);
+ KDateInternalMonthPicker(QWidget* parent, const char* name=0);
/**
* The size hint.
*/
@@ -333,7 +333,7 @@ public:
/**
* The constructor.
*/
- KDateInternalWeekPicker(int fontsize, QWidget* parent, const char* name=0);
+ KDateInternalWeekPicker(QWidget* parent, const char* name=0);
/**
* The size hint.
*/
diff --git a/microkde/kglobalsettings.cpp b/microkde/kglobalsettings.cpp
index 30e793f..fbbf814 100644
--- a/microkde/kglobalsettings.cpp
+++ b/microkde/kglobalsettings.cpp
@@ -11,6 +11,7 @@ QFont KGlobalSettings::generalFont()
if (QApplication::desktop()->width() < 480 )
size = 10;
QFont f = QApplication::font();
+ //qDebug("pointsize %d ", f.pointSize());
f.setPointSize( size );
return f;
}