summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTannin <devnull@localhost>2013-06-29 21:10:53 +0200
committerTannin <devnull@localhost>2013-06-29 21:10:53 +0200
commit3b3717a0214a1a923ef004b90ace68197492d0ba (patch)
tree08ac88bcab5d64c420fd99d044a5c466ecbfc285 /src
parentfe37b48dffd8edcd6e30f4e304d3e27a731ac8ae (diff)
- nxmhandler now has a ui to modify the proxy-handler
- mo now registers itself with nxmhandler when launching the browser - pdbs are now generated for plugins - reverted configurator to pyqt4
Diffstat (limited to 'src')
-rw-r--r--src/mainwindow.cpp18
-rw-r--r--src/organizer.pro2
2 files changed, 5 insertions, 15 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 8027e13a..9dbce0f8 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -3195,7 +3195,7 @@ void MainWindow::on_modList_customContextMenuRequested(const QPoint &pos)
} break;
case ModInfo::ENDORSED_FALSE: {
menu.addAction(tr("Endorse"), this, SLOT(endorse_clicked()));
- menu.addAction(tr("Don't endorse"), this, SLOT(dontendorse_clicked()));
+ menu.addAction(tr("Won't endorse"), this, SLOT(dontendorse_clicked()));
} break;
case ModInfo::ENDORSED_NEVER: {
menu.addAction(tr("Endorse"), this, SLOT(endorse_clicked()));
@@ -3447,19 +3447,9 @@ void MainWindow::on_actionSettings_triggered()
void MainWindow::on_actionNexus_triggered()
{
-/* QString username, password;
- m_NexusDialog.openUrl(ToQString(GameInfo::instance().getNexusPage()));
-
- if (m_Settings.getNexusLogin(username, password)) {
- m_NexusDialog.login(username, password);
- } else {
- m_NexusDialog.loadNexus();
- }
- m_NexusDialog.show();
- m_NexusDialog.activateWindow();
-
- QTabWidget *tabWidget = findChild<QTabWidget*>("tabWidget");
- tabWidget->setCurrentIndex(4);*/
+ std::wstring nxmPath = ToWString(QApplication::applicationDirPath() + "/nxmhandler.exe");
+ ::ShellExecuteW(NULL, L"open", nxmPath.c_str(),
+ (std::wstring(L"reg ") + GameInfo::instance().getGameShortName() + L" " + nxmPath).c_str(), NULL, SW_SHOWNORMAL);
::ShellExecuteW(NULL, L"open", GameInfo::instance().getNexusPage().c_str(), NULL, NULL, SW_SHOWNORMAL);
ui->tabWidget->setCurrentIndex(4);
diff --git a/src/organizer.pro b/src/organizer.pro
index 7ff6b4e9..657e0bce 100644
--- a/src/organizer.pro
+++ b/src/organizer.pro
@@ -190,7 +190,7 @@ CONFIG(debug, debug|release) {
LIBS += -L$$OUT_PWD/../shared/release -L$$OUT_PWD/../bsatk/release
LIBS += -L$$OUT_PWD/../uibase/release
QMAKE_CXXFLAGS += /Zi
- QMAKE_CXXFLAGS -= -O2
+# QMAKE_CXXFLAGS -= -O2
QMAKE_LFLAGS += /DEBUG
}