Windows: GUI "Open" works

This commit is contained in:
Jean-Francois Dockes
2015-10-09 11:03:27 +02:00
parent 6433deaff6
commit e18291ef64
10 changed files with 135 additions and 15 deletions
+3 -1
View File
@@ -399,7 +399,9 @@ void RclMain::execViewer(const map<string, string>& subs, bool istempfile,
// Also substitute inside the unsplitted command line and display
// in status bar
pcSubst(cmd, ncmd, subs);
#ifndef _WIN32
ncmd += " &";
#endif
QStatusBar *stb = statusBar();
if (stb) {
string fcharset = theconfig->getDefCharset(true);
@@ -417,7 +419,7 @@ void RclMain::execViewer(const map<string, string>& subs, bool istempfile,
zg_send_event(ZGSEND_OPEN, doc);
// We keep pushing back and never deleting. This can't be good...
ExecCmd *ecmd = new ExecCmd;
ExecCmd *ecmd = new ExecCmd(ExecCmd::EXF_SHOWWINDOW);
m_viewers.push_back(ecmd);
ecmd->startExec(execpath, lcmd, false, false);
}
+6 -3
View File
@@ -6,8 +6,11 @@ LANGUAGE = C++
QT += webkit
# QT += dbus
# QMAKE_CXXFLAGS += -DUSE_ZEITGEIST
DEFINES += BUILDING_RECOLL
DEFINES -= UNICODE
DEFINES -= _UNICODE
DEFINES += _MBCS
DEFINES += PSAPI_VERSION=1
QT += xml
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets webkitwidgets printsupport
@@ -106,7 +109,7 @@ windows {
contains(QMAKE_CC, cl){
# Visual Studio
}
LIBS += C:/recoll/src/build-librecoll-Desktop_Qt_5_5_0_MinGW_32bit-Debug/debug/librecoll.dll
LIBS += C:/recoll/src/windows/build-librecoll-Desktop_Qt_5_5_0_MinGW_32bit-Debug/debug/librecoll.dll
}
TRANSLATIONS = \