From 32480f7a818facb096c423fbed625bb311b0c497 Mon Sep 17 00:00:00 2001 From: Tannin Date: Sat, 7 May 2016 00:23:13 +0200 Subject: [PATCH] minor fixes --- src/editexecutablesdialog.cpp | 1 + src/mainwindow.cpp | 13 +++++----- src/mainwindow.h | 3 +++ src/usvfsconnector.cpp | 48 ++++++++++++++--------------------- 4 files changed, 30 insertions(+), 35 deletions(-) diff --git a/src/editexecutablesdialog.cpp b/src/editexecutablesdialog.cpp index 42d6f58b..f76323e8 100644 --- a/src/editexecutablesdialog.cpp +++ b/src/editexecutablesdialog.cpp @@ -21,6 +21,7 @@ along with Mod Organizer. If not, see . #include "ui_editexecutablesdialog.h" #include "filedialogmemory.h" #include "stackdata.h" +#include "modlist.h" #include #include #include diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 7944acfc..f21698b0 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -2978,11 +2978,7 @@ void MainWindow::on_modList_customContextMenuRequested(const QPoint &pos) if (info->getNexusID() > 0) { menu->addAction(tr("Visit on Nexus"), this, SLOT(visitOnNexus_clicked())); - } - - //If a URL is specified which is not the game's URL, pop up 'visit web page' - if (info->getURL() != "" && - !NexusInterface::instance()->isModURL(info->getNexusID(), info->getURL())) { + } else if ((info->getURL() != "")) { menu->addAction(tr("Visit web page"), this, SLOT(visitWebPage_clicked())); } @@ -3025,7 +3021,7 @@ void MainWindow::on_categoriesList_itemSelectionChanged() m_ModListSortProxy->setCategoryFilter(categories); m_ModListSortProxy->setContentFilter(content); - ui->clickBlankLabel->setEnabled(categories.size() > 0); + ui->clickBlankButton->setEnabled(categories.size() > 0); if (indices.count() == 0) { ui->currentCategoryLabel->setText(QString("(%1)").arg(tr(""))); } else if (indices.count() > 1) { @@ -4579,3 +4575,8 @@ void MainWindow::dropEvent(QDropEvent *event) event->accept(); } + +void MainWindow::on_clickBlankButton_clicked() +{ + deselectFilters(); +} diff --git a/src/mainwindow.h b/src/mainwindow.h index d2f3fb47..866f1ad6 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -183,6 +183,9 @@ public slots: virtual void dragEnterEvent(QDragEnterEvent *event); virtual void dropEvent(QDropEvent *event); +private slots: + void on_clickBlankButton_clicked(); + private: void cleanup(); diff --git a/src/usvfsconnector.cpp b/src/usvfsconnector.cpp index 2af28522..d8818a9a 100644 --- a/src/usvfsconnector.cpp +++ b/src/usvfsconnector.cpp @@ -20,6 +20,8 @@ along with Mod Organizer. If not, see . #include "usvfsconnector.h" #include "settings.h" #include +#include +#include #include #include #include @@ -27,35 +29,23 @@ along with Mod Organizer. If not, see . static const char SHMID[] = "mod_organizer_instance"; -/* -extern "C" DLLEXPORT BOOL WINAPI VirtualLinkFile(LPCWSTR source, LPCWSTR -destination, BOOL failIfExists); -extern "C" DLLEXPORT BOOL WINAPI VirtualLinkDirectoryStatic(LPCWSTR source, -LPCWSTR destination, unsigned int flags); -extern "C" DLLEXPORT BOOL WINAPI ConnectVFS(const usvfs::Parameters -*parameters); -extern "C" DLLEXPORT void WINAPI DisconnectVFS(); -extern "C" DLLEXPORT void WINAPI GetCurrentVFSName(char *buffer, size_t size); -extern "C" DLLEXPORT BOOL WINAPI CreateProcessHooked(LPCWSTR lpApplicationName - , LPWSTR lpCommandLine - , LPSECURITY_ATTRIBUTES -lpProcessAttributes - , LPSECURITY_ATTRIBUTES -lpThreadAttributes - , BOOL bInheritHandles - , DWORD dwCreationFlags - , LPVOID lpEnvironment - , LPCWSTR -lpCurrentDirectory - , LPSTARTUPINFOW -lpStartupInfo - , LPPROCESS_INFORMATION -lpProcessInformation - ); -extern "C" DLLEXPORT void __cdecl InitLogging(bool toLocal = false); -extern "C" DLLEXPORT void __cdecl InitHooks(LPVOID userData, size_t -userDataSize); -*/ + +std::string to_hex(void *bufferIn, size_t bufferSize) +{ + unsigned char *buffer = static_cast(bufferIn); + std::ostringstream temp; + temp << std::hex; + for (size_t i = 0; i < bufferSize; ++i) { + temp << std::setfill('0') << std::setw(2) << (unsigned int)buffer[i]; + if ((i % 16) == 15) { + temp << "\n"; + } else { + temp << " "; + } + } + return temp.str(); +} + LogWorker::LogWorker() : m_Buffer(1024, '\0')