This commit is contained in:
Yorik van Havre
2019-01-23 18:20:43 -02:00
parent eb08c67a78
commit 090fc64284
9 changed files with 7 additions and 370 deletions

View File

@@ -403,7 +403,7 @@ class _ViewProviderArchMaterial:
def claimChildren(self):
ch = []
if hasattr(self,"Object"):
for o in FreeCAD.ActiveDocument.Objects:
for o in self.Object.Document.Objects:
if o.isDerivedFrom("App::MaterialObject"):
if o.Material:
if "Father" in o.Material:

View File

@@ -932,7 +932,7 @@ class PanelCut(Draft._DraftObject):
obj.addProperty("App::PropertyLength","TagSize","PanelCut",QT_TRANSLATE_NOOP("App::Property","The size of the tag text"))
obj.TagSize = 10
if not "TagPosition" in pl:
obj.addProperty("App::PropertyVector","TagPosition","PanelCut",QT_TRANSLATE_NOOP("App::Property","The position of the tag text. Keep (0,0,0) for automatic center position"))
obj.addProperty("App::PropertyVector","TagPosition","PanelCut",QT_TRANSLATE_NOOP("App::Property","The position of the tag text. Keep (0,0,0) for center position"))
if not "TagRotation" in pl:
obj.addProperty("App::PropertyAngle","TagRotation","PanelCut",QT_TRANSLATE_NOOP("App::Property","The rotation of the tag text"))
if not "FontFile" in pl:

View File

@@ -356,7 +356,7 @@ class _Stairs(ArchComponent.Component):
# TODO - To be combined into Width when PropertyLengthList is available
if not "WidthOfLanding" in pl:
obj.addProperty("App::PropertyFloatList","WidthOfLanding","Stairs",QT_TRANSLATE_NOOP("App::Property","The width of a Landing (Second edge and after - First edge follows Width property"))
obj.addProperty("App::PropertyFloatList","WidthOfLanding","Stairs",QT_TRANSLATE_NOOP("App::Property","The width of a Landing (Second edge and after - First edge follows Width property)"))
# steps properties
if not "NumberOfSteps" in pl:

View File

@@ -19,7 +19,7 @@
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string>Bim server URL:</string>
<string>BimServer URL:</string>
</property>
</widget>
</item>
@@ -59,7 +59,7 @@
<item>
<widget class="QCheckBox" name="checkStore">
<property name="text">
<string>Keep me logged across FreeCAD sessions</string>
<string>Keep me logged in across FreeCAD sessions</string>
</property>
</widget>
</item>

View File

@@ -607,7 +607,7 @@
<item row="2" column="0">
<widget class="QLabel" name="label_13">
<property name="text">
<string>Close &amp; switch on file open</string>
<string>Close &amp; switch on opening file</string>
</property>
</widget>
</item>

View File

@@ -69,7 +69,7 @@ T_OFFLINEPLACEHOLDER = translate("StartPage", "Cannot fetch information from Git
T_RECENTCOMMITS = translate("StartPage", "Recent commits")
T_DESCR_RECENTCOMMITS = translate("StartPage", "Below are the latest changes added to the <a href=\"http://github.com/FreeCAD/FreeCAD/\">FreeCAD source code</a>. These changes might not reflect yet in the FreeCAD version that you are currently running. Check the <a href=\"https://www.freecadweb.org/wiki/Downloads\">available options</a> if you wish to obtain a development version.")
T_SEEONGITHUB = translate("StartPage", "See all commits on github")
T_CUSTOM = translate("StartPage", "You can configure a custom folder to display here in menu Edit -> Preferences -> Start -> Custom folder")
T_CUSTOM = translate("StartPage", "You can configure a custom folder to display here in menu Edit -> Preferences -> Start -> Show additional folder")
T_VERSION = translate("StartPage", "version")
T_BUILD = translate("StartPage", "build")
T_CREATENEW = translate("StartPage", "Create new...")

View File

@@ -10,8 +10,6 @@
<file>icons/actions/web-zoom-out.svg</file>
<file>icons/actions/web-sketchfab.svg</file>
<file>icons/WebWorkbench.svg</file>
<file>icons/Sketchfab.svg</file>
<file>ui/TaskDlgSketchfab.ui</file>
<file>translations/Web_de.qm</file>
<file>translations/Web_af.qm</file>
<file>translations/Web_zh-CN.qm</file>

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 11 KiB

View File

@@ -1,228 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>Form</class>
<widget class="QWidget" name="Form">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>218</width>
<height>548</height>
</rect>
</property>
<property name="windowTitle">
<string>Sketchfab exporter</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="label">
<property name="maximumSize">
<size>
<width>200</width>
<height>43</height>
</size>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="../Web.qrc">:/icons/Sketchfab.svg</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_7">
<property name="text">
<string>What to upload?</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="Radio_Selection">
<property name="text">
<string>Selection</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="Radio_Document">
<property name="text">
<string>All visible objects</string>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="label_3">
<property name="text">
<string>Model name</string>
</property>
</widget>
</item>
<item alignment="Qt::AlignRight">
<widget class="QCheckBox" name="Check_Private">
<property name="text">
<string>Private</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QLineEdit" name="Text_Name"/>
</item>
<item>
<widget class="QLabel" name="label_4">
<property name="text">
<string>Description</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="Text_Description"/>
</item>
<item>
<widget class="QLabel" name="label_5">
<property name="text">
<string>Tags (separated by commas)</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<widget class="QLabel" name="label_8">
<property name="text">
<string>FreeCAD,</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="Text_Tags">
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QLabel" name="label_6">
<property name="text">
<string>Format</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="Combo_Filetype">
<item>
<property name="text">
<string>OBJ + MTL (Arch exporter)</string>
</property>
</item>
<item>
<property name="text">
<string>OBJ (standard Mesh exporter)</string>
</property>
</item>
<item>
<property name="text">
<string>DAE (Collada)</string>
</property>
</item>
<item>
<property name="text">
<string>STL</string>
</property>
</item>
<item>
<property name="text">
<string>IGES (shapes only)</string>
</property>
</item>
<item>
<property name="text">
<string>IV (Inventor)</string>
</property>
</item>
</widget>
</item>
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string>Sketchfab API token</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLineEdit" name="Text_Token">
<property name="echoMode">
<enum>QLineEdit::Password</enum>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="Button_Token">
<property name="text">
<string>Obtain</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QPushButton" name="Button_Upload">
<property name="text">
<string>Upload</string>
</property>
</widget>
</item>
<item>
<widget class="QProgressBar" name="ProgressBar">
<property name="value">
<number>25</number>
</property>
<property name="format">
<string>uploading</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="Button_View">
<property name="text">
<string>Success! View uploaded online</string>
</property>
</widget>
</item>
</layout>
</widget>
<resources>
<include location="../Web.qrc"/>
</resources>
<connections/>
</ui>