diff --git a/src/qt/qt_settings.cpp b/src/qt/qt_settings.cpp
index caabdbfca..67064b73a 100644
--- a/src/qt/qt_settings.cpp
+++ b/src/qt/qt_settings.cpp
@@ -50,6 +50,7 @@ public:
SettingsModel(QObject *parent)
: QAbstractListModel(parent)
{
+ fontHeight = QApplication::fontMetrics().height();
}
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
@@ -82,6 +83,7 @@ private:
"other_removable_devices",
"other_peripherals",
};
+ int fontHeight;
};
QVariant
@@ -94,6 +96,8 @@ SettingsModel::data(const QModelIndex &index, int role) const
return tr(pages.at(index.row()).toUtf8().data());
case Qt::DecorationRole:
return QIcon(QString("%1/%2.ico").arg(ProgSettings::getIconSetPath(), page_icons[index.row()]));
+ case Qt::SizeHintRole:
+ return QSize(-1, fontHeight * 2);
default:
return {};
}
@@ -182,9 +186,6 @@ Settings::Settings(QWidget *parent)
[this](const QModelIndex ¤t, const QModelIndex &previous) {
ui->stackedWidget->setCurrentIndex(current.row()); });
- ui->listView->resizeColumnsToContents();
- ui->listView->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);
-
ui->listView->setCurrentIndex(model->index(0, 0));
Settings::settings = this;
diff --git a/src/qt/qt_settings.ui b/src/qt/qt_settings.ui
index fd92f7f58..da31b98c4 100644
--- a/src/qt/qt_settings.ui
+++ b/src/qt/qt_settings.ui
@@ -36,25 +36,31 @@
0
-
-
-
- QAbstractItemView::NoEditTriggers
+
+
+
+ 0
+ 0
+
-
- QAbstractItemView::SingleSelection
+
+
+ 200
+ 0
+
-
- QAbstractItemView::SelectRows
+
+
+ 200
+ 16777215
+
-
- false
+
+ QListView::ListMode
+
+
+ true
-
- false
-
-
- false
-
-
diff --git a/src/qt/qt_settingsfloppycdrom.ui b/src/qt/qt_settingsfloppycdrom.ui
index d7ad853b3..b9a937d8d 100644
--- a/src/qt/qt_settingsfloppycdrom.ui
+++ b/src/qt/qt_settingsfloppycdrom.ui
@@ -7,7 +7,7 @@
0
0
544
- 617
+ 363
@@ -35,6 +35,18 @@
-
+
+
+ 0
+ 0
+
+
+
+
+ 16777215
+ 150
+
+
QAbstractItemView::NoEditTriggers
@@ -53,49 +65,38 @@
-
-
-
-
-
-
- Type:
-
-
-
- -
-
-
- 30
-
-
-
- -
-
-
- Turbo timings
-
-
-
- -
-
-
- Check BPB
-
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
+
+
+
-
+
+
+ Type:
+
+
+
+ -
+
+
+ 30
+
+
+
+ -
+
+
+ Turbo timings
+
+
+
+ -
+
+
+ Check BPB
+
+
+
+
+
-
@@ -106,6 +107,18 @@
-
+
+
+ 0
+ 0
+
+
+
+
+ 16777215
+ 150
+
+
QAbstractItemView::NoEditTriggers
@@ -124,64 +137,66 @@
-
-
-
-
-
-
- Bus:
-
-
-
- -
-
-
- Channel:
-
-
-
- -
-
-
- Speed:
-
-
-
- -
-
-
- Type:
-
-
-
- -
-
-
- 30
-
-
-
- -
-
-
- 30
-
-
-
- -
-
-
- 30
-
-
-
- -
-
-
- 30
-
-
-
-
+
+
+ -
+
+
+ Bus:
+
+
+
+ -
+
+
+ Channel:
+
+
+
+ -
+
+
+ Speed:
+
+
+
+ -
+
+
+ Type:
+
+
+
+ -
+
+
+ 30
+
+
+
+ -
+
+
+ 30
+
+
+
+ -
+
+
+ 30
+
+
+
+ -
+
+
+ 30
+
+
+
+
+
diff --git a/src/qt/qt_settingsotherremovable.ui b/src/qt/qt_settingsotherremovable.ui
index 219333376..8962184fc 100644
--- a/src/qt/qt_settingsotherremovable.ui
+++ b/src/qt/qt_settingsotherremovable.ui
@@ -7,7 +7,7 @@
0
0
418
- 433
+ 368
@@ -35,6 +35,18 @@
-
+
+
+ 0
+ 0
+
+
+
+
+ 16777215
+ 150
+
+
QAbstractItemView::NoEditTriggers
@@ -53,63 +65,52 @@
-
-
-
-
-
-
- Bus:
-
-
-
- -
-
-
- Channel:
-
-
-
- -
-
-
- 30
-
-
-
- -
-
-
- 30
-
-
-
- -
-
-
- Type:
-
-
-
- -
-
-
- 30
-
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
+
+
+
-
+
+
+ Bus:
+
+
+
+ -
+
+
+ Channel:
+
+
+
+ -
+
+
+ 30
+
+
+
+ -
+
+
+ 30
+
+
+
+ -
+
+
+ Type:
+
+
+
+ -
+
+
+ 30
+
+
+
+
+
-
@@ -120,6 +121,18 @@
-
+
+
+ 0
+ 0
+
+
+
+
+ 16777215
+ 150
+
+
QAbstractItemView::NoEditTriggers
@@ -138,43 +151,45 @@
-
-
-
-
-
-
- Bus:
-
-
-
- -
-
-
- 30
-
-
-
- -
-
-
- Channel:
-
-
-
- -
-
-
- 30
-
-
-
- -
-
-
- ZIP 250
-
-
-
-
+
+
+ -
+
+
+ Bus:
+
+
+
+ -
+
+
+ 30
+
+
+
+ -
+
+
+ Channel:
+
+
+
+ -
+
+
+ 30
+
+
+
+ -
+
+
+ ZIP 250
+
+
+
+
+