Skip to content
Snippets Groups Projects
Commit 285f5840 authored by SeeLook's avatar SeeLook
Browse files

Added 'restore-defaults' icon, other minor changes

parent 5a1beb52
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
picts/restore-defaults.png 0 → 100644
+ 0
− 0
View file @ 285f5840
picts/restore-defaults.png

17.6 KiB

spare_parts/scalable/restore-defaults.svg 0 → 100644
+ 110
− 0
View file @ 285f5840
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<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="15"
height="15"
viewBox="0 0 15 15"
version="1.1"
id="svg7"
sodipodi:docname="restore-defaults.svg"
inkscape:version="0.92.2 5c3e80d, 2017-08-06"
inkscape:export-filename="../../picts/restore-defaults.png"
inkscape:export-xdpi="1638.4"
inkscape:export-ydpi="1638.4">
<metadata
id="metadata11">
<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:license
rdf:resource="http://creativecommons.org/licenses/by/4.0/" />
</cc:Work>
<cc:License
rdf:about="http://creativecommons.org/licenses/by/4.0/">
<cc:permits
rdf:resource="http://creativecommons.org/ns#Reproduction" />
<cc:permits
rdf:resource="http://creativecommons.org/ns#Distribution" />
<cc:requires
rdf:resource="http://creativecommons.org/ns#Notice" />
<cc:requires
rdf:resource="http://creativecommons.org/ns#Attribution" />
<cc:permits
rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
</cc:License>
</rdf:RDF>
</metadata>
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1039"
id="namedview9"
showgrid="false"
inkscape:zoom="39.333333"
inkscape:cx="7.512064"
inkscape:cy="5.5481878"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg7"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0" />
<defs
id="defs3">
<style
id="current-color-scheme"
type="text/css">
.ColorScheme-Text { color:#5c616c; } .ColorScheme-Highlight { color:#5294e2; }
</style>
<filter
inkscape:collect="always"
style="color-interpolation-filters:sRGB"
id="filter4604"
x="-0.033452168"
width="1.0669043"
y="-0.038967934"
height="1.0779359">
<feGaussianBlur
inkscape:collect="always"
stdDeviation="0.19470206"
id="feGaussianBlur4606" />
</filter>
</defs>
<g
id="g869"
transform="translate(0.04834022,-1.0369529)">
<path
sodipodi:nodetypes="ccccsccsscc"
inkscape:connector-curvature="0"
id="path5-3"
d="M 6.9360349,2.5411899 0.46728498,7.0411902 6.9360349,11.54119 V 9.0411902 h 2 c 1.3649001,0 2.4444811,0.390299 2.8103811,1.5169488 0.43763,1.3475 -4.8188561,3.974576 -4.8188561,3.974576 0,0 7.5084751,-1.627118 7.5084751,-4.8771178 0,-3.1235005 -2,-4.6144072 -5.0000001,-4.6144072 h -2.5 z"
class="ColorScheme-Text"
style="color:#5c616c;opacity:0.76000001;fill:#333333;filter:url(#filter4604)" />
<path
sodipodi:nodetypes="ccccsccsscc"
inkscape:connector-curvature="0"
id="path5"
d="m 7.366914,2.1132237 -6.46875,4.5 6.46875,4.5000003 V 8.6132237 h 2 c 1.3649,0 2.444481,0.3902992 2.810381,1.5169493 0.43763,1.3475 -4.8188556,3.974576 -4.8188556,3.974576 0,0 7.5084746,-1.627118 7.5084746,-4.8771185 0,-3.1235 -2,-4.6144068 -5,-4.6144068 h -2.5 z"
class="ColorScheme-Text"
style="color:#5c616c;fill:#008000;fill-opacity:1;stroke:none;stroke-width:0.2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
</g>
</svg>
src/dialogs/tdialogloaderobject.cpp
+ 2
− 2
View file @ 285f5840
......@@ -74,7 +74,7 @@ QString TdialogLoaderObject::stdButtonIcon(int role) {
switch (role) {
case 33554432: return QStringLiteral("check"); // Apply
case 4194304: return QStringLiteral("record"); // Cancel
case 134217728: return QStringLiteral("clear-score"); // Restore defaults
case 134217728: return QStringLiteral("restore-defaults"); // Restore defaults
case 16777216: return QStringLiteral("help"); // Help
case 2097152: return QStringLiteral("exit"); // Close
case 1024: return QStringLiteral("check"); // OK
......@@ -86,7 +86,7 @@ QString TdialogLoaderObject::stdButtonIcon(int role) {
QString TdialogLoaderObject::buttonRoleIcon(int role) {
switch (static_cast<QDialogButtonBox::ButtonRole>(role)) {
case QDialogButtonBox::ApplyRole: return QStringLiteral("check"); // Apply
case QDialogButtonBox::ResetRole: return QStringLiteral("clear-score"); // Restore defaults
case QDialogButtonBox::ResetRole: return QStringLiteral("restore-defaults"); // Restore defaults
case QDialogButtonBox::HelpRole: return QStringLiteral("help"); // Help
case QDialogButtonBox::AcceptRole: return QStringLiteral("check"); // OK
default: return QStringLiteral("exit");;
......
src/qml/exam/ExamSummary.qml
+ 5
− 4
View file @ 285f5840
......@@ -48,29 +48,30 @@ TexamSummary {
anchors.horizontalCenter: parent.horizontalCenter
spacing: summDialog.width / 100
columns: buttColumsCount()
property real buttWidth: buttColumsCount() === 2 ? summDialog.width / 3 : summDialog.width / 4
TiconButton {
visible: enableContinue()
width: summDialog.width / 4
width: buttGrid.buttWidth
pixmap: Noo.pix(isExercise() ? "practice" : "exam"); iconHeight: summDialog.height / 15
text: Noo.TR("QWizard", "Continue")
onClicked: { continueExecutor(); dialLoader.close() }
}
TiconButton {
enabled: false
width: summDialog.width / 4
width: buttGrid.buttWidth
pixmap: Noo.pix("charts"); iconHeight: summDialog.height / 15
text: qsTr("Analyze")
// onClicked:
}
TiconButton {
visible: isExercise()
width: summDialog.width / 4
width: buttGrid.buttWidth
pixmap: Noo.pix("exam"); iconHeight: summDialog.height / 15
text: qsTr("Pass an exam")
onClicked: { exerciseToExam(); dialLoader.close() }
}
TiconButton {
width: summDialog.width / 4
width: buttGrid.buttWidth
pixmap: Noo.pix("exit"); iconHeight: summDialog.height / 15
text: Noo.TR("QPlatformTheme", "Close")
onClicked: dialLoader.close()
......
src/qml/exam/StartExam.qml
+ 1
− 1
View file @ 285f5840
......@@ -112,7 +112,7 @@ TstartExamItem {
spacing: Noo.fontSize()
TiconButton {
iconHeight: startDialog.height / 15
pixmap: Noo.pix("exam"); text: qsTr("Select an exam to continue")
pixmap: Noo.pix("exam"); text: qsTr("Select an exam to continue") + " ⋮"
onClicked: menu.open()
Menu {
id: menu
......
src/qml/level/QuestionsBox.qml
+ 2
− 2
View file @ 285f5840
/** This file is part of Nootka (http://nootka.sf.net) *
* Copyright (C) 2017 by Tomasz Bojczuk (seelook@gmail.com) *
* Copyright (C) 2017-2018 by Tomasz Bojczuk (seelook@gmail.com) *
* on the terms of GNU GPLv3 license (http://www.gnu.org/licenses) */
import QtQuick 2.9
......@@ -44,7 +44,7 @@ Tile {
anchors.verticalCenter: parent.verticalCenter
font { pixelSize: Noo.fontSize() * 2; bold: true }
color: ma.containsMouse ? activPal.highlight : activPal.text
text: " ..."
text: " ⋮"
MouseArea {
id: ma
hoverEnabled: true
......
src/qml/shared/HeadButton.qml
+ 3
− 3
View file @ 285f5840
/** This file is part of Nootka (http://nootka.sf.net) *
* Copyright (C) 2017 by Tomasz Bojczuk (seelook@gmail.com) *
* Copyright (C) 2017-2018 by Tomasz Bojczuk (seelook@gmail.com) *
* on the terms of GNU GPLv3 license (http://www.gnu.org/licenses) */
import QtQuick 2.9
......@@ -24,7 +24,7 @@ ToolButton {
property alias textColor: butText.color
property Taction taction
background: Rectangle { color: pressed ? activPal.button : "transparent" }
background: Rectangle { color: pressed ? activPal.button : (hovered ? activPal.base : "transparent") }
onTactionChanged: {
if (taction) {
......@@ -59,7 +59,7 @@ ToolButton {
id: toolTip
delay: 1000
timeout: 5000
visible: hovered && text != ""
visible: hovered && text !== ""
contentItem: Text {
text: toolTip.text
color: activPal.highlightedText
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment