Mercurial > trustbridge
changeset 1003:db7e7156c824
(issue66) Only depend on is_system_install on windows to decide privilege raise
| author | Andre Heinecke <andre.heinecke@intevation.de> |
|---|---|
| date | Tue, 02 Sep 2014 10:50:04 +0200 |
| parents | e9ff3107b885 |
| children | 7dff5c0c569c |
| files | ui/installwrapper.cpp ui/mainwindow.cpp |
| diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ui/installwrapper.cpp Tue Sep 02 10:46:13 2014 +0200 +++ b/ui/installwrapper.cpp Tue Sep 02 10:50:04 2014 +0200 @@ -96,7 +96,7 @@ shExecInfo.cbSize = sizeof(SHELLEXECUTEINFOW); shExecInfo.fMask = SEE_MASK_NOCLOSEPROCESS; - if (!is_admin() || !is_system_install()) { + if (!is_system_install()) { shExecInfo.lpVerb = L"open"; } else { shExecInfo.lpVerb = L"runas";
--- a/ui/mainwindow.cpp Tue Sep 02 10:46:13 2014 +0200 +++ b/ui/mainwindow.cpp Tue Sep 02 10:50:04 2014 +0200 @@ -312,7 +312,7 @@ // shExecInfo.fMask = SEE_MASK_NOASYNC; shExecInfo.nShow = SW_SHOWDEFAULT; - if (!is_system_install() || !is_admin()) { + if (!is_system_install()) { shExecInfo.lpVerb = L"open"; } else { shExecInfo.lpVerb = L"runas"; @@ -623,7 +623,7 @@ mInstallButton = new QPushButton(" " + tr("Install certificates again")); mInstallButton->setFixedHeight(30); #ifdef Q_OS_WIN - if (is_admin() && is_system_install()) { + if (is_system_install()) { QIcon uacShield = QApplication::style()->standardIcon(QStyle::SP_VistaShield); mInstallButton->setIcon(uacShield); } @@ -1190,8 +1190,8 @@ unselected << mRemoveList->unselectedCertificates(); #ifdef Q_OS_WIN - if (!is_admin() || !is_system_install()) { - QMessageBox::information(this, + if (!is_system_install()) { + QMessageBox::warning(this, tr("Installation with standard user account"), tr("Windows will now ask you to confirm qeach root certificate modification " "because TrustBridge does not have the necessary privileges to install "