1 files changed, 41 insertions, 35 deletions

diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index 187a7e2..8448352 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -466,100 +466,100 @@ static void setScreenSaverIntervals( int i1, int i2, int i3 )
         //qDebug("screen saver intervals: %d %d %d", i1, i2, i3);
 
         v[ 0 ] = QMAX( 1000 * i1, 100 );
         v[ 1 ] = QMAX( 1000 * i2, 100 );
         v[ 2 ] = QMAX( 1000 * i3, 100 );
         v[ 3 ] = 0;
         dim_on = ( ( i1 != 0 ) ? config.readNumEntry( "Dim", 1 ) : FALSE );
         lightoff_on = ( ( i2 != 0 ) ? config.readNumEntry( "LightOff", 1 ) : FALSE );
         if ( !i1 && !i2 && !i3 )
                 QWSServer::setScreenSaverInterval( 0 );
         else
                 QWSServer::setScreenSaverIntervals( v );
 }
 
 static void setScreenSaverInterval( int interval )
 {
         setScreenSaverIntervals( -1, -1, interval );
 }
 
 
 /*!
   \class QPEApplication qpeapplication.h
   \brief The QPEApplication class implements various system services
     that are available to all Qtopia applications.
- 
+
   Simply by using QPEApplication instead of QApplication, a plain Qt
   application becomes a Qtopia application. It automatically follows
   style changes, quits and raises, and in the
   case of \link docwidget.html document-oriented\endlink applications,
   changes the current displayed document in response to the environment.
 */
 
 /*!
   \fn void QPEApplication::clientMoused()
- 
+
   \internal
 */
 
 /*!
   \fn void QPEApplication::timeChanged();
- 
+
   This signal is emitted when the time jumps forward or backwards
   by more than the normal passage of time.
 */
 
 /*!
   \fn void QPEApplication::clockChanged( bool ampm );
- 
+
   This signal is emitted when the user changes the style
   of clock. If \a ampm is TRUE, the user wants a 12-hour
   AM/PM close, otherwise, they want a 24-hour clock.
 */
 
 /*!
   \fn void QPEApplication::appMessage( const QCString& msg, const QByteArray& data )
- 
+
   This signal is emitted when a message is received on the
   QPE/Application/<i>appname</i> QCop channel for this application.
- 
+
   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
 */
 
 /*!
   Constructs a QPEApplication just as you would construct
   a QApplication, passing \a argc, \a argv, and \a t.
 */
 QPEApplication::QPEApplication( int & argc, char **argv, Type t )
                 : QApplication( hack( argc ), argv, t )
 {
         int dw = desktop() ->width();
         if ( dw < 200 ) {
                 //  setFont( QFont( "helvetica", 8 ) );
                 AppLnk::setSmallIconSize( 10 );
                 AppLnk::setBigIconSize( 28 );
         }
 
         d = new QPEApplicationData;
         QMimeSourceFactory::setDefaultFactory( new ResourceMimeFactory );
 
         connect( this, SIGNAL( lastWindowClosed() ), this, SLOT( hideOrQuit() ) );
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
 
         QString qcopfn( "/tmp/qcop-msg-" );
@@ -622,120 +622,126 @@ QPEApplication::QPEApplication( int & argc, char **argv, Type t )
 
 #ifndef QT_NO_TRANSLATION
 
         QStringList langs = Global::languageList();
         for ( QStringList::ConstIterator it = langs.begin(); it != langs.end(); ++it ) {
                 QString lang = *it;
 
                 QTranslator * trans;
                 QString tfn;
 
                 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 + "/" + d->appName + ".qm";
                 if ( trans->load( tfn ) )
                         installTranslator( trans );
                 else
                         delete trans;
 
-                //###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 );
-                }
-                else {
-                        Config config( "qpe" );
+                /*
+                 * not required. if using one of these languages, you might as well install
+                 * a custom font.
+
+                 //###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 );
+                 }
+
+                 else {
+                */
+                    Config config( "qpe" );
                         config.setGroup( "Appearance" );
                         QString familyStr = config.readEntry( "FontFamily", "helvetica" );
                         QString styleStr = config.readEntry( "FontStyle", "Regular" );
                         QString sizeStr = config.readEntry( "FontSize", "10" );
                         QString charSetStr = config.readEntry( "FontCharSet", QString::null );
                         bool ok;
                         int i_size = sizeStr.toInt( &ok, 10 );
                         FontDatabase fdb;
                         QFont selectedFont = fdb.font( familyStr, styleStr, i_size, charSetStr );
                         setFont( selectedFont );
-                }
+                        //}
         }
 
 #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
- 
+
     \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 \a w has use for text input methods
   as specified by \a mode.
- 
+
   \sa 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();
@@ -1248,162 +1254,162 @@ void QPEApplication::pidMessage( const QCString &msg, const QByteArray & data )
                         mw = d->qpe_main_widget;
                 if ( mw )
                         Global::setDocument( mw, doc );
         }
         else if ( msg == "nextView()" ) {
                 if ( raiseAppropriateWindow() )
                         emit appMessage( msg, data );
         }
         else {
                 emit appMessage( msg, data );
         }
 #endif
 }
 
 
 static bool setWidgetCaptionFromAppName( QWidget* /*mw*/, const QString& /*appName*/, const QString& /*appsPath*/ )
 {
         /*
             // This works but disable it for now until it is safe to apply
             // What is does is scan the .desktop files of all the apps for
             // the applnk that has the corresponding argv[0] as this program
             // then it uses the name stored in the .desktop file as the caption
             // for the main widget. This saves duplicating translations for
             // the app name in the program and in the .desktop files.
-         
+
             AppLnkSet apps( appsPath );
-         
+
             QList<AppLnk> appsList = apps.children();
             for ( QListIterator<AppLnk> it(appsList); it.current(); ++it ) {
           if ( (*it)->exec() == appName ) {
               mw->setCaption( (*it)->name() );
               return TRUE;
           }
             }
-        */ 
+        */
         return FALSE;
 }
 
 
 /*!
   Sets \a mw as the mainWidget() and shows it. For small windows,
   consider passing TRUE for \a nomaximize rather than the default FALSE.
- 
+
   \sa showMainDocumentWidget()
 */
 void QPEApplication::showMainWidget( QWidget* mw, bool nomaximize )
 {
         setWidgetCaptionFromAppName( mw, d->appName, qpeDir() + "apps" );
 
         d->nomaximize = nomaximize;
         d->qpe_main_widget = mw;
         d->sendQCopQ();
         if ( d->preloaded ) {
                 if ( d->forceshow ) {
 #ifdef Q_WS_QWS
                         if ( !nomaximize )
                                 mw->showMaximized();
                         else
 #endif
 
                                 mw->show();
                 }
         }
         else if ( d->keep_running ) {
 #ifdef Q_WS_QWS
                 if ( !nomaximize )
                         mw->showMaximized();
                 else
 #endif
 
                         mw->show();
         }
 }
 
 /*!
   Sets \a mw as the mainWidget() and shows it. For small windows,
   consider passing TRUE for \a nomaximize rather than the default FALSE.
- 
+
   This calls designates the application as
   a \link docwidget.html document-oriented\endlink application.
- 
+
   The \a mw widget must have a slot: setDocument(const QString&).
- 
+
   \sa showMainWidget()
 */
 void QPEApplication::showMainDocumentWidget( QWidget* mw, bool nomaximize )
 {
         setWidgetCaptionFromAppName( mw, d->appName, qpeDir() + "apps" );
 
         if ( mw && argc() == 2 )
                 Global::setDocument( mw, QString::fromUtf8( argv() [ 1 ] ) );
         d->nomaximize = nomaximize;
         d->qpe_main_widget = mw;
         d->sendQCopQ();
         if ( d->preloaded ) {
                 if ( d->forceshow ) {
 #ifdef Q_WS_QWS
                         if ( !nomaximize )
                                 mw->showMaximized();
                         else
 #endif
 
                                 mw->show();
                 }
         }
         else if ( d->keep_running ) {
 #ifdef Q_WS_QWS
                 if ( !nomaximize )
                         mw->showMaximized();
                 else
 #endif
 
                         mw->show();
         }
 }
 
 
 /*!
   Sets that the application should continue running after processing
   qcop messages.  Normally if an application is started via a qcop message,
   the application will process the qcop message and then quit.  If while
   processing the qcop message it calls this function, then the application
   will show and start proper once it has finished processing qcop messages.
- 
+
   \sa keepRunning()
 */
 void QPEApplication::setKeepRunning()
 {
         if ( qApp && qApp->inherits( "QPEApplication" ) ) {
                 QPEApplication * qpeApp = ( QPEApplication* ) qApp;
                 qpeApp->d->keep_running = TRUE;
         }
 }
 
 /*!
   Returns whether the application will quit after processing the current
-  list of qcop messages.  
- 
+  list of qcop messages.
+
   \sa setKeepRunning()
 */
 bool QPEApplication::keepRunning() const
 {
         return d->keep_running;
 }
 
 /*!
   \internal
 */
 void QPEApplication::internalSetStyle( const QString &style )
 {
 #if QT_VERSION >= 300
         if ( style == "QPE" ) {
                 setStyle( new QPEStyle );
         }
         else {
                 QStyle *s = QStyleFactory::create( style );
                 if ( s )
                         setStyle( s );
         }
 #else
         if ( style == "Windows" ) {
                 setStyle( new QWindowsStyle );
@@ -1443,49 +1449,49 @@ void QPEApplication::internalSetStyle( const QString &style )
 
                 if ( lib-> queryInterface ( IID_Style, ( QUnknownInterface ** ) &iface ) == QS_OK )
                         sty = iface-> create ( );
 
                 if ( sty ) {
                         setStyle ( sty );
 
                         qDebug ( "Got Style: %p -- iface: %p, lib: %p\n", sty, iface, lib );
 
                         if ( lastiface )
                                 lastiface-> release ( );
                         lastiface = iface;
 
 
                         if ( lastlib ) {
                                 lastlib-> unload ( );
                                 delete lastlib;
                         }
                         lastlib = lib;
                 }
                 else {
                         if ( iface )
                                 iface-> release ( );
                         delete lib;
-                        
+
                         setStyle ( new QPEStyle ( ));
                 }
 
 #if 0
                 // style == "Liquid Style (libliquid.so)" (or "Windows XP (libxp.so)"
 
                 int p2 = style. findRev ( ']' );
                 int p1 = style. findRev ( '[' );
                 QString style2;
 
                 if ( ( p1 > 0 ) && ( p2 > 0 ) && ( ( p1 + 1 ) < p2 ) )
                         style2 = "lib" + style. mid ( p1 + 1, p2 - p1 - 1 ). lower ( ) + ".so";
                 else
                         style2 = "lib" + style. lower ( ) + ".so";
 
                 static QLibrary *currentlib = 0;
 
                 QString path = QPEApplication::qpeDir ( ) + "/plugins/styles/" + style2;
 
                 do { // try/catch simulation
                         QLibrary *lib = new QLibrary ( path, QLibrary::Immediately );
 
                         if ( lib ) {
                                 QStyle * ( *fpa ) ( ) = ( QStyle * ( * ) ( ) ) lib-> resolve ( "allocate" );
@@ -1543,72 +1549,72 @@ void QPEApplication::prepareForTermination( bool willrestart )
   \internal
 */
 void QPEApplication::shutdown()
 {
         // Implement in server's QPEApplication subclass
 }
 
 /*!
   \internal
 */
 void QPEApplication::restart()
 {
         // Implement in server's QPEApplication subclass
 }
 
 static QPtrDict<void>* stylusDict = 0;
 static void createDict()
 {
         if ( !stylusDict )
                 stylusDict = new QPtrDict<void>;
 }
 
 /*!
   Returns the current StylusMode for \a w.
- 
+
   \sa setStylusOperation()
 */
 QPEApplication::StylusMode QPEApplication::stylusOperation( QWidget * w )
 {
         if ( stylusDict )
                 return ( StylusMode ) ( int ) stylusDict->find( w );
         return LeftOnly;
 }
 
 /*!
     \enum QPEApplication::StylusMode
- 
+
     \value LeftOnly the stylus only generates LeftButton
       events (the default).
     \value RightOnHold the stylus generates RightButton events
       if the user uses the press-and-hold gesture.
- 
+
     See setStylusOperation().
 */
 
 /*!
   Causes \a w to receive mouse events according to \a mode.
- 
+
   \sa stylusOperation()
 */
 void QPEApplication::setStylusOperation( QWidget * w, StylusMode mode )
 {
         createDict();
         if ( mode == LeftOnly ) {
                 stylusDict->remove
                 ( w );
                 w->removeEventFilter( qApp );
         }
         else {
                 stylusDict->insert( w, ( void* ) mode );
                 connect( w, SIGNAL( destroyed() ), qApp, SLOT( removeSenderFromStylusDict() ) );
                 w->installEventFilter( qApp );
         }
 }
 
 
 /*!
   \reimp
 */
 bool QPEApplication::eventFilter( QObject *o, QEvent *e )
 {
         if ( stylusDict && e->type() >= QEvent::MouseButtonPress && e->type() <= QEvent::MouseMove ) {
@@ -1699,49 +1705,49 @@ bool QPEApplication::keyboardGrabbed() const
 {
         return d->kbgrabber;
 }
 
 
 /*!
   Reverses the effect of grabKeyboard(). This is called automatically
   on program exit.
 */
 void QPEApplication::ungrabKeyboard()
 {
         QPEApplicationData * d = ( ( QPEApplication* ) qApp ) ->d;
         if ( d->kbgrabber == 2 ) {
                 QCopEnvelope e( "QPE/System", "grabKeyboard(QString)" );
                 e << QString::null;
                 d->kbregrab = FALSE;
                 d->kbgrabber = 0;
         }
 }
 
 /*!
   Grabs the keyboard such that the system's application launching
   keys no longer work, and instead they are receivable by this
   application.
- 
+
   \sa ungrabKeyboard()
 */
 void QPEApplication::grabKeyboard()
 {
         QPEApplicationData * d = ( ( QPEApplication* ) qApp ) ->d;
         if ( qApp->type() == QApplication::GuiServer )
                 d->kbgrabber = 0;
         else {
                 QCopEnvelope e( "QPE/System", "grabKeyboard(QString)" );
                 e << d->appName;
                 d->kbgrabber = 2; // me
         }
 }
 
 /*!
   \reimp
 */
 int QPEApplication::exec()
 {
         d->sendQCopQ();
         if ( d->keep_running )
                 //|| d->qpe_main_widget && d->qpe_main_widget->isVisible() )
                 return QApplication::exec();