Hook up setting choices again
This commit is contained in:
parent
f00de6cbb4
commit
f69d67ce6e
2 changed files with 35 additions and 3 deletions
|
@ -11,10 +11,7 @@ Item {
|
||||||
|
|
||||||
property var choice
|
property var choice
|
||||||
property var default_choice
|
property var default_choice
|
||||||
|
|
||||||
signal clicked()
|
signal clicked()
|
||||||
signal choiceMade(int tag, var choice)
|
|
||||||
onChoiceChanged: choiceMade(tag, choice)
|
|
||||||
|
|
||||||
property var menu
|
property var menu
|
||||||
|
|
||||||
|
|
|
@ -18,6 +18,19 @@ Page {
|
||||||
console.log(JSON.stringify(printer.attrs))
|
console.log(JSON.stringify(printer.attrs))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function choiceMade(name, tag, choice)
|
||||||
|
{
|
||||||
|
if(choice != undefined)
|
||||||
|
{
|
||||||
|
jobParams[name] = {tag: tag, value: choice};
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
jobParams[name] = undefined
|
||||||
|
}
|
||||||
|
console.log(JSON.stringify(jobParams));
|
||||||
|
}
|
||||||
|
|
||||||
// To enable PullDownMenu, place our content in a SilicaFlickable
|
// To enable PullDownMenu, place our content in a SilicaFlickable
|
||||||
SilicaFlickable {
|
SilicaFlickable {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
|
@ -72,6 +85,8 @@ Page {
|
||||||
choices: utils.getChoices(name)
|
choices: utils.getChoices(name)
|
||||||
default_choice: utils.getDefaultChoice(name)
|
default_choice: utils.getDefaultChoice(name)
|
||||||
mime_type: Mimer.get_type(selectedFile)
|
mime_type: Mimer.get_type(selectedFile)
|
||||||
|
|
||||||
|
onChoiceChanged: page.choiceMade(name, tag, choice)
|
||||||
}
|
}
|
||||||
ChoiceSetting {
|
ChoiceSetting {
|
||||||
tag: IppMsg.Keyword
|
tag: IppMsg.Keyword
|
||||||
|
@ -81,6 +96,8 @@ Page {
|
||||||
choices: utils.getChoices(name)
|
choices: utils.getChoices(name)
|
||||||
default_choice: utils.getDefaultChoice(name)
|
default_choice: utils.getDefaultChoice(name)
|
||||||
mime_type: Mimer.get_type(selectedFile)
|
mime_type: Mimer.get_type(selectedFile)
|
||||||
|
|
||||||
|
onChoiceChanged: page.choiceMade(name, tag, choice)
|
||||||
}
|
}
|
||||||
IntegerSetting {
|
IntegerSetting {
|
||||||
tag: IppMsg.Integer
|
tag: IppMsg.Integer
|
||||||
|
@ -90,6 +107,8 @@ Page {
|
||||||
low: valid ? printer.attrs[name+"-supported"].value.low : 0
|
low: valid ? printer.attrs[name+"-supported"].value.low : 0
|
||||||
high: valid ? printer.attrs[name+"-supported"].value.high : 0
|
high: valid ? printer.attrs[name+"-supported"].value.high : 0
|
||||||
default_choice: printer.attrs.hasOwnProperty(name+"-default") ? printer.attrs[name+"-default"].value : undefined
|
default_choice: printer.attrs.hasOwnProperty(name+"-default") ? printer.attrs[name+"-default"].value : undefined
|
||||||
|
|
||||||
|
onChoiceChanged: page.choiceMade(name, tag, choice)
|
||||||
}
|
}
|
||||||
ChoiceSetting {
|
ChoiceSetting {
|
||||||
tag: IppMsg.Keyword
|
tag: IppMsg.Keyword
|
||||||
|
@ -99,6 +118,8 @@ Page {
|
||||||
choices: utils.getChoices(name)
|
choices: utils.getChoices(name)
|
||||||
default_choice: utils.getDefaultChoice(name)
|
default_choice: utils.getDefaultChoice(name)
|
||||||
mime_type: Mimer.get_type(selectedFile)
|
mime_type: Mimer.get_type(selectedFile)
|
||||||
|
|
||||||
|
onChoiceChanged: page.choiceMade(name, tag, choice)
|
||||||
}
|
}
|
||||||
RangeSetting {
|
RangeSetting {
|
||||||
tag: IppMsg.IntegerRange
|
tag: IppMsg.IntegerRange
|
||||||
|
@ -108,6 +129,8 @@ Page {
|
||||||
|
|
||||||
property var pdfpages: ConvertChecker.pdfPages(selectedFile)
|
property var pdfpages: ConvertChecker.pdfPages(selectedFile)
|
||||||
high: name=="page-ranges" ? (pdfpages == 0 ? 65535 : pdfpages) : 0
|
high: name=="page-ranges" ? (pdfpages == 0 ? 65535 : pdfpages) : 0
|
||||||
|
|
||||||
|
onChoiceChanged: page.choiceMade(name, tag, choice)
|
||||||
}
|
}
|
||||||
ChoiceSetting {
|
ChoiceSetting {
|
||||||
tag: IppMsg.Keyword
|
tag: IppMsg.Keyword
|
||||||
|
@ -117,6 +140,8 @@ Page {
|
||||||
choices: utils.getChoices(name)
|
choices: utils.getChoices(name)
|
||||||
default_choice: utils.getDefaultChoice(name)
|
default_choice: utils.getDefaultChoice(name)
|
||||||
mime_type: Mimer.get_type(selectedFile)
|
mime_type: Mimer.get_type(selectedFile)
|
||||||
|
|
||||||
|
onChoiceChanged: page.choiceMade(name, tag, choice)
|
||||||
}
|
}
|
||||||
ChoiceSetting {
|
ChoiceSetting {
|
||||||
tag: IppMsg.Enum
|
tag: IppMsg.Enum
|
||||||
|
@ -126,6 +151,8 @@ Page {
|
||||||
choices: utils.getChoices(name)
|
choices: utils.getChoices(name)
|
||||||
default_choice: utils.getDefaultChoice(name)
|
default_choice: utils.getDefaultChoice(name)
|
||||||
mime_type: Mimer.get_type(selectedFile)
|
mime_type: Mimer.get_type(selectedFile)
|
||||||
|
|
||||||
|
onChoiceChanged: page.choiceMade(name, tag, choice)
|
||||||
}
|
}
|
||||||
ChoiceSetting {
|
ChoiceSetting {
|
||||||
tag: IppMsg.Resolution
|
tag: IppMsg.Resolution
|
||||||
|
@ -135,6 +162,8 @@ Page {
|
||||||
choices: utils.getChoices(name)
|
choices: utils.getChoices(name)
|
||||||
default_choice: utils.getDefaultChoice(name)
|
default_choice: utils.getDefaultChoice(name)
|
||||||
mime_type: Mimer.get_type(selectedFile)
|
mime_type: Mimer.get_type(selectedFile)
|
||||||
|
|
||||||
|
onChoiceChanged: page.choiceMade(name, tag, choice)
|
||||||
}
|
}
|
||||||
ChoiceSetting {
|
ChoiceSetting {
|
||||||
tag: IppMsg.MimeMediaType
|
tag: IppMsg.MimeMediaType
|
||||||
|
@ -144,6 +173,8 @@ Page {
|
||||||
choices: utils.getChoices(name)
|
choices: utils.getChoices(name)
|
||||||
default_choice: utils.getDefaultChoice(name)
|
default_choice: utils.getDefaultChoice(name)
|
||||||
mime_type: Mimer.get_type(selectedFile)
|
mime_type: Mimer.get_type(selectedFile)
|
||||||
|
|
||||||
|
onChoiceChanged: page.choiceMade(name, tag, choice)
|
||||||
}
|
}
|
||||||
ChoiceSetting {
|
ChoiceSetting {
|
||||||
tag: IppMsg.Keyword
|
tag: IppMsg.Keyword
|
||||||
|
@ -153,6 +184,8 @@ Page {
|
||||||
choices: utils.getChoices(name)
|
choices: utils.getChoices(name)
|
||||||
default_choice: utils.getDefaultChoice(name)
|
default_choice: utils.getDefaultChoice(name)
|
||||||
mime_type: Mimer.get_type(selectedFile)
|
mime_type: Mimer.get_type(selectedFile)
|
||||||
|
|
||||||
|
onChoiceChanged: page.choiceMade(name, tag, choice)
|
||||||
}
|
}
|
||||||
MediaColSetting {
|
MediaColSetting {
|
||||||
tag: IppMsg.BeginCollection
|
tag: IppMsg.BeginCollection
|
||||||
|
@ -160,6 +193,8 @@ Page {
|
||||||
prettyName: qsTr("Zero margins")
|
prettyName: qsTr("Zero margins")
|
||||||
valid: false
|
valid: false
|
||||||
printer: page.printer
|
printer: page.printer
|
||||||
|
|
||||||
|
onChoiceChanged: page.choiceMade(name, tag, choice)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue