1 files changed, 33 insertions, 35 deletions

diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index 0b6d56d..1117240 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -63,193 +63,192 @@
 #if QT_VERSION >= 300
 #include <qstylefactory.h>
 #else
 #include <qplatinumstyle.h>
 #include <qwindowsstyle.h>
 #include <qmotifstyle.h>
 #include <qmotifplusstyle.h>
 #include "lightstyle.h"
 
 #include <qpe/qlibrary.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"
 #ifdef QWS
 #include "fontmanager.h"
 #include "fontdatabase.h"
 #endif
 
 #include "alarmserver.h"
 #include "applnk.h"
 #include "qpemenubar.h"
 #include "textcodecinterface.h"
 #include "imagecodecinterface.h"
 #include <qtopia/qpeglobal.h>
 
 #include <unistd.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
 #ifndef QT_NO_SOUND
 #include <sys/soundcard.h>
 #endif
 #include "qt_override_p.h"
 
 #include <backend/rohfeedback.h>
 
 
 static bool useBigPixmaps = 0;
 
 class HackWidget : public QWidget
 {
 public:
     bool needsOk()
     { return (getWState() & WState_Reserved1 ); }
 
     QRect normalGeometry()
     { return topData()->normalGeometry; };
 };
 
 class QPEApplicationData
 {
 public:
     QPEApplicationData ( ) :
           presstimer( 0 ), presswidget( 0 ), rightpressed( false ), kbgrabbed( false ),
           notbusysent( false ), preloaded( false ), forceshow( false ), nomaximize( false ),
           keep_running( true ), qcopQok( false ),
           fontFamily( "Vera" ), fontSize( 10 ), smallIconSize( 14 ),
           bigIconSize( 32 ), qpe_main_widget( 0 )
     {
         Config cfg( "qpe" );
         cfg.setGroup( "Appearance" );
         useBigPixmaps = cfg.readBoolEntry( "useBigPixmaps", false );
         fontFamily = cfg.readEntry( "FontFamily", "Vera" );
         fontSize = cfg.readNumEntry( "FontSize", 10 );
         smallIconSize = cfg.readNumEntry( "SmallIconSize", 14 );
         bigIconSize = cfg.readNumEntry( "BigIconSize", 32 );
 #ifdef OPIE_WITHROHFEEDBACK
         RoH = 0;
 #endif
     }
 
     int presstimer;
     QWidget* presswidget;
     QPoint presspos;
 #ifdef OPIE_WITHROHFEEDBACK
     Opie::Internal::RoHFeedback *RoH;
 #endif
 
     bool rightpressed : 1;
     bool kbgrabbed    : 1;
     bool notbusysent  : 1;
     bool preloaded    : 1;
     bool forceshow    : 1;
     bool nomaximize   : 1;
     bool keep_running : 1;
     bool qcopQok      : 1;
 
     QCString fontFamily;
     int fontSize;
     int smallIconSize;
     int bigIconSize;
 
-  QStringList langs;
     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;
     };
     QWidget* qpe_main_widget;
         QGuardedPtr<QWidget> lastraised;
     QQueue<QCopRec> qcopq;
         QString styleName;
     QString decorationName;
 
     void enqueueQCop( const QCString &ch, const QCString &msg,
                       const QByteArray &data )
     {
         qcopq.enqueue( new QCopRec( ch, msg, data ) );
     }
     void sendQCopQ()
     {
             if (!qcopQok )
                 return;
 
         QCopRec * r;
 
            while((r=qcopq.dequeue())) {
                // remove from queue before sending...
                // event loop can come around again before getting
                // back from sendLocally
 #ifndef QT_NO_COP
                QCopChannel::sendLocally( r->channel, r->message, r->data );
 #endif
 
            delete r;
            }
     }
 
     static void show_mx(QWidget* mw, bool nomaximize, QString &strName)
     {
             if ( mw->inherits("QMainWindow") || mw->isA("QMainWindow") )
             {
                 ( (  QMainWindow* ) mw )->setUsesBigPixmaps( useBigPixmaps );
             }
         QPoint p;
         QSize s;
         bool max;
     if ( mw->isVisible() ) {
         if ( read_widget_rect(strName, max, p, s) && validate_widget_size(mw, p, s) ) {
             mw->resize(s);
             mw->move(p);
         }
         mw->raise();
     } else {
 
         if ( mw->layout() && mw->inherits("QDialog") ) {
         if ( read_widget_rect(strName, max, p, s) && validate_widget_size(mw, p, s) ) {
             mw->resize(s);
             mw->move(p);
 
             if ( max && !nomaximize ) {
             mw->showMaximized();
             } else {
             mw->show();
                 }
         } else {
             QPEApplication::showDialog((QDialog*)mw,nomaximize);
         }
         } else {
         if ( read_widget_rect(strName, max, p, s) && validate_widget_size(mw, p, s) ) {
             mw->resize(s);
             mw->move(p);
         } else {    //no stored rectangle, make an estimation
             int x = (qApp->desktop()->width()-mw->frameGeometry().width())/2;
             int y = (qApp->desktop()->height()-mw->frameGeometry().height())/2;
             mw->move( QMAX(x,0), QMAX(y,0) );
 #ifdef Q_WS_QWS
             if ( !nomaximize )
             mw->showMaximized();
 #endif
         }
         if ( max && !nomaximize )
             mw->showMaximized();
         else
             mw->show();
         }
     }
     }
 
     static bool read_widget_rect(const QString &app, bool &maximized, QPoint &p, QSize &s)
     {
     maximized = TRUE;
@@ -665,372 +664,382 @@ static void setTreble( int t = 0, int percent = -1 )
   This signal is emitted when the user changes the clock's style. If
   \a ampm is TRUE, the user wants a 12-hour AM/PM clock, otherwise,
   they want a 24-hour clock.
 */
 
 /*!
     \fn void QPEApplication::volumeChanged( bool muted )
 
     This signal is emitted whenever the mute state is changed. If \a
     muted is TRUE, then sound output has been muted.
 */
 
 /*!
     \fn void QPEApplication::weekChanged( bool startOnMonday )
 
     This signal is emitted if the week start day is changed. If \a
     startOnMonday is TRUE then the first day of the week is Monday; if
     \a startOnMonday is FALSE then the first day of the week is
     Sunday.
 */
 
 /*!
     \fn void QPEApplication::dateFormatChanged(DateFormat)
 
     This signal is emitted whenever the date format is changed.
 */
 
 /*!
     \fn void QPEApplication::flush()
 
     ###
 */
 
 /*!
   \fn void QPEApplication::reload()
 
 */
 
 
 
 void QPEApplication::processQCopFile()
 {
     QString qcopfn("/tmp/qcop-msg-");
     qcopfn += d->appName; // append command name
 
     QFile f(qcopfn);
     if ( f.open(IO_ReadWrite) ) {
 #ifndef Q_OS_WIN32
     flock(f.handle(), LOCK_EX);
 #endif
     QDataStream ds(&f);
     QCString channel, message;
     QByteArray data;
     while(!ds.atEnd()) {
         ds >> channel >> message >> data;
         d->enqueueQCop(channel,message,data);
     }
     ::ftruncate(f.handle(), 0);
 #ifndef Q_OS_WIN32
     f.flush();
     flock(f.handle(), LOCK_UN);
 #endif
     }
 #endif
 }
 
 
 /*!
   \fn void QPEApplication::appMessage( const QCString& msg, const QByteArray& data )
 
   This signal is emitted when a message is received on this
   application's QPE/Application/<i>appname</i> \link qcop.html
   QCop\endlink channel.
 
   The slot to which you connect this signal uses \a msg and \a data
   in the following way:
 
 \code
      void MyWidget::receive( const QCString& msg, const QByteArray& data )
      {
        QDataStream stream( data, IO_ReadOnly );
        if ( msg == "someMessage(int,int,int)" ) {
             int a,b,c;
             stream >> a >> b >> c;
             ...
        } else if ( msg == "otherMessage(QString)" ) {
            ...
        }
     }
 \endcode
 
   \sa qcop.html
   Note that messages received here may be processed by qpe application
   and emitted as signals, such as flush() and reload().
 */
 
+#ifndef QT_NO_TRANSLATION
+static void qtopia_loadTranslations( const QStringList& qms )
+{
+    QStringList langs = Global::languageList();
+
+    for (QStringList::ConstIterator it = langs.begin(); it!=langs.end(); ++it) {
+        QString lang = *it;
+
+        QTranslator * trans;
+        QString tfn;
+
+        for (QStringList::ConstIterator qmit = qms.begin(); qmit!=qms.end(); ++qmit) {
+            trans = new QTranslator(qApp);
+            tfn = QPEApplication::qpeDir() + "i18n/" + lang + "/" + *qmit + ".qm";
+            if ( trans->load( tfn ))
+                qApp->installTranslator( trans );
+            else
+                delete trans;
+        }
+    }
+}
+#endif
+
 /*!
   Constructs a QPEApplication just as you would construct
   a QApplication, passing \a argc, \a argv, and \a t.
 
   For applications, \a t should be the default, GuiClient. Only
   the Qtopia server passes GuiServer.
 */
 QPEApplication::QPEApplication( int & argc, char **argv, Type t )
         : QApplication( hack(argc), argv, t ), pidChannel( 0 )
 {
     QPixmapCache::setCacheLimit(256); // sensible default for smaller devices.
 
     d = new QPEApplicationData;
     d->loadTextCodecs();
     d->loadImageCodecs();
 
     setFont( QFont( d->fontFamily, d->fontSize ) );
     AppLnk::setSmallIconSize( d->smallIconSize );
     AppLnk::setBigIconSize( d->bigIconSize );
 
     QMimeSourceFactory::setDefaultFactory( new ResourceMimeFactory );
 
     connect( this, SIGNAL( lastWindowClosed() ), this, SLOT( hideOrQuit() ) );
 
 
     sysChannel = new QCopChannel( "QPE/System", this );
     connect( sysChannel, SIGNAL( received(const QCString&,const QByteArray&) ),
              this, SLOT( systemMessage(const QCString&,const QByteArray&) ) );
 
 /* COde now in initapp */
 #if 0
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
 
     QString qcopfn( "/tmp/qcop-msg-" );
     qcopfn += QString( argv[ 0 ] ); // append command name
 
     QFile f( qcopfn );
     if ( f.open( IO_ReadOnly ) ) {
         flock( f.handle(), LOCK_EX );
     }
 
 
 
     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
 #else
-        initApp( argc, argv );
+    initApp( argc, argv );
 #endif
 #ifdef Q_WS_QWS
     /* load the font renderer factories */
     FontDatabase::loadRenderers();
 #endif
 #ifndef QT_NO_TRANSLATION
+    QStringList qms;
+    qms << "libqpe";
+    qms << "libopie";
+    qms << d->appName;
 
-    d->langs = Global::languageList();
-    for ( QStringList::ConstIterator it = d->langs.begin(); it != d->langs.end(); ++it ) {
-        QString lang = *it;
-
-                installTranslation( lang + "/libopie.qm");
-        installTranslation( lang + "/libqpe.qm" );
-        installTranslation( lang + "/" + d->appName + ".qm" );
-
-
-        //###language/font hack; should look it up somewhere
-#ifdef QWS
-
-                if ( lang == "ja" || lang == "zh_CN" || lang == "zh_TW" || lang == "ko" ) {
-                    QFont fn = FontManager::unicodeFont( FontManager::Proportional );
-                    setFont( fn );
-                }
-#endif
-        }
+    qtopia_loadTranslations(qms);
 #endif
 
     applyStyle();
 
     if ( type() == GuiServer ) {
         setVolume();
     }
 
     installEventFilter( this );
 
     QPEMenuToolFocusManager::initialize();
 
 #ifdef QT_NO_QWS_CURSOR
     // if we have no cursor, probably don't want tooltips
     QToolTip::setEnabled( FALSE );
 #endif
 }
 
 
 #ifdef QTOPIA_INTERNAL_INITAPP
 void QPEApplication::initApp( int argc, char **argv )
 {
     delete pidChannel;
     d->keep_running = TRUE;
     d->preloaded = FALSE;
     d->forceshow = FALSE;
 
     QCString channel = QCString(argv[0]);
 
     channel.replace(QRegExp(".*/"),"");
     d->appName = channel;
 
+#ifndef QT_NO_TRANSLATION
+    qtopia_loadTranslations( QStringList()<<channel );
+#endif
+
     #if QT_VERSION > 235
     qt_fbdpy->setIdentity( channel ); // In Qt/E 2.3.6
     #endif
 
     channel = "QPE/Application/" + channel;
     pidChannel = new QCopChannel( channel, this);
     connect( pidChannel, SIGNAL(received(const QCString&,const QByteArray&)),
         this, SLOT(pidMessage(const QCString&,const QByteArray&)));
 
 
 
     processQCopFile();
     d->keep_running = d->qcopq.isEmpty();
 
     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);
-
-    /* install translation here */
-    for ( QStringList::ConstIterator it = d->langs.begin(); it != d->langs.end(); ++it )
-        installTranslation( (*it) + "/" + d->appName + ".qm" );
 }
 #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
   widget \a w has any use for text input methods.
 
 
   \sa setInputMethodHint() InputMethodHint
 */
 QPEApplication::InputMethodHint QPEApplication::inputMethodHint( QWidget * w )
 {
     if ( inputMethodDict && w )
         return ( InputMethodHint ) ( int ) inputMethodDict->find( w );
     return Normal;
 }
 
 /*!
   \enum QPEApplication::InputMethodHint
 
   \value Normal the application sometimes needs text input (the default).
   \value AlwaysOff the application never needs text input.
   \value AlwaysOn the application always needs text input.
 */
 
 /*!
   Hints to the system that widget \a w has use for text input methods
   as specified by \a mode.
 
   \sa inputMethodHint() InputMethodHint
 */
 void QPEApplication::setInputMethodHint( QWidget * w, InputMethodHint mode )
 {
     createInputMethodDict();
     if ( mode == Normal ) {
         inputMethodDict->remove
         ( w );
     }
     else {
         inputMethodDict->insert( w, ( void* ) mode );
     }
 }
 
 class HackDialog : public QDialog
 {
 public:
     void acceptIt()
     {
         accept();
     }
     void rejectIt()
     {
         reject();
     }
 };
 
 
 void QPEApplication::mapToDefaultAction( QWSKeyEvent * ke, int key )
 {
     // specialised actions for certain widgets. May want to
     // add more stuff here.
     if ( activePopupWidget() && activePopupWidget() ->inherits( "QListBox" )
             && activePopupWidget() ->parentWidget()
             && activePopupWidget() ->parentWidget() ->inherits( "QComboBox" ) )
         key = Qt::Key_Return;
 
     if ( activePopupWidget() && activePopupWidget() ->inherits( "QPopupMenu" ) )
         key = Qt::Key_Return;
 
 #ifdef QWS
 
     ke->simpleData.keycode = key;
 #endif
 }
 
 
 /*!
   \internal
 */
 
 #ifdef QWS
 bool QPEApplication::qwsEventFilter( QWSEvent * e )
 {
     if ( !d->notbusysent && e->type == QWSEvent::Focus ) {
         if ( qApp->type() != QApplication::GuiServer ) {
             QCopEnvelope e( "QPE/System", "notBusy(QString)" );
             e << d->appName;
         }
@@ -2086,203 +2095,192 @@ void QPEApplication::timerEvent( QTimerEvent *e )
 #ifdef OPIE_WITHROHFEEDBACK
           d->RoH->stop();
 #endif
     }
 }
 
 void QPEApplication::removeSenderFromStylusDict()
 {
     stylusDict->remove
     ( ( void* ) sender() );
     if ( d->presswidget == sender() )
         d->presswidget = 0;
 }
 
 /*!
   \internal
 */
 bool QPEApplication::keyboardGrabbed() const
 {
     return d->kbgrabbed;
 }
 
 
 /*!
   Reverses the effect of grabKeyboard(). This is called automatically
   on program exit.
 */
 void QPEApplication::ungrabKeyboard()
 {
     ((QPEApplication *) qApp )-> d-> kbgrabbed = false;
 }
 
 /*!
   Grabs the physical keyboard keys, e.g. the application's launching
   keys. Instead of launching applications when these keys are pressed
   the signals emitted are sent to this application instead. Some games
   programs take over the launch keys in this way to make interaction
   easier.
 
   \sa ungrabKeyboard()
 */
 void QPEApplication::grabKeyboard()
 {
     ((QPEApplication *) qApp )-> d-> kbgrabbed = true;
 }
 
 /*!
   \reimp
 */
 int QPEApplication::exec()
 {
         d->qcopQok = true;
 #ifndef QT_NO_COP
     d->sendQCopQ();
         if ( !d->keep_running )
             processEvents(); // we may have received QCop messages in the meantime.
 #endif
 
     if ( d->keep_running )
         //|| d->qpe_main_widget && d->qpe_main_widget->isVisible() )
         return QApplication::exec();
 
 #ifndef QT_NO_COP
 
     {
         QCopEnvelope e( "QPE/System", "closing(QString)" );
         e << d->appName;
     }
 #endif
     processEvents();
     return 0;
 }
 
 /*!
   \internal
   External request for application to quit.  Quits if possible without
   loosing state.
 */
 void QPEApplication::tryQuit()
 {
     if ( activeModalWidget() )
         return ; // Inside modal loop or konsole. Too hard to save state.
 #ifndef QT_NO_COP
 
     {
         QCopEnvelope e( "QPE/System", "closing(QString)" );
         e << d->appName;
     }
 #endif
     if ( d->keep_running )
     d->store_widget_rect(d->qpe_main_widget, d->appName);
     processEvents();
 
     quit();
 }
 
-/*!
-  \internal
-*/
-void QPEApplication::installTranslation( const QString& baseName ) {
-    QTranslator* trans = new QTranslator(this);
-    QString tfn = qpeDir() + "/i18n/"+baseName;
-    if ( trans->load( tfn ) )
-        installTranslator( trans );
-    else
-        delete trans;
-}
 
 /*!
   \internal
   User initiated quit.  Makes the window 'Go Away'.  If preloaded this means
   hiding the window.  If not it means quitting the application.
   As this is user initiated we don't need to check state.
 */
 void QPEApplication::hideOrQuit()
 {
     if ( d->keep_running )
     d->store_widget_rect(d->qpe_main_widget, d->appName);
     processEvents();
 
     // If we are a preloaded application we don't actually quit, so emit
     // a System message indicating we're quasi-closing.
     if ( d->preloaded && d->qpe_main_widget )
 #ifndef QT_NO_COP
 
     {
         QCopEnvelope e("QPE/System", "fastAppHiding(QString)" );
         e << d->appName;
         d->qpe_main_widget->hide();
     }
 #endif
     else
         quit();
 }
 
 #if (__GNUC__ > 2 )
 extern "C" void __cxa_pure_virtual();
 
 void __cxa_pure_virtual()
 {
     fprintf( stderr, "Pure virtual called\n");
     abort();
 
 }
 
 #endif
 
 
 #if defined(OPIE_NEW_MALLOC)
 
 // The libraries with the skiff package (and possibly others) have
 // completely useless implementations of builtin new and delete that
 // use about 50% of your CPU. Here we revert to the simple libc
 // functions.
 
 void* operator new[]( size_t size )
 {
     return malloc( size );
 }
 
 void* operator new( size_t size )
 {
     return malloc( size );
 }
 
 void operator delete[]( void* p )
 {
     free( p );
 }
 
 void operator delete[]( void* p, size_t /*size*/ )
 {
     free( p );
 }
 
 
 void operator delete( void* p )
 {
     free( p );
 }
 
 void operator delete( void* p, size_t /*size*/ )
 {
     free( p );
 }
 
 #endif
 
 #if ( QT_VERSION <= 230 ) && !defined(SINGLE_APP)
 #include <qwidgetlist.h>
 #ifdef QWS
 #include <qgfx_qws.h>
 extern QRect qt_maxWindowRect;
 void qt_setMaxWindowRect(const QRect& r )
 {
     qt_maxWindowRect = qt_screen->mapFromDevice( r,
                        qt_screen->mapToDevice( QSize( qt_screen->width(), qt_screen->height() ) ) );
     // Re-resize any maximized windows
     QWidgetList* l = QApplication::topLevelWidgets();
     if ( l ) {
         QWidget * w = l->first();
         while ( w ) {
             if ( w->isVisible() && w->isMaximized() ) {