Skip to content

Commit ef8c6bf

Browse files
authored
Merge pull request #119 from rsyncOSX/version-3.0.0
update
2 parents 1b22674 + b5b9c90 commit ef8c6bf

2 files changed

Lines changed: 30 additions & 23 deletions

File tree

RsyncUI/Views/Detailsview/SummarizedDetailsContentView.swift

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -137,20 +137,24 @@ struct SummarizedDetailsContentView: View {
137137
Table(progressdetails.estimatedlist ?? [],
138138
selection: $selecteduuids) {
139139
TableColumn("Synchronize ID") { data in
140-
if data.datatosynchronize {
141-
if data.backupID.isEmpty == true {
142-
Text("No ID set")
143-
.foregroundStyle(.blue)
144-
} else {
145-
Text(data.backupID)
146-
.foregroundStyle(.blue)
147-
}
148-
} else {
149-
if data.backupID.isEmpty == true {
150-
Text("No ID set")
140+
HStack(spacing: 4) {
141+
if data.datatosynchronize {
142+
if data.backupID.isEmpty == true {
143+
Text("No ID set")
144+
.foregroundStyle(.blue)
145+
} else {
146+
Text(data.backupID)
147+
.foregroundStyle(.blue)
148+
}
151149
} else {
152-
Text(data.backupID)
150+
if data.backupID.isEmpty == true {
151+
Text("No ID set")
152+
} else {
153+
Text(data.backupID)
154+
}
153155
}
156+
157+
ConfigurationTaskBadge(task: data.task)
154158
}
155159
}
156160
.width(min: 80, max: 120)

RsyncUI/Views/Profiles/ProfilesToUpdateView.swift

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,24 @@ struct ProfilesToUpdateView: View {
1414
var body: some View {
1515
Table(allconfigurations) {
1616
TableColumn("Synchronize ID : profilename") { data in
17-
let split = data.backupID.split(separator: " : ")
18-
if split.count > 1 {
19-
let left = Text(String(split[0]))
20-
let middle = Text(" : ")
21-
let right = Text(String(split[1])).foregroundStyle(.blue)
22-
Text("\(left)\(middle)\(right)")
23-
} else {
24-
Text(data.backupID)
17+
18+
HStack(spacing: 4) {
19+
20+
let split = data.backupID.split(separator: " : ")
21+
if split.count > 1 {
22+
let left = Text(String(split[0]))
23+
let middle = Text(" : ")
24+
let right = Text(String(split[1])).foregroundStyle(.blue)
25+
Text("\(left)\(middle)\(right)")
26+
} else {
27+
Text(data.backupID)
28+
}
29+
30+
ConfigurationTaskBadge(task: data.task)
2531
}
2632
}
2733
.width(min: 150, max: 300)
2834

29-
TableColumn("Task", value: \.task)
30-
.width(max: 80)
31-
3235
TableColumn("Time last") { data in
3336
var seconds: Double {
3437
if let date = data.dateRun {

0 commit comments

Comments
 (0)