ubuntu-touch-coreapps-reviewers team mailing list archive
-
ubuntu-touch-coreapps-reviewers team
-
Mailing list archive
-
Message #06196
[Merge] lp:~rpadovani/ubuntu-calculator-app/dropCustomIcons into lp:ubuntu-calculator-app
Riccardo Padovani has proposed merging lp:~rpadovani/ubuntu-calculator-app/dropCustomIcons into lp:ubuntu-calculator-app.
Commit message:
Use sdk's icons
Requested reviews:
Ubuntu Calculator Developers (ubuntu-calculator-dev)
For more details, see:
https://code.launchpad.net/~rpadovani/ubuntu-calculator-app/dropCustomIcons/+merge/278452
We don't need anymore custom icons, they have been included in the sdk. So drop custom icons and all the graphic directory
--
Your team Ubuntu Calculator Developers is requested to review the proposed merge of lp:~rpadovani/ubuntu-calculator-app/dropCustomIcons into lp:ubuntu-calculator-app.
=== modified file 'app/CMakeLists.txt'
--- app/CMakeLists.txt 2015-07-31 12:18:59 +0000
+++ app/CMakeLists.txt 2015-11-24 14:09:15 +0000
@@ -4,13 +4,12 @@
endif(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
if(CLICK_MODE)
- install(FILES graphics/${ICON_FILE} DESTINATION ${CMAKE_INSTALL_PREFIX})
+ install(FILES ${ICON_FILE} DESTINATION ${CMAKE_INSTALL_PREFIX})
else (CLICK_MODE)
- install(FILES graphics/${ICON_FILE} DESTINATION ${UBUNTU-CALCULATOR-APP_DIR})
+ install(FILES ${ICON_FILE} DESTINATION ${UBUNTU-CALCULATOR-APP_DIR})
endif(CLICK_MODE)
install(FILES ${MAIN_QML} DESTINATION ${UBUNTU-CALCULATOR-APP_DIR})
add_subdirectory(engine)
-add_subdirectory(graphics)
add_subdirectory(ui)
add_subdirectory(upstreamcomponents)
=== removed directory 'app/graphics'
=== removed file 'app/graphics/CMakeLists.txt'
--- app/graphics/CMakeLists.txt 2015-06-24 20:08:49 +0000
+++ app/graphics/CMakeLists.txt 1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-file(GLOB GRAPHICS_FILES *.svg)
-
-install(FILES ${GRAPHICS_FILES} DESTINATION ${UBUNTU-CALCULATOR-APP_DIR}/graphics)
-
=== removed file 'app/graphics/select.svg'
--- app/graphics/select.svg 2015-02-17 09:22:42 +0000
+++ app/graphics/select.svg 1970-01-01 00:00:00 +0000
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/";
- xmlns:cc="http://creativecommons.org/ns#";
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
- xmlns:svg="http://www.w3.org/2000/svg";
- xmlns="http://www.w3.org/2000/svg";
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
- width="90"
- height="90"
- id="svg4874"
- version="1.1"
- inkscape:version="0.48+devel r12833"
- viewBox="0 0 90 90.000001"
- sodipodi:docname="select.svg">
- <defs
- id="defs4876" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="12.434498"
- inkscape:cx="30.343002"
- inkscape:cy="53.600878"
- inkscape:document-units="px"
- inkscape:current-layer="g1311"
- showgrid="true"
- showborder="true"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0"
- inkscape:snap-bbox="true"
- inkscape:bbox-paths="true"
- inkscape:bbox-nodes="true"
- inkscape:snap-bbox-edge-midpoints="true"
- inkscape:snap-bbox-midpoints="true"
- inkscape:object-paths="true"
- inkscape:snap-intersection-paths="true"
- inkscape:object-nodes="true"
- inkscape:snap-smooth-nodes="true"
- inkscape:snap-midpoints="true"
- inkscape:snap-object-midpoints="true"
- inkscape:snap-center="true"
- showguides="true"
- inkscape:guide-bbox="true">
- <inkscape:grid
- type="xygrid"
- id="grid5451"
- empspacing="6" />
- <sodipodi:guide
- orientation="1,0"
- position="6,77"
- id="guide4063" />
- <sodipodi:guide
- orientation="1,0"
- position="3,78"
- id="guide4065" />
- <sodipodi:guide
- orientation="0,1"
- position="55,84"
- id="guide4067" />
- <sodipodi:guide
- orientation="0,1"
- position="53,87"
- id="guide4069" />
- <sodipodi:guide
- orientation="0,1"
- position="20,3"
- id="guide4071" />
- <sodipodi:guide
- orientation="0,1"
- position="20,6"
- id="guide4073" />
- <sodipodi:guide
- orientation="1,0"
- position="87,7"
- id="guide4075" />
- <sodipodi:guide
- orientation="1,0"
- position="84,7"
- id="guide4077" />
- <sodipodi:guide
- orientation="0,1"
- position="58,81"
- id="guide4074" />
- <sodipodi:guide
- orientation="1,0"
- position="9,74"
- id="guide4076" />
- <sodipodi:guide
- orientation="0,1"
- position="21,9"
- id="guide4078" />
- <sodipodi:guide
- orientation="1,0"
- position="81,4"
- id="guide4080" />
- </sodipodi:namedview>
- <metadata
- id="metadata4879">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(67.857146,-84.50504)">
- <g
- transform="matrix(0,-1,-1,0,373.50506,516.50504)"
- id="g4845"
- style="display:inline">
- <g
- transform="matrix(0,-1,-1,0,567.36222,615.36221)"
- id="g1311"
- inkscape:export-filename="envelope02.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <g
- id="g1313"
- transform="matrix(1.875,0,0,1.875,-366,-1657.8169)">
- <rect
- transform="translate(0,804.3622)"
- y="152"
- x="288"
- height="48"
- width="48"
- id="rect1315"
- style="opacity:0.21171169;fill:none;stroke:none" />
- </g>
- <path
- style="font-size:15px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#808080;fill-opacity:1;stroke:none;display:inline;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
- d="M 21 6 C 11 6 6 5.9998033 6 17.626953 L 6 72.373047 C 6 84.000207 11 84 21 84 L 69 84 C 79 84 84 84.000207 84 72.373047 L 84 17.626953 C 84 5.9998033 79 6 69 6 L 21 6 z M 22.867188 12 L 67.132812 12 C 75.065512 12 78 11.999356 78 20.191406 L 78 69.808594 C 78 78.000644 75.065512 78 67.132812 78 L 22.867188 78 C 14.934488 78 12 78.000644 12 69.808594 L 12 20.191406 C 12 11.999356 14.934488 12 22.867188 12 z "
- transform="translate(174,135.36222)"
- id="path4098" />
- <path
- style="font-size:15px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#808080;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
- d="m 242.00422,161.6591 -0.375,0.32812 -26.94727,23.60352 -15.79687,-13.55079 -4.77539,5.4004 20.57617,21.64843 31.30078,-32.9375 -3.98242,-4.49218 z"
- id="path4041-9"
- inkscape:connector-curvature="0" />
- </g>
- </g>
- </g>
-</svg>
=== removed file 'app/graphics/select_none.svg'
--- app/graphics/select_none.svg 2015-02-17 09:22:42 +0000
+++ app/graphics/select_none.svg 1970-01-01 00:00:00 +0000
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/";
- xmlns:cc="http://creativecommons.org/ns#";
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
- xmlns:svg="http://www.w3.org/2000/svg";
- xmlns="http://www.w3.org/2000/svg";
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
- width="90"
- height="90"
- id="svg4874"
- version="1.1"
- inkscape:version="0.48.5 r10040"
- viewBox="0 0 90 90.000001"
- sodipodi:docname="select_none.svg">
- <defs
- id="defs4876" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="12.434498"
- inkscape:cx="30.343002"
- inkscape:cy="53.600878"
- inkscape:document-units="px"
- inkscape:current-layer="g1311"
- showgrid="true"
- showborder="true"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0"
- inkscape:snap-bbox="true"
- inkscape:bbox-paths="true"
- inkscape:bbox-nodes="true"
- inkscape:snap-bbox-edge-midpoints="true"
- inkscape:snap-bbox-midpoints="true"
- inkscape:object-paths="true"
- inkscape:snap-intersection-paths="true"
- inkscape:object-nodes="true"
- inkscape:snap-smooth-nodes="true"
- inkscape:snap-midpoints="true"
- inkscape:snap-object-midpoints="true"
- inkscape:snap-center="true"
- showguides="true"
- inkscape:guide-bbox="true"
- inkscape:window-width="1871"
- inkscape:window-height="1056"
- inkscape:window-x="49"
- inkscape:window-y="24"
- inkscape:window-maximized="1">
- <inkscape:grid
- type="xygrid"
- id="grid5451"
- empspacing="6" />
- <sodipodi:guide
- orientation="1,0"
- position="6,77"
- id="guide4063" />
- <sodipodi:guide
- orientation="1,0"
- position="3,78"
- id="guide4065" />
- <sodipodi:guide
- orientation="0,1"
- position="55,84"
- id="guide4067" />
- <sodipodi:guide
- orientation="0,1"
- position="53,87"
- id="guide4069" />
- <sodipodi:guide
- orientation="0,1"
- position="20,3"
- id="guide4071" />
- <sodipodi:guide
- orientation="0,1"
- position="20,6"
- id="guide4073" />
- <sodipodi:guide
- orientation="1,0"
- position="87,7"
- id="guide4075" />
- <sodipodi:guide
- orientation="1,0"
- position="84,7"
- id="guide4077" />
- <sodipodi:guide
- orientation="0,1"
- position="58,81"
- id="guide4074" />
- <sodipodi:guide
- orientation="1,0"
- position="9,74"
- id="guide4076" />
- <sodipodi:guide
- orientation="0,1"
- position="21,9"
- id="guide4078" />
- <sodipodi:guide
- orientation="1,0"
- position="81,4"
- id="guide4080" />
- </sodipodi:namedview>
- <metadata
- id="metadata4879">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
- <dc:title />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(67.857146,-84.50504)">
- <g
- transform="matrix(0,-1,-1,0,373.50506,516.50504)"
- id="g4845"
- style="display:inline">
- <g
- transform="matrix(0,-1,-1,0,567.36222,615.36221)"
- id="g1311"
- inkscape:export-filename="envelope02.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <g
- id="g1313"
- transform="matrix(1.875,0,0,1.875,-366,-1657.8169)">
- <rect
- transform="translate(0,804.3622)"
- y="152"
- x="288"
- height="48"
- width="48"
- id="rect1315"
- style="opacity:0.21171169;fill:none;stroke:none" />
- </g>
- <path
- style="font-size:15px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#808080;fill-opacity:1;stroke:none;display:inline;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
- d="M 21 6 C 11 6 6 5.9998033 6 17.626953 L 6 72.373047 C 6 84.000207 11 84 21 84 L 69 84 C 79 84 84 84.000207 84 72.373047 L 84 17.626953 C 84 5.9998033 79 6 69 6 L 21 6 z M 22.867188 12 L 67.132812 12 C 75.065512 12 78 11.999356 78 20.191406 L 78 69.808594 C 78 78.000644 75.065512 78 67.132812 78 L 22.867188 78 C 14.934488 78 12 78.000644 12 69.808594 L 12 20.191406 C 12 11.999356 14.934488 12 22.867188 12 z "
- transform="translate(174,135.36222)"
- id="path4098" />
- </g>
- </g>
- </g>
-</svg>
=== removed file 'app/graphics/toolbarIcon@xxxxx'
Binary files app/graphics/toolbarIcon@xxxxx 2015-06-26 11:56:51 +0000 and app/graphics/toolbarIcon@xxxxx 1970-01-01 00:00:00 +0000 differ
=== renamed file 'app/graphics/ubuntu-calculator-app.png' => 'app/ubuntu-calculator-app.png'
=== modified file 'app/ubuntu-calculator-app.qml'
--- app/ubuntu-calculator-app.qml 2015-11-24 13:43:38 +0000
+++ app/ubuntu-calculator-app.qml 2015-11-24 14:09:15 +0000
@@ -112,8 +112,21 @@
var resultLength = mathJs.format(bigNumberToFormat, {exponential: {lower: 1e-10, upper: 1e10},
precision: NUMBER_LENGTH_LIMIT}).toString().length;
+<<<<<<< TREE
return mathJs.format(bigNumberToFormat, {exponential: {lower: 1e-10, upper: 1e10},
precision: (NUMBER_LENGTH_LIMIT - resultLength + NUMBER_LENGTH_LIMIT)}).toString();
+=======
+ return mathJs.format(bigNumberToFormat, {exponential: {lower: 1e-10, upper: 1e10},
+ precision: (NUMBER_LENGTH_LIMIT - resultLenth + NUMBER_LENGTH_LIMIT)});
+ } else {
+ // short format like: "1e-10"
+ return bigNumberToFormat.toExponential();
+ }
+ } else {
+ // exponential: Object An object containing two parameters, {Number} lower and {Number} upper,
+ // used by notation 'auto' to determine when to return exponential notation.
+ return mathJs.format(bigNumberToFormat, {exponential: {lower: 1e-10, upper: 1e10}});
+>>>>>>> MERGE-SOURCE
}
return bigNumberToFormat.toString()
}
@@ -297,6 +310,7 @@
Keys.onPressed: textInputField.keyPress(event)
Keys.onReleased: textInputField.keyRelease(event)
+<<<<<<< TREE
head.visible: false
head.locked: true
head.backAction: Action {
@@ -334,6 +348,48 @@
text: i18n.tr("Delete")
onTriggered: calculatorPage.deleteSelectedCalculations()
enabled: visualModel.selectedItems.count > 0
+=======
+ Header {
+ id: header
+ visible: true
+ useDeprecatedToolbar: false
+ property color dividerColor: "#babbbc"
+ property color panelColor: "white"
+ config: PageHeadConfiguration {
+ backAction: Action {
+ objectName: "cancelSelectionAction"
+ iconName: "close"
+ text: i18n.tr("Cancel")
+ onTriggered: visualModel.cancelSelection()
+ }
+ actions: [
+ Action {
+ id: selectAllAction
+ objectName: "selectAllAction"
+ iconName: visualModel.selectedItems.count < visualModel.items.count ?
+ "select" : "select-none"
+ text: visualModel.selectedItems.count < visualModel.items.count ?
+ i18n.tr("Select All") : i18n.tr("Select None")
+ onTriggered: visualModel.selectAll()
+ },
+ Action {
+ id: copySelectedAction
+ objectName: "copySelectedAction"
+ iconName: "edit-copy"
+ text: i18n.tr("Copy")
+ onTriggered: calculatorPage.copySelectedCalculations()
+ enabled: visualModel.selectedItems.count > 0
+ },
+ Action {
+ id: multiDeleteAction
+ objectName: "multiDeleteAction"
+ iconName: "delete"
+ text: i18n.tr("Delete")
+ onTriggered: calculatorPage.deleteSelectedCalculations()
+ enabled: visualModel.selectedItems.count > 0
+ }
+ ]
+>>>>>>> MERGE-SOURCE
}
]
Follow ups
