Compare commits

...

10 Commits

Author SHA1 Message Date
Laurent Trinques 1078496bb1 Merge pull request #320 from plc-user/master
Fix: Only scroll diagram-view, when moved text leaves visible area
2024-12-31 16:04:26 +01:00
plc-user 711353bb58 Fix whitespace 2024-12-31 16:01:47 +01:00
plc-user dd7955e50e Fix: Only scroll diagram-view, when moved text leaves visible area 2024-12-31 15:52:17 +01:00
Laurent Trinques 27474b0822 Refresh translation binary 2024-12-27 15:00:44 +01:00
Laurent Trinques d6dcc85157 Update qet_be.ts 2024-12-27 14:59:06 +01:00
Laurent Trinques b2dc6ba738 Add be-nl translation, thanks Ronny 2024-12-27 14:16:31 +01:00
Laurent Trinques 31ed09f185 Revert "Try to fix https://github.com/qelectrotech/qelectrotech-source-mirror/"
This reverts commit 3992c60c45.
2024-12-22 16:17:32 +01:00
Laurent Trinques 3992c60c45 Try to fix https://github.com/qelectrotech/qelectrotech-source-mirror/
pull/314
2024-12-22 14:25:30 +01:00
Laurent Trinques fef351df8b Typo 2024-12-22 08:44:19 +01:00
Laurent Trinques fa322af060 Merge pull request #317 from qelectrotech/revert-314-master
Revert "ElementEditor elmt_info_cb sorting changed"
2024-12-21 13:22:10 +01:00
4 changed files with 419 additions and 385 deletions
BIN
View File
Binary file not shown.
+403 -375
View File
File diff suppressed because it is too large Load Diff
+2 -2
View File
@@ -62,7 +62,7 @@
* supplier_auxiliary2 * supplier_auxiliary2
* quantity_auxiliary2 * quantity_auxiliary2
* unity_auxiliary2 * unity_auxiliary2
* auxiliary3 -> auxiliary 1 of element * auxiliary3 -> auxiliary 3 of element
* description_auxiliary3 * description_auxiliary3
* designation_auxiliary3 * designation_auxiliary3
* manufacturer_auxiliary3 * manufacturer_auxiliary3
@@ -71,7 +71,7 @@
* supplier_auxiliary3 * supplier_auxiliary3
* quantity_auxiliary3 * quantity_auxiliary3
* unity_auxiliary3 * unity_auxiliary3
* auxiliary4 -> auxiliary 1 of element * auxiliary4 -> auxiliary 4 of element
* description_auxiliary4 * description_auxiliary4
* designation_auxiliary4 * designation_auxiliary4
* manufacturer_auxiliary4 * manufacturer_auxiliary4
+6
View File
@@ -834,6 +834,12 @@ void DiagramView::scrollOnMovement(QKeyEvent *e)
qreal elmt_bottom = y + qgi->boundingRect().bottom(); qreal elmt_bottom = y + qgi->boundingRect().bottom();
qreal elmt_right = x + qgi->boundingRect().right(); qreal elmt_right = x + qgi->boundingRect().right();
qreal elmt_left = x + qgi->boundingRect().left(); qreal elmt_left = x + qgi->boundingRect().left();
if (qgi->parentItem()) {
elmt_top += qgi->parentItem()->y();
elmt_bottom += qgi->parentItem()->y();
elmt_right += qgi->parentItem()->x();
elmt_left += qgi->parentItem()->x();
}
bool elmt_right_of_left_margin = elmt_left>=left; bool elmt_right_of_left_margin = elmt_left>=left;
bool elmt_left_of_right_margin = elmt_right<=right; bool elmt_left_of_right_margin = elmt_right<=right;