diff options
| author | John Bowler <jbowler@nslu2-linux.org> | 2006-01-18 07:59:50 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-01-18 07:59:50 +0000 |
| commit | 022cad9938488cdc84511658fb112b73b7605c82 (patch) | |
| tree | 46517af689f6b1493997dedd7294a3102211302a | |
| parent | 2db17c741de71cc34e26130d1e23391f06beaaa1 (diff) | |
| parent | c8508a346bd0d33126fef88406bab42320514abd (diff) | |
merge of f32b2805c6ecb514661bd053c664684ab5f7323f
and b78c38c1ca7715097407f79c1f432372e7b8c258
| -rw-r--r-- | packages/opie-console/opie-console-1.2.1/0117_opie-console-use-default-fixed.diff | 25 | ||||
| -rw-r--r-- | packages/opie-console/opie-console_1.2.1.bb | 5 |
2 files changed, 28 insertions, 2 deletions
diff --git a/packages/opie-console/opie-console-1.2.1/0117_opie-console-use-default-fixed.diff b/packages/opie-console/opie-console-1.2.1/0117_opie-console-use-default-fixed.diff new file mode 100644 index 0000000000..e871e8e1e4 --- /dev/null +++ b/packages/opie-console/opie-console-1.2.1/0117_opie-console-use-default-fixed.diff @@ -0,0 +1,25 @@ +Index: terminalwidget.cpp +=================================================================== +RCS file: /cvs/opie/noncore/apps/opie-console/terminalwidget.cpp,v +retrieving revision 1.12 +diff -u -u -r1.12 terminalwidget.cpp +--- opie-console/terminalwidget.cpp 16 Oct 2004 21:06:28 -0000 1.12 ++++ opie-console/terminalwidget.cpp 17 Jan 2006 10:00:13 -0000 +@@ -1,4 +1,5 @@ + #include "terminalwidget.h" ++#include <qpe/config.h> + + /* QT */ + #include <qlabel.h> +@@ -151,8 +152,10 @@ + 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: diff --git a/packages/opie-console/opie-console_1.2.1.bb b/packages/opie-console/opie-console_1.2.1.bb index b9ba9e0e43..061c489c7e 100644 --- a/packages/opie-console/opie-console_1.2.1.bb +++ b/packages/opie-console/opie-console_1.2.1.bb @@ -1,9 +1,10 @@ include ${PN}.inc -PR = "r2" +PR = "r3" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/${APPNAME} \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ file://1686-bugfix.patch;patch=1 \ - file://1647-bugfix.patch;patch=1" + file://1647-bugfix.patch;patch=1 \ + file://0117_opie-console-use-default-fixed.diff;patch=1" |