Skip to content

Commit

Permalink
Revert "settings-sync: add a warning that the settings are synced acr…
Browse files Browse the repository at this point in the history
…oss IDEs: IDEA-308614"

We don't need the warning anymore, since we have a checkbox to enable/disable cross-ide sync, which is disabled by default.
This reverts commit ceeb64cd

GitOrigin-RevId: af57e52a85788af8ee729428e6da189be71a5809
  • Loading branch information
klikh authored and intellij-monorepo-bot committed Dec 22, 2022
1 parent b160c5e commit 46c8b37
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 50 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ settings.category.tools.description=Version control, build tools, debugger, Code
settings.category.system.name=System settings
# suppress inspection "UnusedProperty" -- computed key
settings.category.system.description=Accounts, updates
settings.cross.ide.sync.warning.label=The settings are synced across all JetBrains IDE products.

config.button.login=Log in with JetBrains Account...
error.label.login.not.available=Login service is not available
# config.button.logout=Log Out...
Expand Down Expand Up @@ -122,4 +120,4 @@ settings.repository.unbundled.notification.description=You can install it manual
settings.repository.unbundled.notification.action.install.settings.repository=Install Settings Repository
settings.repository.unbundled.notification.action.use.new.settings.sync=Use Settings Sync
# {0} is a plugin id
install.plugin.failed.no.compatible.notification.error.message=No last compatible plugin found for {0}
install.plugin.failed.no.compatible.notification.error.message=No last compatible plugin found for {0}
Original file line number Diff line number Diff line change
@@ -1,25 +1,13 @@
package com.intellij.settingsSync.config

import com.intellij.codeInsight.hint.HintUtil
import com.intellij.icons.AllIcons
import com.intellij.openapi.editor.colors.EditorColorsManager
import com.intellij.openapi.ui.DialogPanel
import com.intellij.openapi.ui.DialogWrapper
import com.intellij.settingsSync.SettingsSyncBundle.message
import com.intellij.ui.IdeBorderFactory
import com.intellij.ui.JBColor
import com.intellij.ui.SideBorder
import com.intellij.ui.components.JBLabel
import com.intellij.util.ui.JBEmptyBorder
import com.intellij.util.ui.JBUI
import com.intellij.util.ui.UIUtil
import com.intellij.util.ui.UIUtil.DEFAULT_HGAP
import org.jetbrains.annotations.Nls
import java.awt.event.ActionEvent
import javax.swing.AbstractAction
import javax.swing.Action
import javax.swing.JComponent
import javax.swing.SwingConstants
import javax.swing.border.Border

internal class EnableSettingsSyncDialog
private constructor(parent: JComponent, private val remoteSettingsFound: Boolean) : DialogWrapper(parent, false) {
Expand All @@ -45,37 +33,10 @@ internal class EnableSettingsSyncDialog
}
}

override fun createTitlePane(): JComponent? {
val warningPanel =
JBLabel(message("settings.cross.ide.sync.warning.label"), AllIcons.General.Information, SwingConstants.LEADING)
.apply {
background = EditorColorsManager.getInstance().globalScheme.getColor(HintUtil.PROMOTION_PANE_KEY)
isOpaque = true
border = JBUI.Borders.merge(JBUI.Borders.empty(DEFAULT_HGAP),
IdeBorderFactory.createBorder(JBColor.border(), SideBorder.BOTTOM.or(SideBorder.TOP)), true)
}
return warningPanel
}

override fun createContentPaneBorder(): Border? {
return null
}

override fun createCenterPanel(): JComponent {
configPanel = SettingsSyncPanelFactory.createPanel(message("enable.dialog.select.what.to.sync"))
configPanel.reset()

val centerPanel = JBUI.Panels.simplePanel(configPanel)
val defaultInsets = UIUtil.getRegularPanelInsets()
centerPanel.border = JBEmptyBorder(defaultInsets.top, defaultInsets.left, 0, defaultInsets.right)
return centerPanel
}

override fun createSouthPanel(): JComponent {
val centerPanel = JBUI.Panels.simplePanel(super.createSouthPanel())
val defaultInsets = UIUtil.getRegularPanelInsets()
centerPanel.border = JBEmptyBorder(0, defaultInsets.left, defaultInsets.bottom, defaultInsets.right)
return centerPanel
return configPanel
}

override fun createActions(): Array<Action> =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,12 +143,6 @@ internal class SettingsSyncConfigurable : BoundConfigurable(message("title.setti
}
.onReset { categoriesPanel.reset() }
.onIsModified { categoriesPanel.isModified() }
bottomGap(BottomGap.MEDIUM)
}
row {
label(message("settings.cross.ide.sync.warning.label"))
.apply { component.icon = AllIcons.General.Information }
.visibleIf(LoggedInPredicate().and(EnabledPredicate()))
}
}
SettingsSyncAuthService.getInstance().addListener(object : SettingsSyncAuthService.Listener {
Expand Down

0 comments on commit 46c8b37

Please sign in to comment.