Skip to content

Commit e153bb7

Browse files
john-michaelburkejohn-michaelburke
committed
Copy from table and log level default.
1 parent e00c900 commit e153bb7

File tree

13 files changed

+49
-91
lines changed

13 files changed

+49
-91
lines changed

‎console_backend/src/cli_options.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ pub struct CliOptions {
104104
#[clap(long = "sbp-log")]
105105
pub sbp_log: Option<CliSbpLogging>,
106106

107-
/// Set Console Log Level Filter. Default: INFO.
107+
/// Set Console Log Level Filter. Default: WARNING.
108108
#[clap(long = "log-level")]
109109
pub log_level: Option<CliLogLevel>,
110110

@@ -305,7 +305,7 @@ pub fn handle_cli(opt: CliOptions, conn_manager: &ConnectionManager, shared_stat
305305
let log_level = if let Some(log_level_) = opt.log_level {
306306
(*log_level_).clone()
307307
} else {
308-
LogLevel::INFO
308+
LogLevel::WARNING
309309
};
310310
shared_state.set_log_level(log_level);
311311
let mut shared_data = shared_state.lock();

‎console_backend/src/shared_state.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ pub struct LogPanelState {
442442
impl LogPanelState {
443443
fn new() -> LogPanelState {
444444
LogPanelState {
445-
log_level: LogLevel::INFO,
445+
log_level: LogLevel::WARNING,
446446
}
447447
}
448448
}

‎resources/AdvancedTabComponents/MetricsMonitor.qml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,10 +150,12 @@ Item {
150150
height: parent.height
151151
anchors.centerIn: parent
152152
onPressed: {
153-
if (selectedRow == row)
153+
if (selectedRow == row) {
154154
selectedRow = -1;
155-
else
155+
} else {
156156
selectedRow = row;
157+
Globals.copyClipboard = JSON.stringify(tableView.model.getRow(selectedRow));
158+
}
157159
}
158160
}
159161

‎resources/AdvancedTabComponents/NetworkInfo.qml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,10 +147,12 @@ ColumnLayout {
147147
height: parent.height
148148
anchors.centerIn: parent
149149
onPressed: {
150-
if (selectedRow == row)
150+
if (selectedRow == row) {
151151
selectedRow = -1;
152-
else
152+
} else {
153153
selectedRow = row;
154+
Globals.copyClipboard = JSON.stringify(table.model.getRow(selectedRow));
155+
}
154156
}
155157
}
156158

‎resources/AdvancedTabComponents/ThreadStateTable.qml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,10 +139,12 @@ Item {
139139
height: parent.height
140140
anchors.centerIn: parent
141141
onPressed: {
142-
if (selectedRow == row)
142+
if (selectedRow == row) {
143143
selectedRow = -1;
144-
else
144+
} else {
145145
selectedRow = row;
146+
Globals.copyClipboard = JSON.stringify(tableView.model.getRow(selectedRow));
147+
}
146148
}
147149
}
148150

‎resources/BaselineTabComponents/BaselineTable.qml‎

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -102,24 +102,6 @@ Item {
102102

103103
}
104104

105-
TextEdit {
106-
id: textEdit
107-
108-
visible: false
109-
}
110-
111-
Shortcut {
112-
sequences: [StandardKey.Copy]
113-
onActivated: {
114-
if (selectedRow != -1) {
115-
textEdit.text = JSON.stringify(tableView.model.getRow(selectedRow));
116-
textEdit.selectAll();
117-
textEdit.copy();
118-
selectedRow = -1;
119-
}
120-
}
121-
}
122-
123105
TableView {
124106
id: tableView
125107

@@ -181,10 +163,12 @@ Item {
181163
height: parent.height
182164
anchors.centerIn: parent
183165
onPressed: {
184-
if (selectedRow == row)
166+
if (selectedRow == row) {
185167
selectedRow = -1;
186-
else
168+
} else {
187169
selectedRow = row;
170+
Globals.copyClipboard = JSON.stringify(tableView.model.getRow(selectedRow));
171+
}
188172
}
189173
}
190174

‎resources/Constants/Globals.qml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,5 @@ QtObject {
1515
property int minimumWidth: 1050
1616
property string conn_state: Constants.connection.disconnected
1717
property bool connected_at_least_once: false
18+
property string copyClipboard: ""
1819
}

‎resources/LogPanel.qml‎

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -24,24 +24,6 @@ Item {
2424
Rectangle {
2525
anchors.fill: parent
2626

27-
TextEdit {
28-
id: textEdit
29-
30-
visible: false
31-
}
32-
33-
Shortcut {
34-
sequences: [StandardKey.Copy]
35-
onActivated: {
36-
if (selectedRow != -1) {
37-
textEdit.text = JSON.stringify(tableView.model.getRow(selectedRow));
38-
textEdit.selectAll();
39-
textEdit.copy();
40-
selectedRow = -1;
41-
}
42-
}
43-
}
44-
4527
Item {
4628
anchors.fill: parent
4729
anchors.topMargin: Constants.genericTable.cellHeight
@@ -292,10 +274,12 @@ Item {
292274
height: parent.height
293275
anchors.centerIn: parent
294276
onPressed: {
295-
if (selectedRow == row)
277+
if (selectedRow == row) {
296278
selectedRow = -1;
297-
else
279+
} else {
298280
selectedRow = row;
281+
Globals.copyClipboard = JSON.stringify(tableView.model.getRow(selectedRow));
282+
}
299283
}
300284
}
301285

‎resources/SettingsTabComponents/SettingsTable.qml‎

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -101,24 +101,6 @@ Item {
101101

102102
}
103103

104-
TextEdit {
105-
id: textEdit
106-
107-
visible: false
108-
}
109-
110-
Shortcut {
111-
sequences: [StandardKey.Copy]
112-
onActivated: {
113-
if (selectedRowIdx != -1) {
114-
textEdit.text = JSON.stringify(tableView.model.getRow(selectedRowIdx));
115-
textEdit.selectAll();
116-
textEdit.copy();
117-
selectedRowIdx = -1;
118-
}
119-
}
120-
}
121-
122104
TableView {
123105
id: tableView
124106

@@ -187,10 +169,12 @@ Item {
187169
height: parent.height
188170
anchors.centerIn: parent
189171
onPressed: {
190-
if (selectedRowIdx == row)
172+
if (selectedRowIdx == row) {
191173
selectedRowIdx = -1;
192-
else
174+
} else {
193175
selectedRowIdx = row;
176+
Globals.copyClipboard = JSON.stringify(tableView.model.getRow(selectedRowIdx));
177+
}
194178
}
195179
}
196180

‎resources/SolutionTabComponents/SolutionTable.qml‎

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -101,24 +101,6 @@ Item {
101101

102102
}
103103

104-
TextEdit {
105-
id: textEdit
106-
107-
visible: false
108-
}
109-
110-
Shortcut {
111-
sequences: [StandardKey.Copy]
112-
onActivated: {
113-
if (selectedRow != -1) {
114-
textEdit.text = JSON.stringify(tableView.model.getRow(selectedRow));
115-
textEdit.selectAll();
116-
textEdit.copy();
117-
selectedRow = -1;
118-
}
119-
}
120-
}
121-
122104
TableView {
123105
id: tableView
124106

@@ -180,10 +162,12 @@ Item {
180162
height: parent.height
181163
anchors.centerIn: parent
182164
onPressed: {
183-
if (selectedRow == row)
165+
if (selectedRow == row) {
184166
selectedRow = -1;
185-
else
167+
} else {
186168
selectedRow = row;
169+
Globals.copyClipboard = JSON.stringify(tableView.model.getRow(selectedRow));
170+
}
187171
}
188172
}
189173

0 commit comments

Comments
 (0)