Merge branch 'master' into cnc-output

diylc/diylc-core/src/main/resources/update.xml

@@ -465,6 +465,10 @@
 					<changeType>IMPROVEMENT</changeType>
 					<description>Honor label color settings for 'Tape Measure' component</description>
 				</org.diylc.appframework.update.Change>
+				<org.diylc.appframework.update.Change>
+					<changeType>IMPROVEMENT</changeType>
+					<description>Reorganized export and print related items in the File menu to reduce clutter</description>
+				</org.diylc.appframework.update.Change>
 				<org.diylc.appframework.update.Change>
 					<changeType>BUG_FIX</changeType>
 					<description>Fixed underside rendering and mirroring position issues that affected only SPDT 'Mini Toggle Switch' types</description>

diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/file/FileMenuPlugin.java

@@ -45,7 +45,7 @@ public class FileMenuPlugin implements IPlugIn, IDynamicSubmenuHandler {
   private static final String TRACE_MASK_TITLE = "Trace Mask";
   private static final String SILK_SCREEN_TITLE = "Silkscreen";
   private static final String INTEGRATION_TITLE = "Integration";
-  private static final String EXPORT_TITLE = "Export";
+  private static final String PROJECT_TITLE = "Project";
 
   private ProjectDrawingProvider drawingProvider;
   private TraceMaskDrawingProvider traceMaskDrawingProvider;
@@ -76,15 +76,16 @@ public class FileMenuPlugin implements IPlugIn, IDynamicSubmenuHandler {
     swingUI.injectMenuAction(actionFactory.createSaveAsAction(plugInPort, swingUI), FILE_TITLE);
     swingUI.injectDynamicSubmenu("Recent Files", IconLoader.History.getIcon(), FILE_TITLE, this);
     swingUI.injectMenuAction(null, FILE_TITLE);
-    swingUI.injectSubmenu(EXPORT_TITLE, IconLoader.Export.getIcon(), FILE_TITLE);
+
+    swingUI.injectSubmenu(PROJECT_TITLE, IconLoader.Project.getIcon(), FILE_TITLE);
     swingUI.injectMenuAction(
-        actionFactory.createExportPDFAction(plugInPort, drawingProvider, swingUI, ""), EXPORT_TITLE);
+        actionFactory.createExportPDFAction(plugInPort, drawingProvider, swingUI, ""), PROJECT_TITLE);
     swingUI.injectMenuAction(
-        actionFactory.createExportPNGAction(plugInPort, drawingProvider, swingUI, ""), EXPORT_TITLE);
+        actionFactory.createExportPNGAction(plugInPort, drawingProvider, swingUI, ""), PROJECT_TITLE);
     swingUI.injectMenuAction(
-        actionFactory.createExportGerberAction(plugInPort, swingUI), EXPORT_TITLE);
+        actionFactory.createExportGerberAction(plugInPort, swingUI), PROJECT_TITLE);
     swingUI.injectMenuAction(actionFactory.createPrintAction(drawingProvider, swingUI,
-        Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx()), FILE_TITLE);
+        Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx()), PROJECT_TITLE);
 
     swingUI.injectSubmenu(TRACE_MASK_TITLE, IconLoader.TraceMask.getIcon(), FILE_TITLE);
     swingUI.injectMenuAction(actionFactory.createExportPDFAction(plugInPort,
@@ -103,7 +104,7 @@ public class FileMenuPlugin implements IPlugIn, IDynamicSubmenuHandler {
         silkScreenDrawingProvider, swingUI, " (silkscreen)"), SILK_SCREEN_TITLE);
     swingUI.injectMenuAction(
         actionFactory.createPrintAction(silkScreenDrawingProvider, swingUI,
-            Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx() | KeyEvent.SHIFT_DOWN_MASK),
+            Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx() | KeyEvent.ALT_DOWN_MASK),
         SILK_SCREEN_TITLE);
 
 

diylc/diylc-swing/src/main/java/org/diylc/utils/IconLoader.java

@@ -72,7 +72,8 @@ public enum IconLoader {
       ComponentLarge("component_large.png"), ImportNetlist("import_netlist.png"), SplashIC("splash_ic.png"), 
       ComponentPreferences("component_preferences.png"), ComponentReplace("component_replace.png"), Barcode("barcode.png"),
       DocumentGerber("document_gerber.png"), DocumentX2("document_x2.png"), Export("export.png"), Multimeter("multimeter.png"),
-      Patreon("patreon.png"), Brain("brain.png"), Tables("tables.png"), Silkscreen("silkscreen.png");
+      Patreon("patreon.png"), Brain("brain.png"), Tables("tables.png"), Silkscreen("silkscreen.png"),
+      Project("project.png");
 
   protected String name;
 

diylc/diylc-swing/src/main/resources/lang/Deutsch.txt

@@ -305,6 +305,7 @@ Power Rating|Nennleistung
 Power Strip|Steckdosenleiste
 Primary CT|Primärer Mittelabgriff
 Print...|Drucken...
+Project|Projekt
 Project Cloud|Projekt Cloud
 Public Announcement|Öffentliche Ankündigung
 Radius|Radius

diylc/diylc-swing/src/main/resources/lang/English.txt

@@ -300,6 +300,7 @@ Power Rating
 Power Strip
 Primary CT
 Print...
+Project
 Project Cloud
 Public Announcement
 Radius

diylc/diylc-swing/src/main/resources/lang/Español.txt

@@ -299,6 +299,7 @@ Power Rating|Potencia Nominal
 Power Strip|Regleta
 Primary CT|Toma Central en primario
 Print...|Imprimir...
+Project|Proyecto
 Project Cloud|Proyectos en la Nube
 Public Announcement|Anuncio Público
 Radius|Radio

diylc/diylc-swing/src/main/resources/lang/Français.txt

@@ -296,6 +296,7 @@ Power Rating|Puissance nominale
 Power Strip|Multiprise
 Primary CT|Prise centrale primaire
 Print...|Imprimer...
+Project|Projet
 Project Cloud|Projet Cloud
 Public Announcement|Annonce publique
 Radius|Rayon

diylc/diylc-swing/src/main/resources/lang/Italiano.txt

@@ -309,6 +309,7 @@ Power Rating|Potenza nominale
 Power Strip|Ciabatta
 Primary CT|CT primario
 Print...|Stampa ...
+Project|Progetto
 Project Cloud|Progetto Cloud
 Public Announcement|Annuncio pubblico
 Radius|raggio

diylc/diylc-swing/src/main/resources/lang/Nederlands.txt

@@ -305,6 +305,7 @@ Power Rating|Nominale vermogen
 Power Strip|Voedingslijn
 Primary CT|Primaire middenaftakking
 Print...|Afdrukken...
+Project|Project
 Project Cloud|Project cloud
 Public Announcement|Openbare aankondiging 
 Radius|Straal 

diylc/diylc-swing/src/main/resources/lang/Português.txt

@@ -299,6 +299,7 @@ Power Rating|Potência Nominal
 Power Strip|Listra Eletrificada
 Primary CT|CT Primário
 Print...|Imprimir...
+Project|Projeto
 Project Cloud|Projetos na Núvem
 Public Announcement|Anúncio Público
 Radius|Raio

diylc/diylc-swing/src/main/resources/lang/Srpski.txt

@@ -293,6 +293,7 @@ Power Rating|Snaga
 Power Strip|Naponska Magistrala
 Primary CT|Primarni Srednji Izvod
 Print...|Štampa...
+Project|Projekat
 Project Cloud|Projektni Oblak
 Public Announcement|Javna Objava
 Radius|Poluprečnik

diylc/diylc-swing/src/main/resources/lang/हिंदी.txt

@@ -300,6 +300,7 @@ Power Rating|पावर रेटिंग
 Power Strip|पावर स्ट्रिप
 Primary CT|प्राइमरी CT
 Print...|प्रिंट...
+Project|प्रोजेक्ट
 Project Cloud|प्रोजेक्ट क्लाउड
 Public Announcement|सार्वजनिक घोषणा
 Radius|त्रिज्या

diylc/diylc-swing/src/main/resources/lang/简体中文.txt

@@ -300,6 +300,7 @@ Power Rating|功率
 Power Strip|电源条
 Primary CT|初级中心抽头
 Print...|打印...
+Project|项目
 Project Cloud|项目云
 Public Announcement|公告
 Radius|半径