summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleix Pol <[email protected]>2015-11-11 02:58:28 +0100
committerAleix Pol <[email protected]>2015-11-11 02:58:28 +0100
commitc5017331dee26db78a3c0186affd02246d74fc9c (patch)
treeaf0c5521ea3d264459bd925c53dcb6a586f3d05f
parent9830b2c61f2264d7d32201abd9cac701b4ad0105 (diff)
Properly specify icon namev15.12.0v15.11.90v15.11.80
This way we don't have material-specific names in KAlgebra
-rw-r--r--mobile/plugins/Plot2D.qml2
-rw-r--r--mobile/plugins/Plot3D.qml2
-rw-r--r--mobile/plugins/widgets/material/Button.qml2
-rw-r--r--mobile/plugins/widgets/material/KAlgebraMobile.qml3
4 files changed, 5 insertions, 4 deletions
diff --git a/mobile/plugins/Plot2D.qml b/mobile/plugins/Plot2D.qml
index e1833e8..30ddd53 100644
--- a/mobile/plugins/Plot2D.qml
+++ b/mobile/plugins/Plot2D.qml
@@ -46,7 +46,7 @@ KAlgebraPage
}
}
Button {
- iconName: "content/add"
+ iconName: "list-add"
onClicked: {
input.selectAll()
view.addFunction(input.text, app.variables)
diff --git a/mobile/plugins/Plot3D.qml b/mobile/plugins/Plot3D.qml
index 61ab16a..5aa07a5 100644
--- a/mobile/plugins/Plot3D.qml
+++ b/mobile/plugins/Plot3D.qml
@@ -58,7 +58,7 @@ KAlgebraPage
}
}
Button {
- iconName: "content/add"
+ iconName: "list-add"
onClicked: {
input.selectAll()
var err = view.addFunction(input.text, app.variables)
diff --git a/mobile/plugins/widgets/material/Button.qml b/mobile/plugins/widgets/material/Button.qml
index 76761de..f627249 100644
--- a/mobile/plugins/widgets/material/Button.qml
+++ b/mobile/plugins/widgets/material/Button.qml
@@ -23,7 +23,7 @@ Loader
IconButton {
Layout.minimumWidth: implicitWidth*2
Layout.minimumHeight: implicitHeight*2
- iconName: root.iconName
+ iconName: rootItem.iconConvert[root.iconName]
}
}
diff --git a/mobile/plugins/widgets/material/KAlgebraMobile.qml b/mobile/plugins/widgets/material/KAlgebraMobile.qml
index b3a039c..280eeef 100644
--- a/mobile/plugins/widgets/material/KAlgebraMobile.qml
+++ b/mobile/plugins/widgets/material/KAlgebraMobile.qml
@@ -25,7 +25,8 @@ ApplicationWindow
"adjustrgb": "action/view_carousel",
"kspread": "editor/format_list_numbered",
"document-properties": "content/content_copy",
- "help-about": "action/help"
+ "help-about": "action/help",
+ "list-add": "content/add"
}
initialPage: Page {