mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-10-23 23:44:13 +02:00
Add a Customise window: toolbars, shortcut bar, keyboard, gestures
Configuration > Personnaliser... (also at the bottom of a toolbar's right-click menu) opens one window with a tab for each page that sets how the user works: Barres d'outils, Contenu des barres, Barre de raccourcis, Raccourcis and Gestes de la souris, like SolidWorks' Tools > Customize. The tabs are the same pages the configuration dialog shows, which keeps them. OK applies every tab, Cancel none. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -341,6 +341,19 @@ set_tests_properties(tst_gesturesettings PROPERTIES ENVIRONMENT "QT_QPA_PLATFORM
|
||||
target_include_directories(tst_gesturesettings PRIVATE ${QET_DIR}/sources)
|
||||
target_link_libraries(tst_gesturesettings PRIVATE Qt::Test Qt::Widgets Qt::Svg Qt::Xml pugixml::pugixml)
|
||||
|
||||
# CustomizeDialog: the configuration pages as tabs of one window; OK
|
||||
# applies every page once, Cancel none.
|
||||
add_executable(
|
||||
tst_customizedialog
|
||||
tst_customizedialog.cpp
|
||||
${QET_DIR}/sources/ui/customizedialog.cpp
|
||||
${QET_DIR}/sources/ui/customizedialog.h
|
||||
${QET_DIR}/sources/ui/configpage/configpage.h)
|
||||
add_test(NAME tst_customizedialog COMMAND tst_customizedialog)
|
||||
set_tests_properties(tst_customizedialog PROPERTIES ENVIRONMENT "QT_QPA_PLATFORM=offscreen")
|
||||
target_include_directories(tst_customizedialog PRIVATE ${QET_DIR}/sources)
|
||||
target_link_libraries(tst_customizedialog PRIVATE Qt::Test Qt::Widgets)
|
||||
|
||||
# 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.
|
||||
|
||||
@@ -0,0 +1,93 @@
|
||||
/*
|
||||
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 "ui/customizedialog.h"
|
||||
#include "ui/configpage/configpage.h"
|
||||
|
||||
#include <QDialogButtonBox>
|
||||
#include <QIcon>
|
||||
#include <QPushButton>
|
||||
#include <QTabWidget>
|
||||
#include <QTest>
|
||||
|
||||
/// A configuration page that counts how often it was applied
|
||||
class CountingPage : public ConfigPage
|
||||
{
|
||||
public:
|
||||
CountingPage(const QString &title) : ConfigPage(nullptr), m_title(title) {}
|
||||
void applyConf() override { ++applied; }
|
||||
QString title() const override { return m_title; }
|
||||
QIcon icon() const override { return QIcon(); }
|
||||
int applied = 0;
|
||||
private:
|
||||
QString m_title;
|
||||
};
|
||||
|
||||
/**
|
||||
CustomizeDialog: one tab per page in the order added, OK applies every
|
||||
page once, Cancel applies none.
|
||||
*/
|
||||
class tst_customizedialog : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
private slots:
|
||||
void tabsInOrder()
|
||||
{
|
||||
CustomizeDialog dialog;
|
||||
auto *a = new CountingPage(QStringLiteral("Barres d'outils"));
|
||||
auto *b = new CountingPage(QStringLiteral("Clavier"));
|
||||
dialog.addPage(a);
|
||||
dialog.addPage(b);
|
||||
dialog.addPage(a); // twice: ignored
|
||||
dialog.addPage(nullptr);
|
||||
auto *tabs = dialog.findChild<QTabWidget *>(QStringLiteral("customizeTabs"));
|
||||
QVERIFY(tabs);
|
||||
QCOMPARE(tabs->count(), 2);
|
||||
QCOMPARE(tabs->tabText(0), QStringLiteral("Barres d'outils"));
|
||||
QCOMPARE(tabs->tabText(1), QStringLiteral("Clavier"));
|
||||
QCOMPARE(tabs->widget(1), b);
|
||||
}
|
||||
|
||||
void okAppliesEveryPage()
|
||||
{
|
||||
CustomizeDialog dialog;
|
||||
auto *a = new CountingPage(QStringLiteral("a"));
|
||||
auto *b = new CountingPage(QStringLiteral("b"));
|
||||
dialog.addPage(a);
|
||||
dialog.addPage(b);
|
||||
dialog.show();
|
||||
dialog.findChild<QDialogButtonBox *>()->button(QDialogButtonBox::Ok)->click();
|
||||
QCOMPARE(a->applied, 1);
|
||||
QCOMPARE(b->applied, 1);
|
||||
QCOMPARE(dialog.result(), int(QDialog::Accepted));
|
||||
}
|
||||
|
||||
void cancelAppliesNothing()
|
||||
{
|
||||
CustomizeDialog dialog;
|
||||
auto *a = new CountingPage(QStringLiteral("a"));
|
||||
dialog.addPage(a);
|
||||
dialog.show();
|
||||
dialog.findChild<QDialogButtonBox *>()->button(QDialogButtonBox::Cancel)->click();
|
||||
QCOMPARE(a->applied, 0);
|
||||
QCOMPARE(dialog.result(), int(QDialog::Rejected));
|
||||
}
|
||||
};
|
||||
|
||||
QTEST_MAIN(tst_customizedialog)
|
||||
#include "tst_customizedialog.moc"
|
||||
Reference in New Issue
Block a user