Diffstat (limited to 'noncore/tools/formatter/formatter.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/tools/formatter/formatter.cpp | 48 |
1 files changed, 23 insertions, 25 deletions
diff --git a/noncore/tools/formatter/formatter.cpp b/noncore/tools/formatter/formatter.cpp index bd0bb01..2b8ce7f 100644 --- a/noncore/tools/formatter/formatter.cpp +++ b/noncore/tools/formatter/formatter.cpp | |||
@@ -72,32 +72,35 @@ FormatterApp::FormatterApp( QWidget* parent, const char* name, bool modal, WFla | |||
72 | tab = new QWidget( TabWidget, "tab" ); | 72 | tab = new QWidget( TabWidget, "tab" ); |
73 | tabLayout = new QGridLayout( tab ); | 73 | tabLayout = new QGridLayout( tab ); |
74 | tabLayout->setSpacing( 6); | 74 | tabLayout->setSpacing( 3); |
75 | tabLayout->setMargin( 11); | 75 | tabLayout->setMargin( 2); |
76 | 76 | ||
77 | storageComboBox = new QComboBox( FALSE, tab, "storageComboBox" ); | 77 | storageComboBox = new QComboBox( FALSE, tab, "storageComboBox" ); |
78 | storageComboBox->setMaximumWidth(220); | ||
78 | 79 | ||
79 | tabLayout->addMultiCellWidget( storageComboBox, 0, 0, 0, 1 ); | 80 | tabLayout->addMultiCellWidget( storageComboBox, 0, 0, 0, 0 ); |
80 | 81 | ||
81 | TextLabel4 = new QLabel( tab, "TextLabel4" ); | 82 | TextLabel4 = new QLabel( tab, "TextLabel4" ); |
82 | TextLabel4->setText( tr( "Storage Type" ) ); | 83 | TextLabel4->setText( tr( "Storage Type" ) ); |
83 | 84 | ||
84 | tabLayout->addMultiCellWidget( TextLabel4, 1, 1, 0, 1 ); | 85 | tabLayout->addMultiCellWidget( TextLabel4, 1, 1, 0, 0 ); |
85 | 86 | ||
86 | TextLabel2 = new QLabel( tab, "TextLabel2" ); | 87 | TextLabel2 = new QLabel( tab, "TextLabel2" ); |
87 | TextLabel2->setText( tr( "File Systems" ) ); | 88 | TextLabel2->setText( tr( "File Systems" ) ); |
88 | 89 | ||
89 | tabLayout->addMultiCellWidget( TextLabel2, 4, 4, 0, 1 ); | 90 | tabLayout->addMultiCellWidget( TextLabel2, 4, 4, 0, 0 ); |
90 | 91 | ||
91 | fileSystemsCombo = new QComboBox( FALSE, tab, "fileSystemsCombo" ); | 92 | fileSystemsCombo = new QComboBox( FALSE, tab, "fileSystemsCombo" ); |
93 | fileSystemsCombo->setMaximumWidth(220); | ||
92 | 94 | ||
93 | tabLayout->addMultiCellWidget( fileSystemsCombo, 3, 3, 0, 1 ); | 95 | tabLayout->addMultiCellWidget( fileSystemsCombo, 3, 3, 0, 0 ); |
94 | QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); | 96 | QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Minimum ); |
95 | tabLayout->addItem( spacer, 2, 1 ); | 97 | tabLayout->addItem( spacer, 2, 0 ); |
96 | 98 | ||
97 | formatPushButton = new QPushButton( tab, "formatPushButton" ); | 99 | formatPushButton = new QPushButton( tab, "formatPushButton" ); |
98 | formatPushButton->setText( tr( "Format" ) ); | 100 | formatPushButton->setText( tr( "Format" ) ); |
101 | formatPushButton->setMaximumWidth(170); | ||
99 | 102 | ||
100 | tabLayout->addMultiCellWidget( formatPushButton, 6, 6, 0, 1 ); | 103 | tabLayout->addMultiCellWidget( formatPushButton, 6, 6, 0, 0 ); |
101 | QSpacerItem* spacer_2 = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); | 104 | QSpacerItem* spacer_2 = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Minimum ); |
102 | tabLayout->addItem( spacer_2, 5, 0 ); | 105 | tabLayout->addItem( spacer_2, 5, 0 ); |
103 | TabWidget->insertTab( tab, tr( "Main" ) ); | 106 | TabWidget->insertTab( tab, tr( "Main" ) ); |
@@ -105,14 +108,14 @@ FormatterApp::FormatterApp( QWidget* parent, const char* name, bool modal, WFla | |||
105 | tab_2 = new QWidget( TabWidget, "tab_2" ); | 108 | tab_2 = new QWidget( TabWidget, "tab_2" ); |
106 | tabLayout_2 = new QGridLayout( tab_2 ); | 109 | tabLayout_2 = new QGridLayout( tab_2 ); |
107 | tabLayout_2->setSpacing( 6); | 110 | tabLayout_2->setSpacing(3); |
108 | tabLayout_2->setMargin( 11); | 111 | tabLayout_2->setMargin(2); |
109 | 112 | ||
110 | mountPointLineEdit = new QLineEdit( tab_2, "mountPointLineEdit" ); | 113 | mountPointLineEdit = new QLineEdit( tab_2, "mountPointLineEdit" ); |
111 | 114 | ||
112 | tabLayout_2->addMultiCellWidget( mountPointLineEdit, 0, 0, 0, 1 ); | 115 | tabLayout_2->addMultiCellWidget( mountPointLineEdit, 0, 0, 0, 0 ); |
113 | 116 | ||
114 | deviceComboBox = new QComboBox( FALSE, tab_2, "deviceComboBox" ); | 117 | deviceComboBox = new QComboBox( FALSE, tab_2, "deviceComboBox" ); |
115 | 118 | ||
116 | tabLayout_2->addMultiCellWidget( deviceComboBox, 3, 3, 0, 1 ); | 119 | tabLayout_2->addMultiCellWidget( deviceComboBox, 3, 3, 0, 0 ); |
117 | 120 | ||
118 | TextLabel5 = new QLabel( tab_2, "TextLabel5" ); | 121 | TextLabel5 = new QLabel( tab_2, "TextLabel5" ); |
@@ -122,5 +125,5 @@ FormatterApp::FormatterApp( QWidget* parent, const char* name, bool modal, WFla | |||
122 | "to stop functioning properly!!" ) );//idiot message | 125 | "to stop functioning properly!!" ) );//idiot message |
123 | 126 | ||
124 | tabLayout_2->addMultiCellWidget( TextLabel5, 6, 6, 0, 1 ); | 127 | tabLayout_2->addMultiCellWidget( TextLabel5, 6, 6, 0, 0 ); |
125 | 128 | ||
126 | editPushButton = new QPushButton( tab_2, "editPushButton" ); | 129 | editPushButton = new QPushButton( tab_2, "editPushButton" ); |
@@ -132,10 +135,10 @@ FormatterApp::FormatterApp( QWidget* parent, const char* name, bool modal, WFla | |||
132 | fsckButton->setText( tr( "Check Disk" ) ); | 135 | fsckButton->setText( tr( "Check Disk" ) ); |
133 | 136 | ||
134 | tabLayout_2->addMultiCellWidget( fsckButton, 7, 7, 1, 1 ); | 137 | tabLayout_2->addMultiCellWidget( fsckButton, 7, 7, 1, 0 ); |
135 | 138 | ||
136 | TextLabel3 = new QLabel( tab_2, "TextLabel3" ); | 139 | TextLabel3 = new QLabel( tab_2, "TextLabel3" ); |
137 | TextLabel3->setText( tr( "Device" ) ); | 140 | TextLabel3->setText( tr( "Device" ) ); |
138 | 141 | ||
139 | tabLayout_2->addMultiCellWidget( TextLabel3, 4, 4, 0, 1 ); | 142 | tabLayout_2->addMultiCellWidget( TextLabel3, 4, 4, 0, 0 ); |
140 | QSpacerItem* spacer_3 = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); | 143 | QSpacerItem* spacer_3 = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); |
141 | tabLayout_2->addItem( spacer_3, 5, 0 ); | 144 | tabLayout_2->addItem( spacer_3, 5, 0 ); |
@@ -144,5 +147,5 @@ FormatterApp::FormatterApp( QWidget* parent, const char* name, bool modal, WFla | |||
144 | TextLabel1->setText( tr( "Mount Point" ) ); | 147 | TextLabel1->setText( tr( "Mount Point" ) ); |
145 | 148 | ||
146 | tabLayout_2->addMultiCellWidget( TextLabel1, 1, 1, 0, 1 ); | 149 | tabLayout_2->addMultiCellWidget( TextLabel1, 1, 1, 0, 0 ); |
147 | QSpacerItem* spacer_4 = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); | 150 | QSpacerItem* spacer_4 = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); |
148 | tabLayout_2->addItem( spacer_4, 2, 1 ); | 151 | tabLayout_2->addItem( spacer_4, 2, 1 ); |
@@ -163,10 +166,5 @@ FormatterApp::FormatterApp( QWidget* parent, const char* name, bool modal, WFla | |||
163 | } | 166 | } |
164 | 167 | ||
165 | /* | 168 | FormatterApp::~FormatterApp() { |
166 | * Destroys the object and frees any allocated resources | ||
167 | frickin no duh?!? | ||
168 | */ | ||
169 | FormatterApp::~FormatterApp() | ||
170 | { | ||
171 | 169 | ||
172 | } | 170 | } |
@@ -392,5 +390,5 @@ void FormatterApp::deviceComboSelected(int index) { | |||
392 | fsType = getFileSystemType((const QString &)selectedText); | 390 | fsType = getFileSystemType((const QString &)selectedText); |
393 | 391 | ||
394 | TextLabel5->setText("Type: "+ nameS+" Formatted with "+ fsType + " \n" + totalS + usedS + avS); | 392 | TextLabel5->setText("Type: "+ nameS+"\nFormatted with "+ fsType + " \n" + totalS + usedS + avS); |
395 | // storageComboSelected(0); | 393 | // storageComboSelected(0); |
396 | } | 394 | } |