Miroirs/leocad
1
0
Fork 0
mirror of https://github.com/leozide/leocad synced 2025-01-17 18:11:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #316 from tcuje/master

Browse source 
Fix #313 and #166
This commit is contained in:
Leonardo Zide 2019-03-06 08:59:30 -08:00 committed by GitHub
commit 0cfc9f7683
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/lc_partselectionwidget.cpp
View file

@ -371,7 +371,7 @@ void lcPartSelectionListModel::DrawPreview(int InfoIndex)
Scene.SetAllowWireframe(false); Scene.SetAllowWireframe(false);
Scene.Begin(ViewMatrix); Scene.Begin(ViewMatrix);
Info->AddRenderMeshes(Scene, lcMatrix44Identity(), mColorIndex, lcRenderMeshState::NORMAL, true); Info->AddRenderMeshes(Scene, lcMatrix44Identity(), mColorIndex, lcRenderMeshState::NORMAL, false);
Scene.End(); Scene.End();

4
qt/lc_qpropertiestree.cpp
View file

@ -932,7 +932,9 @@ void lcQPropertiesTree::SetPiece(const lcArray<lcObject*>& Selection, lcObject*
partColor->setText(1, color->Name); partColor->setText(1, color->Name);
partColor->setData(0, PropertyValueRole, ColorIndex); partColor->setData(0, PropertyValueRole, ColorIndex);
partID->setText(1, Info ? Info->m_strDescription : QString()); QString text = Info ? Info->m_strDescription : QString();
partID->setText(1, text);
partID->setToolTip(1, text);
partID->setData(0, PropertyValueRole, qVariantFromValue((void*)Info)); partID->setData(0, PropertyValueRole, qVariantFromValue((void*)Info));
} }

8
resources/leocad_de.ts
View file

@ -1089,7 +1089,7 @@
<message> <message>
<location filename="../common/lc_commands.cpp" line="9"/> <location filename="../common/lc_commands.cpp" line="9"/>
<source>&amp;New</source> <source>&amp;New</source>
<translation type="unfinished">&amp;Neu</translation> <translation>&amp;Neu</translation>
</message> </message>
<message> <message>
<location filename="../common/lc_commands.cpp" line="16"/> <location filename="../common/lc_commands.cpp" line="16"/>
@ -1477,7 +1477,7 @@
<message> <message>
<location filename="../common/lc_commands.cpp" line="555"/> <location filename="../common/lc_commands.cpp" line="555"/>
<source>Relative Rotation</source> <source>Relative Rotation</source>
<translation>relative Drehung</translation> <translation>Relative Drehung</translation>
</message> </message>
<message> <message>
<location filename="../common/lc_commands.cpp" line="562"/> <location filename="../common/lc_commands.cpp" line="562"/>
@ -1865,7 +1865,7 @@
<message> <message>
<location filename="../common/lc_commands.cpp" line="1199"/> <location filename="../common/lc_commands.cpp" line="1199"/>
<source>Move to New Model...</source> <source>Move to New Model...</source>
<translation>Neues Modell bewegen…</translation> <translation>In Neues Modell verschieben…</translation>
</message> </message>
<message> <message>
<location filename="../common/lc_commands.cpp" line="1206"/> <location filename="../common/lc_commands.cpp" line="1206"/>
@ -5495,7 +5495,7 @@ GL_EXT_texture_filter_anisotropic extension: %5
<message> <message>
<location filename="../qt/lc_renderdialog.ui" line="29"/> <location filename="../qt/lc_renderdialog.ui" line="29"/>
<source>Settings</source> <source>Settings</source>
<translation>Einstellwerte</translation> <translation>Einstellungen</translation>
</message> </message>
<message> <message>
<location filename="../qt/lc_renderdialog.ui" line="41"/> <location filename="../qt/lc_renderdialog.ui" line="41"/>