Skip to content

Commit 36e925c

Browse files
committed
[WASimUI] Add 'B' and 'R' variable types back to selector; Remove unused "Deprecated" column from docs reference view; Update docs import database as of Nov. 25 '24.
1 parent e66498b commit 36e925c

File tree

4 files changed

+10
-5
lines changed

4 files changed

+10
-5
lines changed

src/WASimUI/DocImports.h

+6-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,12 @@ class DocImportsModel : public QSqlTableModel
141141
return;
142142
}
143143

144-
int col = fieldIndex("Multiplayer");
144+
removeColumnName("Multiplayer");
145+
removeColumnName("Deprecated");
146+
}
147+
148+
void removeColumnName(const QString &name) {
149+
const int col = fieldIndex(name);
145150
if (col > -1)
146151
removeColumn(col);
147152
}

src/WASimUI/Utils.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ class Utils
234234
}
235235

236236
static bool isSettableVariableType(const char type) {
237-
static const std::vector<char> VAR_TYPES_SETTABLE = { 'A', 'C', 'H', 'K', 'L', 'Z' };
237+
static const std::vector<char> VAR_TYPES_SETTABLE = { 'A', 'B', 'C', 'H', 'K', 'L', 'Z' };
238238
return find(VAR_TYPES_SETTABLE.cbegin(), VAR_TYPES_SETTABLE.cend(), type) != VAR_TYPES_SETTABLE.cend();
239239
}
240240

Binary file not shown.

src/WASimUI/widgets/Widgets.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ and is also available at <http://www.gnu.org/licenses/>.
2727
#include "client/WASimClient.h"
2828
#include "DataComboBox.h"
2929
#include "DeletableItemsComboBox.h"
30-
#include "Utils.h"
30+
#include "../Utils.h"
3131

3232
namespace WASimUiNS
3333
{
@@ -269,7 +269,7 @@ class VariableTypeComboBox : public DataComboBox
269269
setToolTip(tr("Named variable type. Types marked with a * use Unit specifiers. Most 'L' vars will ignore the Unit (default is 'number')."));
270270

271271
addItem(tr("A: SimVar *"), 'A');
272-
//addItem(tr("B: Input"), 'B'); // only for gauge modules
272+
addItem(tr("B: Input"), 'B'); // only for gauge modules in FS20
273273
addItem(tr("C: GPS *"), 'C');
274274
addItem(tr("E: Env. *"), 'E');
275275
addItem(tr("H: HTML"), 'H');
@@ -278,7 +278,7 @@ class VariableTypeComboBox : public DataComboBox
278278
addItem(tr("L: Local *"), 'L');
279279
addItem(tr("M: Mouse"), 'M');
280280
//addItem(tr("O: Comp."), 'O'); // only for gauge modules
281-
//addItem(tr("R: Resource"), 'R'); // strings only, can't be read with "Get" command or set at all
281+
addItem(tr("R: Resource"), 'R');
282282
addItem(tr("T: Token"), 'T');
283283
addItem(tr("Z: Custom"), 'Z');
284284

0 commit comments

Comments
 (0)