From ff467f81150b6970ceff3530d44b0b8072c6fbeb Mon Sep 17 00:00:00 2001 From: Uwe Date: Mon, 6 Jun 2022 00:46:42 +0200 Subject: [PATCH] [Spreadsheet] dialog fixes - fixes to tooltips - add 2 labels to make the dialog logic more clear - remove non-functional help button --- src/Mod/Spreadsheet/Gui/DlgBindSheet.cpp | 2 + src/Mod/Spreadsheet/Gui/DlgBindSheet.ui | 176 ++++++++++++++--------- 2 files changed, 114 insertions(+), 64 deletions(-) diff --git a/src/Mod/Spreadsheet/Gui/DlgBindSheet.cpp b/src/Mod/Spreadsheet/Gui/DlgBindSheet.cpp index d72f0822c0..10fac62b80 100644 --- a/src/Mod/Spreadsheet/Gui/DlgBindSheet.cpp +++ b/src/Mod/Spreadsheet/Gui/DlgBindSheet.cpp @@ -40,6 +40,8 @@ DlgBindSheet::DlgBindSheet(Sheet *sheet, const std::vector &ranges, QWidg : QDialog(parent), sheet(sheet), range(ranges.front()), ui(new Ui::DlgBindSheet) { ui->setupUi(this); + // remove the automatic help button in dialog title since we don't use it + setWindowFlag(Qt::WindowContextHelpButtonHint, false); std::string toStart,toEnd; ExpressionPtr pStart, pEnd; diff --git a/src/Mod/Spreadsheet/Gui/DlgBindSheet.ui b/src/Mod/Spreadsheet/Gui/DlgBindSheet.ui index c7103d6d81..c984a5b18d 100644 --- a/src/Mod/Spreadsheet/Gui/DlgBindSheet.ui +++ b/src/Mod/Spreadsheet/Gui/DlgBindSheet.ui @@ -6,84 +6,132 @@ 0 0 - 387 - 176 + 257 + 167 Bind Spreadsheet Cells - - - - - From cells: - - + + + + + + + First cell in range + + + + + + + Last cell in range + + + + + + + From cells: + + + + + + + + 0 + 0 + + + + Start cell address + + + + + + + + 0 + 0 + + + + End cell address + + + + + + + To cells: + + + + + + + + 0 + 0 + + + + Start cell address to bind to. +Type '=' if you want to use an expression. +The expression must evaluate to a string of some cell address. + + + + + + + + 0 + 0 + + + + End cell address to bind to. +Type '=' if you want to use an expression. +The expression must evaluate to a string of some cell address. + + + + - - - - Binding cell range start - - + + + + + + Which spread sheet to bind to + + + + + + + Sheet: + + + + - - - - Binding cell range end - - - - - - - - To cells: - - - - - - - Starting cell address to bind to. Type '=' if you want to use expression. -The expression must evaluates to a string of some cell address. - - - - - - - Ending cell address to bind to. Type '=' if you want to use expression. -The expression must evaluates to a string of some cell address. - - - - - - - Sheet: - - - - - - - Select which spread sheet to bind to. - - - - + - Use hidden reference to avoid creating a dependency with the referenced object. Use with caution! + Use hidden reference to avoid creating a dependency +with the referenced object. Use with caution! Use hidden reference - + @@ -111,7 +159,7 @@ The expression must evaluates to a string of some cell address. - +