Add "Encrypt" checkBox to partition widget.
Also replace occurrences of NULL with nullptr.
This commit is contained in:
Teo Mrnjavac
parent
0c780279ae
commit
b0b2eccc23
|
|
@ -81,6 +81,11 @@ public:
|
|||
return *m_ComboFileSystem;
|
||||
}
|
||||
|
||||
QCheckBox& checkBoxEncrypt() {
|
||||
Q_ASSERT(m_CheckBoxEncrypt);
|
||||
return *m_CheckBoxEncrypt;
|
||||
}
|
||||
|
||||
QLabel& textLabel() {
|
||||
Q_ASSERT(m_LabelTextLabel);
|
||||
return *m_LabelTextLabel;
|
||||
|
|
@ -100,27 +105,29 @@ public:
|
|||
|
||||
void hideRole() {
|
||||
delete m_LabelRole;
|
||||
m_LabelRole = NULL;
|
||||
m_LabelRole = nullptr;
|
||||
delete m_RadioPrimary;
|
||||
m_RadioPrimary = NULL;
|
||||
m_RadioPrimary = nullptr;
|
||||
delete m_RadioExtended;
|
||||
m_RadioExtended = NULL;
|
||||
m_RadioExtended = nullptr;
|
||||
delete m_RadioLogical;
|
||||
m_RadioLogical = NULL;
|
||||
m_RadioLogical = nullptr;
|
||||
}
|
||||
void hideFileSystem() {
|
||||
delete m_LabelFileSystem;
|
||||
m_LabelFileSystem = NULL;
|
||||
m_LabelFileSystem = nullptr;
|
||||
delete m_ComboFileSystem;
|
||||
m_ComboFileSystem = NULL;
|
||||
m_ComboFileSystem = nullptr;
|
||||
delete m_CheckBoxEncrypt;
|
||||
m_CheckBoxEncrypt = nullptr;
|
||||
}
|
||||
void hideLabel() {
|
||||
delete m_LabelTextLabel;
|
||||
m_LabelTextLabel = NULL;
|
||||
m_LabelTextLabel = nullptr;
|
||||
delete m_EditLabel;
|
||||
m_EditLabel = NULL;
|
||||
m_EditLabel = nullptr;
|
||||
delete m_LabelTextNoSetLabel;
|
||||
m_LabelTextNoSetLabel = NULL;
|
||||
m_LabelTextNoSetLabel = nullptr;
|
||||
}
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -6,27 +6,11 @@
|
|||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>478</width>
|
||||
<height>347</height>
|
||||
<width>653</width>
|
||||
<height>655</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout">
|
||||
<item row="0" column="0" colspan="2">
|
||||
<widget class="PartResizerWidget" name="m_PartResizerWidget" native="true">
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>400</width>
|
||||
<height>60</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>16777215</width>
|
||||
<height>60</height>
|
||||
</size>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0" colspan="2">
|
||||
<spacer name="verticalSpacer">
|
||||
<property name="orientation">
|
||||
|
|
@ -43,6 +27,22 @@
|
|||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item row="0" column="0" colspan="2">
|
||||
<widget class="PartResizerWidget" name="m_PartResizerWidget" native="true">
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>400</width>
|
||||
<height>60</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>16777215</width>
|
||||
<height>60</height>
|
||||
</size>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="0">
|
||||
<widget class="QLabel" name="m_LabelRole">
|
||||
<property name="sizePolicy">
|
||||
|
|
@ -106,10 +106,7 @@
|
|||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="1">
|
||||
<widget class="QComboBox" name="m_ComboFileSystem"/>
|
||||
</item>
|
||||
<item row="4" column="0">
|
||||
<item row="5" column="0">
|
||||
<widget class="QLabel" name="m_LabelTextLabel">
|
||||
<property name="text">
|
||||
<string comment="@label">Label:</string>
|
||||
|
|
@ -122,7 +119,7 @@
|
|||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="1">
|
||||
<item row="5" column="1">
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<item>
|
||||
<widget class="QLineEdit" name="m_EditLabel"/>
|
||||
|
|
@ -139,7 +136,7 @@
|
|||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item row="5" column="0">
|
||||
<item row="6" column="0">
|
||||
<widget class="QLabel" name="label_4">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
|
||||
|
|
@ -155,14 +152,14 @@
|
|||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="5" column="1">
|
||||
<item row="6" column="1">
|
||||
<widget class="QLabel" name="m_LabelMinSize">
|
||||
<property name="textInteractionFlags">
|
||||
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="6" column="0">
|
||||
<item row="7" column="0">
|
||||
<widget class="QLabel" name="label_5">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
|
||||
|
|
@ -178,14 +175,14 @@
|
|||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="6" column="1">
|
||||
<item row="7" column="1">
|
||||
<widget class="QLabel" name="m_LabelMaxSize">
|
||||
<property name="textInteractionFlags">
|
||||
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="7" column="0">
|
||||
<item row="8" column="0">
|
||||
<widget class="QLabel" name="label">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
|
||||
|
|
@ -204,7 +201,7 @@
|
|||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="7" column="1">
|
||||
<item row="8" column="1">
|
||||
<widget class="FormattedSpinBox" name="m_SpinFreeBefore">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
|
||||
|
|
@ -220,7 +217,7 @@
|
|||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="8" column="0">
|
||||
<item row="9" column="0">
|
||||
<widget class="QLabel" name="label_2">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
|
||||
|
|
@ -239,7 +236,7 @@
|
|||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="8" column="1">
|
||||
<item row="9" column="1">
|
||||
<widget class="FormattedSpinBox" name="m_SpinCapacity">
|
||||
<property name="minimum">
|
||||
<double>0.000000000000000</double>
|
||||
|
|
@ -249,7 +246,7 @@
|
|||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="9" column="0">
|
||||
<item row="10" column="0">
|
||||
<widget class="QLabel" name="label_3">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
|
||||
|
|
@ -268,7 +265,7 @@
|
|||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="9" column="1">
|
||||
<item row="10" column="1">
|
||||
<widget class="FormattedSpinBox" name="m_SpinFreeAfter">
|
||||
<property name="minimum">
|
||||
<double>0.000000000000000</double>
|
||||
|
|
@ -278,7 +275,7 @@
|
|||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="10" column="0" colspan="2">
|
||||
<item row="11" column="0" colspan="2">
|
||||
<spacer name="verticalSpacer_2">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
|
|
@ -294,6 +291,23 @@
|
|||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item row="3" column="1">
|
||||
<layout class="QVBoxLayout" name="verticalLayout_2">
|
||||
<item>
|
||||
<widget class="QComboBox" name="m_ComboFileSystem"/>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QCheckBox" name="m_CheckBoxEncrypt">
|
||||
<property name="toolTip">
|
||||
<string>Set up encryption for this filesystem with LUKS. You will be asked to provide a passphrase.</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Encrypt with LUKS</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<customwidgets>
|
||||
|
|
@ -313,7 +327,6 @@
|
|||
<tabstop>m_RadioPrimary</tabstop>
|
||||
<tabstop>m_RadioExtended</tabstop>
|
||||
<tabstop>m_RadioLogical</tabstop>
|
||||
<tabstop>m_ComboFileSystem</tabstop>
|
||||
<tabstop>m_EditLabel</tabstop>
|
||||
<tabstop>m_SpinFreeBefore</tabstop>
|
||||
<tabstop>m_SpinCapacity</tabstop>
|
||||
|
|
|
|||
Loading…
Reference in New Issue