diff options
22 files changed, 760 insertions, 203 deletions
diff --git a/classes/qmake-base.bbclass b/classes/qmake-base.bbclass index 5ca3ee2904..09694e97b8 100644 --- a/classes/qmake-base.bbclass +++ b/classes/qmake-base.bbclass @@ -23,7 +23,7 @@ export OE_QMAKE_RPATH="-Wl,-rpath-link," # default to qte2 via bb.conf, inherit qt3x11 to configure for qt3x11 export OE_QMAKE_INCDIR_QT="${QTDIR}/include" export OE_QMAKE_LIBDIR_QT="${QTDIR}/lib" -export OE_QMAKE_LIBS_QT="${QT_LIBRARY}" +export OE_QMAKE_LIBS_QT="qte" export OE_QMAKE_LIBS_X11="" oe_qmake_mkspecs () { diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index a9e9e0dbd8..059a1ad4bf 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -8,7 +8,7 @@ #DISTRO_VERSION = "2007.4" DISTRO_VERSION = "test-${DATE}" -DISTRO_REVISION = "45" +DISTRO_REVISION = "46" require conf/distro/include/angstrom.inc require conf/distro/include/sane-srcdates.inc @@ -143,7 +143,7 @@ PREFERRED_VERSION_file_native = "4.18" PREFERRED_VERSION_fontconfig = "2.4.1" PREFERRED_VERSION_freetype = "2.3.3" PREFERRED_VERSION_freetype-native = "2.2.1" -PREFERRED_VERSION_cairo = "1.4.4" +PREFERRED_VERSION_cairo = "1.4.8" PREFERRED_VERSION_glib-2.0 = "2.12.12" PREFERRED_VERSION_pango = "1.16.4" PREFERRED_VERSION_atk = "1.10.3" @@ -330,4 +330,5 @@ DISTRO_EXTRA_RDEPENDS += "\ DISTRO_EXTRA_RRECOMMENDS += " \ kernel-module-vfat \ kernel-module-ext2 \ + kernel-module-af-packet \ " diff --git a/conf/sanity.conf b/conf/sanity.conf index 58313f27ca..3a1dec9059 100644 --- a/conf/sanity.conf +++ b/conf/sanity.conf @@ -3,6 +3,6 @@ # See sanity.bbclass # # Expert users can confirm their sanity with "touch conf/sanity.conf" -BB_MIN_VERSION = "1.6.2" +BB_MIN_VERSION = "1.6.8" INHERIT += "sanity" diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb index 37068780fd..74c4c33711 100644 --- a/packages/base-files/base-files_3.0.14.bb +++ b/packages/base-files/base-files_3.0.14.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Miscellaneous files for the base system." SECTION = "base" PRIORITY = "required" -PR = "r66" +PR = "r68" LICENSE = "GPL" SRC_URI = " \ @@ -80,9 +80,11 @@ do_install () { echo ${hostname} > ${D}${sysconfdir}/hostname fi + install -m 644 ${WORKDIR}/issue* ${D}${sysconfdir} + if [ -n "${DISTRO_NAME}" ]; then - echo -n "${DISTRO_NAME} " > ${D}${sysconfdir}/issue - echo -n "${DISTRO_NAME} " > ${D}${sysconfdir}/issue.net + echo -n "${DISTRO_NAME} " >> ${D}${sysconfdir}/issue + echo -n "${DISTRO_NAME} " >> ${D}${sysconfdir}/issue.net if [ -n "${DISTRO_VERSION}" ]; then echo -n "${DISTRO_VERSION} " >> ${D}${sysconfdir}/issue echo -n "${DISTRO_VERSION} " >> ${D}${sysconfdir}/issue.net diff --git a/packages/cairo/cairo_1.4.8.bb b/packages/cairo/cairo_1.4.8.bb new file mode 100644 index 0000000000..845e14fc29 --- /dev/null +++ b/packages/cairo/cairo_1.4.8.bb @@ -0,0 +1,6 @@ +require cairo.inc + +SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz" + +PR = "r0" + diff --git a/packages/ftpd-topfield/ftpd-topfield_0.7.3.bb b/packages/ftpd-topfield/ftpd-topfield_0.7.4.bb index f86524b8cf..75d963f6da 100755 --- a/packages/ftpd-topfield/ftpd-topfield_0.7.3.bb +++ b/packages/ftpd-topfield/ftpd-topfield_0.7.4.bb @@ -4,8 +4,8 @@ HOMEPAGE = "http://sourceforge.net/projects/puppy" SECTION = "net" LICENSE = "MIT" -SRC_URI = "cvs://anonymous@puppy.cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=ftpd-topfield;tag=FTPD_TOPFIELD_0_7_3 \ - cvs://anonymous@puppy.cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=libtopfield;tag=FTPD_TOPFIELD_0_7_3 \ +SRC_URI = "cvs://anonymous@puppy.cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=ftpd-topfield;tag=FTPD_TOPFIELD_0_7_4 \ + cvs://anonymous@puppy.cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=libtopfield;tag=FTPD_TOPFIELD_0_7_4 \ file://init" # The source will end up in the subdirectory 'ftpd-topfield' - no release name diff --git a/packages/gspcav1/gspcav1_20070110.bb b/packages/gspcav1/gspcav1_20070110.bb index 86cb1010df..e1fc443d36 100644 --- a/packages/gspcav1/gspcav1_20070110.bb +++ b/packages/gspcav1/gspcav1_20070110.bb @@ -4,7 +4,9 @@ PRIORITY = "optional" SECTION = "kernel/modules" LICENSE = "GPL" -SRC_URI = "http://mxhaard.free.fr/spca50x/Download/${PN}-${PV}.tar.gz \ +PR = "r1" + +SRC_URI = "http://mxhaard.free.fr/spca50x/Download/oldrelease/${PN}-${PV}.tar.gz \ file://Makefile.patch;patch=1 \ file://MS.patch;patch=1" diff --git a/packages/gspcav1/gspcav1_20070508.bb b/packages/gspcav1/gspcav1_20070508.bb new file mode 100644 index 0000000000..e1fc443d36 --- /dev/null +++ b/packages/gspcav1/gspcav1_20070508.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "USB Webcam driver for spca5xx chipset family supporting \ +over 100 models of camera" +PRIORITY = "optional" +SECTION = "kernel/modules" +LICENSE = "GPL" + +PR = "r1" + +SRC_URI = "http://mxhaard.free.fr/spca50x/Download/oldrelease/${PN}-${PV}.tar.gz \ + file://Makefile.patch;patch=1 \ + file://MS.patch;patch=1" + +S = "${WORKDIR}/${PN}-${PV}" + +inherit module + +do_compile () { + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + oe_runmake 'KERNELDIR=${STAGING_KERNEL_DIR}' \ + 'CC=${KERNEL_CC}' \ + 'LD=${KERNEL_LD}' +} + +do_install() { + install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media + install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media +} diff --git a/packages/images/angstrom-minimal-image.bb b/packages/images/angstrom-minimal-image.bb index 90f46a1e01..c79bff25e2 100644 --- a/packages/images/angstrom-minimal-image.bb +++ b/packages/images/angstrom-minimal-image.bb @@ -1,15 +1,11 @@ #Angstrom minimalist image #gives you a small images with ssh access LICENSE = "MIT" -PR = "r0" +PR = "r1" ANGSTROM_EXTRA_INSTALL ?= "" DISTRO_SSH_DAEMON ?= "dropbear" -DEPENDS = "task-base \ - ${DISTRO_SSH_DAEMON} \ - " - RDEPENDS = "task-boot \ ${DISTRO_SSH_DAEMON} \ " diff --git a/packages/linux/linux-magicbox_2.6.19.2.bb b/packages/linux/linux-magicbox_2.6.19.2.bb index 4e07abdfb2..438eaac478 100644 --- a/packages/linux/linux-magicbox_2.6.19.2.bb +++ b/packages/linux/linux-magicbox_2.6.19.2.bb @@ -1,7 +1,9 @@ +# Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved +# Released under the MIT license (see packages/COPYING) SECTION = "kernel" DESCRIPTION = "Linux kernel for Magicbox ver 1.1 and 2.0 router boards" LICENSE = "GPL" -PR = "r2" +PR = "r3" DEPENDS = "u-boot" COMPATIBLE_MACHINE = "magicbox" @@ -86,16 +88,17 @@ do_stage_append () { do_install_append () { - install -d ${DEPLOY_DIR}/images - install -m 0755 arch/ppc/boot/images/zImage.elf ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.elf - install -m 0755 vmlinux ${DEPLOY_DIR}/images/ - powerpc${TARGET_VENDOR}-${TARGET_OS}-objcopy -O binary -R .note -R .comment -S ${DEPLOY_DIR}/images/vmlinux ${DEPLOY_DIR}/images/linux.bin - gzip -f -9 ${DEPLOY_DIR}/images/linux.bin - cp -a ${DEPLOY_DIR}/images/linux.bin.gz ${DEPLOY_DIR}/images/linux-${PV}-${MACHINE}-${DATETIME}.bin.gz + install -d ${DEPLOY_DIR_IMAGE} + install -m 0755 arch/ppc/boot/images/zImage.elf ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.elf + install -m 0755 vmlinux ${DEPLOY_DIR_IMAGE}/ + powerpc${TARGET_VENDOR}-${TARGET_OS}-objcopy -O binary -R .note -R .comment -S ${DEPLOY_DIR_IMAGE}/vmlinux \ + ${DEPLOY_DIR_IMAGE}/linux.bin + gzip -f -9 ${DEPLOY_DIR_IMAGE}/linux.bin + cp -a ${DEPLOY_DIR_IMAGE}/linux.bin.gz ${DEPLOY_DIR_IMAGE}/linux-${PV}-${MACHINE}-${DATETIME}.bin.gz mkimage -A ppc -O linux -T kernel -C gzip -a 00000000 -e 00000000 -n "magicbox"-${PV} \ - -d ${DEPLOY_DIR}/images/linux.bin.gz ${DEPLOY_DIR}/images/uImage-${PV}-${MACHINE}-${DATETIME}.bin - rm ${DEPLOY_DIR}/images/vmlinux - rm ${DEPLOY_DIR}/images/linux.bin.gz + -d ${DEPLOY_DIR_IMAGE}/linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${MACHINE}-${DATETIME}.bin + rm ${DEPLOY_DIR_IMAGE}/vmlinux + rm ${DEPLOY_DIR_IMAGE}/linux.bin.gz } diff --git a/packages/netbase/netbase/interfaces b/packages/netbase/netbase/interfaces index e6a4574aa9..c9b2faf3f8 100644 --- a/packages/netbase/netbase/interfaces +++ b/packages/netbase/netbase/interfaces @@ -28,7 +28,7 @@ iface wlan0 inet dhcp # wireless-key s:My-PlainText-Password # wireless-mode managed # -# A WPA encrypted connection locked to a specific access point. +# A WPA1 or WPA2 encrypted connection locked to a specific access point. # The WLAN cards firmware is updated temporarily to allow WPA # connections. Your card may or may not need the update. # diff --git a/packages/netbase/netbase_4.21.bb b/packages/netbase/netbase_4.21.bb index ba5d95b287..6851ae8d9a 100644 --- a/packages/netbase/netbase_4.21.bb +++ b/packages/netbase/netbase_4.21.bb @@ -2,7 +2,7 @@ DESCRIPTION = "This package provides the necessary \ infrastructure for basic TCP/IP based networking." SECTION = "base" LICENSE = "GPL" -PR = "r17" +PR = "r18" inherit update-rc.d diff --git a/packages/opie-reader/files/qt4.patch b/packages/opie-reader/files/qt4.patch index 82f3b9fdd1..f19000f12f 100644 --- a/packages/opie-reader/files/qt4.patch +++ b/packages/opie-reader/files/qt4.patch @@ -27,20 +27,36 @@ index 45aa045..c67db9e 100644 Bkmk::Bkmk(const tchar* _nm, const tchar* _anno, unsigned int _p) : m_position(_p) diff --git a/BuffDoc.cpp b/BuffDoc.cpp -index 355d14d..8c1eadc 100644 +index 355d14d..170ed43 100644 --- a/BuffDoc.cpp +++ b/BuffDoc.cpp -@@ -682,7 +682,8 @@ int BuffDoc::openfile(QWidget* _parent, const char *src) +@@ -23,6 +23,8 @@ + #include "Reb.h" #endif - codecpath += "/plugins/reader/codecs"; + ++#include "uqtcommon.h" ++ + + linkType BuffDoc::hyperlink(unsigned int n, unsigned int noff, QString& wrd, QString& nm) + { +@@ -674,35 +676,19 @@ int BuffDoc::openfile(QWidget* _parent, const char *src) + } + // //qDebug("Doing final open:%x:%x",exp,filt); #else +-#ifdef USEQPE +-#ifdef OPIE +- QString codecpath(getenv("OPIEDIR")); +-#else +- QString codecpath(getenv("QTDIR")); +-#endif +- codecpath += "/plugins/reader/codecs"; +-#else - QString codecpath(getenv("READERDIR")); -+ const char *rd = getenv("READERDIR"); -+ QString codecpath(rd?rd:"/usr/lib/uqtreader"); - codecpath += "/codecs"; - #endif - QDir d(codecpath, "*.so"); -@@ -690,19 +691,14 @@ int BuffDoc::openfile(QWidget* _parent, const char *src) +- codecpath += "/codecs"; +-#endif +- QDir d(codecpath, "*.so"); ++ QDir d(uqt_codecspath(), "*.so"); + if (d.exists()) { @@ -217,19 +233,37 @@ index 78d3eeb..c74c560 100644 QComboBox* colorbox; public: diff --git a/CFilter.cpp b/CFilter.cpp -index a4ea60a..4baa890 100644 +index a4ea60a..84fa451 100644 --- a/CFilter.cpp +++ b/CFilter.cpp -@@ -673,7 +673,8 @@ ExternFilter::ExternFilter(const QString& nm, const QString& optional) : filt(NU - #endif - filterpath += "/plugins/reader/filters/lib"; - #else +@@ -9,6 +9,7 @@ + #include "CDrawBuffer.h" + #include "CFilter.h" + #include "hrule.h" ++#include "uqtcommon.h" + + #include <qregexp.h> + #include <qimage.h> +@@ -665,17 +666,8 @@ class ErrorFilter : public CFilter + #ifndef __STATIC + ExternFilter::ExternFilter(const QString& nm, const QString& optional) : filt(NULL), handle(NULL) + { +-#ifdef USEQPE +-#ifdef OPIE +- QString filterpath(getenv("OPIEDIR")); +-#else +- QString filterpath(getenv("QTDIR")); +-#endif +- filterpath += "/plugins/reader/filters/lib"; +-#else - QString filterpath(getenv("READERDIR")); -+ const char *rd = getenv("READERDIR"); -+ QString filterpath(rd?rd:"/usr/lib/uqtreader"); - filterpath += "/filters/lib"; - #endif +- filterpath += "/filters/lib"; +-#endif ++ QString filterpath = uqt_filterspath(); ++ filterpath += "lib"; filterpath += nm; + filterpath += ".so"; + if (QFile::exists(filterpath)) diff --git a/CHM.cpp b/CHM.cpp index ace5abc..3c325bb 100644 --- a/CHM.cpp @@ -281,7 +315,7 @@ index 54aaf1c..84609f5 100644 class QVBoxLayout; class QHBoxLayout; diff --git a/FontControl.cpp b/FontControl.cpp -index 08b8c52..b80dd6e 100644 +index 08b8c52..0be54ba 100644 --- a/FontControl.cpp +++ b/FontControl.cpp @@ -1,4 +1,5 @@ @@ -302,6 +336,63 @@ index 08b8c52..b80dd6e 100644 if (sizes.count() == 0) { return false; +@@ -65,3 +66,25 @@ bool FontControl::ChangeFont(QString& n, int tgt) + } + return true; + } ++ ++void FontControl::setCourier() { ++ setCourier(m_fontname); ++} ++void FontControl::setCourier(const QString fn) { ++ QFontDatabase fdb; ++ QStringList fl = fdb.families(); ++ setCourier(fn,fl); ++} ++void FontControl::setCourier(const QString fn,const QStringList fl) { ++ QString fp; ++ int sp = fn.indexOf(' '); ++ if(sp>=0) fp = fn.left(sp); ++ for(QStringList::const_iterator i=fl.begin();i!=fl.end();++i) { ++ if( ++ ( i->startsWith(fn,Qt::CaseInsensitive) ++ || ( (!fp.isEmpty()) && i->startsWith(fp,Qt::CaseInsensitive) ) ) ++ && ( i->endsWith("mono",Qt::CaseInsensitive) ++ || i->endsWith("Fixed") ) ) ++ hasCourier(true,*i); ++ } ++} +diff --git a/FontControl.h b/FontControl.h +index 563e1a8..c7a54ab 100644 +--- a/FontControl.h ++++ b/FontControl.h +@@ -2,6 +2,7 @@ + #define __FONTCONTROL_H + + #include <qfontmetrics.h> ++#include <QFontDatabase> + #include "StyleConsts.h" + + class FontControl +@@ -32,6 +33,7 @@ class FontControl + m_fontsizes(NULL), m_hasCourier(false), m_leading(0), m_extraspace(0), m_fixgraphics(true) + { + ChangeFont(n, size); ++ setCourier(); + } + ~FontControl() + { +@@ -167,6 +169,10 @@ class FontControl + { + return m_extraspace; + } ++ ++ void setCourier(); ++ void setCourier(const QString fn); ++ void setCourier(const QString fn,const QStringList fl); + }; + + #endif diff --git a/GraphicWin.h b/GraphicWin.h index 70d5f7e..a6c556a 100644 --- a/GraphicWin.h @@ -335,10 +426,18 @@ index 70d5f7e..a6c556a 100644 m_picture = new QWidget(viewport()); addChild(m_picture); diff --git a/Prefs.cpp b/Prefs.cpp -index 6c4d45b..f3df856 100644 +index 6c4d45b..d20dc00 100644 --- a/Prefs.cpp +++ b/Prefs.cpp -@@ -27,6 +27,7 @@ +@@ -7,6 +7,7 @@ + ** WARNING! All changes made in this file will be lost! + ****************************************************************************/ + #include "Prefs.h" ++#include "uqtcommon.h" + + #include <stdlib.h> + +@@ -27,6 +28,7 @@ #include <qpe/menubutton.h> #endif #include <qfontdatabase.h> @@ -346,7 +445,7 @@ index 6c4d45b..f3df856 100644 #ifdef USECOMBO void populate_colours(QComboBox *mb) -@@ -58,7 +59,7 @@ CLayoutPrefs::CLayoutPrefs( QWidget* parent, const char* name, WFlags fl ) +@@ -58,7 +60,7 @@ CLayoutPrefs::CLayoutPrefs( QWidget* parent, const char* name, WFlags fl ) : QWidget( parent, name, fl ) { QHBoxLayout* hb = new QHBoxLayout(this); @@ -355,7 +454,7 @@ index 6c4d45b..f3df856 100644 hb->addWidget(bg); StripCR = new QCheckBox( bg ); -@@ -592,7 +593,7 @@ CMiscPrefs::CMiscPrefs( QWidget* parent, const char* name, WFlags fl ) +@@ -592,7 +594,7 @@ CMiscPrefs::CMiscPrefs( QWidget* parent, const char* name, WFlags fl ) vl->setMargin( 0 ); hl->setMargin( 0 ); @@ -364,7 +463,7 @@ index 6c4d45b..f3df856 100644 hl->addWidget( gb ); annotation = new QCheckBox( gb ); -@@ -607,7 +608,7 @@ CMiscPrefs::CMiscPrefs( QWidget* parent, const char* name, WFlags fl ) +@@ -607,7 +609,7 @@ CMiscPrefs::CMiscPrefs( QWidget* parent, const char* name, WFlags fl ) boutput = new QCheckBox( gb ); boutput->setText( tr( "Output" ) ); @@ -373,7 +472,7 @@ index 6c4d45b..f3df856 100644 hl->addWidget( bg ); Depluck = new QCheckBox( bg ); -@@ -618,7 +619,7 @@ CMiscPrefs::CMiscPrefs( QWidget* parent, const char* name, WFlags fl ) +@@ -618,7 +620,7 @@ CMiscPrefs::CMiscPrefs( QWidget* parent, const char* name, WFlags fl ) Continuous = new QCheckBox( bg ); Continuous->setText( tr( "Continuous" ) ); @@ -382,7 +481,7 @@ index 6c4d45b..f3df856 100644 vl->addWidget( bg ); // QLabel* TextLabel = new QLabel( bg ); -@@ -662,7 +663,7 @@ CScrollPrefs::CScrollPrefs( QWidget* parent, const char* name, WFlags fl ) +@@ -662,7 +664,7 @@ CScrollPrefs::CScrollPrefs( QWidget* parent, const char* name, WFlags fl ) hl->setMargin( 0 ); @@ -391,17 +490,28 @@ index 6c4d45b..f3df856 100644 hl->addWidget( bg ); // scrollinplace = new QCheckBox( bg ); -@@ -715,7 +716,8 @@ CScrollPrefs::CScrollPrefs( QWidget* parent, const char* name, WFlags fl ) - #endif - codecpath += "/plugins/reader/outcodecs"; +@@ -707,18 +709,8 @@ CScrollPrefs::CScrollPrefs( QWidget* parent, const char* name, WFlags fl ) #else -- QString codecpath(getenv("READERDIR")); -+ const char *rd = getenv("READERDIR"); -+ QString codecpath(rd?rd:"/usr/lib/uqtreader"); - codecpath += "/outcodecs"; + outcodec = new MenuButton( this); #endif - QDir ocd(codecpath, "lib*.so"); -@@ -772,7 +774,7 @@ CInterPrefs::CInterPrefs( QWidget* parent, const char* name, WFlags fl ) +-#ifdef USEQPE +-#ifdef OPIE +- QString codecpath(getenv("OPIEDIR")); +-#else +- QString codecpath(getenv("QTDIR")); +-#endif +- codecpath += "/plugins/reader/outcodecs"; +-#else +- QString codecpath(getenv("READERDIR")); +- codecpath += "/outcodecs"; +-#endif +- QDir ocd(codecpath, "lib*.so"); ++ QString codecpath = uqt_outcodecspath(); ++ QDir ocd(uqt_outcodecspath(), "lib*.so"); + for (int i = 0; i < ocd.count(); ++i) + { + QString tmp(ocd[i]); +@@ -772,7 +764,7 @@ CInterPrefs::CInterPrefs( QWidget* parent, const char* name, WFlags fl ) { QHBoxLayout* hb = new QHBoxLayout(this); @@ -410,7 +520,7 @@ index 6c4d45b..f3df856 100644 hb->addWidget(gb); -@@ -784,7 +786,7 @@ CInterPrefs::CInterPrefs( QWidget* parent, const char* name, WFlags fl ) +@@ -784,7 +776,7 @@ CInterPrefs::CInterPrefs( QWidget* parent, const char* name, WFlags fl ) TextLabel = new QLabel( gb ); TextLabel->setText( tr( "Ideogram Width" ) ); ideogramwidth = new QSpinBox( gb ); @@ -419,7 +529,7 @@ index 6c4d45b..f3df856 100644 ideogramwidth->setRange(1,200); propfontchange = new QCheckBox( gb ); -@@ -809,7 +811,7 @@ CInterPrefs::CInterPrefs( QWidget* parent, const char* name, WFlags fl ) +@@ -809,7 +801,7 @@ CInterPrefs::CInterPrefs( QWidget* parent, const char* name, WFlags fl ) QVBoxLayout* vb = new QVBoxLayout; @@ -530,7 +640,7 @@ index 9daa07a..6afa3e7 100644 class CDrawBuffer; diff --git a/QTReaderApp.cpp b/QTReaderApp.cpp -index b985094..b525435 100644 +index b985094..529ec9e 100644 --- a/QTReaderApp.cpp +++ b/QTReaderApp.cpp @@ -20,7 +20,9 @@ @@ -538,7 +648,7 @@ index b985094..b525435 100644 #include <qregexp.h> #include <qclipboard.h> -#include <qwidgetstack.h> -+#include <Qt3Support/Q3WidgetStack> ++#include <QStackedWidget> +#include <Qt3Support/Q3Action> +#include <qdesktopwidget.h> #ifdef USEQPE @@ -559,17 +669,35 @@ index b985094..b525435 100644 #include <qstatusbar.h> #ifdef USEQPE #include <qpe/global.h> -@@ -106,7 +107,8 @@ bool CheckVersion(int&, int&, char&, QWidget*); - //#define PICDIR "/home/tim/uqtreader/pics/" - QString picdir() - { +@@ -66,6 +67,7 @@ + #include "FixedFont.h" + #include "URLDialog.h" + #include "util.h" ++#include "uqtcommon.h" + #include <qfontdatabase.h> + + #ifdef USEQPE +@@ -103,18 +105,10 @@ bool CheckVersion(int&, int&, char&, QWidget*); + #define USEMSGS + #define PICDIR "opie-reader/" + #else +-//#define PICDIR "/home/tim/uqtreader/pics/" +-QString picdir() +-{ - QString hd(getenv("READERDIR")); -+ const char *rd = getenv("READERDIR"); -+ QString hd(rd?rd:"/usr/share/uqtreader"); - return hd + "/pics"; - } - #define PICDIR picdir() -@@ -156,16 +158,9 @@ void QTReaderApp::listBkmkFiles() +- return hd + "/pics"; +-} +-#define PICDIR picdir() ++#define PICDIR uqt_picspath() + #endif + #endif + +-unsigned long QTReaderApp::m_uid = 0; +- + void QTReaderApp::setScrollState(bool _b) { m_scrollButton->setOn(_b); } + + #ifdef USEQPE +@@ -156,16 +150,9 @@ void QTReaderApp::listBkmkFiles() d.setFilter( QDir::Files | QDir::NoSymLinks ); // d.setSorting( QDir::Size | QDir::Reversed ); @@ -589,7 +717,16 @@ index b985094..b525435 100644 #else /* USEQPE */ int cnt = 0; -@@ -207,6 +202,8 @@ void QTReaderApp::hidetoolbars() +@@ -192,7 +179,7 @@ void QTReaderApp::listBkmkFiles() + //tjw menu->hide(); + + +- editorStack->raiseWidget( bkmkselector ); ++ editorStack->setCurrentWidget( bkmkselector ); + hidetoolbars(); + m_nBkmkAction = cRmBkmkFile; + } +@@ -207,6 +194,8 @@ void QTReaderApp::hidetoolbars() #if defined(USEQPE) menubar->hide(); @@ -598,7 +735,7 @@ index b985094..b525435 100644 #endif if (m_scrollbar != NULL) m_scrollbar->hide(); -@@ -233,7 +230,7 @@ void QTReaderApp::hidetoolbars() +@@ -233,7 +222,7 @@ void QTReaderApp::hidetoolbars() } QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f ) @@ -607,7 +744,7 @@ index b985094..b525435 100644 fileBar(NULL), navBar(NULL), viewBar(NULL), markBar(NULL), m_scrollbar(NULL), m_localscroll(2), m_hidebars(false), m_kmapchanged(false) { { -@@ -337,41 +334,41 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f ) +@@ -337,41 +326,41 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f ) // QToolBar* markBar = new QToolBar("File", this); #if defined(USEQPE) @@ -658,18 +795,63 @@ index b985094..b525435 100644 connect( a, SIGNAL( activated() ), this, SLOT( fileNew() ) ); a->addTo( bar ); a->addTo( file ); -@@ -384,7 +381,7 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f ) +@@ -379,34 +368,35 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f ) + QWidget* widge = new QWidget(this); + setCentralWidget( widge ); + QVBoxLayout* vlayout = new QVBoxLayout(widge); ++ vlayout->setMargin(0); + m_layout = new QBoxLayout(QBoxLayout::LeftToRight); + m_prog = new QLabel(widge); vlayout->addLayout(m_layout, 1); vlayout->addWidget(m_prog); - editorStack = new QWidgetStack( widge ); -+ editorStack = new Q3WidgetStack( widge ); ++ editorStack = new QStackedWidget( widge ); // setCentralWidget( editorStack ); searchVisible = FALSE; -@@ -574,137 +571,137 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f ) + regVisible = FALSE; + m_fontVisible = false; + +- m_buttonprefs = new CButtonPrefs(&kmap, this); +- editorStack->addWidget(m_buttonprefs, get_unique_id()); ++ m_buttonprefs = new CButtonPrefs(&kmap, editorStack); ++ editorStack->addWidget(m_buttonprefs); + connect( m_buttonprefs, SIGNAL( Closed() ), this, SLOT( infoClose() ) ); + + + m_annoWin = new CAnnoEdit(editorStack); +- editorStack->addWidget(m_annoWin, get_unique_id()); ++ editorStack->addWidget(m_annoWin); + connect( m_annoWin, SIGNAL( finished(const QString&, const QString&) ), this, SLOT( addAnno(const QString&, const QString&) ) ); + connect( m_annoWin, SIGNAL( cancelled() ), this, SLOT( infoClose() ) ); + + m_infoWin = new infowin(editorStack); +- editorStack->addWidget(m_infoWin, get_unique_id()); ++ editorStack->addWidget(m_infoWin); + connect( m_infoWin, SIGNAL( Close() ), this, SLOT( infoClose() ) ); + + m_graphicwin = new GraphicWin(editorStack); +- editorStack->addWidget(m_graphicwin, get_unique_id()); ++ editorStack->addWidget(m_graphicwin); + connect( m_graphicwin, SIGNAL( Closed() ), this, SLOT( infoClose() ) ); + + // bkmkselector = new QListBox(editorStack, "Bookmarks"); +@@ -414,7 +404,7 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f ) + // connect(bkmkselector, SIGNAL( selected(const QString&) ), this, SLOT( gotobkmk(const QString&) ) ); + connect(bkmkselector, SIGNAL( selected(int) ), this, SLOT( gotobkmk(int) ) ); + connect(bkmkselector, SIGNAL( cancelled() ), this, SLOT( cancelbkmk() ) ); +- editorStack->addWidget( bkmkselector, get_unique_id() ); ++ editorStack->addWidget( bkmkselector); + + /* + importSelector = new FileSelector( "*", editorStack, "importselector", false ); +@@ -572,139 +562,139 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f ) + connect( reader, SIGNAL( HandleKeyRequest(QKeyEvent*) ), this, SLOT( handlekey(QKeyEvent*) ) ); + connect( reader, SIGNAL( SetScrollState(bool) ), this, SLOT( setScrollState(bool) ) ); connect( reader, SIGNAL(RefreshBitmap()), this, SLOT(setBackgroundBitmap())); - editorStack->addWidget( reader, get_unique_id() ); +- editorStack->addWidget( reader, get_unique_id() ); ++ editorStack->addWidget( reader ); - m_preferences_action = new QAction( tr( "Configuration" ), geticon( "SettingsIcon" ), QString::null, 0, this, NULL); + m_preferences_action = new Q3Action( tr( "Configuration" ), geticon( "SettingsIcon" ), QString::null, 0, this, NULL); @@ -835,7 +1017,7 @@ index b985094..b525435 100644 // connect( a, SIGNAL( activated() ), this, SLOT( pagedn() ) ); a->addTo( file ); */ -@@ -715,13 +712,13 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f ) +@@ -715,13 +705,13 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f ) QActionGroup* ag = new QActionGroup(this); ag->setExclusive(false); @@ -852,7 +1034,7 @@ index b985094..b525435 100644 connect( a, SIGNAL( toggled(bool) ), this, SLOT( setpause(bool) ) ); a->setOn(reader->m_pauseAfterEachPara); -@@ -731,64 +728,64 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f ) +@@ -731,64 +721,64 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f ) #endif /* @@ -930,7 +1112,7 @@ index b985094..b525435 100644 -@@ -796,57 +793,57 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f ) +@@ -796,57 +786,57 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f ) // view->insertSeparator(); /* @@ -1000,7 +1182,7 @@ index b985094..b525435 100644 connect( m_endBlock_action, SIGNAL( activated() ), this, SLOT( editCopy() ) ); m_endBlock_action->addTo( marks ); -@@ -868,10 +865,10 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f ) +@@ -868,10 +858,10 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f ) } @@ -1013,7 +1195,7 @@ index b985094..b525435 100644 searchBar->setHorizontalStretchable( TRUE ); -@@ -890,17 +887,17 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f ) +@@ -890,17 +880,17 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f ) connect( searchEdit, SIGNAL( returnPressed( ) ), this, SLOT( search( ) ) ); #endif @@ -1034,7 +1216,7 @@ index b985094..b525435 100644 connect(regBar, SIGNAL( OnHide() ), this, SLOT( restoreFocus() )); regBar->setHorizontalStretchable( TRUE ); -@@ -913,17 +910,17 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f ) +@@ -913,17 +903,17 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f ) connect( regEdit, SIGNAL( returnPressed( ) ), this, SLOT( do_regaction() ) ); @@ -1055,7 +1237,18 @@ index b985094..b525435 100644 m_fontBar->setHorizontalStretchable( TRUE ); -@@ -965,7 +962,7 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f ) +@@ -940,9 +930,9 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f ) + { + realfont = true; + } +- if ((*nm).contains(FIXEDFONT,false)) reader->m_fontControl.hasCourier(true, *nm); + } + if (!realfont) reader->m_fontname = flist[0]; ++ reader->m_fontControl.setCourier(reader->m_fontname,flist); + } // delete the FontDatabase!!! + connect( m_fontSelector, SIGNAL( activated(const QString& ) ), + this, SLOT( do_setfont(const QString&) ) ); +@@ -965,7 +955,7 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f ) m_scrollbar->setVerticalStretchable( TRUE ); */ @@ -1064,7 +1257,7 @@ index b985094..b525435 100644 m_layout->addWidget(scrollbar); scrollbar->setTracking(false); // connect(scrollbar, SIGNAL(sliderMoved(int)), this, SLOT(actionscroll(int)) ); -@@ -1226,7 +1223,7 @@ void QTReaderApp::addtoolbars(Config* config) +@@ -1226,7 +1216,7 @@ void QTReaderApp::addtoolbars(Config* config) { if (m_bkmkAvail == NULL) { @@ -1073,7 +1266,7 @@ index b985094..b525435 100644 connect( m_bkmkAvail, SIGNAL( activated() ), this, SLOT( showAnnotation() ) ); m_bkmkAvail->setEnabled(false); -@@ -1253,7 +1250,7 @@ bool QTReaderApp::checkbar(Config* _config, const QString& key) +@@ -1253,7 +1243,7 @@ bool QTReaderApp::checkbar(Config* _config, const QString& key) } @@ -1082,7 +1275,7 @@ index b985094..b525435 100644 { if (fileBar == NULL) { -@@ -1270,21 +1267,21 @@ QToolBar* QTReaderApp::filebar() +@@ -1270,21 +1260,21 @@ QToolBar* QTReaderApp::filebar() case cesMenuTool: case cesMultiple: // qDebug("Creating new file bar"); @@ -1107,7 +1300,7 @@ index b985094..b525435 100644 break; default: qDebug("Incorrect toolbar policy set"); -@@ -1298,7 +1295,7 @@ QToolBar* QTReaderApp::viewbar() +@@ -1298,7 +1288,7 @@ QToolBar* QTReaderApp::viewbar() } return viewBar; } @@ -1116,7 +1309,7 @@ index b985094..b525435 100644 { if (navBar == NULL) { -@@ -1306,7 +1303,7 @@ QToolBar* QTReaderApp::navbar() +@@ -1306,7 +1296,7 @@ QToolBar* QTReaderApp::navbar() { case cesMultiple: // qDebug("Creating new nav bar"); @@ -1125,7 +1318,7 @@ index b985094..b525 |