| -rw-r--r-- | library/library.pro | 6 | ||||
| -rw-r--r-- | library/qpeapplication.cpp | 40 | ||||
| -rw-r--r-- | library/qpeapplication.h | 5 | ||||
| -rw-r--r-- | library/qt_override.cpp | 170 | ||||
| -rw-r--r-- | library/qt_override_p.h | 25 |
5 files changed, 0 insertions, 246 deletions
diff --git a/library/library.pro b/library/library.pro index 04e125f..95c18a2 100644 --- a/library/library.pro +++ b/library/library.pro @@ -14,132 +14,126 @@ HEADERS = calendar.h \ qdawg.h \ datebookmonth.h \ fileselector.h \ fileselector_p.h \ imageedit.h \ qcopenvelope_qws.h \ qpedecoration_qws.h \ qpeapplication.h \ qpestyle.h \ qpedialog.h \ lightstyle.h \ config.h \ applnk.h \ sound.h \ tzselect.h \ qmath.h \ datebookdb.h \ alarmserver.h \ process.h \ password.h \ timestring.h \ fontfactoryinterface.h \ fontdatabase.h \ power.h \ storage.h \ qpemessagebox.h \ timeconversion.h \ qpedebug.h \ qpemenubar.h \ qpetoolbar.h \ backend/categories.h \ stringutil.h \ backend/palmtoprecord.h \ backend/task.h \ backend/event.h \ backend/contact.h\ categorymenu.h \ categoryedit_p.h \ categoryselect.h \ categorywidget.h \ ir.h \ backend/vobject_p.h \ findwidget_p.h \ finddialog.h \ lnkproperties.h \ windowdecorationinterface.h \ textcodecinterface.h \ imagecodecinterface.h \ - qt_override_p.h \ qpeglobal.h SOURCES = calendar.cpp \ global.cpp \ xmlreader.cpp \ mimetype.cpp \ menubutton.cpp \ network.cpp \ networkinterface.cpp \ filemanager.cpp \ fontmanager.cpp \ qdawg.cpp \ datebookmonth.cpp \ fileselector.cpp \ imageedit.cpp \ resource.cpp \ qpedecoration_qws.cpp \ qcopenvelope_qws.cpp \ qpeapplication.cpp \ qpestyle.cpp \ qpedialog.cpp \ lightstyle.cpp \ config.cpp \ applnk.cpp \ sound.cpp \ tzselect.cpp \ qmath.c \ datebookdb.cpp \ alarmserver.cpp \ password.cpp \ process.cpp \ process_unix.cpp \ timestring.cpp \ fontdatabase.cpp \ power.cpp \ storage.cpp \ qpemessagebox.cpp \ backend/timeconversion.cpp \ qpedebug.cpp \ qpemenubar.cpp \ qpetoolbar.cpp \ backend/categories.cpp \ backend/stringutil.cpp \ backend/palmtoprecord.cpp \ backend/task.cpp \ backend/event.cpp \ backend/contact.cpp \ categorymenu.cpp \ categoryedit_p.cpp \ categoryselect.cpp \ categorywidget.cpp \ ir.cpp \ backend/vcc_yacc.cpp \ backend/vobject.cpp \ findwidget_p.cpp \ finddialog.cpp \ lnkproperties.cpp \ - qt_override.cpp \ widget_showing.cpp # Qt 3 compatibility HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp INCLUDEPATH += $(OPIEDIR)/include backend LIBS += -ldl -lcrypt -lm INTERFACES = passwordbase_p.ui categoryeditbase_p.ui findwidgetbase_p.ui lnkpropertiesbase_p.ui TARGET = qpe DESTDIR = $(OPIEDIR)/lib$(PROJMAK) VERSION = 1.5.0.1 include( $(OPIEDIR)/include.pro ) -contains( CONFIG, no-override ){ - DEFINES += OPIE_NO_OVERRIDE_QT -} - contains( CONFIG, LIBQPE_WITHROHFEEDBACK ){ DEFINES += OPIE_WITHROHFEEDBACK SOURCES += backend/rohfeedback.cpp HEADERS += backend/rohfeedback.h } diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index 1c5ced3..2bd7cbe 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp @@ -51,97 +51,96 @@ #include <qevent.h> #include <qtooltip.h> #include <qsignal.h> #include <qmainwindow.h> #include <qwidgetlist.h> #include <qpixmapcache.h> #if defined(Q_WS_QWS) && !defined(QT_NO_COP) #define QTOPIA_INTERNAL_INITAPP #include "qpeapplication.h" #include "qpestyle.h" #include "styleinterface.h" #if QT_VERSION >= 0x030000 #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; @@ -1307,178 +1306,139 @@ extern void qws_clearLoadedFonts(); #endif void QPEApplication::setCurrentMode( int x, int y, int depth ) { // Reset the caches #if QT_VERSION > 236 qws_clearLoadedFonts(); #endif QPixmapCache::clear(); // Change the screen mode qt_screen->setMode(x, y, depth); if ( qApp->type() == GuiServer ) { #if QT_VERSION > 236 // Reconfigure the GuiServer qwsServer->beginDisplayReconfigure(); qwsServer->endDisplayReconfigure(); #endif // Get all the running apps to reset QCopEnvelope env( "QPE/System", "reset()" ); } } void QPEApplication::reset() { // Reconnect to the screen qt_screen->disconnect(); qt_screen->connect( QString::null ); // Redraw everything applyStyle(); } #if (QT_VERSION < 238) && defined Q_OS_MACX bool qt_left_hand_scrollbars = false; #else extern bool qt_left_hand_scrollbars QPE_WEAK_SYMBOL; #endif /*! \internal */ void QPEApplication::applyStyle() { Config config( "qpe" ); config.setGroup( "Appearance" ); #if QT_VERSION > 233 -#if !defined(OPIE_NO_OVERRIDE_QT) - // 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; - } - } -#else - int nostyle = 0; -#endif - // Widget style QString style = config.readEntry( "Style", "FlatStyle" ); - // don't set a custom style - if ( nostyle & Opie::Force_Style ) - style = "FlatStyle"; - internalSetStyle ( style ); // Colors - from /etc/colors/Liquid.scheme QColor bgcolor( config.readEntry( "Background", "#E0E0E0" ) ); QColor btncolor( config.readEntry( "Button", "#96c8fa" ) ); QPalette pal( btncolor, bgcolor ); QString color = config.readEntry( "Highlight", "#73adef" ); 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 ); // Set the ScrollBar on the 'right' side but only if the weak symbol is present if (&qt_left_hand_scrollbars ) qt_left_hand_scrollbars = config.readBoolEntry( "LeftHand", false ); // Window Decoration QString dec = config.readEntry( "Decoration", "Flat" ); - // don't set a custom deco - if ( nostyle & Opie::Force_Decoration ) - dec = ""; - - 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 = "Vera"; - fs = 10; - } - setFont ( QFont ( ff, fs ), true ); - -#if !defined(OPIE_NO_OVERRIDE_QT) - // revert to global blocking policy ... - Opie::force_appearance = config. readBoolEntry ( "ForceStyle", false ) ? Opie::Force_All : Opie::Force_None; - Opie::force_appearance &= ~nostyle; -#endif #endif } 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 == "setCurrentMode(int,int,int)" ) { // Added: 2003-06-11 by Tim Ansell <mithro@mithis.net> if ( type() == GuiServer ) { int x, y, depth; stream >> x; stream >> y; stream >> depth; setCurrentMode( x, y, depth ); } } else if ( msg == "reset()" ) { if ( type() != GuiServer ) reset(); } else if ( msg == "setCurrentRotation(int)" ) { int r; stream >> r; setCurrentRotation( r ); diff --git a/library/qpeapplication.h b/library/qpeapplication.h index 849d5b3..167fe69 100644 --- a/library/qpeapplication.h +++ b/library/qpeapplication.h @@ -121,101 +121,96 @@ public: void showMainWidget( QWidget*, bool nomax=FALSE ); void showMainDocumentWidget( QWidget*, bool nomax=FALSE ); static void showDialog( QDialog*, bool nomax=FALSE ) QPE_WEAK_SYMBOL; static int execDialog ( QDialog*, bool nomax=FALSE ) QPE_WEAK_SYMBOL; static void showWidget( QWidget*, bool nomax=FALSE ) QPE_WEAK_SYMBOL; /* Merge setTempScreenSaverMode */ #ifdef QTOPIA_INTERNAL_INITAPP void initApp( int argv, char **argv ); #endif 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(); /* linkChanged signal */ 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(); -#ifndef OPIE_NO_ERASE_RECT_HACKFIX - #if QT_VERSION > 233 - virtual void polish ( QWidget * ); // this is actually implemented in qt_override.cpp (!) - #endif -#endif private: void mapToDefaultAction( QWSKeyEvent *ke, int defKey ); void processQCopFile(); #if defined(Q_WS_QWS) && !defined(QT_NO_COP) QCopChannel *sysChannel; QCopChannel *pidChannel; #endif QPEApplicationData *d; bool reserved_sh; }; enum Transformation { Rot0, Rot90, Rot180, Rot270 }; /* from qgfxtransformed_qws.cpp */ inline int TransToDeg ( Transformation t ) { int d = static_cast<int>( t ); return d * 90; } inline Transformation DegToTrans ( int d ) { Transformation t = static_cast<Transformation>( d / 90 ); return t; } /* * Set current rotation of Opie, and rotation for newly started apps. * Differs from setDefaultRotation in that 1) it rotates currently running apps, * and 2) does not set deforient or save orientation to qpe.conf. */ inline void QPEApplication::setCurrentRotation( int r ) { // setTransformation has been introduced in Qt/Embedded 2.3.4 snapshots // for compatibility with the SharpROM use fallback to setDefaultTransformation() #if QT_VERSION > 233 Transformation e = DegToTrans( r ); ::setenv( "QWS_DISPLAY", QString( "Transformed:Rot%1:0" ).arg( r ).latin1(), 1 ); qApp->desktop()->qwsDisplay()->setTransformation( e ); #else setDefaultRotation( r ); #endif } diff --git a/library/qt_override.cpp b/library/qt_override.cpp deleted file mode 100644 index a0d753b..0000000 --- a/library/qt_override.cpp +++ b/dev/null @@ -1,170 +0,0 @@ - -#include <qpe/qpeapplication.h> -#include <qfontdatabase.h> - -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <limits.h> -#include <sys/param.h> // for toolchains with old libc headers - -#include <qtopia/qpeglobal.h> -#include "qt_override_p.h" - -#if QT_VERSION > 233 - -#ifndef OPIE_NO_ERASE_RECT_HACKFIX -struct color_fix_t { - char *m_app; - char *m_class; - char *m_name; - QColorGroup::ColorRole m_set; - QColorGroup::ColorRole m_get; -}; - - - -static const color_fix_t apps_that_need_special_colors [] = { - { "HancomMobileWord", "HTextEdit", 0, QColorGroup::Background, QColorGroup::Base }, - { "neocal", "Display", 0, QColorGroup::Background, QColorGroup::Base }, - - { 0, 0, 0, QColorGroup::Base, QColorGroup::Base } -}; - -#endif - -#ifndef OPIE_NO_OVERRIDE_QT - -static const char * const apps_that_need_pointsizes_times_10 [] = { - "HancomMobileWord", - "hancomsheet", - "HancomPresenterViewer", - - 0 -}; - - - - -int Opie::force_appearance = 0; - - -// Return the *real* name of the binary - not just a quick guess -// by looking at argv [0] (which could be anything) - -static void binaryNameFree ( ) -{ - ::free ((void *) Opie::binaryName ( )); // we need to cast away the const here -} - -const char *Opie::binaryName ( ) -{ - static const char *appname = 0; - - if ( !appname ) { - char dst [PATH_MAX + 1]; - int l = ::readlink ( "/proc/self/exe", dst, PATH_MAX ); - - if ( l <= 0 ) - l = 0; - - dst [l] = 0; - const char *b = ::strrchr ( dst, '/' ); - appname = ::strdup ( b ? b + 1 : dst ); - - ::atexit ( binaryNameFree ); - } - return appname; -} - -#else -int Opie::force_appearance = 0; -#endif - -// Fix for a toolchain incompatibility (binaries compiled with -// old tcs using shared libs compiled with newer tcs) - -extern "C" { - -extern void __gmon_start__ ( ) QPE_WEAK_SYMBOL; -extern void __gmon_start__ ( ) -{ -} - -} - - -#ifndef OPIE_NO_ERASE_RECT_HACKFIX -// Fix for apps, that use QPainter::eraseRect() which doesn't work with styles -// that set a background pixmap (it would be easier to fix eraseRect(), but -// TT made it an inline ...) - -void QPEApplication::polish ( QWidget *w ) -{ -#ifndef OPIE_NO_OVERRIDE_QT - for ( const color_fix_t *ptr = apps_that_need_special_colors; ptr-> m_app; ptr++ ) { - if (( ::strcmp ( Opie::binaryName ( ), ptr-> m_app ) == 0 ) && - ( ptr-> m_class ? w-> inherits ( ptr-> m_class ) : true ) && - ( ptr-> m_name ? ( ::strcmp ( w-> name ( ), ptr-> m_name ) == 0 ) : true )) { - QPalette pal = w-> palette ( ); - pal. setColor ( ptr-> m_set, pal. color ( QPalette::Active, ptr-> m_get )); - w-> setPalette ( pal ); - } - } -#endif - QApplication::polish ( w ); -} -#endif - - -#ifndef OPIE_NO_OVERRIDE_QT -// Fix for the binary incompatibility that TT introduced in Qt/E 2.3.4 -- point sizes -// were multiplied by 10 (which was incorrect) - -QValueList <int> QFontDatabase::pointSizes ( QString const &family, QString const &style, QString const &charset ) -{ - QValueList <int> sl = pointSizes_NonWeak ( family, style, charset ); - - for ( const char * const *ptr = apps_that_need_pointsizes_times_10; *ptr; ptr++ ) { - if ( ::strcmp ( Opie::binaryName ( ), *ptr ) == 0 ) { - for ( QValueList <int>::Iterator it = sl. begin ( ); it != sl. end ( ); ++it ) - *it *= 10; - } - } - return sl; -} - - -// Various style/font/color related overrides for weak symbols in Qt/E, -// which allows us to force the usage of the global Opie appearance. - -void QApplication::setStyle ( QStyle *style ) -{ - if ( Opie::force_appearance & Opie::Force_Style ) - delete style; - else - QApplication::setStyle_NonWeak ( style ); -} - -void QApplication::setPalette ( const QPalette &pal, bool informWidgets, const char *className ) -{ - if (!( Opie::force_appearance & Opie::Force_Style )) - QApplication::setPalette_NonWeak ( pal, informWidgets, className ); -} - -void QApplication::setFont ( const QFont &fnt, bool informWidgets, const char *className ) -{ - if (!( Opie::force_appearance & Opie::Force_Font )) - QApplication::setFont_NonWeak ( fnt, informWidgets, className ); -} - - -void QApplication::qwsSetDecoration ( QWSDecoration *deco ) -{ - if ( Opie::force_appearance & Opie::Force_Decoration ) - delete deco; - else - QApplication::qwsSetDecoration_NonWeak ( deco ); -} -#endif -#endif diff --git a/library/qt_override_p.h b/library/qt_override_p.h deleted file mode 100644 index cb05d15..0000000 --- a/library/qt_override_p.h +++ b/dev/null @@ -1,25 +0,0 @@ -#ifndef __QT_OVERRIDE_H__ -#define __QT_OVERRIDE_H__ - -#if QT_VERSION > 233 - -namespace Opie { - -enum ForceAppearance { - Force_Style = 0x01, - Force_Font = 0x02, - Force_Decoration = 0x04, - - Force_All = 0xff, - Force_None = 0x00, -}; - -extern const char *binaryName ( ); - -extern int force_appearance; - -} - -#endif // (QT_VERSION >233) - -#endif |