Merge branch 'master' into issue-2224

Author: Matthias Koefferlein

.github/workflows/build.yml

@@ -49,7 +49,7 @@ jobs:
       - uses: hmarr/debug-action@v3
       - name: Cancel Workflow Action
         uses: styfle/[email protected]
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: ccache
         if: matrix.os != 'ubuntu-24.04-arm'
         uses: hendrikmuhs/[email protected]
@@ -66,7 +66,7 @@ jobs:
           mkdir -p $HOST_CCACHE_DIR
       - name: Build wheels (ARM)
         if: matrix.os == 'ubuntu-24.04-arm'
-        uses: pypa/cibuildwheel@v3.2.1
+        uses: pypa/cibuildwheel@v3.3.0
         env:
           # override the default CentOS “yum install … ccache” and drop ccache
           CIBW_BEFORE_ALL_LINUX: |
@@ -81,7 +81,7 @@ jobs:
 
       - name: Build wheels (all other platforms)
         if: matrix.os != 'ubuntu-24.04-arm'
-        uses: pypa/cibuildwheel@v3.2.1
+        uses: pypa/cibuildwheel@v3.3.0
         env:
           CIBW_BUILD: ${{ matrix.cibuild }}
           CIBW_ARCHS_MACOS: ${{ matrix.macos-arch }}
@@ -98,7 +98,7 @@ jobs:
           mv ./wheelhouse/.ccache $HOST_CCACHE_DIR
           ls -la $HOST_CCACHE_DIR
           ccache -s
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         with:
           name: artifact-${{ matrix.os }}-${{ matrix.cibw_arch }}-${{ strategy.job-index }}
           path: ./wheelhouse/*.whl
@@ -108,12 +108,12 @@ jobs:
     name: Make SDist
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
 
     - name: Build SDist
       run: pipx run build --sdist
 
-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@v5
       with:
         name: artifact-sdist
         path: dist/*.tar.gz
@@ -122,7 +122,7 @@ jobs:
     needs: [build, make_sdist]
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/download-artifact@v5
+    - uses: actions/download-artifact@v6
       with:
         merge-multiple: true
         path: dist
@@ -139,7 +139,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event_name == 'release' && github.event.action == 'published'
     steps:
-    - uses: actions/download-artifact@v5
+    - uses: actions/download-artifact@v6
       with:
         merge-multiple: true
         path: dist

.github/workflows/cache-maintenance.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Cleanup
         run: |

COPYRIGHT

@@ -7,18 +7,19 @@ Authors:
 Copyright:
 	Copyright (C) 2006-2025 by Matthias Köfferlein.
 
-    This program 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 or 3 of the License.
+    This program 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 3 of the
+    License, or (at your option) any later version.
 
     This program 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.
+    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 this package; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+    along with this program. If not, see
+    <https://www.gnu.org/licenses/>.
 
   On Debian GNU/Linux systems, the complete text of the GNU General
   Public License can be found in `/usr/share/common-licenses/GPL'.

src/edt/edt/edtPartialService.cc

@@ -762,9 +762,9 @@ PartialShapeFinder::visit_cell (const db::Cell &cell, const db::Box &hit_box, co
 {
   if (! point_mode ()) {
 
-    for (std::vector<int>::const_iterator l = layers ().begin (); l != layers ().end (); ++l) {
+    for (std::vector<unsigned int>::const_iterator l = layers ().begin (); l != layers ().end (); ++l) {
 
-      if (layers ().size () == 1 || (layers ().size () > 1 && cell.bbox ((unsigned int) *l).touches (scan_box))) {
+      if (layers ().size () == 1 || (layers ().size () > 1 && cell.bbox (*l).touches (scan_box))) {
 
         checkpoint ();
 
@@ -897,9 +897,9 @@ PartialShapeFinder::visit_cell (const db::Cell &cell, const db::Box &hit_box, co
 
   } else {
 
-    for (std::vector<int>::const_iterator l = layers ().begin (); l != layers ().end (); ++l) {
+    for (std::vector<unsigned int>::const_iterator l = layers ().begin (); l != layers ().end (); ++l) {
 
-      if (layers ().size () == 1 || (layers ().size () > 1 && cell.bbox ((unsigned int) *l).touches (hit_box))) {
+      if (layers ().size () == 1 || (layers ().size () > 1 && cell.bbox (*l).touches (hit_box))) {
 
         checkpoint ();
 
@@ -2315,8 +2315,8 @@ PartialService::mouse_release_event (const db::DPoint &p, unsigned int buttons,
     if (ui ()->mouse_event_viewport ().contains (p)) { 
 
       lay::Editable::SelectionMode mode = lay::Editable::Replace;
-      bool shift = ((m_buttons & lay::ShiftButton) != 0);
-      bool ctrl = ((m_buttons & lay::ControlButton) != 0);
+      bool shift = ((buttons & lay::ShiftButton) != 0);
+      bool ctrl = ((buttons & lay::ControlButton) != 0);
       if (shift && ctrl) {
         mode = lay::Editable::Invert;
       } else if (shift) {

src/lay/lay/gsiDeclLayMainWindow.cc

@@ -328,6 +328,12 @@ set_menu_items_hidden (lay::MainWindow *mw, const std::map<std::string, bool> &h
   mw->dispatcher ()->config_set (lay::cfg_menu_items_hidden, lay::pack_menu_items_hidden (hv));
 }
 
+static void
+clear_message (lay::MainWindow *mw, int priority)
+{
+  mw->message (std::string (), 0, priority);
+}
+
 Class<lay::MainWindow> decl_MainWindow (QT_EXTERNAL_BASE (QMainWindow) "lay", "MainWindow",
 
   //  Dispatcher interface and convenience functions
@@ -475,15 +481,36 @@ Class<lay::MainWindow> decl_MainWindow (QT_EXTERNAL_BASE (QMainWindow) "lay", "M
     "\n"
     "This method has been added in version 0.24."
   ) +
-  gsi::method ("message", &lay::MainWindow::message, gsi::arg ("message"), gsi::arg ("time", -1, "infinite"),
+  gsi::method_ext ("clear_message", &clear_message, gsi::arg ("priority", -1, "all priorities"),
+    "@brief Clears the message\n"
+    "When calling this method with a priority, it will clear the message in the given priority slot, thus "
+    "unhiding the messages with lower priority. This is equivalent to calling \\message with an empty string.\n"
+    "\n"
+    "When calling without a priority, all messages in all priority slots will be cleared.\n"
+    "\n"
+    "This method has been added in version 0.30.6."
+  ) +
+  gsi::method ("message", &lay::MainWindow::message, gsi::arg ("message"), gsi::arg ("time", -1, "infinite"), gsi::arg ("priority", 0),
     "@brief Displays a message in the status bar\n"
     "\n"
     "@param message The message to display\n"
     "@param time The time how long to display the message in ms. A negative value means 'infinitely'.\n"
+    "@param priority The priority of the message. Higher-priority messages have precendence over lower-priority ones.\n"
     "\n"
     "This given message is shown in the status bar for the given time.\n" 
+    "If a priority is given, higher-priority messages have precedence over lower-priority ones.\n"
+    "Placing an empty message clears a message with a given priority and unhides messages with lower "
+    "priority. Standard messages like selection descriptions have priority 0, which is the lowest priority.\n"
+    "\n"
+    "Messages generated during modal actions (e.g. 'Click on first point') by convention should have priority 10 "
+    "and should be tied to the active state of a plugin. This ensures there is only one such message.\n"
+    "Higher-priority messages must be cleared (set to empty string) explicitly to unhide lower-priority messages "
+    "when the indicated action is finished.\n"
+    "\n"
+    "\\clear_message is a convenience method that will clear messages.\n"
     "\n"
-    "This method has been added in version 0.18. The 'time' parameter was made optional in version 0.28.10."
+    "This method has been added in version 0.18. The 'time' parameter was made optional in version 0.28.10.\n"
+    "The 'priority' argument has been added in version 0.30.6."
   ) +
   gsi::method ("resize", (void (lay::MainWindow::*)(int, int)) &lay::MainWindow::resize, gsi::arg ("width"), gsi::arg ("height"),
     "@brief Resizes the window\n"