From 8a1eaa7292e0c516518a5535975adb7820574a38 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 29 Oct 2018 19:37:34 +0200 Subject: [PATCH] Improve Option dialogs. Make them resizable as possible. --HG-- branch : develop --- .../tapepreferencesconfigurationpage.ui | 483 ++++++------ .../tape/dialogs/dialogtapepreferences.cpp | 2 - .../preferencesconfigurationpage.ui | 533 ++++++------- .../configpages/preferencespatternpage.ui | 741 +++++++++--------- .../valentina/dialogs/dialogpreferences.cpp | 2 - .../valentina/dialogs/dialogpreferences.ui | 2 +- 6 files changed, 891 insertions(+), 872 deletions(-) diff --git a/src/app/tape/dialogs/configpages/tapepreferencesconfigurationpage.ui b/src/app/tape/dialogs/configpages/tapepreferencesconfigurationpage.ui index b445c78e5..451e97ee5 100644 --- a/src/app/tape/dialogs/configpages/tapepreferencesconfigurationpage.ui +++ b/src/app/tape/dialogs/configpages/tapepreferencesconfigurationpage.ui @@ -6,8 +6,8 @@ 0 0 - 501 - 726 + 544 + 750 @@ -15,241 +15,260 @@ - - - Language + + + true - - - QFormLayout::ExpandingFieldsGrow - - - - - GUI language: - - - - - - - - - - Decimal separator parts: - - - - - - - < With OS options > - - - true - - - - - - - - - - Pattern making system - - - - QFormLayout::ExpandingFieldsGrow - - - - - Pattern making system: - - - - - - - - - - Author: - - - - - - - author - - - - - - - Book: - - - - - - - - 0 - 0 - - - - true - - - - - - - - - - Measurements editing - - - - - - - 0 - 0 - - - - Reset warnings - - - - - - - - - - Toolbar - - - - - - The text appears under the icon (recommended for beginners). - - - true - - - - - - - - - - Default height and size - - - - - - Default height: - - - - - - - - 0 - 0 - - - - - - - - Height unit - - - - - - - - 0 - 0 - - - - - - - - Size unit - - - - - - - Default size: - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - User Interface - - + - 20 - 30 - 351 - 20 + 0 + 0 + 524 + 730 - - Activate dark mode(Restart required) - + + + + + Language + + + + QFormLayout::ExpandingFieldsGrow + + + + + GUI language: + + + + + + + + + + Decimal separator parts: + + + + + + + < With OS options > + + + true + + + + + + + + + + Pattern making system + + + + QFormLayout::ExpandingFieldsGrow + + + + + Pattern making system: + + + + + + + + + + Author: + + + + + + + author + + + + + + + Book: + + + + + + + + 0 + 0 + + + + true + + + + + + + + + + Measurements editing + + + + + + + 0 + 0 + + + + Reset warnings + + + + + + + + + + Toolbar + + + + + + The text appears under the icon (recommended for beginners). + + + true + + + + + + + + + + Default height and size + + + + + + Default height: + + + + + + + + 0 + 0 + + + + + + + + Height unit + + + + + + + + 0 + 0 + + + + + + + + Size unit + + + + + + + Default size: + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + User Interface + + + + + 20 + 30 + 351 + 20 + + + + Activate dark mode(Restart required) + + + + + diff --git a/src/app/tape/dialogs/dialogtapepreferences.cpp b/src/app/tape/dialogs/dialogtapepreferences.cpp index b3292fde3..f9d803a2f 100644 --- a/src/app/tape/dialogs/dialogtapepreferences.cpp +++ b/src/app/tape/dialogs/dialogtapepreferences.cpp @@ -87,8 +87,6 @@ void DialogTapePreferences::showEvent(QShowEvent *event) } // do your init stuff here - setMinimumSize(size()); - QSize sz = qApp->Settings()->GetPreferenceDialogSize(); if (sz.isEmpty() == false) { diff --git a/src/app/valentina/dialogs/configpages/preferencesconfigurationpage.ui b/src/app/valentina/dialogs/configpages/preferencesconfigurationpage.ui index 20cec63c4..895e6853f 100644 --- a/src/app/valentina/dialogs/configpages/preferencesconfigurationpage.ui +++ b/src/app/valentina/dialogs/configpages/preferencesconfigurationpage.ui @@ -6,14 +6,14 @@ 0 0 - 516 - 751 + 680 + 624 Configuration - + @@ -23,279 +23,264 @@ General - - - - 20 - 0 - 441 - 70 - - - - Save - - - - - - Auto-save modified pattern - - - true + + + + + true + + + + + 0 + 0 + 624 + 707 + + + + + + Save + + + + + + Auto-save modified pattern + + + true + + + + + + + Interval: + + + + + + + + 0 + 0 + + + + min + + + 1 + + + 60 + + + + + + + + + + Language + + + + QFormLayout::ExpandingFieldsGrow + + + + + GUI language: + + + + + + + + + + Decimal separator parts: + + + + + + + < With OS options > + + + true + + + + + + + Default unit: + + + + + + + Label language: + + + + + + + + + + + + + + + + Pattern making system + + + + QFormLayout::ExpandingFieldsGrow + + + + + Pattern making system: + + + + + + + + + + Author: + + + + + + + author + + + + + + + Book: + + + + + + + true + + + + + + + + + + Pattern editing + + + + + + + 0 + 0 + + + + Reset warnings + + + + + + + Update a pattern only after a curve release + + + Free curve mode + + + true + + + + + + + Double click calls Zoom fit best for current pattern piece + + + true + + + + + + + + + + Toolbar + + + + + + The text appears under the icon (recommended for beginners). + + + true + + + + + + + + + + User Interface + + + + + + Activate dark mode(Restart required) + + + true + + + + + + + - - - - - Interval: - - - - - - - - 0 - 0 - - - - min - - - 1 - - - 60 - - - - - - - - - 20 - 70 - 441 - 173 - - - - Language - - - - QFormLayout::ExpandingFieldsGrow - - - - - GUI language: - - - - - - - - - - Decimal separator parts: - - - - - - - < With OS options > - - - true - - - - - - - Default unit: - - - - - - - Label language: - - - - - - - - - - - - - - - 20 - 243 - 446 - 185 - - - - Pattern making system - - - - QFormLayout::ExpandingFieldsGrow - - - - - Pattern making system: - - - - - - - - - - Author: - - - - - - - author - - - - - - - Book: - - - - - - - true - - - - - - - - - 20 - 428 - 451 - 131 - - - - Pattern editing - - - - - - - 0 - 0 - - - - Reset warnings - - - - - - - Update a pattern only after a curve release - - - Free curve mode - - - true - - - - - - - Double click calls Zoom fit best for current pattern piece - - - true - - - - - - - - - 20 - 560 - 451 - 71 - - - - Toolbar - - - - - - The text appears under the icon (recommended for beginners). - - - true - - - - - - - - - 20 - 630 - 446 - 71 - - - - User Interface - - - - - - Activate dark mode(Restart required) - - - true - - - - - + + + diff --git a/src/app/valentina/dialogs/configpages/preferencespatternpage.ui b/src/app/valentina/dialogs/configpages/preferencespatternpage.ui index 0b2011584..cc02f7be9 100644 --- a/src/app/valentina/dialogs/configpages/preferencespatternpage.ui +++ b/src/app/valentina/dialogs/configpages/preferencespatternpage.ui @@ -6,379 +6,398 @@ 0 0 - 381 - 727 + 373 + 760 Pattern - + - - - Graphical output + + + true - - - - - Use antialiasing - - - - - - - Use OpenGL to render a scene. + + + + 0 + 0 + 353 + 740 + + + + + + + Graphical output + + + + + + Use antialiasing + + + + + + + Use OpenGL to render a scene. This option will take an affect after restart. - - - Use OpenGL render - - - false - - - - - - - - - - 0 - 0 - + + + Use OpenGL render + + + false + + + + + + + + + + 0 + 0 + + + + Curve approximation: + + + + + + + Set default curve approximation scale + + + 1 + + + 0.100000000000000 + + + 10.000000000000000 + + + 0.100000000000000 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + Bold line width + + + Line width: + + + + + + + + + + 6 + + + 0.100000000000000 + + + + + + + + 0 + 0 + + + + + + + + Qt::Horizontal + + + + 500 + 20 + + + + + + + + + + + + + Undo + + + + QFormLayout::ExpandingFieldsGrow - - Curve approximation: + + + + Count steps (0 - no limit): + + + + + + + + + + + + + Workpiece + + + + + + By default forbid flipping for all new created workpieces + + + Forbid flipping + + + + + + + Show a passmark both in the seam allowance and on the seam line. + + + Show second passmark on seam line + + + + + + + By default hide the main path if the seam allowance was enabled + + + Hide main path + + + + + + + + + Label font: + + + + + + + + + + + + + + + Seam allowance + + + + + + Default value: + + + + + + + 3 + + + 100.000000000000000 + + + 0.100000000000000 + + + 1.000000000000000 + + + + + + + + + + Label data/time format + + + + QFormLayout::ExpandingFieldsGrow - - - - - - Set default curve approximation scale - - - 1 - - - 0.100000000000000 - - - 10.000000000000000 - - - 0.100000000000000 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - Bold line width - - - Line width: - - - - - - - - - - 6 - - - 0.100000000000000 - - - - - - - - 0 - 0 - - - - - - - - Qt::Horizontal - - - - 500 - 20 - - - - - - - + + + + Date: + + + + + + + + + + + + Edit formats + + + + + + + + + Time: + + + + + + + + + + + + Edit formats + + + + + + + + + + + + Materials + + + + + + + + Known materials: + + + + + + + + 0 + 0 + + + + Manage list of known materials + + + Manage + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + When manage pattern materials save them to known materials list + + + Remeber pattern materials + + + true + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + - - - - Undo - - - - QFormLayout::ExpandingFieldsGrow - - - - - Count steps (0 - no limit): - - - - - - - - - - - - - Workpiece - - - - - - By default forbid flipping for all new created workpieces - - - Forbid flipping - - - - - - - Show a passmark both in the seam allowance and on the seam line. - - - Show second passmark on seam line - - - - - - - By default hide the main path if the seam allowance was enabled - - - Hide main path - - - - - - - - - Label font: - - - - - - - - - - - - - - - Seam allowance - - - - - - Default value: - - - - - - - 3 - - - 100.000000000000000 - - - 0.100000000000000 - - - 1.000000000000000 - - - - - - - - - - Label data/time format - - - - QFormLayout::ExpandingFieldsGrow - - - - - Date: - - - - - - - - - - - - Edit formats - - - - - - - - - Time: - - - - - - - - - - - - Edit formats - - - - - - - - - - - - Materials - - - - - - - - Known materials: - - - - - - - - 0 - 0 - - - - Manage list of known materials - - - Manage - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - When manage pattern materials save them to known materials list - - - Remeber pattern materials - - - true - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - diff --git a/src/app/valentina/dialogs/dialogpreferences.cpp b/src/app/valentina/dialogs/dialogpreferences.cpp index 9b8754f06..9571cdd60 100644 --- a/src/app/valentina/dialogs/dialogpreferences.cpp +++ b/src/app/valentina/dialogs/dialogpreferences.cpp @@ -90,8 +90,6 @@ void DialogPreferences::showEvent(QShowEvent *event) } // do your init stuff here - setMinimumSize(size()); - QSize sz = qApp->Settings()->GetPreferenceDialogSize(); if (sz.isEmpty() == false) { diff --git a/src/app/valentina/dialogs/dialogpreferences.ui b/src/app/valentina/dialogs/dialogpreferences.ui index 55a7fb711..676cdba81 100644 --- a/src/app/valentina/dialogs/dialogpreferences.ui +++ b/src/app/valentina/dialogs/dialogpreferences.ui @@ -6,7 +6,7 @@ 0 0 - 712 + 827 522