Skip to content

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

fixed various small things 

removed many icons for menus and buttons: focussing on important actions


git-svn-id: https://pycam.svn.sourceforge.net/svnroot/pycam/trunk@1029 bbaffbd6-741e-11dd-a85d-61de82d9cad9
parent 879ff049
Show whitespace changes
Inline Side-by-side
Showing with 110 additions and 154 deletions
share/ui/pycam-project.ui
View file @ a9a05655
...@@ -4022,7 +4022,6 @@ Usually you will want to use the cutter radius here to cut around the outline.</ ...@@ -4022,7 +4022,6 @@ Usually you will want to use the cutter radius here to cut around the outline.</
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Generate all toolpaths that are marked as enabled</property> <property name="tooltip_text" translatable="yes">Generate all toolpaths that are marked as enabled</property>
<property name="image">GenerateAllToolPathsIcon</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
</object> </object>
<packing> <packing>
...@@ -4459,7 +4458,6 @@ Usually you will want to use the cutter radius here to cut around the outline.</ ...@@ -4459,7 +4458,6 @@ Usually you will want to use the cutter radius here to cut around the outline.</
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="image">ExportAllToolpathsIcon</property> <property name="image">ExportAllToolpathsIcon</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
...@@ -4473,8 +4471,6 @@ Usually you will want to use the cutter radius here to cut around the outline.</ ...@@ -4473,8 +4471,6 @@ Usually you will want to use the cutter radius here to cut around the outline.</
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="image">ExportVisibleToolpathsIcon</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
...@@ -4488,8 +4484,6 @@ Usually you will want to use the cutter radius here to cut around the outline.</ ...@@ -4488,8 +4484,6 @@ Usually you will want to use the cutter radius here to cut around the outline.</
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="image">ShowToolPathSimulation</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
...@@ -4499,12 +4493,10 @@ Usually you will want to use the cutter radius here to cut around the outline.</ ...@@ -4499,12 +4493,10 @@ Usually you will want to use the cutter radius here to cut around the outline.</
</child> </child>
<child> <child>
<object class="GtkButton" id="ToolpathGrid"> <object class="GtkButton" id="ToolpathGrid">
<property name="label">gtk-page-setup</property> <property name="label">Clone grid</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="use_stock">True</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
...@@ -4518,8 +4510,6 @@ Usually you will want to use the cutter radius here to cut around the outline.</ ...@@ -4518,8 +4510,6 @@ Usually you will want to use the cutter radius here to cut around the outline.</
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="image">CropToolpath</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
...@@ -4534,7 +4524,6 @@ Usually you will want to use the cutter radius here to cut around the outline.</ ...@@ -4534,7 +4524,6 @@ Usually you will want to use the cutter radius here to cut around the outline.</
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="use_stock">True</property> <property name="use_stock">True</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
...@@ -4549,7 +4538,6 @@ Usually you will want to use the cutter radius here to cut around the outline.</ ...@@ -4549,7 +4538,6 @@ Usually you will want to use the cutter radius here to cut around the outline.</
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="use_stock">True</property> <property name="use_stock">True</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
...@@ -4564,7 +4552,6 @@ Usually you will want to use the cutter radius here to cut around the outline.</ ...@@ -4564,7 +4552,6 @@ Usually you will want to use the cutter radius here to cut around the outline.</
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="use_stock">True</property> <property name="use_stock">True</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
...@@ -5264,7 +5251,6 @@ Usually you will want to use the cutter radius here to cut around the outline.</ ...@@ -5264,7 +5251,6 @@ Usually you will want to use the cutter radius here to cut around the outline.</
<property name="label">_Open Model ...</property> <property name="label">_Open Model ...</property>
<property name="tooltip">Opens a model file.</property> <property name="tooltip">Opens a model file.</property>
<property name="stock_id">gtk-open</property> <property name="stock_id">gtk-open</property>
<property name="always_show_image">True</property>
</object> </object>
<object class="GtkAction" id="FileMenu"> <object class="GtkAction" id="FileMenu">
<property name="label">_File</property> <property name="label">_File</property>
...@@ -5275,50 +5261,38 @@ Usually you will want to use the cutter radius here to cut around the outline.</ ...@@ -5275,50 +5261,38 @@ Usually you will want to use the cutter radius here to cut around the outline.</
<object class="GtkAction" id="ExportGCodeVisible"> <object class="GtkAction" id="ExportGCodeVisible">
<property name="label">Export _visible Toolpaths ...</property> <property name="label">Export _visible Toolpaths ...</property>
<property name="tooltip">Write all visible toolpaths to a file.</property> <property name="tooltip">Write all visible toolpaths to a file.</property>
<property name="stock_id">gtk-execute</property>
<property name="always_show_image">True</property>
</object> </object>
<object class="GtkAction" id="ExportGCodeAll"> <object class="GtkAction" id="ExportGCodeAll">
<property name="label">_Export all Toolpaths ...</property> <property name="label">_Export all Toolpaths ...</property>
<property name="tooltip">Write all toolpaths to a file.</property> <property name="tooltip">Write all toolpaths to a file.</property>
<property name="stock_id">gtk-execute</property> <property name="stock_id">gtk-execute</property>
<property name="always_show_image">True</property>
</object> </object>
<object class="GtkAction" id="LoadTaskSettings"> <object class="GtkAction" id="LoadTaskSettings">
<property name="label">_Load Task Settings ...</property> <property name="label">_Load Task Settings ...</property>
<property name="tooltip">Load tool, process and task definitions from a file.</property> <property name="tooltip">Load tool, process and task definitions from a file.</property>
<property name="stock_id">gtk-open</property>
<property name="always_show_image">True</property>
</object> </object>
<object class="GtkAction" id="SaveTaskSettings"> <object class="GtkAction" id="SaveTaskSettings">
<property name="label">_Save Task Settings</property> <property name="label">_Save Task Settings</property>
<property name="tooltip">Save the tool, process and task definitions.</property> <property name="tooltip">Save the tool, process and task definitions.</property>
<property name="stock_id">gtk-save</property> <property name="stock_id">gtk-save-as</property>
<property name="always_show_image">True</property>
</object> </object>
<object class="GtkAction" id="SaveAsTaskSettings"> <object class="GtkAction" id="SaveAsTaskSettings">
<property name="label">Save Task Settings _as ...</property> <property name="label">Save Task Settings _as ...</property>
<property name="tooltip">Save the tool, process and task definitions to a new file.</property> <property name="tooltip">Save the tool, process and task definitions to a new file.</property>
<property name="stock_id">gtk-save-as</property>
<property name="always_show_image">True</property>
</object> </object>
<object class="GtkAction" id="GeneralSettings"> <object class="GtkAction" id="GeneralSettings">
<property name="label">_Preferences</property> <property name="label">_Preferences</property>
<property name="tooltip">Configure PyCAM</property> <property name="tooltip">Configure PyCAM</property>
<property name="stock_id">gtk-preferences</property> <property name="stock_id">gtk-preferences</property>
<property name="always_show_image">True</property>
</object> </object>
<object class="GtkAction" id="Quit"> <object class="GtkAction" id="Quit">
<property name="label">_Quit</property> <property name="label">_Quit</property>
<property name="tooltip">Exit PyCAM</property> <property name="tooltip">Exit PyCAM</property>
<property name="stock_id">gtk-quit</property> <property name="stock_id">gtk-quit</property>
<property name="always_show_image">True</property>
</object> </object>
<object class="GtkAction" id="SaveModel"> <object class="GtkAction" id="SaveModel">
<property name="label">_Save Model</property> <property name="label">_Save Model</property>
<property name="tooltip">Save the current model to the STL file.</property> <property name="tooltip">Save the current model to the STL file.</property>
<property name="stock_id">gtk-save</property>
<property name="always_show_image">True</property>
</object> </object>
<object class="GtkAction" id="WindowMenu"> <object class="GtkAction" id="WindowMenu">
<property name="label">_Windows</property> <property name="label">_Windows</property>
...@@ -5332,7 +5306,6 @@ Usually you will want to use the cutter radius here to cut around the outline.</ ...@@ -5332,7 +5306,6 @@ Usually you will want to use the cutter radius here to cut around the outline.</
<property name="short_label">Save Model as ...</property> <property name="short_label">Save Model as ...</property>
<property name="tooltip">Save the current model to a new STL file.</property> <property name="tooltip">Save the current model to a new STL file.</property>
<property name="stock_id">gtk-save-as</property> <property name="stock_id">gtk-save-as</property>
<property name="always_show_image">True</property>
</object> </object>
<object class="GtkDialog" id="GeneralSettingsWindow"> <object class="GtkDialog" id="GeneralSettingsWindow">
<property name="border_width">5</property> <property name="border_width">5</property>
...@@ -7326,10 +7299,19 @@ See the &lt;a href="http://sf.net/apps/mediawiki/pycam/?title=Parallel_Processin ...@@ -7326,10 +7299,19 @@ See the &lt;a href="http://sf.net/apps/mediawiki/pycam/?title=Parallel_Processin
<property name="position">0</property> <property name="position">0</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkAlignment" id="alignment48">
<property name="visible">True</property>
<child> <child>
<placeholder/> <placeholder/>
</child> </child>
</object> </object>
<packing>
<property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">False</property> <property name="fill">False</property>
...@@ -7345,7 +7327,7 @@ See the &lt;a href="http://sf.net/apps/mediawiki/pycam/?title=Parallel_Processin ...@@ -7345,7 +7327,7 @@ See the &lt;a href="http://sf.net/apps/mediawiki/pycam/?title=Parallel_Processin
<child> <child>
<object class="GtkTable" id="ServerModeSettingsTable"> <object class="GtkTable" id="ServerModeSettingsTable">
<property name="visible">True</property> <property name="visible">True</property>
<property name="n_rows">4</property> <property name="n_rows">5</property>
<property name="n_columns">3</property> <property name="n_columns">3</property>
<property name="column_spacing">3</property> <property name="column_spacing">3</property>
<property name="row_spacing">2</property> <property name="row_spacing">2</property>
...@@ -7415,35 +7397,63 @@ Leave this field empty for running a local server.</property> ...@@ -7415,35 +7397,63 @@ Leave this field empty for running a local server.</property>
</object> </object>
<packing> <packing>
<property name="top_attach">2</property> <property name="top_attach">2</property>
<property name="bottom_attach">3</property> <property name="bottom_attach">4</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>
</child> </child>
<child> <child>
<object class="GtkSpinButton" id="ServerPortLocal"> <object class="GtkButton" id="ServerPasswordGenerate">
<property name="label">Generate</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Generate a new random shared secret.</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options"></property>
<property name="y_options"></property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="ServerPasswordShow">
<property name="label" translatable="yes">Show password</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="tooltip_text" translatable="yes">PyCAM will try to bind to this local TCP port. Other PyCAM clients may connect to this port if they know the shared secret. <property name="receives_default">False</property>
Remember that you need administrative permissions for ports below 1024. <property name="draw_indicator">True</property>
The default port is 1250.</property> </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="ServerPassword">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="visibility">False</property>
<property name="invisible_char">&#x25CF;</property> <property name="invisible_char">&#x25CF;</property>
<property name="adjustment">ServerPortLocalValue</property> <property name="truncate_multiline">True</property>
</object> </object>
<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">1</property> <property name="top_attach">2</property>
<property name="bottom_attach">2</property> <property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkViewport" id="viewport1"> <object class="GtkAlignment" id="alignment24">
<property name="visible">True</property> <property name="visible">True</property>
<property name="resize_mode">queue</property>
<property name="shadow_type">none</property>
<child> <child>
<placeholder/> <placeholder/>
</child> </child>
...@@ -7451,89 +7461,74 @@ The default port is 1250.</property> ...@@ -7451,89 +7461,74 @@ The default port is 1250.</property>
<packing> <packing>
<property name="left_attach">2</property> <property name="left_attach">2</property>
<property name="right_attach">3</property> <property name="right_attach">3</property>
<property name="top_attach">1</property> <property name="top_attach">3</property>
<property name="bottom_attach">2</property> <property name="bottom_attach">4</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>
</child> </child>
<child> <child>
<object class="GtkVBox" id="vbox37"> <object class="GtkLinkButton" id="ServerModeHelp">
<property name="visible">True</property> <property name="label">gtk-help</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkEntry" id="ServerPassword">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="tooltip_text" translatable="yes">All servers and clients of a processing cloud must use the same shared secret.</property> <property name="receives_default">True</property>
<property name="visibility">False</property> <property name="relief">none</property>
<property name="invisible_char">&#x25CF;</property> <property name="use_stock">True</property>
<property name="truncate_multiline">True</property> <property name="uri">http://sourceforge.net/apps/mediawiki/pycam/index.php?title=ServerMode</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="left_attach">2</property>
<property name="position">0</property> <property name="right_attach">3</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> </packing>
</child> </child>
<child> <child>
<object class="GtkCheckButton" id="ServerPasswordShow"> <object class="GtkAlignment" id="alignment25">
<property name="label" translatable="yes">Show password</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <child>
<property name="receives_default">False</property> <placeholder/>
<property name="tooltip_text" translatable="yes">Show or hide the shared secret in the password field.</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child> </child>
</object> </object>
<packing> <packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property> <property name="right_attach">2</property>
<property name="top_attach">2</property> <property name="top_attach">4</property>
<property name="bottom_attach">3</property> <property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkButton" id="ServerPasswordGenerate"> <object class="GtkSpinButton" id="ServerPortLocal">
<property name="label">gtk-new</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="invisible_char">&#x25CF;</property>
<property name="tooltip_text" translatable="yes">Generate a new random shared secret.</property> <property name="adjustment">ServerPortLocalValue</property>
<property name="use_stock">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
</object> </object>
<packing> <packing>
<property name="left_attach">2</property> <property name="left_attach">2</property>
<property name="right_attach">3</property> <property name="right_attach">3</property>
<property name="top_attach">2</property> <property name="top_attach">1</property>
<property name="bottom_attach">3</property> <property name="bottom_attach">2</property>
<property name="x_options"></property> <property name="x_options">GTK_FILL</property>
<property name="y_options"></property> <property name="y_options">GTK_FILL</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkLinkButton" id="ServerModeHelp"> <object class="GtkAlignment" id="alignment49">
<property name="label">gtk-help</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <child>
<property name="receives_default">True</property> <placeholder/>
<property name="has_tooltip">True</property> </child>
<property name="relief">none</property>
<property name="use_stock">True</property>
<property name="xalign">1</property>
<property name="uri">http://sourceforge.net/apps/mediawiki/pycam/index.php?title=ServerMode</property>
</object> </object>
<packing> <packing>
<property name="right_attach">3</property> <property name="left_attach">1</property>
<property name="top_attach">3</property> <property name="right_attach">2</property>
<property name="bottom_attach">4</property> <property name="top_attach">1</property>
<property name="bottom_attach">2</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>
...@@ -7709,12 +7704,9 @@ You should have received a copy of the GNU General Public License along with thi ...@@ -7709,12 +7704,9 @@ You should have received a copy of the GNU General Public License along with thi
<object class="GtkAction" id="About"> <object class="GtkAction" id="About">
<property name="label">_About</property> <property name="label">_About</property>
<property name="stock_id">gtk-about</property> <property name="stock_id">gtk-about</property>
<property name="always_show_image">True</property>
</object> </object>
<object class="GtkAction" id="ExportEMCToolDefinition"> <object class="GtkAction" id="ExportEMCToolDefinition">
<property name="label">_Export EMC tools ...</property> <property name="label">_Export EMC tools ...</property>
<property name="stock_id">gtk-execute</property>
<property name="always_show_image">True</property>
</object> </object>
<object class="GtkAdjustment" id="ScaleDimensionValue"> <object class="GtkAdjustment" id="ScaleDimensionValue">
<property name="upper">10000</property> <property name="upper">10000</property>
...@@ -7940,47 +7932,36 @@ Any selected group of dimensions will be scaled accordingly.</property> ...@@ -7940,47 +7932,36 @@ Any selected group of dimensions will be scaled accordingly.</property>
</object> </object>
<object class="GtkAction" id="HelpIntroduction"> <object class="GtkAction" id="HelpIntroduction">
<property name="label">_Introduction</property> <property name="label">_Introduction</property>
<property name="stock_id">gtk-help</property>
</object> </object>
<object class="GtkAction" id="HelpSupportedFormats"> <object class="GtkAction" id="HelpSupportedFormats">
<property name="label">Supported _Formats</property> <property name="label">Supported _Formats</property>
<property name="stock_id">gtk-help</property>
</object> </object>
<object class="GtkAction" id="HelpModelTransformations"> <object class="GtkAction" id="HelpModelTransformations">
<property name="label">_Model Transformations</property> <property name="label">_Model Transformations</property>
<property name="stock_id">gtk-help</property>
</object> </object>
<object class="GtkAction" id="HelpToolTypes"> <object class="GtkAction" id="HelpToolTypes">
<property name="label">T_ool Types</property> <property name="label">T_ool Types</property>
<property name="stock_id">gtk-help</property>
</object> </object>
<object class="GtkAction" id="HelpProcessSettings"> <object class="GtkAction" id="HelpProcessSettings">
<property name="label">_Process Settings</property> <property name="label">_Process Settings</property>
<property name="stock_id">gtk-help</property>
</object> </object>
<object class="GtkAction" id="HelpBoundsSettings"> <object class="GtkAction" id="HelpBoundsSettings">
<property name="label">_Bounds Settings</property> <property name="label">_Bounds Settings</property>
<property name="stock_id">gtk-help</property>
</object> </object>
<object class="GtkAction" id="HelpTaskSetup"> <object class="GtkAction" id="HelpTaskSetup">
<property name="label">_Task Setup</property> <property name="label">_Task Setup</property>
<property name="stock_id">gtk-help</property>
</object> </object>
<object class="GtkAction" id="HelpGCodeExport"> <object class="GtkAction" id="HelpGCodeExport">
<property name="label">_GCode Export</property> <property name="label">_GCode Export</property>
<property name="stock_id">gtk-help</property>
</object> </object>
<object class="GtkAction" id="HelpSimulation"> <object class="GtkAction" id="HelpSimulation">
<property name="label">_Simulation</property> <property name="label">_Simulation</property>
<property name="stock_id">gtk-help</property>
</object> </object>
<object class="GtkAction" id="Help3DView"> <object class="GtkAction" id="Help3DView">
<property name="label">3D _View</property> <property name="label">3D _View</property>
<property name="stock_id">gtk-help</property>
</object> </object>
<object class="GtkAction" id="HelpCommandLine"> <object class="GtkAction" id="HelpCommandLine">
<property name="label">_Command Line Usage</property> <property name="label">_Command Line Usage</property>
<property name="stock_id">gtk-help</property>
</object> </object>
<object class="GtkAction" id="ProjectWebsite"> <object class="GtkAction" id="ProjectWebsite">
<property name="label">Project _Website</property> <property name="label">Project _Website</property>
...@@ -7988,15 +7969,12 @@ Any selected group of dimensions will be scaled accordingly.</property> ...@@ -7988,15 +7969,12 @@ Any selected group of dimensions will be scaled accordingly.</property>
</object> </object>
<object class="GtkAction" id="Forum"> <object class="GtkAction" id="Forum">
<property name="label">_Forum</property> <property name="label">_Forum</property>
<property name="stock_id">gtk-network</property>
</object> </object>
<object class="GtkAction" id="BugTracker"> <object class="GtkAction" id="BugTracker">
<property name="label">Report a _Bug</property> <property name="label">Report a _Bug</property>
<property name="stock_id">gtk-network</property>
</object> </object>
<object class="GtkAction" id="FeatureRequest"> <object class="GtkAction" id="FeatureRequest">
<property name="label">Re_quest a Feature</property> <property name="label">Re_quest a Feature</property>
<property name="stock_id">gtk-network</property>
</object> </object>
<object class="GtkAdjustment" id="SupportGridDistanceY"> <object class="GtkAdjustment" id="SupportGridDistanceY">
<property name="upper">1000</property> <property name="upper">1000</property>
...@@ -8015,8 +7993,6 @@ Any selected group of dimensions will be scaled accordingly.</property> ...@@ -8015,8 +7993,6 @@ Any selected group of dimensions will be scaled accordingly.</property>
<object class="GtkToggleAction" id="ToggleLogWindow"> <object class="GtkToggleAction" id="ToggleLogWindow">
<property name="label">_Log Window</property> <property name="label">_Log Window</property>
<property name="tooltip">Show the event protocol of PyCAM.</property> <property name="tooltip">Show the event protocol of PyCAM.</property>
<property name="stock_id">gtk-dialog-info</property>
<property name="always_show_image">True</property>
</object> </object>
<object class="GtkDialog" id="LogWindow"> <object class="GtkDialog" id="LogWindow">
<property name="border_width">5</property> <property name="border_width">5</property>
...@@ -8151,7 +8127,6 @@ Any selected group of dimensions will be scaled accordingly.</property> ...@@ -8151,7 +8127,6 @@ Any selected group of dimensions will be scaled accordingly.</property>
</object> </object>
<object class="GtkAction" id="HelpHotkeys"> <object class="GtkAction" id="HelpHotkeys">
<property name="label">_Keyboard Shortcuts</property> <property name="label">_Keyboard Shortcuts</property>
<property name="stock_id">gtk-help</property>
</object> </object>
<object class="GtkAdjustment" id="SupportGridAverageDistance"> <object class="GtkAdjustment" id="SupportGridAverageDistance">
<property name="value">30</property> <property name="value">30</property>
...@@ -8180,8 +8155,6 @@ Any selected group of dimensions will be scaled accordingly.</property> ...@@ -8180,8 +8155,6 @@ Any selected group of dimensions will be scaled accordingly.</property>
</object> </object>
<object class="GtkAction" id="OpenRecentModel"> <object class="GtkAction" id="OpenRecentModel">
<property name="label">Open _Recent</property> <property name="label">Open _Recent</property>
<property name="stock_id">gtk-open</property>
<property name="always_show_image">True</property>
</object> </object>
<object class="GtkDialog" id="ProcessPoolWindow"> <object class="GtkDialog" id="ProcessPoolWindow">
<property name="border_width">5</property> <property name="border_width">5</property>
...@@ -8485,12 +8458,9 @@ Please read the description of the Server Mode (linked below) to understand the ...@@ -8485,12 +8458,9 @@ Please read the description of the Server Mode (linked below) to understand the
<object class="GtkToggleAction" id="ToggleProcessPoolWindow"> <object class="GtkToggleAction" id="ToggleProcessPoolWindow">
<property name="label">_Process Pool Window</property> <property name="label">_Process Pool Window</property>
<property name="tooltip">Show the current pool of workers</property> <property name="tooltip">Show the current pool of workers</property>
<property name="stock_id">gtk-network</property>
<property name="always_show_image">True</property>
</object> </object>
<object class="GtkAction" id="DevelopmentBlog"> <object class="GtkAction" id="DevelopmentBlog">
<property name="label">_Development Blog</property> <property name="label">_Development Blog</property>
<property name="stock_id">gtk-network</property>
</object> </object>
<object class="GtkAction" id="HelpServerMode"> <object class="GtkAction" id="HelpServerMode">
<property name="label">Server Mode</property> <property name="label">Server Mode</property>
...@@ -8983,7 +8953,6 @@ You can paste the result into Inkscape or other vector graphic editors.</propert ...@@ -8983,7 +8953,6 @@ You can paste the result into Inkscape or other vector graphic editors.</propert
<object class="GtkAction" id="ShowFontDialog"> <object class="GtkAction" id="ShowFontDialog">
<property name="label">_Engrave text ...</property> <property name="label">_Engrave text ...</property>
<property name="stock_id">gtk-select-font</property> <property name="stock_id">gtk-select-font</property>
<property name="always_show_image">True</property>
</object> </object>
<object class="GtkTextBuffer" id="FontDialogInputBuffer"/> <object class="GtkTextBuffer" id="FontDialogInputBuffer"/>
<object class="GtkAction" id="ExtrasMenu"> <object class="GtkAction" id="ExtrasMenu">
...@@ -8995,7 +8964,6 @@ You can paste the result into Inkscape or other vector graphic editors.</propert ...@@ -8995,7 +8964,6 @@ You can paste the result into Inkscape or other vector graphic editors.</propert
<object class="GtkAction" id="UndoButton"> <object class="GtkAction" id="UndoButton">
<property name="label">Undo latest model change</property> <property name="label">Undo latest model change</property>
<property name="stock_id">gtk-undo</property> <property name="stock_id">gtk-undo</property>
<property name="always_show_image">True</property>
</object> </object>
<object class="GtkAdjustment" id="FontCharacterSpacingValue"> <object class="GtkAdjustment" id="FontCharacterSpacingValue">
<property name="value">1</property> <property name="value">1</property>
...@@ -9470,14 +9438,6 @@ upon interesting bugs and weird results.</property> ...@@ -9470,14 +9438,6 @@ upon interesting bugs and weird results.</property>
<property name="upper">1000</property> <property name="upper">1000</property>
<property name="step_increment">1</property> <property name="step_increment">1</property>
</object> </object>
<object class="GtkImage" id="ShowToolPathSimulation">
<property name="visible">True</property>
<property name="stock">gtk-execute</property>
</object>
<object class="GtkImage" id="CropToolpath">
<property name="visible">True</property>
<property name="stock">gtk-zoom-fit</property>
</object>
<object class="GtkAdjustment" id="ToolChangeRapidMoveDownValue"> <object class="GtkAdjustment" id="ToolChangeRapidMoveDownValue">
<property name="upper">10000</property> <property name="upper">10000</property>
<property name="step_increment">1</property> <property name="step_increment">1</property>
...@@ -9522,19 +9482,9 @@ upon interesting bugs and weird results.</property> ...@@ -9522,19 +9482,9 @@ upon interesting bugs and weird results.</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="stock">gtk-execute</property> <property name="stock">gtk-execute</property>
</object> </object>
<object class="GtkImage" id="GenerateAllToolPathsIcon">
<property name="visible">True</property>
<property name="stock">gtk-execute</property>
</object>
<object class="GtkAction" id="HelpTouchOff"> <object class="GtkAction" id="HelpTouchOff">
<property name="label">_Touch off and tool change</property> <property name="label">_Touch off and tool change</property>
<property name="short_label">_Touch off</property> <property name="short_label">_Touch off</property>
<property name="stock_id">gtk-help</property>
<property name="always_show_image">True</property>
</object>
<object class="GtkImage" id="ExportVisibleToolpathsIcon">
<property name="visible">True</property>
<property name="stock">gtk-save-as</property>
</object> </object>
<object class="GtkImage" id="ExportAllToolpathsIcon"> <object class="GtkImage" id="ExportAllToolpathsIcon">
<property name="visible">True</property> <property name="visible">True</property>
...@@ -9545,13 +9495,11 @@ upon interesting bugs and weird results.</property> ...@@ -9545,13 +9495,11 @@ upon interesting bugs and weird results.</property>
<property name="short_label">_Copy</property> <property name="short_label">_Copy</property>
<property name="tooltip">Copy model to clipboard</property> <property name="tooltip">Copy model to clipboard</property>
<property name="stock_id">gtk-copy</property> <property name="stock_id">gtk-copy</property>
<property name="always_show_image">True</property>
</object> </object>
<object class="GtkAction" id="PasteModelFromClipboard"> <object class="GtkAction" id="PasteModelFromClipboard">
<property name="label">_Paste</property> <property name="label">_Paste</property>
<property name="short_label">_Paste</property> <property name="short_label">_Paste</property>
<property name="tooltip">Paste a model from clipboard</property> <property name="tooltip">Paste a model from clipboard</property>
<property name="stock_id">gtk-paste</property> <property name="stock_id">gtk-paste</property>
<property name="always_show_image">True</property>
</object> </object>
</interface> </interface>
src/pycam/Gui/Project.py
View file @ a9a05655
...@@ -281,6 +281,7 @@ class ProjectGui: ...@@ -281,6 +281,7 @@ class ProjectGui:
gtk.main_quit() gtk.main_quit()
self.gui.add_from_file(gtk_build_file) self.gui.add_from_file(gtk_build_file)
self.window = self.gui.get_object("ProjectWindow") self.window = self.gui.get_object("ProjectWindow")
# show stock items on buttons
# increase the initial width of the window (due to hidden elements) # increase the initial width of the window (due to hidden elements)
self.window.set_default_size(400, -1) self.window.set_default_size(400, -1)
# initialize the RecentManager (TODO: check for Windows) # initialize the RecentManager (TODO: check for Windows)
...@@ -1593,7 +1594,8 @@ class ProjectGui: ...@@ -1593,7 +1594,8 @@ class ProjectGui:
def _browse_external_program_location(self, widget=None, key=None): def _browse_external_program_location(self, widget=None, key=None):
location = self.get_filename_via_dialog(title="Select the executable " \ location = self.get_filename_via_dialog(title="Select the executable " \
+ "for '%s'" % key, mode_load=True) + "for '%s'" % key, mode_load=True,
parent=self.preferences_window)
if not location is None: if not location is None:
self.settings.set("external_program_%s" % key, location) self.settings.set("external_program_%s" % key, location)
...@@ -4048,11 +4050,13 @@ class ProjectGui: ...@@ -4048,11 +4050,13 @@ class ProjectGui:
return toolpath_settings return toolpath_settings
def get_filename_via_dialog(self, title, mode_load=False, type_filter=None, def get_filename_via_dialog(self, title, mode_load=False, type_filter=None,
filename_templates=None, filename_extension=None): filename_templates=None, filename_extension=None, parent=None):
if parent is None:
parent = self.window
# we open a dialog # we open a dialog
if mode_load: if mode_load:
dialog = gtk.FileChooserDialog(title=title, dialog = gtk.FileChooserDialog(title=title,
parent=self.window, action=gtk.FILE_CHOOSER_ACTION_OPEN, parent=parent, action=gtk.FILE_CHOOSER_ACTION_OPEN,
buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
gtk.STOCK_OPEN, gtk.RESPONSE_OK)) gtk.STOCK_OPEN, gtk.RESPONSE_OK))
else: else:
...@@ -4267,6 +4271,10 @@ class ProjectGui: ...@@ -4267,6 +4271,10 @@ class ProjectGui:
def mainloop(self): def mainloop(self):
# run the mainloop only if a GUI was requested # run the mainloop only if a GUI was requested
if not self.no_dialog: if not self.no_dialog:
gtk_settings = gtk.settings_get_default()
# force the icons to be displayed
gtk_settings.props.gtk_menu_images = True
gtk_settings.props.gtk_button_images = True
try: try:
gtk.main() gtk.main()
except KeyboardInterrupt: except KeyboardInterrupt:
......
src/pycam/Utils/__init__.py
View file @ a9a05655
...@@ -209,7 +209,7 @@ def get_external_program_location(key): ...@@ -209,7 +209,7 @@ def get_external_program_location(key):
for one_dir in path_env.split(os.pathsep): for one_dir in path_env.split(os.pathsep):
for basename in potential_names: for basename in potential_names:
location = os.path.join(one_dir, basename) location = os.path.join(one_dir, basename)
if check_uri_exists(location): if os.path.isfile(location):
return location return location
# do a manual scan in the programs directory (only for windows) # do a manual scan in the programs directory (only for windows)
try: try:
...@@ -223,7 +223,7 @@ def get_external_program_location(key): ...@@ -223,7 +223,7 @@ def get_external_program_location(key):
for sub_dir in windows_program_directories[key]: for sub_dir in windows_program_directories[key]:
for basename in potential_names: for basename in potential_names:
location = os.path.join(program_dir, sub_dir, basename) location = os.path.join(program_dir, sub_dir, basename)
if check_uri_exists(location): if os.path.isfile(location):
return location return location
# nothing found # nothing found
return None return None
......
src/pycam/Utils/log.py
View file @ a9a05655
...@@ -100,7 +100,7 @@ class RepetitionsFilter(logging.Filter): ...@@ -100,7 +100,7 @@ class RepetitionsFilter(logging.Filter):
# a clean style. # a clean style.
self._handler = handler self._handler = handler
self._suppressed_messages_counter = 0 self._suppressed_messages_counter = 0
self._cmp_len = 20 self._cmp_len = 30
self._delay = 3 self._delay = 3
def filter(self, record): def filter(self, record):
......
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