diff --git a/0001-change-panel-background.patch b/0001-change-panel-background.patch deleted file mode 100644 index 56fdb11f56b26133a7b4ba16d666fbaa31ee6eff..0000000000000000000000000000000000000000 --- a/0001-change-panel-background.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 9a07b680f0a174d9561233071f5133972ed3d693 Mon Sep 17 00:00:00 2001 -From: root -Date: Wed, 15 Jan 2020 14:56:13 +0800 -Subject: [PATCH] change panel background - ---- - data/org.mate.panel.toplevel.gschema.xml.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/data/org.mate.panel.toplevel.gschema.xml.in b/data/org.mate.panel.toplevel.gschema.xml.in -index 25e712c..39b4f31 100644 ---- a/data/org.mate.panel.toplevel.gschema.xml.in -+++ b/data/org.mate.panel.toplevel.gschema.xml.in -@@ -104,7 +104,7 @@ - - - -- 'none' -+ 'image' - Background type - Which type of background should be used for this panel. Possible values are "none" - the default GTK+ widget background will be used, "color" - the color key will be used as background color or "image" - the image specified by the image key will be used as background. - -@@ -119,7 +119,7 @@ - Specifies the opacity of the background color format. If the color is not completely opaque (a value of less than 65535), the color will be composited onto the desktop background image. - - -- '' -+ '/usr/share/mate-panel/background.png' - Background image - Specifies the file to be used for the background image. If the image contains an alpha channel it will be composited onto the desktop background image. - --- -2.23.0 - diff --git a/background.png b/background.png deleted file mode 100644 index b600ddeb8c7e340c5e5ab6cc9ce5e675423ec206..0000000000000000000000000000000000000000 Binary files a/background.png and /dev/null differ diff --git a/mate-panel-1.22.2.tar.xz b/mate-panel-1.22.2.tar.xz deleted file mode 100644 index 1c1b717857088267629b306d59abaa26f53a68db..0000000000000000000000000000000000000000 Binary files a/mate-panel-1.22.2.tar.xz and /dev/null differ diff --git a/mate-panel-1.26.0.tar.xz b/mate-panel-1.26.0.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..cb9a449f0e691296d3df0b21d31b7b429423e403 Binary files /dev/null and b/mate-panel-1.26.0.tar.xz differ diff --git a/mate-panel-delete-shutdown-action.patch b/mate-panel-delete-shutdown-action.patch deleted file mode 100644 index 7538086a8a33eab7eac091262f3f092c32926c65..0000000000000000000000000000000000000000 --- a/mate-panel-delete-shutdown-action.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur mate-panel-bak/mate-panel/panel-menu-items.c mate-panel-1.22.2/mate-panel/panel-menu-items.c ---- mate-panel-bak/mate-panel/panel-menu-items.c 2020-04-09 12:20:30.480838558 +0800 -+++ mate-panel-1.22.2/mate-panel/panel-menu-items.c 2020-04-09 13:04:21.475963657 +0800 -@@ -1644,13 +1644,13 @@ - gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); - } - -- item = panel_menu_items_create_action_item (PANEL_ACTION_SHUTDOWN); -- if (item != NULL) { -- if (!separator_inserted) -- add_menu_separator (menu); -- -- gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); -- } -+// item = panel_menu_items_create_action_item (PANEL_ACTION_SHUTDOWN); -+// if (item != NULL) { -+// if (!separator_inserted) -+// add_menu_separator (menu); -+// -+// gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); -+// } - } - - void diff --git a/mate-panel.spec b/mate-panel.spec index 13559f4d5a1c705b1a96f3aeeb66f168284484ba..9241814ca8c7375de194ac63cbda374c902cff68 100644 --- a/mate-panel.spec +++ b/mate-panel.spec @@ -2,7 +2,7 @@ %global rel_build 1 # This is needed, because src-url contains branched part of versioning-scheme. -%global branch 1.22 +%global branch 1.26 # Settings used for build from snapshots. %{!?rel_build:%global commit 838555a41dc08a870b408628f529b66e2c8c4054} @@ -13,8 +13,12 @@ %{!?rel_build:%global git_tar %{name}-%{version}-%{git_ver}.tar.xz} Name: mate-panel -Version: %{branch}.2 -Release: 6 +Version: %{branch}.0 +%if 0%{?rel_build} +Release: 1 +%else +Release: 0.14%{?git_rel} +%endif Summary: MATE Desktop panel and applets #libs are LGPLv2+ applications GPLv2+ License: GPLv2+ @@ -27,15 +31,7 @@ URL: http://mate-desktop.org %{!?rel_build:Source0: http://git.mate-desktop.org/%{name}/snapshot/%{name}-%{commit}.tar.xz#/%{git_tar}} Source1: mate-panel_fedora-30.layout -Source2: mate-panel_fedora-28.layout -Source3: mate-panel_rhel.layout -Source4: background.png - -# https://github.com/mate-desktop/mate-panel/pull/816 -Patch1: mate-panel_0001-struts-Create-struts-for-panels-on-inside-edges-of-m.patch -Patch2: mate-panel_0002-struts-Use-inside-edge-panels-only-on-Marco-and-Meta.patch -Patch3: 0001-change-panel-background.patch -Patch4: mate-panel-delete-shutdown-action.patch +Source2: mate-panel_rhel.layout Requires: %{name}-libs%{?_isa} = %{version}-%{release} #for fish @@ -43,19 +39,21 @@ Recommends: fortune-mod # rhbz (#1007219) Requires: caja-schemas -BuildRequires: dbus-glib-devel -BuildRequires: desktop-file-utils -BuildRequires: gobject-introspection-devel -BuildRequires: gtk3-devel -BuildRequires: libcanberra-devel -BuildRequires: libmateweather-devel -BuildRequires: libwnck3-devel -BuildRequires: librsvg2-devel -BuildRequires: libSM-devel -BuildRequires: mate-common -BuildRequires: mate-desktop-devel -BuildRequires: mate-menus-devel -BuildRequires: yelp-tools +BuildRequires: desktop-file-utils +BuildRequires: gobject-introspection-devel +BuildRequires: gtk3-devel +BuildRequires: gtk-layer-shell-devel +BuildRequires: libcanberra-devel +BuildRequires: libmateweather-devel +BuildRequires: libwnck3-devel +BuildRequires: librsvg2-devel +BuildRequires: libSM-devel +BuildRequires: make +BuildRequires: mate-common +BuildRequires: mate-desktop-devel +BuildRequires: mate-menus-devel +BuildRequires: wayland-devel +BuildRequires: yelp-tools %description MATE Desktop panel applets @@ -98,6 +96,8 @@ NOCONFIGURE=1 ./autogen.sh --libexecdir=%{_libexecdir}/mate-panel \ --enable-introspection \ --disable-gtk-doc \ + --enable-x11 \ + --enable-wayland \ --with-in-process-applets=none # remove unused-direct-shlib-dependency @@ -119,18 +119,10 @@ desktop-file-install \ %if 0%{?fedora} && 0%{?fedora} >= 30 install -D -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/mate-panel/layouts/fedora.layout %endif -%if 0%{?fedora} && 0%{?fedora} == 29 -install -D -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/mate-panel/layouts/fedora.layout -%endif -%if 0%{?fedora} && 0%{?fedora} == 28 -install -D -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/mate-panel/layouts/fedora.layout -%endif %if 0%{?rhel} -install -D -m 0644 %{SOURCE3} %{buildroot}%{_datadir}/mate-panel/layouts/rhel.layout +install -D -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/mate-panel/layouts/rhel.layout %endif -install -D -m 0644 %{SOURCE4} %{buildroot}%{_datadir}/mate-panel/background.png - %find_lang %{name} --with-gnome --all-name @@ -140,15 +132,16 @@ install -D -m 0644 %{SOURCE4} %{buildroot}%{_datadir}/mate-panel/background.png %{_bindir}/mate-desktop-item-edit %{_bindir}/mate-panel %{_bindir}/mate-panel-test-applets -%{_libexecdir}/mate-panel +#%%{_libexecdir}/mate-panel %{_datadir}/glib-2.0/schemas/org.mate.panel.*.xml %{_datadir}/applications/mate-panel.desktop %{_datadir}/icons/hicolor/*/*/* %{_datadir}/mate-panel -%{_datadir}/dbus-1/services/org.mate.panel.applet.ClockAppletFactory.service -%{_datadir}/dbus-1/services/org.mate.panel.applet.FishAppletFactory.service -%{_datadir}/dbus-1/services/org.mate.panel.applet.NotificationAreaAppletFactory.service -%{_datadir}/dbus-1/services/org.mate.panel.applet.WnckletFactory.service +#%%{_datadir}/dbus-1/services/org.mate.panel.applet.ClockAppletFactory.service +#%%{_datadir}/dbus-1/services/org.mate.panel.applet.FishAppletFactory.service +#%%{_datadir}/dbus-1/services/org.mate.panel.applet.NotificationAreaAppletFactory.service +#%%{_datadir}/dbus-1/services/org.mate.panel.applet.WnckletFactory.service +%{_libdir}/mate-panel/ %files libs %doc COPYING.LIB @@ -164,6 +157,9 @@ install -D -m 0644 %{SOURCE4} %{buildroot}%{_datadir}/mate-panel/background.png %changelog +* Mon Aug 19 2024 yueyaoqiang - 1.26.0-1 +- update to 1.26.0 + * Mon Jun 13 2022 fushanqing - 1.22.2-6 - Remove the dist tag diff --git a/mate-panel_0001-struts-Create-struts-for-panels-on-inside-edges-of-m.patch b/mate-panel_0001-struts-Create-struts-for-panels-on-inside-edges-of-m.patch deleted file mode 100644 index 1d34f7ef01980dbb37c64652a5b071699702eb32..0000000000000000000000000000000000000000 --- a/mate-panel_0001-struts-Create-struts-for-panels-on-inside-edges-of-m.patch +++ /dev/null @@ -1,137 +0,0 @@ -From 19b5c7c9690699878228b47d31ce0850585249de Mon Sep 17 00:00:00 2001 -From: Victor Kareh -Date: Fri, 8 Jun 2018 15:53:00 -0400 -Subject: [PATCH 1/2] struts: Create struts for panels on inside edges of - monitors - -This is a hack to provide partial struts for panels that are positioned on the inside edge of a multi-monitor setup (e.g. top panel on bottom monitor, or left panel on right-side monitor). - -Fixes #303 -Partially fixes #803 -Fixes mate-desktop/marco/issues/135 ---- - mate-panel/panel-struts.c | 81 ++++++++++++++++++++++++++++++--------- - 1 file changed, 63 insertions(+), 18 deletions(-) - -diff --git a/mate-panel/panel-struts.c b/mate-panel/panel-struts.c -index d5adccc..3d314ac 100644 ---- a/mate-panel/panel-struts.c -+++ b/mate-panel/panel-struts.c -@@ -250,13 +250,15 @@ panel_struts_allocate_struts (PanelToplevel *toplevel, - void - panel_struts_set_window_hint (PanelToplevel *toplevel) - { -- GtkWidget *widget; -- PanelStrut *strut; -- int strut_size; -- int monitor_x, monitor_y, monitor_width, monitor_height; -- int screen_width, screen_height; -- int leftmost, rightmost, topmost, bottommost; -- int scale; -+ GtkWidget *widget; -+ PanelStrut *strut; -+ int strut_size; -+ int monitor_x, monitor_y, monitor_width, monitor_height; -+ int screen_width, screen_height; -+ int leftmost, rightmost, topmost, bottommost; -+ int scale; -+ PanelOrientation strut_orientation; -+ int strut_start, strut_end; - - widget = GTK_WIDGET (toplevel); - -@@ -288,26 +290,69 @@ panel_struts_set_window_hint (PanelToplevel *toplevel) - &topmost, - &bottommost); - -+ /* HACK: Here we purposefully break freedesktop wm-spec standard for _NET_WM_STRUT_PARTIAL -+ * for multi-monitor setups. Since _NET_WM_STRUT_PARTIAL only allow struts along the edges -+ * of the screen (rather than each monitor), panels positioned on the inside edge of a -+ * monitor (e.g. top panel on the bottom-most monitor, left panel on the right-most -+ * monitor, etc), cannot have proper struts. We "fix" this by setting a partial strut that -+ * is orthogonal to the "correct" one, and pivot the dimensions for it. -+ * -+ * For example: a top panel defaults to having a strut that is 24px high, a start -+ * coordinate of 0px, and an end coordinate of 1920px. If this panel is on the bottom-most -+ * monitor, and thus no longer at the edge of the screen, we instead "fix" it here by -+ * applying struts as though it was a *left* panel, that is 1920px wide, with a start -+ * coordinate of 1080px (top monitor height) and an end coordinate of (1080px + 24px). -+ * -+ * This hack only works properly for expanded panels, or panels that start at either edge -+ * of the monitor, since otherwise they require floating struts, which are not really a -+ * thing. This last part we just ignore and let the strut exist snapped to the far edge of -+ * the monitor, which only mildly affects edge snapping of non-maximized windows against -+ * the floating panel. -+ */ -+ strut_start = strut->allocated_strut_start; -+ strut_end = strut->allocated_strut_end; -+ strut_orientation = strut->orientation; -+ - switch (strut->orientation) { - case PANEL_ORIENTATION_TOP: -- if (monitor_y > 0) -+ if (!topmost) { -+ strut_orientation = strut_start ? PANEL_ORIENTATION_RIGHT : PANEL_ORIENTATION_LEFT; -+ strut_start = monitor_y; -+ strut_end = (strut_size / scale) + strut_start - 1; -+ strut_size = (1 + strut->allocated_strut_end - strut->allocated_strut_start) * scale; -+ } else if (monitor_y > 0) { - strut_size += monitor_y; -- if (!topmost) strut_size = 0; -+ } - break; - case PANEL_ORIENTATION_BOTTOM: -- if (monitor_y + monitor_height < screen_height) -+ if (!bottommost) { -+ strut_orientation = strut_start ? PANEL_ORIENTATION_RIGHT : PANEL_ORIENTATION_LEFT; -+ strut_end = monitor_height - 1; -+ strut_start = strut_end - (strut_size / scale) + 1; -+ strut_size = (1 + strut->allocated_strut_end - strut->allocated_strut_start) * scale; -+ } else if (monitor_y + monitor_height < screen_height) { - strut_size += screen_height - (monitor_y + monitor_height); -- if (!bottommost) strut_size = 0; -+ } - break; - case PANEL_ORIENTATION_LEFT: -- if (leftmost && monitor_x > 0) -+ if (!leftmost) { -+ strut_orientation = strut_start ? PANEL_ORIENTATION_BOTTOM : PANEL_ORIENTATION_TOP; -+ strut_start = monitor_x; -+ strut_end = (strut_size / scale) + strut_start - 1; -+ strut_size = (1 + strut->allocated_strut_end - strut->allocated_strut_start) * scale; -+ } else if (monitor_x > 0) { - strut_size += monitor_x; -- if (!leftmost) strut_size = 0; -+ } - break; - case PANEL_ORIENTATION_RIGHT: -- if (monitor_x + monitor_width < screen_width) -+ if (!rightmost) { -+ strut_orientation = strut_start ? PANEL_ORIENTATION_BOTTOM : PANEL_ORIENTATION_TOP; -+ strut_end = monitor_width - 1; -+ strut_start = strut_end - (strut_size / scale) + 1; -+ strut_size = (1 + strut->allocated_strut_end - strut->allocated_strut_start) * scale; -+ } else if (monitor_x + monitor_width < screen_width) { - strut_size += screen_width - (monitor_x + monitor_width); -- if (!rightmost) strut_size = 0; -+ } - break; - default: - g_assert_not_reached (); -@@ -315,10 +360,10 @@ panel_struts_set_window_hint (PanelToplevel *toplevel) - } - - panel_xutils_set_strut (gtk_widget_get_window (widget), -- strut->orientation, -+ strut_orientation, - strut_size, -- strut->allocated_strut_start * scale, -- strut->allocated_strut_end * scale); -+ strut_start * scale, -+ strut_end * scale); - } - - void --- -2.17.1 - diff --git a/mate-panel_0002-struts-Use-inside-edge-panels-only-on-Marco-and-Meta.patch b/mate-panel_0002-struts-Use-inside-edge-panels-only-on-Marco-and-Meta.patch deleted file mode 100644 index c367e477d5935ff3b23f551bcf978066f3ce3bdd..0000000000000000000000000000000000000000 --- a/mate-panel_0002-struts-Use-inside-edge-panels-only-on-Marco-and-Meta.patch +++ /dev/null @@ -1,114 +0,0 @@ -From a507a5526cf5709ae32909448be94ef8aef08a0e Mon Sep 17 00:00:00 2001 -From: Victor Kareh -Date: Sat, 16 Jun 2018 23:52:01 -0400 -Subject: [PATCH 2/2] struts: Use inside edge panels only on Marco and Metacity - ---- - mate-panel/panel-struts.c | 58 ++++++++++++++++++++++++++++----------- - 1 file changed, 42 insertions(+), 16 deletions(-) - -diff --git a/mate-panel/panel-struts.c b/mate-panel/panel-struts.c -index 3d314ac..4e31de8 100644 ---- a/mate-panel/panel-struts.c -+++ b/mate-panel/panel-struts.c -@@ -259,6 +259,8 @@ panel_struts_set_window_hint (PanelToplevel *toplevel) - int scale; - PanelOrientation strut_orientation; - int strut_start, strut_end; -+ const char *wm_name; -+ gboolean wm_compatible; - - widget = GTK_WIDGET (toplevel); - -@@ -308,48 +310,72 @@ panel_struts_set_window_hint (PanelToplevel *toplevel) - * thing. This last part we just ignore and let the strut exist snapped to the far edge of - * the monitor, which only mildly affects edge snapping of non-maximized windows against - * the floating panel. -+ * -+ * This hack will be removed once _NET_WM_STRUT_AREA is implemented. - */ - strut_start = strut->allocated_strut_start; - strut_end = strut->allocated_strut_end; - strut_orientation = strut->orientation; - -+ /* Only "Metacity" and "Metacity (Marco)" are compatible with this workaround, so we set a -+ * flag to make sure that other window managers get the standard behavior. -+ */ -+ wm_name = gdk_x11_screen_get_window_manager_name (strut->screen); -+ wm_compatible = g_str_has_prefix (wm_name, "Metacity"); -+ - switch (strut->orientation) { - case PANEL_ORIENTATION_TOP: - if (!topmost) { -- strut_orientation = strut_start ? PANEL_ORIENTATION_RIGHT : PANEL_ORIENTATION_LEFT; -- strut_start = monitor_y; -- strut_end = (strut_size / scale) + strut_start - 1; -- strut_size = (1 + strut->allocated_strut_end - strut->allocated_strut_start) * scale; -+ if (wm_compatible) { -+ strut_orientation = strut_start ? PANEL_ORIENTATION_RIGHT : PANEL_ORIENTATION_LEFT; -+ strut_start = monitor_y; -+ strut_end = (strut_size / scale) + strut_start - 1; -+ strut_size = (1 + strut->allocated_strut_end - strut->allocated_strut_start) * scale; -+ } else { -+ strut_size = 0; -+ } - } else if (monitor_y > 0) { - strut_size += monitor_y; - } - break; - case PANEL_ORIENTATION_BOTTOM: - if (!bottommost) { -- strut_orientation = strut_start ? PANEL_ORIENTATION_RIGHT : PANEL_ORIENTATION_LEFT; -- strut_end = monitor_height - 1; -- strut_start = strut_end - (strut_size / scale) + 1; -- strut_size = (1 + strut->allocated_strut_end - strut->allocated_strut_start) * scale; -+ if (wm_compatible) { -+ strut_orientation = strut_start ? PANEL_ORIENTATION_RIGHT : PANEL_ORIENTATION_LEFT; -+ strut_end = monitor_height - 1; -+ strut_start = strut_end - (strut_size / scale) + 1; -+ strut_size = (1 + strut->allocated_strut_end - strut->allocated_strut_start) * scale; -+ } else { -+ strut_size = 0; -+ } - } else if (monitor_y + monitor_height < screen_height) { - strut_size += screen_height - (monitor_y + monitor_height); - } - break; - case PANEL_ORIENTATION_LEFT: - if (!leftmost) { -- strut_orientation = strut_start ? PANEL_ORIENTATION_BOTTOM : PANEL_ORIENTATION_TOP; -- strut_start = monitor_x; -- strut_end = (strut_size / scale) + strut_start - 1; -- strut_size = (1 + strut->allocated_strut_end - strut->allocated_strut_start) * scale; -+ if (wm_compatible) { -+ strut_orientation = strut_start ? PANEL_ORIENTATION_BOTTOM : PANEL_ORIENTATION_TOP; -+ strut_start = monitor_x; -+ strut_end = (strut_size / scale) + strut_start - 1; -+ strut_size = (1 + strut->allocated_strut_end - strut->allocated_strut_start) * scale; -+ } else { -+ strut_size = 0; -+ } - } else if (monitor_x > 0) { - strut_size += monitor_x; - } - break; - case PANEL_ORIENTATION_RIGHT: - if (!rightmost) { -- strut_orientation = strut_start ? PANEL_ORIENTATION_BOTTOM : PANEL_ORIENTATION_TOP; -- strut_end = monitor_width - 1; -- strut_start = strut_end - (strut_size / scale) + 1; -- strut_size = (1 + strut->allocated_strut_end - strut->allocated_strut_start) * scale; -+ if (wm_compatible) { -+ strut_orientation = strut_start ? PANEL_ORIENTATION_BOTTOM : PANEL_ORIENTATION_TOP; -+ strut_end = monitor_width - 1; -+ strut_start = strut_end - (strut_size / scale) + 1; -+ strut_size = (1 + strut->allocated_strut_end - strut->allocated_strut_start) * scale; -+ } else { -+ strut_size = 0; -+ } - } else if (monitor_x + monitor_width < screen_width) { - strut_size += screen_width - (monitor_x + monitor_width); - } --- -2.17.1 - diff --git a/mate-panel_fedora-28.layout b/mate-panel_fedora-28.layout deleted file mode 100644 index d2c2e71788c1fcb4e389896e1f2bc708bd037325..0000000000000000000000000000000000000000 --- a/mate-panel_fedora-28.layout +++ /dev/null @@ -1,81 +0,0 @@ -[Toplevel top] -expand=true -orientation=top -size=24 - -[Toplevel bottom] -expand=true -orientation=bottom -size=24 - -[Object menu-bar] -object-type=menu-bar -toplevel-id=top -position=0 -locked=true - -[Object file-browser] -object-type=launcher -launcher-location=/usr/share/applications/caja-browser.desktop -toplevel-id=top -position=10 -locked=true - -[Object terminal] -object-type=launcher -launcher-location=/usr/share/applications/mate-terminal.desktop -toplevel-id=top -position=20 -locked=true - -[Object web-browser] -object-type=launcher -launcher-location=/usr/share/applications/firefox.desktop -toplevel-id=top -position=30 -locked=true - -[Object email-client] -object-type=launcher -launcher-location=/usr/share/applications/mozilla-thunderbird.desktop -toplevel-id=top -position=40 -locked=true - -[Object notification-area] -object-type=applet -applet-iid=NotificationAreaAppletFactory::NotificationArea -toplevel-id=top -position=10 -panel-right-stick=true -locked=true - -[Object clock] -object-type=applet -applet-iid=ClockAppletFactory::ClockApplet -toplevel-id=top -position=0 -panel-right-stick=true -locked=true - -[Object show-desktop] -object-type=applet -applet-iid=WnckletFactory::ShowDesktopApplet -toplevel-id=bottom -position=0 -locked=true - -[Object window-list] -object-type=applet -applet-iid=WnckletFactory::WindowListApplet -toplevel-id=bottom -position=20 -locked=true - -[Object workspace-switcher] -object-type=applet -applet-iid=WnckletFactory::WorkspaceSwitcherApplet -toplevel-id=bottom -position=0 -panel-right-stick=true -locked=true diff --git a/mate-panel_rhel.layout b/mate-panel_rhel.layout index a5ffd0f5009d47e9b7c04cea305780cc4653f98f..59b56bf227a02eb38d3bf2007ce36e046520e527 100644 --- a/mate-panel_rhel.layout +++ b/mate-panel_rhel.layout @@ -1,3 +1,8 @@ +[Toplevel top] +expand=true +orientation=top +size=24 + [Toplevel bottom] expand=true orientation=bottom @@ -5,51 +10,65 @@ size=24 [Object menu-bar] object-type=menu-bar -toplevel-id=bottom +toplevel-id=top position=0 locked=true [Object file-browser] object-type=launcher launcher-location=/usr/share/applications/caja-browser.desktop -toplevel-id=bottom -position=34 +toplevel-id=top +position=10 locked=true [Object terminal] object-type=launcher launcher-location=/usr/share/applications/mate-terminal.desktop -toplevel-id=bottom -position=58 +toplevel-id=top +position=20 locked=true [Object web-browser] object-type=launcher launcher-location=/usr/share/applications/firefox.desktop -toplevel-id=bottom -position=82 -locked=true - -[Object window-list] -object-type=applet -applet-iid=WnckletFactory::WindowListApplet -toplevel-id=bottom -position=106 +toplevel-id=top +position=30 locked=true [Object notification-area] object-type=applet applet-iid=NotificationAreaAppletFactory::NotificationArea -toplevel-id=bottom -position=200 +toplevel-id=top +position=10 panel-right-stick=true locked=true [Object clock] object-type=applet applet-iid=ClockAppletFactory::ClockApplet -toplevel-id=bottom -position=143 +toplevel-id=top +position=0 panel-right-stick=true locked=true +[Object show-desktop] +object-type=applet +applet-iid=WnckletFactory::ShowDesktopApplet +toplevel-id=bottom +position=0 +locked=true + +[Object window-list] +object-type=applet +applet-iid=WnckletFactory::WindowListApplet +toplevel-id=bottom +position=20 +locked=true + +[Object workspace-switcher] +object-type=applet +applet-iid=WnckletFactory::WorkspaceSwitcherApplet +toplevel-id=bottom +position=0 +panel-right-stick=true +locked=true