github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Bazaar/SysExecGui : provided fake windows analogs to keep the interface uniform

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@3069 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
micio 2011-01-23 12:17:19 +00:00
parent 4a61f6507d
commit 5e53a3234b
2 changed files with 69 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

67
bazaar/SysExecGui/SysExecGui.cpp
View file

@ -58,7 +58,7 @@ bool PasswordDlg::Run(String const &u)
while(true)
{
pwd.Clear();
PopUp(NULL, false, true, true, true);
PopUp(NULL, false, false, true, true);
pwd.SetFocus();
switch(Execute())
{
@ -90,6 +90,7 @@ static PasswordDlg &pDlg()
// return true on success, false otherwise
bool SysStartAdmin(String const &command, String const &args, const VectorMap<String, String> &Environ)
{
PasswordDlg *pp = &(pDlg());
if(!pDlg().Run())
return false;
return SysStartAdmin(pDlg().GetPassword(), command, args, Environ);
@ -161,6 +162,70 @@ bool SysExecUser(String const &user, String const &command, String const &args)
return SysExecUser(user, pDlg().GetPassword(), command, args);
}
#else
///////////////////////////////////////////////////////////////////////////////////////////////
// executes an external command as Admin user, passing a command line to it without waiting for its termination
// it WILL prompt for user intervention on windows secure systems (Vista+ OSes), on which the password is useless
// on linux, will return an error if password is wrong
// return true on success, false otherwise
bool SysStartAdmin(String const &command, String const &args, const VectorMap<String, String> &Environ)
{
return SysStartAdmin("", command, args, Environ);
}
bool SysStartAdmin(String const &command, String const &args)
{
return SysStartAdmin("", command, args);
}
///////////////////////////////////////////////////////////////////////////////////////////////
// executes an external command as required user, passing a command line to it without waiting for its termination
// on linux, will return an error if password is required AND wrong
// on windows, by now... it just spawn the process without changing security level
// I still shall find a way to go back to user mode on windows
// return true on success, false otherwise
bool SysStartUser(String const &user, String const &command, String const &args, const VectorMap<String, String> &Environ)
{
return SysStartUser(user, "", command, args, Environ);
}
bool SysStartUser(String const &user, String const &command, String const &args)
{
return SysStartUser(user, "", command, args);
}
///////////////////////////////////////////////////////////////////////////////////////////////
// executes an external command as Admin user, passing a command line to it waiting for its termination
// it WILL prompt for user intervention on windows secure systems (Vista+ OSes), on which the password is useless
// on linux, will return an error if password is wrong
// return true on success, false otherwise
bool SysExecAdmin(String const &command, String const &args, const VectorMap<String, String> &Environ)
{
return SysExecAdmin("", command, args, Environ);
}
bool SysExecAdmin(String const &command, String const &args)
{
return SysExecAdmin("", command, args);
}
///////////////////////////////////////////////////////////////////////////////////////////////
// executes an external command as required user, passing a command line to it waiting for its termination
// on linux, will return an error if password is required AND wrong
// on windows, by now... it just spawn the process without changing security level
// I still shall find a way to go back to user mode on windows
// return true on success, false otherwise
bool SysExecUser(String const &user, String const &command, String const &args, const VectorMap<String, String> &Environ)
{
return SysExecUser(user, "", command, args, Environ);
}
bool SysExecUser(String const &user, String const &command, String const &args)
{
return SysExecUser(user, "", command, args);
}
#endif
END_UPP_NAMESPACE

8
bazaar/SysExecGui/SysExecGui.h
View file

@ -5,10 +5,10 @@
NAMESPACE_UPP
#ifdef PLATFORM_POSIX
///////////////////////////////////////////////////////////////////////////////////////////////
// SysXXXAdmin and SysXXXUser function with gui password frontend
// SysXXXAdmin and SysXXXUser function with gui password frontend (for POSIX)
// For windows you don't have the password dialog, but do have uniform interface
// we propose them too -- they just don't show the interface prompt but the UAC one
///////////////////////////////////////////////////////////////////////////////////////////////
// executes an external command as Admin user, passing a command line to it without waiting for its termination
@ -44,8 +44,6 @@ bool SysExecAdmin(String const &command, String const &args);
bool SysExecUser(String const &user, String const &command, String const &args, const VectorMap<String, String> &Environ);
bool SysExecUser(String const &user, String const &command, String const &args);
#endif
END_UPP_NAMESPACE
#endif