Merge branch 'alxsa-align-tool-layout' into 'master'

tools: Move layer extent options down a line See merge request GNOME/gimp!2287
build/linux: Update poppler module to 25.10
2025-10-05 21:02:42 +02:00 · 2025-10-05 07:49:36 +00:00 · 2025-10-04 18:51:18 -03:00 · 2025-10-04 16:16:49 -03:00 · 2025-10-04 16:12:00 -03:00 · 2025-10-04 12:48:26 +00:00
6 changed files with 396 additions and 387 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -541,8 +541,7 @@ gimp-snap:
    PKGCONF_RELOCATABLE_OPTION: '-Dpkgconfig.relocatable=true'
  before_script:
    - if (-not $env:MSYSTEM_PREFIX) { $env:MSYSTEM_PREFIX = if ((Get-WmiObject Win32_ComputerSystem).SystemType -like 'ARM64*') { 'clangarm64' } else { 'clang64' }}
-    # FIXME:'gimpenv' have buggy code about Windows paths. See: https://gitlab.gnome.org/GNOME/gimp/-/issues/12284
-    - $GIMP_PREFIX = "$PWD\_install-$env:MSYSTEM_PREFIX".Replace('\', '/')
+    - $GIMP_PREFIX = "$PWD\_install-$env:MSYSTEM_PREFIX"
  timeout: 30m

 .win_environ: &WIN_ENVIRON
--- a/app/tools/gimpalignoptions.c
+++ b/app/tools/gimpalignoptions.c
@@ -374,17 +374,19 @@ gimp_align_options_gui (GimpToolOptions *tool_options)
  GObject          *config  = G_OBJECT (tool_options);
  GimpAlignOptions *options = GIMP_ALIGN_OPTIONS (tool_options);
  GtkWidget        *vbox    = gimp_tool_options_gui (tool_options);
+  GtkWidget        *vbox2;
  GtkWidget        *widget;
  GtkWidget        *section_vbox;
  GtkWidget        *items_grid;
  GtkWidget        *hbox;
+  GtkWidget        *align_hbox;
  GtkWidget        *frame;
  GtkWidget        *combo;
  gchar            *text;
  gint              n = 0;

  /* Selected objects */
-  frame = gimp_frame_new (_("Targets"));
+  frame = gimp_frame_new (_("Align"));
  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
  gtk_widget_show (frame);

@@ -396,25 +398,14 @@ gimp_align_options_gui (GimpToolOptions *tool_options)
  gtk_container_add (GTK_CONTAINER (section_vbox), items_grid);
  gtk_widget_show (items_grid);

-  widget = gimp_prop_check_button_new (config, "align-contents", NULL);
-  widget = gimp_prop_expanding_frame_new (config, "align-layers",
-                                          NULL, widget, NULL);
+  widget = gimp_prop_check_button_new (config, "align-layers", NULL);
  gtk_grid_attach (GTK_GRID (items_grid), widget, 0, 0, 1, 1);

  widget = gimp_prop_check_button_new (config, "align-paths", NULL);
  gtk_grid_attach (GTK_GRID (items_grid), widget, 0, 1, 1, 1);

-  options->priv->pivot_selector = gimp_pivot_selector_new (0.0, 0.0, 1.0, 1.0);
-  gtk_widget_set_tooltip_text (options->priv->pivot_selector,
-                               _("Set anchor point of targets"));
-  gimp_pivot_selector_set_position (GIMP_PIVOT_SELECTOR (options->priv->pivot_selector),
-                                    options->priv->pivot_x, options->priv->pivot_y);
-  gtk_grid_attach (GTK_GRID (items_grid), options->priv->pivot_selector, 1, 0, 1, 2);
-  gtk_widget_show (options->priv->pivot_selector);
-
-  g_signal_connect (options->priv->pivot_selector, "changed",
-                    G_CALLBACK (gimp_align_options_pivot_changed),
-                    options);
+  widget = gimp_prop_check_button_new (config, "align-contents", NULL);
+  gtk_grid_attach (GTK_GRID (items_grid), widget, 0, 2, 1, 1);

  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
  gtk_box_pack_start (GTK_BOX (section_vbox), hbox, FALSE, FALSE, 0);
@@ -438,18 +429,12 @@ gimp_align_options_gui (GimpToolOptions *tool_options)

  widget = gtk_label_new (NULL);
  gtk_box_pack_start (GTK_BOX (section_vbox), widget, FALSE, FALSE, 0);
-  gtk_widget_show (widget);
+  if (options->priv->selected_guides)
+    gtk_widget_set_visible (widget, TRUE);
+  else
+    gtk_widget_set_visible (widget, FALSE);
  options->priv->selected_guides_label = widget;

-  /* Align frame */
-  frame = gimp_frame_new (_("Align"));
-  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
-  gtk_widget_show (frame);
-
-  section_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
-  gtk_container_add (GTK_CONTAINER (frame), section_vbox);
-  gtk_widget_show (section_vbox);
-
  /* Align frame: reference */
  combo = gimp_prop_enum_combo_box_new (config, "align-reference", 0, 0);
  gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Relative to"));
@@ -459,7 +444,10 @@ gimp_align_options_gui (GimpToolOptions *tool_options)

  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
  gtk_box_pack_start (GTK_BOX (section_vbox), hbox, FALSE, FALSE, 0);
-  gtk_widget_show (hbox);
+  if (options->align_reference == GIMP_ALIGN_REFERENCE_PICK)
+    gtk_widget_set_visible (hbox, TRUE);
+  else
+    gtk_widget_set_visible (hbox, FALSE);
  options->priv->reference_box = hbox;

  widget = gtk_image_new_from_icon_name (GIMP_ICON_CURSOR, GTK_ICON_SIZE_BUTTON);
@@ -472,14 +460,21 @@ gimp_align_options_gui (GimpToolOptions *tool_options)

  widget = gtk_label_new (NULL);
  gtk_box_pack_start (GTK_BOX (section_vbox), widget, FALSE, FALSE, 0);
-  gtk_widget_show (widget);
  options->priv->reference_label = widget;

  /* Align frame: buttons */
+  align_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_box_pack_start (GTK_BOX (section_vbox), align_hbox, FALSE, FALSE, 0);
+  gtk_widget_set_visible (align_hbox, TRUE);
+
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+  gtk_widget_set_valign (vbox2, GTK_ALIGN_CENTER);
+  gtk_container_add (GTK_CONTAINER (align_hbox), vbox2);
+  gtk_widget_set_visible (vbox2, TRUE);

  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
-  gtk_box_pack_start (GTK_BOX (section_vbox), hbox, FALSE, FALSE, 0);
-  gtk_widget_show (hbox);
+  gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
+  gtk_widget_set_visible (hbox, TRUE);

  n = 0;
  options->priv->align_ver_button[n++] =
@@ -495,8 +490,8 @@ gimp_align_options_gui (GimpToolOptions *tool_options)
                                   _("Align anchor points of targets on right edge of reference"));

  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
-  gtk_box_pack_start (GTK_BOX (section_vbox), hbox, FALSE, FALSE, 0);
-  gtk_widget_show (hbox);
+  gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
+  gtk_widget_set_visible (hbox, TRUE);

  n = 0;
  options->priv->align_hor_button[n++] =
@@ -511,6 +506,19 @@ gimp_align_options_gui (GimpToolOptions *tool_options)
    gimp_align_options_button_new (options, GIMP_ALIGN_BOTTOM, hbox,
                                   _("Align anchor points of targets on bottom of reference"));

+  /* Anchor points square */
+  options->priv->pivot_selector = gimp_pivot_selector_new (0.0, 0.0, 1.0, 1.0);
+  gtk_widget_set_tooltip_text (options->priv->pivot_selector,
+                               _("Set anchor point of targets"));
+  gimp_pivot_selector_set_position (GIMP_PIVOT_SELECTOR (options->priv->pivot_selector),
+                                    options->priv->pivot_x, options->priv->pivot_y);
+  gtk_container_add (GTK_CONTAINER (align_hbox), options->priv->pivot_selector);
+  gtk_widget_set_visible (options->priv->pivot_selector, TRUE);
+
+  g_signal_connect (options->priv->pivot_selector, "changed",
+                    G_CALLBACK (gimp_align_options_pivot_changed),
+                    options);
+
  /* Distribute frame */
  frame = gimp_frame_new (_("Distribute"));
  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
@@ -842,6 +850,7 @@ gimp_align_options_update_area (GimpAlignOptions *options)
      gtk_widget_hide (options->priv->reference_box);
    }
  gtk_label_set_markup (GTK_LABEL (options->priv->reference_label), text);
+  gtk_widget_set_visible (options->priv->reference_label, (text) ? TRUE: FALSE);
  g_free (text);
 }

--- a/build/linux/flatpak/org.gimp.GIMP-nightly.json
+++ b/build/linux/flatpak/org.gimp.GIMP-nightly.json
@@ -245,8 +245,8 @@
            "sources": [
                {
                    "type": "archive",
-                    "url": "https://poppler.freedesktop.org/poppler-25.09.1.tar.xz",
-                    "sha256": "0c1091d01d3dd1664a13816861e812d02b29201e96665454b81b52d261fad658",
+                    "url": "https://poppler.freedesktop.org/poppler-25.10.0.tar.xz",
+                    "sha256": "6b5e9bb64dabb15787a14db1675291c7afaf9387438cc93a4fb7f6aec4ee6fe0",
                    "x-checker-data": {
                        "type": "anitya",
                        "project-id": 3686,
--- a/build/windows/2_build-gimp-msys2.ps1
+++ b/build/windows/2_build-gimp-msys2.ps1
@@ -32,8 +32,7 @@ if ($GITLAB_CI)
 # Prepare env
 if (-not $GIMP_PREFIX)
  {
-    #FIXME:'gimpenv' have buggy code about Windows paths. See: https://gitlab.gnome.org/GNOME/gimp/-/issues/12284
-    $GIMP_PREFIX = "$PWD\..\_install".Replace('\', '/')
+    $GIMP_PREFIX = "$PWD\..\_install"
  }
 Invoke-Expression ((Get-Content .gitlab-ci.yml | Select-String 'win_environ\[' -Context 0,7) -replace '> ','' -replace '- ','')

--- a/meson.build
+++ b/meson.build
@@ -128,7 +128,7 @@ fs        = import('fs')

 cc        = meson.get_compiler('c')
 cxx       = meson.get_compiler('cpp')
-prefix    = get_option('prefix')
+prefix    = get_option('prefix').replace('\\', '/')
 buildtype = get_option('buildtype')
 exec_ver  = '-' + gimp_app_version

--- a/po-libgimp/da.po
+++ b/po-libgimp/da.po
Author	SHA1	Message	Date
Alx Sa	b24cf08467	Merge branch 'alxsa-align-tool-layout' into 'master' tools: Move layer extent options down a line See merge request GNOME/gimp!2287	2025-10-05 07:49:36 +00:00
Bruno Lopes	d8d73266bc	build/linux: Update poppler module to 25.10 Synced from `6d4124f7b8`	2025-10-04 18:51:18 -03:00
Bruno Lopes	356c2baec5	gitlab-ci, build/windows: Remove forgotten comment about fixed #12284	2025-10-04 16:16:49 -03:00
Bruno Lopes	aea7042aa1	meson: Support Windows native paths (aka backslashes) on -Dprefix Closes: #12284	2025-10-04 16:12:00 -03:00
Alan Mortensen	97944a5415	Update Danish translation (cherry picked from commit `d81cfcc325`)	2025-10-04 12:48:26 +00:00
Alx Sa	4221bb76da	Redesign 3	2025-10-03 11:59:15 +00:00
Alx Sa	a9cab5d374	tools: Additional layout revision	2025-09-21 18:56:42 +00:00
Alx Sa	ae7bbbedbf	tools: Redesign Align Tool GUI	2025-09-21 08:57:40 -04:00