Merge branch 'main' into lenemter/notification-add-button

lenemter · web-flow · commit fe7dbef101bd · 2025-03-02T17:08:11.000+03:00
diff --git a/po/ja.po b/po/ja.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: noise\n"
 "Report-Msgid-Bugs-To: https://github.com/elementary/gala/issues\n"
 "POT-Creation-Date: 2025-02-10 20:55+0000\n"
-"PO-Revision-Date: 2024-12-22 20:56+0000\n"
+"PO-Revision-Date: 2025-03-01 16:01+0000\n"
 "Last-Translator: Ryo Nakano <ryonakaknock3@gmail.com>\n"
 "Language-Team: Japanese <https://l10n.elementary.io/projects/desktop/gala/ja/"
 ">\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 5.8.4\n"
+"X-Generator: Weblate 5.9.2\n"
 "X-Launchpad-Export-Date: 2017-03-02 05:47+0000\n"
 
 #: daemon/DBus.vala:82 daemon-gtk3/BackgroundMenu.vala:11
@@ -193,7 +193,7 @@ msgstr "すべての開いているウィンドウとワークスペースを参
 
 #: data/gala-other.desktop.in:4
 msgid "Other"
-msgstr "そのほか"
+msgstr "その他"
 
 #: data/gala-other.desktop.in:5
 msgid "Fallback desktop file for notifications from outdated applications."
@@ -291,11 +291,11 @@ msgstr "スクリーンショット %s"
 
 #: src/WindowManager.vala:2375
 msgid "Screenshot is saved to clipboard"
-msgstr ""
+msgstr "スクリーンショットをクリップボードに保存しました"
 
 #: src/WindowManager.vala:2375
 msgid "Screenshot saved to screenshots folder"
-msgstr ""
+msgstr "スクリーンショットを“スクリーンショット”フォルダーに保存しました"
 
 #~ msgid ""
 #~ "Set the keyboard layout correctly at startup so that the indicator "
diff --git a/src/InternalUtils.vala b/src/InternalUtils.vala
@@ -13,11 +13,6 @@ namespace Gala {
     }
 
     public class InternalUtils {
-        public static bool workspaces_only_on_primary () {
-            return Meta.Prefs.get_dynamic_workspaces ()
-                && Meta.Prefs.get_workspaces_only_on_primary ();
-        }
-
         /**
          * set the area where clutter can receive events
          **/
@@ -318,9 +313,8 @@ namespace Gala {
 #else
         public static Meta.Rectangle get_workspaces_geometry (Meta.Display display) {
 #endif
-            if (InternalUtils.workspaces_only_on_primary ()) {
-                var primary = display.get_primary_monitor ();
-                return display.get_monitor_geometry (primary);
+            if (Meta.Prefs.get_workspaces_only_on_primary ()) {
+                return display.get_monitor_geometry (display.get_primary_monitor ());
             } else {
                 float screen_width, screen_height;
                 display.get_size (out screen_width, out screen_height);
diff --git a/src/Widgets/IconGroup.vala b/src/Widgets/IconGroup.vala
@@ -282,9 +282,9 @@ public class Gala.IconGroup : CanvasActor {
         var scaled_size = InternalUtils.scale_to_int (SIZE, scale_factor);
 
         if (n_windows < 1) {
-            if (!Meta.Prefs.get_dynamic_workspaces ()
-                || workspace_index != manager.get_n_workspaces () - 1)
+            if (workspace_index != manager.get_n_workspaces () - 1) {
                 return;
+            }
 
             var buffer = new Drawing.BufferSurface (scaled_size, scaled_size);
             var offset = scaled_size / 2 - InternalUtils.scale_to_int (PLUS_WIDTH, scale_factor) / 2;
@@ -390,7 +390,6 @@ public class Gala.IconGroup : CanvasActor {
     private Clutter.Actor? drag_begin (float click_x, float click_y) {
         unowned Meta.WorkspaceManager manager = workspace.get_display ().get_workspace_manager ();
         if (icon_container.get_n_children () < 1 &&
-            Meta.Prefs.get_dynamic_workspaces () &&
             workspace.index () == manager.get_n_workspaces () - 1) {
             return null;
         }
diff --git a/src/Widgets/MultitaskingView.vala b/src/Widgets/MultitaskingView.vala
@@ -110,37 +110,7 @@ namespace Gala {
             Meta.Prefs.add_listener ((pref) => {
                 if (pref == Meta.Preference.WORKSPACES_ONLY_ON_PRIMARY) {
                     update_monitors ();
-                    return;
                 }
-
-                if (Meta.Prefs.get_dynamic_workspaces () ||
-                    (pref != Meta.Preference.DYNAMIC_WORKSPACES && pref != Meta.Preference.NUM_WORKSPACES)) {
-                    return;
-                }
-
-                Idle.add (() => {
-                    unowned List<Meta.Workspace> existing_workspaces = null;
-                    for (int i = 0; i < manager.get_n_workspaces (); i++) {
-                        existing_workspaces.append (manager.get_workspace_by_index (i));
-                    }
-
-                    foreach (unowned var child in workspaces.get_children ()) {
-                        unowned var workspace_clone = (WorkspaceClone) child;
-                        if (existing_workspaces.index (workspace_clone.workspace) < 0) {
-                            workspace_clone.window_selected.disconnect (window_selected);
-                            workspace_clone.selected.disconnect (activate_workspace);
-
-                            icon_groups.remove_group (workspace_clone.icon_group);
-
-                            workspace_clone.destroy ();
-                        }
-                    }
-
-                    update_monitors ();
-                    update_positions (false);
-
-                    return Source.REMOVE;
-                });
             });
 
             style_manager.notify["prefers-color-scheme"].connect (update_brightness_effect);
@@ -167,7 +137,7 @@ namespace Gala {
 
             var primary = display.get_primary_monitor ();
 
-            if (InternalUtils.workspaces_only_on_primary ()) {
+            if (Meta.Prefs.get_workspaces_only_on_primary ()) {
                 for (var monitor = 0; monitor < display.get_n_monitors (); monitor++) {
                     if (monitor == primary) {
                         continue;
diff --git a/src/Widgets/WindowClone.vala b/src/Widgets/WindowClone.vala
@@ -609,11 +609,6 @@ public class Gala.WindowClone : Clutter.Actor {
         } else if (destination is FramedBackground) {
             workspace = ((WorkspaceClone) destination.get_parent ()).workspace;
         } else if (destination is WorkspaceInsertThumb) {
-            if (!Meta.Prefs.get_dynamic_workspaces ()) {
-                drag_canceled ();
-                return;
-            }
-
             unowned WorkspaceInsertThumb inserter = (WorkspaceInsertThumb) destination;
 
             var will_move = window.get_workspace ().index () != inserter.workspace_index;
diff --git a/src/Widgets/WorkspaceInsertThumb.vala b/src/Widgets/WorkspaceInsertThumb.vala
@@ -36,10 +36,6 @@ public class Gala.WorkspaceInsertThumb : Clutter.Actor {
 
         var drop = new DragDropAction (DragDropActionType.DESTINATION, "multitaskingview-window");
         drop.crossed.connect ((target, hovered) => {
-            if (!Meta.Prefs.get_dynamic_workspaces () && (target != null && target is WindowClone)) {
-                return;
-            }
-
             if (!hovered) {
                 if (expand_timeout != 0) {
                     Source.remove (expand_timeout);
diff --git a/src/WindowManager.vala b/src/WindowManager.vala
@@ -477,11 +477,10 @@ namespace Gala {
             unowned var manager = display.get_workspace_manager ();
             var active_workspace_index = manager.get_active_workspace_index ();
             var index = active_workspace_index + direction;
-            var dynamic_offset = Meta.Prefs.get_dynamic_workspaces () ? 1 : 0;
 
             if (index < 0) {
-                index = manager.get_n_workspaces () - 1 - dynamic_offset;
-            } else if (index > manager.get_n_workspaces () - 1 - dynamic_offset) {
+                index = manager.get_n_workspaces () - 2;
+            } else if (index > manager.get_n_workspaces () - 2) {
                 index = 0;
             }
 
@@ -799,7 +798,7 @@ namespace Gala {
             unowned var active = manager.get_active_workspace ();
 
             // don't allow empty workspaces to be created by moving, if we have dynamic workspaces
-            if (Meta.Prefs.get_dynamic_workspaces () && Utils.get_n_windows (active) == 1 && workspace.index () == manager.n_workspaces - 1) {
+            if (Utils.get_n_windows (active) == 1 && workspace.index () == manager.n_workspaces - 1) {
                 InternalUtils.bell_notify (display);
                 return;
             }
@@ -1872,7 +1871,7 @@ namespace Gala {
             float screen_width, screen_height;
             unowned var display = get_display ();
             var primary = display.get_primary_monitor ();
-            var move_primary_only = InternalUtils.workspaces_only_on_primary ();
+            var move_primary_only = Meta.Prefs.get_workspaces_only_on_primary ();
             var monitor_geom = display.get_monitor_geometry (primary);
             var clone_offset_x = move_primary_only ? monitor_geom.x : 0.0f;
             var clone_offset_y = move_primary_only ? monitor_geom.y : 0.0f;
@@ -2172,10 +2171,8 @@ namespace Gala {
             unowned var active_workspace = display.get_workspace_manager ().get_active_workspace ();
 
             // Show the real wallpaper again
-            var primary = display.get_primary_monitor ();
-            var move_primary_only = InternalUtils.workspaces_only_on_primary ();
-            if (move_primary_only) {
-                unowned var background = background_group.get_child_at_index (primary);
+            if (Meta.Prefs.get_workspaces_only_on_primary ()) {
+                unowned var background = background_group.get_child_at_index (display.get_primary_monitor ());
                 background.show ();
             } else {
                 ((BackgroundContainer) background_group).set_black_background (true);
diff --git a/src/WorkspaceManager.vala b/src/WorkspaceManager.vala
@@ -43,33 +43,25 @@ public class Gala.WorkspaceManager : Object {
         // There are some empty workspace at startup
         cleanup ();
 
-        if (Meta.Prefs.get_dynamic_workspaces ()) {
-            manager.override_workspace_layout (Meta.DisplayCorner.TOPLEFT, false, 1, -1);
-        }
+        manager.override_workspace_layout (Meta.DisplayCorner.TOPLEFT, false, 1, -1);
 
         for (var i = 0; i < manager.get_n_workspaces (); i++) {
             workspace_added (manager, i);
         }
 
-        Meta.Prefs.add_listener (prefs_listener);
-
         manager.workspace_switched.connect_after (workspace_switched);
         manager.workspace_added.connect (workspace_added);
         manager.workspace_removed.connect_after (workspace_removed);
         display.window_entered_monitor.connect (window_entered_monitor);
         display.window_left_monitor.connect (window_left_monitor);
 
         // make sure the last workspace has no windows on it
-        if (Meta.Prefs.get_dynamic_workspaces ()
-            && Utils.get_n_windows (manager.get_workspace_by_index (manager.get_n_workspaces () - 1)) > 0
-        ) {
+        if (Utils.get_n_windows (manager.get_workspace_by_index (manager.get_n_workspaces () - 1)) > 0) {
             append_workspace ();
         }
     }
 
     ~WorkspaceManager () {
-        Meta.Prefs.remove_listener (prefs_listener);
-
         unowned Meta.Display display = wm.get_display ();
         unowned Meta.WorkspaceManager manager = display.get_workspace_manager ();
         manager.workspace_added.disconnect (workspace_added);
@@ -106,10 +98,6 @@ public class Gala.WorkspaceManager : Object {
     }
 
     private void workspace_switched (Meta.WorkspaceManager manager, int from, int to, Meta.MotionDirection direction) {
-        if (!Meta.Prefs.get_dynamic_workspaces ()) {
-            return;
-        }
-
         // remove empty workspaces after we switched away from them unless it's the last one
         var prev_workspace = manager.get_workspace_by_index (from);
         if (Utils.get_n_windows (prev_workspace) < 1
@@ -131,7 +119,7 @@ public class Gala.WorkspaceManager : Object {
     }
 
     private bool window_added (Meta.Workspace? workspace, Meta.Window window) {
-        if (workspace == null || !Meta.Prefs.get_dynamic_workspaces () || window.on_all_workspaces) {
+        if (workspace == null || window.on_all_workspaces) {
             return Source.REMOVE;
         }
 
@@ -150,7 +138,7 @@ public class Gala.WorkspaceManager : Object {
     }
 
     private void window_removed (Meta.Workspace? workspace, Meta.Window window) {
-        if (workspace == null || !Meta.Prefs.get_dynamic_workspaces () || window.on_all_workspaces) {
+        if (workspace == null || window.on_all_workspaces) {
             return;
         }
 
@@ -192,28 +180,17 @@ public class Gala.WorkspaceManager : Object {
     }
 
     private void window_entered_monitor (Meta.Display display, int monitor, Meta.Window window) {
-        if (InternalUtils.workspaces_only_on_primary () && monitor == display.get_primary_monitor ()) {
+        if (Meta.Prefs.get_workspaces_only_on_primary () && monitor == display.get_primary_monitor ()) {
             queue_window_added (window.get_workspace (), window);
         }
     }
 
     private void window_left_monitor (Meta.Display display, int monitor, Meta.Window window) {
-        if (InternalUtils.workspaces_only_on_primary () && monitor == display.get_primary_monitor ()) {
+        if (Meta.Prefs.get_workspaces_only_on_primary () && monitor == display.get_primary_monitor ()) {
             window_removed (window.get_workspace (), window);
         }
     }
 
-    private void prefs_listener (Meta.Preference pref) {
-        unowned Meta.WorkspaceManager manager = wm.get_display ().get_workspace_manager ();
-
-        if (pref == Meta.Preference.DYNAMIC_WORKSPACES && Meta.Prefs.get_dynamic_workspaces ()) {
-            // if the last workspace has a window, we need to append a new workspace
-            if (Utils.get_n_windows (manager.get_workspace_by_index (manager.get_n_workspaces () - 1)) > 0) {
-                append_workspace ();
-            }
-        }
-    }
-
     private void append_workspace () {
         unowned Meta.Display display = wm.get_display ();
         unowned Meta.WorkspaceManager manager = display.get_workspace_manager ();
@@ -293,10 +270,6 @@ public class Gala.WorkspaceManager : Object {
      * cleanup after an operation that required stable workspace/window indices
      */
     private void cleanup () {
-        if (!Meta.Prefs.get_dynamic_workspaces ()) {
-            return;
-        }
-
         unowned Meta.WorkspaceManager manager = wm.get_display ().get_workspace_manager ();
 
         foreach (var workspace in manager.get_workspaces ()) {
