From 4bedea24cbe1a1b77ac76b67e3f6de35b71d253d Mon Sep 17 00:00:00 2001 From: Dagen Brock Date: Wed, 18 Dec 2019 07:40:35 -0800 Subject: [PATCH] Update layout --- buckshot/buckshot.pro.user | 276 ++++++++++++++++- buckshot/main.cpp | 2 + buckshot/mainwindow.ui | 603 ++++++++++++++++--------------------- 3 files changed, 524 insertions(+), 357 deletions(-) diff --git a/buckshot/buckshot.pro.user b/buckshot/buckshot.pro.user index 161c625..5f716be 100644 --- a/buckshot/buckshot.pro.user +++ b/buckshot/buckshot.pro.user @@ -1,10 +1,10 @@ - + EnvironmentId - {23d26f48-d306-494e-9a6a-e70e7fc9f87a} + {10167945-6a86-4b2a-b68a-43769891377a} ProjectExplorer.Project.ActiveTarget @@ -55,28 +55,30 @@ ProjectExplorer.Project.PluginSettings - + + -fno-delayed-template-parsing + true ProjectExplorer.Project.Target.0 - Desktop Qt 5.12.5 clang 64bit - Desktop Qt 5.12.5 clang 64bit - qt.qt5.5125.clang_64_kit - 0 + Desktop Qt 5.12.6 MinGW 32-bit + Desktop Qt 5.12.6 MinGW 32-bit + qt.qt5.5126.win32_mingw73_kit + 1 0 0 - /Users/dbrock/Google Drive/appleiigs/buckshot/build-buckshot-Desktop_Qt_5_12_5_clang_64bit-Debug + C:/Users/builder/Documents/GitHub/buckshot/build-buckshot-Desktop_Qt_5_12_6_MinGW_32_bit-Debug true QtProjectManager.QMakeBuildStep true - false + true false false @@ -117,7 +119,7 @@ 2 - /Users/dbrock/Google Drive/appleiigs/buckshot/build-buckshot-Desktop_Qt_5_12_5_clang_64bit-Release + C:/Users/builder/Documents/GitHub/buckshot/build-buckshot-Desktop_Qt_5_12_6_MinGW_32_bit-Release true @@ -165,7 +167,7 @@ 0 - /Users/dbrock/Google Drive/appleiigs/buckshot/build-buckshot-Desktop_Qt_5_12_5_clang_64bit-Profile + C:/Users/builder/Documents/GitHub/buckshot/build-buckshot-Desktop_Qt_5_12_6_MinGW_32_bit-Profile true @@ -285,27 +287,269 @@ 2 - Qt4ProjectManager.Qt4RunConfiguration:/Users/dbrock/Google Drive/appleiigs/buckshot/buckshot/buckshot.pro - /Users/dbrock/Google Drive/appleiigs/buckshot/buckshot/buckshot.pro + Qt4ProjectManager.Qt4RunConfiguration:C:/Users/builder/Documents/GitHub/buckshot/buckshot/buckshot.pro + C:/Users/builder/Documents/GitHub/buckshot/buckshot/buckshot.pro false false true - 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 + 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 + + 1 ProjectExplorer.Project.TargetCount - 1 + 2 ProjectExplorer.Project.Updater.FileVersion diff --git a/buckshot/main.cpp b/buckshot/main.cpp index b48f94e..be841ca 100644 --- a/buckshot/main.cpp +++ b/buckshot/main.cpp @@ -3,6 +3,8 @@ int main(int argc, char *argv[]) { + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); + QApplication a(argc, argv); MainWindow w; w.show(); diff --git a/buckshot/mainwindow.ui b/buckshot/mainwindow.ui index c40411e..3f4f166 100644 --- a/buckshot/mainwindow.ui +++ b/buckshot/mainwindow.ui @@ -104,219 +104,6 @@ - - - - 330 - 390 - 31 - 16 - - - - Off - - - - - - 330 - 420 - 31 - 16 - - - - Off - - - - - - 390 - 271 - 101 - 30 - - - - Live Preview - - - true - - - - - - 149 - 421 - 171 - 22 - - - - Qt::Horizontal - - - - - - 12 - 271 - 134 - 20 - - - - Apple ][ Display Mode - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - 149 - 271 - 211 - 26 - - - - - - - 2 - 421 - 140 - 16 - - - - Color Bleed Reduction - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - 103 - 361 - 37 - 16 - - - - Scale - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - 2 - 391 - 140 - 16 - - - - Crosshatch Threshold - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - 30 - 301 - 114 - 16 - - - - Source Resolution - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - 149 - 331 - 211 - 26 - - - - - - - 149 - 391 - 171 - 22 - - - - 50 - - - Qt::Horizontal - - - - - - 157 - 301 - 161 - 16 - - - - 10x10 - - - - - - 23 - 331 - 121 - 20 - - - - Scale to Resolution - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - 157 - 361 - 171 - 16 - - - - 1 - - @@ -335,19 +122,6 @@ This box shows the last conversion command run. - - - - 390 - 430 - 141 - 32 - - - - Save Binary Image - - @@ -361,127 +135,274 @@ Qt::Vertical - - - - 530 - 430 - 141 - 32 - - - - Save to ProDOS - - - - - - 22 - 451 - 121 - 20 - - - - Dithering - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - 149 - 451 - 211 - 26 - - - - - - - 520 - 330 - 131 - 21 - - - - - - - 410 - 300 - 101 - 20 - - - - Preview Palette - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - 510 - 301 - 161 - 26 - - - - - - - 370 - 330 - 141 - 20 - - - - - 12 - - - - Additional arguments - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - 510 - 271 - 161 - 32 - - - - Manual Preview - - - + 390 - 400 - 281 - 32 + 271 + 291 + 221 - - Save preview as PNG/BMP + + + + + + + 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 + + + + + + + + Save preview as PNG/BMP + + + + + + + + + Save Binary Image + + + + + + + Save to ProDOS + + + + + + + + + + + 22 + 271 + 331 + 221 + + + + + + + + Apple ][ Display Mode + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + + + + + Source Resolution + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + 10x10 + + + + + + + + + + + Scale to Resolution + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + + + + + Scale + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + 1 + + + + + + + + + + + Crosshatch Threshold + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + 50 + + + Qt::Horizontal + + + + + + + Off + + + + + + + + + + + Color Bleed Reduction + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Qt::Horizontal + + + + + + + Off + + + + + + + + + + + Dithering + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + +