Browse Source

- added inverted icons

Marius Stanciu 6 năm trước cách đây
mục cha
commit
031a3a141e
100 tập tin đã thay đổi với 21 bổ sung15 xóa
  1. 4 1
      FlatCAM.py
  2. 1 0
      README.md
  3. 2 0
      flatcamGUI/VisPyCanvas.py
  4. 14 14
      flatcamTools/ToolRulesCheck.py
  5. BIN
      share/dark/about32.png
  6. BIN
      share/dark/active_static.png
  7. BIN
      share/dark/addarray16.png
  8. BIN
      share/dark/addarray20.png
  9. BIN
      share/dark/addarray32.png
  10. BIN
      share/dark/align_center32.png
  11. BIN
      share/dark/align_justify32.png
  12. BIN
      share/dark/align_left32.png
  13. BIN
      share/dark/align_right32.png
  14. BIN
      share/dark/aperture16.png
  15. BIN
      share/dark/aperture32.png
  16. BIN
      share/dark/arc16.png
  17. BIN
      share/dark/arc24.png
  18. BIN
      share/dark/arc32.png
  19. BIN
      share/dark/axis32.png
  20. BIN
      share/dark/backup24.png
  21. BIN
      share/dark/backup_export24.png
  22. BIN
      share/dark/backup_import24.png
  23. BIN
      share/dark/blocked16.png
  24. BIN
      share/dark/bluelight12.png
  25. BIN
      share/dark/bold32.png
  26. BIN
      share/dark/buffer16-2.png
  27. BIN
      share/dark/buffer16.png
  28. BIN
      share/dark/buffer20.png
  29. BIN
      share/dark/buffer24.png
  30. BIN
      share/dark/bug16.png
  31. BIN
      share/dark/bug32.png
  32. BIN
      share/dark/calculator16.png
  33. BIN
      share/dark/calculator24.png
  34. BIN
      share/dark/cancel_edit16.png
  35. BIN
      share/dark/cancel_edit32.png
  36. BIN
      share/dark/circle32.png
  37. BIN
      share/dark/clear_plot16.png
  38. BIN
      share/dark/clear_plot32.png
  39. BIN
      share/dark/cnc16.png
  40. BIN
      share/dark/cnc32.png
  41. BIN
      share/dark/code.png
  42. BIN
      share/dark/code_editor32.png
  43. BIN
      share/dark/convert24.png
  44. BIN
      share/dark/copy.png
  45. BIN
      share/dark/copy16.png
  46. BIN
      share/dark/copy32.png
  47. BIN
      share/dark/copy_geo.png
  48. BIN
      share/dark/corner32.png
  49. BIN
      share/dark/cut16.png
  50. BIN
      share/dark/cut16_bis.png
  51. BIN
      share/dark/cut32.png
  52. BIN
      share/dark/cut32_bis.png
  53. BIN
      share/dark/cutpath16.png
  54. BIN
      share/dark/cutpath24.png
  55. BIN
      share/dark/cutpath32.png
  56. BIN
      share/dark/defaults.png
  57. BIN
      share/dark/delete32.png
  58. BIN
      share/dark/deleteshape16.png
  59. BIN
      share/dark/deleteshape24.png
  60. BIN
      share/dark/deleteshape32.png
  61. BIN
      share/dark/disable16.png
  62. BIN
      share/dark/disable32.png
  63. BIN
      share/dark/disc32.png
  64. BIN
      share/dark/distance16.png
  65. BIN
      share/dark/distance32.png
  66. BIN
      share/dark/distance_min16.png
  67. BIN
      share/dark/distance_min32.png
  68. BIN
      share/dark/doubleside16.png
  69. BIN
      share/dark/doubleside32.png
  70. BIN
      share/dark/draw32.png
  71. BIN
      share/dark/drill16.png
  72. BIN
      share/dark/drill32.png
  73. BIN
      share/dark/dxf16.png
  74. BIN
      share/dark/edit16.png
  75. BIN
      share/dark/edit32.png
  76. BIN
      share/dark/edit_ok16.png
  77. BIN
      share/dark/edit_ok32.png
  78. BIN
      share/dark/edit_ok32_bis.png
  79. BIN
      share/dark/eraser26.png
  80. BIN
      share/dark/explode32.png
  81. BIN
      share/dark/export.png
  82. BIN
      share/dark/export_png32.png
  83. BIN
      share/dark/file16.png
  84. BIN
      share/dark/file32.png
  85. BIN
      share/dark/film16.png
  86. BIN
      share/dark/film32.png
  87. BIN
      share/dark/flatcam_icon128.png
  88. BIN
      share/dark/flatcam_icon128_inv.png
  89. BIN
      share/dark/flatcam_icon16.ico
  90. BIN
      share/dark/flatcam_icon16.png
  91. BIN
      share/dark/flatcam_icon24.png
  92. BIN
      share/dark/flatcam_icon256.ico
  93. BIN
      share/dark/flatcam_icon256.png
  94. BIN
      share/dark/flatcam_icon32.ico
  95. BIN
      share/dark/flatcam_icon32.png
  96. BIN
      share/dark/flatcam_icon32_green.png
  97. BIN
      share/dark/flatcam_icon48.ico
  98. BIN
      share/dark/flatcam_icon48.png
  99. BIN
      share/dark/flipx.png
  100. BIN
      share/dark/flipy.png

+ 4 - 1
FlatCAM.py

@@ -9,11 +9,14 @@ from flatcamGUI import VisPyPatches
 from multiprocessing import freeze_support
 # import copyreg
 # import types
+import qdarkstyle
 
 if sys.platform == "win32":
     # cx_freeze 'module win32' workaround
     pass
 
+os.environ['QT_API'] = 'pyqt5'
+
 
 def debug_trace():
     """
@@ -48,7 +51,7 @@ if __name__ == '__main__':
         os.environ["QT_AUTO_SCREEN_SCALE_FACTOR"] = "0"
 
     app = QtWidgets.QApplication(sys.argv)
-
+    app.setStyleSheet(qdarkstyle.load_stylesheet_pyqt5())
     # apply style
     settings = QSettings("Open Source", "FlatCAM")
     if settings.contains("style"):

+ 1 - 0
README.md

@@ -17,6 +17,7 @@ CAD program, and create G-Code for Isolation routing.
 - updated the .POT file and worked a bit in the romanian translation
 - small changes: reduced the thickness of the axis in 3D mode from 3 pixels to 1 pixel
 - made sure that is the text in the source file of a FlatCAMDocument is HTML is loaded as such
+- added inverted icons
 
 6.10.2019
 

+ 2 - 0
flatcamGUI/VisPyCanvas.py

@@ -44,6 +44,8 @@ class VisPyCanvas(scene.SceneCanvas):
             theme_color = Color('#000000')
             tick_color = Color('gray')
             back_color = Color('#000000')
+            # back_color = Color('#272822') # darker
+            # back_color = Color('#3c3f41') # lighter
 
         self.central_widget.bgcolor = back_color
         self.central_widget.border_color = back_color

+ 14 - 14
flatcamTools/ToolRulesCheck.py

@@ -51,7 +51,7 @@ class RulesCheck(FlatCAMTool):
 
         self.gerber_title_lbl = QtWidgets.QLabel('<b>%s</b>:' % _("Gerber Files"))
         self.gerber_title_lbl.setToolTip(
-            _("Gerber files for which to check rules.")
+            _("Gerber objects for which to check rules.")
         )
 
         self.all_obj_cb = FCCheckBox()
@@ -64,7 +64,7 @@ class RulesCheck(FlatCAMTool):
 
         self.copper_t_object_lbl = QtWidgets.QLabel('%s:' % _("Top"))
         self.copper_t_object_lbl.setToolTip(
-            _("The Gerber Copper Top file for which rules are checked.")
+            _("The Top Gerber Copper object for which rules are checked.")
         )
 
         self.copper_t_cb = FCCheckBox()
@@ -77,7 +77,7 @@ class RulesCheck(FlatCAMTool):
 
         self.copper_b_object_lbl = QtWidgets.QLabel('%s:' % _("Bottom"))
         self.copper_b_object_lbl.setToolTip(
-            _("The Gerber Copper Bottom file for which rules are checked.")
+            _("The Bottom Gerber Copper object for which rules are checked.")
         )
 
         self.copper_b_cb = FCCheckBox()
@@ -90,7 +90,7 @@ class RulesCheck(FlatCAMTool):
 
         self.sm_t_object_lbl = QtWidgets.QLabel('%s:' % _("SM Top"))
         self.sm_t_object_lbl.setToolTip(
-            _("The Gerber Solder Mask Top file for which rules are checked.")
+            _("The Top Gerber Solder Mask object for which rules are checked.")
         )
 
         self.sm_t_cb = FCCheckBox()
@@ -103,7 +103,7 @@ class RulesCheck(FlatCAMTool):
 
         self.sm_b_object_lbl = QtWidgets.QLabel('%s:' % _("SM Bottom"))
         self.sm_b_object_lbl.setToolTip(
-            _("The Gerber Solder Mask Top file for which rules are checked.")
+            _("The Bottom Gerber Solder Mask object for which rules are checked.")
         )
 
         self.sm_b_cb = FCCheckBox()
@@ -116,7 +116,7 @@ class RulesCheck(FlatCAMTool):
 
         self.ss_t_object_lbl = QtWidgets.QLabel('%s:' % _("Silk Top"))
         self.ss_t_object_lbl.setToolTip(
-            _("The Gerber Silkscreen Top file for which rules are checked.")
+            _("The Top Gerber Silkscreen object for which rules are checked.")
         )
 
         self.ss_t_cb = FCCheckBox()
@@ -129,7 +129,7 @@ class RulesCheck(FlatCAMTool):
 
         self.ss_b_object_lbl = QtWidgets.QLabel('%s:' % _("Silk Bottom"))
         self.ss_b_object_lbl.setToolTip(
-            _("The Gerber Silkscreen Bottom file for which rules are checked.")
+            _("The Bottom Gerber Silkscreen object for which rules are checked.")
         )
 
         self.ss_b_cb = FCCheckBox()
@@ -142,7 +142,7 @@ class RulesCheck(FlatCAMTool):
 
         self.outline_object_lbl = QtWidgets.QLabel('%s:' % _("Outline"))
         self.outline_object_lbl.setToolTip(
-            _("The Gerber Outline (Cutout) file for which rules are checked.")
+            _("The Gerber Outline (Cutout) object for which rules are checked.")
         )
 
         self.out_cb = FCCheckBox()
@@ -180,9 +180,9 @@ class RulesCheck(FlatCAMTool):
 
         self.grid_layout.addWidget(QtWidgets.QLabel(""), 8, 0, 1, 3)
 
-        self.excellon_title_lbl = QtWidgets.QLabel('<b>%s</b>:' % _("Excellon Files"))
+        self.excellon_title_lbl = QtWidgets.QLabel('<b>%s</b>:' % _("Excellon Objects"))
         self.excellon_title_lbl.setToolTip(
-            _("Excellon files for which to check rules.")
+            _("Excellon objects for which to check rules.")
         )
 
         # Excellon 1 object
@@ -193,8 +193,8 @@ class RulesCheck(FlatCAMTool):
 
         self.e1_object_lbl = QtWidgets.QLabel('%s:' % _("Excellon 1"))
         self.e1_object_lbl.setToolTip(
-            _("Object to be panelized. This means that it will\n"
-              "be duplicated in an array of rows and columns.")
+            _("Excellon object for which to check rules.\n"
+              "Holds the plated holes or a general Excellon file content.")
         )
 
         self.e1_cb = FCCheckBox()
@@ -207,8 +207,8 @@ class RulesCheck(FlatCAMTool):
 
         self.e2_object_lbl = QtWidgets.QLabel('%s:' % _("Excellon 2"))
         self.e2_object_lbl.setToolTip(
-            _("Object to be panelized. This means that it will\n"
-              "be duplicated in an array of rows and columns.")
+            _("Excellon object for which to check rules.\n"
+              "Holds the non-plated holes.")
         )
 
         self.e2_cb = FCCheckBox()

BIN
share/dark/about32.png


BIN
share/dark/active_static.png


BIN
share/dark/addarray16.png


BIN
share/dark/addarray20.png


BIN
share/dark/addarray32.png


BIN
share/dark/align_center32.png


BIN
share/dark/align_justify32.png


BIN
share/dark/align_left32.png


BIN
share/dark/align_right32.png


BIN
share/dark/aperture16.png


BIN
share/dark/aperture32.png


BIN
share/dark/arc16.png


BIN
share/dark/arc24.png


BIN
share/dark/arc32.png


BIN
share/dark/axis32.png


BIN
share/dark/backup24.png


BIN
share/dark/backup_export24.png


BIN
share/dark/backup_import24.png


BIN
share/dark/blocked16.png


BIN
share/dark/bluelight12.png


BIN
share/dark/bold32.png


BIN
share/dark/buffer16-2.png


BIN
share/dark/buffer16.png


BIN
share/dark/buffer20.png


BIN
share/dark/buffer24.png


BIN
share/dark/bug16.png


BIN
share/dark/bug32.png


BIN
share/dark/calculator16.png


BIN
share/dark/calculator24.png


BIN
share/dark/cancel_edit16.png


BIN
share/dark/cancel_edit32.png


BIN
share/dark/circle32.png


BIN
share/dark/clear_plot16.png


BIN
share/dark/clear_plot32.png


BIN
share/dark/cnc16.png


BIN
share/dark/cnc32.png


BIN
share/dark/code.png


BIN
share/dark/code_editor32.png


BIN
share/dark/convert24.png


BIN
share/dark/copy.png


BIN
share/dark/copy16.png


BIN
share/dark/copy32.png


BIN
share/dark/copy_geo.png


BIN
share/dark/corner32.png


BIN
share/dark/cut16.png


BIN
share/dark/cut16_bis.png


BIN
share/dark/cut32.png


BIN
share/dark/cut32_bis.png


BIN
share/dark/cutpath16.png


BIN
share/dark/cutpath24.png


BIN
share/dark/cutpath32.png


BIN
share/dark/defaults.png


BIN
share/dark/delete32.png


BIN
share/dark/deleteshape16.png


BIN
share/dark/deleteshape24.png


BIN
share/dark/deleteshape32.png


BIN
share/dark/disable16.png


BIN
share/dark/disable32.png


BIN
share/dark/disc32.png


BIN
share/dark/distance16.png


BIN
share/dark/distance32.png


BIN
share/dark/distance_min16.png


BIN
share/dark/distance_min32.png


BIN
share/dark/doubleside16.png


BIN
share/dark/doubleside32.png


BIN
share/dark/draw32.png


BIN
share/dark/drill16.png


BIN
share/dark/drill32.png


BIN
share/dark/dxf16.png


BIN
share/dark/edit16.png


BIN
share/dark/edit32.png


BIN
share/dark/edit_ok16.png


BIN
share/dark/edit_ok32.png


BIN
share/dark/edit_ok32_bis.png


BIN
share/dark/eraser26.png


BIN
share/dark/explode32.png


BIN
share/dark/export.png


BIN
share/dark/export_png32.png


BIN
share/dark/file16.png


BIN
share/dark/file32.png


BIN
share/dark/film16.png


BIN
share/dark/film32.png


BIN
share/dark/flatcam_icon128.png


BIN
share/dark/flatcam_icon128_inv.png


BIN
share/dark/flatcam_icon16.ico


BIN
share/dark/flatcam_icon16.png


BIN
share/dark/flatcam_icon24.png


BIN
share/dark/flatcam_icon256.ico


BIN
share/dark/flatcam_icon256.png


BIN
share/dark/flatcam_icon32.ico


BIN
share/dark/flatcam_icon32.png


BIN
share/dark/flatcam_icon32_green.png


BIN
share/dark/flatcam_icon48.ico


BIN
share/dark/flatcam_icon48.png


BIN
share/dark/flipx.png


BIN
share/dark/flipy.png


Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác