hush
/
SilentDragon
9
1
Fork 7
Code Issues 76 Pull Requests 1 Projects Releases 8 Wiki Activity
Browse Source

update for hush3 dev branch; no mo cumodo

pull/21/head
oDinZu 3 years ago
parent
8331250dde
commit
b5e334c7b8
2 changed files with 11 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      src/connection.cpp
  2. 10
      src/mainwindow.cpp

12
src/connection.cpp
View File

@ -553,11 +553,11 @@ void ConnectionLoader::showError(QString explanation) {
QString ConnectionLoader::locateHushConfFile() { QString ConnectionLoader::locateHushConfFile() {
#ifdef Q_OS_LINUX #ifdef Q_OS_LINUX
auto confLocation = QStandardPaths::locate(QStandardPaths::HomeLocation, ".komodo/HUSH3/HUSH3.conf"); auto confLocation = QStandardPaths::locate(QStandardPaths::HomeLocation, ".hush/HUSH3/HUSH3.conf");
#elif defined(Q_OS_DARWIN) #elif defined(Q_OS_DARWIN)
auto confLocation = QStandardPaths::locate(QStandardPaths::HomeLocation, "Library/Application Support/Komodo/HUSH3/HUSH3.conf"); auto confLocation = QStandardPaths::locate(QStandardPaths::HomeLocation, "Library/Application Support/Hush/HUSH3/HUSH3.conf");
#else #else
auto confLocation = QStandardPaths::locate(QStandardPaths::AppDataLocation, "../../Komodo/HUSH3/HUSH3.conf"); auto confLocation = QStandardPaths::locate(QStandardPaths::AppDataLocation, "../../Hush/HUSH3/HUSH3.conf");
#endif #endif
main->logger->write("Found HUSH3.conf at " + QDir::cleanPath(confLocation)); main->logger->write("Found HUSH3.conf at " + QDir::cleanPath(confLocation));
@ -566,11 +566,11 @@ QString ConnectionLoader::locateHushConfFile() {
QString ConnectionLoader::zcashConfWritableLocation() { QString ConnectionLoader::zcashConfWritableLocation() {
#ifdef Q_OS_LINUX #ifdef Q_OS_LINUX
auto confLocation = QDir(QStandardPaths::writableLocation(QStandardPaths::HomeLocation)).filePath(".komodo/HUSH3/HUSH3.conf"); auto confLocation = QDir(QStandardPaths::writableLocation(QStandardPaths::HomeLocation)).filePath(".hush/HUSH3/HUSH3.conf");
#elif defined(Q_OS_DARWIN) #elif defined(Q_OS_DARWIN)
auto confLocation = QDir(QStandardPaths::writableLocation(QStandardPaths::HomeLocation)).filePath("Library/Application Support/Komodo/HUSH3/HUSH3.conf"); auto confLocation = QDir(QStandardPaths::writableLocation(QStandardPaths::HomeLocation)).filePath("Library/Application Support/Hush/HUSH3/HUSH3.conf");
#else #else
auto confLocation = QDir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)).filePath("../../Komodo/HUSH3/HUSH3.conf"); auto confLocation = QDir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)).filePath("../../Hush/HUSH3/HUSH3.conf");
#endif #endif
main->logger->write("Found HUSH3.conf at " + QDir::cleanPath(confLocation)); main->logger->write("Found HUSH3.conf at " + QDir::cleanPath(confLocation));

10
src/mainwindow.cpp
View File

@ -1236,23 +1236,23 @@ void MainWindow::setupPeersTab() {
}); });
/* /*
//grep 'BAN THRESHOLD EXCEEDED' ~/.komodo/HUSH3/debug.log //grep 'BAN THRESHOLD EXCEEDED' ~/.hush/HUSH3/debug.log
//grep Disconnected ... //grep Disconnected ...
QFile debuglog = ""; QFile debuglog = "";
#ifdef Q_OS_LINUX #ifdef Q_OS_LINUX
debuglog = "~/.komodo/HUSH3/debug.log"; debuglog = "~/.hush/HUSH3/debug.log";
#elif defined(Q_OS_DARWIN) #elif defined(Q_OS_DARWIN)
debuglog = "~/Library/Application Support/Komodo/HUSH3/debug.log"; debuglog = "~/Library/Application Support/Hush/HUSH3/debug.log";
#elif defined(Q_OS_WIN64) #elif defined(Q_OS_WIN64)
// "C:/Users/<USER>/AppData/Roaming/<APPNAME>", // "C:/Users/<USER>/AppData/Roaming/<APPNAME>",
// TODO: get current username // TODO: get current username
debuglog = "C:/Users/<USER>/AppData/Roaming/Komodo/HUSH3/debug.log"; debuglog = "C:/Users/<USER>/AppData/Roaming/Hush/HUSH3/debug.log";
#else #else
// Bless Your Heart, You Like Danger! // Bless Your Heart, You Like Danger!
// There are open bounties to port HUSH softtware to OpenBSD and friends: // There are open bounties to port HUSH softtware to OpenBSD and friends:
// git.hush.is/hush/tasks // git.hush.is/hush/tasks
debuglog = "~/.komodo/HUSH3/debug.log"; debuglog = "~/.hush/HUSH3/debug.log";
#endif // Q_OS_LINUX #endif // Q_OS_LINUX
if(debuglog.exists()) { if(debuglog.exists()) {

Write Preview
Loading…
Cancel
Save