[PATCH 2 of 2] (issue66) Only depend on is_system_install on windows to decide privilege raise

[Wald Commits]

# HG changeset patch
# User Andre Heinecke <andre.heinecke at intevation.de>
# Date 1409647804 -7200
# Node ID db7e7156c8246da5cc0cff0d15a5e36139566823
# Parent  e9ff3107b885ebd26faa65f6cca1909d4c82b843
(issue66) Only depend on is_system_install on windows to decide privilege raise

diff -r e9ff3107b885 -r db7e7156c824 ui/installwrapper.cpp
--- 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";
diff -r e9ff3107b885 -r db7e7156c824 ui/mainwindow.cpp
--- 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 "