diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2020-11-22 11:19:41 +0100 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2020-11-22 14:43:01 +0100 |
commit | ba2bbd60bd3d8a9fa204b17686c33dfb0337b07c (patch) | |
tree | 1c2865adab8e956fe65180e56d87f8380754ba7a /rbutil/rbutilqt/rbutilqt.cpp | |
parent | 5f36aed4bfd5e78a9edc322b8dae2c1e10ff733d (diff) | |
download | rockbox-ba2bbd60bd3d8a9fa204b17686c33dfb0337b07c.tar.gz rockbox-ba2bbd60bd3d8a9fa204b17686c33dfb0337b07c.zip |
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
Diffstat (limited to 'rbutil/rbutilqt/rbutilqt.cpp')
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index d996eddfe1..a250e4f252 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp | |||
@@ -38,7 +38,6 @@ | |||
38 | #include "serverinfo.h" | 38 | #include "serverinfo.h" |
39 | #include "systeminfo.h" | 39 | #include "systeminfo.h" |
40 | #include "ziputil.h" | 40 | #include "ziputil.h" |
41 | #include "manualwidget.h" | ||
42 | #include "infowidget.h" | 41 | #include "infowidget.h" |
43 | #include "selectiveinstallwidget.h" | 42 | #include "selectiveinstallwidget.h" |
44 | #include "backupdialog.h" | 43 | #include "backupdialog.h" |
@@ -136,12 +135,6 @@ RbUtilQt::RbUtilQt(QWidget *parent) : QMainWindow(parent) | |||
136 | m_gotInfo = false; | 135 | m_gotInfo = false; |
137 | m_auto = false; | 136 | m_auto = false; |
138 | 137 | ||
139 | // insert ManualWidget() widget in manual tab | ||
140 | QGridLayout *mantablayout = new QGridLayout(this); | ||
141 | ui.manual->setLayout(mantablayout); | ||
142 | manual = new ManualWidget(this); | ||
143 | mantablayout->addWidget(manual); | ||
144 | |||
145 | // selective "install" tab. | 138 | // selective "install" tab. |
146 | QGridLayout *selectivetablayout = new QGridLayout(this); | 139 | QGridLayout *selectivetablayout = new QGridLayout(this); |
147 | ui.selective->setLayout(selectivetablayout); | 140 | ui.selective->setLayout(selectivetablayout); |
@@ -358,7 +351,6 @@ void RbUtilQt::updateSettings() | |||
358 | { | 351 | { |
359 | LOG_INFO() << "updating current settings"; | 352 | LOG_INFO() << "updating current settings"; |
360 | updateDevice(); | 353 | updateDevice(); |
361 | manual->updateManual(); | ||
362 | QString c = RbSettings::value(RbSettings::CachePath).toString(); | 354 | QString c = RbSettings::value(RbSettings::CachePath).toString(); |
363 | HttpGet::setGlobalCache(c.isEmpty() ? QDir::tempPath() : c); | 355 | HttpGet::setGlobalCache(c.isEmpty() ? QDir::tempPath() : c); |
364 | HttpGet::setGlobalProxy(proxy()); | 356 | HttpGet::setGlobalProxy(proxy()); |