kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-08-17 12:14:13 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into feature/center-rotation-option-for-textfields

Browse Source 
# Conflicts:
#	lang/qet_de.ts
#	lang/qet_en.ts
This commit is contained in:
Levi Jetzer
2026-08-09 15:31:52 +02:00
parent 3424ba50bd 5b33c044c5
commit c1d892c496
74 changed files with 16542 additions and 6574 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/qetgraphicsitem/independenttextitem.cpp
+5 -1
View File
@@ -19,6 +19,7 @@
#include "../diagram.h"
#include "../diagramcommands.h"
#include "../lastusedstyle.h"
#include "../qet.h"
#include "../qetapp.h"
#include "../utils/qetutils.h"
@@ -33,7 +34,10 @@
IndependentTextItem::IndependentTextItem() :
DiagramTextItem(nullptr)
{
setFont(QETApp::indiTextsItemFont());
//Start from the font last applied to a text item this session,
//falling back to the app-wide Preferences default otherwise.
setFont(LastUsedStyle::hasTextFont() ? LastUsedStyle::textFont()
: QETApp::indiTextsItemFont());
QSettings settings;
setRotation(settings.value("diagrameditor/independent_text_rotation", 0).toInt());
}
sources/qetgraphicsitem/terminal.cpp
+17 -14
View File
@@ -199,19 +199,21 @@ void Terminal::paint(
// dessin de la borne en rouge
// draw the terminal in red
t.setColor(Qt::red);
painter -> setPen(t);
painter -> drawLine(c, e);
if (!diagram() || diagram()->drawTerminals()) {
t.setColor(Qt::red);
painter -> setPen(t);
painter -> drawLine(c, e);
// dessin du point d'amarrage au conducteur en bleu
// draw the docking point to the conductor in blue
t.setColor(m_hovered_color);
painter -> setPen(t);
painter -> setBrush(m_hovered_color);
if (m_hovered) {
painter -> setRenderHint(QPainter::Antialiasing, true);
painter -> drawEllipse(QRectF(c.x() - 2.5, c.y() - 2.5, 5.0, 5.0));
} else painter -> drawPoint(c);
// dessin du point d'amarrage au conducteur en bleu
// draw the docking point to the conductor in blue
t.setColor(m_hovered_color);
painter -> setPen(t);
painter -> setBrush(m_hovered_color);
if (m_hovered) {
painter -> setRenderHint(QPainter::Antialiasing, true);
painter -> drawEllipse(QRectF(c.x() - 2.5, c.y() - 2.5, 5.0, 5.0));
} else painter -> drawPoint(c);
}
//Draw help line if needed,
if (diagram() && m_draw_help_line)
@@ -273,9 +275,10 @@ void Terminal::paint(
m_help_line_a -> setLine(line);
}
// Draw label if show_name is enabled
// Draw label if show_name is enabled and terminal names are allowed
const QString display_name = name();
if (d->m_show_name && !display_name.isEmpty()) {
if (d->m_show_name && !display_name.isEmpty()
&& (!diagram() || diagram()->drawTerminalNames())) {
painter->setRenderHint(QPainter::Antialiasing, true);
painter->setRenderHint(QPainter::TextAntialiasing, true);
painter->setFont(d->m_label_font);