Skip to content

Commit

Permalink
Удаление кнопки перехода в настройки загрузчика (#744)
Browse files Browse the repository at this point in the history
  • Loading branch information
Roundabout1 authored Feb 13, 2025
1 parent 0215775 commit 6de684e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 19 deletions.
15 changes: 1 addition & 14 deletions src/renderer/src/components/Sidebar/Flasher/DeviceList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import React, { useEffect, useState } from 'react';

import { twMerge } from 'tailwind-merge';

import { ReactComponent as Setting } from '@renderer/assets/icons/settings.svg';
import { ReactComponent as Update } from '@renderer/assets/icons/update.svg';
import { ErrorModal, ErrorModalData } from '@renderer/components/ErrorModal';
import { Flasher } from '@renderer/components/Modules/Flasher';
Expand All @@ -29,15 +28,10 @@ import { Select } from '../../UI/Select';

export interface FlasherProps {
compilerData: CompilerResult | undefined;
openLoaderSettings: () => void;
openAvrdudeGuideModal: () => void;
}

export const Loader: React.FC<FlasherProps> = ({
compilerData,
openLoaderSettings,
openAvrdudeGuideModal,
}) => {
export const Loader: React.FC<FlasherProps> = ({ compilerData, openAvrdudeGuideModal }) => {
const modelController = useModelContext();
const stateMachinesId = modelController.model.useData('', 'elements.stateMachinesId') as {
[ID: string]: StateMachine;
Expand Down Expand Up @@ -559,13 +553,6 @@ export const Loader: React.FC<FlasherProps> = ({
<Update width="1.5rem" height="1.5rem" />
{display()}
</button>
<button
className="btn-primary px-2"
onClick={openLoaderSettings}
disabled={connectionStatus == ClientStatus.CONNECTING || isFlashing}
>
<Setting width="1.5rem" height="1.5rem" />
</button>
</div>
<div className="mb-2 h-40 overflow-y-auto break-words rounded bg-bg-primary p-2">
<ErrorModal isOpen={isMsgModalOpen} data={msgModalData} onClose={closeMsgModal} />
Expand Down
6 changes: 1 addition & 5 deletions src/renderer/src/components/Sidebar/Sidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -114,11 +114,7 @@ export const Sidebar: React.FC<SidebarProps> = ({
setCompilerStatus={setCompilerStatus}
openImportError={openImportError}
/>,
<Loader
compilerData={compilerData}
openLoaderSettings={openLoaderSettings}
openAvrdudeGuideModal={openAvrdudeGuideModal}
/>,
<Loader compilerData={compilerData} openAvrdudeGuideModal={openAvrdudeGuideModal} />,
<History />,
undefined,
<Setting
Expand Down

0 comments on commit 6de684e

Please sign in to comment.