Compare commits
No commits in common. "efecad40aee166ba5b79138b6ebdf3eacd25ef6d" and "f58b972359bdcfbf6a48771286cd4edc0523cf1d" have entirely different histories.
efecad40ae
...
f58b972359
3 changed files with 3 additions and 4 deletions
|
@ -181,13 +181,13 @@ D.Dialog {
|
||||||
property bool selectObjMode: paramTypeIn(modelData[1], ['ObjectType'])
|
property bool selectObjMode: paramTypeIn(modelData[1], ['ObjectType'])
|
||||||
|
|
||||||
property var baseModel: visible ?
|
property var baseModel: visible ?
|
||||||
(selectObjMode ? Objects.getObjectsName(modelData[1].objType).concat([qsTr("+ Create new %1").arg(modelData[1].objType)]) : modelData[1].values)
|
(selectObjMode ? Objects.getObjectsName(modelData[1].objType).concat([qsTr("+ Create new %1").arg(Objects.types[modelData[1].objType].displayType())]) : modelData[1].values)
|
||||||
: []
|
: []
|
||||||
// Translate the model if necessary.
|
// Translate the model if necessary.
|
||||||
model: selectObjMode ? baseModel : baseModel.map(x => qsTr(x))
|
model: selectObjMode ? baseModel : baseModel.map(x => qsTr(x))
|
||||||
visible: paramTypeIn(modelData[1], ['ObjectType', 'Enum'])
|
visible: paramTypeIn(modelData[1], ['ObjectType', 'Enum'])
|
||||||
currentIndex: baseModel.indexOf(selectObjMode ? objEditor.obj[modelData[0]].name : objEditor.obj[modelData[0]])
|
currentIndex: baseModel.indexOf(selectObjMode ? objEditor.obj[modelData[0]].name : objEditor.obj[modelData[0]])
|
||||||
|
|
||||||
onActivated: function(newIndex) {
|
onActivated: function(newIndex) {
|
||||||
if(selectObjMode) {
|
if(selectObjMode) {
|
||||||
// This is only done when what we're selecting are Objects.
|
// This is only done when what we're selecting are Objects.
|
||||||
|
|
|
@ -18,6 +18,7 @@
|
||||||
|
|
||||||
import QtQuick.Controls 2.12
|
import QtQuick.Controls 2.12
|
||||||
import QtQuick 2.12
|
import QtQuick 2.12
|
||||||
|
import QtQuick.Dialogs 1.1
|
||||||
import "js/utils.js" as Utils
|
import "js/utils.js" as Utils
|
||||||
|
|
||||||
ScrollView {
|
ScrollView {
|
||||||
|
@ -349,7 +350,6 @@ ScrollView {
|
||||||
|
|
||||||
function save() {
|
function save() {
|
||||||
if(settings.saveFilename == "") {
|
if(settings.saveFilename == "") {
|
||||||
console.log(fdiag, fdiag.exportMode)
|
|
||||||
fdiag.exportMode = true
|
fdiag.exportMode = true
|
||||||
fdiag.open()
|
fdiag.open()
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
|
|
||||||
recursive-include LogarithmPlotter/qml *.qml *.js *.qdoc qmldir *.svg *.md LICENSE
|
recursive-include LogarithmPlotter/qml *.qml *.js *.qdoc qmldir *.svg *.md LICENSE
|
||||||
recursive-include LogarithmPlotter/i18n *.qm *.ts
|
|
||||||
include LogarithmPlotter/ *.svg
|
include LogarithmPlotter/ *.svg
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue