summaryrefslogtreecommitdiff
authorhrw <hrw>2006-01-17 10:10:21 (UTC)
committer hrw <hrw>2006-01-17 10:10:21 (UTC)
commit6494eb0ba251e95091ba15f0aba8ad4717015922 (patch) (unidiff)
tree8ad63fd4d69f043ab9bd0689e1f3b2b369cf8327
parent50b379b4637c80273b6f5397c9c20db78410f125 (diff)
downloadopie-6494eb0ba251e95091ba15f0aba8ad4717015922.zip
opie-6494eb0ba251e95091ba15f0aba8ad4717015922.tar.gz
opie-6494eb0ba251e95091ba15f0aba8ad4717015922.tar.bz2
Opie-console fallback to FixedFont settings from qpe.conf in config
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ChangeLog1
-rw-r--r--noncore/apps/opie-console/terminalwidget.cpp5
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a9639ef..e03bc96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,53 +1,54 @@
1 2005-??-??Opie 1.2.2 1 2005-??-??Opie 1.2.2
2 2
3 3
4 New Features 4 New Features
5 ------------ 5 ------------
6 * Appearance: Added configuration options to set smallIconSize, bigIconSize, useBigPixmaps (hrw, drw) 6 * Appearance: Added configuration options to set smallIconSize, bigIconSize, useBigPixmaps (hrw, drw)
7 * Opie-Notes: Notes application based on NoteZ (hrw) 7 * Opie-Notes: Notes application based on NoteZ (hrw)
8 * OPIE-PackageManager: Added two configuration options: "Force recursive", "Verbose fetch" (hrw) 8 * OPIE-PackageManager: Added two configuration options: "Force recursive", "Verbose fetch" (hrw)
9 9
10 Fixed Bugs 10 Fixed Bugs
11 ---------- 11 ----------
12 * #1695 - Date selector use too small fontsize on VGA screen (hrw) 12 * #1695 - Date selector use too small fontsize on VGA screen (hrw)
13 * #1686 - opie-console lack UI setting for switching scrollbar (hrw) 13 * #1686 - opie-console lack UI setting for switching scrollbar (hrw)
14 * #1647 - Opie-console doesn't respect scroll-bar on left side (hrw) 14 * #1647 - Opie-console doesn't respect scroll-bar on left side (hrw)
15 * #1624 - Button settngs changes are applied only after restart (hrw) 15 * #1624 - Button settngs changes are applied only after restart (hrw)
16 * #1492 - Backup and Restore does not show list of backups to restore on start (hrw) 16 * #1492 - Backup and Restore does not show list of backups to restore on start (hrw)
17 * n.a. - remove hardcoded font size from wellenreiter (hrw) 17 * n.a. - remove hardcoded font size from wellenreiter (hrw)
18 * n.a. - added patch to build QT/E 2.3.10 with gcc 4.x.x (hrw) 18 * n.a. - added patch to build QT/E 2.3.10 with gcc 4.x.x (hrw)
19 * n.a. - make blue-pin UI resizable to looks good in any resolution (hrw) 19 * n.a. - make blue-pin UI resizable to looks good in any resolution (hrw)
20 * n.a. - fix a problem with vCard send to Sony Ericsson k600i (ar) 20 * n.a. - fix a problem with vCard send to Sony Ericsson k600i (ar)
21 * n.a. - add a patch to build Qt/E 2.3.10 on amd64 with gcc 4.x.x (ar) 21 * n.a. - add a patch to build Qt/E 2.3.10 on amd64 with gcc 4.x.x (ar)
22 * n.a. - Opie-console fallback to FixedFont settings from qpe.conf in config (hrw)
22 23
23 2005-09-11Opie 1.2.1 24 2005-09-11Opie 1.2.1
24 25
25 26
26 New Features 27 New Features
27 ------------ 28 ------------
28 * OpieStumbler: Scans WiFi networks using the wireless extension scanning (skyhusker) 29 * OpieStumbler: Scans WiFi networks using the wireless extension scanning (skyhusker)
29 * Opie-Reader: Support for document formats ArriereGo and Reb, add flite output (tim,pohly) 30 * Opie-Reader: Support for document formats ArriereGo and Reb, add flite output (tim,pohly)
30 * Opie-Networksettings: Add support for wlan-ng devices and improve WEP handling (Dirk Opfer) 31 * Opie-Networksettings: Add support for wlan-ng devices and improve WEP handling (Dirk Opfer)
31 * Wellenreiter: Remove Joining networks - use OpieStumbler for that (mickeyl) 32 * Wellenreiter: Remove Joining networks - use OpieStumbler for that (mickeyl)
32 * Opie-Mobilemsg has gone unsupported - it never really worked and there will be a replacement (mickeyl) 33 * Opie-Mobilemsg has gone unsupported - it never really worked and there will be a replacement (mickeyl)
33 * Opie-Tabmanager has gone unsupported - it barely works and there is not much of a use of it anyway (mickeyl) 34 * Opie-Tabmanager has gone unsupported - it barely works and there is not much of a use of it anyway (mickeyl)
34 * Checkbook: Added configuration option to use smaller font for checkbook transaction tab (hrw) 35 * Checkbook: Added configuration option to use smaller font for checkbook transaction tab (hrw)
35 * ZSafe: Made UI conform to Opie standards (drw) 36 * ZSafe: Made UI conform to Opie standards (drw)
36 * Today Addressbook plugin: Fixed configuration to show/not show birthdays, use checkboxes for selection (hrw) 37 * Today Addressbook plugin: Fixed configuration to show/not show birthdays, use checkboxes for selection (hrw)
37 * Opie-Console: Read initial fixed font configuration from qpe.conf (mickeyl) 38 * Opie-Console: Read initial fixed font configuration from qpe.conf (mickeyl)
38 * Opie-PcmciaApplet: Configure insert/resume actions and bind unsupported cards (mickeyl) 39 * Opie-PcmciaApplet: Configure insert/resume actions and bind unsupported cards (mickeyl)
39 * SysInfo: Remove CPU tab and add Devices tab instead (mickeyl) 40 * SysInfo: Remove CPU tab and add Devices tab instead (mickeyl)
40 * Opie-smb: Added Opie front end for Samba (ljp) 41 * Opie-smb: Added Opie front end for Samba (ljp)
41 * Opie-Bluetooth: Replace obex send implementation and patch libopieobex and the bluetoothapplet (Michael Haynie) 42 * Opie-Bluetooth: Replace obex send implementation and patch libopieobex and the bluetoothapplet (Michael Haynie)
42 * Opieplayer: rudimentary podcast support (ljp) 43 * Opieplayer: rudimentary podcast support (ljp)
43 44
44 Fixed Bugs 45 Fixed Bugs
45 ---------- 46 ----------
46 * #1377 - Suspend Powermanagement when switched to another VT (mickeyl) 47 * #1377 - Suspend Powermanagement when switched to another VT (mickeyl)
47 - We actually suspend the complete Opie now in that case. 48 - We actually suspend the complete Opie now in that case.
48 * #1384 - Battery status updated improperly when charging (skyhusker) 49 * #1384 - Battery status updated improperly when charging (skyhusker)
49 * #1476 - Wrong order of application entries in the O-menu (skyhusker) 50 * #1476 - Wrong order of application entries in the O-menu (skyhusker)
50 * #1514 - Remove usage of cardmon/pcmcia picture in applications. pcmcia is now an inline picture (mickeyl) 51 * #1514 - Remove usage of cardmon/pcmcia picture in applications. pcmcia is now an inline picture (mickeyl)
51 * #1535- Missing line break and unnecessary location shown with Today-Calendar plugin (deller) 52 * #1535- Missing line break and unnecessary location shown with Today-Calendar plugin (deller)
52 * #1543 - Time Settings: "predict" tab is displayed twice after reopen (hrw) 53 * #1543 - Time Settings: "predict" tab is displayed twice after reopen (hrw)
53 * #1546 - Battery applet popup is not always large enough to show jacket remaining info (skyhusker) 54 * #1546 - Battery applet popup is not always large enough to show jacket remaining info (skyhusker)
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,33 +1,34 @@
1#include "terminalwidget.h" 1#include "terminalwidget.h"
2#include <qpe/config.h>
2 3
3/* QT */ 4/* QT */
4#include <qlabel.h> 5#include <qlabel.h>
5#include <qcheckbox.h> 6#include <qcheckbox.h>
6#include <qcombobox.h> 7#include <qcombobox.h>
7#include <qradiobutton.h> 8#include <qradiobutton.h>
8#include <qhgroupbox.h> 9#include <qhgroupbox.h>
9#include <qhbuttongroup.h> 10#include <qhbuttongroup.h>
10#include <qlayout.h> 11#include <qlayout.h>
11#include <qhbox.h> 12#include <qhbox.h>
12 13
13namespace { 14namespace {
14 enum TermIds { 15 enum TermIds {
15 id_term_vt100 = 0, 16 id_term_vt100 = 0,
16 id_term_vt102, 17 id_term_vt102,
17 id_term_linux, 18 id_term_linux,
18 id_term_xterm 19 id_term_xterm
19 }; 20 };
20 21
21 enum ColourIds { 22 enum ColourIds {
22 id_term_black, 23 id_term_black,
23 id_term_white, 24 id_term_white,
24 id_term_green, 25 id_term_green,
25 id_term_orange 26 id_term_orange
26 }; 27 };
27 28
28 enum FontIds { 29 enum FontIds {
29 id_size_small, 30 id_size_small,
30 id_size_medium, 31 id_size_medium,
31 id_size_large 32 id_size_large
32 }; 33 };
33}; 34};
@@ -122,66 +123,68 @@ void TerminalWidget::load( const Profile& prof ) {
122 break; 123 break;
123 case Profile::VT102: 124 case Profile::VT102:
124 m_terminalBox->setCurrentItem(id_term_vt102 ); 125 m_terminalBox->setCurrentItem(id_term_vt102 );
125 break; 126 break;
126 case Profile::Linux: 127 case Profile::Linux:
127 m_terminalBox->setCurrentItem(id_term_linux ); 128 m_terminalBox->setCurrentItem(id_term_linux );
128 break; 129 break;
129 case Profile::XTerm: 130 case Profile::XTerm:
130 m_terminalBox->setCurrentItem(id_term_xterm ); 131 m_terminalBox->setCurrentItem(id_term_xterm );
131 break; 132 break;
132 default: 133 default:
133 m_terminalBox->setCurrentItem(id_term_vt102 ); 134 m_terminalBox->setCurrentItem(id_term_vt102 );
134 break; 135 break;
135 }; 136 };
136 137
137 switch( color ) { 138 switch( color ) {
138 case Profile::Black: 139 case Profile::Black:
139 m_colorCmb->setCurrentItem(id_term_black ); 140 m_colorCmb->setCurrentItem(id_term_black );
140 break; 141 break;
141 case Profile::White: 142 case Profile::White:
142 m_colorCmb->setCurrentItem(id_term_white ); 143 m_colorCmb->setCurrentItem(id_term_white );
143 break; 144 break;
144 case Profile::Green: 145 case Profile::Green:
145 m_colorCmb->setCurrentItem(id_term_green ); 146 m_colorCmb->setCurrentItem(id_term_green );
146 break; 147 break;
147 case Profile::Orange: 148 case Profile::Orange:
148 m_colorCmb->setCurrentItem(id_term_orange ); 149 m_colorCmb->setCurrentItem(id_term_orange );
149 break; 150 break;
150 default: 151 default:
151 break; 152 break;
152 }; 153 };
153 154
155 Config qpecfg("qpe");
156 qpecfg.setGroup("Appearance");
154 157
155 m_fontSelector->setSelectedFont( prof.readEntry( "Font"), prof.readEntry( "FontStyle"), prof.readNumEntry( "FontSize" ), prof.readEntry( "FontCharset") ); 158 m_fontSelector->setSelectedFont( prof.readEntry( "Font", qpecfg.readEntry("FixedFontFamily")), prof.readEntry( "FontStyle", qpecfg.readEntry("FixedFontStyle")), prof.readNumEntry( "FontSize" , qpecfg.readNumEntry("FixedFontStyle")), prof.readEntry( "FontCharset") );
156 159
157// switch( fontsize ) { 160// switch( fontsize ) {
158// case Profile::Micro: 161// case Profile::Micro:
159// m_sizeSmall->setChecked(true ); 162// m_sizeSmall->setChecked(true );
160// break; 163// break;
161// case Profile::Small: 164// case Profile::Small:
162// m_sizeMedium->setChecked(true ); 165// m_sizeMedium->setChecked(true );
163// break; 166// break;
164// case Profile::Medium: 167// case Profile::Medium:
165// m_sizeLarge->setChecked( true ); 168// m_sizeLarge->setChecked( true );
166// break; 169// break;
167// default: 170// default:
168// m_sizeMedium->setChecked(true ); 171// m_sizeMedium->setChecked(true );
169// break; 172// break;
170// }; 173// };
171 174
172 if (opt_echo) m_optionEcho->setChecked( true ); 175 if (opt_echo) m_optionEcho->setChecked( true );
173 if (opt_wrap) m_optionWrap->setChecked( true ); 176 if (opt_wrap) m_optionWrap->setChecked( true );
174 if (opt_inbound) m_convInbound->setChecked( true ); 177 if (opt_inbound) m_convInbound->setChecked( true );
175 if (opt_outbound) m_convOutbound->setChecked( true ); 178 if (opt_outbound) m_convOutbound->setChecked( true );
176 179
177} 180}
178void TerminalWidget::save( Profile& profile ) { 181void TerminalWidget::save( Profile& profile ) {
179 switch(m_terminalBox->currentItem() ) { 182 switch(m_terminalBox->currentItem() ) {
180 case id_term_vt100: 183 case id_term_vt100:
181 profile.writeEntry("Terminal", Profile::VT100 ); 184 profile.writeEntry("Terminal", Profile::VT100 );
182 break; 185 break;
183 case id_term_vt102: 186 case id_term_vt102:
184 profile.writeEntry("Terminal", Profile::VT102 ); 187 profile.writeEntry("Terminal", Profile::VT102 );
185 break; 188 break;
186 case id_term_linux: 189 case id_term_linux:
187 profile.writeEntry("Terminal", Profile::Linux ); 190 profile.writeEntry("Terminal", Profile::Linux );