kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-09-30 06:34:13 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Share the text grid choices; add a preference, a status hint and a unit test

Browse Source 
Drop 1:2.5: on a grid of 10 it steps by 4, which misses 10, so texts on
two elements 10 apart could never line up. Every remaining divisor is a
whole number, which tst_textgrid checks.

The divisor list and the snapping arithmetic move to the header-only
textgrid.h so the toolbar menu, the preferences page and the test share
them. The preferences page gets the same choice under Grille + Clavier;
QETApp::textGridChanged keeps every editor's toolbar button in step.
While element texts are dragged, the status bar names the text grid and
says to release Shift and hold Ctrl for free placement -- Ctrl+Shift
together is the pan shortcut.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01G2d2Zi8BfrYRPX88zhaoFG
This commit is contained in:
ispyisail
2026-09-26 10:11:18 +12:00
parent 0e02190eb2
commit 95f3ea2f6d
12 changed files with 252 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/qetdiagrameditor.cpp
+31 -18
View File
@@ -49,6 +49,7 @@
#include "qeticons.h"
#include "qetmessagebox.h"
#include "recentfiles.h"
#include "textgrid.h"
#include "shortcutmanager.h"
#include "ui/bomexportdialog.h"
#include "ui/conductorcolortoolbutton.h"
@@ -493,29 +494,21 @@ void QETDiagramEditor::setUpActions()
m_text_grid_button->setToolTip(tr("Grille d'accrochage des textes déplacés à la souris.\n"
"Maintenir Ctrl pendant le déplacement pour placer librement."));
auto text_grid_group = new QActionGroup(this);
const qreal current_divisor = settings.value("diagrameditor/text_grid_divisor", 1).toReal();
const QList<QPair<QString, qreal>> text_grids {
{tr("Désactivée"), 0},
{QStringLiteral("1:1"), 1},
{QStringLiteral("1:2"), 2},
{QStringLiteral("1:2.5"), 2.5},
{QStringLiteral("1:5"), 5},
{QStringLiteral("1:10"), 10}};
for (const auto &grid : text_grids)
for (const qreal divisor : TextGrid::divisors)
{
QAction *action = m_text_grid_menu->addAction(grid.first);
QAction *action = m_text_grid_menu->addAction(
divisor > 0 ? TextGrid::ratioLabel(divisor) : tr("Désactivée"));
action->setCheckable(true);
action->setData(grid.second);
action->setData(divisor);
text_grid_group->addAction(action);
if (qFuzzyCompare(grid.second + 1, current_divisor + 1)) {
action->setChecked(true);
m_text_grid_button->setText(tr("Textes %1").arg(grid.first));
}
}
connect(text_grid_group, &QActionGroup::triggered, this, [this](QAction *action) {
QSettings().setValue("diagrameditor/text_grid_divisor", action->data());
m_text_grid_button->setText(tr("Textes %1").arg(action->text()));
connect(text_grid_group, &QActionGroup::triggered, this, [](QAction *action) {
QSettings().setValue(TextGrid::settings_key, action->data());
emit QETApp::instance()->textGridChanged();
});
connect(QETApp::instance(), &QETApp::textGridChanged,
this, &QETDiagramEditor::updateTextGridButton);
updateTextGridButton();
// Draw or not the custom guides
m_draw_guides = new QAction ( QIcon::fromTheme("guides"), tr("Afficher les guides"), this);
@@ -3262,3 +3255,23 @@ void QETDiagramEditor::slot_runScript() {
QetScripting::runOnProject(script_path, project, currentDiagramView());
}
#endif
/**
@brief QETDiagramEditor::updateTextGridButton
Show the current text grid on its toolbar button and check it in its menu.
*/
void QETDiagramEditor::updateTextGridButton()
{
const qreal divisor = QSettings().value(TextGrid::settings_key, 1).toReal();
for (QAction *action : m_text_grid_menu->actions())
{
if (qFuzzyCompare(action->data().toReal() + 1, divisor + 1))
{
action->setChecked(true);
m_text_grid_button->setText(tr("Textes %1").arg(action->text()));
return;
}
}
//A divisor the menu does not offer, set by hand in the config file
m_text_grid_button->setText(tr("Textes %1").arg(TextGrid::ratioLabel(divisor)));
}