diff --git a/build/conf/openIDE/linux/images/openide_128.png b/build/conf/openIDE/linux/images/openide_128.png new file mode 100644 index 000000000000..8967a1f4dfeb Binary files /dev/null and b/build/conf/openIDE/linux/images/openide_128.png differ diff --git a/build/conf/openIDE/linux/images/openide_eap_128.png b/build/conf/openIDE/linux/images/openide_eap_128.png new file mode 100644 index 000000000000..1c9a6f12d841 Binary files /dev/null and b/build/conf/openIDE/linux/images/openide_eap_128.png differ diff --git a/build/conf/openIDE/mac/images/dmg_background.tiff b/build/conf/openIDE/mac/images/dmg_background.tiff new file mode 100644 index 000000000000..2331a81a5205 Binary files /dev/null and b/build/conf/openIDE/mac/images/dmg_background.tiff differ diff --git a/build/conf/openIDE/mac/images/openide.icns b/build/conf/openIDE/mac/images/openide.icns new file mode 100644 index 000000000000..04aa37a91a2a Binary files /dev/null and b/build/conf/openIDE/mac/images/openide.icns differ diff --git a/build/conf/openIDE/mac/images/openide_eap.icns b/build/conf/openIDE/mac/images/openide_eap.icns new file mode 100644 index 000000000000..62d5c691ecdb Binary files /dev/null and b/build/conf/openIDE/mac/images/openide_eap.icns differ diff --git a/build/conf/openIDE/win/images/headerlogo.bmp b/build/conf/openIDE/win/images/headerlogo.bmp new file mode 100644 index 000000000000..c358826f3583 Binary files /dev/null and b/build/conf/openIDE/win/images/headerlogo.bmp differ diff --git a/build/conf/openIDE/win/images/install.ico b/build/conf/openIDE/win/images/install.ico new file mode 100644 index 000000000000..ca971847001f Binary files /dev/null and b/build/conf/openIDE/win/images/install.ico differ diff --git a/build/conf/openIDE/win/images/logo.bmp b/build/conf/openIDE/win/images/logo.bmp new file mode 100644 index 000000000000..f63ce463e753 Binary files /dev/null and b/build/conf/openIDE/win/images/logo.bmp differ diff --git a/build/conf/openIDE/win/images/openide.ico b/build/conf/openIDE/win/images/openide.ico new file mode 100644 index 000000000000..a10387412a68 Binary files /dev/null and b/build/conf/openIDE/win/images/openide.ico differ diff --git a/build/conf/openIDE/win/images/openide_eap.ico b/build/conf/openIDE/win/images/openide_eap.ico new file mode 100644 index 000000000000..abff9b93991f Binary files /dev/null and b/build/conf/openIDE/win/images/openide_eap.ico differ diff --git a/build/conf/openIDE/win/images/uninstall.ico b/build/conf/openIDE/win/images/uninstall.ico new file mode 100644 index 000000000000..829acd2ed8be Binary files /dev/null and b/build/conf/openIDE/win/images/uninstall.ico differ diff --git a/build/src/org/jetbrains/intellij/build/OpenIdeProperties.kt b/build/src/org/jetbrains/intellij/build/OpenIdeProperties.kt index 1db2081ed9e3..d2b811203f3d 100644 --- a/build/src/org/jetbrains/intellij/build/OpenIdeProperties.kt +++ b/build/src/org/jetbrains/intellij/build/OpenIdeProperties.kt @@ -10,15 +10,15 @@ open class OpenIdeProperties(val communityHomeDir: Path): IdeaCommunityPropertie override val baseFileName: String = "openide" - override fun createWindowsCustomizer(projectHome: String): WindowsDistributionCustomizer = CommunityWindowsDistributionCustomizer() - override fun createLinuxCustomizer(projectHome: String): LinuxDistributionCustomizer = CommunityLinuxDistributionCustomizer() - override fun createMacCustomizer(projectHome: String): MacDistributionCustomizer = CommunityMacDistributionCustomizer() + override fun createWindowsCustomizer(projectHome: String): WindowsDistributionCustomizer = OpenIdeWindowsDistributionCustomizer() + override fun createLinuxCustomizer(projectHome: String): LinuxDistributionCustomizer = OpenIdeLinuxDistributionCustomizer() + override fun createMacCustomizer(projectHome: String): MacDistributionCustomizer = OpenIdeMacDistributionCustomizer() - protected open inner class CommunityWindowsDistributionCustomizer : WindowsDistributionCustomizer() { + protected open inner class OpenIdeWindowsDistributionCustomizer : WindowsDistributionCustomizer() { init { - icoPath = "${communityHomeDir}/build/conf/ideaCE/win/images/idea_CE.ico" - icoPathForEAP = "${communityHomeDir}/build/conf/ideaCE/win/images/idea_CE_EAP.ico" - installerImagesPath = "${communityHomeDir}/build/conf/ideaCE/win/images" + icoPath = "${communityHomeDir}/build/conf/openIDE/win/images/openide.ico" + icoPathForEAP = "${communityHomeDir}/build/conf/openIDE/win/images/openide_eap.ico" + installerImagesPath = "${communityHomeDir}/build/conf/openIDE/win/images" fileAssociations = listOf("java", "gradle", "groovy", "kt", "kts", "pom") } @@ -27,10 +27,10 @@ open class OpenIdeProperties(val communityHomeDir: Path): IdeaCommunityPropertie override fun getFullNameIncludingEditionAndVendor(appInfo: ApplicationInfoProperties) = "OpenIDE" } - protected open inner class CommunityLinuxDistributionCustomizer : LinuxDistributionCustomizer() { + protected open inner class OpenIdeLinuxDistributionCustomizer : LinuxDistributionCustomizer() { init { - iconPngPath = "${communityHomeDir}/build/conf/ideaCE/linux/images/icon_CE_128.png" - iconPngPathForEAP = "${communityHomeDir}/build/conf/ideaCE/linux/images/icon_CE_EAP_128.png" + iconPngPath = "${communityHomeDir}/build/conf/openIDE/linux/images/openide_128.png" + iconPngPathForEAP = "${communityHomeDir}/build/conf/openIDE/linux/images/openide_eap_128.png" snapName = "open-ide" snapDescription = "The most intelligent Java IDE. Every aspect of OpenIDE is specifically designed to maximize developer productivity. " + @@ -46,15 +46,15 @@ open class OpenIdeProperties(val communityHomeDir: Path): IdeaCommunityPropertie } } - protected open inner class CommunityMacDistributionCustomizer : MacDistributionCustomizer() { + protected open inner class OpenIdeMacDistributionCustomizer : MacDistributionCustomizer() { init { - icnsPath = "${communityHomeDir}/build/conf/ideaCE/mac/images/idea.icns" - icnsPathForEAP = "${communityHomeDir}/build/conf/ideaCE/mac/images/communityEAP.icns" + icnsPath = "${communityHomeDir}/build/conf/openIDE/mac/images/openide.icns" + icnsPathForEAP = "${communityHomeDir}/build/conf/openIDE/mac/images/openide_eap.icns" urlSchemes = listOf("idea") associateIpr = true fileAssociations = FileAssociation.from("java", "groovy", "kt", "kts") bundleIdentifier = "ru.openide" - dmgImagePath = "${communityHomeDir}/build/conf/ideaCE/mac/images/dmg_background.tiff" + dmgImagePath = "${communityHomeDir}/build/conf/openIDE/mac/images/dmg_background.tiff" } override fun getRootDirectoryName(appInfo: ApplicationInfoProperties, buildNumber: String): String { diff --git a/community-resources/resources/idea/IdeaApplicationInfo.xml b/community-resources/resources/idea/IdeaApplicationInfo.xml index 2e3366b01655..e680e0fe62d1 100644 --- a/community-resources/resources/idea/IdeaApplicationInfo.xml +++ b/community-resources/resources/idea/IdeaApplicationInfo.xml @@ -2,9 +2,9 @@ - - - + + + com.intellij.java diff --git a/community-resources/resources/openide-eap.svg b/community-resources/resources/openide-eap.svg new file mode 100644 index 000000000000..fc93798afde7 --- /dev/null +++ b/community-resources/resources/openide-eap.svg @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/community-resources/resources/openide-eap_16.svg b/community-resources/resources/openide-eap_16.svg new file mode 100644 index 000000000000..180b5ee6298d --- /dev/null +++ b/community-resources/resources/openide-eap_16.svg @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/community-resources/resources/openide-eap_32.svg b/community-resources/resources/openide-eap_32.svg new file mode 100644 index 000000000000..9c5edbb92c18 --- /dev/null +++ b/community-resources/resources/openide-eap_32.svg @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/community-resources/resources/openide.svg b/community-resources/resources/openide.svg new file mode 100644 index 000000000000..95bd2631f17a --- /dev/null +++ b/community-resources/resources/openide.svg @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/community-resources/resources/openide_16.svg b/community-resources/resources/openide_16.svg new file mode 100644 index 000000000000..74f977821594 --- /dev/null +++ b/community-resources/resources/openide_16.svg @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/community-resources/resources/openide_32.svg b/community-resources/resources/openide_32.svg new file mode 100644 index 000000000000..6024c479d457 --- /dev/null +++ b/community-resources/resources/openide_32.svg @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/community-resources/resources/openide_logo.png b/community-resources/resources/openide_logo.png new file mode 100644 index 000000000000..7431ed1f6579 Binary files /dev/null and b/community-resources/resources/openide_logo.png differ diff --git a/community-resources/resources/openide_logo@2x.png b/community-resources/resources/openide_logo@2x.png new file mode 100644 index 000000000000..903fe83ffbf8 Binary files /dev/null and b/community-resources/resources/openide_logo@2x.png differ