新增小容量硬盘的QT客户端方案

This commit is contained in:
yangdonghai 2022-10-20 11:41:25 +08:00
parent 25d4a74c00
commit e631bff4c4
9 changed files with 243 additions and 174 deletions

Binary file not shown.

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1" language="en_US" sourcelanguage="en_AS">
<TS version="2.0" language="en_US" sourcelanguage="en_AS">
<context>
<name>DiskInfoView</name>
<message>
@ -89,7 +89,7 @@
<message>
<source>Root partition size is greater than 15GiB,
but Huawei machines require greater than 25GiB.</source>
<translation type="vanished">Root partition size is greater than 15GiB,
<translation type="vanished">Root partition size is greater than 15GiB,
but Huawei machines require greater than 25GiB.</translation>
</message>
<message>
@ -199,8 +199,8 @@ but Huawei machines require greater than 25GiB.</translation>
<name>KInstaller::FullPartitionFrame</name>
<message>
<location filename="../src/plugins/KPartition/quickpartitionframe.cpp" line="158"/>
<source>Please choose custom way to install, disk size less than 50G!</source>
<translation>Please choose custom way to install, disk size less than 50G!</translation>
<source>Please choose custom way to install, disk size less than 20G!</source>
<translation>Please choose custom way to install, disk size less than 20G!</translation>
</message>
<message>
<location filename="../src/plugins/KPartition/quickpartitionframe.cpp" line="159"/>
@ -289,12 +289,12 @@ but Huawei machines require greater than 25GiB.</translation>
<context>
<name>KInstaller::LanguageFrame</name>
<message>
<location filename="../src/plugins/KChoiceLanguage/languageframe.cpp" line="211"/>
<location filename="../src/plugins/KChoiceLanguage/languageframe.cpp" line="187"/>
<source>Select Language</source>
<translation>Select Language</translation>
</message>
<message>
<location filename="../src/plugins/KChoiceLanguage/languageframe.cpp" line="214"/>
<location filename="../src/plugins/KChoiceLanguage/languageframe.cpp" line="190"/>
<source>Next</source>
<translation>Next</translation>
</message>
@ -320,92 +320,60 @@ but Huawei machines require greater than 25GiB.</translation>
<context>
<name>KInstaller::MainPartFrame</name>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="468"/>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="479"/>
<source>Custom install</source>
<translatorcomment>Custom install</translatorcomment>
<translation>Custom install</translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="294"/>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="306"/>
<source>Coexist Install</source>
<translation>Coexist Install</translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="322"/>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="334"/>
<source>Confirm Custom Installation</source>
<translation>Confirm Custom Installation</translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="261"/>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="258"/>
<source>Formatted the whole disk</source>
<translation>Formatted the whole disk</translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="263"/>
<source>%1 1 EFI, vfat;
%1 2 boot, ext4;
%1 3 /, ext4;
%1 4 backup, ext4;
%1 5 data, ext4;
%1 6 swap, swap;
</source>
<translation>EFI partition #1 of %1 as vfat;
boot partition #2 of %1 as ext4;
/ partition #3 of %1 as ext4;
backup partition #4 of %1 as ext4;
data partition #5 of %1 as ext4;
swap partition #6 of %1 as swap;</translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="270"/>
<source>%1 1 boot, ext4;
%1 2 extend;
%1 5 /, ext4;
%1 6 backup, ext4;
%1 7 data, ext4;
%1 8 swap, swap;
</source>
<translation>boot partition #1 of %1 as vfat;
extend partition #2 of %1 ;
/ partition #5 of %1 as ext4;
backup partition #6 of %1 as ext4;
data partition #7 of %1 as ext4;
swap partition #8 of %1 as swap;</translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="330"/>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="342"/>
<source>Confirm the above operations</source>
<translation>Confirm the above operations</translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="350"/>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="361"/>
<source>BootLoader method %1 inconsistent with the disk partition table
type %2.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="353"/>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="358"/>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="364"/>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="369"/>
<source>BootLoader method %1 inconsistent with the disk partition table
type %2, cannot have efi partition.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="379"/>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="390"/>
<source>InvalidId
</source>
<translation>InvalidId
</translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="382"/>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="393"/>
<source>Boot filesystem invalid
</source>
<translation>Boot filesystem invalid
</translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="397"/>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="408"/>
<source>the EFI partition size should be set between 256MB and 2GB
</source>
<translation>the EFI partition size should be set between 256MB and 2GB.</translation>
@ -418,96 +386,146 @@ but Huawei machines require greater than 25GiB.
but Huawei machines require greater than 25GiB.</translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="388"/>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="399"/>
<source>Boot partition too small
</source>
<translation>Boot partition too small
</translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="385"/>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="396"/>
<source>Boot partition not in the first partition
</source>
<translation>Boot partition not in the first partition
</translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="260"/>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="257"/>
<source>Confirm Full Installation</source>
<translation>Confirm Full Installation</translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="391"/>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="262"/>
<source>EFI partition #1 of %1 as vfat;
boot partition #2 of %1 as ext4;
/ partition #3 of %1 as ext4;
</source>
<translation>EFI partition #1 of %1 as vfat;
boot partition #2 of %1 as ext4;
/ partition #3 of %1 as ext4;</translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="267"/>
<source>EFI partition #1 of %1 as vfat;
boot partition #2 of %1 as ext4;
/ partition #3 of %1 as ext4;
backup partition #4 of %1 as ext4;
data partition #5 of %1 as ext4;
swap partition #6 of %1 as swap;
</source>
<translation>EFI partition #1 of %1 as vfat;
boot partition #2 of %1 as ext4;
/ partition #3 of %1 as ext4;
backup partition #4 of %1 as ext4;
data partition #5 of %1 as ext4;
swap partition #6 of %1 as swap;</translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="277"/>
<source>boot partition #1 of %1 as vfat;
/ partition #2 of %1 as ext4;
</source>
<translation>boot partition #1 of %1 as vfat;
/ partition #2 of %1 as ext4;</translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="281"/>
<source>boot partition #1 of %1 as vfat;
extend partition #2 of %1 ;
/ partition #5 of %1 as ext4;
backup partition #6 of %1 as ext4;
data partition #7 of %1 as ext4;
swap partition #8 of %1 as swap;
</source>
<translation>boot partition #1 of %1 as vfat;
extend partition #2 of %1 ;
/ partition #5 of %1 as ext4;
backup partition #6 of %1 as ext4;
data partition #7 of %1 as ext4;
swap partition #8 of %1 as swap;</translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="402"/>
<source>No boot partition
</source>
<translation>No boot partition
</translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="394"/>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="405"/>
<source>No Efi partition
</source>
<translation>No Efi partition
</translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="400"/>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="411"/>
<source>Only one EFI partition is allowed
</source>
<translation>Only one EFI partition is allowed
</translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="403"/>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="414"/>
<source>Efi partition number invalid
</source>
<translation>Efi partition number invalid
</translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="406"/>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="417"/>
<source>No root partition
</source>
<translation>No root partition
</translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="409"/>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="420"/>
<source>Recommended Root partition size greater than 15GiB</source>
<translation>Recommended Root partition size greater than 15GiB</translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="430"/>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="441"/>
<source>This machine not support EFI partition
</source>
<translation>This machine not support EFI partition
</translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="467"/>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="478"/>
<source>Full install</source>
<translation>Full install</translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="412"/>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="423"/>
<source>Partition too small
</source>
<translation>Partition too small</translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="418"/>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="429"/>
<source>Repeated mountpoint
</source>
<translation>Repeated mountpoint
</translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="466"/>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="477"/>
<source>Choose Installation Method</source>
<translation>Choose Installation Method</translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="470"/>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="481"/>
<source>Next</source>
<translation>Next</translation>
</message>

Binary file not shown.

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1" language="zh_CN" sourcelanguage="en_AS">
<TS version="2.0" language="zh_CN" sourcelanguage="en_AS">
<context>
<name>DiskInfoView</name>
<message>
@ -198,8 +198,8 @@ but Huawei machines require greater than 25GiB.</source>
<name>KInstaller::FullPartitionFrame</name>
<message>
<location filename="../src/plugins/KPartition/quickpartitionframe.cpp" line="158"/>
<source>Please choose custom way to install, disk size less than 50G!</source>
<translation>50G</translation>
<source>Please choose custom way to install, disk size less than 20G!</source>
<translation>20G</translation>
</message>
<message>
<location filename="../src/plugins/KPartition/quickpartitionframe.cpp" line="159"/>
@ -269,7 +269,7 @@ but Huawei machines require greater than 25GiB.</source>
</message>
<message>
<source>Sorry, KylinOS cannot continue the installation. Please feed back the error log below so that we can better solve the problem for you.</source>
<translation type="vanished">kylinOS无法继续安装便.</translation>
<translation>kylinOS无法继续安装便.</translation>
</message>
<message>
<location filename="../src/Installer_main/installingframe.cpp" line="214"/>
@ -288,12 +288,12 @@ but Huawei machines require greater than 25GiB.</source>
<context>
<name>KInstaller::LanguageFrame</name>
<message>
<location filename="../src/plugins/KChoiceLanguage/languageframe.cpp" line="211"/>
<location filename="../src/plugins/KChoiceLanguage/languageframe.cpp" line="187"/>
<source>Select Language</source>
<translation></translation>
</message>
<message>
<location filename="../src/plugins/KChoiceLanguage/languageframe.cpp" line="214"/>
<location filename="../src/plugins/KChoiceLanguage/languageframe.cpp" line="190"/>
<source>Next</source>
<translation></translation>
</message>
@ -319,34 +319,101 @@ but Huawei machines require greater than 25GiB.</source>
<context>
<name>KInstaller::MainPartFrame</name>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="468"/>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="479"/>
<source>Custom install</source>
<translatorcomment></translatorcomment>
<translation></translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="294"/>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="306"/>
<source>Coexist Install</source>
<translation></translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="322"/>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="334"/>
<source>Confirm Custom Installation</source>
<translation></translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="261"/>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="258"/>
<source>Formatted the whole disk</source>
<translation></translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="263"/>
<source>%1 1 EFI, vfat;
%1 2 boot, ext4;
%1 3 /, ext4;
%1 4 backup, ext4;
%1 5 data, ext4;
%1 6 swap, swap;
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="342"/>
<source>Confirm the above operations</source>
<translation></translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="361"/>
<source>BootLoader method %1 inconsistent with the disk partition table
type %2.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="364"/>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="369"/>
<source>BootLoader method %1 inconsistent with the disk partition table
type %2, cannot have efi partition.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="390"/>
<source>InvalidId
</source>
<translation>
</translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="393"/>
<source>Boot filesystem invalid
</source>
<translation>Boot分区文件系统不可用
</translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="408"/>
<source>the EFI partition size should be set between 256MB and 2GB
</source>
<translation>Efi分区大小应设置在256MB到2GB之间</translation>
</message>
<message>
<source>Root partition size is greater than 15GiB,
but Huawei machines require greater than 25GiB.
</source>
<translation type="obsolete">15GiB25GiB
</translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="399"/>
<source>Boot partition too small
</source>
<translation>Boot分区太小
</translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="257"/>
<source>Confirm Full Installation</source>
<translation></translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="262"/>
<source>EFI partition #1 of %1 as vfat;
boot partition #2 of %1 as ext4;
/ partition #3 of %1 as ext4;
</source>
<translation>%1 1 EFI, vfat;
%1 2 boot, ext4;
%1 3 /, ext4;</translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="267"/>
<source>EFI partition #1 of %1 as vfat;
boot partition #2 of %1 as ext4;
/ partition #3 of %1 as ext4;
backup partition #4 of %1 as ext4;
data partition #5 of %1 as ext4;
swap partition #6 of %1 as swap;
</source>
<translation>%1 1 EFI, vfat;
%1 2 boot, ext4;
@ -356,13 +423,21 @@ but Huawei machines require greater than 25GiB.</source>
%1 6 swap, swap;</translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="270"/>
<source>%1 1 boot, ext4;
%1 2 extend;
%1 5 /, ext4;
%1 6 backup, ext4;
%1 7 data, ext4;
%1 8 swap, swap;
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="277"/>
<source>boot partition #1 of %1 as vfat;
/ partition #2 of %1 as ext4;
</source>
<translation>%1 1 boot, ext4;
%1 2 /, ext4;</translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="281"/>
<source>boot partition #1 of %1 as vfat;
extend partition #2 of %1 ;
/ partition #5 of %1 as ext4;
backup partition #6 of %1 as ext4;
data partition #7 of %1 as ext4;
swap partition #8 of %1 as swap;
</source>
<translation>%1 1 boot, ext4;
%1 2 extend;
@ -372,140 +447,83 @@ but Huawei machines require greater than 25GiB.</source>
%1 8 swap, swap;</translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="330"/>
<source>Confirm the above operations</source>
<translation></translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="350"/>
<source>BootLoader method %1 inconsistent with the disk partition table
type %2.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="353"/>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="358"/>
<source>BootLoader method %1 inconsistent with the disk partition table
type %2, cannot have efi partition.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="379"/>
<source>InvalidId
</source>
<translation>
</translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="382"/>
<source>Boot filesystem invalid
</source>
<translation>Boot分区文件系统不可用
</translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="397"/>
<source>the EFI partition size should be set between 256MB and 2GB
</source>
<translation>Efi分区大小应设置在256MB到2GB之间</translation>
</message>
<message>
<source>Root partition size is greater than 15GiB,
but Huawei machines require greater than 25GiB.
</source>
<translation type="vanished">15GiB25GiB
</translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="388"/>
<source>Boot partition too small
</source>
<translation>Boot分区太小
</translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="260"/>
<source>Confirm Full Installation</source>
<translation></translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="385"/>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="396"/>
<source>Boot partition not in the first partition
</source>
<translation>Boot分区必须为第一分区!</translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="391"/>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="402"/>
<source>No boot partition
</source>
<translation>boot分区
</translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="394"/>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="405"/>
<source>No Efi partition
</source>
<translation>Efi分区
</translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="400"/>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="411"/>
<source>Only one EFI partition is allowed
</source>
<translation>EFI分区存在
</translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="403"/>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="414"/>
<source>Efi partition number invalid
</source>
<translation>Efi分区编号不可用
</translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="406"/>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="417"/>
<source>No root partition
</source>
<translation>
</translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="409"/>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="420"/>
<source>Recommended Root partition size greater than 15GiB</source>
<translation>15GiB</translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="430"/>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="441"/>
<source>This machine not support EFI partition
</source>
<translation>EFI分区!</translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="467"/>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="478"/>
<source>Full install</source>
<translation></translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="412"/>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="423"/>
<source>Partition too small
</source>
<translation>
</translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="418"/>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="429"/>
<source>Repeated mountpoint
</source>
<translation>
</translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="466"/>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="477"/>
<source>Choose Installation Method</source>
<translation></translation>
</message>
<message>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="470"/>
<location filename="../src/plugins/KPartition/mainpartframe.cpp" line="481"/>
<source>Next</source>
<translation></translation>
</message>

View File

@ -13,7 +13,9 @@
#include "partition_delegate.h"
namespace KInstaller {
#define DISKMINSIZE 50
#define DISKMINSIZE 20
#define DISKLIMITESIZE 32
FullPartitionDelegate::FullPartitionDelegate(QObject* parent) :PartitionDelegate(parent),
m_quickInstall(false)
{
@ -244,6 +246,19 @@ bool FullPartitionDelegate::DiskSizeValidate(QString devpath)
}
bool FullPartitionDelegate::DiskSizeLimited(QString devpath)
{
Device::Ptr dev = findDevice(devpath);
if(dev != nullptr) {
qint64 len = DISKLIMITESIZE * kGibiByte;
if(dev->m_diskTotal <= len) {
return true;
} else
return false;
} else
return false;
}
uint FullPartitionDelegate::getSwapSize()
{
struct sysinfo myinfo;

View File

@ -87,6 +87,7 @@ public:
const QStringList& selectedDisks();
void removeAllSelectedDisk();
bool DiskSizeValidate(QString devpath);
bool DiskSizeLimited(QString devpath);
bool formatWholeDeviceMultipleDisk();
void getFinalDiskResolution(FinalQuickDiskResolution& resolution);

View File

@ -173,7 +173,7 @@ void LevelScrollDiskView::addItemsToList(DeviceList devlist)
double d =100.0 * usedspace / devlist.at(i)->m_diskTotal;
disk->setProgressValue(d);
qint64 t = devlist.at(i)->m_diskTotal/1024/1024/1024;
int r = t - 50;//50G
int r = t - 20;//20G
if(r < 0) {
m_disklist.at(i)->setWidgetDisabled();
m_disklist.at(i)->checkable = false;

View File

@ -257,19 +257,36 @@ void MainPartFrame::clickNextButton()
m_prepareFrame->setMainTitleStr(tr("Confirm Full Installation"));//快速安装
m_prepareFrame->m_tipCheck->setText(tr("Formatted the whole disk"));
if(!m_quickDelegate->isMBRPreferredDe()) {
partStr = QString(tr("%1 设备上第1分区为 EFI, 将设为 vfat;\n"
"%1 设备上第2分区为 boot, 将设为 ext4;\n"
"%1 设备上第3分区为 /, 将设为 ext4;\n"
"%1 设备上第4分区为 backup, 将设为 ext4;\n"
"%1 设备上第5分区为 data, 将设为 ext4;\n"
"%1 设备上第6分区为 swap, 将设为 swap;\n")).arg(m_fullPartFrame->m_devPath);
if(m_quickDelegate->DiskSizeLimited(m_fullPartFrame->m_devPath))
{
partStr = QString(tr("EFI partition #1 of %1 as vfat;\n"
"boot partition #2 of %1 as ext4;\n"
"/ partition #3 of %1 as ext4;\n")).arg(m_fullPartFrame->m_devPath);
}
else
{
partStr = QString(tr("EFI partition #1 of %1 as vfat;\n"
"boot partition #2 of %1 as ext4;\n"
"/ partition #3 of %1 as ext4;\n"
"backup partition #4 of %1 as ext4;\n"
"data partition #5 of %1 as ext4;\n"
"swap partition #6 of %1 as swap;\n")).arg(m_fullPartFrame->m_devPath);
}
} else {
partStr = QString(tr("%1 设备上第1分区为 boot, 将设为 ext4;\n"
"%1 设备上第2分区为 extend;\n"
"%1 设备上第5分区为 /, 将设为 ext4;\n"
"%1 设备上第6分区为 backup, 将设为 ext4;\n"
"%1 设备上第7分区为 data, 将设为 ext4;\n"
"%1 设备上第8分区为 swap, 将设为 swap;\n")).arg(m_fullPartFrame->m_devPath);
if(m_quickDelegate->DiskSizeLimited(m_fullPartFrame->m_devPath))
{
partStr = QString(tr("boot partition #1 of %1 as vfat;\n"
"/ partition #2 of %1 as ext4;\n")).arg(m_fullPartFrame->m_devPath);
}
else
{
partStr = QString(tr("boot partition #1 of %1 as vfat;\n"
"extend partition #2 of %1 ;\n"
"/ partition #5 of %1 as ext4;\n"
"backup partition #6 of %1 as ext4;\n"
"data partition #7 of %1 as ext4;\n"
"swap partition #8 of %1 as swap;\n")).arg(m_fullPartFrame->m_devPath);
}
}
//添加数据盘

View File

@ -109,7 +109,7 @@ void FullPartitionFrame::repaintDevices(DeviceList devs)
slistDisk->numDisk = 0;
slistDisk->addItemsToList(devs);
devlist = devs;
if(devs.length() == 1 && (devs.at(0)->m_diskTotal/1024/1024/1024 - 50 < 0)) {
if(devs.length() == 1 && (devs.at(0)->m_diskTotal/1024/1024/1024 - 20 < 0)) {
m_tip->show();
}
//2021-3-4 14:37
@ -155,7 +155,7 @@ void FullPartitionFrame::changeEvent(QEvent *event)
void FullPartitionFrame::translateStr()
{
m_tip->setText(tr("Please choose custom way to install, disk size less than 50G!"));//请选择自定义方式进行安装!
m_tip->setText(tr("Please choose custom way to install, disk size less than 20G!"));//请选择自定义方式进行安装!
m_encryptBox->setText(tr("Full disk encryption"));
m_firstback->setText(tr("Factory backup"));
// promptLabel->setText(tr("Quick installation will format the entire hard drive!"