rbutil: Move Manual installation to main tab.

The manual tab didn't show the manual, so it's clearer to have that as
part of the main tab.

Also fixes the wrong manual getting downloaded for releases.

Change-Id: I5d4a287102af037f94f0de8464e025d9ff5f76ed
This commit is contained in:
Dominik Riebeling 2020-11-22 11:19:41 +01:00
parent 5f36aed4bf
commit ba2bbd60bd
16 changed files with 221 additions and 446 deletions

View file

@ -38,7 +38,6 @@
#include "serverinfo.h"
#include "systeminfo.h"
#include "ziputil.h"
#include "manualwidget.h"
#include "infowidget.h"
#include "selectiveinstallwidget.h"
#include "backupdialog.h"
@ -136,12 +135,6 @@ RbUtilQt::RbUtilQt(QWidget *parent) : QMainWindow(parent)
m_gotInfo = false;
m_auto = false;
// insert ManualWidget() widget in manual tab
QGridLayout *mantablayout = new QGridLayout(this);
ui.manual->setLayout(mantablayout);
manual = new ManualWidget(this);
mantablayout->addWidget(manual);
// selective "install" tab.
QGridLayout *selectivetablayout = new QGridLayout(this);
ui.selective->setLayout(selectivetablayout);
@ -358,7 +351,6 @@ void RbUtilQt::updateSettings()
{
LOG_INFO() << "updating current settings";
updateDevice();
manual->updateManual();
QString c = RbSettings::value(RbSettings::CachePath).toString();
HttpGet::setGlobalCache(c.isEmpty() ? QDir::tempPath() : c);
HttpGet::setGlobalProxy(proxy());