Merge pull request #179 from kbwbe/devel

Devel

A2plus.qrc

@@ -1,52 +1,53 @@
 <RCC>
     <qresource prefix="/">
+        <file>icons/a2p_SetRelativePathes.svg</file>
         <file>icons/a2p_CenterOfMassConstraint.svg</file>
-        <file>icons/a2p_recursiveUpdate.svg</file>        
+        <file>icons/a2p_RecursiveUpdate.svg</file>        
         <file>icons/a2p_Asm.svg</file>        
         <file>icons/a2p_Obj.svg</file>
         <file>icons/a2p_EditConstraint.svg</file>
         <file>icons/a2p_DefineConstraints.svg</file>
         <file>icons/a2p_AngleConstraint.svg</file>
-        <file>icons/a2p_autoSolve.svg</file>
+        <file>icons/a2p_AutoSolve.svg</file>
         <file>icons/a2p_AxialConstraint.svg</file>
         <file>icons/a2p_AxisParallelConstraint.svg</file>
         <file>icons/a2p_AxisPlaneParallelConstraint.svg</file>
-        <file>icons/a2p_checkAssembly.svg</file>
+        <file>icons/a2p_CheckAssembly.svg</file>
         <file>icons/a2p_CircularEdgeConstraint.svg</file>
-        <file>icons/a2p_degreesOfFreedomAnimation.svg</file>
+        <file>icons/a2p_DegreesOfFreedomAnimation.svg</file>
         <file>icons/a2p_DeleteConnections.svg</file>
         <file>icons/a2p_DuplicatePart.svg</file>
         <file>icons/a2p_EditPart.svg</file>
         <file>icons/a2p_EditUndo.svg</file>
-        <file>icons/a2p_flipConstraint.svg</file>
-        <file>icons/a2p_help.svg</file>
+        <file>icons/a2p_FlipConstraint.svg</file>
+        <file>icons/a2p_Help.svg</file>
         <file>icons/a2p_ImportPart.svg</file>
         <file>icons/a2p_ConvertPart.svg</file>
         <file>icons/a2p_ImportPart_Update.svg</file>
         <file>icons/a2p_Isolate_Element.svg</file>
-        <file>icons/a2p_lockRotation.svg</file>
+        <file>icons/a2p_LockRotation.svg</file>
         <file>icons/a2p_MovePart.svg</file>
-        <file>icons/a2p_partialProcessing.svg</file>
-        <file>icons/a2p_partsInfo.svg</file>
-        <file>icons/a2p_partsList.svg</file>
-        <file>icons/a2p_pause.svg</file>
+        <file>icons/a2p_PartialProcessing.svg</file>
+        <file>icons/a2p_PartsInfo.svg</file>
+        <file>icons/a2p_PartsList.svg</file>
+        <file>icons/a2p_Pause.svg</file>
         <file>icons/a2p_PlaneCoincidentConstraint.svg</file>
         <file>icons/a2p_PlanesParallelConstraint.svg</file>
-        <file>icons/a2p_play.svg</file>
+        <file>icons/a2p_Play.svg</file>
         <file>icons/a2p_PointIdentity.svg</file>
         <file>icons/a2p_PointOnLineConstraint.svg</file>
         <file>icons/a2p_PointOnPlaneConstraint.svg</file>
         <file>icons/a2p_SimpleAssemblyShape.svg</file>
-        <file>icons/a2p_solver.svg</file>
+        <file>icons/a2p_Solver.svg</file>
         <file>icons/a2p_SphericalSurfaceConstraint.svg</file>
-        <file>icons/a2p_stop.svg</file>
-        <file>icons/a2p_ToggleTranparency.svg</file>
+        <file>icons/a2p_Stop.svg</file>
+        <file>icons/a2p_ToggleTransparency.svg</file>
         <file>icons/a2p_ToggleAutoSolve.svg</file>
         <file>icons/a2p_TogglePartial.svg</file>
-        <file>icons/a2p_treeview.svg</file>
+        <file>icons/a2p_Treeview.svg</file>
         <file>icons/a2p_RepairTree.svg</file>
         <file>icons/a2p_ViewConnection.svg</file>
-        <file>icons/a2p_workbench.svg</file>
+        <file>icons/a2p_Workbench.svg</file>
         <file>icons/preferences-a2plus.svg</file>
     </qresource>
 </RCC>

InitGui.py

@@ -26,7 +26,7 @@
 __title__ = 'A2plus assembly Workbench - InitGui file'
 __author__ = 'kbwbe'
 
-A2P_VERSION = 'V0.3.3'
+A2P_VERSION = 'V0.3.4'
 
 import sys
 PyVersion = sys.version_info[0]
@@ -41,7 +41,7 @@ class a2pWorkbench (Workbench):
     def __init__(self):
         global A2P_VERSION
         import a2plib
-        self.__class__.Icon = a2plib.pathOfModule() + "/icons/a2p_workbench.svg"
+        self.__class__.Icon = a2plib.pathOfModule() + "/icons/a2p_Workbench.svg"
         self.__class__.MenuText = 'A2plus '+A2P_VERSION
         self.__class__.ToolTip  = 'An other assembly workbench for FreeCAD'
 
@@ -159,7 +159,7 @@ def Initialize(self):
         commandslist.extend(miscCommands)
 
         self.appendMenu(
-            'A2p',
+            'A2plus',
             commandslist
             )
 
@@ -168,11 +168,11 @@ def Initialize(self):
             'a2p_absPath_to_relPath_Command'
             ]
         self.appendMenu(
-            'A2p',
+            'A2plus',
             menuEntries
             )
         FreeCADGui.addIconPath(':/icons')
-        #FreeCADGui.addPreferencePage( a2plib.pathOfModule() + '/GuiA2p/ui/a2p_prefs.ui','A2plus' )
+
         FreeCADGui.addPreferencePage(
             a2plib.pathOfModule() +
             '/GuiA2p/Resources/ui/a2p_prefs.ui','A2plus'

a2p_bom.py

@@ -253,7 +253,7 @@ def Activated(self):
 
     def GetResources(self):
         return {
-            'Pixmap'  :     ':/icons/a2p_partsList.svg',
+            'Pixmap'  :     ':/icons/a2p_PartsList.svg',
             'MenuText':     'Create a spreadsheet with a partlist of this file',
             'ToolTip':      toolTip
             }

a2p_constraintDialog.py

@@ -109,7 +109,7 @@ def initUI(self):
             self.mainLayout.addWidget(self.directionCombo,self.lineNo,1)
 
             self.flipDirectionButton = QtGui.QPushButton(self)
-            self.flipDirectionButton.setIcon(QtGui.QIcon(':/icons/a2p_flipConstraint.svg'))
+            self.flipDirectionButton.setIcon(QtGui.QIcon(':/icons/a2p_FlipConstraint.svg'))
             self.flipDirectionButton.setText("Flip Dir.")
             self.flipDirectionButton.setFixedHeight(32)
             QtCore.QObject.connect(self.flipDirectionButton, QtCore.SIGNAL("clicked()"), self.flipDirection)
@@ -176,7 +176,7 @@ def initUI(self):
             self.mainLayout.addWidget(self.lockRotationCombo,self.lineNo,1)
 
             self.flipLockRotationButton = QtGui.QPushButton(self)
-            self.flipLockRotationButton.setIcon(QtGui.QIcon(':/icons/a2p_lockRotation.svg'))
+            self.flipLockRotationButton.setIcon(QtGui.QIcon(':/icons/a2p_LockRotation.svg'))
             self.flipLockRotationButton.setText("Toggle")
             self.flipLockRotationButton.setFixedHeight(32)
             QtCore.QObject.connect(self.flipLockRotationButton, QtCore.SIGNAL("clicked()"), self.flipLockRotation)
@@ -197,13 +197,13 @@ def initUI(self):
 
         self.solveButton = QtGui.QPushButton(self.buttonPanel)
         self.solveButton.setFixedHeight(32)
-        self.solveButton.setIcon(QtGui.QIcon(':/icons/a2p_solver.svg'))
+        self.solveButton.setIcon(QtGui.QIcon(':/icons/a2p_Solver.svg'))
         self.solveButton.setToolTip("solve Constraints")
         self.solveButton.setText("Solve")
 
         self.acceptButton = QtGui.QPushButton(self.buttonPanel)
         self.acceptButton.setFixedHeight(32)
-        self.acceptButton.setIcon(QtGui.QIcon(':/icons/a2p_checkAssembly.svg')) #need new Icon
+        self.acceptButton.setIcon(QtGui.QIcon(':/icons/a2p_CheckAssembly.svg')) #need new Icon
         self.acceptButton.setToolTip("solve Constraints")
         self.acceptButton.setText("Accept")
 

a2p_constraintcommands.py

@@ -229,7 +229,7 @@ def IsActive(self):
     def GetResources(self):
         return {
              'Pixmap' : ':/icons/a2p_AxisPlaneParallelConstraint.svg',
-             'MenuText': 'axisPlaneParallel constraint',
+             'MenuText': 'Add axisPlaneParallel constraint',
              'ToolTip': a2p_constraints.AxisPlaneParallelConstraint.getToolTip()
              }
 
@@ -305,7 +305,7 @@ def IsActive(self):
     def GetResources(self):
         return {
              'Pixmap' : path_a2p + '/icons/a2p_AngleConstraint.svg',
-             'MenuText': 'angle between planes constraint',
+             'MenuText': 'Add angleBetweenPlanes constraint',
              'ToolTip': a2p_constraints.AngledPlanesConstraint.getToolTip()
              }
 
@@ -332,7 +332,7 @@ def IsActive(self):
     def GetResources(self):
         return {
              'Pixmap' : path_a2p + '/icons/a2p_CenterOfMassConstraint.svg',
-             'MenuText': 'center of mass constraint',
+             'MenuText': 'Add centerOfMass constraint',
              'ToolTip': a2p_constraints.CenterOfMassConstraint.getToolTip()
              }
 

a2p_constraints.py

@@ -639,8 +639,6 @@ def __init__(self,selection):
         BasicConstraint.__init__(self, selection)
         self.typeInfo = 'CenterOfMass'
         self.constraintBaseName = 'CenterOfMass'
-        #self.iconPath = ':/icons/a2p_CenterOfMassConstraint.svg'
-        #self.iconPath = a2plib.pathOfModule() + '/GuiA2p/Resources/icons/a2p_CenterOfMassConstraint.svg'
         self.iconPath = path_a2p + '/icons/a2p_CenterOfMassConstraint.svg'
         self.create(selection)
 

a2p_convertPart.py

@@ -109,7 +109,7 @@ def GetResources(self):
         import a2plib
         return {'Pixmap'  : a2plib.pathOfModule()+'/icons/a2p_ConvertPart.svg',
 #                'Accel' : "Shift+C", # a default shortcut (optional)
-                'MenuText': "convert Part to A2plus form",
+                'MenuText': "Convert a Part to A2plus",
                 'ToolTip' : toolTip
                 }
 

a2p_importpart.py

@@ -245,7 +245,7 @@ class a2p_ImportPartCommand():
     def GetResources(self):
         return {'Pixmap'  : a2plib.pathOfModule()+'/icons/a2p_ImportPart.svg',
                 'Accel' : "Shift+A", # a default shortcut (optional)
-                'MenuText': "add Part from external file",
+                'MenuText': "Add a Part from an external file",
                 'ToolTip' : toolTip
                 }
 
@@ -554,7 +554,7 @@ def Activated(self):
     def GetResources(self):
         return {
             'Pixmap'  : a2plib.pathOfModule()+'/icons/a2p_DuplicatePart.svg',
-            'MenuText': 'duplicate',
+            'MenuText': 'Make a duplicate of a part',
             'ToolTip':  toolTip
             }
 
@@ -676,7 +676,7 @@ def Activated(self):
     def GetResources(self):
         return {
             'Pixmap'  : a2plib.pathOfModule()+'/icons/a2p_EditPart.svg',
-            'MenuText': 'edit',
+            'MenuText': 'Edit an imported Part (open linked fcstd file)',
             'ToolTip':  toolTip
             }
 
@@ -783,7 +783,7 @@ def GetResources(self):
         return {
             #'Pixmap' : ':/assembly2/icons/MovePart.svg',
             'Pixmap'  : a2plib.pathOfModule()+'/icons/a2p_MovePart.svg',
-            'MenuText': 'move selected part',
+            'MenuText': 'Move the selected part',
             'ToolTip': toolTip
             }
 
@@ -838,7 +838,7 @@ def Activated(self):
     def GetResources(self):
         return {
             'Pixmap'  : a2plib.pathOfModule()+'/icons/a2p_DeleteConnections.svg',
-            'MenuText': 'delete constraints',
+            'MenuText': 'Delete all constraints of selected parts',
             'ToolTip': toolTipText
             }
 FreeCADGui.addCommand('a2p_DeleteConnectionsCommand', DeleteConnectionsCommand())
@@ -885,7 +885,7 @@ def IsActive(self):
     def GetResources(self):
         return {
             'Pixmap'  :     a2plib.pathOfModule()+'/icons/a2p_ViewConnection.svg',
-            'MenuText':     'show connected parts',
+            'MenuText':     'Highlight both constrained parts',
             'ToolTip':      toolTip,
             }
 
@@ -1007,7 +1007,7 @@ def IsActive(self):
 
     def GetResources(self):
         return {
-            'Pixmap'  :     a2plib.pathOfModule()+'/icons/a2p_ToggleTranparency.svg',
+            'Pixmap'  :     a2plib.pathOfModule()+'/icons/a2p_ToggleTransparency.svg',
             'MenuText':     'Toggle transparency of assembly',
             'ToolTip':      'Toggle transparency of assembly',
             'Checkable':    self.IsChecked()
@@ -1041,7 +1041,7 @@ def IsChecked(self):
     def GetResources(self):
         return {
             'Pixmap'  :     a2plib.pathOfModule()+'/icons/a2p_ToggleAutoSolve.svg',
-            'MenuText':     'toggle AutoSolve',
+            'MenuText':     'Toggle AutoSolve',
             'ToolTip':      toolTipMessage,
             'Checkable':    self.IsChecked()
             }
@@ -1126,7 +1126,7 @@ def Activated(self):
     def GetResources(self):
         return {
             'Pixmap'  :     a2plib.pathOfModule()+'/icons/a2p_RepairTree.svg',
-            'MenuText':     'Repair treeView',
+            'MenuText':     'Repair the treeView, if it is damaged somehow',
             'ToolTip':      toolTipMessage
             }
 FreeCADGui.addCommand('a2p_repairTreeViewCommand', a2p_repairTreeViewCommand())
@@ -1158,8 +1158,8 @@ def Activated(self):
 
     def GetResources(self):
         return {
-            'Pixmap'  :     a2plib.pathOfModule()+'/icons/a2p_flipConstraint.svg',
-            'MenuText':     'flip direction of last constraint',
+            'Pixmap'  :     a2plib.pathOfModule()+'/icons/a2p_FlipConstraint.svg',
+            'MenuText':     'Flip direction of last constraint',
             'ToolTip':      toolTip
             }
 FreeCADGui.addCommand('a2p_FlipConstraintDirectionCommand', a2p_FlipConstraintDirectionCommand())
@@ -1205,7 +1205,7 @@ def Activated(self):
 
     def GetResources(self):
         return {
-            'Pixmap'  :     a2plib.pathOfModule()+'/icons/a2p_treeview.svg',
+            'Pixmap'  :     a2plib.pathOfModule()+'/icons/a2p_Treeview.svg',
             'MenuText':     'Generate HTML file with detailed constraining structure',
             'ToolTip':      'Generate HTML file with detailed constraining structure'
             }
@@ -1262,8 +1262,9 @@ def Activated(self):
 
     def GetResources(self):
         return {
-            'MenuText':     'convert absolute paths of importParts to relative ones',
-            'ToolTip':      'convert absolute paths of importParts to relative ones'
+            'Pixmap'  :     a2plib.pathOfModule()+'/icons/a2p_SetRelativePathes.svg',
+            'MenuText':     'Convert absolute paths of importParts to relative ones',
+            'ToolTip':      'Convert absolute paths of importParts to relative ones'
             }
 FreeCADGui.addCommand('a2p_absPath_to_relPath_Command', a2p_absPath_to_relPath_Command())
 

a2p_partinformation.py

@@ -81,8 +81,8 @@ def Activated(self):
 
     def GetResources(self):
         return {
-            'Pixmap'  :     ':/icons/a2p_partsInfo.svg',
-            'MenuText':     'create a spreadSheet with logistics/ordering information',
+            'Pixmap'  :     ':/icons/a2p_PartsInfo.svg',
+            'MenuText':     'Create a spreadSheet for ordering or logistics information',
             'ToolTip':      toolTip
             }
 

a2p_recursiveUpdatePlanner.py

@@ -173,7 +173,7 @@ def Activated(self):
 
     def GetResources(self):
         return {
-            'Pixmap' : ':/icons/a2p_recursiveUpdate.svg',
+            'Pixmap' : ':/icons/a2p_RecursiveUpdate.svg',
             'MenuText': 'update imports recursively',
             'ToolTip': toolTip
             }

a2p_solversystem.py

@@ -548,7 +548,7 @@ def Activated(self):
 
     def GetResources(self):
         return {
-            'Pixmap' : path_a2p + '/icons/a2p_solver.svg',
+            'Pixmap' : path_a2p + '/icons/a2p_Solver.svg',
             'MenuText': 'Solve',
             'ToolTip': 'Solve A2plus constraints'
             }