minor changes

cvpcb/makefile.gtk

@@ -1,12 +1,11 @@
 # File:		makefile
-
 FINAL = 1
 
-
 include ../libs.linux
 
 TARGET = cvpcb
 
+all: $(TARGET)
 
 include makefile.include
 -include *.d
@@ -14,8 +13,6 @@ include makefile.include
 CPPFLAGS += $(EXTRACPPFLAGS)
 EDACPPFLAGS = $(CPPFLAGS)
 
-all: $(TARGET)
-
 deps:
 	$(CXX) $(CPPFLAGS) -E -MMD -MG *.cpp >/dev/null
 

eeschema/eeredraw.cpp

@@ -218,7 +218,7 @@ void EDA_DrawLineStruct::Draw( WinEDA_DrawPanel* panel, wxDC* DC,
                                const wxPoint& offset, int DrawMode, int Color )
 {
     int color;
-    int width = MAX( m_Width, g_DrawMinimunLineWidth );
+    int width = m_Width;
 
     if( Color >= 0 )
         color = Color;
@@ -227,9 +227,11 @@ void EDA_DrawLineStruct::Draw( WinEDA_DrawPanel* panel, wxDC* DC,
 
     GRSetDrawMode( DC, DrawMode );
 
-    // FIXME: Not compatable with new zoom.
-    if( (m_Layer == LAYER_BUS) && panel->GetScreen()->Scale( width ) <= 1 )
-        width *= 3;
+    // Busses are draw with thick lines
+    if( m_Layer == LAYER_BUS )
+        width = MAX( m_Width, MIN_BUSLINES_THICKNESS );
+
+    width = MAX( width, g_DrawMinimunLineWidth );
 
     if( m_Layer == LAYER_NOTES )
         GRDashedLine( &panel->m_ClipBox, DC, m_Start.x + offset.x,
@@ -303,7 +305,7 @@ void DrawBusEntryStruct::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint&
 
 {
     int color;
-    int width = MAX( m_Width, g_DrawMinimunLineWidth );
+    int width = m_Width;
 
     if( Color >= 0 )
         color = Color;
@@ -312,7 +314,9 @@ void DrawBusEntryStruct::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint&
     GRSetDrawMode( DC, DrawMode );
 
     if( m_Layer == LAYER_BUS )
-        width *= 3;
+        width = MAX( m_Width, MIN_BUSLINES_THICKNESS );
+
+    width = MAX( width, g_DrawMinimunLineWidth );
 
     GRLine( &panel->m_ClipBox, DC, m_Pos.x + offset.x, m_Pos.y + offset.y,
             m_End().x + offset.x, m_End().y + offset.y, width, color );
@@ -327,7 +331,7 @@ void DrawPolylineStruct::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint&
                                int DrawMode, int Color )
 {
     int color;
-    int width = MAX( m_Width, g_DrawMinimunLineWidth );
+    int width = m_Width;
 
     if( Color >= 0 )
         color = Color;
@@ -337,9 +341,9 @@ void DrawPolylineStruct::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint&
     GRSetDrawMode( DC, DrawMode );
 
     if( m_Layer == LAYER_BUS )
-    {
-        width *= 3;
-    }
+        width = MAX( m_Width, MIN_BUSLINES_THICKNESS );
+
+    width = MAX( width, g_DrawMinimunLineWidth );
 
     GRMoveTo( m_PolyPoints[0].x, m_PolyPoints[0].y );
     if( m_Layer == LAYER_NOTES )

eeschema/program.h

@@ -25,6 +25,8 @@
 
 #define TEXT_NO_VISIBLE 1
 
+#define MIN_BUSLINES_THICKNESS 12   // min bus lines and entries thickness
+
 /* Rotation, mirror of graphic items in components bodies are handled by a transform matrix
  *  The default matix is useful to draw lib entries with a defualt matix ( no rotation, no mirrot
  *  but Y axis is bottom to top, and Y draw axis is to to bottom

nsis_win_installer/install.nsi

@@ -109,7 +109,7 @@ Section $(TITLE_SEC01) SEC01
   SectionIn RO
   SetOverwrite try
   SetOutPath "$INSTDIR"
-  File /nonfatal "..\author.txt"
+  File /nonfatal "..\AUTHORS.txt"
   File /nonfatal "..\copyright.txt"
   File /nonfatal "..\gpl.txt"
   File /nonfatal "..\licendoc.txt"