[LyX/master] Allow to hide categories in CategorizedCombo

Juergen Spitzmueller spitz at lyx.org
Mon Jan 30 06:47:28 UTC 2023


commit b260ff8b27fa48a11d8b82b0ae1a214aec606c01
Author: Juergen Spitzmueller <spitz at lyx.org>
Date:   Mon Jan 30 08:45:58 2023 +0100

    Allow to hide categories in CategorizedCombo
    
    font combos do not need that
---
 src/frontends/qt/CategorizedCombo.cpp |    4 ++--
 src/frontends/qt/CategorizedCombo.h   |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/frontends/qt/CategorizedCombo.cpp b/src/frontends/qt/CategorizedCombo.cpp
index c4005ac..9053228 100644
--- a/src/frontends/qt/CategorizedCombo.cpp
+++ b/src/frontends/qt/CategorizedCombo.cpp
@@ -476,13 +476,13 @@ bool CategorizedCombo::set(QString const & item)
 void CategorizedCombo::addItemSort(QString const & item, QString const & guiname,
 				   QString const & category, QString const & tooltip,
 				   bool sorted, bool sortedByCat, bool sortCats,
-				   bool available)
+				   bool available, bool nocategories)
 {
 	QString titem = available ? guiname
 				  : toqstr(bformat(_("Unavailable: %1$s"),
 						   qstring_to_ucs4(guiname)));
 	bool const uncategorized = category.isEmpty();
-	QString qcat = uncategorized ? qt_("Uncategorized") : category;
+	QString qcat = (uncategorized && !nocategories) ? qt_("Uncategorized") : category;
 
 	QList<QStandardItem *> row;
 	QStandardItem * gui = new QStandardItem(titem);
diff --git a/src/frontends/qt/CategorizedCombo.h b/src/frontends/qt/CategorizedCombo.h
index 9e03449..10d730b 100644
--- a/src/frontends/qt/CategorizedCombo.h
+++ b/src/frontends/qt/CategorizedCombo.h
@@ -49,7 +49,7 @@ public:
 	void addItemSort(QString const & item, QString const & guiname,
 			 QString const & category, QString const & tooltip,
 			 bool sorted, bool sortedByCat, bool sortCats,
-			 bool available);
+			 bool available, bool nocategories = false);
 	///
 	QString getData(int row) const;
 	///


More information about the lyx-cvs mailing list