Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix SimpleButton use of UM.ColorImage #874

Merged
merged 3 commits into from
Jun 1, 2023
Merged

Fix SimpleButton use of UM.ColorImage #874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
88fd460
Fix SimpleButton use of UM.ColorImage
fieldOfView May 20, 2023
71bf449
Update copyright
fieldOfView May 20, 2023
57f7580
update translations
fieldOfView May 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions UM/Qt/qml/UM/SimpleButton.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// Copyright (c) 2018 Ultimaker B.V.
// Copyright (c) 2023 Ultimaker
// Uranium is released under the terms of the LGPLv3 or higher.

import QtQuick 2.1
import UM 1.5 as UM

MouseArea
{
Expand All @@ -27,7 +28,7 @@ MouseArea
radius: 0
}

ColorImage
UM.ColorImage
{
id: image

Expand Down
2 changes: 1 addition & 1 deletion resources/i18n/cs_CZ/uranium.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Uranium 5.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-04-06 16:02+0000\n"
"POT-Creation-Date: 2023-05-20 19:24+0000\n"
"PO-Revision-Date: 2022-04-26 00:14+0200\n"
"Last-Translator: Miroslav Šustek <sustmidown@centrum.cz>\n"
"Language-Team: DenyCZ <www.github.com/DenyCZ>\n"
Expand Down
2 changes: 1 addition & 1 deletion resources/i18n/de_DE/uranium.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-04-06 16:02+0000\n"
"POT-Creation-Date: 2023-05-20 19:24+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down
2 changes: 1 addition & 1 deletion resources/i18n/es_ES/uranium.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-04-06 16:02+0000\n"
"POT-Creation-Date: 2023-05-20 19:24+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down
2 changes: 1 addition & 1 deletion resources/i18n/fi_FI/uranium.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Uranium 5.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-04-06 16:02+0000\n"
"POT-Creation-Date: 2023-05-20 19:24+0000\n"
"PO-Revision-Date: 2017-09-27 12:27+0200\n"
"Last-Translator: Bothof <info@bothof.nl>\n"
"Language-Team: Finnish <info@bothof.nl>\n"
Expand Down
2 changes: 1 addition & 1 deletion resources/i18n/fr_FR/uranium.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-04-06 16:02+0000\n"
"POT-Creation-Date: 2023-05-20 19:24+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down
2 changes: 1 addition & 1 deletion resources/i18n/hu_HU/uranium.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Uranium 5.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-04-06 16:02+0000\n"
"POT-Creation-Date: 2023-05-20 19:24+0000\n"
"PO-Revision-Date: 2019-10-10 22:30+0200\n"
"Last-Translator: Nagy Attila\n"
"Language-Team: AT-VLOG <LL@li.org>\n"
Expand Down
2 changes: 1 addition & 1 deletion resources/i18n/it_IT/uranium.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-04-06 16:02+0000\n"
"POT-Creation-Date: 2023-05-20 19:24+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down
2 changes: 1 addition & 1 deletion resources/i18n/ja_JP/uranium.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-04-06 16:02+0000\n"
"POT-Creation-Date: 2023-05-20 19:24+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down
2 changes: 1 addition & 1 deletion resources/i18n/ko_KR/uranium.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-04-06 16:02+0000\n"
"POT-Creation-Date: 2023-05-20 19:24+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down
2 changes: 1 addition & 1 deletion resources/i18n/nl_NL/uranium.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-04-06 16:02+0000\n"
"POT-Creation-Date: 2023-05-20 19:24+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down
2 changes: 1 addition & 1 deletion resources/i18n/pl_PL/uranium.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Uranium 5.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-04-06 16:02+0000\n"
"POT-Creation-Date: 2023-05-20 19:24+0000\n"
"PO-Revision-Date: 2019-11-15 15:35+0100\n"
"Last-Translator: Mariusz 'Virgin71' Matłosz <matliks@gmail.com>\n"
"Language-Team: reprapy.pl\n"
Expand Down
2 changes: 1 addition & 1 deletion resources/i18n/pt_BR/uranium.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Uranium 5.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-04-06 16:02+0000\n"
"POT-Creation-Date: 2023-05-20 19:24+0000\n"
"PO-Revision-Date: 2022-04-25 07:03+0200\n"
"Last-Translator: Cláudio Sampaio <patola@gmail.com>\n"
"Language-Team: Cláudio Sampaio\n"
Expand Down
2 changes: 1 addition & 1 deletion resources/i18n/pt_PT/uranium.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-04-06 16:02+0000\n"
"POT-Creation-Date: 2023-05-20 19:24+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down
2 changes: 1 addition & 1 deletion resources/i18n/ru_RU/uranium.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-04-06 16:02+0000\n"
"POT-Creation-Date: 2023-05-20 19:24+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down
2 changes: 1 addition & 1 deletion resources/i18n/tr_TR/uranium.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-04-06 16:02+0000\n"
"POT-Creation-Date: 2023-05-20 19:24+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down
118 changes: 59 additions & 59 deletions resources/i18n/uranium.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-04-06 16:02+0000\n"
"POT-Creation-Date: 2023-05-20 19:24+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down Expand Up @@ -742,14 +742,44 @@ msgstr ""
msgctxt "@item:inmenu"
msgid "Simple"
msgstr ""
#: plugins/UpdateChecker/plugin.json
#: plugins/ConsoleLogger/plugin.json
msgctxt "description"
msgid "Checks for updates of the software."
msgid "Outputs log information to the console."
msgstr ""

#: plugins/UpdateChecker/plugin.json
#: plugins/ConsoleLogger/plugin.json
msgctxt "name"
msgid "Update Checker"
msgid "Console Logger"
msgstr ""

#: plugins/LocalFileOutputDevice/plugin.json
msgctxt "description"
msgid "Enables saving to local files."
msgstr ""

#: plugins/LocalFileOutputDevice/plugin.json
msgctxt "name"
msgid "Local File Output Device"
msgstr ""

#: plugins/Views/SimpleView/plugin.json
msgctxt "description"
msgid "Provides a simple solid mesh view."
msgstr ""

#: plugins/Views/SimpleView/plugin.json
msgctxt "name"
msgid "Simple View"
msgstr ""

#: plugins/LocalContainerProvider/plugin.json
msgctxt "description"
msgid "Provides built-in setting containers that come with the installation of the application."
msgstr ""

#: plugins/LocalContainerProvider/plugin.json
msgctxt "name"
msgid "Local Container Provider"
msgstr ""

#: plugins/FileHandlers/OBJWriter/plugin.json
Expand Down Expand Up @@ -792,34 +822,34 @@ msgctxt "name"
msgid "Wavefront OBJ Reader"
msgstr ""

#: plugins/Tools/TranslateTool/plugin.json
#: plugins/FileLogger/plugin.json
msgctxt "description"
msgid "Provides the Move tool."
msgid "Outputs log information to a file in your settings folder."
msgstr ""

#: plugins/Tools/TranslateTool/plugin.json
#: plugins/FileLogger/plugin.json
msgctxt "name"
msgid "Move Tool"
msgid "File Logger"
msgstr ""

#: plugins/Tools/MirrorTool/plugin.json
#: plugins/UpdateChecker/plugin.json
msgctxt "description"
msgid "Provides the Mirror tool."
msgid "Checks for updates of the software."
msgstr ""

#: plugins/Tools/MirrorTool/plugin.json
#: plugins/UpdateChecker/plugin.json
msgctxt "name"
msgid "Mirror Tool"
msgid "Update Checker"
msgstr ""

#: plugins/Tools/RotateTool/plugin.json
#: plugins/Tools/TranslateTool/plugin.json
msgctxt "description"
msgid "Provides the Rotate tool."
msgid "Provides the Move tool."
msgstr ""

#: plugins/Tools/RotateTool/plugin.json
#: plugins/Tools/TranslateTool/plugin.json
msgctxt "name"
msgid "Rotate Tool"
msgid "Move Tool"
msgstr ""

#: plugins/Tools/ScaleTool/plugin.json
Expand All @@ -842,63 +872,33 @@ msgctxt "name"
msgid "Selection Tool"
msgstr ""

#: plugins/Tools/CameraTool/plugin.json
msgctxt "description"
msgid "Provides the tool to manipulate the camera."
msgstr ""

#: plugins/Tools/CameraTool/plugin.json
msgctxt "name"
msgid "Camera Tool"
msgstr ""

#: plugins/FileLogger/plugin.json
msgctxt "description"
msgid "Outputs log information to a file in your settings folder."
msgstr ""

#: plugins/FileLogger/plugin.json
msgctxt "name"
msgid "File Logger"
msgstr ""

#: plugins/ConsoleLogger/plugin.json
msgctxt "description"
msgid "Outputs log information to the console."
msgstr ""

#: plugins/ConsoleLogger/plugin.json
msgctxt "name"
msgid "Console Logger"
msgstr ""

#: plugins/LocalContainerProvider/plugin.json
#: plugins/Tools/RotateTool/plugin.json
msgctxt "description"
msgid "Provides built-in setting containers that come with the installation of the application."
msgid "Provides the Rotate tool."
msgstr ""

#: plugins/LocalContainerProvider/plugin.json
#: plugins/Tools/RotateTool/plugin.json
msgctxt "name"
msgid "Local Container Provider"
msgid "Rotate Tool"
msgstr ""

#: plugins/LocalFileOutputDevice/plugin.json
#: plugins/Tools/CameraTool/plugin.json
msgctxt "description"
msgid "Enables saving to local files."
msgid "Provides the tool to manipulate the camera."
msgstr ""

#: plugins/LocalFileOutputDevice/plugin.json
#: plugins/Tools/CameraTool/plugin.json
msgctxt "name"
msgid "Local File Output Device"
msgid "Camera Tool"
msgstr ""

#: plugins/Views/SimpleView/plugin.json
#: plugins/Tools/MirrorTool/plugin.json
msgctxt "description"
msgid "Provides a simple solid mesh view."
msgid "Provides the Mirror tool."
msgstr ""

#: plugins/Views/SimpleView/plugin.json
#: plugins/Tools/MirrorTool/plugin.json
msgctxt "name"
msgid "Simple View"
msgid "Mirror Tool"
msgstr ""

2 changes: 1 addition & 1 deletion resources/i18n/zh_CN/uranium.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-04-06 16:02+0000\n"
"POT-Creation-Date: 2023-05-20 19:24+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down
2 changes: 1 addition & 1 deletion resources/i18n/zh_TW/uranium.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Uranium 5.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-04-06 16:02+0000\n"
"POT-Creation-Date: 2023-05-20 19:24+0000\n"
"PO-Revision-Date: 2022-01-02 20:28+0800\n"
"Last-Translator: Valen Chang <carf17771@gmail.com>\n"
"Language-Team: Valen Chang <carf17771@gmail.com>\n"
Expand Down