- 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
@@ -974,197 +974,195 @@ void QPEApplication::applyStyle()
 	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;
diff --git a/library/qpeapplication.h b/library/qpeapplication.h
index 82954d0..4c37ea6 100644
--- a/library/qpeapplication.h
+++ b/library/qpeapplication.h
@@ -72,126 +72,121 @@ public:
     };
 
     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