Commit 867d30d1 authored by jerryjacobs's avatar jerryjacobs

Linux/Unix desktop files updated and moved to resources directory, about dialog updated

parent 56f30b4d
...@@ -163,11 +163,67 @@ install(FILES freeroute.jnlp ...@@ -163,11 +163,67 @@ install(FILES freeroute.jnlp
DESTINATION ${KICAD_BIN} DESTINATION ${KICAD_BIN}
COMPONENT resources) COMPONENT resources)
if(UNIX) 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)
# 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 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications
COMPONENT resources) COMPONENT resources)
install(FILES bitmaps/kicad.png # GerbView icon file
install(FILES ${LINUX_ICONS}/kicad_gerbview.png
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps
COMPONENT resources) 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) endif(UNIX)
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
extern wxString g_Main_Title; // Import program title extern wxString g_Main_Title; // Import program title
/**************************************************/ /**************************************************/
void InitKiCadAbout(wxAboutDialogInfo& info) void InitKiCadAbout(wxAboutDialogInfo& info)
/**************************************************/ /**************************************************/
...@@ -36,16 +35,26 @@ void InitKiCadAbout(wxAboutDialogInfo& info) ...@@ -36,16 +35,26 @@ void InitKiCadAbout(wxAboutDialogInfo& info)
/* Set license */ /* Set license */
info.SetLicence(wxString::FromAscii 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 */ /* Add developers */
info.AddDeveloper(_T("Dick Hollenbeck <dick@softplc.com>"));
info.AddDeveloper(_T("Jean-Pierre Charras <jean-pierre.charras@inpg.fr>")); info.AddDeveloper(_T("Jean-Pierre Charras <jean-pierre.charras@inpg.fr>"));
/* Add document writers */ /* Add document writers */
info.AddDocWriter(_T("Jean-Pierre Charras <jean-pierre.charras@inpg.fr>")); info.AddDocWriter(_T("Jean-Pierre Charras <jean-pierre.charras@inpg.fr>"));
info.AddDocWriter(_T("Igor Plyatov <plyatov@gmail.com>"));
/* Add translators */ /* Add translators */
info.AddTranslator(_T("Czech (CZ) Milan Horák <stranger@tiscali.cz>"));
info.AddTranslator(_T("Dutch (NL) Jerry Jacobs <jerkejacobs@gmail.com>")); info.AddTranslator(_T("Dutch (NL) Jerry Jacobs <jerkejacobs@gmail.com>"));
info.AddTranslator(_T("French (FR) Jean-Pierre Charras <jean-pierre.charras@inpg.fr>")); info.AddTranslator(_T("French (FR) Jean-Pierre Charras <jean-pierre.charras@inpg.fr>"));
info.AddTranslator(_T("Polish (PL) Mateusz Skowroński <skowri@gmail.com>"));
info.AddTranslator(_T("Russian (RU) Igor Plyatov <plyatov@gmail.com>"));
} }
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#include "id.h" #include "id.h"
wxString g_Main_Title = wxT("Cvpcb"); wxString g_Main_Title = wxT("CVpcb");
// Create a new application object // Create a new application object
IMPLEMENT_APP(WinEDA_App) IMPLEMENT_APP(WinEDA_App)
......
...@@ -197,7 +197,7 @@ static void py_common_init() ...@@ -197,7 +197,7 @@ static void py_common_init()
bool WinEDA_App::OnInit() bool WinEDA_App::OnInit()
{ {
g_EDA_Appl = this; g_EDA_Appl = this;
InitEDA_Appl( wxT("kicad")); InitEDA_Appl( wxT("KiCad"));
/* init kicad */ /* init kicad */
GetSettings(); // read current setup GetSettings(); // read current setup
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include "eda_dde.h" #include "eda_dde.h"
wxString g_Main_Title( wxT( "PCBNEW" ) ); wxString g_Main_Title( wxT( "PCBnew" ) );
IMPLEMENT_APP( WinEDA_App ) IMPLEMENT_APP( WinEDA_App )
......
[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
[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
[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
[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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment