summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-02-08 16:40:46 (UTC)
committer zautrix <zautrix>2005-02-08 16:40:46 (UTC)
commit720510bf933a86211f8e9e2465788d141f0f1149 (patch) (side-by-side diff)
tree65fb4d3ab30fed082d8c8b513e1cbed910373178
parent78c70cfbbe79243d8b0ec40f8f6438c99046e12b (diff)
downloadkdepimpi-720510bf933a86211f8e9e2465788d141f0f1149.zip
kdepimpi-720510bf933a86211f8e9e2465788d141f0f1149.tar.gz
kdepimpi-720510bf933a86211f8e9e2465788d141f0f1149.tar.bz2
ffff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/navigatorbar.cpp10
-rw-r--r--libkdepim/kdatepicker.cpp8
2 files changed, 13 insertions, 5 deletions
diff --git a/korganizer/navigatorbar.cpp b/korganizer/navigatorbar.cpp
index 2b8fd4f..7ba97c8 100644
--- a/korganizer/navigatorbar.cpp
+++ b/korganizer/navigatorbar.cpp
@@ -54,26 +54,32 @@ NavigatorBar::NavigatorBar( const QDate & date, QWidget *parent, const char *nam
: QWidget( parent, name )
{
QBoxLayout *topLayout = new QHBoxLayout( this );
// Set up the control buttons and date label
mCtrlFrame = new QFrame( this );
mCtrlFrame->setFrameStyle(QFrame::Panel|QFrame::Raised);
mCtrlFrame->setLineWidth(1);
topLayout->addWidget( mCtrlFrame );
QFont tfont = KGlobalSettings::generalFont();//font();
- if ( QApplication::desktop()->width() >= 480 )
- tfont.setPointSize(tfont.pointSize()+2);
+ int add = 0;
+ if ( QApplication::desktop()->width() >= 480 ) {
+ add = 2;
+ if ( QString ( name ) == QString("useBigPixmaps") )
+ add += 2;
+ }
+ if ( add )
+ tfont.setPointSize(tfont.pointSize()+add);
tfont.setBold(true);
bool isRTL = KOGlobals::self()->reverseLayout();
#ifndef DESKTOP_VERSION
bool isDesktop = false;
#else
bool isDesktop = true;
#endif
if ( QString ( name ) == QString("useBigPixmaps") && QApplication::desktop()->width() > 320 )
isDesktop = true;
// Create backward navigation buttons
mPrevYear = new QPushButton( mCtrlFrame );
diff --git a/libkdepim/kdatepicker.cpp b/libkdepim/kdatepicker.cpp
index d6e9b51..c13734f 100644
--- a/libkdepim/kdatepicker.cpp
+++ b/libkdepim/kdatepicker.cpp
@@ -43,30 +43,32 @@ KDatePicker::KDatePicker(QWidget *parent, QDate dt, const char *name)
: QFrame(parent,name),
yearForward(new QToolButton(this)),
yearBackward(new QToolButton(this)),
monthForward(new QToolButton(this)),
monthBackward(new QToolButton(this)),
selectMonth(new QToolButton(this)),
selectYear(new QToolButton(this)),
//line(new QLineEdit(this)),
val(new KDateValidator(this))
//table(new KDateTable(this)),
//fontsize(1)
{
- setFont ( KGlobalSettings::generalFont() );
- table = new KDateTable(this);
+ QFont fo = KGlobalSettings::generalFont();
int add = 2;
if ( QApplication::desktop()->width() >= 480 && QApplication::desktop()->width() <= 640 )
add += 4;
- setFontSize(font().pointSize()+add);
+ fo.setPointSize(fo.pointSize()+add );
+ setFont( fo );
+ table = new KDateTable(this);
+ setFontSize(font().pointSize());
//line->setValidator(val);
lineDate = new KDateEdit( this, "dateediipicker", true );
yearForward->setPixmap(SmallIcon("2rightarrowB"));
yearBackward->setPixmap(SmallIcon("2leftarrowB"));
monthForward->setPixmap(SmallIcon("1rightarrowB"));
monthBackward->setPixmap(SmallIcon("1leftarrowB"));
setDate(dt); // set button texts
connect(table, SIGNAL(dateChanged(QDate)), SLOT(dateChangedSlot(QDate)));
connect(table, SIGNAL(tableClicked()), SLOT(tableClickedSlot()));
connect(monthForward, SIGNAL(clicked()), SLOT(monthForwardClicked()));
connect(monthBackward, SIGNAL(clicked()), SLOT(monthBackwardClicked()));
connect(yearForward, SIGNAL(clicked()), SLOT(yearForwardClicked()));