|
 |
106311 |
diff -up qt-x11-free-3.3.8b/src/kernel/qapplication.cpp.sane_defaults qt-x11-free-3.3.8b/src/kernel/qapplication.cpp
|
|
|
106311 |
--- qt-x11-free-3.3.8b/src/kernel/qapplication.cpp.sane_defaults 2008-01-15 13:09:13.000000000 -0600
|
|
|
106311 |
+++ qt-x11-free-3.3.8b/src/kernel/qapplication.cpp 2009-12-22 14:00:19.078553429 -0600
|
|
|
106311 |
@@ -1241,7 +1241,7 @@ QStyle& QApplication::style()
|
|
|
106311 |
#elif defined(Q_WS_X11) && defined(Q_OS_IRIX)
|
|
|
106311 |
style = "SGI"; // default style for X11 on IRIX
|
|
|
106311 |
#elif defined(Q_WS_X11)
|
|
|
106311 |
- style = "Motif"; // default style for X11
|
|
|
106311 |
+ style = "Platinum"; // default style for X11
|
|
|
106311 |
#elif defined(Q_WS_MAC)
|
|
|
106311 |
style = "Macintosh"; // default style for all Mac's
|
|
|
106311 |
#elif defined(Q_WS_QWS)
|
|
|
106311 |
@@ -1250,8 +1250,8 @@ QStyle& QApplication::style()
|
|
|
106311 |
}
|
|
|
106311 |
app_style = QStyleFactory::create( style );
|
|
|
106311 |
if ( !app_style && // platform default style not available, try alternatives
|
|
|
106311 |
- !(app_style = QStyleFactory::create( "Windows" ) ) &&
|
|
|
106311 |
!(app_style = QStyleFactory::create( "Platinum" ) ) &&
|
|
|
106311 |
+ !(app_style = QStyleFactory::create( "Windows" ) ) &&
|
|
|
106311 |
!(app_style = QStyleFactory::create( "MotifPlus" ) ) &&
|
|
|
106311 |
!(app_style = QStyleFactory::create( "Motif" ) ) &&
|
|
|
106311 |
!(app_style = QStyleFactory::create( "CDE" ) ) &&
|
|
|
106311 |
@@ -1731,6 +1731,13 @@ QStringList QApplication::libraryPaths()
|
|
|
106311 |
app_libpaths->append(installPathPlugins);
|
|
|
106311 |
}
|
|
|
106311 |
|
|
|
106311 |
+ #if defined(Q_WS_X11)
|
|
|
106311 |
+ QString kde3PathPlugins = QString("@@KDE3_PLUGIN_PATH@@");
|
|
|
106311 |
+ if ( QFile::exists(kde3PathPlugins) ) {
|
|
|
106311 |
+ app_libpaths->append(kde3PathPlugins);
|
|
|
106311 |
+ }
|
|
|
106311 |
+#endif
|
|
|
106311 |
+
|
|
|
106311 |
QString app_location;
|
|
|
106311 |
if (qApp)
|
|
|
106311 |
app_location = qApp->applicationFilePath();
|
|
|
106311 |
@@ -1933,7 +1940,7 @@ QFont QApplication::font( const QWidget
|
|
|
106311 |
}
|
|
|
106311 |
}
|
|
|
106311 |
if ( !app_font ) {
|
|
|
106311 |
- app_font = new QFont( "Helvetica" );
|
|
|
106311 |
+ app_font = new QFont( "Sans" );
|
|
|
106311 |
Q_CHECK_PTR( app_font );
|
|
|
106311 |
}
|
|
|
106311 |
return *app_font;
|
|
|
106311 |
diff -up qt-x11-free-3.3.8b/src/kernel/qapplication_x11.cpp.sane_defaults qt-x11-free-3.3.8b/src/kernel/qapplication_x11.cpp
|
|
|
106311 |
--- qt-x11-free-3.3.8b/src/kernel/qapplication_x11.cpp.sane_defaults 2008-01-15 13:09:13.000000000 -0600
|
|
|
106311 |
+++ qt-x11-free-3.3.8b/src/kernel/qapplication_x11.cpp 2009-12-22 13:54:58.335802790 -0600
|
|
|
106311 |
@@ -953,8 +953,11 @@ bool QApplication::x11_apply_settings()
|
|
|
106311 |
// read new QStyle
|
|
|
106311 |
extern bool qt_explicit_app_style; // defined in qapplication.cpp
|
|
|
106311 |
QString stylename = settings.readEntry( "/qt/style" );
|
|
|
106311 |
- if ( !stylename.isEmpty() && !qt_explicit_app_style ) {
|
|
|
106311 |
- QApplication::setStyle( stylename );
|
|
|
106311 |
+ if ( !qt_explicit_app_style ) {
|
|
|
106311 |
+ if ( stylename.isEmpty() )
|
|
|
106311 |
+ QApplication::setStyle( QString("Platinum") );
|
|
|
106311 |
+ else
|
|
|
106311 |
+ QApplication::setStyle( stylename );
|
|
|
106311 |
// took the style from the user settings, so mark the explicit flag FALSE
|
|
|
106311 |
qt_explicit_app_style = FALSE;
|
|
|
106311 |
}
|
|
|
106311 |
@@ -2095,11 +2098,11 @@ void qt_init_internal( int *argcptr, cha
|
|
|
106311 |
// At 95 DPI, a 12 point font should be 16 pixels tall - in which case a 17
|
|
|
106311 |
// pixel font is a closer match than a 12 pixel font
|
|
|
106311 |
int ptsz =
|
|
|
106311 |
- (int) ( ( ( QPaintDevice::x11AppDpiY() >= 95 ? 17. : 12. ) *
|
|
|
106311 |
+ (int) ( ( ( QPaintDevice::x11AppDpiY() >= 95 ? 13. : 11. ) *
|
|
|
106311 |
72. / (float) QPaintDevice::x11AppDpiY() ) + 0.5 );
|
|
|
106311 |
|
|
|
106311 |
if ( !qt_app_has_font && !qt_x11_cmdline_font ) {
|
|
|
106311 |
- QFont f( "Helvetica", ptsz );
|
|
|
106311 |
+ QFont f( "Sans", ptsz );
|
|
|
106311 |
QApplication::setFont( f );
|
|
|
106311 |
}
|
|
|
106311 |
|