Opie-console fallback to FixedFont settings from qpe.conf in config

author: hrw <hrw> 2006-01-17 10:10:21 (UTC)
committer: hrw <hrw> 2006-01-17 10:10:21 (UTC)
commit: 6494eb0ba251e95091ba15f0aba8ad4717015922 (patch) (unidiff)
tree: 8ad63fd4d69f043ab9bd0689e1f3b2b369cf8327
parent: 50b379b4637c80273b6f5397c9c20db78410f125 (diff)
download: opie-6494eb0ba251e95091ba15f0aba8ad4717015922.zip
opie-6494eb0ba251e95091ba15f0aba8ad4717015922.tar.gz
opie-6494eb0ba251e95091ba15f0aba8ad4717015922.tar.bz2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a9639ef..e03bc96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,213 +1,214 @@
        2005-??-??Opie 1.2.2
        
        
        New Features
        ------------
        * Appearance: Added configuration options to set smallIconSize, bigIconSize, useBigPixmaps (hrw, drw)
        * Opie-Notes: Notes application based on NoteZ (hrw)
        * OPIE-PackageManager: Added two configuration options: "Force recursive", "Verbose fetch" (hrw)
        Fixed Bugs
        ----------
        * #1695 - Date selector use too small fontsize on VGA screen (hrw)
        * #1686 - opie-console lack UI setting for switching scrollbar (hrw)
        * #1647 - Opie-console doesn't respect scroll-bar on left side (hrw)
        * #1624 - Button settngs changes are applied only after restart (hrw)
        * #1492 - Backup and Restore does not show list of backups to restore on start (hrw)
        * n.a.  - remove hardcoded font size from wellenreiter (hrw)
        * n.a.  - added patch to build QT/E 2.3.10 with gcc 4.x.x (hrw)
        * n.a.  - make blue-pin UI resizable to looks good in any resolution (hrw)
        * n.a.  - fix a problem with vCard send to Sony Ericsson k600i (ar)
        * n.a.  - add a patch to build Qt/E 2.3.10 on amd64 with gcc 4.x.x (ar)
+        * n.a.  - Opie-console fallback to FixedFont settings from qpe.conf in config (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)
        * n.a.  - remove hardcoded font size from netsystemtime (hrw)
        * n.a.  - remove hardcoded font size from checkbook graphs (hrw)
        * n.a.  - Dagger - fixes for Sword 1.5.8, morph tag x-refs, closing last tab crash (drw)
        
        Internal
        --------
        * Make BluezApplet use OTaskbarApplet (mickeyl)
        * libopiecore: rewrite OFileNotification to use the Linux 2.6 inotify interface (mickeyl)
        * libopiecore: add ODirNotification - recursive directory notifications (mickeyl)
        * libopienet: Skip hostap control interfaces 'wifi' and improve robustness in ONetworkInterface (mickeyl)
        * libopieui: Remove OVersatileView and OVersatileViewItem (mickeyl)
        * libopienet: Miscellaneous API cleanups (mickeyl)
        * libopiecore: Add linux pcmcia system abstraction classes (mickeyl)
        * libopiecore: ODevice now knows the default gfx driver to use (mteira,mickeyl)
        * libopiecore: Add support for the Sharp SL-C3100 "Borzoi" (mickeyl)
        * libopiecore: Add support for the new Linux Inputsystem Switches type [necessary for auto rotation in 2.6.13] (mickeyl)
        * Remove assumptions about default gfx driver ("Transformed") all over the place (mteira,mickeyl)
        * Fix / Optimize number of scanned directories (ljp)
        * Use five point mouse calibration to make calibrated mouse drivers work on newer Zaurii (rp,mickeyl)
        2005-03-25Opie 1.2.0
        Fixed Bugs
        ----------
        * #1613 - AdvancedFM - scale toolbar icons appropriately (drw)
        * #1620 - OFileSelector - show the button on press and not on press on hold (alwin)
        * #1473 - Opie-Eye - Same as #1620 but we lack a common FileSystem Button class (zecke)
        * n.a.  - PackageManager - fix bug where messages show up multiple times in install dialog (drw)
                * n.a.- make qpeglobal.h include qglobal.h (zecke)
        2005-03-20Opie 1.2.0-rc1
        New Features
        ------------
        * Launcher: Support a static background pixmap (mickeyl)
        * LauncherSettings: Choose whether to have a static background pixmap (mickeyl)
        * PackageManager supports the 'lists_dir' ipkg configuration option (drw)
        * Added hi-res inline images for large resolution devices (drw)
        * Improved launcher icons for consistency (ar)
        * Datebook: Added plugin system to datebook so holidays and birthdays from contacts may displayed in datebook (alwin)
        Fixed Bugs
        ----------
        * #1236 - VCards contained empty home and work address entries causing Palms to crash (eilers)
        * #1412 - Launcher Settings - fixed default settings for background in Edit tab dialog (drw)
        * #1472 - Opie textedit now check for unsaved changes on ESC key (ljp)
        * #1474 - Implement GUI for Scrollbars on the Left in Appearance (zecke)
        * #1482 - Fix double '/' in paths (zecke)
        * #1536 - Autosave of custom locations in opie backup (ar)
        * #1539 - Fixed displaying too long path in the delete dialog in opie-eye (zecke)
        * #1540 - Implemented deletion of DocLnks in opie-eye (zecke)
        * #1542 - Fixed Todo crash when priority < 1 or > 5 (drw)
        * #1550 - Browse for alarm sound start in QPEDIR/sounds/ (zecke)
        * #1554 - Fixed Opie-Console name in .desktop file (mickeyl)
        * #1556 - Start to look for sound files in /opt/QtPalmtop/sounds (zecke)
        * #1558 - Fixed opie-login breaking opie startup (mickeyl)
        * #1560 - Fixed Opie-Console picking up the wrong shell (bluelightning)
        * #1570 - Confirmation needed befor Restore a backup and overwrite local data (ar)
        * #1591 - Addressbook sortorder changed by clicking on column 0 (eilers)
        * #1599 - Security - change recommendation for opie-multiauth to opie-securityplugin (gints)
        * #1604 - Checkbook crashed on startup (drw)
        * #1608 - Addressbook crashed after search, which may caused by not initialzed member variable (eilers)
        * #1608 - QueryByExampe-Datediff on SQL database did not worked properly (eilers)
        * n.a.  - Netsystemtime - fixed UI to prevent error dialog from displaying when it shouldn't, get rid of some compiler warnings (drw)
        * n.a.  - PackageManager - fixed where last package in status file was not shown as installed when it should be (drw)
        * n.a.  - PackageManager - fixed bug where lists_dir was not being honored at startup (drw)
        * n.a.  - PackageManager - provided default value for lists_dir when none is entered in configuration dialog (drw)
        * n.a.  - OTabWidget - fixed scroll buttons, fix display position of tabs (drw)
        * n.a.  - AddressBook - fixed sorting by 'File As' name (drw)
        * n.a.  - AddressBook - fixed category handling for 'All' and 'Unfiled' (eilers)
        * n.a.  - AddressBook - fixed letter picker record selection and sort records afterwards (drw)
        Internal
        --------
        * Worked around bug in Qt/Embedded 2.3.10: qt_version() returns 231 (mickeyl)
        * Killed the need for weak symbols in QtE (zecke)
        * Added optional building libqpe without inline images (mickeyl)
        * OColorButton - fixed so does not emit a colorSelected signal inside of resizeEvent (drw)
        2005-02-03Opie 1.1.9
        New Features
        ------------
        * Number of icon columns in Launcher is customizable through Launcher.conf (hrw,zecke,mickeyl)
        * Number of icon columns in Launcher is customizable through LauncherSettings (mickeyl)
        * Usability enhancements in OpieIRC (skyhusker)
        Fixed Bugs
        ----------
        * #1501 - Fixed bug in todo sql backend (eilers)
        * #1505 - Added more Swap sizes in memoryapplet (mickeyl)
        * #1525 - Hopefully fixed double alarms and not removing alarms set with the Clock application (zecke)
        * #1533 - Security Owner Dialog (shown in case of unsuccessfull authentiacation) wasn't able to display information in non latin1 encoding (zecke)
        * n.a. - Removed hard coded font sizes in a couple of inputmethods (mickeyl)
        * n.a. - Removed MediumDlg appearing prior to FirstUsage wizard (i.e. calibration) (mickeyl)
        * n.a. - Fixed numerous buglets in OpieIRC (skyhusker)
        Internal
        --------
        * Added the Qtopia 1.7 SDK macros for quick-apps to easa compilation of 3rd party apps against our headers (mickeyl)
        * You can now use the Opie build system in combination with a OpenEmbedded staging area which makes a nice cross development environment (mickeyl)
        * Made Opie compilable with Qt/Embedded 2.3.10 (ar)
        * Changed Launcher to get default orientation from ODevice w/ QWS_DISPLAY overriding (mickeyl)
        * Build tree cleanups (mickeyl)
        2004-11-26Opie 1.1.8
        New Features
        ------------
        * PackageManager supports installation of local ipkg files (drw)
        * PackageManager supports linking of applications to root (drw)
        * PackageManager supports src/gz feeds (drw,wimpie)
        * Added a syslog information tab to sysinfo (mickeyl)
        * Added new, more consistent, PIM icons + a GIMP teplate (ar)
        Fixed Bugs
        ----------
        * #1017 - Tetrix doesn't display correctly for high resolution screens (drw)
        * #1269 - VCards were imported into personal area if it was activated (eilers)
        * #1464 - Packagemanager dont set active filter after install a package (drw)
        * #1479 - Improved VCard-Parser to import VCards created by Evolution 2 and Apple Addressbook (eilers)
        * #1493 - Fixed one column layout bug of the launcher (hrw)
        * n.a. - PackageManager - (Minor UI tweak) in filter dialog, when option is enabled, set focus to widget that corresponds to that option (drw)
        * n.a. - PackageManager - (Minor UI tweak) fix double entry in source feed configuration when adding a new feed (drw)
        * n.a. - Battery Applet - fix sizing of battery info popup (drw,mickeyl)
        Internal
        --------
        * Moved libopie1 to unsupported (mickeyl)
        * Implemented generic queryByExample() with incremental searching. A lot of internal changes of the Pim2-library (eilers)
        * Added fast and full featured and incremental sorted() for SQL addressbook backend (eilers)
        2004-11-14Opie 1.1.7
        New Features
        ------------
        * libOpieDB now uses SQLite V3 instead V2. Remember to upgrade your database files! (eilers)
        * Backup now uses the busy indicator when backing up and restore (ar)
        * OpiePlayer2 gained adding of Directories to the playlist (zecke)
        * OpiePlayer2 better error handling (zecke)
        * OpiePlayer2 progress indication while streaming (zecke)
diff --git a/noncore/apps/opie-console/terminalwidget.cpp b/noncore/apps/opie-console/terminalwidget.cpp
index 907de1b..91d4986 100644
--- a/noncore/apps/opie-console/terminalwidget.cpp
+++ b/noncore/apps/opie-console/terminalwidget.cpp
@@ -1,236 +1,239 @@
 #include "terminalwidget.h"
+#include <qpe/config.h>
 /* QT */
 #include <qlabel.h>
 #include <qcheckbox.h>
 #include <qcombobox.h>
 #include <qradiobutton.h>
 #include <qhgroupbox.h>
 #include <qhbuttongroup.h>
 #include <qlayout.h>
 #include <qhbox.h>
 namespace {
    enum TermIds {
        id_term_vt100 = 0,
        id_term_vt102,
        id_term_linux,
        id_term_xterm
    };
    enum ColourIds {
        id_term_black,
        id_term_white,
        id_term_green,
        id_term_orange
    };
    enum FontIds {
        id_size_small,
        id_size_medium,
        id_size_large
    };
 };
 TerminalWidget::TerminalWidget( const QString& name, QWidget* parent,
                                const char* na )
    : ProfileDialogTerminalWidget( name, parent, na ) {
    m_terminal = new QLabel(tr("Terminal Type"), this );
    m_terminalBox = new QComboBox(this);
    m_colorLabel = new QLabel(tr("Color scheme"), this);
    m_colorCmb = new QComboBox(this );
 //     m_groupSize = new QHButtonGroup(tr("Font size"), this );
    m_groupSize = new QHBox( this );
    m_fontSelector = new Opie::Ui::OFontSelector( false, m_groupSize );
 //      m_sizeSmall = new QRadioButton(tr("small"),  m_groupSize );
 //      m_sizeMedium = new QRadioButton(tr("medium"),  m_groupSize );
 //      m_sizeLarge = new QRadioButton(tr("large"),  m_groupSize );
    m_groupConv = new QHGroupBox( tr("Line-break conversions"), this );
    m_convInbound  = new QCheckBox( tr("Inbound"), m_groupConv );
    m_convOutbound = new QCheckBox( tr("Outbound"), m_groupConv );
    m_groupOptions = new QHGroupBox( tr("Options"), this );
    m_optionEcho = new QCheckBox( tr("Local echo"), m_groupOptions );
    m_optionWrap = new QCheckBox( tr("Line wrap"), m_groupOptions );
    m_lroot = new QVBoxLayout( this );
    m_typeBox = new  QVBoxLayout( m_lroot );
    m_colorBox = new QVBoxLayout( m_lroot );
    // Layout
    m_typeBox->add( m_terminal );
    m_typeBox->add( m_terminalBox );
    m_lroot->add( m_groupSize );
    m_colorBox->add( m_colorLabel );
    m_colorBox->add( m_colorCmb );
    m_lroot->add( m_groupConv );
    m_lroot->add( m_groupOptions );
    m_lroot->addStretch( 0 );
    // Fill in some options
    m_terminalBox->insertItem( tr("VT 100"), 0 ); // /*, id_term_vt100*/ );
    m_terminalBox->insertItem( tr("VT 102"), 1 );  // /* , id_term_vt102 */);
    m_terminalBox->insertItem( tr("Linux Console"), 2 ); //, id_term_linux );
    m_terminalBox->insertItem( tr("X-Terminal"), 3 ); //, id_term_xterm );
    //m_terminalBox->insertItem( tr("ANSI"), id_term_ansi );
    m_colorCmb->insertItem( tr("black on white"), id_term_black );
    m_colorCmb->insertItem( tr("white on black"), id_term_white );
    m_colorCmb->insertItem( tr("green on black"), id_term_green );
    m_colorCmb->insertItem( tr("orange on black"), id_term_orange );
    // signals + slots
    /*
    connect(m_terminalBox, SIGNAL(activated(int) ),
            this, SLOT(slotTermTerm(int) ) );
    connect(m_colorBox, SIGNAL(activated(int) ),
            tis, SLOT(slotTermColor(int) ) );
    connect(m_groupSize, SIGNAL(activated(int) ),
            this, SLOT(slotTermFont(int) ) );
    connect(m_optionEcho, SIGNAL(toggled(bool) ),
            this, SLOT(slotTermEcho(bool) ) );
    connect(m_optionWrap, SIGNAL(toggled(bool) ),
            this, SLOT(slotTermWrap(bool) ) );
    connect(m_convInbound, SIGNAL(toggled(bool) ),
            this, SLOT(slotTermInbound(bool) ) );
    connect(m_convOutbound, SIGNAL(toggled(bool) ),
            this, SLOT(slotTermOutbound(bool) ) );
 */
 }
 TerminalWidget::~TerminalWidget() {
 }
 void TerminalWidget::load( const Profile& prof ) {
    int term = prof.readNumEntry("Terminal");
    int color = prof.readNumEntry("Color");
 //     int fontsize = prof.readNumEntry("Font");
    int opt_echo = prof.readNumEntry("Echo");
    int opt_wrap = prof.readNumEntry("Wrap");
    int opt_inbound = prof.readNumEntry("Inbound");
    int opt_outbound = prof.readNumEntry("Outbound");
    switch( term ) {
    case Profile::VT100:
        m_terminalBox->setCurrentItem(id_term_vt100 );
        break;
    case Profile::VT102:
        m_terminalBox->setCurrentItem(id_term_vt102 );
        break;
    case Profile::Linux:
        m_terminalBox->setCurrentItem(id_term_linux );
        break;
    case Profile::XTerm:
        m_terminalBox->setCurrentItem(id_term_xterm );
        break;
    default:
        m_terminalBox->setCurrentItem(id_term_vt102 );
        break;
    };
    switch( color ) {
    case Profile::Black:
        m_colorCmb->setCurrentItem(id_term_black );
        break;
    case Profile::White:
        m_colorCmb->setCurrentItem(id_term_white );
        break;
    case Profile::Green:
        m_colorCmb->setCurrentItem(id_term_green );
        break;
    case Profile::Orange:
        m_colorCmb->setCurrentItem(id_term_orange );
        break;
    default:
        break;
    };
+    Config qpecfg("qpe");
+    qpecfg.setGroup("Appearance");
-    m_fontSelector->setSelectedFont( prof.readEntry( "Font"), prof.readEntry( "FontStyle"), prof.readNumEntry( "FontSize"  ), prof.readEntry( "FontCharset") );
+    m_fontSelector->setSelectedFont( prof.readEntry( "Font", qpecfg.readEntry("FixedFontFamily")), prof.readEntry( "FontStyle", qpecfg.readEntry("FixedFontStyle")), prof.readNumEntry( "FontSize" , qpecfg.readNumEntry("FixedFontStyle")), prof.readEntry( "FontCharset") );
 //     switch( fontsize ) {
 //     case Profile::Micro:
 //         m_sizeSmall->setChecked(true );
 //         break;
 //     case Profile::Small:
 //         m_sizeMedium->setChecked(true );
 //         break;
 //     case Profile::Medium:
 //         m_sizeLarge->setChecked( true );
 //         break;
 //     default:
 //         m_sizeMedium->setChecked(true );
 //         break;
 //     };
    if (opt_echo) m_optionEcho->setChecked( true );
    if (opt_wrap) m_optionWrap->setChecked( true );
    if (opt_inbound) m_convInbound->setChecked( true );
    if (opt_outbound) m_convOutbound->setChecked( true );
 }
 void TerminalWidget::save( Profile& profile ) {
    switch(m_terminalBox->currentItem() ) {
    case id_term_vt100:
        profile.writeEntry("Terminal", Profile::VT100 );
        break;
    case id_term_vt102:
        profile.writeEntry("Terminal", Profile::VT102 );
        break;
    case id_term_linux:
        profile.writeEntry("Terminal", Profile::Linux );
        break;
    case id_term_xterm:
        profile.writeEntry("Terminal", Profile::XTerm );
        break;
    //case id_term_ansi:
    //    profile.writeEntry("Terminal", Profile::VT102 );
    //    break;
    default:
        break;
    };
    // color
    switch(m_colorCmb->currentItem() ) {
    case id_term_black:
        profile.writeEntry("Color", Profile::Black );
        break;
    case id_term_white:
        profile.writeEntry("Color", Profile::White );
        break;
    case id_term_green:
        profile.writeEntry("Color", Profile::Green );
        break;
    case id_term_orange:
        profile.writeEntry("Color", Profile::Orange );
        break;
    default:
        break;
    };
    profile.writeEntry( "FontSize", m_fontSelector->fontSize() );
    profile.writeEntry( "FontStyle", m_fontSelector->fontStyle() );
    profile.writeEntry( "FontCharset", m_fontSelector->fontCharSet() );
    profile.writeEntry( "Font", m_fontSelector->fontFamily() );
 //     if (m_sizeSmall->isChecked() ) {
 //         profile.writeEntry("Font", Profile::Micro );
 //     }else if (m_sizeMedium->isChecked() ) {
 //         profile.writeEntry("Font", Profile::Small );
 //     }else {
 //         profile.writeEntry("Font", Profile::Medium );
 //     }
    profile.writeEntry("Echo", m_optionEcho->isChecked() );
    profile.writeEntry("Wrap", m_optionWrap->isChecked() );
    profile.writeEntry("Inbound", m_convInbound->isChecked() );
    profile.writeEntry("Outbound",m_convOutbound->isChecked() );
 }
author	hrw <hrw>	2006-01-17 10:10:21 (UTC)
committer	hrw <hrw>	2006-01-17 10:10:21 (UTC)
commit	6494eb0ba251e95091ba15f0aba8ad4717015922 (patch) (unidiff)
tree	8ad63fd4d69f043ab9bd0689e1f3b2b369cf8327
parent	50b379b4637c80273b6f5397c9c20db78410f125 (diff)
download	opie-6494eb0ba251e95091ba15f0aba8ad4717015922.zip opie-6494eb0ba251e95091ba15f0aba8ad4717015922.tar.gz opie-6494eb0ba251e95091ba15f0aba8ad4717015922.tar.bz2