From 5d45f4fb6c3d775f6c0303b40359b35fb1f26da6 Mon Sep 17 00:00:00 2001 From: Wendelin Date: Mon, 28 Jul 2025 08:59:24 +0200 Subject: [PATCH] migrate buttons --- src/components/ha-copy-textfield.ts | 14 +++---- .../ha-selector/ha-selector-object.ts | 4 +- .../media-player/dialog-join-media-players.ts | 40 +++++++++++-------- .../media-player/dialog-media-manage.ts | 2 +- src/dialogs/enter-code/dialog-enter-code.ts | 6 ++- src/dialogs/form/dialog-form.ts | 8 +++- .../cloud/cloud-step-intro.ts | 13 +++--- .../voice-assistant-setup-step-area.ts | 4 +- .../voice-assistant-setup-step-success.ts | 2 +- src/onboarding/onboarding-integrations.ts | 2 +- .../dialog-cloud-already-connected.ts | 12 ++++-- .../bluetooth/dialog-bluetooth-device-info.ts | 17 ++++---- .../dialog-zeroconf-discovery-info.ts | 17 ++++---- .../section-editor/hui-dialog-edit-section.ts | 6 ++- 14 files changed, 88 insertions(+), 59 deletions(-) diff --git a/src/components/ha-copy-textfield.ts b/src/components/ha-copy-textfield.ts index 4980524130..0f67b18a4d 100644 --- a/src/components/ha-copy-textfield.ts +++ b/src/components/ha-copy-textfield.ts @@ -1,14 +1,14 @@ -import { customElement, property, state } from "lit/decorators"; -import { css, html, LitElement, nothing } from "lit"; import { mdiContentCopy, mdiEye, mdiEyeOff } from "@mdi/js"; +import { css, html, LitElement, nothing } from "lit"; +import { customElement, property, state } from "lit/decorators"; +import { copyToClipboard } from "../common/util/copy-clipboard"; +import type { HomeAssistant } from "../types"; +import { showToast } from "../util/toast"; import "./ha-button"; import "./ha-icon-button"; import "./ha-svg-icon"; import "./ha-textfield"; -import type { HomeAssistant } from "../types"; -import { copyToClipboard } from "../common/util/copy-clipboard"; -import { showToast } from "../util/toast"; import type { HaTextField } from "./ha-textfield"; @customElement("ha-copy-textfield") @@ -48,8 +48,8 @@ export class HaCopyTextfield extends LitElement { >` : nothing} - - + + ${this.label || this.hass.localize("ui.common.copy")} diff --git a/src/components/ha-selector/ha-selector-object.ts b/src/components/ha-selector/ha-selector-object.ts index 626699c4fe..fcab38e1b8 100644 --- a/src/components/ha-selector/ha-selector-object.ts +++ b/src/components/ha-selector/ha-selector-object.ts @@ -137,7 +137,7 @@ export class HaObjectSelector extends LitElement { ${items.map((item, index) => this._renderItem(item, index))} - + ${this.hass.localize("ui.common.add")} @@ -152,7 +152,7 @@ export class HaObjectSelector extends LitElement { ${this._renderItem(this.value, 0)} ` : html` - + ${this.hass.localize("ui.common.add")} `} diff --git a/src/components/media-player/dialog-join-media-players.ts b/src/components/media-player/dialog-join-media-players.ts index 44958aa938..ac5b581c45 100644 --- a/src/components/media-player/dialog-join-media-players.ts +++ b/src/components/media-player/dialog-join-media-players.ts @@ -1,28 +1,28 @@ -import type { CSSResultGroup } from "lit"; import { mdiClose } from "@mdi/js"; +import type { HassEntity } from "home-assistant-js-websocket"; +import type { CSSResultGroup } from "lit"; import { LitElement, css, html, nothing } from "lit"; import { customElement, property, state } from "lit/decorators"; -import type { HassEntity } from "home-assistant-js-websocket"; import { fireEvent } from "../../common/dom/fire_event"; -import { haStyleDialog } from "../../resources/styles"; -import type { HomeAssistant } from "../../types"; -import "../ha-alert"; -import "../ha-dialog"; -import "../ha-button"; -import "../ha-dialog-header"; -import "./ha-media-player-toggle"; -import type { JoinMediaPlayersDialogParams } from "./show-join-media-players-dialog"; +import { computeDomain } from "../../common/entity/compute_domain"; import { computeStateName } from "../../common/entity/compute_state_name"; import { supportsFeature } from "../../common/entity/supports-feature"; +import type { EntityRegistryDisplayEntry } from "../../data/entity_registry"; +import { extractApiErrorMessage } from "../../data/hassio/common"; import { type MediaPlayerEntity, MediaPlayerEntityFeature, mediaPlayerJoin, mediaPlayerUnjoin, } from "../../data/media-player"; -import { extractApiErrorMessage } from "../../data/hassio/common"; -import type { EntityRegistryDisplayEntry } from "../../data/entity_registry"; -import { computeDomain } from "../../common/entity/compute_domain"; +import { haStyleDialog } from "../../resources/styles"; +import type { HomeAssistant } from "../../types"; +import "../ha-alert"; +import "../ha-button"; +import "../ha-dialog"; +import "../ha-dialog-header"; +import "./ha-media-player-toggle"; +import type { JoinMediaPlayersDialogParams } from "./show-join-media-players-dialog"; @customElement("dialog-join-media-players") class DialogJoinMediaPlayers extends LitElement { @@ -90,7 +90,11 @@ class DialogJoinMediaPlayers extends LitElement { ${this.hass.localize("ui.card.media_player.media_players")} - + ${this.hass.localize("ui.card.media_player.select_all")} @@ -114,11 +118,15 @@ class DialogJoinMediaPlayers extends LitElement { >` )} - + ${this.hass.localize("ui.common.cancel")} diff --git a/src/components/media-player/dialog-media-manage.ts b/src/components/media-player/dialog-media-manage.ts index 6a38ec9847..8fb1658de4 100644 --- a/src/components/media-player/dialog-media-manage.ts +++ b/src/components/media-player/dialog-media-manage.ts @@ -127,7 +127,7 @@ class DialogMediaManage extends LitElement { )} @click=${this._handleDelete} > - + ${this._deleting diff --git a/src/dialogs/enter-code/dialog-enter-code.ts b/src/dialogs/enter-code/dialog-enter-code.ts index 0eb95992a1..374e5a8ae9 100644 --- a/src/dialogs/enter-code/dialog-enter-code.ts +++ b/src/dialogs/enter-code/dialog-enter-code.ts @@ -110,7 +110,11 @@ export class DialogEnterCode pattern=${ifDefined(this._dialogParams.codePattern)} inputmode="text" > - + ${this._dialogParams.cancelText ?? this.hass.localize("ui.common.cancel")} diff --git a/src/dialogs/form/dialog-form.ts b/src/dialogs/form/dialog-form.ts index af755a2224..5369304bd2 100644 --- a/src/dialogs/form/dialog-form.ts +++ b/src/dialogs/form/dialog-form.ts @@ -4,10 +4,10 @@ import { fireEvent } from "../../common/dom/fire_event"; import "../../components/ha-button"; import { createCloseHeading } from "../../components/ha-dialog"; import "../../components/ha-form/ha-form"; +import { haStyleDialog } from "../../resources/styles"; import type { HomeAssistant } from "../../types"; import type { HassDialog } from "../make-dialog-manager"; import type { FormDialogData, FormDialogParams } from "./show-form-dialog"; -import { haStyleDialog } from "../../resources/styles"; @customElement("dialog-form") export class DialogForm @@ -69,7 +69,11 @@ export class DialogForm @value-changed=${this._valueChanged} > - + ${this._params.cancelText || this.hass.localize("ui.common.cancel")} diff --git a/src/dialogs/voice-assistant-setup/cloud/cloud-step-intro.ts b/src/dialogs/voice-assistant-setup/cloud/cloud-step-intro.ts index 7777ab3ddd..8b6cff6412 100644 --- a/src/dialogs/voice-assistant-setup/cloud/cloud-step-intro.ts +++ b/src/dialogs/voice-assistant-setup/cloud/cloud-step-intro.ts @@ -97,17 +97,16 @@ export class CloudStepIntro extends LitElement {
- - - - nabucasa.com - - - + nabucasa.com + + ${this.hass.localize( "ui.panel.config.cloud.register.headline" )}
- ${this.hass.localize("ui.common.next")}
`; diff --git a/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-success.ts b/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-success.ts index d995047403..96e6406307 100644 --- a/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-success.ts +++ b/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-success.ts @@ -180,7 +180,7 @@ export class HaVoiceAssistantSetupStepSuccess extends LitElement {
- ${this.hass.localize( "ui.panel.config.voice_assistants.satellite_wizard.success.done" )}
- + ${this.onboardingLocalize( "ui.panel.page-onboarding.integration.finish" )} diff --git a/src/panels/config/cloud/dialog-cloud-already-connected/dialog-cloud-already-connected.ts b/src/panels/config/cloud/dialog-cloud-already-connected/dialog-cloud-already-connected.ts index a92d54da31..0295a9ffa2 100644 --- a/src/panels/config/cloud/dialog-cloud-already-connected/dialog-cloud-already-connected.ts +++ b/src/panels/config/cloud/dialog-cloud-already-connected/dialog-cloud-already-connected.ts @@ -1,17 +1,17 @@ +import { mdiEye, mdiEyeOff } from "@mdi/js"; import type { CSSResultGroup } from "lit"; import { css, html, LitElement, nothing } from "lit"; import { customElement, state } from "lit/decorators"; -import { mdiEye, mdiEyeOff } from "@mdi/js"; import { formatDateTime } from "../../../../common/datetime/format_date_time"; import { fireEvent } from "../../../../common/dom/fire_event"; import "../../../../components/ha-alert"; import "../../../../components/ha-button"; -import "../../../../components/ha-icon-button"; import { createCloseHeading } from "../../../../components/ha-dialog"; +import "../../../../components/ha-icon-button"; import { haStyleDialog } from "../../../../resources/styles"; import type { HomeAssistant } from "../../../../types"; -import type { CloudAlreadyConnectedParams as CloudAlreadyConnectedDialogParams } from "./show-dialog-cloud-already-connected"; import { obfuscateUrl } from "../../../../util/url"; +import type { CloudAlreadyConnectedParams as CloudAlreadyConnectedDialogParams } from "./show-dialog-cloud-already-connected"; @customElement("dialog-cloud-already-connected") class DialogCloudAlreadyConnected extends LitElement { @@ -131,7 +131,11 @@ class DialogCloudAlreadyConnected extends LitElement { )} - + ${this.hass!.localize("ui.common.cancel")} diff --git a/src/panels/config/integrations/integration-panels/bluetooth/dialog-bluetooth-device-info.ts b/src/panels/config/integrations/integration-panels/bluetooth/dialog-bluetooth-device-info.ts index 71ee7224c2..91796067de 100644 --- a/src/panels/config/integrations/integration-panels/bluetooth/dialog-bluetooth-device-info.ts +++ b/src/panels/config/integrations/integration-panels/bluetooth/dialog-bluetooth-device-info.ts @@ -2,13 +2,13 @@ import type { TemplateResult } from "lit"; import { html, LitElement, nothing } from "lit"; import { customElement, property, state } from "lit/decorators"; import { fireEvent } from "../../../../../common/dom/fire_event"; -import type { HassDialog } from "../../../../../dialogs/make-dialog-manager"; -import { createCloseHeading } from "../../../../../components/ha-dialog"; -import type { HomeAssistant } from "../../../../../types"; -import type { BluetoothDeviceInfoDialogParams } from "./show-dialog-bluetooth-device-info"; -import "../../../../../components/ha-button"; -import { showToast } from "../../../../../util/toast"; import { copyToClipboard } from "../../../../../common/util/copy-clipboard"; +import "../../../../../components/ha-button"; +import { createCloseHeading } from "../../../../../components/ha-dialog"; +import type { HassDialog } from "../../../../../dialogs/make-dialog-manager"; +import type { HomeAssistant } from "../../../../../types"; +import { showToast } from "../../../../../util/toast"; +import type { BluetoothDeviceInfoDialogParams } from "./show-dialog-bluetooth-device-info"; @customElement("dialog-bluetooth-device-info") class DialogBluetoothDeviceInfo extends LitElement implements HassDialog { @@ -117,7 +117,10 @@ class DialogBluetoothDeviceInfo extends LitElement implements HassDialog { - ${this.hass.localize( "ui.panel.config.bluetooth.copy_to_clipboard" )} - ${this.hass.localize( "ui.panel.config.zeroconf.copy_to_clipboard" )} ${content} - + ${this.hass!.localize("ui.common.cancel")}