src: Fixes for Release

* pass log directory absolute to indexers
* pass app and user paths absolute to indexers
* removed QCoreApplication instance from indexer process
* removed mutex from ConsoleLogger
* updated shortcut window
* renamed code reference menu items

bin/app/data/gui/keyboard_shortcuts/keyboard_shortcuts.css

@@ -2,7 +2,7 @@ QTableWidget {
 	font-family: "<setting:font_name>";
 	color: black;
 	margin-top: 6px;
-	background-color: #dadada;
+	background-color: white;
 	alternate-background-color: #f6f6f6;
 	selection-background-color: #227abf;
 	selection-color: white;

src/app/main.cpp

@@ -51,7 +51,8 @@ void setupLogging()
 	logManager->addLogger(consoleLogger);
 
 	std::shared_ptr<FileLogger> fileLogger = std::make_shared<FileLogger>();
-	fileLogger->setLogDirectory(UserPaths::getLogPath());
+	fileLogger->setLogDirectory(UserPaths::getLogPath().getAbsolute());
+
 	fileLogger->setFileName(FileLogger::generateDatedFileName(L"log"));
 	fileLogger->setLogLevel(Logger::LOG_ALL);
 	logManager->addLogger(fileLogger);

src/indexer/main.cpp

@@ -1,7 +1,5 @@
 #include "includes.h"
 
-#include <QCoreApplication>
-
 #include "LanguagePackageCxx.h"
 #include "LanguagePackageJava.h"
 #include "LanguagePackageManager.h"
@@ -37,8 +35,6 @@ void suppressCrashMessage()
 
 int main(int argc, char *argv[])
 {
-	QCoreApplication qtApp(argc, argv);
-
 	int processId = -1;
 	std::string instanceUuid;
 	std::string appPath;
@@ -93,6 +89,5 @@ int main(int argc, char *argv[])
 	InterprocessIndexer indexer(instanceUuid, processId);
 	indexer.work();
 
-//	qtApp.quit();
 	return 0;
 }

src/lib/data/indexer/TaskBuildIndex.cpp

@@ -193,8 +193,8 @@ void TaskBuildIndex::runIndexerProcess(int processId, const std::wstring& logFil
 	std::vector<std::wstring> commandArguments;
 	commandArguments.push_back(std::to_wstring(processId));
 	commandArguments.push_back(utility::decodeFromUtf8(Application::getUUID()));
-	commandArguments.push_back(L"\"" + AppPath::getAppPath().wstr() + L"\"");
+	commandArguments.push_back(L"\"" + AppPath::getAppPath().getAbsolute().wstr() + L"\"");
-	commandArguments.push_back(L"\"" + UserPaths::getUserDataPath().wstr() + L"\"");
+	commandArguments.push_back(L"\"" + UserPaths::getUserDataPath().getAbsolute().wstr() + L"\"");
 
 	if (!logFilePath.empty())
 	{

src/lib/utility/logging/ConsoleLogger.cpp

@@ -24,8 +24,6 @@ void ConsoleLogger::logError(const LogMessage& message)
 
 void ConsoleLogger::logMessage(const std::string& type, const LogMessage& message)
 {
-	std::lock_guard<std::mutex> lock(m_consoleMutex);
-
 	std::cout << message.getTimeString("%H:%M:%S") << " | ";
 
 	if (!message.filePath.empty())

src/lib/utility/logging/ConsoleLogger.h

@@ -6,7 +6,8 @@
 #include "utility/logging/Logger.h"
 #include "utility/logging/LogMessage.h"
 
-class ConsoleLogger: public Logger
+class ConsoleLogger
+	: public Logger
 {
 public:
 	ConsoleLogger();
@@ -17,8 +18,6 @@ private:
 	void logError(const LogMessage& message) override;
 
 	void logMessage(const std::string& type, const LogMessage& message);
-
-	std::mutex m_consoleMutex;
 };
 
 #endif // CONSOLE_LOGGER_H

src/lib_gui/platform_includes/includesMac.h

@@ -15,7 +15,7 @@
 
 void setupPlatform(int argc, char *argv[])
 {
-	UserPaths::setUserDataPath(FilePath(L"./user/"));
+	UserPaths::setUserDataPath(FilePath(L"./user/").getAbsolute());
 
 	// ----------------------------------------------------------------------------
 	// This makes relative paths work in C++ in Xcode by changing directory to the Resources folder inside the .app bundle
@@ -81,7 +81,7 @@ void setupPlatform(int argc, char *argv[])
 	utility::copyNewFilesFromDirectory(oldDataPath, dataPath);
 
 	// ----------------------------------------------------------------------------
-	UserPaths::setUserDataPath(FilePath(dataPath.toStdWString() + L"/"));
+	UserPaths::setUserDataPath(FilePath(dataPath.toStdWString() + L"/").getAbsolute());
 }
 
 void setupApp(int argc, char *argv[])

src/lib_gui/qt/window/QtKeyboardShortcuts.cpp

@@ -120,7 +120,7 @@ QTableWidget* QtKeyboardShortcuts::createGenerelShortcutsTable()
 	table->setItem(3, 0, new QTableWidgetItem("Back"));
 	table->setItem(4, 0, new QTableWidgetItem("Forward"));
 	table->setItem(5, 0, new QTableWidgetItem("Refresh"));
-	table->setItem(6, 0, new QTableWidgetItem("Force Refresh"));
+	table->setItem(6, 0, new QTableWidgetItem("Full Refresh"));
 	table->setItem(7, 0, new QTableWidgetItem("Find Symbol"));
 	table->setItem(8, 0, new QTableWidgetItem("Find Text"));
 	table->setItem(9, 0, new QTableWidgetItem("Find On-Screen"));
@@ -186,16 +186,22 @@ QTableWidget* QtKeyboardShortcuts::createCodeViewShortcutsTable()
 {
 	QtShortcutTable* table = createTableWidget("table_code");
 
-	table->setRowCount(2);
+	table->setRowCount(4);
-	table->setItem(0, 0, new QTableWidgetItem("Code Reference Next"));
+	table->setItem(0, 0, new QTableWidgetItem("Next Reference"));
-	table->setItem(1, 0, new QTableWidgetItem("Code Reference Previous"));
+	table->setItem(1, 0, new QTableWidgetItem("Previous Reference"));
+	table->setItem(2, 0, new QTableWidgetItem("Next Local Reference"));
+	table->setItem(3, 0, new QTableWidgetItem("Previous Local Reference"));
 
 #if defined(Q_OS_MAC)
 	table->setItem(0, 1, new QTableWidgetItem("Cmd + G"));
 	table->setItem(1, 1, new QTableWidgetItem("Cmd + Shift + G"));
+	table->setItem(2, 1, new QTableWidgetItem("Cmd + T"));
+	table->setItem(3, 1, new QTableWidgetItem("Cmd + Shift + T"));
 #else
 	table->setItem(0, 1, new QTableWidgetItem("Ctrl + G"));
 	table->setItem(1, 1, new QTableWidgetItem("Ctrl + Shift + G"));
+	table->setItem(2, 1, new QTableWidgetItem("Ctrl + T"));
+	table->setItem(3, 1, new QTableWidgetItem("Ctrl + Shift + T"));
 #endif
 
 	table->updateSize();

src/lib_gui/qt/window/QtMainWindow.cpp

@@ -834,13 +834,13 @@ void QtMainWindow::setupEditMenu()
 
 	menu->addSeparator();
 
-	menu->addAction(tr("Code Reference Next"), this, &QtMainWindow::codeReferenceNext, QKeySequence(Qt::CTRL + Qt::Key_G));
+	menu->addAction(tr("Next Reference"), this, &QtMainWindow::codeReferenceNext, QKeySequence(Qt::CTRL + Qt::Key_G));
-	menu->addAction(tr("Code Reference Previous"), this,
+	menu->addAction(tr("Previous Reference"), this,
 		&QtMainWindow::codeReferencePrevious, QKeySequence(Qt::SHIFT + Qt::CTRL + Qt::Key_G));
 
-	menu->addAction(tr("Code Local Reference Next"), this,
+	menu->addAction(tr("Next Local Reference"), this,
 		&QtMainWindow::codeLocalReferenceNext, QKeySequence(Qt::CTRL + Qt::Key_T));
-	menu->addAction(tr("Code Local Reference Previous"), this,
+	menu->addAction(tr("Previous Local Reference"), this,
 		&QtMainWindow::codeLocalReferencePrevious, QKeySequence(Qt::SHIFT + Qt::CTRL + Qt::Key_T));
 
 	menu->addSeparator();