From 166813cb918ebd029325e12377989bfdc2021074 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Sun, 7 Jun 2015 23:42:22 +0200
Subject: GH-1060 remove some old updater bits and pieces

---
 application/dialogs/UpdateDialog.cpp |  6 ------
 application/dialogs/UpdateDialog.h   |  2 --
 application/dialogs/UpdateDialog.ui  | 12 ++----------
 3 files changed, 2 insertions(+), 18 deletions(-)

(limited to 'application/dialogs')

diff --git a/application/dialogs/UpdateDialog.cpp b/application/dialogs/UpdateDialog.cpp
index d8f5d8ac..4240e3d5 100644
--- a/application/dialogs/UpdateDialog.cpp
+++ b/application/dialogs/UpdateDialog.cpp
@@ -21,7 +21,6 @@ UpdateDialog::UpdateDialog(bool hasUpdate, QWidget *parent) : QDialog(parent), u
 	{
 		ui->label->setText(tr("No %1 updates found. You are running the latest version.").arg(channel));
 		ui->btnUpdateNow->setDisabled(true);
-		ui->btnUpdateOnExit->setDisabled(true);
 	}
 	loadChangelog();
 }
@@ -129,8 +128,3 @@ void UpdateDialog::on_btnUpdateNow_clicked()
 {
 	done(UPDATE_NOW);
 }
-
-void UpdateDialog::on_btnUpdateOnExit_clicked()
-{
-	done(UPDATE_ONEXIT);
-}
diff --git a/application/dialogs/UpdateDialog.h b/application/dialogs/UpdateDialog.h
index b92c7473..5237df5c 100644
--- a/application/dialogs/UpdateDialog.h
+++ b/application/dialogs/UpdateDialog.h
@@ -28,7 +28,6 @@ enum UpdateAction
 {
 	UPDATE_LATER = QDialog::Rejected,
 	UPDATE_NOW = QDialog::Accepted,
-	UPDATE_ONEXIT = 2
 };
 
 class UpdateDialog : public QDialog
@@ -43,7 +42,6 @@ private:
 	Ui::UpdateDialog *ui;
 public slots:
 	void on_btnUpdateNow_clicked();
-	void on_btnUpdateOnExit_clicked();
 	void on_btnUpdateLater_clicked();
 
 	/// Starts loading the changelog
diff --git a/application/dialogs/UpdateDialog.ui b/application/dialogs/UpdateDialog.ui
index 06f4f086..cbe1ef74 100644
--- a/application/dialogs/UpdateDialog.ui
+++ b/application/dialogs/UpdateDialog.ui
@@ -46,8 +46,8 @@
       <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Bitstream Vera Sans'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p align=&quot;center&quot; style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:22pt;&quot;&gt;Loading changelog...&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Oxygen-Sans'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p align=&quot;center&quot; style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Bitstream Vera Sans'; font-size:22pt;&quot;&gt;Loading changelog...&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
      <property name="openExternalLinks">
       <bool>true</bool>
@@ -69,13 +69,6 @@ p, li { white-space: pre-wrap; }
        </property>
       </widget>
      </item>
-     <item>
-      <widget class="QPushButton" name="btnUpdateOnExit">
-       <property name="text">
-        <string>Update after MultiMC closes</string>
-       </property>
-      </widget>
-     </item>
      <item>
       <widget class="QPushButton" name="btnUpdateLater">
        <property name="sizePolicy">
@@ -96,7 +89,6 @@ p, li { white-space: pre-wrap; }
  <tabstops>
   <tabstop>changelogBrowser</tabstop>
   <tabstop>btnUpdateNow</tabstop>
-  <tabstop>btnUpdateOnExit</tabstop>
   <tabstop>btnUpdateLater</tabstop>
  </tabstops>
  <resources>
-- 
cgit v1.2.3