summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ChangeLog11
-rw-r--r--library/datebookmonth.cpp9
2 files changed, 19 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 4f347db..3b0f1d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,32 +1,43 @@
1 2005-??-??Opie 1.2.2
2
3
4 New Features
5 ------------
6
7
8 Fixed Bugs
9 ----------
10 * #1695 - Date selector use too small fontsize on VGA screen (hrw)
11
1 2005-09-11Opie 1.2.1 12 2005-09-11Opie 1.2.1
2 13
3 14
4 New Features 15 New Features
5 ------------ 16 ------------
6 * OpieStumbler: Scans WiFi networks using the wireless extension scanning (skyhusker) 17 * OpieStumbler: Scans WiFi networks using the wireless extension scanning (skyhusker)
7 * Opie-Reader: Support for document formats ArriereGo and Reb, add flite output (tim,pohly) 18 * Opie-Reader: Support for document formats ArriereGo and Reb, add flite output (tim,pohly)
8 * Opie-Networksettings: Add support for wlan-ng devices and improve WEP handling (Dirk Opfer) 19 * Opie-Networksettings: Add support for wlan-ng devices and improve WEP handling (Dirk Opfer)
9 * Wellenreiter: Remove Joining networks - use OpieStumbler for that (mickeyl) 20 * Wellenreiter: Remove Joining networks - use OpieStumbler for that (mickeyl)
10 * Opie-Mobilemsg has gone unsupported - it never really worked and there will be a replacement (mickeyl) 21 * Opie-Mobilemsg has gone unsupported - it never really worked and there will be a replacement (mickeyl)
11 * Opie-Tabmanager has gone unsupported - it barely works and there is not much of a use of it anyway (mickeyl) 22 * Opie-Tabmanager has gone unsupported - it barely works and there is not much of a use of it anyway (mickeyl)
12 * Checkbook: Added configuration option to use smaller font for checkbook transaction tab (hrw) 23 * Checkbook: Added configuration option to use smaller font for checkbook transaction tab (hrw)
13 * ZSafe: Made UI conform to Opie standards (drw) 24 * ZSafe: Made UI conform to Opie standards (drw)
14 * Today Addressbook plugin: Fixed configuration to show/not show birthdays, use checkboxes for selection (hrw) 25 * Today Addressbook plugin: Fixed configuration to show/not show birthdays, use checkboxes for selection (hrw)
15 * Opie-Console: Read initial fixed font configuration from qpe.conf (mickeyl) 26 * Opie-Console: Read initial fixed font configuration from qpe.conf (mickeyl)
16 * Opie-PcmciaApplet: Configure insert/resume actions and bind unsupported cards (mickeyl) 27 * Opie-PcmciaApplet: Configure insert/resume actions and bind unsupported cards (mickeyl)
17 * SysInfo: Remove CPU tab and add Devices tab instead (mickeyl) 28 * SysInfo: Remove CPU tab and add Devices tab instead (mickeyl)
18 * Opie-smb: Added Opie front end for Samba (ljp) 29 * Opie-smb: Added Opie front end for Samba (ljp)
19 * Opie-Bluetooth: Replace obex send implementation and patch libopieobex and the bluetoothapplet (Michael Haynie) 30 * Opie-Bluetooth: Replace obex send implementation and patch libopieobex and the bluetoothapplet (Michael Haynie)
20 * Opieplayer: rudimentary podcast support (ljp) 31 * Opieplayer: rudimentary podcast support (ljp)
21 32
22 Fixed Bugs 33 Fixed Bugs
23 ---------- 34 ----------
24 * #1377 - Suspend Powermanagement when switched to another VT (mickeyl) 35 * #1377 - Suspend Powermanagement when switched to another VT (mickeyl)
25 - We actually suspend the complete Opie now in that case. 36 - We actually suspend the complete Opie now in that case.
26 * #1384 - Battery status updated improperly when charging (skyhusker) 37 * #1384 - Battery status updated improperly when charging (skyhusker)
27 * #1476 - Wrong order of application entries in the O-menu (skyhusker) 38 * #1476 - Wrong order of application entries in the O-menu (skyhusker)
28 * #1514 - Remove usage of cardmon/pcmcia picture in applications. pcmcia is now an inline picture (mickeyl) 39 * #1514 - Remove usage of cardmon/pcmcia picture in applications. pcmcia is now an inline picture (mickeyl)
29 * #1535- Missing line break and unnecessary location shown with Today-Calendar plugin (deller) 40 * #1535- Missing line break and unnecessary location shown with Today-Calendar plugin (deller)
30 * #1543 - Time Settings: "predict" tab is displayed twice after reopen (hrw) 41 * #1543 - Time Settings: "predict" tab is displayed twice after reopen (hrw)
31 * #1546 - Battery applet popup is not always large enough to show jacket remaining info (skyhusker) 42 * #1546 - Battery applet popup is not always large enough to show jacket remaining info (skyhusker)
32 * #1557 - Light&Power-Settings don't store warning intervall and warning levels (skyhusker) 43 * #1557 - Light&Power-Settings don't store warning intervall and warning levels (skyhusker)
diff --git a/library/datebookmonth.cpp b/library/datebookmonth.cpp
index 2616b7b..ffdf335 100644
--- a/library/datebookmonth.cpp
+++ b/library/datebookmonth.cpp
@@ -632,65 +632,72 @@ void DayItemMonth::paint( QPainter *p, const QColorGroup &cg,
632 p->fillRect( 0, 0, cr.width(), 632 p->fillRect( 0, 0, cr.width(),
633 cr.height(), selected 633 cr.height(), selected
634 ? g.brush( QColorGroup::Highlight ) 634 ? g.brush( QColorGroup::Highlight )
635 : g.brush( QColorGroup::Base ) ); 635 : g.brush( QColorGroup::Base ) );
636 } 636 }
637 637
638 // The lines 638 // The lines
639 // now for the lines. 639 // now for the lines.
640 int h = 5; 640 int h = 5;
641 int y = cr.height() / 2 - h; 641 int y = cr.height() / 2 - h;
642 642
643 while(normalLine.count() >= 2) { 643 while(normalLine.count() >= 2) {
644 int x2 = normalLine.pop(); 644 int x2 = normalLine.pop();
645 int x1 = normalLine.pop(); 645 int x1 = normalLine.pop();
646 if (x2 < x1 + 2) 646 if (x2 < x1 + 2)
647 x2 = x1 + 2; 647 x2 = x1 + 2;
648 p->fillRect(x1, y, x2 - x1, h, colorNormal); 648 p->fillRect(x1, y, x2 - x1, h, colorNormal);
649 } 649 }
650 650
651 y += h; 651 y += h;
652 652
653 while(repeatLine.count() >= 2) { 653 while(repeatLine.count() >= 2) {
654 int x2 = repeatLine.pop(); 654 int x2 = repeatLine.pop();
655 int x1 = repeatLine.pop(); 655 int x1 = repeatLine.pop();
656 if (x2 < x1 + 2) 656 if (x2 < x1 + 2)
657 x2 = x1 + 2; 657 x2 = x1 + 2;
658 p->fillRect(x1, y, x2 - x1, h, colorRepeat); 658 p->fillRect(x1, y, x2 - x1, h, colorRepeat);
659 } 659 }
660 660
661 661
662 // Finally, draw the number. 662 // Finally, draw the number.
663 QFont f = p->font(); 663 QFont f = p->font();
664 f.setPointSize( ( f.pointSize() / 3 ) * 2 ); 664 if(qApp->desktop()->width() >= 480)
665 {
666 f.setPointSize( f.pointSize() - 2 );
667 }
668 else
669 {
670 f.setPointSize( ( f.pointSize() / 3 ) * 2 );
671 }
665 p->setFont( f ); 672 p->setFont( f );
666 QFontMetrics fm( f ); 673 QFontMetrics fm( f );
667 p->drawText( 1, 1 + fm.ascent(), QString::number( day() ) ); 674 p->drawText( 1, 1 + fm.ascent(), QString::number( day() ) );
668 675
669 p->restore(); 676 p->restore();
670} 677}
671 678
672 679
673 680
674void DayItemMonth::setType( Calendar::Day::Type t ) 681void DayItemMonth::setType( Calendar::Day::Type t )
675{ 682{
676 switch ( t ) { 683 switch ( t ) {
677 case Calendar::Day::PrevMonth: 684 case Calendar::Day::PrevMonth:
678 case Calendar::Day::NextMonth: 685 case Calendar::Day::NextMonth:
679 back = QBrush( QColor( 224, 224, 224 ) ); 686 back = QBrush( QColor( 224, 224, 224 ) );
680 forg = black; 687 forg = black;
681 break; 688 break;
682 case Calendar::Day::ThisMonth: 689 case Calendar::Day::ThisMonth:
683 back = QBrush( white ); 690 back = QBrush( white );
684 forg = black; 691 forg = black;
685 break; 692 break;
686 } 693 }
687 typ = t; 694 typ = t;
688} 695}
689 696
690 697
691 698
692DateButton::DateButton( bool longDate, QWidget *parent, const char * name ) 699DateButton::DateButton( bool longDate, QWidget *parent, const char * name )
693 :QPushButton( parent, name ) 700 :QPushButton( parent, name )
694{ 701{
695 longFormat = longDate; 702 longFormat = longDate;
696 df = DateFormat('/', DateFormat::MonthDayYear, DateFormat::MonthDayYear); 703 df = DateFormat('/', DateFormat::MonthDayYear, DateFormat::MonthDayYear);