andrius
/
partitionmanager
1
0
Fork 0
Code Pull Requests Releases Activity

Merge branch '3.3'

This commit is contained in:
Andrius Štikonas 2018-01-07 16:51:50 +02:00
parent 523e07cbf5 f469ef204a
commit 6252fb480f
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -27,7 +27,7 @@ set(KPMCORE_MIN_VERSION "3.3.0")
# Check KPMcore dependency when bumping
set(VERSION_MAJOR "3")
set(VERSION_MINOR "3")
set(VERSION_RELEASE "0")
set(VERSION_RELEASE "1")
set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_RELEASE})
add_definitions(-D'VERSION="${VERSION}"') #"

5
src/gui/newdialog.cpp
View File

@ -102,6 +102,11 @@ void NewDialog::setupDialog()
dialogWidget().checkBoxEncrypt().hide();
dialogWidget().editPassphrase().hide();
if (device().type() == Device::LVM_Device) {
dialogWidget().comboFileSystem().removeItem(dialogWidget().comboFileSystem().findText(QStringLiteral("lvm2 pv")));
}
dialogWidget().editPassphrase().setMinimumPasswordLength(1);
dialogWidget().editPassphrase().setMaximumPasswordLength(512); // cryptsetup does not support longer passwords

1
src/gui/sizedialogbase.cpp
View File

@ -114,7 +114,6 @@ void SizeDialogBase::setupDialog()
detailsWidget().checkAlign().setChecked(false);
detailsWidget().checkAlign().setEnabled(false);
detailsButton->hide();
dialogWidget().comboFileSystem().removeItem(dialogWidget().comboFileSystem().findText(QStringLiteral("lvm2 pv")));
m_IsValidLVName = false;
/* LVM logical volume name can consist of: letters numbers _ . - +