Skip to content

P
pyMKcam
Commit 0e66a8d9 authored by sumpfralle's avatar sumpfralle
Browse files
Options

added the previously missing "toolpath_cut" color to the preferences 


git-svn-id: https://pycam.svn.sourceforge.net/svnroot/pycam/trunk@291 bbaffbd6-741e-11dd-a85d-61de82d9cad9
parent c0c8834d
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 5 deletions
pycam/Gui/Project.py
View file @ 0e66a8d9
...@@ -65,6 +65,7 @@ PREFERENCES_DEFAULTS = { ...@@ -65,6 +65,7 @@ PREFERENCES_DEFAULTS = {
"color_model": COLORS["color_model"], "color_model": COLORS["color_model"],
"color_bounding_box": COLORS["color_bounding_box"], "color_bounding_box": COLORS["color_bounding_box"],
"color_cutter": COLORS["color_cutter"], "color_cutter": COLORS["color_cutter"],
"color_toolpath_cut": COLORS["color_toolpath_cut"],
"color_toolpath_return": COLORS["color_toolpath_return"], "color_toolpath_return": COLORS["color_toolpath_return"],
"view_light": True, "view_light": True,
"view_shadow": True, "view_shadow": True,
...@@ -535,6 +536,7 @@ class ProjectGui: ...@@ -535,6 +536,7 @@ class ProjectGui:
("color_model", "ColorModel"), ("color_model", "ColorModel"),
("color_bounding_box", "ColorBoundingBox"), ("color_bounding_box", "ColorBoundingBox"),
("color_cutter", "ColorDrill"), ("color_cutter", "ColorDrill"),
("color_toolpath_cut", "ColorToolpathCut"),
("color_toolpath_return", "ColorToolpathReturn")): ("color_toolpath_return", "ColorToolpathReturn")):
obj = self.gui.get_object(objname) obj = self.gui.get_object(objname)
self.settings.add_item(name, get_color_wrapper(obj), set_color_wrapper(obj)) self.settings.add_item(name, get_color_wrapper(obj), set_color_wrapper(obj))
......
pycam/Gui/gtk-interface/pycam-project.ui
View file @ 0e66a8d9
...@@ -2502,7 +2502,7 @@ This combination is added to the above task list.</property> ...@@ -2502,7 +2502,7 @@ This combination is added to the above task list.</property>
<child> <child>
<object class="GtkTable" id="table4"> <object class="GtkTable" id="table4">
<property name="visible">True</property> <property name="visible">True</property>
<property name="n_rows">5</property> <property name="n_rows">6</property>
<property name="n_columns">2</property> <property name="n_columns">2</property>
<property name="column_spacing">23</property> <property name="column_spacing">23</property>
<child> <child>
...@@ -2595,8 +2595,8 @@ This combination is added to the above task list.</property> ...@@ -2595,8 +2595,8 @@ This combination is added to the above task list.</property>
<property name="label" translatable="yes">Toolpath return:</property> <property name="label" translatable="yes">Toolpath return:</property>
</object> </object>
<packing> <packing>
<property name="top_attach">4</property> <property name="top_attach">5</property>
<property name="bottom_attach">5</property> <property name="bottom_attach">6</property>
<property name="x_options">GTK_FILL</property> <property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property> <property name="y_options">GTK_FILL</property>
</packing> </packing>
...@@ -2611,8 +2611,8 @@ This combination is added to the above task list.</property> ...@@ -2611,8 +2611,8 @@ This combination is added to the above task list.</property>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
<property name="right_attach">2</property> <property name="right_attach">2</property>
<property name="top_attach">4</property> <property name="top_attach">5</property>
<property name="bottom_attach">5</property> <property name="bottom_attach">6</property>
<property name="x_options">GTK_FILL</property> <property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property> <property name="y_options">GTK_FILL</property>
</packing> </packing>
...@@ -2646,6 +2646,35 @@ This combination is added to the above task list.</property> ...@@ -2646,6 +2646,35 @@ This combination is added to the above task list.</property>
<property name="y_options">GTK_FILL</property> <property name="y_options">GTK_FILL</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkLabel" id="ColorToolpathCutLabel">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Toolpath cut:</property>
</object>
<packing>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<object class="GtkColorButton" id="ColorToolpathCut">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="color">#000000000000</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
</object> </object>
</child> </child>
</object> </object>
......
Markdown is supported
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