Update the stop/terminate icon at all the places for better UX. #8473
Before Width: | Height: | Size: 90 KiB After Width: | Height: | Size: 156 KiB |
Before Width: | Height: | Size: 111 KiB After Width: | Height: | Size: 105 KiB |
Before Width: | Height: | Size: 82 KiB After Width: | Height: | Size: 84 KiB |
Before Width: | Height: | Size: 84 KiB After Width: | Height: | Size: 108 KiB |
Before Width: | Height: | Size: 37 KiB After Width: | Height: | Size: 38 KiB |
Before Width: | Height: | Size: 108 KiB After Width: | Height: | Size: 106 KiB |
Before Width: | Height: | Size: 82 KiB After Width: | Height: | Size: 83 KiB |
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 9.5 KiB |
Before Width: | Height: | Size: 141 KiB After Width: | Height: | Size: 195 KiB |
Before Width: | Height: | Size: 63 KiB After Width: | Height: | Size: 76 KiB |
Before Width: | Height: | Size: 34 KiB After Width: | Height: | Size: 34 KiB |
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |
Before Width: | Height: | Size: 33 KiB After Width: | Height: | Size: 32 KiB |
|
@ -17,8 +17,8 @@ import url_for from 'sources/url_for';
|
||||||
import Graphs from './Graphs';
|
import Graphs from './Graphs';
|
||||||
import { Box, Tab, Tabs } from '@mui/material';
|
import { Box, Tab, Tabs } from '@mui/material';
|
||||||
import { PgIconButton } from '../../../static/js/components/Buttons';
|
import { PgIconButton } from '../../../static/js/components/Buttons';
|
||||||
import CancelIcon from '@mui/icons-material/Cancel';
|
import BlockRoundedIcon from '@mui/icons-material/BlockRounded';
|
||||||
import StopCircleOutlinedIcon from '@mui/icons-material/StopCircleOutlined';
|
import StopRoundedIcon from '@mui/icons-material/StopRounded';
|
||||||
import WelcomeDashboard from './WelcomeDashboard';
|
import WelcomeDashboard from './WelcomeDashboard';
|
||||||
import ActiveQuery from './ActiveQuery.ui';
|
import ActiveQuery from './ActiveQuery.ui';
|
||||||
import ServerLog from './ServerLog.ui';
|
import ServerLog from './ServerLog.ui';
|
||||||
|
@ -81,9 +81,6 @@ const Root = styled('div')(({theme}) => ({
|
||||||
height: '100%',
|
height: '100%',
|
||||||
display: 'flex',
|
display: 'flex',
|
||||||
flexDirection: 'column',
|
flexDirection: 'column',
|
||||||
'& .Dashboard-terminateButton': {
|
|
||||||
color: theme.palette.error.main
|
|
||||||
},
|
|
||||||
'& .Dashboard-download': {
|
'& .Dashboard-download': {
|
||||||
'& .Dashboard-downloadButton': {
|
'& .Dashboard-downloadButton': {
|
||||||
width: '40px',
|
width: '40px',
|
||||||
|
@ -133,7 +130,7 @@ function getTerminateCell(pgAdmin, sid, did, canTakeAction, onSuccess) {
|
||||||
<PgIconButton
|
<PgIconButton
|
||||||
size="xs"
|
size="xs"
|
||||||
noBorder
|
noBorder
|
||||||
icon={<CancelIcon />}
|
icon={<BlockRoundedIcon />}
|
||||||
className='Dashboard-terminateButton'
|
className='Dashboard-terminateButton'
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
if (
|
if (
|
||||||
|
@ -198,7 +195,7 @@ function getCancelCell(pgAdmin, sid, did, canTakeAction, onSuccess) {
|
||||||
<PgIconButton
|
<PgIconButton
|
||||||
size="xs"
|
size="xs"
|
||||||
noBorder
|
noBorder
|
||||||
icon={<StopCircleOutlinedIcon/>}
|
icon={<StopRoundedIcon/>}
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
if (!canTakeAction(row, 'cancel'))
|
if (!canTakeAction(row, 'cancel'))
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -16,7 +16,7 @@ import PropTypes from 'prop-types';
|
||||||
import { MESSAGE_TYPE, NotifierMessage } from '../../../../static/js/components/FormComponents';
|
import { MESSAGE_TYPE, NotifierMessage } from '../../../../static/js/components/FormComponents';
|
||||||
import { BgProcessManagerProcessState } from './BgProcessConstants';
|
import { BgProcessManagerProcessState } from './BgProcessConstants';
|
||||||
import { DefaultButton, PgIconButton } from '../../../../static/js/components/Buttons';
|
import { DefaultButton, PgIconButton } from '../../../../static/js/components/Buttons';
|
||||||
import HighlightOffRoundedIcon from '@mui/icons-material/HighlightOffRounded';
|
import BlockRoundedIcon from '@mui/icons-material/BlockRounded';
|
||||||
import AccessTimeRoundedIcon from '@mui/icons-material/AccessTimeRounded';
|
import AccessTimeRoundedIcon from '@mui/icons-material/AccessTimeRounded';
|
||||||
import { useInterval } from '../../../../static/js/custom_hooks';
|
import { useInterval } from '../../../../static/js/custom_hooks';
|
||||||
import getApiInstance from '../../../../static/js/api_instance';
|
import getApiInstance from '../../../../static/js/api_instance';
|
||||||
|
@ -165,8 +165,8 @@ export default function ProcessDetails({data}) {
|
||||||
pgAdmin.Tools.FileManager.openStorageManager(data.current_storage_dir);
|
pgAdmin.Tools.FileManager.openStorageManager(data.current_storage_dir);
|
||||||
}} style={{marginRight: '4px'}} />}
|
}} style={{marginRight: '4px'}} />}
|
||||||
<DefaultButton disabled={process_state != BgProcessManagerProcessState.PROCESS_STARTED || data.server_id != null}
|
<DefaultButton disabled={process_state != BgProcessManagerProcessState.PROCESS_STARTED || data.server_id != null}
|
||||||
startIcon={<HighlightOffRoundedIcon />} className='ProcessDetails-terminateBtn' onClick={onStopProcess}>
|
startIcon={<BlockRoundedIcon />} className='ProcessDetails-terminateBtn' onClick={onStopProcess}>
|
||||||
Stop Process
|
End Process
|
||||||
</DefaultButton>
|
</DefaultButton>
|
||||||
</Box>
|
</Box>
|
||||||
</Box>
|
</Box>
|
||||||
|
|
|
@ -14,7 +14,7 @@ import gettext from 'sources/gettext';
|
||||||
import PropTypes from 'prop-types';
|
import PropTypes from 'prop-types';
|
||||||
import { BgProcessManagerEvents, BgProcessManagerProcessState } from './BgProcessConstants';
|
import { BgProcessManagerEvents, BgProcessManagerProcessState } from './BgProcessConstants';
|
||||||
import { PgButtonGroup, PgIconButton } from '../../../../static/js/components/Buttons';
|
import { PgButtonGroup, PgIconButton } from '../../../../static/js/components/Buttons';
|
||||||
import StopCircleOutlinedIcon from '@mui/icons-material/StopCircleOutlined';
|
import BlockRoundedIcon from '@mui/icons-material/BlockRounded';
|
||||||
import DescriptionOutlinedIcon from '@mui/icons-material/DescriptionOutlined';
|
import DescriptionOutlinedIcon from '@mui/icons-material/DescriptionOutlined';
|
||||||
import DeleteIcon from '@mui/icons-material/Delete';
|
import DeleteIcon from '@mui/icons-material/Delete';
|
||||||
import HelpIcon from '@mui/icons-material/HelpRounded';
|
import HelpIcon from '@mui/icons-material/HelpRounded';
|
||||||
|
@ -76,7 +76,7 @@ function CancelCell({row}) {
|
||||||
<PgIconButton
|
<PgIconButton
|
||||||
size="xs"
|
size="xs"
|
||||||
noBorder
|
noBorder
|
||||||
icon={<StopCircleOutlinedIcon />}
|
icon={<BlockRoundedIcon />}
|
||||||
className='Processes-stopButton'
|
className='Processes-stopButton'
|
||||||
disabled={row.original.process_state != BgProcessManagerProcessState.PROCESS_STARTED
|
disabled={row.original.process_state != BgProcessManagerProcessState.PROCESS_STARTED
|
||||||
|| row.original.server_id != null}
|
|| row.original.server_id != null}
|
||||||
|
@ -84,8 +84,8 @@ function CancelCell({row}) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
pgAdmin.Browser.BgProcessManager.stopProcess(row.original.id);
|
pgAdmin.Browser.BgProcessManager.stopProcess(row.original.id);
|
||||||
}}
|
}}
|
||||||
aria-label="Stop Process"
|
aria-label="End Process"
|
||||||
title={gettext('Stop Process')}
|
title={gettext('End Process')}
|
||||||
></PgIconButton>
|
></PgIconButton>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,7 +17,7 @@ import FormatIndentDecreaseIcon from '@mui/icons-material/FormatIndentDecrease';
|
||||||
import PlayCircleFilledWhiteIcon from '@mui/icons-material/PlayCircleFilledWhite';
|
import PlayCircleFilledWhiteIcon from '@mui/icons-material/PlayCircleFilledWhite';
|
||||||
import FiberManualRecordIcon from '@mui/icons-material/FiberManualRecord';
|
import FiberManualRecordIcon from '@mui/icons-material/FiberManualRecord';
|
||||||
import NotInterestedIcon from '@mui/icons-material/NotInterested';
|
import NotInterestedIcon from '@mui/icons-material/NotInterested';
|
||||||
import StopCircleOutlinedIcon from '@mui/icons-material/StopCircleOutlined';
|
import StopRoundedIcon from '@mui/icons-material/StopRounded';
|
||||||
import HelpIcon from '@mui/icons-material/HelpRounded';
|
import HelpIcon from '@mui/icons-material/HelpRounded';
|
||||||
import RotateLeftRoundedIcon from '@mui/icons-material/RotateLeftRounded';
|
import RotateLeftRoundedIcon from '@mui/icons-material/RotateLeftRounded';
|
||||||
|
|
||||||
|
@ -180,7 +180,7 @@ export function ToolBar() {
|
||||||
}} />
|
}} />
|
||||||
</PgButtonGroup>
|
</PgButtonGroup>
|
||||||
<PgButtonGroup size="small">
|
<PgButtonGroup size="small">
|
||||||
<PgIconButton data-test='stop-debugger' title={gettext('Stop')} icon={<StopCircleOutlinedIcon style={{height: '2rem'}} />} disabled={buttonsDisabled[MENUS.STOP]} onClick={() => { stop(); }}
|
<PgIconButton data-test='stop-debugger' title={gettext('Stop')} icon={<StopRoundedIcon style={{height: '2rem'}} />} disabled={buttonsDisabled[MENUS.STOP]} onClick={() => { stop(); }}
|
||||||
shortcut={preferences?.btn_stop} />
|
shortcut={preferences?.btn_stop} />
|
||||||
</PgButtonGroup>
|
</PgButtonGroup>
|
||||||
<PgButtonGroup size="small">
|
<PgButtonGroup size="small">
|
||||||
|
|
|
@ -13,7 +13,7 @@ import { PgButtonGroup, PgIconButton } from '../../../../../../static/js/compone
|
||||||
import FolderRoundedIcon from '@mui/icons-material/FolderRounded';
|
import FolderRoundedIcon from '@mui/icons-material/FolderRounded';
|
||||||
import KeyboardArrowDownIcon from '@mui/icons-material/KeyboardArrowDown';
|
import KeyboardArrowDownIcon from '@mui/icons-material/KeyboardArrowDown';
|
||||||
import SaveRoundedIcon from '@mui/icons-material/SaveRounded';
|
import SaveRoundedIcon from '@mui/icons-material/SaveRounded';
|
||||||
import StopCircleOutlinedIcon from '@mui/icons-material/StopCircleOutlined';
|
import StopRoundedIcon from '@mui/icons-material/StopRounded';
|
||||||
import PlayArrowRoundedIcon from '@mui/icons-material/PlayArrowRounded';
|
import PlayArrowRoundedIcon from '@mui/icons-material/PlayArrowRounded';
|
||||||
import { FilterIcon, CommitIcon, RollbackIcon, ExecuteQueryIcon } from '../../../../../../static/js/components/ExternalIcon';
|
import { FilterIcon, CommitIcon, RollbackIcon, ExecuteQueryIcon } from '../../../../../../static/js/components/ExternalIcon';
|
||||||
import EditRoundedIcon from '@mui/icons-material/EditRounded';
|
import EditRoundedIcon from '@mui/icons-material/EditRounded';
|
||||||
|
@ -535,7 +535,7 @@ export function MainToolBar({containerRef, onFilterClick, onManageMacros, onAddT
|
||||||
{label: gettext('100 rows'), value: '100'},
|
{label: gettext('100 rows'), value: '100'},
|
||||||
]} value={limit} onChange={onLimitChange} disabled={buttonsDisabled['limit'] || queryToolCtx.params.is_query_tool} />
|
]} value={limit} onChange={onLimitChange} disabled={buttonsDisabled['limit'] || queryToolCtx.params.is_query_tool} />
|
||||||
<PgButtonGroup size="small">
|
<PgButtonGroup size="small">
|
||||||
<PgIconButton title={gettext('Cancel query')} icon={<StopCircleOutlinedIcon style={{height: 'unset'}} />}
|
<PgIconButton title={gettext('Cancel query')} icon={<StopRoundedIcon style={{height: 'unset'}} />}
|
||||||
onClick={cancelQuery} disabled={buttonsDisabled['cancel']} shortcut={queryToolPref.btn_cancel_query} />
|
onClick={cancelQuery} disabled={buttonsDisabled['cancel']} shortcut={queryToolPref.btn_cancel_query} />
|
||||||
<PgIconButton title={gettext('Execute script')} icon={<PlayArrowRoundedIcon style={{height: 'unset'}} />}
|
<PgIconButton title={gettext('Execute script')} icon={<PlayArrowRoundedIcon style={{height: 'unset'}} />}
|
||||||
onClick={executeScript} disabled={buttonsDisabled['execute']} shortcut={queryToolPref.execute_script}/>
|
onClick={executeScript} disabled={buttonsDisabled['execute']} shortcut={queryToolPref.execute_script}/>
|
||||||
|
|