latest qtopia merge as of 20020204.

1 files changed, 11 insertions, 29 deletions

diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index 70ffec1..4dbfbd8 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -1,69 +1,70 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 ** $Id$
 **
 **********************************************************************/
+#define QTOPIA_INTERNAL_LANGLIST
 #include <stdlib.h>
 #include <unistd.h>
 #include <qfile.h>
 #ifdef Q_WS_QWS
 #ifndef QT_NO_COP
 #if QT_VERSION <= 231
 #define private public
 #define sendLocally processEvent
 #include "qcopenvelope_qws.h"
 #undef private
 #else
 #include "qcopenvelope_qws.h"
 #endif
 #endif
 #include <qwindowsystem_qws.h>
 #endif
 #include <qtextstream.h>
 #include <qpalette.h>
 #include <qbuffer.h>
 #include <qptrdict.h>
 #include <qregexp.h>
 #include <qdir.h>
 #include <qlabel.h>
 #include <qdialog.h>
 #include <qdragobject.h>
 #include <qevent.h>
 #include <qtooltip.h>
 #include <qsignal.h>
 #include "qpeapplication.h"
 #include "qpestyle.h"
 #if QT_VERSION >= 300
 #include <qstylefactory.h>
 #else
 #include <qplatinumstyle.h>
 #include <qwindowsstyle.h>
 #include <qmotifstyle.h>
 #include <qmotifplusstyle.h>
 #include "lightstyle.h"
 #endif
 #include "global.h"
 #include "resource.h"
 #if QT_VERSION <= 230 && defined(QT_NO_CODECS)
 #include "qutfcodec.h"
 #endif
 #include "config.h"
 #include "network.h"
 #include "fontmanager.h"
 #include "power.h"
@@ -92,112 +93,97 @@ public:
 	forceshow(FALSE), nomaximize(FALSE), qpe_main_widget(0),
 	keep_running(TRUE)
     {
 	qcopq.setAutoDelete(TRUE);
     }
 
     int presstimer;
     QWidget* presswidget;
     QPoint presspos;
     bool rightpressed;
     int kbgrabber;
     bool kbregrab;
     bool notbusysent;
     QString appName;
     struct QCopRec {
 	QCopRec(const QCString &ch, const QCString &msg,
                                const QByteArray &d) :
 	    channel(ch), message(msg), data(d) { }
 
 	QCString channel;
 	QCString message;
 	QByteArray data;
     };
     bool preloaded;
     bool forceshow;
     bool nomaximize;
     QWidget* qpe_main_widget;
     bool keep_running;
     QList<QCopRec> qcopq;
 
     void enqueueQCop(const QCString &ch, const QCString &msg,
                                const QByteArray &data)
     {
 	qcopq.append(new QCopRec(ch,msg,data));
     }
     void sendQCopQ()
     {
 	QCopRec* r;
 	for (QListIterator<QCopRec> it(qcopq); (r=it.current()); ++it)
 	    QCopChannel::sendLocally(r->channel,r->message,r->data);
 	qcopq.clear();
     }
 };
 
 class ResourceMimeFactory : public QMimeSourceFactory {
 public:
     ResourceMimeFactory()
     {
-	QStringList path;
-	QString lang = getenv("LANG");
-	if ( !lang.isEmpty() )
-	    path += QPEApplication::qpeDir() + "/help/" + lang + "/html";
-	path += QPEApplication::qpeDir() + "/pics";
-	path += QPEApplication::qpeDir() + "/help/en/html";
-	path += QPEApplication::qpeDir() + "/docs";
-	QString dir = QDir::current().canonicalPath();
-	if ( dir == "/" )
-	    dir += "/docs";
-	else {
-	    path += dir + "/../pics";
-	    dir += "/../docs";
-	    path += dir;
-	}
-	setFilePath( path );
+	setFilePath( Global::helpPath() );
 	setExtensionType("html","text/html;charset=UTF-8");
     }
 
     const QMimeSource* data(const QString& abs_name) const
     {
 	const QMimeSource* r = QMimeSourceFactory::data(abs_name);
 	if ( !r ) {
 	    int sl = abs_name.length();
 	    do {
 		sl = abs_name.findRev('/',sl-1);
 		QString name = sl>=0 ? abs_name.mid(sl+1) : abs_name;
 		int dot = name.findRev('.');
 		if ( dot >= 0 )
 		    name = name.left(dot);
 		QImage img = Resource::loadImage(name);
 		if ( !img.isNull() )
 		    r = new QImageDrag(img);
 	    } while (!r && sl>0);
 	}
 	return r;
     }
 };
 
 static int muted=0;
 
 static void setVolume(int t=0, int percent=-1)
 {
     switch (t) {
 	case 0: {
 	    Config cfg("Sound");
 	    cfg.setGroup("System");
 	    if ( percent < 0 )
 		percent = cfg.readNumEntry("Volume",50);
 	    int fd = 0;
 	    if ((fd = open("/dev/mixer", O_RDWR))>=0) {
 		int vol = muted ? 0 : percent;
 		// set both channels to same volume
 		vol |= vol << 8;
 		ioctl(fd, MIXER_WRITE(0), &vol);
 		::close(fd);
 	    }
 	} break;
     }
 }
 
 int qpe_sysBrightnessSteps()
 {
 #if defined(QT_QWS_IPAQ)
@@ -492,122 +478,118 @@ QPEApplication::QPEApplication( int& argc, char **argv, Type t )
 	     this, SLOT(systemMessage( const QCString &, const QByteArray &)) );
 
     QCString channel = QCString(argv[0]);
     channel.replace(QRegExp(".*/"),"");
     d->appName = channel;
     channel = "QPE/Application/" + channel;
     pidChannel = new QCopChannel( channel, this);
     connect( pidChannel, SIGNAL(received(const QCString &, const QByteArray &)),
 	    this, SLOT(pidMessage(const QCString &, const QByteArray &)));
 
     if ( f.isOpen() ) {
 	d->keep_running = FALSE;
 	QDataStream ds(&f);
 	QCString channel, message;
 	QByteArray data;
 	while(!ds.atEnd()) {
 	    ds >> channel >> message >> data;
 	    d->enqueueQCop(channel,message,data);
 	}
 
 	flock(f.handle(), LOCK_UN);
 	f.close();
 	f.remove();
     }
 
     for (int a=0; a<argc; a++) {
 	if ( qstrcmp(argv[a],"-preload")==0 ) {
 	    argv[a] = argv[a+1];
 	    a++;
 	    d->preloaded = TRUE;
 	    argc-=1;
 	} else if ( qstrcmp(argv[a],"-preload-show")==0 ) {
 	    argv[a] = argv[a+1];
 	    a++;
 	    d->preloaded = TRUE;
 	    d->forceshow = TRUE;
 	    argc-=1;
 	}
     }
 
     /* overide stored arguments */
     setArgs(argc, argv);
 
 #endif
 
     qwsSetDecoration( new QPEDecoration() );
 
 #ifndef QT_NO_TRANSLATION
-    char *l = getenv( "LANG" );
-    QString lang;
-    if ( l ) {
-	lang = l;
+    QStringList langs = Global::languageList();
+    for (QStringList::ConstIterator it = langs.begin(); it!=langs.end(); ++it) {
+	QString lang = *it;
 
-	/*
-    Config config("qpe");
-    config.setGroup( "Appearance" );
-    lang = config.readEntry( "Language", lang );
-    */
+	QTranslator * trans;
+	QString tfn;
 
-	QTranslator * trans = new QTranslator(this);
-	QString tfn = qpeDir()+"/i18n/"+lang+"/"+d->appName+".qm";
+	trans = new QTranslator(this);
+	tfn = qpeDir()+"/i18n/"+lang+"/libqpe.qm";
 	if ( trans->load( tfn ))
 	    installTranslator( trans );
 	else
 	    delete trans;
 
 	trans = new QTranslator(this);
-	tfn = qpeDir()+"/i18n/"+lang+"/libqpe.qm";
+	tfn = qpeDir()+"/i18n/"+lang+"/"+d->appName+".qm";
 	if ( trans->load( tfn ))
 	    installTranslator( trans );
 	else
 	    delete trans;
 
-    //###language/font hack; should look it up somewhere
+	//###language/font hack; should look it up somewhere
 	if ( lang == "ja" || lang == "zh_CN" || lang == "zh_TW" || lang == "ko" ) {
 	    QFont fn = FontManager::unicodeFont( FontManager::Proportional );
 	    setFont( fn );
 	}
     }
 #endif
 
     applyStyle();
 
     if ( type() == GuiServer ) {
 	setScreenSaverInterval(-1);
 	setVolume();
 	QWSServer::setScreenSaver(new QPEScreenSaver);
     }
 
     installEventFilter( this );
 
     QPEMenuToolFocusManager::initialize();
 
 #ifdef QT_NO_QWS_CURSOR
     // if we have no cursor, probably don't want tooltips
     QToolTip::setEnabled( FALSE );
 #endif
 }
 
 static QPtrDict<void>* inputMethodDict=0;
 static void createInputMethodDict()
 {
     if ( !inputMethodDict )
 	inputMethodDict = new QPtrDict<void>;
 }
 
 /*!
   Returns the currently set hint to the system as to whether
   \a w has any use for text input methods.
 
   \sa setInputMethodHint()
 */
 QPEApplication::InputMethodHint QPEApplication::inputMethodHint( QWidget* w )
 {
     if ( inputMethodDict && w )
 	return (InputMethodHint)(int)inputMethodDict->find(w);
     return Normal;
 }
 
 /*!
     \enum QPEApplication::InputMethodHint