improve macOS and Linux user guides

This commit is contained in:
josc146 2023-06-06 22:12:26 +08:00
parent 4814b88172
commit 72d601370d
4 changed files with 31 additions and 19 deletions

View File

@ -140,5 +140,6 @@
"Failed to switch model, please try starting the program with administrator privileges.": "切换模型失败, 请尝试以管理员权限启动程序", "Failed to switch model, please try starting the program with administrator privileges.": "切换模型失败, 请尝试以管理员权限启动程序",
"Current Strategy": "当前Strategy", "Current Strategy": "当前Strategy",
"MacOS is not yet supported for performing this operation, please do it manually.": "MacOS尚未支持此操作, 请手动执行", "MacOS is not yet supported for performing this operation, please do it manually.": "MacOS尚未支持此操作, 请手动执行",
"Linux is not yet supported for performing this operation, please do it manually.": "Linux尚未支持此操作, 请手动执行" "Linux is not yet supported for performing this operation, please do it manually.": "Linux尚未支持此操作, 请手动执行",
"On Linux system, you must manually install python dependencies.": "在Linux系统下, 你必须手动安装python依赖"
} }

View File

@ -75,10 +75,16 @@ export const RunButton: FC<{ onClickRun?: MouseEventHandler, iconMode?: boolean
BrowserOpenURL('https://aka.ms/vs/16/release/vc_redist.x64.exe'); BrowserOpenURL('https://aka.ms/vs/16/release/vc_redist.x64.exe');
}); });
} else { } else {
toastWithButton(t('Python dependencies are incomplete, would you like to install them?'), t('Install'), () => { toast(depErrorMsg, { type: 'info', position: 'bottom-left' });
InstallPyDep(commonStore.settings.customPythonPath, commonStore.settings.cnMirror); if (commonStore.platform != 'linux')
setTimeout(WindowShow, 1000); toastWithButton(t('Python dependencies are incomplete, would you like to install them?'), t('Install'), () => {
}); InstallPyDep(commonStore.settings.customPythonPath, commonStore.settings.cnMirror);
setTimeout(WindowShow, 1000);
});
else
toastWithButton(t('On Linux system, you must manually install python dependencies.'), t('Check'), () => {
BrowserOpenURL('https://github.com/josStorer/RWKV-Runner/blob/master/build/linux/Readme_Install.txt');
});
} }
} else { } else {
toast(depErrorMsg, { type: 'error' }); toast(depErrorMsg, { type: 'error' });

View File

@ -95,7 +95,7 @@ export const Settings: FC = observer(() => {
} /> } />
} }
{ {
commonStore.settings.language === 'zh' && commonStore.settings.language === 'zh' && commonStore.platform != 'linux' &&
<Labeled label={t('Use Tsinghua Pip Mirrors')} flex spaceBetween content={ <Labeled label={t('Use Tsinghua Pip Mirrors')} flex spaceBetween content={
<Switch checked={commonStore.settings.cnMirror} <Switch checked={commonStore.settings.cnMirror}
onChange={(e, data) => { onChange={(e, data) => {

View File

@ -16,6 +16,7 @@ import { Button } from '@fluentui/react-components';
import { Language, Languages, SettingsType } from '../pages/Settings'; import { Language, Languages, SettingsType } from '../pages/Settings';
import { ModelSourceItem } from '../pages/Models'; import { ModelSourceItem } from '../pages/Models';
import { ModelConfig, ModelParameters } from '../pages/Configs'; import { ModelConfig, ModelParameters } from '../pages/Configs';
import { BrowserOpenURL } from '../../wailsjs/runtime';
export type Cache = { export type Cache = {
models: ModelSourceItem[] models: ModelSourceItem[]
@ -245,20 +246,24 @@ export async function checkUpdate(notifyEvenLatest: boolean = false) {
`https://gitee.com/josc146/RWKV-Runner/releases/download/${versionTag}/${asset.name}`; `https://gitee.com/josc146/RWKV-Runner/releases/download/${versionTag}/${asset.name}`;
toastWithButton(t('New Version Available') + ': ' + versionTag, t('Update'), () => { toastWithButton(t('New Version Available') + ': ' + versionTag, t('Update'), () => {
DeleteFile('cache.json'); DeleteFile('cache.json');
toast(t('Downloading update, please wait. If it is not completed, please manually download the program from GitHub and replace the original program.'), { if (commonStore.platform != 'darwin') {
type: 'info', toast(t('Downloading update, please wait. If it is not completed, please manually download the program from GitHub and replace the original program.'), {
position: 'bottom-left', type: 'info',
autoClose: 20000 position: 'bottom-left',
}); autoClose: 20000
setTimeout(() => {
UpdateApp(updateUrl).catch((e) => {
toast(t('Update Error') + ' - ' + e.message || e, {
type: 'error',
position: 'bottom-left',
autoClose: false
});
}); });
}, 500); setTimeout(() => {
UpdateApp(updateUrl).catch((e) => {
toast(t('Update Error') + ' - ' + e.message || e, {
type: 'error',
position: 'bottom-left',
autoClose: false
});
});
}, 500);
} else {
BrowserOpenURL(updateUrl);
}
}, { }, {
autoClose: false, autoClose: false,
position: 'bottom-left' position: 'bottom-left'