GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-08 02:19:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into CURA-4248_BAM

Browse Source
This commit is contained in:
Diego Prado Gesto 2017-10-19 10:26:25 +02:00
commit d3e8915b30
7 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cura.desktop.in
View File

@ -10,6 +10,6 @@ TryExec=@CMAKE_INSTALL_FULL_BINDIR@/cura
Icon=cura-icon Icon=cura-icon
Terminal=false Terminal=false
Type=Application Type=Application
MimeType=application/sla;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;image/bmp;image/gif;image/jpeg;image/png; MimeType=application/sla;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;image/bmp;image/gif;image/jpeg;image/png;model/x3d+xml;
Categories=Graphics; Categories=Graphics;
Keywords=3D;Printing; Keywords=3D;Printing;

2
cura/CuraSplashScreen.py
View File

@ -62,7 +62,7 @@ class CuraSplashScreen(QSplashScreen):
painter.setFont(font) painter.setFont(font)
painter.drawText(215, 66, 330 * self._scale, 230 * self._scale, Qt.AlignLeft | Qt.AlignTop, version[0]) painter.drawText(215, 66, 330 * self._scale, 230 * self._scale, Qt.AlignLeft | Qt.AlignTop, version[0])
if len(version) > 1: if len(version) > 1:
font.setPointSize(12) font.setPixelSize(16)
painter.setFont(font) painter.setFont(font)
painter.setPen(QColor(200, 200, 200, 255)) painter.setPen(QColor(200, 200, 200, 255))
painter.drawText(247, 105, 330 * self._scale, 255 * self._scale, Qt.AlignLeft | Qt.AlignTop, version[1]) painter.drawText(247, 105, 330 * self._scale, 255 * self._scale, Qt.AlignLeft | Qt.AlignTop, version[1])

0
resources/definitions/dagoma_discoeasy200.def.json Executable file → Normal file
View File

0
resources/definitions/fdmprinter.def.json Executable file → Normal file
View File

0
resources/definitions/helloBEEprusa.def.json Executable file → Normal file
View File

14
resources/qml/SidebarHeader.qml
View File

@ -34,20 +34,6 @@ Column
width: height width: height
} }
Item
{
anchors
{
left: parent.left
leftMargin: UM.Theme.getSize("sidebar_margin").width
right: parent.right
rightMargin: UM.Theme.getSize("sidebar_margin").width
}
visible: extruderSelectionRow.visible
height: UM.Theme.getSize("default_lining").hieght
width: height
}
Item Item
{ {
id: extruderSelectionRow id: extruderSelectionRow

2
resources/qml/SidebarSimple.qml
View File

@ -366,7 +366,7 @@ Item
} }
onEntered: onEntered:
{ {
var content = catalog.i18nc("@tooltip","You have selected a custom profile. If you want to change it, go to custom mode.") var content = catalog.i18nc("@tooltip","You have modified some profile settings. If you want to change these go to custom mode.")
base.showTooltip(qualityRow, Qt.point(-UM.Theme.getSize("sidebar_margin").width, customisedSettings.height), content) base.showTooltip(qualityRow, Qt.point(-UM.Theme.getSize("sidebar_margin").width, customisedSettings.height), content)
} }
onExited: base.hideTooltip() onExited: base.hideTooltip()