From 8420e7e3118cf543273bc2042cb08bd3f70f5e95 Mon Sep 17 00:00:00 2001
From: lordmulder <mulder2@gmx.de>
Date: Mon, 16 Dec 2013 22:58:21 +0100
Subject: [PATCH] Some fixes for updater dialog.

---
 gui/win_updater.ui  | 224 ++++++++++++++++++++++----------------------
 src/win_updater.cpp |  37 +++++---
 2 files changed, 139 insertions(+), 122 deletions(-)

diff --git a/gui/win_updater.ui b/gui/win_updater.ui
index accbc50..0ba1b91 100644
--- a/gui/win_updater.ui
+++ b/gui/win_updater.ui
@@ -9,7 +9,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>428</width>
+    <width>418</width>
     <height>247</height>
    </rect>
   </property>
@@ -355,22 +355,6 @@
            </item>
           </layout>
          </item>
-         <item>
-          <spacer name="verticalSpacer_7">
-           <property name="orientation">
-            <enum>Qt::Vertical</enum>
-           </property>
-           <property name="sizeType">
-            <enum>QSizePolicy::Fixed</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>20</width>
-             <height>8</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
          <item>
           <spacer name="verticalSpacer_6">
            <property name="orientation">
@@ -385,96 +369,117 @@
           </spacer>
          </item>
          <item>
-          <layout class="QHBoxLayout" name="horizontalLayout_7">
-           <item>
-            <spacer name="horizontalSpacer_6">
-             <property name="orientation">
-              <enum>Qt::Horizontal</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>40</width>
-               <height>0</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-           <item>
-            <widget class="QLabel" name="labelLoadingLeft">
-             <property name="text">
-              <string/>
-             </property>
-             <property name="pixmap">
-              <pixmap resource="../res/resources.qrc">:/buttons/transmit.png</pixmap>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <spacer name="horizontalSpacer_8">
-             <property name="orientation">
-              <enum>Qt::Horizontal</enum>
-             </property>
-             <property name="sizeType">
-              <enum>QSizePolicy::Fixed</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>3</width>
-               <height>20</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-           <item>
-            <widget class="QLabel" name="labelLoadingCenter">
-             <property name="text">
-              <string/>
-             </property>
-             <property name="pixmap">
-              <pixmap resource="../res/resources.qrc">:/images/loading.gif</pixmap>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <spacer name="horizontalSpacer_9">
-             <property name="orientation">
-              <enum>Qt::Horizontal</enum>
-             </property>
-             <property name="sizeType">
-              <enum>QSizePolicy::Fixed</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>3</width>
-               <height>20</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-           <item>
-            <widget class="QLabel" name="labelLoadingRight">
-             <property name="text">
-              <string/>
-             </property>
-             <property name="pixmap">
-              <pixmap resource="../res/resources.qrc">:/buttons/computer.png</pixmap>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <spacer name="horizontalSpacer_7">
-             <property name="orientation">
-              <enum>Qt::Horizontal</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>40</width>
-               <height>0</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-          </layout>
+          <spacer name="verticalSpacer_8">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>0</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QFrame" name="frameAnimation">
+           <property name="lineWidth">
+            <number>0</number>
+           </property>
+           <layout class="QHBoxLayout" name="horizontalLayout_7">
+            <property name="margin">
+             <number>0</number>
+            </property>
+            <item>
+             <spacer name="horizontalSpacer_6">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>0</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item>
+             <widget class="QLabel" name="labelLoadingLeft">
+              <property name="text">
+               <string/>
+              </property>
+              <property name="pixmap">
+               <pixmap resource="../res/resources.qrc">:/buttons/transmit.png</pixmap>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="horizontalSpacer_8">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeType">
+               <enum>QSizePolicy::Fixed</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>5</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item>
+             <widget class="QLabel" name="labelLoadingCenter">
+              <property name="text">
+               <string/>
+              </property>
+              <property name="pixmap">
+               <pixmap resource="../res/resources.qrc">:/images/loading.gif</pixmap>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="horizontalSpacer_9">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeType">
+               <enum>QSizePolicy::Fixed</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>5</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item>
+             <widget class="QLabel" name="labelLoadingRight">
+              <property name="text">
+               <string/>
+              </property>
+              <property name="pixmap">
+               <pixmap resource="../res/resources.qrc">:/buttons/computer.png</pixmap>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="horizontalSpacer_7">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>0</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </widget>
          </item>
          <item>
           <widget class="QLabel" name="labelBuildNo">
@@ -494,13 +499,10 @@
            <property name="orientation">
             <enum>Qt::Vertical</enum>
            </property>
-           <property name="sizeType">
-            <enum>QSizePolicy::Fixed</enum>
-           </property>
            <property name="sizeHint" stdset="0">
             <size>
              <width>20</width>
-             <height>10</height>
+             <height>0</height>
             </size>
            </property>
           </spacer>
diff --git a/src/win_updater.cpp b/src/win_updater.cpp
index caca516..bd398ce 100644
--- a/src/win_updater.cpp
+++ b/src/win_updater.cpp
@@ -42,14 +42,18 @@
 #define UPDATE_TEXT(N, TEXT) ui->label_phase##N->setText((TEXT))
 #define UPDATE_ICON(N, ICON) ui->icon_phase##N->setPixmap(QIcon(":/buttons/" ICON ".png").pixmap(16, 16))
 
+/*
+ui->labelLoadingLeft->setVisible((FLAG)); \
+ui->labelLoadingCenter->setVisible((FLAG)); \
+ui->labelLoadingRight->setVisible((FLAG)); \
+*/
+
 #define SHOW_ANIMATION(FLAG) do  \
 { \
-	ui->labelLoadingLeft->setVisible((FLAG)); \
-	ui->labelLoadingCenter->setVisible((FLAG)); \
-	ui->labelLoadingRight->setVisible((FLAG)); \
-	ui->labelBuildNo->setVisible(!(FLAG)); \
+	ui->frameAnimation->setVisible((FLAG)); \
 	ui->labelInfo->setVisible(!(FLAG)); \
 	ui->labelUrl->setVisible(!(FLAG)); \
+	ui->labelBuildNo->setVisible(!(FLAG)); \
 	if((FLAG)) m_animator->start(); else m_animator->stop(); \
 } \
 while(0)
@@ -88,17 +92,14 @@ UpdaterDialog::UpdaterDialog(QWidget *parent, const QString &binDir)
 	//Init animation
 	m_animator = new QMovie(":/images/loading.gif");
 	ui->labelLoadingCenter->setMovie(m_animator);
-	m_animator->start();
 
 	//Init buttons
 	ui->buttonCancel->setEnabled(false);
 	ui->buttonRetry->hide();
 	ui->buttonDownload->hide();
 
-	//Hide labels
-	ui->labelInfo->hide();
-	ui->labelUrl->hide();
-	ui->labelBuildNo->hide();
+	//Start animation
+	SHOW_ANIMATION(true);
 }
 
 UpdaterDialog::~UpdaterDialog(void)
@@ -192,8 +193,21 @@ void UpdaterDialog::initUpdate(void)
 	{
 		ui->buttonCancel->setEnabled(true);
 		QMessageBox::critical(this, tr("File Error"), tr("At least one file required by web-update is missing or corrupted.<br>Please re-install this application and then try again!"));
-		close();
-		return;
+		close(); return;
+	}
+
+	//Make sure user does have admin access
+	if(!x264_user_is_admin())
+	{
+		qWarning("User is not in the \"admin\" group, cannot update!");
+		QString message;
+		message += QString("<nobr>%1</nobr><br>").arg(tr("Sorry, but only users in the \"Administrators\" group can install updates."));
+		message += QString("<nobr>%1</nobr>").arg(tr("Please start application from an administrator account and try again!"));
+		if(QMessageBox::critical(this, this->windowTitle(), message, tr("Discard"), tr("Ignore")) != 1)
+		{
+			ui->buttonCancel->setEnabled(true);
+			close(); return;
+		}
 	}
 	
 	//Create and setup thread
@@ -464,6 +478,7 @@ bool UpdaterDialog::checkBinaries(QString &wgetBin, QString &gpgvBin)
 		{
 			binaries.insert(FILE_INFO[i].name, binPath);
 		}
+		QApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
 	}
 
 	if(okay)