From 45cf2ade08351ccbc880856ba7774da52db06f0b Mon Sep 17 00:00:00 2001 From: Clinton Stimpson Date: Fri, 8 Feb 2008 10:42:14 -0500 Subject: [PATCH] COMP: Fix build with Qt 4.2. BUG: Fix new editors stealing focus while typing search text. ENH: Look for translation in data dir, not bin dir. --- Source/QtDialog/CMakeSetup.cxx | 12 ++++++++++-- Source/QtDialog/QCMakeCacheView.cxx | 1 + 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Source/QtDialog/CMakeSetup.cxx b/Source/QtDialog/CMakeSetup.cxx index 13237f2d9..5d8f3c19d 100644 --- a/Source/QtDialog/CMakeSetup.cxx +++ b/Source/QtDialog/CMakeSetup.cxx @@ -19,6 +19,7 @@ #include #include #include +#include #include "CMakeSetupDialog.h" #include "cmDocumentation.h" @@ -65,22 +66,29 @@ static const char * cmDocumentationOptions[][3] = int main(int argc, char** argv) { QApplication app(argc, argv); - + + // tell the cmake library where cmake is QDir cmExecDir(QApplication::applicationDirPath()); #if defined(Q_OS_MAC) cmExecDir.cd("../../../"); #endif cmSystemTools::FindExecutableDirectory(cmExecDir.filePath("cmake").toAscii().data()); + // pick up translation files if they exists in the data directory + QDir translationsDir = cmExecDir; + translationsDir.cd(".." CMAKE_DATA_DIR); + translationsDir.cd("i18n"); QTranslator translator; QString transfile = QString("cmake_%1").arg(QLocale::system().name()); - translator.load(transfile, app.applicationDirPath()); + translator.load(transfile, translationsDir.path()); app.installTranslator(&translator); + // app setup app.setApplicationName("CMakeSetup"); app.setOrganizationName("Kitware"); app.setWindowIcon(QIcon(":/Icons/CMakeSetup.png")); + // do docs, if args were given cmDocumentation doc; if(app.arguments().size() > 1 && doc.CheckOptions(app.argc(), app.argv())) diff --git a/Source/QtDialog/QCMakeCacheView.cxx b/Source/QtDialog/QCMakeCacheView.cxx index 640a3e011..466006a71 100644 --- a/Source/QtDialog/QCMakeCacheView.cxx +++ b/Source/QtDialog/QCMakeCacheView.cxx @@ -146,6 +146,7 @@ bool QCMakeCacheView::showAdvanced() const void QCMakeCacheView::setSearchFilter(const QString& s) { + this->selectionModel()->clear(); this->SearchFilter->setFilterFixedString(s); }