diff options
author | Petr Mrázek <peterix@gmail.com> | 2015-06-07 23:42:22 +0200 |
---|---|---|
committer | Petr Mrázek <peterix@gmail.com> | 2015-06-09 00:03:42 +0200 |
commit | 166813cb918ebd029325e12377989bfdc2021074 (patch) | |
tree | 19a1a5a7e3503ccb85c9ac46bcb45e1bef19361e /application/dialogs | |
parent | 38e42ad79493afb759181fa5cead90c9b3483655 (diff) | |
download | MultiMC-166813cb918ebd029325e12377989bfdc2021074.tar MultiMC-166813cb918ebd029325e12377989bfdc2021074.tar.gz MultiMC-166813cb918ebd029325e12377989bfdc2021074.tar.lz MultiMC-166813cb918ebd029325e12377989bfdc2021074.tar.xz MultiMC-166813cb918ebd029325e12377989bfdc2021074.zip |
GH-1060 remove some old updater bits and pieces
Diffstat (limited to 'application/dialogs')
-rw-r--r-- | application/dialogs/UpdateDialog.cpp | 6 | ||||
-rw-r--r-- | application/dialogs/UpdateDialog.h | 2 | ||||
-rw-r--r-- | application/dialogs/UpdateDialog.ui | 12 |
3 files changed, 2 insertions, 18 deletions
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><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Bitstream Vera Sans'; font-size:11pt; font-weight:400; font-style:normal;"> -<p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:22pt;">Loading changelog...</span></p></body></html></string> +</style></head><body style=" font-family:'Oxygen-Sans'; font-size:11pt; font-weight:400; font-style:normal;"> +<p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Bitstream Vera Sans'; font-size:22pt;">Loading changelog...</span></p></body></html></string> </property> <property name="openExternalLinks"> <bool>true</bool> @@ -70,13 +70,6 @@ p, li { white-space: pre-wrap; } </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"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> @@ -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> |