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

Add a Toolbars settings page: icon size, text with icons, lock

Browse Source 
A new page in Configurer QElectroTech, "Barres d'outils", sets for
every window (folio editor, element editor, title block editor):
- the icon size: default, 16, 24, 32 or 48 px
- the buttons: icon only, text beside the icon, or text under it
- locking the toolbars so they can't be dragged out of place

OK applies it to the open windows at once. The defaults are Qt's
own, and a default value removes its key, so nothing changes for
anyone who never opens the page. A toolbar inside a panel is left
alone; only the window's own toolbars are locked.

New test tst_toolbarsettings: defaults change nothing, saved values
reach every toolbar of an open window, back to defaults removes the
keys.

Third stage of discussion #1319.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
ispyisail
2026-10-06 09:14:35 +13:00
parent 85342f4b56
commit 9eef8f95c9
11 changed files with 447 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/qttest/CMakeLists.txt
+18
View File
@@ -227,6 +227,24 @@ set_tests_properties(tst_commandsearch PROPERTIES ENVIRONMENT "QT_QPA_PLATFORM=o
target_include_directories(tst_commandsearch PRIVATE ${QET_DIR}/sources)
target_link_libraries(tst_commandsearch PRIVATE Qt::Test Qt::Widgets)
# ToolbarSettings and its configuration page: defaults change nothing,
# saved values reach every open window's toolbars, panels are left alone.
add_executable(
tst_toolbarsettings
tst_toolbarsettings.cpp
${QET_DIR}/sources/toolbarsettings.cpp
${QET_DIR}/sources/toolbarsettings.h
${QET_DIR}/sources/ui/configpage/toolbarsconfigpage.cpp
${QET_DIR}/sources/ui/configpage/toolbarsconfigpage.h
${QET_DIR}/sources/ui/configpage/configpage.h
${QET_DIR}/sources/qeticons.cpp
${QET_DIR}/sources/qetpalette.cpp
${QET_DIR}/sources/qetstyle.cpp)
add_test(NAME tst_toolbarsettings COMMAND tst_toolbarsettings)
set_tests_properties(tst_toolbarsettings PROPERTIES ENVIRONMENT "QT_QPA_PLATFORM=offscreen")
target_include_directories(tst_toolbarsettings PRIVATE ${QET_DIR}/sources)
target_link_libraries(tst_toolbarsettings PRIVATE Qt::Test Qt::Widgets Qt::Svg)
# scriptheader.h is header-only: the // ==QETScript== block that turns a
# stored script into a button; and ShortcutManager::unregisterAction(), which
# takes a deleted script's command out of the lists again.
tests/qttest/tst_toolbarsettings.cpp
+133
View File
@@ -0,0 +1,133 @@
/*
Copyright 2006-2026 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
QElectroTech is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
*/
#include "toolbarsettings.h"
#include "ui/configpage/toolbarsconfigpage.h"
#include <QCheckBox>
#include <QComboBox>
#include <QDockWidget>
#include <QMainWindow>
#include <QSettings>
#include <QStandardPaths>
#include <QTest>
#include <QToolBar>
/**
ToolbarSettings and its configuration page: defaults change nothing,
saved values reach every open window's toolbars, and a toolbar inside
a panel is left alone.
*/
class tst_toolbarsettings : public QObject
{
Q_OBJECT
QMainWindow *m_window = nullptr;
QToolBar *m_top = nullptr;
QToolBar *m_left = nullptr;
QToolBar *m_in_dock = nullptr;
QSize m_default_size;
private slots:
void initTestCase()
{
QStandardPaths::setTestModeEnabled(true);
QSettings().remove(QStringLiteral("toolbars"));
m_window = new QMainWindow();
m_default_size = m_window->iconSize();
m_top = new QToolBar(QStringLiteral("top"), m_window);
m_window->addToolBar(Qt::TopToolBarArea, m_top);
//Created without a parent, as some QET toolbars are
m_left = new QToolBar(QStringLiteral("left"));
m_window->addToolBar(Qt::LeftToolBarArea, m_left);
auto *dock = new QDockWidget(m_window);
m_in_dock = new QToolBar(dock);
dock->setWidget(m_in_dock);
m_window->addDockWidget(Qt::LeftDockWidgetArea, dock);
m_window->show();
}
void cleanupTestCase()
{
delete m_window;
}
void defaultsChangeNothing()
{
QCOMPARE(ToolbarSettings::iconSize(), 0);
QCOMPARE(ToolbarSettings::buttonStyle(), Qt::ToolButtonIconOnly);
QCOMPARE(ToolbarSettings::locked(), false);
ToolbarSettings::applyTo(m_window);
QCOMPARE(m_window->iconSize(), m_default_size);
QCOMPARE(m_top->iconSize(), m_default_size);
QCOMPARE(m_top->toolButtonStyle(), Qt::ToolButtonIconOnly);
QVERIFY(m_top->isMovable());
QVERIFY(m_left->isMovable());
}
void pageSavesAndAppliesToOpenWindows()
{
{
ToolbarsConfigPage page;
auto *size = page.findChild<QComboBox *>(QStringLiteral("iconSizeCombo"));
auto *style = page.findChild<QComboBox *>(QStringLiteral("buttonStyleCombo"));
size->setCurrentIndex(size->findData(32));
style->setCurrentIndex(style->findData(int(Qt::ToolButtonTextUnderIcon)));
page.findChild<QCheckBox *>(QStringLiteral("lockedCheck"))->setChecked(true);
page.applyConf();
}
QCOMPARE(ToolbarSettings::iconSize(), 32);
QCOMPARE(ToolbarSettings::buttonStyle(), Qt::ToolButtonTextUnderIcon);
QVERIFY(ToolbarSettings::locked());
QCOMPARE(m_top->iconSize(), QSize(32, 32));
QCOMPARE(m_left->iconSize(), QSize(32, 32));
QCOMPARE(m_top->toolButtonStyle(), Qt::ToolButtonTextUnderIcon);
QVERIFY(!m_top->isMovable());
QVERIFY(!m_left->isMovable());
//A toolbar inside a panel is not one of the window's toolbars
QVERIFY(m_in_dock->isMovable());
//A page opened now shows what was saved
ToolbarsConfigPage page;
QCOMPARE(page.findChild<QComboBox *>(QStringLiteral("iconSizeCombo"))->currentData().toInt(), 32);
QVERIFY(page.findChild<QCheckBox *>(QStringLiteral("lockedCheck"))->isChecked());
}
void backToDefaultsRemovesTheKeys()
{
ToolbarSettings::save(0, Qt::ToolButtonIconOnly, false);
QVERIFY(!QSettings().contains(QStringLiteral("toolbars/icon_size")));
QVERIFY(!QSettings().contains(QStringLiteral("toolbars/button_style")));
QVERIFY(!QSettings().contains(QStringLiteral("toolbars/locked")));
ToolbarSettings::applyToAll();
QCOMPARE(m_top->iconSize(), m_default_size);
QCOMPARE(m_top->toolButtonStyle(), Qt::ToolButtonIconOnly);
QVERIFY(m_top->isMovable());
}
void unknownStyleFallsBack()
{
QSettings().setValue(QStringLiteral("toolbars/button_style"), 99);
QCOMPARE(ToolbarSettings::buttonStyle(), Qt::ToolButtonIconOnly);
QSettings().remove(QStringLiteral("toolbars/button_style"));
}
};
QTEST_MAIN(tst_toolbarsettings)
#include "tst_toolbarsettings.moc"