haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix window app_id in KDE/wayland

This commit is contained in:
xenia 2024-07-02 02:34:29 -04:00
parent 61a17e4c8b
commit 2d5434e9ab
8 changed files with 35 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bitmap2component/CMakeLists.txt
View File

@ -22,7 +22,7 @@ set( BITMAP2COMPONENT_SRCS
)
set_source_files_properties( ${CMAKE_SOURCE_DIR}/common/single_top.cpp PROPERTIES
COMPILE_DEFINITIONS "TOP_FRAME=FRAME_BM2CMP"
COMPILE_DEFINITIONS "TOP_FRAME=FRAME_BM2CMP;KICAD_WINDOW_APP_ID=org.kicad.bitmap2component"
)
if( WIN32 )

17
common/single_top.cpp
View File

@ -298,7 +298,22 @@ struct APP_SINGLE_TOP : public wxApp
#endif
};
IMPLEMENT_APP( APP_SINGLE_TOP )
wxIMPLEMENT_WX_THEME_SUPPORT
wxIMPLEMENT_APP_NO_MAIN( APP_SINGLE_TOP );
#if defined(__WINDOWS__)
wxIMPLEMENT_WXWIN_MAIN
#else
int main(int argc, char** argv) {
wxDISABLE_DEBUG_SUPPORT();
// replace argv[0] and thus the window app_id
#define _APP_ID_STR(app_id) #app_id
#define _APP_ID_STR2(app_id) _APP_ID_STR(app_id)
argv[0] = (char*) _APP_ID_STR2(KICAD_WINDOW_APP_ID);
#undef _APP_ID_STR2
#undef _APP_ID_STR
return wxEntry(argc, argv);
}
#endif
bool PGM_SINGLE_TOP::OnPgmInit()

2
eeschema/CMakeLists.txt
View File

@ -520,7 +520,7 @@ if( KICAD_USE_SENTRY )
endif()
set_source_files_properties( ${CMAKE_SOURCE_DIR}/common/single_top.cpp PROPERTIES
COMPILE_DEFINITIONS "TOP_FRAME=FRAME_SCH;PGM_DATA_FILE_EXT=\"kicad_sch\";BUILD_KIWAY_DLL"
COMPILE_DEFINITIONS "TOP_FRAME=FRAME_SCH;PGM_DATA_FILE_EXT=\"kicad_sch\";BUILD_KIWAY_DLL;KICAD_WINDOW_APP_ID=org.kicad.eeschema"
)
target_link_libraries( eeschema
#singletop # replaces common, giving us restrictive control and link warnings.

2
gerbview/CMakeLists.txt
View File

@ -112,7 +112,7 @@ if( KICAD_USE_SENTRY )
endif()
set_source_files_properties( ${CMAKE_SOURCE_DIR}/common/single_top.cpp PROPERTIES
COMPILE_DEFINITIONS "TOP_FRAME=FRAME_GERBER;BUILD_KIWAY_DLL"
COMPILE_DEFINITIONS "TOP_FRAME=FRAME_GERBER;BUILD_KIWAY_DLL;KICAD_WINDOW_APP_ID=org.kicad.gerbview"
)
target_link_libraries( gerbview
#singletop # replaces common, giving us restrictive control and link warnings.

14
kicad/kicad.cpp
View File

@ -583,7 +583,19 @@ struct APP_KICAD : public wxApp
#endif
};
IMPLEMENT_APP( APP_KICAD )
wxIMPLEMENT_WX_THEME_SUPPORT
wxIMPLEMENT_APP_NO_MAIN( APP_KICAD );
#if defined(__WINDOWS__)
wxIMPLEMENT_WXWIN_MAIN
#else
int main(int argc, char** argv)
{
wxDISABLE_DEBUG_SUPPORT();
// replace argv[0] and thus the window app_id
argv[0] = (char*) "org.kicad.kicad";
return wxEntry(argc, argv);
}
#endif
// The C++ project manager supports one open PROJECT, so Prj() calls within

2
pagelayout_editor/CMakeLists.txt
View File

@ -83,7 +83,7 @@ if( KICAD_USE_SENTRY )
endif()
set_source_files_properties( ${CMAKE_SOURCE_DIR}/common/single_top.cpp PROPERTIES
COMPILE_DEFINITIONS "TOP_FRAME=FRAME_PL_EDITOR;PGM_DATA_FILE_EXT=\"kicad_wks\";BUILD_KIWAY_DLL"
COMPILE_DEFINITIONS "TOP_FRAME=FRAME_PL_EDITOR;PGM_DATA_FILE_EXT=\"kicad_wks\";BUILD_KIWAY_DLL;KICAD_WINDOW_APP_ID=org.kicad.pl_editor"
)
target_link_libraries( pl_editor
#singletop # replaces common, giving us restrictive control and link warnings.

2
pcb_calculator/CMakeLists.txt
View File

@ -97,7 +97,7 @@ if( KICAD_USE_SENTRY )
endif()
set_source_files_properties( ${CMAKE_SOURCE_DIR}/common/single_top.cpp PROPERTIES
COMPILE_DEFINITIONS "TOP_FRAME=FRAME_CALC;BUILD_KIWAY_DLL"
COMPILE_DEFINITIONS "TOP_FRAME=FRAME_CALC;BUILD_KIWAY_DLL;KICAD_WINDOW_APP_ID=org.kicad.pcbcalculator"
)
target_link_libraries( pcb_calculator
#singletop # replaces common, giving us restrictive control and link warnings.

2
pcbnew/CMakeLists.txt
View File

@ -609,7 +609,7 @@ add_executable( pcbnew WIN32 MACOSX_BUNDLE
${PCBNEW_RESOURCES}
)
set_source_files_properties( ${CMAKE_SOURCE_DIR}/common/single_top.cpp pcbnew.cpp PROPERTIES
COMPILE_DEFINITIONS "TOP_FRAME=FRAME_PCB_EDITOR;PGM_DATA_FILE_EXT=\"kicad_pcb\";BUILD_KIWAY_DLL"
COMPILE_DEFINITIONS "TOP_FRAME=FRAME_PCB_EDITOR;PGM_DATA_FILE_EXT=\"kicad_pcb\";BUILD_KIWAY_DLL;KICAD_WINDOW_APP_ID=org.kicad.pcbnew"
)
target_link_libraries( pcbnew
#singletop # replaces common, giving us restrictive control and link warnings.