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

Merge branch '3.2'

This commit is contained in:
Andrius Štikonas 2017-10-06 18:54:25 -04:00
parent 8baad25d47 f34733e824
commit d38b889a22
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

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

4
src/gui/mainwindow.cpp
View File

@ -725,10 +725,10 @@ void MainWindow::scanDevices()
deviceScanner().start();
}
void MainWindow::on_m_DeviceScanner_progress(const QString& device_node, int percent)
void MainWindow::on_m_DeviceScanner_progress(const QString& deviceNode, int percent)
{
scanProgressDialog().setProgress(percent);
scanProgressDialog().setDeviceName(device_node);
scanProgressDialog().setDeviceName(deviceNode);
}
void MainWindow::on_m_DeviceScanner_finished()

5
src/gui/volumegroupdialog.cpp
View File

@ -75,7 +75,10 @@ VolumeGroupDialog::~VolumeGroupDialog()
void VolumeGroupDialog::setupDialog()
{
QRegularExpression re(QStringLiteral("[\\w-.+]+"));
/* LVM Volume group name can consists of: letters numbers _ . - +
* It cannot start with underscore _ and must not be equal to . or .. or any entry in /dev/
* QLineEdit accepts QValidator::Intermediate, so we just disable . at the beginning */
QRegularExpression re(QStringLiteral(R"(^(?!_|\.)[\w\-.+]+)"));
QRegularExpressionValidator *validator = new QRegularExpressionValidator(re, this);
dialogWidget().vgName().setValidator(validator);
dialogWidget().vgName().setText(targetName());