- Kommando zurueck :)

2 files changed, 3 insertions, 10 deletions

diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index f5bf0c5..7463074 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -878,389 +878,387 @@ QPEApplication::~QPEApplication()
 	// be gone by the time we get to ~QObject().
 	delete sysChannel;
 	delete pidChannel;
 #endif
 
 	delete d;
 }
 
 /*!
   Returns <tt>$OPIEDIR/</tt>.
 */
 QString QPEApplication::qpeDir()
 {
 	const char * base = getenv( "OPIEDIR" );
 	if ( base )
 		return QString( base ) + "/";
 
 	return QString( "../" );
 }
 
 /*!
   Returns the user's current Document directory. There is a trailing "/".
   .. well, it does now,, and there's no trailing '/'
 */
 QString QPEApplication::documentDir()
 {
 	const char* base = getenv( "HOME");
 	if ( base )
 		return QString( base ) + "/Documents";
 
 	return QString( "../Documents" );
 }
 
 static int deforient = -1;
 
 /*!
   \internal
 */
 int QPEApplication::defaultRotation()
 {
 	if ( deforient < 0 ) {
 		QString d = getenv( "QWS_DISPLAY" );
 		if ( d.contains( "Rot90" ) ) {
 			deforient = 90;
 		}
 		else if ( d.contains( "Rot180" ) ) {
 			deforient = 180;
 		}
 		else if ( d.contains( "Rot270" ) ) {
 			deforient = 270;
 		}
 		else {
 			deforient = 0;
 		}
 	}
 	return deforient;
 }
 
 /*!
   \internal
 */
 void QPEApplication::setDefaultRotation( int r )
 {
 	if ( qApp->type() == GuiServer ) {
 		deforient = r;
 		setenv( "QWS_DISPLAY", QString( "Transformed:Rot%1:0" ).arg( r ).latin1(), 1 );
 		Config config("qpe");
 		config.setGroup( "Rotation" );
 		config.writeEntry( "Screen", getenv("QWS_DISPLAY") );
 	}
 	else {
 #ifndef QT_NO_COP
 		{ QCopEnvelope e( "QPE/System", "setDefaultRotation(int)" );
 			e << r;
 		}
 #endif
 
 	}
 }
 
 
 /*!
   \internal
 */
 void QPEApplication::applyStyle()
 {
 	Config config( "qpe" );
 	config.setGroup( "Appearance" );
 
 	// don't block ourselves ...
 	Opie::force_appearance = 0;
 
 	static QString appname = Opie::binaryName ( );
 
 	QStringList ex = config. readListEntry ( "NoStyle", ';' );
 	int nostyle = 0;
 	for ( QStringList::Iterator it = ex. begin ( ); it != ex. end ( ); ++it ) {
 		if ( QRegExp (( *it ). mid ( 1 ), false, true ). find ( appname, 0 ) >= 0 ) {
 			nostyle = ( *it ). left ( 1 ). toInt ( 0, 32 );
 			break;
 		}
 	}
 
 	// Widget style
 	QString style = config.readEntry( "Style", "Light" );
 
 	// don't set a custom style
 	if ( nostyle & Opie::Force_Style )
 		style = "Light";
 
 	internalSetStyle ( style );
 
 	// Colors
 	QColor bgcolor( config.readEntry( "Background", "#E5E1D5" ) );
 	QColor btncolor( config.readEntry( "Button", "#D6CDBB" ) );
 	QPalette pal( btncolor, bgcolor );
 	QString color = config.readEntry( "Highlight", "#800000" );
 	pal.setColor( QColorGroup::Highlight, QColor( color ) );
 	color = config.readEntry( "HighlightedText", "#FFFFFF" );
 	pal.setColor( QColorGroup::HighlightedText, QColor( color ) );
 	color = config.readEntry( "Text", "#000000" );
 	pal.setColor( QColorGroup::Text, QColor( color ) );
 	color = config.readEntry( "ButtonText", "#000000" );
 	pal.setColor( QPalette::Active, QColorGroup::ButtonText, QColor( color ) );
 	color = config.readEntry( "Base", "#FFFFFF" );
 	pal.setColor( QColorGroup::Base, QColor( color ) );
 
 	pal.setColor( QPalette::Disabled, QColorGroup::Text,
 	              pal.color( QPalette::Active, QColorGroup::Background ).dark() );
 
 	setPalette( pal, TRUE );
 
 	// Window Decoration
 	QString dec = config.readEntry( "Decoration", "Qtopia" );
 
 	// don't set a custom deco
 	if ( nostyle & Opie::Force_Decoration )
 		dec = "";
 
 	//qDebug ( "Setting Deco: %s -- old %s (%d)", dec.latin1(), d-> decorationName.latin1(), nostyle);
 
 	if ( dec != d->decorationName ) {
 		qwsSetDecoration( new QPEDecoration( dec ) );
 		d->decorationName = dec;
 	}
 
 	// Font
 	QString ff = config.readEntry( "FontFamily", font().family() );
 	int fs = config.readNumEntry( "FontSize", font().pointSize() );
 
 	// don't set a custom font
 	if ( nostyle & Opie::Force_Font ) {
 		ff = "Helvetica";
 		fs = 10;
 	}
 
 	setFont ( QFont ( ff, fs ), true );
 
 	// revert to global blocking policy ...
 	Opie::force_appearance = config. readBoolEntry ( "ForceStyle", false ) ? Opie::Force_All : Opie::Force_None;
 	Opie::force_appearance &= ~nostyle;
 }
 
 void QPEApplication::systemMessage( const QCString& msg, const QByteArray& data )
 {
 #ifdef Q_WS_QWS
 	QDataStream stream( data, IO_ReadOnly );
 	if ( msg == "applyStyle()" ) {
 		applyStyle();
 	}
 	else if ( msg == "toggleApplicationMenu()" ) {
 		QWidget *active = activeWindow ( );
 	
 		if ( active ) {
 			QPEMenuToolFocusManager *man = QPEMenuToolFocusManager::manager ( );			
 			bool oldactive = man-> isActive ( );
 
 			man-> setActive( !man-> isActive() );
 
 			if ( !oldactive && !man-> isActive ( )) { // no menubar to toggle -> try O-Menu
 				QCopEnvelope e ( "QPE/TaskBar", "toggleStartMenu()" );
 			}
 		}
 	}
 	else if ( msg == "setDefaultRotation(int)" ) {
 		if ( type() == GuiServer ) {
 			int r;
 			stream >> r;
 			setDefaultRotation( r );
 		}
 	}
 	else if ( msg == "setCurrentRotation(int)" ) {
-	    	if ( type() == GuiServer ) {
-			int r;
-			stream >> r;
-			setCurrentRotation( r );
-		}
+		int r;
+		stream >> r;
+		setCurrentRotation( r );
  	}
 	else if ( msg == "shutdown()" ) {
 		if ( type() == GuiServer )
 			shutdown();
 	}
 	else if ( msg == "quit()" ) {
 		if ( type() != GuiServer )
 			tryQuit();
 	}
 	else if ( msg == "forceQuit()" ) {
 		if ( type() != GuiServer )
 			quit();
 	}
 	else if ( msg == "restart()" ) {
 		if ( type() == GuiServer )
 			restart();
 	}
 	else if ( msg == "language(QString)" ) {
 		if ( type() == GuiServer ) {
 			QString l;
 			stream >> l;
 			QString cl = getenv( "LANG" );
 			if ( cl != l ) {
 				if ( l.isNull() )
 					unsetenv( "LANG" );
 				else
 					setenv( "LANG", l.latin1(), 1 );
 				restart();
 			}
 		}
 	}
 	else if ( msg == "timeChange(QString)" ) {
 		QString t;
 		stream >> t;
 		if ( t.isNull() )
 			unsetenv( "TZ" );
 		else
 			setenv( "TZ", t.latin1(), 1 );
 		// emit the signal so everyone else knows...
 		emit timeChanged();
 	}
 	else if ( msg == "execute(QString)" ) {
 		if ( type() == GuiServer ) {
 			QString t;
 			stream >> t;
 			Global::execute( t );
 		}
 	}
 	else if ( msg == "execute(QString,QString)" ) {
 		if ( type() == GuiServer ) {
 			QString t, d;
 			stream >> t >> d;
 			Global::execute( t, d );
 		}
 	}
 	else if ( msg == "addAlarm(QDateTime,QCString,QCString,int)" ) {
 		if ( type() == GuiServer ) {
 			QDateTime when;
 			QCString channel, message;
 			int data;
 			stream >> when >> channel >> message >> data;
 			AlarmServer::addAlarm( when, channel, message, data );
 		}
 	}
 	else if ( msg == "deleteAlarm(QDateTime,QCString,QCString,int)" ) {
 		if ( type() == GuiServer ) {
 			QDateTime when;
 			QCString channel, message;
 			int data;
 			stream >> when >> channel >> message >> data;
 			AlarmServer::deleteAlarm( when, channel, message, data );
 		}
 	}
 	else if ( msg == "clockChange(bool)" ) {
 		int tmp;
 		stream >> tmp;
 		emit clockChanged( tmp );
 	}
 	else if ( msg == "weekChange(bool)" ) {
 		int tmp;
 		stream >> tmp;
 		emit weekChanged( tmp );
 	}
 	else if ( msg == "setDateFormat(DateFormat)" ) {
 		DateFormat tmp;
 		stream >> tmp;
 		emit dateFormatChanged( tmp );
 	}
 	else if ( msg == "setVolume(int,int)" ) {
 		int t, v;
 		stream >> t >> v;
 		setVolume( t, v );
 		emit volumeChanged( muted );
 	}
 	else if ( msg == "volumeChange(bool)" ) {
 		stream >> muted;
 		setVolume();
 		emit volumeChanged( muted );
 	}
 	else if ( msg == "setMic(int,int)" ) { // Added: 2002-02-08 by Jeremy Cowgar <jc@cowgar.com>
 		int t, v;
 		stream >> t >> v;
 		setMic( t, v );
 		emit micChanged( micMuted );
 	}
 	else if ( msg == "micChange(bool)" ) { // Added: 2002-02-08 by Jeremy Cowgar <jc@cowgar.com>
 		stream >> micMuted;
 		setMic();
 		emit micChanged( micMuted );
 	}
 	else if ( msg == "setBass(int,int)" ) { // Added: 2002-12-13 by Maximilian Reiss <harlekin@handhelds.org>
 		int t, v;
 		stream >> t >> v;
 		setBass( t, v );
 	}
 	else if ( msg == "bassChange(bool)" ) { // Added: 2002-12-13 by Maximilian Reiss <harlekin@handhelds.org>
 	        setBass();
 	}
     	else if ( msg == "setTreble(int,int)" ) { // Added: 2002-12-13 by Maximilian Reiss <harlekin@handhelds.org>
 		int t, v;
 		stream >> t >> v;
 		setTreble( t, v );
 	}
 	else if ( msg == "trebleChange(bool)" ) { // Added: 2002-12-13 by Maximilian Reiss <harlekin@handhelds.org>
 	        setTreble();
 	}
 
 
 
 #endif
 }
 
 /*!
   \internal
 */
 bool QPEApplication::raiseAppropriateWindow()
 {
 	bool r = FALSE;
 	// ########## raise()ing main window should raise and set active
 	// ########## it and then all childen. This belongs in Qt/Embedded
 	QWidget *top = d->qpe_main_widget;
 	if ( !top )
 		top = mainWidget();
 	if ( top && d->keep_running ) {
 		if ( top->isVisible() )
 			r = TRUE;
 		else if (d->preloaded) {
 			// We are preloaded and not visible.. pretend we just started..
 			QCopEnvelope e("QPE/System", "fastAppShowing(QString)");
 			e << d->appName;
 		}
 
 		d->show_mx(top, d->nomaximize);
 		top->raise();
 		top->setActiveWindow();
 	}
 	QWidget *topm = activeModalWidget();
 	if ( topm && topm != top ) {
 		topm->show();
 		topm->raise();
 		topm->setActiveWindow();
 		// If we haven't already handled the fastAppShowing message
 		if (!top && d->preloaded) {
 			QCopEnvelope e("QPE/System", "fastAppShowing(QString)");
 			e << d->appName;
 		}
 		r = FALSE;
 	}
 	return r;
 }
 
 void QPEApplication::pidMessage( const QCString& msg, const QByteArray& data)
 {
 #ifdef Q_WS_QWS
 
 	if ( msg == "quit()" ) {
 		tryQuit();
 	}
 	else if ( msg == "quitIfInvisible()" ) {
 		if ( d->qpe_main_widget && !d->qpe_main_widget->isVisible() )
 			quit();
 	}
 	else if ( msg == "close()" ) {
 		hideOrQuit();
 	}
 	else if ( msg == "disablePreload()" ) {
 		d->preloaded = FALSE;
 		d->keep_running = TRUE;
 		/* so that quit will quit */
 	}
 	else if ( msg == "enablePreload()" ) {
 		if (d->qpe_main_widget)
diff --git a/library/qpeapplication.h b/library/qpeapplication.h
index 82954d0..4c37ea6 100644
--- a/library/qpeapplication.h
+++ b/library/qpeapplication.h
@@ -1,197 +1,192 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the 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.
 **
 **********************************************************************/
 #ifndef __QPE_APPLICATION_H__
 #define __QPE_APPLICATION_H__
 
 
 #include <qglobal.h>
 #include <qapplication.h>
 #include <qdialog.h>
 #include <qwsdisplay_qws.h>
 #if defined(_WS_QWS_) && !defined(Q_WS_QWS)
 #define Q_WS_QWS
 #endif
 #include "qpedecoration_qws.h"
 #include "timestring.h"
 
 #if ( defined Q_WS_QWS || defined( _WS_QWS_ ) ) && !defined( QT_NO_COP )
 #include <qpe/qcopenvelope_qws.h>
 #endif
 
 class QCopChannel;
 class QPEApplicationData;
 class QWSEvent;
 class QWSKeyEvent;
 
 
 class QPEApplication : public QApplication
 {
     Q_OBJECT
 public:
     QPEApplication( int& argc, char **argv, Type=GuiClient );
     ~QPEApplication();
 
     static QString qpeDir();
     static QString documentDir();
     void applyStyle();
     static int defaultRotation();
     static void setDefaultRotation(int r);
     static void setCurrentRotation(int r);
     static void grabKeyboard();
     static void ungrabKeyboard();
 
     enum StylusMode {
         LeftOnly,
         RightOnHold
         // RightOnHoldLeftDelayed, etc.
     };
     static void setStylusOperation( QWidget*, StylusMode );
     static StylusMode stylusOperation( QWidget* );
 
     enum InputMethodHint {
         Normal,
         AlwaysOff,
         AlwaysOn
     };
 
     enum screenSaverHint {
         Disable = 0,
         DisableLightOff = 1,
         DisableSuspend = 2,
         Enable = 100
     };
 
     static void setInputMethodHint( QWidget *, InputMethodHint );
     static InputMethodHint inputMethodHint( QWidget * );
 
     void showMainWidget( QWidget*, bool nomax=FALSE );
     void showMainDocumentWidget( QWidget*, bool nomax=FALSE );
     static void showDialog( QDialog*, bool nomax=FALSE );
     static int execDialog( QDialog*, bool nomax=FALSE );
 
     static void setKeepRunning();
     bool keepRunning() const;
 
     bool keyboardGrabbed() const;
 
     int exec();
 
 signals:
     void clientMoused();
     void timeChanged();
     void clockChanged( bool pm );
     void micChanged( bool muted );
     void volumeChanged( bool muted );
     void appMessage( const QCString& msg, const QByteArray& data);
     void weekChanged( bool startOnMonday );
     void dateFormatChanged( DateFormat );
     void flush();
     void reload();
 
 private slots:
     void systemMessage( const QCString &msg, const QByteArray &data );
     void pidMessage( const QCString &msg, const QByteArray &data );
     void removeSenderFromStylusDict();
     void hideOrQuit();
 
 protected:
     bool qwsEventFilter( QWSEvent * );
     void internalSetStyle( const QString &style );
     void prepareForTermination(bool willrestart);
     virtual void restart();
     virtual void shutdown();
     bool eventFilter( QObject *, QEvent * );
     void timerEvent( QTimerEvent * );
     bool raiseAppropriateWindow();
     virtual void tryQuit();
 
     virtual void polish ( QWidget * ); // this is actually implemented in qt_override.cpp (!)
 
 private:
     void mapToDefaultAction( QWSKeyEvent *ke, int defKey );
 
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
     QCopChannel *sysChannel;
     QCopChannel *pidChannel;
 #endif
     QPEApplicationData *d;
 
     bool reserved_sh;
 
 
 
 };
 
 inline void QPEApplication::showDialog( QDialog* d, bool nomax )
 {
     QSize sh = d->sizeHint();
     int w = QMAX(sh.width(),d->width());
     int h = QMAX(sh.height(),d->height());
     if ( !nomax
             && ( w > qApp->desktop()->width()*3/4
                  || h > qApp->desktop()->height()*3/4 ) )
     {
         d->showMaximized();
     } else {
         d->resize(w,h);
         d->show();
     }
 }
 
 inline int QPEApplication::execDialog( QDialog* d, bool nomax )
 {
     showDialog(d,nomax);
     return d->exec();
 }
 
 enum Transformation { Rot0, Rot90, Rot180, Rot270 }; /* from qgfxtransformed_qws.cpp */
 
 inline void QPEApplication::setCurrentRotation( int r )
 {
-    if ( qApp->type() != GuiServer ) {
-        QCopEnvelope e( "QPE/System", "setCurrentRotation(int)" );
-        e << r;
-        return;
-    }
     Transformation e;
 
     switch (r) {
         case 0:
             e = Rot0;
             break;
         case 90:
             e = Rot90;
             break;
         case 180:
             e = Rot180;
             break;
         case 270:
             e = Rot270;
             break;
 	default:
 	    return;
     }
 
     qDebug("calling qApp->desktop()->qwsDisplay()->setTransformation( %d )\n", e);
     qApp->desktop()->qwsDisplay()->setTransformation( e );
 }
 
 
 #endif