diff --git a/buckshot/buckshot.pro b/buckshot/buckshot.pro
index f81f020..0137ee7 100644
--- a/buckshot/buckshot.pro
+++ b/buckshot/buckshot.pro
@@ -26,5 +26,8 @@ HEADERS += mainwindow.h
FORMS += mainwindow.ui
-DISTFILES += \
- ../b2d
+#@todo: integrate
+#DISTFILES += \
+# ../b2d
+
+QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8
diff --git a/buckshot/buckshot.pro.user b/buckshot/buckshot.pro.user
index 1735e71..161c625 100644
--- a/buckshot/buckshot.pro.user
+++ b/buckshot/buckshot.pro.user
@@ -1,10 +1,10 @@
-
+
EnvironmentId
- {30a1729f-a912-4116-992a-f04331cbb1d0}
+ {23d26f48-d306-494e-9a6a-e70e7fc9f87a}
ProjectExplorer.Project.ActiveTarget
@@ -57,29 +57,22 @@
true
- false
-
-
-
- true
ProjectExplorer.Project.Target.0
- Desktop Qt 5.12.0 clang 64bit
- Desktop Qt 5.12.0 clang 64bit
- qt.qt5.5120.clang_64_kit
+ Desktop Qt 5.12.5 clang 64bit
+ Desktop Qt 5.12.5 clang 64bit
+ qt.qt5.5125.clang_64_kit
0
0
0
- /Users/dbrock/Google Drive/appleiigs/buckshot/build-buckshot-Desktop_Qt_5_12_0_clang_64bit-Debug
+ /Users/dbrock/Google Drive/appleiigs/buckshot/build-buckshot-Desktop_Qt_5_12_5_clang_64bit-Debug
true
- qmake
-
QtProjectManager.QMakeBuildStep
true
@@ -89,8 +82,6 @@
true
- Make
-
Qt4ProjectManager.MakeStep
false
@@ -100,14 +91,12 @@
2
Build
-
+ Build
ProjectExplorer.BuildSteps.Build
true
- Make
-
Qt4ProjectManager.MakeStep
true
@@ -117,25 +106,21 @@
1
Clean
-
+ Clean
ProjectExplorer.BuildSteps.Clean
2
false
- Debug
Debug
Qt4ProjectManager.Qt4BuildConfiguration
2
- true
- /Users/dbrock/Google Drive/appleiigs/buckshot/build-buckshot-Desktop_Qt_5_12_0_clang_64bit-Release
+ /Users/dbrock/Google Drive/appleiigs/buckshot/build-buckshot-Desktop_Qt_5_12_5_clang_64bit-Release
true
- qmake
-
QtProjectManager.QMakeBuildStep
false
@@ -145,8 +130,6 @@
true
- Make
-
Qt4ProjectManager.MakeStep
false
@@ -156,14 +139,12 @@
2
Build
-
+ Build
ProjectExplorer.BuildSteps.Build
true
- Make
-
Qt4ProjectManager.MakeStep
true
@@ -173,25 +154,21 @@
1
Clean
-
+ Clean
ProjectExplorer.BuildSteps.Clean
2
false
- Release
Release
Qt4ProjectManager.Qt4BuildConfiguration
0
- true
- /Users/dbrock/Google Drive/appleiigs/buckshot/build-buckshot-Desktop_Qt_5_12_0_clang_64bit-Profile
+ /Users/dbrock/Google Drive/appleiigs/buckshot/build-buckshot-Desktop_Qt_5_12_5_clang_64bit-Profile
true
- qmake
-
QtProjectManager.QMakeBuildStep
true
@@ -201,8 +178,6 @@
true
- Make
-
Qt4ProjectManager.MakeStep
false
@@ -212,14 +187,12 @@
2
Build
-
+ Build
ProjectExplorer.BuildSteps.Build
true
- Make
-
Qt4ProjectManager.MakeStep
true
@@ -229,34 +202,47 @@
1
Clean
-
+ Clean
ProjectExplorer.BuildSteps.Clean
2
false
- Profile
Profile
Qt4ProjectManager.Qt4BuildConfiguration
0
- true
3
0
Deploy
-
+ Deploy
ProjectExplorer.BuildSteps.Deploy
1
- Deploy Configuration
-
ProjectExplorer.DefaultDeployConfiguration
1
+ dwarf
+
+ cpu-cycles
+
+
+ 250
+
+ -e
+ cpu-cycles
+ --call-graph
+ dwarf,4096
+ -F
+ 250
+
+ -F
+ true
+ 4096
false
false
1000
@@ -271,6 +257,7 @@
0.01
10
true
+ kcachegrind
1
25
@@ -298,12 +285,11 @@
2
- buckshot
-
Qt4ProjectManager.Qt4RunConfiguration:/Users/dbrock/Google Drive/appleiigs/buckshot/buckshot/buckshot.pro
- buckshot.pro
+ /Users/dbrock/Google Drive/appleiigs/buckshot/buckshot/buckshot.pro
- 3768
+ false
+
false
true
false
@@ -312,7 +298,7 @@
false
true
- /Users/dbrock/Google Drive/appleiigs/buckshot/build-buckshot-Desktop_Qt_5_12_0_clang_64bit-Debug/buckshot.app/Contents/MacOS
+ /Users/dbrock/Google Drive/appleiigs/buckshot/build-buckshot-Desktop_Qt_5_12_5_clang_64bit-Debug/buckshot.app/Contents/MacOS
1
@@ -323,10 +309,10 @@
ProjectExplorer.Project.Updater.FileVersion
- 20
+ 22
Version
- 20
+ 22
diff --git a/buckshot/mainwindow.cpp b/buckshot/mainwindow.cpp
index 1b83bb3..4f5bf0c 100644
--- a/buckshot/mainwindow.cpp
+++ b/buckshot/mainwindow.cpp
@@ -9,7 +9,7 @@
#include "qformlayout.h"
#include "qdialogbuttonbox.h"
const QString MainWindow::programName = QString("buckshot");
-const QString MainWindow::version = QString("0.04");
+const QString MainWindow::version = QString("0.05");
const QString MainWindow::imageName = QString("saved");
MainWindow::MainWindow(QWidget *parent) :
@@ -93,6 +93,8 @@ MainWindow::MainWindow(QWidget *parent) :
updateNeeded = false;
previewTimer = new QTimer(this);
connect(previewTimer, SIGNAL(timeout()), this, SLOT(previewTimerTimeout()));
+ // decided to enable by checking in the form and calling this.
+ on_checkBox_livePreview_stateChanged(1);
}
@@ -292,9 +294,6 @@ void MainWindow::on_pushButton_preview_clicked()
break;
}
- QString tempDir = "/tmp";
-
-
QString converterPath = "/Users/dbrock/appleiigs/grlib/b2d";
converterPath = QString("%1/b2d").arg(QCoreApplication::applicationDirPath());
@@ -302,6 +301,9 @@ void MainWindow::on_pushButton_preview_clicked()
QStringList args;
args << inputImgPath; // "/tmp/saved.bmp"
args << outputFormat;
+ if (outputFormat == "DL" || outputFormat == "L") {
+ args << "N";
+ }
if (ui->horizontalSlider_crossHatch->value() > 0) {
QString crossHatchArg = QString("Z%1").arg(ui->horizontalSlider_crossHatch->value());
@@ -424,7 +426,7 @@ void MainWindow::on_actionWhat_is_this_triggered()
"Once you are satisfied with your conversion settings, click \"Save Image File\" to save in one of the Apple ][ image formats based on the display mode. "
"If you want to save that image file directly to a ProDOS volume, that is now supported via the \"Save To ProDOS\" function!\n\n"
"Then you can load it up in your favorite emulator, or transfer it to real disks/flash storage to view on glorious vintage hardware.\n\n"
- "(c)2016-2019 Dagen Brock *\n\n\n * bmp2dhr is by Bill Buckels and CADIUS is by Brutal Deluxe.");
+ "(c)2016-2020 Dagen Brock *\n\n\n * bmp2dhr is by Bill Buckels and CADIUS is by Brutal Deluxe.");
msgBox.exec();
}
diff --git a/buckshot/mainwindow.ui b/buckshot/mainwindow.ui
index c4d4950..c40411e 100644
--- a/buckshot/mainwindow.ui
+++ b/buckshot/mainwindow.ui
@@ -6,10 +6,16 @@
0
0
- 671
- 576
+ 712
+ 628
+
+
+ 0
+ 0
+
+
MainWindow
@@ -18,7 +24,7 @@
20
- 40
+ 46
311
211
@@ -46,7 +52,7 @@
- 362
+ 380
40
301
221
@@ -101,8 +107,8 @@
- 310
- 385
+ 330
+ 390
31
16
@@ -114,8 +120,8 @@
- 310
- 415
+ 330
+ 420
31
16
@@ -127,8 +133,8 @@
- 380
- 265
+ 390
+ 271
101
30
@@ -136,13 +142,16 @@
Live Preview
+
+ true
+
- 147
- 415
- 161
+ 149
+ 421
+ 171
22
@@ -153,8 +162,8 @@
- 10
- 265
+ 12
+ 271
134
20
@@ -169,9 +178,9 @@
- 147
- 265
- 191
+ 149
+ 271
+ 211
26
@@ -179,8 +188,8 @@
- 0
- 415
+ 2
+ 421
140
16
@@ -195,8 +204,8 @@
- 101
- 355
+ 103
+ 361
37
16
@@ -211,8 +220,8 @@
- 0
- 385
+ 2
+ 391
140
16
@@ -227,14 +236,14 @@
- 28
- 295
+ 30
+ 301
114
16
- Source Resolution:
+ Source Resolution
Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
@@ -243,9 +252,9 @@
- 147
- 325
- 191
+ 149
+ 331
+ 211
26
@@ -253,9 +262,9 @@
- 147
- 385
- 161
+ 149
+ 391
+ 171
22
@@ -269,8 +278,8 @@
- 155
- 295
+ 157
+ 301
161
16
@@ -282,8 +291,8 @@
- 21
- 325
+ 23
+ 331
121
20
@@ -298,8 +307,8 @@
- 155
- 355
+ 157
+ 361
171
16
@@ -311,10 +320,10 @@
- 360
- 370
- 291
- 71
+ 10
+ 510
+ 691
+ 41
@@ -329,8 +338,8 @@
- 370
- 480
+ 390
+ 430
141
32
@@ -342,10 +351,10 @@
- 340
- 270
+ 360
+ 280
20
- 201
+ 211
@@ -355,8 +364,8 @@
- 510
- 480
+ 530
+ 430
141
32
@@ -368,8 +377,8 @@
- 20
- 445
+ 22
+ 451
121
20
@@ -384,9 +393,9 @@
- 147
- 445
- 191
+ 149
+ 451
+ 211
26
@@ -394,8 +403,8 @@
- 360
- 340
+ 520
+ 330
131
21
@@ -404,14 +413,14 @@
- 390
- 295
+ 410
+ 300
101
20
- Preview Palette:
+ Preview Palette
Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
@@ -420,8 +429,8 @@
- 500
- 295
+ 510
+ 301
161
26
@@ -430,8 +439,8 @@
- 490
- 340
+ 370
+ 330
141
20
@@ -442,7 +451,7 @@
- <- additional arguments
+ Additional arguments
Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
@@ -451,21 +460,21 @@
- 500
- 265
+ 510
+ 271
161
32
- Preview
+ Manual Preview
- 370
- 450
+ 390
+ 400
281
32
@@ -480,7 +489,7 @@
0
0
- 671
+ 712
22
diff --git a/make_dist_linux.sh b/make_dist_linux.sh
old mode 100755
new mode 100644
diff --git a/make_dist_mac.sh b/make_dist_mac.sh
index 42fe4b1..2ba28d8 100755
--- a/make_dist_mac.sh
+++ b/make_dist_mac.sh
@@ -29,7 +29,7 @@ cp README.md $DEXTRAS/README.txt
cp LICENSE.txt $DEXTRAS
# COPY BINARIES FROM EXTERNAL PROJECTS
-cp ../b2d $DDIR/Contents/MacOS
-cp ../tools/Cadius $DDIR/Contents/MacOS
+cp ../buckshot-bins/mac/b2d $DDIR/Contents/MacOS
+cp ../buckshot-bins/mac/cadius $DDIR/Contents/MacOS
# packaging now in DMG script
diff --git a/platform/linux/buckshot.sh b/platform/linux/buckshot.sh
old mode 100755
new mode 100644