helpwindow.cpp | 6 +++++- machineprocess.cpp | 3 +++ main.cpp | 12 ++++++++++++ 3 files changed, 20 insertions(+), 1 deletions(-) diff --git a/helpwindow.cpp b/helpwindow.cpp index 9846714..bbb7f70 100644 --- a/helpwindow.cpp +++ b/helpwindow.cpp @@ -86,10 +86,14 @@ QUrl HelpWindow::getHelpFile() } //check for case when qtemu executable is in same dir (windows) - QUrl testUrl("help/main.htm"); + QUrl testUrl("/usr/share/doc/qtemu-1.0.5/help/main.htm"); if (QFile::exists(testUrl.toString())) return testUrl; +/* QUrl testUrl("help/main.htm"); + if (QFile::exists(testUrl.toString())) + return testUrl;*/ + //check for case when qtemu executable is in same dir (linux) testUrl = QUrl(QCoreApplication::applicationDirPath()+"/help/main.htm"); if (QFile::exists(testUrl.toString())) diff --git a/machineprocess.cpp b/machineprocess.cpp index 61643b7..bb94304 100644 --- a/machineprocess.cpp +++ b/machineprocess.cpp @@ -30,6 +30,8 @@ #include #include +#define DEVELOPER + MachineProcess::MachineProcess(QObject *parent) :QProcess(parent), bootFromCdEnabled(false), @@ -98,6 +100,7 @@ void MachineProcess::start() arguments << "-localtime"; // Add the VM image name... + arguments << "-hda"; arguments << pathString; #ifdef DEVELOPER diff --git a/main.cpp b/main.cpp index b4b814c..b96e59e 100644 --- a/main.cpp +++ b/main.cpp @@ -48,6 +48,18 @@ int main(int argc, char *argv[]) path = QCoreApplication::applicationDirPath()+"/../translations/qtemu_" + locale + ".qm"; if (QFile::exists(path)) translator.load(path); + else + { + path = "/usr/lib/qt4/translations/qtemu_" + locale + ".qm"; + if (QFile::exists(path)) + translator.load(path); + else + { + path = "/usr/lib64/qt4/translations/qtemu_" + locale + ".qm"; + if (QFile::exists(path)) + translator.load(path); + } + } } app.installTranslator(&translator);