diff --git a/buckshot/assets.qrc b/buckshot/assets.qrc
new file mode 100644
index 0000000..6147c49
--- /dev/null
+++ b/buckshot/assets.qrc
@@ -0,0 +1,7 @@
+
+
+ resources/binary.png
+ resources/disk.png
+ resources/image.png
+
+
diff --git a/buckshot/buckshot.pro b/buckshot/buckshot.pro
index 0137ee7..8fbe2c4 100644
--- a/buckshot/buckshot.pro
+++ b/buckshot/buckshot.pro
@@ -31,3 +31,6 @@ FORMS += mainwindow.ui
# ../b2d
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8
+
+RESOURCES += \
+ assets.qrc
diff --git a/buckshot/buckshot.pro.user b/buckshot/buckshot.pro.user
index 5f716be..f1be99f 100644
--- a/buckshot/buckshot.pro.user
+++ b/buckshot/buckshot.pro.user
@@ -1,10 +1,10 @@
-
+
EnvironmentId
- {10167945-6a86-4b2a-b68a-43769891377a}
+ {23d26f48-d306-494e-9a6a-e70e7fc9f87a}
ProjectExplorer.Project.ActiveTarget
@@ -55,30 +55,28 @@
ProjectExplorer.Project.PluginSettings
-
- -fno-delayed-template-parsing
-
+
true
ProjectExplorer.Project.Target.0
- Desktop Qt 5.12.6 MinGW 32-bit
- Desktop Qt 5.12.6 MinGW 32-bit
- qt.qt5.5126.win32_mingw73_kit
- 1
+ Desktop Qt 5.12.5 clang 64bit
+ Desktop Qt 5.12.5 clang 64bit
+ qt.qt5.5125.clang_64_kit
+ 0
0
0
- C:/Users/builder/Documents/GitHub/buckshot/build-buckshot-Desktop_Qt_5_12_6_MinGW_32_bit-Debug
+ /Users/dbrock/Google Drive/appleiigs/buckshot/build-buckshot-Desktop_Qt_5_12_5_clang_64bit-Debug
true
QtProjectManager.QMakeBuildStep
true
- true
+ false
false
false
@@ -119,7 +117,7 @@
2
- C:/Users/builder/Documents/GitHub/buckshot/build-buckshot-Desktop_Qt_5_12_6_MinGW_32_bit-Release
+ /Users/dbrock/Google Drive/appleiigs/buckshot/build-buckshot-Desktop_Qt_5_12_5_clang_64bit-Release
true
@@ -167,7 +165,7 @@
0
- C:/Users/builder/Documents/GitHub/buckshot/build-buckshot-Desktop_Qt_5_12_6_MinGW_32_bit-Profile
+ /Users/dbrock/Google Drive/appleiigs/buckshot/build-buckshot-Desktop_Qt_5_12_5_clang_64bit-Profile
true
@@ -287,269 +285,27 @@
2
- Qt4ProjectManager.Qt4RunConfiguration:C:/Users/builder/Documents/GitHub/buckshot/buckshot/buckshot.pro
- C:/Users/builder/Documents/GitHub/buckshot/buckshot/buckshot.pro
+ Qt4ProjectManager.Qt4RunConfiguration:/Users/dbrock/Google Drive/appleiigs/buckshot/buckshot/buckshot.pro
+ /Users/dbrock/Google Drive/appleiigs/buckshot/buckshot/buckshot.pro
false
false
true
+ false
true
false
false
true
- C:/Users/builder/Documents/GitHub/buckshot/build-buckshot-Desktop_Qt_5_12_6_MinGW_32_bit-Release
-
- 1
-
-
-
- ProjectExplorer.Project.Target.1
-
- Desktop Qt 5.12.6 MinGW 64-bit
- Desktop Qt 5.12.6 MinGW 64-bit
- qt.qt5.5126.win64_mingw73_kit
- 0
- 0
- 0
-
- C:/Users/builder/Documents/GitHub/buckshot/build-buckshot-Desktop_Qt_5_12_6_MinGW_64_bit-Debug
-
-
- true
- QtProjectManager.QMakeBuildStep
- true
-
- false
- false
- false
-
-
- true
- Qt4ProjectManager.MakeStep
-
- false
-
-
- false
-
- 2
- Build
- Build
- ProjectExplorer.BuildSteps.Build
-
-
-
- true
- Qt4ProjectManager.MakeStep
-
- true
- clean
-
- false
-
- 1
- Clean
- Clean
- ProjectExplorer.BuildSteps.Clean
-
- 2
- false
-
- Debug
- Qt4ProjectManager.Qt4BuildConfiguration
- 2
-
-
- C:/Users/builder/Documents/GitHub/buckshot/build-buckshot-Desktop_Qt_5_12_6_MinGW_64_bit-Release
-
-
- true
- QtProjectManager.QMakeBuildStep
- false
-
- false
- false
- true
-
-
- true
- Qt4ProjectManager.MakeStep
-
- false
-
-
- false
-
- 2
- Build
- Build
- ProjectExplorer.BuildSteps.Build
-
-
-
- true
- Qt4ProjectManager.MakeStep
-
- true
- clean
-
- false
-
- 1
- Clean
- Clean
- ProjectExplorer.BuildSteps.Clean
-
- 2
- false
-
- Release
- Qt4ProjectManager.Qt4BuildConfiguration
- 0
-
-
- C:/Users/builder/Documents/GitHub/buckshot/build-buckshot-Desktop_Qt_5_12_6_MinGW_64_bit-Profile
-
-
- true
- QtProjectManager.QMakeBuildStep
- true
-
- false
- true
- true
-
-
- true
- Qt4ProjectManager.MakeStep
-
- false
-
-
- false
-
- 2
- Build
- Build
- ProjectExplorer.BuildSteps.Build
-
-
-
- true
- Qt4ProjectManager.MakeStep
-
- true
- clean
-
- false
-
- 1
- Clean
- Clean
- ProjectExplorer.BuildSteps.Clean
-
- 2
- false
-
- Profile
- Qt4ProjectManager.Qt4BuildConfiguration
- 0
-
- 3
-
-
- 0
- Deploy
- Deploy
- ProjectExplorer.BuildSteps.Deploy
-
- 1
- ProjectExplorer.DefaultDeployConfiguration
-
- 1
-
-
- dwarf
-
- cpu-cycles
-
-
- 250
-
- -e
- cpu-cycles
- --call-graph
- dwarf,4096
- -F
- 250
-
- -F
- true
- 4096
- false
- false
- 1000
-
- true
-
- false
- false
- false
- false
- true
- 0.01
- 10
- true
- kcachegrind
- 1
- 25
-
- 1
- true
- false
- true
- valgrind
-
- 0
- 1
- 2
- 3
- 4
- 5
- 6
- 7
- 8
- 9
- 10
- 11
- 12
- 13
- 14
-
- 2
-
-
- ProjectExplorer.CustomExecutableRunConfiguration
-
-
- false
-
- false
- true
- false
- false
- true
-
-
+ /Users/dbrock/Google Drive/appleiigs/buckshot/build-buckshot-Desktop_Qt_5_12_5_clang_64bit-Debug/buckshot.app/Contents/MacOS
1
ProjectExplorer.Project.TargetCount
- 2
+ 1
ProjectExplorer.Project.Updater.FileVersion
diff --git a/buckshot/mainwindow.ui b/buckshot/mainwindow.ui
index 3f4f166..19b3694 100644
--- a/buckshot/mainwindow.ui
+++ b/buckshot/mainwindow.ui
@@ -6,8 +6,8 @@
0
0
- 712
- 628
+ 682
+ 612
@@ -23,10 +23,10 @@
- 20
- 46
+ 30
+ 34
311
- 211
+ 220
@@ -52,10 +52,10 @@
- 380
- 40
+ 364
+ 34
301
- 221
+ 220
@@ -65,7 +65,7 @@
11
- 24
+ 20
280
192
@@ -108,8 +108,8 @@
10
- 510
- 691
+ 540
+ 661
41
@@ -122,222 +122,104 @@
This box shows the last conversion command run.
-
+
- 360
- 280
- 20
- 211
+ 20
+ 290
+ 321
+ 231
-
- Qt::Vertical
-
-
-
-
-
- 390
- 271
- 291
- 221
-
-
-
- -
-
-
-
-
-
- Live Preview
-
-
- true
-
-
-
- -
-
-
- Manual Preview
-
-
-
-
-
- -
-
-
-
-
-
- Preview Palette
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
-
-
- -
-
-
-
-
-
- Additional arguments
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
+
+
+ QFormLayout::AllNonFixedFieldsGrow
+
+
+ -1
+
+
+ -1
+
+
-
+
- Save preview as PNG/BMP
+ Apple ][ Display Mode
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
- -
-
-
-
-
-
- Save Binary Image
-
-
-
- -
-
-
- Save to ProDOS
-
-
-
-
+ -
+
+
+
+ 1
+ 0
+
+
+
-
-
-
-
-
- 22
- 271
- 331
- 221
-
-
-
- -
-
-
-
-
-
- Apple ][ Display Mode
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
-
+ -
+
+
+ Source Resolution
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
- -
-
-
-
-
-
- Source Resolution
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
- 10x10
-
-
-
-
+ -
+
+
+ 10x10
+
+
- -
-
-
-
-
-
- Scale to Resolution
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
-
+ -
+
+
+ Scale to Resolution
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
- -
-
-
-
-
-
- Scale
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
- 1
-
-
-
-
+ -
+
- -
+
-
+
+
+ Scale
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+ 1
+
+
+
+ -
+
+
+ Crosshatch Threshold
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
-
-
-
-
- Crosshatch Threshold
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
-
@@ -357,18 +239,18 @@
- -
+
-
+
+
+ Color Bleed Reduction
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
-
-
-
-
- Color Bleed Reduction
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
-
@@ -385,32 +267,244 @@
- -
-
-
-
-
-
- Dithering
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
-
+ -
+
+
+ Dithering
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+
+
+ 10
+ 260
+ 341
+ 271
+
+
+
+ QFrame::StyledPanel
+
+
+ QFrame::Raised
+
+
+
+
+ 100
+ 0
+ 121
+ 26
+
+
+
+
+ 11
+
+
+
+ Conversion Settings
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+
+
+
+ 360
+ 260
+ 311
+ 271
+
+
+
+ QFrame::StyledPanel
+
+
+ QFrame::Raised
+
+
+
+
+ 10
+ 10
+ 291
+ 101
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Manual Preview
+
+
+
+ -
+
+
+ Preview Palette
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+ -
+
+
+ Additional arguments
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ -
+
+
+ Live Preview
+
+
+ true
+
+
+
+
+
+
+
+
+ 10
+ 120
+ 291
+ 148
+
+
+
+ -
+
+
+ Qt::RightToLeft
+
+
+ text-align:left;
+
+
+ Save preview as PNG/BMP
+
+
+
+ :/icons/resources/image.png:/icons/resources/image.png
+
+
+
+ 36
+ 32
+
+
+
+
+ -
+
+
+ Qt::RightToLeft
+
+
+ text-align:left;
+
+
+ Save output as local binary
+
+
+
+ :/icons/resources/binary.png:/icons/resources/binary.png
+
+
+
+ 36
+ 32
+
+
+
+
+ -
+
+
+ Qt::RightToLeft
+
+
+ text-align:left;
+
+
+ Save output on ProDOS image
+
+
+
+ :/icons/resources/disk.png:/icons/resources/disk.png
+
+
+
+ 36
+ 32
+
+
+
+
+
+
+
+ frame_2
+ frame
+ groupBox_source
+ groupBox_preview
+ horizontalLayoutWidget
+ plainTextEdit_lastCmd
+ formLayoutWidget
-
-
- TopToolBarArea
-
-
- false
-
-
-
What is this?
@@ -438,6 +523,8 @@
-
+
+
+
diff --git a/buckshot/resources/binary.png b/buckshot/resources/binary.png
new file mode 100644
index 0000000..537c1ab
Binary files /dev/null and b/buckshot/resources/binary.png differ
diff --git a/buckshot/resources/disk.png b/buckshot/resources/disk.png
new file mode 100644
index 0000000..a93f4f3
Binary files /dev/null and b/buckshot/resources/disk.png differ
diff --git a/buckshot/resources/image.png b/buckshot/resources/image.png
new file mode 100644
index 0000000..c68f50d
Binary files /dev/null and b/buckshot/resources/image.png differ