Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions src/webui/www/private/css/dynamicTable.css
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,17 @@
padding: 2px;
}

:root.compact .dynamicTable td {
padding-bottom: 4px;
padding-top: 4px;
}

:root.compact #torrentFilesTableDiv .dynamicTable td,
:root.compact #bulkRenameFilesTableDiv .dynamicTable td {
padding-bottom: 2px;
padding-top: 2px;
}

.dynamicTableDiv table.dynamicTable tbody tr.selected {
background-color: var(--color-background-blue);
color: var(--color-text-white);
Expand Down
19 changes: 13 additions & 6 deletions src/webui/www/private/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,12 @@ body {
text-align: left;
}

:root.compact body {
--icon-size: 13px;

line-height: 1.2;
}

/* targets dialog windows loaded via iframes */
body:not(:has(#desktop)) {
background-color: var(--color-background-popup);
Expand Down Expand Up @@ -690,14 +696,13 @@ td.noWrap {

.filesTableCollapseIcon {
cursor: pointer;
height: 15px;
margin-bottom: -3px;
padding-right: 5px;
width: 15px;
height: var(--icon-size, 15px);
margin-right: 5px;
vertical-align: top;
width: var(--icon-size, 15px);
}

.filesTableCollapseIcon.rotate {
margin-bottom: -1px;
transform: rotate(270deg);
}

Expand Down Expand Up @@ -777,7 +782,9 @@ td.noWrap {

.combo_priority {
font-size: 1em;
padding: 2px 6px;
height: 1.5em;
padding: 0 6px;
vertical-align: top;
}

td.statusBarSeparator {
Expand Down
2 changes: 2 additions & 0 deletions src/webui/www/private/scripts/client.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ window.qBittorrent.Client ??= (() => {
"dblclick_complete",
"dblclick_download",
"dblclick_filter",
"display_density",
"full_url_tracker_column",
"hide_zero_status_filters",
"qbt_selected_log_levels",
Expand Down Expand Up @@ -299,6 +300,7 @@ window.addEventListener("DOMContentLoaded", async (event) => {

await window.qBittorrent.Client.initializeClientData();
window.qBittorrent.ColorScheme.update();
document.documentElement.classList.toggle("compact", clientData.get("display_density") === "compact");

useAutoHideZeroStatusFilters = clientData.get("hide_zero_status_filters") === true;
displayFullURLTrackerColumn = clientData.get("full_url_tracker_column") === true;
Expand Down
32 changes: 12 additions & 20 deletions src/webui/www/private/scripts/dynamicTable.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ window.qBittorrent.DynamicTable ??= (() => {
this.hiddenTableHeader = this.dynamicTableDiv.querySelector("thead tr");
this.table = this.dynamicTableDiv.querySelector("table");
this.tableBody = this.dynamicTableDiv.querySelector("tbody");
this.rowHeight = 26;
this.rowHeight = (clientData.get("display_density") === "compact") ? 22 : 26;
this.rows = new Map();
this.cachedElements = [];
this.selectedRows = [];
Expand Down Expand Up @@ -1100,7 +1100,7 @@ window.qBittorrent.DynamicTable ??= (() => {
class TorrentsTable extends DynamicTable {
setupVirtualList() {
super.setupVirtualList();
this.rowHeight = 22;
this.rowHeight = (clientData.get("display_density") === "compact") ? 18 : 22;
}

initColumns() {
Expand Down Expand Up @@ -2425,11 +2425,6 @@ window.qBittorrent.DynamicTable ??= (() => {
this.collapseState.clear();
}

setupVirtualList() {
super.setupVirtualList();
this.rowHeight = 29.5;
}

expandFolder(id) {
if (!this.supportCollapsing)
return;
Expand Down Expand Up @@ -2541,7 +2536,7 @@ window.qBittorrent.DynamicTable ??= (() => {
if (td.firstElementChild === null) {
const treeImg = document.createElement("img");
treeImg.src = "images/L.svg";
treeImg.style.marginBottom = "-2px";
treeImg.style.verticalAlign = "top";
td.append(treeImg);
}

Expand Down Expand Up @@ -2594,9 +2589,10 @@ window.qBittorrent.DynamicTable ??= (() => {
if (dirImg === undefined) {
dirImg = document.createElement("img");
dirImg.src = "images/directory.svg";
dirImg.style.width = "20px";
dirImg.style.paddingRight = "5px";
dirImg.style.marginBottom = "-3px";
dirImg.style.height = "18px";
dirImg.style.width = "18px";
dirImg.style.marginRight = "5px";
dirImg.style.verticalAlign = "top";
td.append(dirImg);
}
dirImg.style.display = node.isFolder ? "inline" : "none";
Expand Down Expand Up @@ -2817,11 +2813,6 @@ window.qBittorrent.DynamicTable ??= (() => {
supportCollapsing = false;
fileNameColumn = "original";

setupVirtualList() {
super.setupVirtualList();
this.rowHeight = 29;
}

getSelectedRows() {
const nodes = this.fileTree.toArray();
return nodes.filter(x => x.checked === 0);
Expand Down Expand Up @@ -2909,7 +2900,7 @@ window.qBittorrent.DynamicTable ??= (() => {
if (td.firstElementChild === null) {
const treeImg = document.createElement("img");
treeImg.src = "images/L.svg";
treeImg.style.marginBottom = "-2px";
treeImg.style.verticalAlign = "top";
td.append(treeImg);
}

Expand Down Expand Up @@ -2974,9 +2965,10 @@ window.qBittorrent.DynamicTable ??= (() => {
if (dirImg === undefined) {
dirImg = document.createElement("img");
dirImg.src = "images/directory.svg";
dirImg.style.width = "20px";
dirImg.style.paddingRight = "5px";
dirImg.style.marginBottom = "-3px";
dirImg.style.height = "18px";
dirImg.style.width = "18px";
dirImg.style.marginRight = "5px";
dirImg.style.verticalAlign = "top";
td.append(dirImg);
}
if (node.isFolder) {
Expand Down
25 changes: 19 additions & 6 deletions src/webui/www/private/views/preferences.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,21 @@

<fieldset class="settings">
<legend>QBT_TR(Interface)QBT_TR[CONTEXT=OptionsDialog]</legend>
<label for="colorSchemeSelect">QBT_TR(Color scheme:)QBT_TR[CONTEXT=OptionsDialog]</label>
<select id="colorSchemeSelect">
<option value="0">QBT_TR(Auto)QBT_TR[CONTEXT=OptionsDialog]</option>
<option value="1">QBT_TR(Light)QBT_TR[CONTEXT=OptionsDialog]</option>
<option value="2">QBT_TR(Dark)QBT_TR[CONTEXT=OptionsDialog]</option>
</select>
<div class="formRow" style="margin-bottom: 3px;">
<label for="colorSchemeSelect">QBT_TR(Color scheme:)QBT_TR[CONTEXT=OptionsDialog]</label>
<select id="colorSchemeSelect">
<option value="0">QBT_TR(Auto)QBT_TR[CONTEXT=OptionsDialog]</option>
<option value="1">QBT_TR(Light)QBT_TR[CONTEXT=OptionsDialog]</option>
<option value="2">QBT_TR(Dark)QBT_TR[CONTEXT=OptionsDialog]</option>
</select>
</div>
<div class="formRow">
<label for="displayDensitySelect">QBT_TR(Display density:)QBT_TR[CONTEXT=OptionsDialog]</label>
<select id="displayDensitySelect">
<option value="default">QBT_TR(Default)QBT_TR[CONTEXT=OptionsDialog]</option>
<option value="compact">QBT_TR(Compact)QBT_TR[CONTEXT=OptionsDialog]</option>
</select>
</div>
</fieldset>

<fieldset class="settings">
Expand Down Expand Up @@ -2262,6 +2271,7 @@
.then((pref) => {
const clientData = window.parent.qBittorrent.ClientData;
const colorScheme = clientData.get("color_scheme");
const displayDensity = clientData.get("display_density") ?? "default";
const fullUrlTrackerColumn = clientData.get("full_url_tracker_column");
const useVirtualList = clientData.get("use_virtual_list");
const hideZeroStatusFilters = clientData.get("hide_zero_status_filters");
Expand All @@ -2274,6 +2284,7 @@
// Language
updateWebuiLocaleSelect(pref.locale);
updateColoSchemeSelect(colorScheme);
document.getElementById("displayDensitySelect").value = displayDensity;

document.getElementById("statusBarExternalIP").checked = pref.status_bar_external_ip;
document.getElementById("performanceWarning").checked = pref.performance_warning;
Expand Down Expand Up @@ -2721,6 +2732,8 @@
clientData.color_scheme = "light";
else
clientData.color_scheme = "dark";
const displayDensity = document.getElementById("displayDensitySelect").value;
clientData.display_density = (displayDensity === "default") ? null : displayDensity;
settings["status_bar_external_ip"] = document.getElementById("statusBarExternalIP").checked;
settings["performance_warning"] = document.getElementById("performanceWarning").checked;
clientData.full_url_tracker_column = document.getElementById("displayFullURLTrackerColumn").checked;
Expand Down
Loading