6b470516fa
Corrected handling of new-lines in fossil output on OSX. The update command now logs only the actual update output from fossil. The log cursor is now repositioned to the end before any text is appended. Fixed minor static analysis warnings. FossilOrigin-Name: 4db466899df13050ac14c60097286f1df3adc46f
314 lines
9.6 KiB
C++
314 lines
9.6 KiB
C++
#include "Utils.h"
|
|
#include <QMessageBox>
|
|
#include <QDialogButtonBox>
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
QMessageBox::StandardButton DialogQuery(QWidget *parent, const QString &title, const QString &query, QMessageBox::StandardButtons buttons)
|
|
{
|
|
QMessageBox mb(QMessageBox::Question, title, query, buttons, parent, Qt::Dialog | Qt::MSWindowsFixedSizeDialogHint | Qt::Sheet );
|
|
mb.setDefaultButton(QMessageBox::No);
|
|
mb.setWindowModality(Qt::WindowModal);
|
|
mb.setModal(true);
|
|
mb.exec();
|
|
QMessageBox::StandardButton res = mb.standardButton(mb.clickedButton());
|
|
return res;
|
|
}
|
|
|
|
//-----------------------------------------------------------------------------
|
|
#if 0 // Unused
|
|
#include <QInputDialog>
|
|
|
|
static bool DialogQueryText(QWidget *parent, const QString &title, const QString &query, QString &text, bool isPassword=false)
|
|
{
|
|
QInputDialog dlg(parent, Qt::Sheet);
|
|
dlg.setWindowTitle(title);
|
|
dlg.setInputMode(QInputDialog::TextInput);
|
|
dlg.setWindowModality(Qt::WindowModal);
|
|
dlg.setModal(true);
|
|
dlg.setLabelText(query);
|
|
dlg.setTextValue(text);
|
|
if(isPassword)
|
|
dlg.setTextEchoMode(QLineEdit::Password);
|
|
|
|
if(dlg.exec() == QDialog::Rejected)
|
|
return false;
|
|
|
|
text = dlg.textValue();
|
|
return true;
|
|
}
|
|
#endif
|
|
|
|
|
|
#ifdef Q_WS_WIN
|
|
// Explorer File Context Menu support. Based on http://www.microsoft.com/msj/0497/wicked/wicked0497.aspx
|
|
#include <shlobj.h>
|
|
|
|
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
//
|
|
// FUNCTION: DoExplorerMenu
|
|
//
|
|
// DESCRIPTION: Given a path name to a file or folder object, displays
|
|
// the shell's context menu for that object and executes
|
|
// the menu command (if any) selected by the user.
|
|
//
|
|
// INPUT: hwnd = Handle of the window in which the menu will be
|
|
// displayed.
|
|
//
|
|
// pszPath = Pointer to an ANSI or Unicode string
|
|
// specifying the path to the object.
|
|
//
|
|
// point = x and y coordinates of the point where the
|
|
// menu's upper left corner should be located, in
|
|
// client coordinates relative to hwnd.
|
|
//
|
|
// RETURNS: TRUE if successful, FALSE if not.
|
|
//
|
|
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
bool ShowExplorerMenu(HWND hwnd, const QString &path, const QPoint &qpoint)
|
|
{
|
|
struct Util
|
|
{
|
|
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
// FUNCTION: GetNextItem
|
|
// DESCRIPTION: Finds the next item in an item ID list.
|
|
// INPUT: pidl = Pointer to an item ID list.
|
|
// RETURNS: Pointer to the next item.
|
|
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
static LPITEMIDLIST GetNextItem (LPITEMIDLIST pidl)
|
|
{
|
|
USHORT nLen;
|
|
|
|
if ((nLen = pidl->mkid.cb) == 0)
|
|
return NULL;
|
|
|
|
return (LPITEMIDLIST) (((LPBYTE) pidl) + nLen);
|
|
}
|
|
|
|
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
// FUNCTION: GetItemCount
|
|
// DESCRIPTION: Computes the number of item IDs in an item ID list.
|
|
// INPUT: pidl = Pointer to an item ID list.
|
|
// RETURNS: Number of item IDs in the list.
|
|
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
static UINT GetItemCount (LPITEMIDLIST pidl)
|
|
{
|
|
USHORT nLen;
|
|
UINT nCount;
|
|
|
|
nCount = 0;
|
|
while ((nLen = pidl->mkid.cb) != 0) {
|
|
pidl = GetNextItem (pidl);
|
|
nCount++;
|
|
}
|
|
return nCount;
|
|
}
|
|
|
|
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
// FUNCTION: DuplicateItem
|
|
// DESCRIPTION: Makes a copy of the next item in an item ID list.
|
|
// INPUT: pMalloc = Pointer to an IMalloc interface.
|
|
// pidl = Pointer to an item ID list.
|
|
// RETURNS: Pointer to an ITEMIDLIST containing the copied item ID.
|
|
// NOTES: It is the caller's responsibility to free the memory
|
|
// allocated by this function when the item ID is no longer
|
|
// needed. Example:
|
|
// pidlItem = DuplicateItem (pMalloc, pidl);
|
|
// .
|
|
// .
|
|
// .
|
|
// pMalloc->lpVtbl->Free (pMalloc, pidlItem);
|
|
// Failure to free the ITEMIDLIST will result in memory
|
|
// leaks.
|
|
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
static LPITEMIDLIST DuplicateItem (LPMALLOC pMalloc, LPITEMIDLIST pidl)
|
|
{
|
|
USHORT nLen;
|
|
LPITEMIDLIST pidlNew;
|
|
|
|
nLen = pidl->mkid.cb;
|
|
if (nLen == 0)
|
|
return NULL;
|
|
|
|
pidlNew = (LPITEMIDLIST) pMalloc->Alloc (
|
|
nLen + sizeof (USHORT));
|
|
if (pidlNew == NULL)
|
|
return NULL;
|
|
|
|
CopyMemory (pidlNew, pidl, nLen);
|
|
*((USHORT*) (((LPBYTE) pidlNew) + nLen)) = 0;
|
|
|
|
return pidlNew;
|
|
}
|
|
};
|
|
|
|
|
|
LPITEMIDLIST pidlMain, pidlItem, pidlNextItem, *ppidl;
|
|
UINT nCount;
|
|
POINT point;
|
|
point.x = qpoint.x();
|
|
point.y = qpoint.y();
|
|
|
|
WCHAR wchPath[MAX_PATH];
|
|
memset(wchPath, 0, sizeof(wchPath));
|
|
Q_ASSERT(path.length()<MAX_PATH);
|
|
path.toWCharArray(wchPath);
|
|
|
|
//
|
|
// Get pointers to the shell's IMalloc interface and the desktop's
|
|
// IShellFolder interface.
|
|
//
|
|
bool bResult = false;
|
|
|
|
LPMALLOC pMalloc;
|
|
if (!SUCCEEDED (SHGetMalloc (&pMalloc)))
|
|
return bResult;
|
|
|
|
LPSHELLFOLDER psfFolder;
|
|
if (!SUCCEEDED (SHGetDesktopFolder (&psfFolder))) {
|
|
pMalloc->Release();
|
|
return bResult;
|
|
}
|
|
|
|
//
|
|
// Convert the path name into a pointer to an item ID list (pidl).
|
|
//
|
|
ULONG ulCount, ulAttr;
|
|
if (SUCCEEDED (psfFolder->ParseDisplayName (hwnd,
|
|
NULL, wchPath, &ulCount, &pidlMain, &ulAttr)) && (pidlMain != NULL)) {
|
|
|
|
if ( (nCount = Util::GetItemCount (pidlMain))>0) { // nCount must be > 0
|
|
//
|
|
// Initialize psfFolder with a pointer to the IShellFolder
|
|
// interface of the folder that contains the item whose context
|
|
// menu we're after, and initialize pidlItem with a pointer to
|
|
// the item's item ID. If nCount > 1, this requires us to walk
|
|
// the list of item IDs stored in pidlMain and bind to each
|
|
// subfolder referenced in the list.
|
|
//
|
|
pidlItem = pidlMain;
|
|
|
|
while (--nCount) {
|
|
//
|
|
// Create a 1-item item ID list for the next item in pidlMain.
|
|
//
|
|
pidlNextItem = Util::DuplicateItem (pMalloc, pidlItem);
|
|
if (pidlNextItem == NULL) {
|
|
pMalloc->Free(pidlMain);
|
|
psfFolder->Release ();
|
|
pMalloc->Release ();
|
|
return bResult;
|
|
}
|
|
|
|
//
|
|
// Bind to the folder specified in the new item ID list.
|
|
//
|
|
LPSHELLFOLDER psfNextFolder;
|
|
if (!SUCCEEDED (psfFolder->BindToObject (
|
|
pidlNextItem, NULL, IID_IShellFolder, (void**)&psfNextFolder))) {
|
|
pMalloc->Free (pidlNextItem);
|
|
pMalloc->Free (pidlMain);
|
|
psfFolder->Release ();
|
|
pMalloc->Release ();
|
|
return bResult;
|
|
}
|
|
|
|
//
|
|
// Release the IShellFolder pointer to the parent folder
|
|
// and set psfFolder equal to the IShellFolder pointer for
|
|
// the current folder.
|
|
//
|
|
psfFolder->Release ();
|
|
psfFolder = psfNextFolder;
|
|
|
|
//
|
|
// Release the storage for the 1-item item ID list we created
|
|
// just a moment ago and initialize pidlItem so that it points
|
|
// to the next item in pidlMain.
|
|
//
|
|
pMalloc->Free(pidlNextItem);
|
|
pidlItem = Util::GetNextItem (pidlItem);
|
|
}
|
|
|
|
//
|
|
// Get a pointer to the item's IContextMenu interface and call
|
|
// IContextMenu::QueryContextMenu to initialize a context menu.
|
|
//
|
|
ppidl = &pidlItem;
|
|
LPCONTEXTMENU pContextMenu;
|
|
if (SUCCEEDED (psfFolder->GetUIObjectOf (
|
|
hwnd, 1, (const ITEMIDLIST **)ppidl, IID_IContextMenu, NULL, (void**)&pContextMenu))) {
|
|
|
|
HMENU hMenu = CreatePopupMenu ();
|
|
if (SUCCEEDED (pContextMenu->QueryContextMenu (
|
|
hMenu, 0, 1, 0x7FFF, CMF_EXPLORE))) {
|
|
|
|
|
|
//
|
|
// Display the context menu.
|
|
//
|
|
UINT nCmd = TrackPopupMenu (hMenu, TPM_LEFTALIGN |
|
|
TPM_LEFTBUTTON | TPM_RIGHTBUTTON | TPM_RETURNCMD,
|
|
point.x, point.y, 0, hwnd, NULL);
|
|
|
|
|
|
//
|
|
// If a command was selected from the menu, execute it.
|
|
//
|
|
if (nCmd) {
|
|
CMINVOKECOMMANDINFO ici;
|
|
memset(&ici, 0, sizeof(ici) );
|
|
ici.cbSize = sizeof (CMINVOKECOMMANDINFO);
|
|
ici.fMask = 0;
|
|
ici.hwnd = hwnd;
|
|
ici.lpVerb = MAKEINTRESOURCEA (nCmd - 1);
|
|
ici.lpParameters = NULL;
|
|
ici.lpDirectory = NULL;
|
|
ici.nShow = SW_SHOWNORMAL;
|
|
ici.dwHotKey = 0;
|
|
ici.hIcon = NULL;
|
|
|
|
if (SUCCEEDED (
|
|
pContextMenu->InvokeCommand (
|
|
(CMINVOKECOMMANDINFO*)&ici)))
|
|
bResult = true;
|
|
}
|
|
}
|
|
DestroyMenu (hMenu);
|
|
pContextMenu->Release ();
|
|
}
|
|
}
|
|
pMalloc->Free (pidlMain);
|
|
}
|
|
|
|
//
|
|
// Clean up and return.
|
|
//
|
|
psfFolder->Release ();
|
|
pMalloc->Release ();
|
|
|
|
return bResult;
|
|
}
|
|
|
|
#endif
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
QLoggedProcess::QLoggedProcess(QObject *parent) : QProcess(parent)
|
|
{
|
|
setProcessChannelMode(QProcess::MergedChannels);
|
|
connect(this, SIGNAL(readyReadStandardOutput()), this, SLOT(onReadyReadStandardOutput()));
|
|
}
|
|
|
|
void QLoggedProcess::getLogAndClear(QByteArray &buffer)
|
|
{
|
|
QMutexLocker lck(&mutex);
|
|
buffer = log;
|
|
log.clear();
|
|
}
|
|
|
|
void QLoggedProcess::onReadyReadStandardOutput()
|
|
{
|
|
QMutexLocker lck(&mutex);
|
|
log.append(readAllStandardOutput());
|
|
}
|
|
|