From 78436c774e42b8ace09fb775094c52beb1b259dc Mon Sep 17 00:00:00 2001 From: Nikita Iarychenko Date: Sun, 13 Apr 2025 01:11:38 +0400 Subject: [PATCH] OPENIDE #163 Change external links --- CONTRIBUTING.md | 4 ++ .../base/src/OpenIdeExternalResourceUrls.kt | 38 +++++++++---------- .../ide/actions/ReportProblemAction.kt | 10 +++-- .../customization/OpenIdeFeedbackReporter.kt | 2 +- .../platform-resources/src/euaOpenIde.html | 10 ++--- 5 files changed, 34 insertions(+), 30 deletions(-) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 000000000000..f7f767c97a0c --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,4 @@ +Contributing to OpenIDE +=== + +Coming soon... \ No newline at end of file diff --git a/idea/customization/base/src/OpenIdeExternalResourceUrls.kt b/idea/customization/base/src/OpenIdeExternalResourceUrls.kt index f7dc14456139..724c40fd59f3 100644 --- a/idea/customization/base/src/OpenIdeExternalResourceUrls.kt +++ b/idea/customization/base/src/OpenIdeExternalResourceUrls.kt @@ -35,14 +35,7 @@ class OpenIdeExternalResourceUrls : ExternalProductResourceUrls { Urls.newFromEncoded("https://download.openide.ru/ide").resolve(computePatchFileName(from, to)) override val bugReportUrl: ((String) -> Url) - get() = { description -> - Urls.newFromEncoded("https://youtrack.openide.ru/newissue").addParameters(mapOf( - "project" to "12345", - "clearDraft" to "true", - "description" to description, - "c" to "Affected versions: ${ApplicationInfo.getInstance().fullVersion}" - )) - } + get() = { Urls.newFromEncoded("https://gitflic.ru/project/openide/openide/issue/create") } override val technicalSupportUrl: ((description: String) -> Url) = { productUrl.resolve("contacts") } @@ -50,24 +43,27 @@ class OpenIdeExternalResourceUrls : ExternalProductResourceUrls { override val downloadPageUrl = productUrl.resolve("download") - override val youTubeChannelUrl = Urls.newFromEncoded("https://www.youtube.com/openide") + override val youTubeChannelUrl = Urls.newFromEncoded("https://www.youtube.com/@openide") override val keyboardShortcutsPdfUrl: Url - get() { - val suffix = if (SystemInfo.isMac) "_Mac" else "" - return productUrl.resolve("ide/docs/OpenIDE_ReferenceCard$suffix.pdf") - } + get() = productUrl + //get() { + // val suffix = if (SystemInfo.isMac) "_Mac" else "" + // return productUrl.resolve("ide/docs/OpenIDE_ReferenceCard$suffix.pdf") + //} - override val gettingStartedPageUrl = productUrl.resolve("ide/resources") + override val gettingStartedPageUrl = productUrl + //productUrl.resolve("ide/resources") override val helpPageUrl: ((topicId: String) -> Url) - get() = productUrl.resolve("help/ide/").let { baseUrl -> - { topicId -> - baseUrl.resolve("${ApplicationInfo.getInstance().shortVersion}/").addParameters(mapOf( - topicId to "" - )) - } - } + get() = { productUrl } + //get() = productUrl.resolve("help/ide/").let { baseUrl -> + // { topicId -> + // baseUrl.resolve("${ApplicationInfo.getInstance().shortVersion}/").addParameters(mapOf( + // topicId to "" + // )) + // } + //} private fun computePatchFileName(from: BuildNumber, to: BuildNumber): String { val product = ApplicationInfo.getInstance().build.productCode diff --git a/platform/platform-impl/src/com/intellij/ide/actions/ReportProblemAction.kt b/platform/platform-impl/src/com/intellij/ide/actions/ReportProblemAction.kt index 237956d65c9c..f898e4869bac 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/ReportProblemAction.kt +++ b/platform/platform-impl/src/com/intellij/ide/actions/ReportProblemAction.kt @@ -1,4 +1,7 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// +// Modified by Nikita Iarychenko at 2025 as part of the OpenIDE project(https://openide.ru). +// Any modifications are available on the same license terms as the original source code. package com.intellij.ide.actions import com.intellij.ide.BrowserUtil @@ -13,6 +16,7 @@ import com.intellij.openapi.project.Project import com.intellij.openapi.ui.MessageDialogBuilder import com.intellij.platform.ide.customization.ExternalProductResourceUrls import com.intellij.platform.ide.progress.withBackgroundProgress +import com.jetbrains.rd.util.string.printToString import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext @@ -29,8 +33,8 @@ internal class ReportProblemAction : DumbAwareAction() { ExternalProductResourceUrls.getInstance().bugReportUrl?.let { url -> service().coroutineScope.launch { withBackgroundProgress(project, IdeBundle.message("reportProblemAction.progress.title.submitting"), cancellable = true) { - val description = getIssueDescription(project) - BrowserUtil.browse(url(description).toExternalForm(), project) + //val description = getIssueDescription(project) + BrowserUtil.browse(url("").toExternalForm(), project) } } } diff --git a/platform/platform-impl/src/com/intellij/platform/ide/impl/customization/OpenIdeFeedbackReporter.kt b/platform/platform-impl/src/com/intellij/platform/ide/impl/customization/OpenIdeFeedbackReporter.kt index e2783ad434c2..84bf380bcb84 100644 --- a/platform/platform-impl/src/com/intellij/platform/ide/impl/customization/OpenIdeFeedbackReporter.kt +++ b/platform/platform-impl/src/com/intellij/platform/ide/impl/customization/OpenIdeFeedbackReporter.kt @@ -20,5 +20,5 @@ class OpenIdeFeedbackReporter : FeedbackReporter { override val destinationDescription = "openide.ru" - override fun feedbackFormUrl(description: String) = Urls.newFromEncoded("https://openide.ru/feedback") + override fun feedbackFormUrl(description: String) = Urls.newFromEncoded("https://gitflic.ru/project/openide/openide") } \ No newline at end of file diff --git a/platform/platform-resources/src/euaOpenIde.html b/platform/platform-resources/src/euaOpenIde.html index 05eed42785d4..42ab98fa074d 100644 --- a/platform/platform-resources/src/euaOpenIde.html +++ b/platform/platform-resources/src/euaOpenIde.html @@ -19,13 +19,13 @@

- Исходный код продукта доступен по адресу: наш репозиторий. + Исходный код продукта доступен по адресу: наш репозиторий.

Дистрибутив OpenIDE включает в себя JetBrains Runtime, распространяемый по лицензии GPL v 2.0. Исходный код JetBrainsRuntime доступен по адресу:
- репозиторий. + репозиторий.

@@ -53,13 +53,13 @@

УЧАСТИЕ В ПРОЕКТЕ

Мы приветствуем всех желающих внести свой вклад в развитие OpenIDE. Для участия в проекте вы можете: -

1. Написать нам на xxx@xxx

+

1. Написать нам на info@openide.ru

2. Создать Pull Request в репозитории OpenIDE.

-

Предлагаемые вам изменения должны соответствовать правилам, указанным в ссылка на contributing.md

+

Предлагаемые вам изменения должны соответствовать правилам, указанным в contributing.md

ПОЛИТИКА КОНФИДЕНЦИАЛЬНОСТИ

- Политику конфиденциальности можно найти на данном сайте, перейдя по этой ссылке + Политику конфиденциальности можно найти на данном сайте, перейдя по этой ссылке