Linux/Unix desktop files updated and moved to resources directory, ab…

…out dialog updated

CMakeLists.txt

@@ -163,11 +163,67 @@ install(FILES freeroute.jnlp
         DESTINATION ${KICAD_BIN}
         COMPONENT resources)
 
+
 if(UNIX)
-    install(FILES share/kicad.desktop
+
+  # set resource dir variables
+  set(LINUX_RESOURCES_DIR resources/linux)
+  set(LINUX_DESKTOP_FILES ${LINUX_RESOURCES_DIR}/opendesktop)
+  set(LINUX_ICONS ${LINUX_RESOURCES_DIR}/icons)
+
+
+
+    # KiCad desktop file
+    install(FILES ${LINUX_DESKTOP_FILES}/kicad.desktop
             DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications
             COMPONENT resources)
-    install(FILES bitmaps/kicad.png
+    # KiCad icon file
+    install(FILES ${LINUX_ICONS}/kicad.png
             DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps
             COMPONENT resources)
+
+
+
+   # CVpcb desktop file
+   install(FILES ${LINUX_DESKTOP_FILES}/cvpcb.desktop
+           DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications
+           COMPONENT resources)
+   # CVpcb icon file
+   install(FILES ${LINUX_ICONS}/kicad_cvpcb.png
+           DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps
+           COMPONENT resources)
+
+
+
+   # EEschema desktop file
+   install(FILES ${LINUX_DESKTOP_FILES}/eeschema.desktop
+           DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications
+           COMPONENT resources)
+   # EEschema icon file
+   install(FILES ${LINUX_ICONS}/kicad_eeschema.png
+           DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps
+           COMPONENT resources)
+
+
+
+   # GerbView desktop file
+   install(FILES ${LINUX_DESKTOP_FILES}/gerbview.desktop
+           DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications
+           COMPONENT resources)
+   # GerbView icon file
+   install(FILES ${LINUX_ICONS}/kicad_gerbview.png
+           DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps
+           COMPONENT resources)
+
+
+
+   # PCBnew desktop file
+   install(FILES ${LINUX_DESKTOP_FILES}/pcbnew.desktop
+           DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications
+           COMPONENT resources)
+   # PCBnew icon file
+   install(FILES ${LINUX_ICONS}/kicad_pcbnew.png
+           DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps
+           COMPONENT resources)
+
 endif(UNIX)

common/about_kicad.cpp

@@ -10,7 +10,6 @@
 extern wxString g_Main_Title; // Import program title
 
 
-
 /**************************************************/
 void InitKiCadAbout(wxAboutDialogInfo& info)
 /**************************************************/
@@ -36,16 +35,26 @@ void InitKiCadAbout(wxAboutDialogInfo& info)
     /* Set license */
     info.SetLicence(wxString::FromAscii
     (
-      "GNU GPLv3"
+      "The complete KiCad EDA Suite is released under the following license: \n"
+      "\n"
+      "GNU General Public License version 2\n"
+      "\n"
+      "See <http://www.gnu.org/licenses/> for more information"
     ));
 
     /* Add developers */
+    info.AddDeveloper(_T("Dick Hollenbeck <[email protected]>"));
     info.AddDeveloper(_T("Jean-Pierre Charras <[email protected]>"));
 
     /* Add document writers */
     info.AddDocWriter(_T("Jean-Pierre Charras <[email protected]>"));
+    info.AddDocWriter(_T("Igor Plyatov <[email protected]>"));
 
     /* Add translators */
+    info.AddTranslator(_T("Czech (CZ) Milan Horák <[email protected]>"));
     info.AddTranslator(_T("Dutch (NL) Jerry Jacobs <[email protected]>"));
     info.AddTranslator(_T("French (FR) Jean-Pierre Charras <[email protected]>"));
+    info.AddTranslator(_T("Polish (PL) Mateusz Skowroński <[email protected]>"));
+    info.AddTranslator(_T("Russian (RU) Igor Plyatov <[email protected]>"));
+
 }

cvpcb/cvpcb.cpp

@@ -17,7 +17,7 @@
 
 #include "id.h"
 
-wxString g_Main_Title = wxT("Cvpcb");
+wxString g_Main_Title = wxT("CVpcb");
 
 // Create a new application object
 IMPLEMENT_APP(WinEDA_App)

kicad/kicad.cpp

@@ -197,7 +197,7 @@ static void py_common_init()
 bool WinEDA_App::OnInit()
 {
     g_EDA_Appl = this;
-    InitEDA_Appl( wxT("kicad"));
+    InitEDA_Appl( wxT("KiCad"));
 
     /* init kicad */
     GetSettings();                  // read current setup

pcbnew/pcbnew.cpp

@@ -25,7 +25,7 @@
 
 #include "eda_dde.h"
 
-wxString g_Main_Title( wxT( "PCBNEW" ) );
+wxString g_Main_Title( wxT( "PCBnew" ) );
 
 IMPLEMENT_APP( WinEDA_App )
 

resources/linux/opendesktop/cvpcb.desktop

@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=KiCad - CVpcb
+GenericName[en]=CVpcb - Schema to PCB converter
+Comment[en]=Schematic to PCB utility
+MimeType=text/pro;
+Exec=cvpcb
+Icon=kicad_cvpcb
+Type=Application
+Terminal=false
+Categories=Scientific;Development

resources/linux/opendesktop/eeschema.desktop

@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=KiCad - EESchema
+GenericName[en]=KiCad - Schematic Designer
+Comment[en]=Electrical schematic and PCB design suite
+MimeType=text/pro;
+Exec=eeschema
+Icon=kicad_eeschema
+Type=Application
+Terminal=false
+Categories=Scientific;Development

resources/linux/opendesktop/gerbview.desktop

@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=KiCad - GerbView
+GenericName[en]=KiCad - Gerber Viewer
+Comment[en]=KiCad's gerber viewer
+MimeType=text/pro;
+Exec=gerbview
+Icon=kicad_gerbview
+Type=Application
+Terminal=false
+Categories=Scientific;Development

resources/linux/opendesktop/pcbnew.desktop

@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=KiCad - PCBnew
+GenericName[en]=KiCad - PCB Designer
+Comment[en]=Electrical schematic and PCB design suite
+MimeType=text/pro;
+Exec=pcbnew
+Icon=kicad_pcbnew
+Type=Application
+Terminal=false
+Categories=Scientific;Development