napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wip mount point

Browse Source
This commit is contained in:
Aurélien Gâteau 2014-07-04 16:14:06 +02:00
parent a62f3daf25
commit ab4e81504e
2 changed files with 57 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/modules/partition/CreatePartitionDialog.cpp
View File

@ -27,6 +27,9 @@
#include <fs/filesystem.h> #include <fs/filesystem.h>
#include <fs/filesystemfactory.h> #include <fs/filesystemfactory.h>
// Qt
#include <QComboBox>
CreatePartitionDialog::CreatePartitionDialog( Device* device, Partition* freePartition, QWidget* parent ) CreatePartitionDialog::CreatePartitionDialog( Device* device, Partition* freePartition, QWidget* parent )
: QDialog( parent ) : QDialog( parent )
, m_ui( new Ui_CreatePartitionDialog ) , m_ui( new Ui_CreatePartitionDialog )
@ -104,7 +107,7 @@ CreatePartitionDialog::createJob()
fs, first, last, fs, first, last,
QString() /* path */, QString() /* path */,
PartitionTable::FlagNone /* availableFlags */, PartitionTable::FlagNone /* availableFlags */,
QString() /* mountPoint */, m_ui->mountPointComboBox->currentText(),
false /* mounted */, false /* mounted */,
PartitionTable::FlagNone /* activeFlags */, PartitionTable::FlagNone /* activeFlags */,
Partition::StateNew Partition::StateNew

56
src/modules/partition/CreatePartitionDialog.ui
View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>263</width> <width>425</width>
<height>179</height> <height>321</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -39,7 +39,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0"> <item row="5" column="0">
<spacer name="verticalSpacer"> <spacer name="verticalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
@ -86,6 +86,56 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>&amp;Mount Point:</string>
</property>
<property name="buddy">
<cstring>mountPointComboBox</cstring>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QComboBox" name="mountPointComboBox">
<property name="editable">
<bool>true</bool>
</property>
<property name="currentIndex">
<number>-1</number>
</property>
<item>
<property name="text">
<string>/</string>
</property>
</item>
<item>
<property name="text">
<string>/boot</string>
</property>
</item>
<item>
<property name="text">
<string>/home</string>
</property>
</item>
<item>
<property name="text">
<string>/opt</string>
</property>
</item>
<item>
<property name="text">
<string>/usr</string>
</property>
</item>
<item>
<property name="text">
<string>/var</string>
</property>
</item>
</widget>
</item>
</layout> </layout>
</item> </item>
<item> <item>