libqpe/datebookmonth selector use too small fontsize on VGA screen.

- now on =>480 screen.width it will use "default_fontsize" - 2 size
  on smaller screen devices behavior is not changed
- close bug #1695

2 files changed, 19 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 4f347db..3b0f1d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,16 +1,27 @@
+2005-??-??	Opie 1.2.2
+	
+	
+	New Features
+	------------
+
+
+	Fixed Bugs
+	----------
+	* #1695 - Date selector use too small fontsize on VGA screen (hrw)
+
 2005-09-11	Opie 1.2.1
 	
 	
 	New Features
 	------------
 	* OpieStumbler: Scans WiFi networks using the wireless extension scanning (skyhusker)
 	* Opie-Reader: Support for document formats ArriereGo and Reb, add flite output (tim,pohly)
 	* Opie-Networksettings: Add support for wlan-ng devices and improve WEP handling (Dirk Opfer)
 	* Wellenreiter: Remove Joining networks - use OpieStumbler for that (mickeyl)
 	* Opie-Mobilemsg has gone unsupported - it never really worked and there will be a replacement (mickeyl)
 	* Opie-Tabmanager has gone unsupported - it barely works and there is not much of a use of it anyway (mickeyl)
 	* Checkbook: Added configuration option to use smaller font for checkbook transaction tab (hrw)
 	* ZSafe: Made UI conform to Opie standards (drw)
 	* Today Addressbook plugin: Fixed configuration to show/not show birthdays, use checkboxes for selection (hrw)
 	* Opie-Console: Read initial fixed font configuration from qpe.conf (mickeyl)
 	* Opie-PcmciaApplet: Configure insert/resume actions and bind unsupported cards (mickeyl)
diff --git a/library/datebookmonth.cpp b/library/datebookmonth.cpp
index 2616b7b..ffdf335 100644
--- a/library/datebookmonth.cpp
+++ b/library/datebookmonth.cpp
@@ -648,33 +648,40 @@ void DayItemMonth::paint( QPainter *p, const QColorGroup &cg,
 	p->fillRect(x1, y, x2 - x1, h, colorNormal);
     }
 
     y += h;
 
     while(repeatLine.count() >= 2) {
 	int x2 = repeatLine.pop();
 	int x1 = repeatLine.pop();
 	if (x2 < x1 + 2)
 	    x2 = x1 + 2;
 	p->fillRect(x1, y, x2 - x1, h, colorRepeat);
     }
 
 
     // Finally, draw the number.
     QFont f = p->font();
-    f.setPointSize( ( f.pointSize() / 3 ) * 2 );
+    if(qApp->desktop()->width() >= 480)
+    {
+	f.setPointSize( f.pointSize() - 2 );
+    }
+    else
+    {
+	f.setPointSize( ( f.pointSize() / 3 ) * 2 );
+    }
     p->setFont( f );
     QFontMetrics fm( f );
     p->drawText( 1, 1 + fm.ascent(), QString::number( day() ) );
 
     p->restore();
 }
 
 
 
 void DayItemMonth::setType( Calendar::Day::Type t )
 {
     switch ( t ) {
     case Calendar::Day::PrevMonth:
     case Calendar::Day::NextMonth:
 	back = QBrush( QColor( 224, 224, 224 ) );
 	forg = black;