[Kde-cygwin-cvs] CVS: qt-3/tools/qtconfig mainwindow.cpp,1.1.1.14,1.1.1.15 qtconfig.pro,1.1.1.9,1.1.
Status: Inactive
Brought to you by:
habacker
Menu
▾
▴
[Kde-cygwin-cvs] CVS: qt-3/tools/qtconfig mainwindow.cpp,1.1.1.14,1.1.1.15 qtconfig.pro,1.1.1.9,1.1.1.10
|
From: Christian E. <che...@us...> - 2005-10-01 00:36:17
|
Update of /cvsroot/kde-cygwin/qt-3/tools/qtconfig In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6831/tools/qtconfig Modified Files: Tag: QT_WIN32_3_3_BRANCH mainwindow.cpp qtconfig.pro Log Message: reapply patches which were lost during my not so good update to 3.3.5 Index: mainwindow.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/qtconfig/mainwindow.cpp,v retrieving revision 1.1.1.14 retrieving revision 1.1.1.15 diff -u -r1.1.1.14 -r1.1.1.15 --- mainwindow.cpp 22 Sep 2005 12:57:57 -0000 1.1.1.14 +++ mainwindow.cpp 30 Sep 2005 16:58:32 -0000 1.1.1.15 @@ -40,9 +40,16 @@ #include <qmessagebox.h> #include <qtextview.h> #include <qstyle.h> +#include <qtabwidget.h> +#include <qgroupbox.h> #include <stdlib.h> +inline QString getVersionString() +{ + return QString::number( (QT_VERSION >> 16) & 0xff ) + + "." + QString::number( (QT_VERSION >> 8) & 0xff ); +} // from qapplication.cpp and qapplication_x11.cpp - These are NOT for // external use ignore them @@ -53,15 +60,21 @@ "<p><b><font size+=2>Appearance</font></b></p>" "<hr>" "<p>Use this tab to customize the appearance of your Qt applications.</p>" +#ifdef Q_WS_WIN +"<p>You can select the default GUI Style from the drop down list.</p>" +#else "<p>You can select the default GUI Style from the drop down list and " "customize the colors.</p>" +#endif "<p>Any GUI Style plugins in your plugin path will automatically be added " "to the list of built-in Qt styles. (See the Library Paths tab for " "information on adding new plugin paths.)</p>" +#ifndef Q_WS_WIN "<p>When you choose 3-D Effects and Background colors, the Qt Configuration " "program will automatically generate a palette for you. To customize " "colors further, press the Tune Palette button to open the advanced " "palette editor." +#endif "<p>The Preview Window shows what the selected Style and colors look " "like."; @@ -203,12 +216,26 @@ { modified = TRUE; +#ifdef Q_WS_WIN + groupAutoPalette->hide(); + TabWidget3->removePage(tab_2); + TabWidget3->removePage(tab_3); +// TabWidget3->removePage(tab_4); + TabWidget3->removePage(tab_5); +#endif + QStringList gstyles = QStyleFactory::keys(); gstyles.sort(); gstylecombo->insertStringList(gstyles); QSettings settings; - QString currentstyle = settings.readEntry("/qt/style"); +#ifdef Q_WS_WIN + settings.insertSearchPath( QSettings::Windows, "/Trolltech" ); + const QString key = "/" + getVersionString() + "/"; +#else + const QString key = "/qt/"; +#endif + QString currentstyle = settings.readEntry( key + "style" ); if (currentstyle.isNull()) currentstyle = QApplication::style().className(); { @@ -359,17 +386,17 @@ sublistbox->clear(); sublistbox->insertStringList(subs); - rtlExtensions->setChecked( settings.readBoolEntry( "/qt/useRtlExtensions", FALSE ) ); + rtlExtensions->setChecked( settings.readBoolEntry( key + "useRtlExtensions", FALSE ) ); #ifdef Q_WS_X11 - inputStyle->setCurrentText( settings.readEntry( "/qt/XIMInputStyle", trUtf8( "On The Spot" ) ) ); + inputStyle->setCurrentText( settings.readEntry( key + "XIMInputStyle", trUtf8( "On The Spot" ) ) ); #else inputStyle->hide(); inputStyleLabel->hide(); #endif - fontembeddingcheckbox->setChecked( settings.readBoolEntry("/qt/embedFonts", TRUE) ); - fontpaths = settings.readListEntry("/qt/fontPath", ':'); + fontembeddingcheckbox->setChecked( settings.readBoolEntry(key + "embedFonts", TRUE) ); + fontpaths = settings.readListEntry(key + "fontPath", ':'); fontpathlistbox->insertStringList(fontpaths); setModified(FALSE); @@ -392,6 +419,15 @@ { QSettings settings; +#ifdef Q_WS_WIN + settings.insertSearchPath( QSettings::Windows, "/Trolltech" ); + const QString key = "/" + getVersionString() + "/"; + const QString key_version = key; +#else + const QString key = "/qt/"; + const QString key_version = QString( key + getVersionString() ); +#endif + QFontDatabase db; QFont font = db.font(familycombo->currentText(), stylecombo->currentText(), @@ -409,30 +445,29 @@ discg << editPalette.color(QPalette::Disabled, (QColorGroup::ColorRole) i).name(); - settings.writeEntry("/qt/font", font.toString()); - settings.writeEntry("/qt/Palette/active", actcg); - settings.writeEntry("/qt/Palette/inactive", inactcg); - settings.writeEntry("/qt/Palette/disabled", discg); + settings.writeEntry(key + "font", font.toString()); + settings.writeEntry(key + "Palette/active", actcg); + settings.writeEntry(key + "Palette/inactive", inactcg); + settings.writeEntry(key + "Palette/disabled", discg); QStringList libpath = QApplication::libraryPaths(); - QString libpathkey = - QString("/qt/%1.%2/libraryPath").arg( QT_VERSION >> 16 ).arg( (QT_VERSION & 0xff00 ) >> 8 ); + QString libpathkey = QString(key_version + "libraryPath"); settings.writeEntry(libpathkey, libpath, ':'); - settings.writeEntry("/qt/fontPath", fontpaths, ':'); - settings.writeEntry("/qt/embedFonts", fontembeddingcheckbox->isChecked() ); - settings.writeEntry("/qt/style", gstylecombo->currentText()); - settings.writeEntry("/qt/doubleClickInterval", + settings.writeEntry(key + "fontPath", fontpaths, ':'); + settings.writeEntry(key + "embedFonts", fontembeddingcheckbox->isChecked() ); + settings.writeEntry(key + "style", gstylecombo->currentText()); + settings.writeEntry(key + "doubleClickInterval", dcispin->value()); - settings.writeEntry("/qt/cursorFlashTime", cfispin->value() == 9 ? 0 : cfispin->value() ); - settings.writeEntry("/qt/wheelScrollLines", wslspin->value()); - settings.writeEntry("/qt/resolveSymlinks", resolvelinks->isChecked()); + settings.writeEntry(key + "cursorFlashTime", cfispin->value() == 9 ? 0 : cfispin->value() ); + settings.writeEntry(key + "wheelScrollLines", wslspin->value()); + settings.writeEntry(key + "resolveSymlinks", resolvelinks->isChecked()); QStringList strut; strut << QString::number(strutwidth->value()); strut << QString::number(strutheight->value()); - settings.writeEntry("/qt/globalStrut", strut); + settings.writeEntry(key + "globalStrut", strut); - settings.writeEntry("/qt/useRtlExtensions", rtlExtensions->isChecked() ); + settings.writeEntry(key + "useRtlExtensions", rtlExtensions->isChecked() ); #ifdef Q_WS_X11 QString style = inputStyle->currentText(); @@ -443,7 +478,7 @@ str = "Off The Spot"; else if ( style == trUtf8( "Root" ) ) str = "Root"; - settings.writeEntry( "/qt/XIMInputStyle", inputStyle->currentText() ); + settings.writeEntry( key + "XIMInputStyle", inputStyle->currentText() ); #endif QStringList effects; @@ -469,13 +504,13 @@ } } else effects << "none"; - settings.writeEntry("/qt/GUIEffects", effects); + settings.writeEntry(key + "GUIEffects", effects); QStringList familysubs = QFont::substitutions(); QStringList::Iterator fit = familysubs.begin(); while (fit != familysubs.end()) { QStringList subs = QFont::substitutes(*fit); - settings.writeEntry("/qt/Font Substitutions/" + *fit, subs); + settings.writeEntry(key + "Font Substitutions/" + *fit, subs); fit++; } } Index: qtconfig.pro =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/qtconfig/qtconfig.pro,v retrieving revision 1.1.1.9 retrieving revision 1.1.1.10 diff -u -r1.1.1.9 -r1.1.1.10 --- qtconfig.pro 22 Sep 2005 12:57:57 -0000 1.1.1.9 +++ qtconfig.pro 30 Sep 2005 16:58:32 -0000 1.1.1.10 @@ -16,3 +16,4 @@ INCLUDEPATH += . DBFILE = qtconfig.db REQUIRES=full-config nocrosscompiler !win32* +win32:RC_FILE = qtconfig.rc |
