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

Commit

Permalink
Version 6.1
Browse files Browse the repository at this point in the history
  • Loading branch information
ETCG committed Oct 24, 2016
1 parent c04f8c6 commit 4ae51ee
Show file tree
Hide file tree
Showing 8 changed files with 38 additions and 8 deletions.
6 changes: 2 additions & 4 deletions Bootable Drive Maker.app/Contents/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,12 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleGetInfoString</key>
<string>Created by Qt/QMake</string>
<string>Bootable Drive Maker</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleExecutable</key>
<string>BootableDriveMaker</string>
<key>CFBundleIdentifier</key>
<string>com.yourcompany.BootableDriveMaker</string>
<key>NOTE</key>
<string>This file was generated by Qt/QMake.</string>
<string>com.ETCG.BootableDriveMaker</string>
</dict>
</plist>
Binary file modified Bootable Drive Maker.app/Contents/MacOS/BootableDriveMaker
Binary file not shown.
7 changes: 6 additions & 1 deletion Bootable Drive Maker.app/Contents/MacOS/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,12 @@ fileExt=${copyFile##*.}
#############
echo "Copying..." > currStep.txt
echo "Copying File To Needed Location..." >> cmdOut.txt 2>&1
cp "$copyFile" "file.$fileExt"
if [ "$fileExt" == "iso" ]
then
cp "$copyFile" "file.iso"
else
cp "$copyFile" "file.img.dmg"
fi
if [ "$?" != "0" ]
then
exitValue=$?
Expand Down
Binary file modified BootableDriveMaker.dmg
Binary file not shown.
7 changes: 7 additions & 0 deletions source/mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,11 @@ void MainWindow::on_openIMG_clicked() {
if (filePath != "") osPath = filePath;
ui->pathReadOut->setText(osPath);
}
void MainWindow::on_openDMG_clicked() {
QString filePath = QFileDialog::getOpenFileName(this,tr("Select An Operating System File"),QDir::homePath() + "/Downloads","DMG (*.dmg)");
if (filePath != "") osPath = filePath;
ui->pathReadOut->setText(osPath);
}
void MainWindow::on_startStop_clicked() {
//Run starting checks
if (hasStarted) {
Expand Down Expand Up @@ -102,6 +107,7 @@ void MainWindow::on_startStop_clicked() {
ui->devID->setEnabled(false);
ui->openISO->setEnabled(false);
ui->openIMG->setEnabled(false);
ui->openDMG->setEnabled(false);
ui->downloadOS->setEnabled(false);
ui->osSelector->setEnabled(false);
ui->allowNonExtern->setEnabled(false);
Expand Down Expand Up @@ -243,6 +249,7 @@ void MainWindow::on_downloadOS_clicked() {
void MainWindow::on_allowNonExtern_clicked() { on_refreshDevs_clicked(); }
void MainWindow::on_actionSelectISO_triggered() { if(!hasStarted) on_openISO_clicked(); }
void MainWindow::on_actionSelectIMG_triggered() { if(!hasStarted) on_openIMG_clicked(); }
void MainWindow::on_actionSelectDMG_triggered() { if(!hasStarted) on_openDMG_clicked(); }
void MainWindow::on_actionContact_triggered() { QMessageBox::about(this,"Contact","Email: contact@etcg.pw\nWebsite: http://www.etcg.pw"); }
void MainWindow::on_actionCopyright_triggered() {
QFile copyNotice("../Resources/copyrightNotice.txt"),
Expand Down
6 changes: 4 additions & 2 deletions source/mainwindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,14 @@ private slots:
void on_startStop_clicked();
void autoScroll();
void on_refreshDevs_clicked();
void on_openISO_clicked();
void on_openIMG_clicked();
void on_downloadOS_clicked();
void on_allowNonExtern_clicked();
void on_openISO_clicked();
void on_openIMG_clicked();
void on_openDMG_clicked();
void on_actionSelectISO_triggered();
void on_actionSelectIMG_triggered();
void on_actionSelectDMG_triggered();
void on_actionContact_triggered();
void on_actionCopyright_triggered();
void on_actionREADME_triggered();
Expand Down
13 changes: 13 additions & 0 deletions source/mainwindow.ui
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,13 @@
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="openDMG">
<property name="text">
<string>Select A DMG</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
Expand Down Expand Up @@ -238,6 +245,7 @@
</property>
<addaction name="actionSelectISO"/>
<addaction name="actionSelectIMG"/>
<addaction name="actionSelectDMG"/>
<addaction name="actionREADME"/>
<addaction name="actionContact"/>
<addaction name="actionCopyright"/>
Expand Down Expand Up @@ -272,6 +280,11 @@
<string>Open README</string>
</property>
</action>
<action name="actionSelectDMG">
<property name="text">
<string>Select A DMG</string>
</property>
</action>
</widget>
<layoutdefault spacing="6" margin="11"/>
<resources/>
Expand Down
7 changes: 6 additions & 1 deletion source/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,12 @@ fileExt=${copyFile##*.}
#############
echo "Copying..." > currStep.txt
echo "Copying File To Needed Location..." >> cmdOut.txt 2>&1
cp "$copyFile" "file.$fileExt"
if [ "$fileExt" == "iso" ]
then
cp "$copyFile" "file.iso"
else
cp "$copyFile" "file.img.dmg"
fi
if [ "$?" != "0" ]
then
exitValue=$?
Expand Down

0 comments on commit 4ae51ee

Please sign in to comment.