Skip to content
This repository was archived by the owner on Mar 14, 2020. It is now read-only.

Commit 4ae51ee

Browse files
author
ETCG
committed
Version 6.1
1 parent c04f8c6 commit 4ae51ee

File tree

8 files changed

+38
-8
lines changed

8 files changed

+38
-8
lines changed

Bootable Drive Maker.app/Contents/Info.plist

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,12 @@
99
<key>CFBundlePackageType</key>
1010
<string>APPL</string>
1111
<key>CFBundleGetInfoString</key>
12-
<string>Created by Qt/QMake</string>
12+
<string>Bootable Drive Maker</string>
1313
<key>CFBundleSignature</key>
1414
<string>????</string>
1515
<key>CFBundleExecutable</key>
1616
<string>BootableDriveMaker</string>
1717
<key>CFBundleIdentifier</key>
18-
<string>com.yourcompany.BootableDriveMaker</string>
19-
<key>NOTE</key>
20-
<string>This file was generated by Qt/QMake.</string>
18+
<string>com.ETCG.BootableDriveMaker</string>
2119
</dict>
2220
</plist>
4.59 KB
Binary file not shown.

Bootable Drive Maker.app/Contents/MacOS/run.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,12 @@ fileExt=${copyFile##*.}
1212
#############
1313
echo "Copying..." > currStep.txt
1414
echo "Copying File To Needed Location..." >> cmdOut.txt 2>&1
15-
cp "$copyFile" "file.$fileExt"
15+
if [ "$fileExt" == "iso" ]
16+
then
17+
cp "$copyFile" "file.iso"
18+
else
19+
cp "$copyFile" "file.img.dmg"
20+
fi
1621
if [ "$?" != "0" ]
1722
then
1823
exitValue=$?

BootableDriveMaker.dmg

22.2 KB
Binary file not shown.

source/mainwindow.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,11 @@ void MainWindow::on_openIMG_clicked() {
7575
if (filePath != "") osPath = filePath;
7676
ui->pathReadOut->setText(osPath);
7777
}
78+
void MainWindow::on_openDMG_clicked() {
79+
QString filePath = QFileDialog::getOpenFileName(this,tr("Select An Operating System File"),QDir::homePath() + "/Downloads","DMG (*.dmg)");
80+
if (filePath != "") osPath = filePath;
81+
ui->pathReadOut->setText(osPath);
82+
}
7883
void MainWindow::on_startStop_clicked() {
7984
//Run starting checks
8085
if (hasStarted) {
@@ -102,6 +107,7 @@ void MainWindow::on_startStop_clicked() {
102107
ui->devID->setEnabled(false);
103108
ui->openISO->setEnabled(false);
104109
ui->openIMG->setEnabled(false);
110+
ui->openDMG->setEnabled(false);
105111
ui->downloadOS->setEnabled(false);
106112
ui->osSelector->setEnabled(false);
107113
ui->allowNonExtern->setEnabled(false);
@@ -243,6 +249,7 @@ void MainWindow::on_downloadOS_clicked() {
243249
void MainWindow::on_allowNonExtern_clicked() { on_refreshDevs_clicked(); }
244250
void MainWindow::on_actionSelectISO_triggered() { if(!hasStarted) on_openISO_clicked(); }
245251
void MainWindow::on_actionSelectIMG_triggered() { if(!hasStarted) on_openIMG_clicked(); }
252+
void MainWindow::on_actionSelectDMG_triggered() { if(!hasStarted) on_openDMG_clicked(); }
246253
void MainWindow::on_actionContact_triggered() { QMessageBox::about(this,"Contact","Email: contact@etcg.pw\nWebsite: http://www.etcg.pw"); }
247254
void MainWindow::on_actionCopyright_triggered() {
248255
QFile copyNotice("../Resources/copyrightNotice.txt"),

source/mainwindow.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,14 @@ private slots:
2525
void on_startStop_clicked();
2626
void autoScroll();
2727
void on_refreshDevs_clicked();
28-
void on_openISO_clicked();
29-
void on_openIMG_clicked();
3028
void on_downloadOS_clicked();
3129
void on_allowNonExtern_clicked();
30+
void on_openISO_clicked();
31+
void on_openIMG_clicked();
32+
void on_openDMG_clicked();
3233
void on_actionSelectISO_triggered();
3334
void on_actionSelectIMG_triggered();
35+
void on_actionSelectDMG_triggered();
3436
void on_actionContact_triggered();
3537
void on_actionCopyright_triggered();
3638
void on_actionREADME_triggered();

source/mainwindow.ui

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,13 @@
102102
</property>
103103
</widget>
104104
</item>
105+
<item>
106+
<widget class="QPushButton" name="openDMG">
107+
<property name="text">
108+
<string>Select A DMG</string>
109+
</property>
110+
</widget>
111+
</item>
105112
</layout>
106113
</item>
107114
<item>
@@ -238,6 +245,7 @@
238245
</property>
239246
<addaction name="actionSelectISO"/>
240247
<addaction name="actionSelectIMG"/>
248+
<addaction name="actionSelectDMG"/>
241249
<addaction name="actionREADME"/>
242250
<addaction name="actionContact"/>
243251
<addaction name="actionCopyright"/>
@@ -272,6 +280,11 @@
272280
<string>Open README</string>
273281
</property>
274282
</action>
283+
<action name="actionSelectDMG">
284+
<property name="text">
285+
<string>Select A DMG</string>
286+
</property>
287+
</action>
275288
</widget>
276289
<layoutdefault spacing="6" margin="11"/>
277290
<resources/>

source/run.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,12 @@ fileExt=${copyFile##*.}
1212
#############
1313
echo "Copying..." > currStep.txt
1414
echo "Copying File To Needed Location..." >> cmdOut.txt 2>&1
15-
cp "$copyFile" "file.$fileExt"
15+
if [ "$fileExt" == "iso" ]
16+
then
17+
cp "$copyFile" "file.iso"
18+
else
19+
cp "$copyFile" "file.img.dmg"
20+
fi
1621
if [ "$?" != "0" ]
1722
then
1823
exitValue=$?

0 commit comments

Comments
 (0)