Merge pull request #707 from ispyisail/fix/conductor-text-rotation-not-saved-bug312

Fix bugtracker #312: wire text rotation not preserved on reload
cmake: fix QET_MIME_PACKAGE_PATH escaping CMAKE_INSTALL_PREFIX
2026-09-27 20:44:13 +02:00 · 2026-08-15 17:10:28 +02:00 · 2026-08-15 16:42:10 +02:00 · 2026-08-15 16:17:10 +02:00 · 2026-08-10 22:37:23 +12:00
3 changed files with 11 additions and 3 deletions
@@ -23,6 +23,14 @@ set(QAPPLICATION_CLASS QApplication)

 Include(FetchContent)

+if(EXISTS "${CMAKE_SOURCE_DIR}/SingleApplication/CMakeLists.txt")
+  # Submodule deja present dans l'arbre source (clone --recursive, tarball
+  # de distro deja peuple via "git submodule update", etc.) : on l'utilise
+  # tel quel, sans acces reseau. Necessaire pour les builds hors-ligne
+  # (pbuilder/sbuild avec FETCHCONTENT_FULLY_DISCONNECTED=ON, Launchpad PPA...).
+  set(FETCHCONTENT_SOURCE_DIR_SINGLEAPPLICATION "${CMAKE_SOURCE_DIR}/SingleApplication")
+endif()
+
 FetchContent_Declare(
  SingleApplication
  GIT_REPOSITORY https://github.com/itay-grudev/SingleApplication.git
@@ -28,7 +28,7 @@ if(UNIX AND NOT APPLE)
  set(QET_LANG_PATH               "share/qelectrotech/lang/")
  set(QET_EXAMPLES_PATH           "share/qelectrotech/examples/")
  set(QET_LICENSE_PATH            "doc/qelectrotech/")
-  set(QET_MIME_PACKAGE_PATH       "../share/mime/packages/")
+  set(QET_MIME_PACKAGE_PATH       "share/mime/packages/")
  set(QET_DESKTOP_PATH            "share/applications/")
  set(QET_ICONS_PATH              "share/icons/hicolor/")
  set(QET_MAN_PATH                "man/")
@@ -89,7 +89,7 @@ void RotateTextsCommand::undo()
 	m_anim_group->start();
 	
 	for(ConductorTextItem *cti : m_cond_texts.keys())
-		cti->forceMovedByUser(m_cond_texts.value(cti));
+		cti->forceRotateByUser(m_cond_texts.value(cti));
 }

 void RotateTextsCommand::redo()
@@ -101,7 +101,7 @@ void RotateTextsCommand::redo()
 	m_anim_group->start();
 	
 	for(ConductorTextItem *cti : m_cond_texts.keys())
-		cti->forceMovedByUser(true);
+		cti->forceRotateByUser(true);
 }

 void RotateTextsCommand::openDialog()
Author	SHA1	Message	Date
Laurent Trinques	2419faf931	Merge pull request #707 from ispyisail/fix/conductor-text-rotation-not-saved-bug312 Fix bugtracker #312: wire text rotation not preserved on reload	2026-08-15 17:10:28 +02:00
Laurent Trinques	ddbd1d8d75	cmake: fix QET_MIME_PACKAGE_PATH escaping CMAKE_INSTALL_PREFIX QET_MIME_PACKAGE_PATH was "../share/mime/packages/", a path relative to CMAKE_INSTALL_PREFIX. This only worked by accident with the old default prefix (/usr/local -> ../share resolves to /usr/share/mime, the conventional system location regardless of app prefix). With -DCMAKE_INSTALL_PREFIX=/usr (as used by Debian/Ubuntu packaging), the same "../share" escapes /usr entirely, landing at /share/mime instead of /usr/share/mime, which breaks dh_install (file not found under usr/) and would silently install the mime package definition outside any path desktop environments actually scan. Drop the "../" so the mime package path stays under the install prefix, matching standard practice (/usr/share/mime/packages or /usr/local/share/mime/packages).	2026-08-15 16:42:10 +02:00
Laurent Trinques	afb7442e8a	cmake: use vendored SingleApplication submodule when available FetchContent_Declare unconditionally tries to clone SingleApplication from GitHub, which breaks offline builds (e.g. Debian/Ubuntu pbuilder with FETCHCONTENT_FULLY_DISCONNECTED=ON, Launchpad PPA builds). If the SingleApplication submodule is already checked out in the source tree, point FETCHCONTENT_SOURCE_DIR_SINGLEAPPLICATION at it so FetchContent skips the network step entirely and reuses the local copy. Falls back to the existing git clone behavior otherwise, so this is a no-op for setups that don't vendor the submodule.	2026-08-15 16:17:10 +02:00
ispyisail	6c76b1f6a8	Fix bugtracker #312 : wire text rotation not preserved on reload RotateTextsCommand::undo()/redo() called cti->forceMovedByUser(...) instead of cti->forceRotateByUser(...) for ConductorTextItem entries - a copy-paste mix-up between the two parallel user-override flags that track independently whether a conductor's text was manually moved vs manually rotated. Because rotate_by_user_ was never actually set to true, the rotation attribute-writing gate in Conductor::toXml() (which checks wasRotatedByUser()) never fired, so a manual rotation applied via "Orienter les textes" (Edit > Orienter les textes / Ctrl+Space) was silently dropped on save: the rotation displayed correctly until the project was closed and reopened, at which point it reverted to default orientation. Fix swaps both calls to forceRotateByUser(...), matching what the constructor reads via wasRotatedByUser() when building m_cond_texts. Verified: clean rebuild (506/506, no new warnings). Live-verified under Xvfb that RotateTextsCommand's rotation correctly animates and applies to ConductorTextItem text (confirmed via the "Orienter les textes" dialog). A full save/close/reopen round-trip on a from-scratch two-element wire was attempted but not completed due to unreliable terminal-to-terminal wire drawing via synthetic mouse events in the window-manager-less Xvfb sandbox; confidence in the fix instead rests on tracing the exact save-gate code path (Conductor::toXml() gates solely on wasRotatedByUser(), which the constructor/undo/redo all already correctly reference elsewhere for the parallel moved-by-user flag).	2026-08-10 22:37:23 +12:00