GUI: Attempt to fix editor detection for x64 Windows

PKEuS · PKEuS · commit 65e85385901c · 2015-11-18T17:35:10.000+01:00
diff --git a/gui/applicationlist.cpp b/gui/applicationlist.cpp
@@ -182,39 +182,42 @@ void ApplicationList::Clear()
     mDefaultApplicationIndex = -1;
 }
 
-bool ApplicationList::FindDefaultWindowsEditor()
+bool ApplicationList::CheckAndAddApplication(QString appPath, QString name, QString parameters)
 {
-    bool foundOne = false;
-    const QString appPath(getenv("ProgramFiles"));
-    const QString notepadppPath = appPath + "\\Notepad++\\notepad++.exe";
-    if (QFileInfo(notepadppPath).exists() && QFileInfo(notepadppPath).isExecutable()) {
+    if (QFileInfo(appPath).exists() && QFileInfo(appPath).isExecutable()) {
         Application app;
-        app.setName("Notepad++");
-        app.setPath("\"" + notepadppPath + "\"");
-        app.setParameters("-n(line) (file)");
+        app.setName(name);
+        app.setPath("\"" + appPath + "\"");
+        app.setParameters(parameters);
         AddApplication(app);
-        foundOne = true;
+        return true;
     }
+    return false;
+}
 
-    const QString notepadTwoPath = appPath + "\\Notepad2\\Notepad2.exe";
-    if (QFileInfo(notepadTwoPath).exists() && QFileInfo(notepadTwoPath).isExecutable()) {
-        Application app;
-        app.setName("Notepad2");
-        app.setPath("\"" + notepadTwoPath + "\"");
-        app.setParameters("/g (line) (file)");
-        AddApplication(app);
+bool ApplicationList::FindDefaultWindowsEditor()
+{
+    bool foundOne = false;
+#ifdef WIN64 // As long as we do support 32-bit XP, we cannot be sure that the environment variable "ProgramFiles(x86)" exists
+    const QString appPathx86(getenv("ProgramFiles(x86)"));
+#else
+    const QString appPathx86(getenv("ProgramFiles"));
+#endif
+    const QString appPathx64(getenv("ProgramW6432"));
+    const QString windowsPath(getenv("windir"));
+
+    if (CheckAndAddApplication(appPathx86 + "\\Notepad++\\notepad++.exe", "Notepad++", "-n(line) (file)"))
+        foundOne = true;
+    else if (CheckAndAddApplication(appPathx64 + "\\Notepad++\\notepad++.exe", "Notepad++", "-n(line) (file)"))
         foundOne = true;
-    }
 
-    const QString windowsPath(getenv("windir"));
-    const QString notepadPath = windowsPath + "\\system32\\notepad.exe";
-    if (QFileInfo(notepadPath).exists() && QFileInfo(notepadPath).isExecutable()) {
-        Application app;
-        app.setName("Notepad");
-        app.setPath(notepadPath);
-        app.setParameters("(file)");
-        AddApplication(app);
+    if (CheckAndAddApplication(appPathx86 + "\\Notepad2\\Notepad2.exe", "Notepad2", "/g (line) (file)"))
         foundOne = true;
-    }
+    else if (CheckAndAddApplication(appPathx64 + "\\Notepad2\\Notepad2.exe", "Notepad2", "/g (line) (file)"))
+        foundOne = true;
+
+    if (CheckAndAddApplication(windowsPath + "\\system32\\notepad.exe", "Notepad", "(file)"))
+        foundOne = true;
+
     return foundOne;
 }
diff --git a/gui/applicationlist.h b/gui/applicationlist.h
@@ -116,6 +116,8 @@ class ApplicationList : public QObject {
 
 private:
 
+    bool CheckAndAddApplication(QString appPath, QString name, QString parameters);
+
     /**
     * @brief List of applications
     *

Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,8 @@ class ApplicationList : public QObject {`
`116`	`116`
`117`	`117`	`private:`
`118`	`118`
	`119`	`+ bool CheckAndAddApplication(QString appPath, QString name, QString parameters);`
	`120`	`+`
`119`	`121`	`/**`
`120`	`122`	`* @brief List of applications`
`121`	`123`	`*`