LCLib: fixed enter key not working on the part picker.

trevorsandy · trevorsandy · commit 6ebcb398b951 · 2025-01-21T04:21:58.000+01:00
diff --git a/builds/linux/obs/PKGBUILD b/builds/linux/obs/PKGBUILD
@@ -2,7 +2,7 @@
 #  Last Update: December 06, 2024
 #  Copyright (C) 2017 - 2025 by Trevor SANDY
 pkgname=lpub3d
-pkgver=2.4.9.4082
+pkgver=2.4.9.4083
 pkgrel=1
 pkgdesc="An LDraw Building Instruction Editor"
 url="https://github.com/trevorsandy/lpub3d.git"
diff --git a/builds/linux/obs/alldeps/PKGBUILD b/builds/linux/obs/alldeps/PKGBUILD
@@ -2,7 +2,7 @@
 #  Last Update: September 16, 2024
 #  Copyright (C) 2017 - 2025 by Trevor SANDY
 pkgname=lpub3d
-pkgver=2.4.9.4082
+pkgver=2.4.9.4083
 pkgrel=1
 pkgdesc="An LDraw Building Instruction Editor"
 url="https://github.com/trevorsandy/lpub3d.git"
diff --git a/builds/linux/obs/alldeps/debian/changelog b/builds/linux/obs/alldeps/debian/changelog
@@ -1,5 +1,5 @@
-lpub3d (2.4.9.4082) debian; urgency=medium
+lpub3d (2.4.9.4083) debian; urgency=medium
 
-  * LPub3D version 2.4.9.34.4082_20250121 for Linux
+  * LPub3D version 2.4.9.35.4083_20250121 for Linux
 
- -- Trevor SANDY <trevor.sandy@gmail.com>  Tue, 21 Jan 2025 04:19:35 +0100
+ -- Trevor SANDY <trevor.sandy@gmail.com>  Tue, 21 Jan 2025 04:21:53 +0100
diff --git a/builds/linux/obs/alldeps/debian/lpub3d.dsc b/builds/linux/obs/alldeps/debian/lpub3d.dsc
@@ -2,7 +2,7 @@ Format: 1.0
 Source: lpub3d
 Binary: lpub3d
 Architecture: any
-Version: 2.4.9.4082
+Version: 2.4.9.4083
 Maintainer: Trevor SANDY <trevor.sandy@gmail.com>
 Homepage: https://trevorsandy.github.io/lpub3d/
 Standards-Version: 3.9.7
diff --git a/builds/linux/obs/alldeps/lpub3d.spec b/builds/linux/obs/alldeps/lpub3d.spec
@@ -120,7 +120,7 @@ BuildRequires: fdupes
 Summary: An LDraw Building Instruction Editor
 Name: lpub3d
 Icon: lpub3d.xpm
-Version: 2.4.9.4082
+Version: 2.4.9.4083
 Release: <B_CNT>%{?dist}
 URL: https://trevorsandy.github.io/lpub3d
 Vendor: Trevor SANDY
@@ -816,10 +816,10 @@ update-desktop-database || true
 %endif
 
 %changelog
-* Tue Jan 21 2025 - trevor.dot.sandy.at.gmail.dot.com 2.4.9.4082
+* Tue Jan 21 2025 - trevor.dot.sandy.at.gmail.dot.com 2.4.9.4083
 - LPub3D 2.3.8 enhancements and fixes - see RELEASE_NOTES for details
 
-* Tue Jan 21 2025 - trevor.dot.sandy.at.gmail.dot.com 2.4.9.4082
+* Tue Jan 21 2025 - trevor.dot.sandy.at.gmail.dot.com 2.4.9.4083
 - LPub3D 2.3.7 enhancements and fixes - see RELEASE_NOTES for details
 
 * Tue May 31 2022 - trevor dot sandy at gmail dot com 2.4.4.2670
diff --git a/builds/linux/obs/debian/changelog b/builds/linux/obs/debian/changelog
@@ -1,5 +1,5 @@
-lpub3d (2.4.9.4082) debian; urgency=medium
+lpub3d (2.4.9.4083) debian; urgency=medium
 
-  * LPub3D version 2.4.9.34.4082_20250121 for Linux
+  * LPub3D version 2.4.9.35.4083_20250121 for Linux
 
- -- Trevor SANDY <trevor.sandy@gmail.com>  Tue, 21 Jan 2025 04:19:32 +0100
+ -- Trevor SANDY <trevor.sandy@gmail.com>  Tue, 21 Jan 2025 04:21:50 +0100
diff --git a/builds/linux/obs/debian/lpub3d.dsc b/builds/linux/obs/debian/lpub3d.dsc
@@ -2,7 +2,7 @@ Format: 1.0
 Source: lpub3d
 Binary: lpub3d
 Architecture: any
-Version: 2.4.9.4082
+Version: 2.4.9.4083
 Maintainer: Trevor SANDY <trevor.sandy@gmail.com>
 Homepage: https://trevorsandy.github.io/lpub3d/
 Standards-Version: 3.9.7
diff --git a/builds/linux/obs/lpub3d.spec b/builds/linux/obs/lpub3d.spec
@@ -82,7 +82,7 @@ BuildRequires: fdupes
 Summary: An LDraw Building Instruction Editor
 Name: lpub3d
 Icon: lpub3d.xpm
-Version: 2.4.9.4082
+Version: 2.4.9.4083
 Release: 1%{?dist}
 URL: https://trevorsandy.github.io/lpub3d
 Vendor: Trevor SANDY
@@ -314,10 +314,10 @@ update-desktop-database || true
 %endif
 
 %changelog
-* Tue Jan 21 2025 - trevor.dot.sandy.at.gmail.dot.com 2.4.9.4082
+* Tue Jan 21 2025 - trevor.dot.sandy.at.gmail.dot.com 2.4.9.4083
 - LPub3D 2.4.4 enhancements and fixes - see RELEASE_NOTES for details
 
-* Tue Jan 21 2025 - trevor.dot.sandy.at.gmail.dot.com 2.4.9.4082
+* Tue Jan 21 2025 - trevor.dot.sandy.at.gmail.dot.com 2.4.9.4083
 - LPub3D 2.4.4 enhancements and fixes - see RELEASE_NOTES for details
 
 * Tue May 31 2022 - trevor dot sandy at gmail dot com 2.4.4.2670
diff --git a/builds/utilities/version.info b/builds/utilities/version.info
@@ -1 +1 @@
-2 4 9 34 4082 b2d6c97e9
+2 4 9 35 4083 7a9115d7c
diff --git a/gitversion.pri b/gitversion.pri
@@ -53,7 +53,7 @@ equals(GIT_DIR, undefined) {
 
     # Check if we do not have a valid version number (i.e. no version tag found)
     isEmpty(GIT_VERSION) {
-        GIT_REVISION = 34
+        GIT_REVISION = 35
         GIT_SHA      = $$system($$GIT_BASE_COMMAND rev-parse --short HEAD 2> $$NULL_DEVICE)
         GIT_COMMIT   = $$system($$GIT_BASE_COMMAND rev-list --count HEAD 2> $$NULL_DEVICE)
         GIT_VERSION  = v$${VERSION}-$${GIT_REVISION}-$${GIT_SHA}
@@ -81,7 +81,7 @@ equals(GIT_DIR, undefined) {
         # Get commit count
         GIT_COMMIT = $$system($$GIT_BASE_COMMAND rev-list --count HEAD 2> $$NULL_DEVICE)
         isEmpty(GIT_COMMIT) {
-            GIT_COMMIT = 4082
+            GIT_COMMIT = 4083
             message("~~~ ERROR LPUB3D! GIT_COMMIT NOT DEFINED, USING $$GIT_COMMIT ~~~")
         }
 
@@ -129,7 +129,7 @@ if (equals(USE_GIT_VER_FILE, true)|equals(USE_VERSION_INFO_VAR, true)) {
             GIT_VERSION = $$cat($$GIT_VER_FILE, lines)
         } else {
             message("~~~ ERROR LPUB3D! $$GIT_DIR_ENV VERSION_INFO FILE $$GIT_VER_FILE NOT FOUND ~~~")
-            GIT_VERSION = $${VERSION}.34.4082.b2d6c97e9
+            GIT_VERSION = $${VERSION}.35.4083.7a9115d7c
             message("~~~ $${LPUB3D} GIT_DIR [$$GIT_DIR_ENV, USING VERSION] $$GIT_VERSION ~~~")
             GIT_VERSION ~= s/\./" "
         }
diff --git a/lclib/common/lc_global.h b/lclib/common/lc_global.h
@@ -71,7 +71,7 @@ char* strupr(char* string);
 #define LC_VERSION_PATCH 0
 #define LC_VERSION_TEXT "23.03"
 /*** LPub3D Mod - LeoCAD Git SHA ***/
-#define LC_VERSION_SHA "f2a2e44"
+#define LC_VERSION_SHA "79dbf99"
 /*** LPub3D Mod end ***/
 
 
diff --git a/lclib/common/lc_model.cpp b/lclib/common/lc_model.cpp
@@ -2516,13 +2516,13 @@ bool lcModel::RemoveCameraIndex(size_t CameraIdx)
 }
 /*** LPub3D Mod end ***/
 
-void lcModel::AddPiece(PieceInfo* PieceInfo, quint32 Section)
+lcPiece* lcModel::AddPiece(PieceInfo* PieceInfo, quint32 Section)
 {
 	if (!PieceInfo)
 		PieceInfo = gMainWindow->GetCurrentPieceInfo();
 
 	if (!PieceInfo)
-		return;
+		return nullptr;
 
 	lcPiece* Last = mPieces.empty() ? nullptr : mPieces.back().get();
 
@@ -2579,6 +2579,8 @@ void lcModel::AddPiece(PieceInfo* PieceInfo, quint32 Section)
 	ClearSelectionAndSetFocus(Piece, LC_PIECE_SECTION_POSITION, false);
 
 	SaveCheckpoint(tr("Adding Piece"));
+
+	return Piece;
 }
 
 void lcModel::AddPiece(lcPiece* Piece)
diff --git a/lclib/common/lc_model.h b/lclib/common/lc_model.h
@@ -246,7 +246,7 @@ class lcModel
 	void InsertStep(lcStep Step);
 	void RemoveStep(lcStep Step);
 
-	void AddPiece(PieceInfo* Info, quint32 Section);
+	lcPiece* AddPiece(PieceInfo* Info, quint32 Section);
 	void DeleteAllCameras();
 	void DeleteSelectedObjects();
 	void ResetSelectedPiecesPivotPoint();
diff --git a/lclib/common/lc_partselectionwidget.cpp b/lclib/common/lc_partselectionwidget.cpp
@@ -549,11 +549,34 @@ lcPartSelectionListView::lcPartSelectionListView(QWidget* Parent, lcPartSelectio
 	lcPartSelectionItemDelegate* ItemDelegate = new lcPartSelectionItemDelegate(this, mListModel);
 	setItemDelegate(ItemDelegate);
 
-	connect(this, SIGNAL(customContextMenuRequested(QPoint)), SLOT(CustomContextMenuRequested(QPoint)));
+	connect(this, &QListView::doubleClicked, this, &lcPartSelectionListView::DoubleClicked);
+	connect(this, &QListView::customContextMenuRequested, this, &lcPartSelectionListView::CustomContextMenuRequested);
 
 	SetIconSize(lcGetProfileInt(LC_PROFILE_PARTS_LIST_ICONS));
 }
 
+void lcPartSelectionListView::keyPressEvent(QKeyEvent* KeyEvent)
+{
+	if (KeyEvent->key() == Qt::Key_Enter)
+	{
+		PieceInfo* Info = GetCurrentPart();
+
+		emit PartPicked(Info);
+
+		return;
+	}
+
+	return QListView::keyPressEvent(KeyEvent);
+}
+
+void lcPartSelectionListView::DoubleClicked(const QModelIndex& Index)
+{
+	PieceInfo* Info = GetListModel()->GetPieceInfo(Index.row());
+
+	if (Info)
+		emit PartPicked(Info);
+}
+
 void lcPartSelectionListView::CustomContextMenuRequested(QPoint Pos)
 {
 	if (!mPartSelectionWidget)
@@ -880,7 +903,7 @@ lcPartSelectionWidget::lcPartSelectionWidget(QWidget* Parent)
 	Layout->addWidget(mSplitter);
 	setLayout(Layout);
 
-	connect(mPartsWidget, &QListView::doubleClicked, this, &lcPartSelectionWidget::PartViewDoubleClicked);
+	connect(mPartsWidget, &lcPartSelectionListView::PartPicked, this, &lcPartSelectionWidget::PartViewPartPicked);
 	connect(mPartsWidget->selectionModel(), &QItemSelectionModel::currentChanged, this, &lcPartSelectionWidget::PartViewSelectionChanged);
 	connect(mFilterWidget, &QLineEdit::textChanged, this, &lcPartSelectionWidget::FilterChanged);
 	connect(mCategoriesWidget, &QTreeWidget::currentItemChanged, this, &lcPartSelectionWidget::CategoryChanged);
@@ -1081,10 +1104,8 @@ void lcPartSelectionWidget::PartViewSelectionChanged(const QModelIndex& Current,
 	emit CurrentPartChanged(mPartsWidget->GetCurrentPart());
 }
 
-void lcPartSelectionWidget::PartViewDoubleClicked(const QModelIndex& Index)
+void lcPartSelectionWidget::PartViewPartPicked(PieceInfo* Info)
 {
-	PieceInfo* Info = mPartsWidget->GetListModel()->GetPieceInfo(Index.row());
-
 	if (Info)
 		emit PartPicked(Info);
 }
diff --git a/lclib/common/lc_partselectionwidget.h b/lclib/common/lc_partselectionwidget.h
@@ -219,6 +219,9 @@ class lcPartSelectionListView : public QListView
 	void UpdateInUseCategory();
 	void UpdateViewMode();
 
+signals:
+	void PartPicked(PieceInfo* Info);
+
 public slots:
 	void CustomContextMenuRequested(QPoint Pos);
 	void SetNoIcons();
@@ -238,9 +241,13 @@ public slots:
 	void ToggleListMode();
 	void ToggleFixedColor();
 
+protected slots:
+	void DoubleClicked(const QModelIndex& Index);
+
 protected:
 	void SetIconSize(int Size);
 	void SetPartFilterType(lcPartFilterType Option);
+	void keyPressEvent(QKeyEvent* KeyEvent) override;
 
 	lcPartSelectionListModel* mListModel = nullptr;
 	lcPartSelectionWidget* mPartSelectionWidget = nullptr;
@@ -318,7 +325,7 @@ protected slots:
 	void FilterCategoriesTriggered();
 	void CategoryChanged(QTreeWidgetItem* Current, QTreeWidgetItem* Previous);
 	void PartViewSelectionChanged(const QModelIndex& Current, const QModelIndex& Previous);
-	void PartViewDoubleClicked(const QModelIndex& Index);
+	void PartViewPartPicked(PieceInfo* Info);
 	void OptionsMenuAboutToShow();
 	void EditPartPalettes();
 
diff --git a/lclib/common/lc_view.cpp b/lclib/common/lc_view.cpp
@@ -17,7 +17,7 @@
 #include "lc_viewsphere.h"
 #include "lc_findreplacewidget.h"
 #include "lc_library.h"
-#include "lc_partselectionwidget.h"
+#include "lc_qutils.h"
 /*** LPub3D Mod - Rotate Step ***/
 #include "lpub.h"
 /*** LPub3D Mod end ***/
@@ -329,29 +329,15 @@ void lcView::ShowTrainTrackPopup()
 	if (!TrainTrackInfo)
 		return;
 
-	QMenu* Menu = new QMenu(mWidget);
+	PieceInfo* Info = lcShowTrainTrackPopup(mWidget, TrainTrackInfo);
 
-	QWidgetAction* Action = new QWidgetAction(Menu);
-	lcPartSelectionListView* ListView = new lcPartSelectionListView(mWidget, nullptr);
-	Action->setDefaultWidget(ListView);
-	Menu->addAction(Action);
-
-	std::vector<PieceInfo*> Parts = lcGetPiecesLibrary()->GetTrainTrackParts(TrainTrackInfo);
-
-	ListView->SetCustomParts(Parts);
-
-	connect(ListView, &QListView::doubleClicked, [this, Menu, ListView, ActiveModel]()
+	if (Info)
 	{
-		ActiveModel->AddPiece(ListView->GetCurrentPart(), mTrackToolSection);
-		lcObject* Focus = ActiveModel->GetFocusObject();
-		if (Focus && Focus->IsPiece())
-			ActiveModel->UpdateTrainTrackConnections((lcPiece*)Focus);
-		Menu->close();
-	});
+		Piece = ActiveModel->AddPiece(Info, mTrackToolSection);
 
-	Menu->exec(QCursor::pos());
-
-	delete Menu;
+		if (Piece)
+			ActiveModel->UpdateTrainTrackConnections(Piece);
+	}
 }
 
 void lcView::ShowContextMenu() const
diff --git a/lclib/qt/lc_qutils.cpp b/lclib/qt/lc_qutils.cpp
@@ -229,6 +229,71 @@ void lcPieceIdPickerPopup::Close()
 		Menu->close();
 }
 
+lcTrainTrackPickerPopup::lcTrainTrackPickerPopup(QWidget* Parent, const lcTrainTrackInfo* TrainTrackInfo)
+	: QWidget(Parent)
+{
+	QVBoxLayout* Layout = new QVBoxLayout(this);
+
+	mPartSelectionListView = new lcPartSelectionListView(this, nullptr);
+	Layout->addWidget(mPartSelectionListView);
+
+	mPartSelectionListView->setMinimumWidth(450);
+	mPartSelectionListView->setDragEnabled(false);
+
+	std::vector<PieceInfo*> Parts = lcGetPiecesLibrary()->GetTrainTrackParts(TrainTrackInfo);
+
+	mPartSelectionListView->SetCustomParts(Parts);
+
+	connect(mPartSelectionListView, &lcPartSelectionListView::PartPicked, this, &lcTrainTrackPickerPopup::Accept);
+
+	QDialogButtonBox* ButtonBox = new QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Cancel, this);
+	Layout->addWidget(ButtonBox);
+
+	QObject::connect(ButtonBox, &QDialogButtonBox::accepted, this, &lcTrainTrackPickerPopup::Accept);
+	QObject::connect(ButtonBox, &QDialogButtonBox::rejected, this, &lcTrainTrackPickerPopup::Reject);
+}
+
+void lcTrainTrackPickerPopup::showEvent(QShowEvent* ShowEvent)
+{
+	QWidget::showEvent(ShowEvent);
+
+	mPartSelectionListView->setFocus();
+}
+
+void lcTrainTrackPickerPopup::Accept()
+{
+	mPickedTrainTrack = mPartSelectionListView->GetCurrentPart();
+
+	Close();
+}
+
+void lcTrainTrackPickerPopup::Reject()
+{
+	Close();
+}
+
+void lcTrainTrackPickerPopup::Close()
+{
+	QMenu* Menu = qobject_cast<QMenu*>(parent());
+
+	if (Menu)
+		Menu->close();
+}
+
+PieceInfo* lcShowTrainTrackPopup(QWidget* Parent, const lcTrainTrackInfo* TrainTrackInfo)
+{
+	std::unique_ptr<QMenu> Menu(new QMenu(Parent));
+	QWidgetAction* Action = new QWidgetAction(Menu.get());
+	lcTrainTrackPickerPopup* Popup = new lcTrainTrackPickerPopup(Menu.get(), TrainTrackInfo);
+
+	Action->setDefaultWidget(Popup);
+	Menu->addAction(Action);
+
+	Menu->exec(QCursor::pos());
+
+	return Popup->GetPickedTrainTrack();
+}
+
 lcColorDialogPopup::lcColorDialogPopup(const QColor& InitialColor, QWidget* Parent)
 	: QWidget(Parent)
 {
diff --git a/lclib/qt/lc_qutils.h b/lclib/qt/lc_qutils.h
diff --git a/mainApp/docs/CREDITS.txt b/mainApp/docs/CREDITS.txt
diff --git a/mainApp/docs/README.txt b/mainApp/docs/README.txt
diff --git a/mainApp/docs/RELEASE_NOTES.html b/mainApp/docs/RELEASE_NOTES.html
diff --git a/mainApp/extras/LPub3D_Npp_UDL.xml b/mainApp/extras/LPub3D_Npp_UDL.xml
diff --git a/mainApp/lpub3d.appdata.xml b/mainApp/lpub3d.appdata.xml

-Original file line number
+Diff line change
@@ @@ -1,5 +1,5 @@ @@
 -lpub3d (2.4.9.4082) debian; urgency=medium
 +lpub3d (2.4.9.4083) debian; urgency=medium
 -  * LPub3D version 2.4.9.34.4082_20250121 for Linux
 +  * LPub3D version 2.4.9.35.4083_20250121 for Linux
 - -- Trevor SANDY <[email protected]>  Tue, 21 Jan 2025 04:19:35 +0100
 + -- Trevor SANDY <[email protected]>  Tue, 21 Jan 2025 04:21:53 +0100
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-2 4 9 34 4082 b2d6c97e9`
	`1`	`+2 4 9 35 4083 7a9115d7c`