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.
This commit is contained in:
parent
a71d56096c
commit
45cf2ade08
|
@ -19,6 +19,7 @@
|
||||||
#include <QFileInfo>
|
#include <QFileInfo>
|
||||||
#include <QDir>
|
#include <QDir>
|
||||||
#include <QTranslator>
|
#include <QTranslator>
|
||||||
|
#include <QLocale>
|
||||||
|
|
||||||
#include "CMakeSetupDialog.h"
|
#include "CMakeSetupDialog.h"
|
||||||
#include "cmDocumentation.h"
|
#include "cmDocumentation.h"
|
||||||
|
@ -66,21 +67,28 @@ int main(int argc, char** argv)
|
||||||
{
|
{
|
||||||
QApplication app(argc, argv);
|
QApplication app(argc, argv);
|
||||||
|
|
||||||
|
// tell the cmake library where cmake is
|
||||||
QDir cmExecDir(QApplication::applicationDirPath());
|
QDir cmExecDir(QApplication::applicationDirPath());
|
||||||
#if defined(Q_OS_MAC)
|
#if defined(Q_OS_MAC)
|
||||||
cmExecDir.cd("../../../");
|
cmExecDir.cd("../../../");
|
||||||
#endif
|
#endif
|
||||||
cmSystemTools::FindExecutableDirectory(cmExecDir.filePath("cmake").toAscii().data());
|
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;
|
QTranslator translator;
|
||||||
QString transfile = QString("cmake_%1").arg(QLocale::system().name());
|
QString transfile = QString("cmake_%1").arg(QLocale::system().name());
|
||||||
translator.load(transfile, app.applicationDirPath());
|
translator.load(transfile, translationsDir.path());
|
||||||
app.installTranslator(&translator);
|
app.installTranslator(&translator);
|
||||||
|
|
||||||
|
// app setup
|
||||||
app.setApplicationName("CMakeSetup");
|
app.setApplicationName("CMakeSetup");
|
||||||
app.setOrganizationName("Kitware");
|
app.setOrganizationName("Kitware");
|
||||||
app.setWindowIcon(QIcon(":/Icons/CMakeSetup.png"));
|
app.setWindowIcon(QIcon(":/Icons/CMakeSetup.png"));
|
||||||
|
|
||||||
|
// do docs, if args were given
|
||||||
cmDocumentation doc;
|
cmDocumentation doc;
|
||||||
if(app.arguments().size() > 1 &&
|
if(app.arguments().size() > 1 &&
|
||||||
doc.CheckOptions(app.argc(), app.argv()))
|
doc.CheckOptions(app.argc(), app.argv()))
|
||||||
|
|
|
@ -146,6 +146,7 @@ bool QCMakeCacheView::showAdvanced() const
|
||||||
|
|
||||||
void QCMakeCacheView::setSearchFilter(const QString& s)
|
void QCMakeCacheView::setSearchFilter(const QString& s)
|
||||||
{
|
{
|
||||||
|
this->selectionModel()->clear();
|
||||||
this->SearchFilter->setFilterFixedString(s);
|
this->SearchFilter->setFilterFixedString(s);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue