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,48 +1,59 @@
+        2005-??-??Opie 1.2.2
+        
+        
+        New Features
+        ------------
+
+
+        Fixed Bugs
+        ----------
+        * #1695 - Date selector use too small fontsize on VGA screen (hrw)
+
         2005-09-11Opie 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)
         * SysInfo: Remove CPU tab and add Devices tab instead (mickeyl)
         * Opie-smb: Added Opie front end for Samba (ljp)
         * Opie-Bluetooth: Replace obex send implementation and patch libopieobex and the bluetoothapplet (Michael Haynie)
         * Opieplayer: rudimentary podcast support (ljp)
         
         Fixed Bugs
         ----------
         * #1377 - Suspend Powermanagement when switched to another VT (mickeyl)
                 - We actually suspend the complete Opie now in that case.
         * #1384 - Battery status updated improperly when charging (skyhusker)
         * #1476 - Wrong order of application entries in the O-menu (skyhusker)
         * #1514 - Remove usage of cardmon/pcmcia picture in applications. pcmcia is now an inline picture (mickeyl)
                 * #1535- Missing line break and unnecessary location shown with Today-Calendar plugin (deller)
         * #1543 - Time Settings: "predict" tab is displayed twice after reopen (hrw)
         * #1546 - Battery applet popup is not always large enough to show jacket remaining info (skyhusker)
         * #1557 - Light&Power-Settings don't store warning intervall and warning levels (skyhusker)
         * #1565 - crash-fix in odevice.cpp while scanning the distribution table (deller)
         * #1614 - Make Opie-console start in $HOME instead of / (skyhusker)
         * #1635 - opie-today, datebook-plugin does not show notes (skyhusker)
         * #1665 - Opie-IRC displays the host prepended to the message when peer is using and ipv6 address (skyhusker)
                 * #1666 - Opie-IRC does not allow to add !channels in config asautojoin ones (skyhusker)
         * #1667 - Opie-IRC does not show messages from !channel (skyhusker)
         * #1679 - Security PIN plugin is QVGA sized (hrw)
         * #1682 - Properly resize tab control in OTabWidget (drw)
         * n.a.  - always show volume and wireless applet popups inside visible screen (deller)
         * n.a.  - scale O-Menu-Applets appropriately (mickeyl)
         * n.a.  - libopienet: fix bugs in wireless scanning and setting SSID (skyhusker)
         * n.a.  - Wellenreiter: relax WE version matching test a bit (mickeyl)
         * n.a.  - scale BluezApplet appropriately and use larger icons (mickeyl)
         * n.a.  - memoryapplet: fix crash in memoryapplet on kernels without swap support (seneca cunningham)
         * n.a.  - networksettings: ignore hostap control interfaces wifi* (mickeyl)
         * n.a.  - Today Addressbook plugin fix configuration to show/not show birthdays, use checkboxes for selection (hrw)
diff --git a/library/datebookmonth.cpp b/library/datebookmonth.cpp
index 2616b7b..ffdf335 100644
--- a/library/datebookmonth.cpp
+++ b/library/datebookmonth.cpp
@@ -616,97 +616,104 @@ void DayItemMonth::paint( QPainter *p, const QColorGroup &cg,
                         s_colorNormalLight );
                 p->fillRect( 0, cr.height() / 2, cr.width(), cr.height() / 2,
                         colorRepeatLight );
             } else {
                         if (!holidayAllDay) {
                 p->fillRect( 0, 0, cr.width(), cr.height(),
                         s_colorNormalLight );
                         } else {
                 p->fillRect( 0, 0, cr.width(), cr.height(),
                         s_colorHolidayLight );
                         }
             } else if (repeatAllDay) {
                 p->fillRect( 0, 0, cr.width(), cr.height(),
                         s_colorRepeatLight );
                 }
     } else {
         p->fillRect( 0, 0, cr.width(),
                 cr.height(), selected
                 ?  g.brush( QColorGroup::Highlight )
                 : g.brush( QColorGroup::Base ) );
     }
 
     // The lines
     // now for the lines.
     int h = 5;
     int y = cr.height() / 2 - h;
 
     while(normalLine.count() >= 2) {
         int x2 = normalLine.pop();
         int x1 = normalLine.pop();
         if (x2 < x1 + 2)
             x2 = x1 + 2;
         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;
         break;
     case Calendar::Day::ThisMonth:
         back = QBrush( white );
         forg = black;
         break;
     }
     typ = t;
 }
 
 
 
 DateButton::DateButton( bool longDate, QWidget *parent, const char * name )
     :QPushButton( parent, name )
 {
     longFormat = longDate;
     df = DateFormat('/', DateFormat::MonthDayYear, DateFormat::MonthDayYear);
     setDate( QDate::currentDate() );
 
     connect(this,SIGNAL(pressed()),this,SLOT(pickDate()));
 
 
 }
 
 
 void DateButton::pickDate()
 {
     static QPopupMenu *m1 = 0;
     static DateBookMonth *picker = 0;
     if ( !m1 ) {
         m1 = new QPopupMenu( this );
         picker = new DateBookMonth( m1, 0, TRUE );
         m1->insertItem( picker );