From f7cf61ff16a7252013aea29c0bb0370e014acba4 Mon Sep 17 00:00:00 2001 From: Mason Hock Date: Tue, 10 Sep 2019 16:07:07 -0700 Subject: [PATCH 01/11] add mate compatibility --- helpers/make-indicator-datetime | 65 +++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 helpers/make-indicator-datetime diff --git a/helpers/make-indicator-datetime b/helpers/make-indicator-datetime new file mode 100644 index 0000000..67079fd --- /dev/null +++ b/helpers/make-indicator-datetime @@ -0,0 +1,65 @@ +#!/bin/sh +# +# Copyright (C) 2019 Mason Hock +# +# 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 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. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# + +VERSION=1 + +. ./config + +cat << EOF > data/indicator-datetime.desktop.in +[Desktop Entry] +Type=Application +Name=Indicator Date & Time +Exec=@pkglibexecdir@/indicator-datetime-service +OnlyShowIn=MATE; +NoDisplay=true +StartupNotify=false +Terminal=false +Icon=@messaging_menu_icon@ +EOF + +cat << EOF >> data/CMakeLists.txt + +## +## XDG Autostart File +## + +# where to install +set (XDG_AUTOSTART_DIR "/etc/xdg/autostart") +message (STATUS "\${XDG_AUTOSTART_DIR} is the DBus Service File install dir") + +set (XDG_AUTOSTART_NAME "\${CMAKE_PROJECT_NAME}.desktop") +set (XDG_AUTOSTART_FILE "\${CMAKE_CURRENT_BINARY_DIR}/\${XDG_AUTOSTART_NAME}") +set (XDG_AUTOSTART_FILE_IN "\${CMAKE_CURRENT_SOURCE_DIR}/\${XDG_AUTOSTART_NAME}.in") + +# build it +set (pkglibexecdir "\${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}") +configure_file ("\${XDG_AUTOSTART_FILE_IN}" "\${XDG_AUTOSTART_FILE}") + +# install XDG autostart +install (FILES "\${XDG_AUTOSTART_FILE}" + DESTINATION "\${XDG_AUTOSTART_DIR}") +EOF + +# this shouldn't be needed for Ubuntu 20.04 +sed '/UNITY8,/a\ MATE,' -i include/datetime/actions-live.h +patch -p0 < $DATA/launch-time-admin-in-mate.patch + +changelog "Add MATE compatibility" + +compile From 7b4e4e9d10a3802287616a8fcd497647f786a8ce Mon Sep 17 00:00:00 2001 From: Mason Hock Date: Tue, 10 Sep 2019 16:11:47 -0700 Subject: [PATCH 02/11] integrate thunderbird calendar with datetime panel indicator --- helpers/make-xul-ext-eds-calendar | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 helpers/make-xul-ext-eds-calendar diff --git a/helpers/make-xul-ext-eds-calendar b/helpers/make-xul-ext-eds-calendar new file mode 100644 index 0000000..95a01d8 --- /dev/null +++ b/helpers/make-xul-ext-eds-calendar @@ -0,0 +1,28 @@ +#!/bin/sh +# +# Copyright (C) 2019 Mason Hock +# +# 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 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. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# + +VERSION=1 +EXTERNAL='deb-src http://ppa.launchpad.net/mate-ob/eds-calendar/ubuntu bionic main ' +REPOKEY=E99FABBCCA21C62C + +. ./config + +changelog "Imported from PPA" + +compile From 860d7dd7866cf2bd29297a366352a6afc4fd65d9 Mon Sep 17 00:00:00 2001 From: Mason Hock Date: Wed, 11 Sep 2019 19:02:34 -0700 Subject: [PATCH 03/11] customize brisk menu for trisquel --- .../trisquel-style-session-buttons.patch | 101 ++++++++++++++++++ helpers/make-mate-applet-brisk-menu | 34 ++++++ 2 files changed, 135 insertions(+) create mode 100644 helpers/DATA/mate-applet-brisk-menu/trisquel-style-session-buttons.patch create mode 100644 helpers/make-mate-applet-brisk-menu diff --git a/helpers/DATA/mate-applet-brisk-menu/trisquel-style-session-buttons.patch b/helpers/DATA/mate-applet-brisk-menu/trisquel-style-session-buttons.patch new file mode 100644 index 0000000..e961ab4 --- /dev/null +++ b/helpers/DATA/mate-applet-brisk-menu/trisquel-style-session-buttons.patch @@ -0,0 +1,101 @@ +diff --git a/src/frontend/classic/classic-window.c b/src/frontend/classic/classic-window.c +index 9fd6b2b..3c316c0 100644 +--- a/src/frontend/classic/classic-window.c ++++ b/src/frontend/classic/classic-window.c +@@ -640,52 +640,63 @@ static void brisk_classic_window_setup_session_controls(BriskClassicWindow *self + { + GtkWidget *widget = NULL; + GtkWidget *box = NULL; +- GtkStyleContext *style = NULL; ++ GtkWidget *button = NULL; ++ GtkWidget *image = NULL; ++ GtkWidget *label = NULL; + +- box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); ++ box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); + gtk_widget_set_margin_bottom(box, 4); + +- gtk_box_pack_end(GTK_BOX(self->sidebar_wrap), box, FALSE, FALSE, 0); +- gtk_widget_set_halign(box, GTK_ALIGN_CENTER); ++ gtk_box_pack_end(GTK_BOX(self->sidebar_wrap), box, TRUE, TRUE, 0); + + /* Add a separator for visual consistency */ + widget = gtk_separator_new(GTK_ORIENTATION_HORIZONTAL); + gtk_box_pack_end(GTK_BOX(self->sidebar_wrap), widget, FALSE, FALSE, 3); + +- /* Logout */ +- widget = gtk_button_new_from_icon_name("brisk_system-log-out-symbolic", GTK_ICON_SIZE_MENU); +- self->button_logout = widget; +- g_signal_connect_swapped(widget, "clicked", G_CALLBACK(brisk_menu_window_logout), self); +- gtk_widget_set_tooltip_text(widget, _("End the current session")); +- gtk_widget_set_can_focus(widget, FALSE); +- gtk_container_add(GTK_CONTAINER(box), widget); +- style = gtk_widget_get_style_context(widget); +- gtk_style_context_add_class(style, GTK_STYLE_CLASS_FLAT); +- gtk_style_context_add_class (style, "session-button"); +- + /* Lock */ +- widget = gtk_button_new_from_icon_name("system-lock-screen-symbolic", +- GTK_ICON_SIZE_SMALL_TOOLBAR); +- self->button_lock = widget; +- g_signal_connect_swapped(widget, "clicked", G_CALLBACK(brisk_menu_window_lock), self); ++ button = gtk_button_new(); ++ widget = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); ++ image = gtk_image_new_from_icon_name("system-lock-screen", GTK_ICON_SIZE_MENU); ++ gtk_box_pack_start(GTK_BOX(widget), image, FALSE, FALSE, 0); ++ label = gtk_label_new("Log Out"); ++ gtk_box_pack_start(GTK_BOX(widget), label, FALSE, FALSE, 0); ++ gtk_container_add(GTK_CONTAINER(button), widget); ++ self->button_logout = button; ++ g_signal_connect_swapped(button, "clicked", G_CALLBACK(brisk_menu_window_lock), self); + gtk_widget_set_tooltip_text(widget, _("Lock the screen")); +- gtk_widget_set_can_focus(widget, FALSE); +- gtk_container_add(GTK_CONTAINER(box), widget); +- style = gtk_widget_get_style_context(widget); +- gtk_style_context_add_class(style, GTK_STYLE_CLASS_FLAT); +- gtk_style_context_add_class (style, "session-button"); ++ gtk_container_add(GTK_CONTAINER(box), button); ++ gtk_button_set_relief(button, GTK_RELIEF_NONE); ++ gtk_widget_set_margin_end(image, 7); ++ ++ /* Logout */ ++ button = gtk_button_new(); ++ widget = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); ++ image = gtk_image_new_from_icon_name("application-exit", GTK_ICON_SIZE_MENU); ++ gtk_box_pack_start(GTK_BOX(widget), image, FALSE, FALSE, 0); ++ label = gtk_label_new("Lock Screen"); ++ gtk_box_pack_start(GTK_BOX(widget), label, FALSE, FALSE, 0); ++ gtk_container_add(GTK_CONTAINER(button), widget); ++ self->button_logout = button; ++ g_signal_connect_swapped(button, "clicked", G_CALLBACK(brisk_menu_window_logout), self); ++ gtk_widget_set_tooltip_text(widget, _("End the current session")); ++ gtk_container_add(GTK_CONTAINER(box), button); ++ gtk_button_set_relief(button, GTK_RELIEF_NONE); ++ gtk_widget_set_margin_end(image, 7); + + /* Shutdown */ +- widget = +- gtk_button_new_from_icon_name("system-shutdown-symbolic", GTK_ICON_SIZE_SMALL_TOOLBAR); +- self->button_shutdown = widget; +- g_signal_connect_swapped(widget, "clicked", G_CALLBACK(brisk_menu_window_shutdown), self); ++ button = gtk_button_new(); ++ widget = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); ++ image = gtk_image_new_from_icon_name("system-shutdown", GTK_ICON_SIZE_MENU); ++ gtk_box_pack_start(GTK_BOX(widget), image, FALSE, FALSE, 0); ++ label = gtk_label_new("Power Off"); ++ gtk_box_pack_start(GTK_BOX(widget), label, FALSE, FALSE, 0); ++ gtk_container_add(GTK_CONTAINER(button), widget); ++ self->button_logout = button; ++ g_signal_connect_swapped(button, "clicked", G_CALLBACK(brisk_menu_window_shutdown), self); + gtk_widget_set_tooltip_text(widget, _("Turn off the device")); +- gtk_widget_set_can_focus(widget, FALSE); +- gtk_container_add(GTK_CONTAINER(box), widget); +- style = gtk_widget_get_style_context(widget); +- gtk_style_context_add_class(style, GTK_STYLE_CLASS_FLAT); +- gtk_style_context_add_class (style, "session-button"); ++ gtk_container_add(GTK_CONTAINER(box), button); ++ gtk_button_set_relief(button, GTK_RELIEF_NONE); ++ gtk_widget_set_margin_end(image, 7); + } + + /** diff --git a/helpers/make-mate-applet-brisk-menu b/helpers/make-mate-applet-brisk-menu new file mode 100644 index 0000000..ffc60c4 --- /dev/null +++ b/helpers/make-mate-applet-brisk-menu @@ -0,0 +1,34 @@ +#!/bin/sh +# +# Copyright (C) 2019 Mason Hock +# +# 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 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. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# + +VERSION=1 + +. ./config + +cp $DATA/trisquel-style-session-buttons.patch debian/patches/ +echo "trisquel-style-session-buttons.patch" >> debian/patches/series + +sed '/dark-theme/{N;s/false/true/}' -i data/com.solus-project.brisk-menu.gschema.xml +sed '/label-visible/{N;s/true/false/}' -i data/com.solus-project.brisk-menu.gschema.xml +sed "/pinned-shortcuts/{N;s/'matecc.desktop'/'gnome-app-install.desktop', 'matecc.desktop'/}" -i data/com.solus-project.brisk-menu.gschema.xml +sed '/search-position/{N;s/top/bottom/}' -i data/com.solus-project.brisk-menu.gschema.xml + +changelog "Customized for Trisquel" + +compile From 4ec6ad88cacf688a63e5434e7edc6d921f69082e Mon Sep 17 00:00:00 2001 From: Mason Hock Date: Mon, 16 Sep 2019 00:52:13 -0700 Subject: [PATCH 04/11] fix swapped logout and lock labels --- .../trisquel-style-session-buttons.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/helpers/DATA/mate-applet-brisk-menu/trisquel-style-session-buttons.patch b/helpers/DATA/mate-applet-brisk-menu/trisquel-style-session-buttons.patch index e961ab4..a343e50 100644 --- a/helpers/DATA/mate-applet-brisk-menu/trisquel-style-session-buttons.patch +++ b/helpers/DATA/mate-applet-brisk-menu/trisquel-style-session-buttons.patch @@ -43,7 +43,7 @@ index 9fd6b2b..3c316c0 100644 + widget = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); + image = gtk_image_new_from_icon_name("system-lock-screen", GTK_ICON_SIZE_MENU); + gtk_box_pack_start(GTK_BOX(widget), image, FALSE, FALSE, 0); -+ label = gtk_label_new("Log Out"); ++ label = gtk_label_new("Lock Screen"); + gtk_box_pack_start(GTK_BOX(widget), label, FALSE, FALSE, 0); + gtk_container_add(GTK_CONTAINER(button), widget); + self->button_logout = button; @@ -63,7 +63,7 @@ index 9fd6b2b..3c316c0 100644 + widget = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); + image = gtk_image_new_from_icon_name("application-exit", GTK_ICON_SIZE_MENU); + gtk_box_pack_start(GTK_BOX(widget), image, FALSE, FALSE, 0); -+ label = gtk_label_new("Lock Screen"); ++ label = gtk_label_new("Log Out"); + gtk_box_pack_start(GTK_BOX(widget), label, FALSE, FALSE, 0); + gtk_container_add(GTK_CONTAINER(button), widget); + self->button_logout = button; From d53ac1dd1025596223b5f65ea66d05b9ef7540dd Mon Sep 17 00:00:00 2001 From: Mason Hock Date: Fri, 4 Oct 2019 19:19:11 -0700 Subject: [PATCH 05/11] add trisquel panel layout to mate tweak --- helpers/make-mate-tweak | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 helpers/make-mate-tweak diff --git a/helpers/make-mate-tweak b/helpers/make-mate-tweak new file mode 100644 index 0000000..828de02 --- /dev/null +++ b/helpers/make-mate-tweak @@ -0,0 +1,30 @@ +#!/bin/sh +# +# Copyright (C) 2019 Mason Hock +# +# 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 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. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# + +VERSION=1 + +. ./config + +sed -i 's/manjaro/trisquel/g' mate-tweak +sed -i 's/Manjaro/Trisquel/g' mate-tweak + +changelog "Add Trisquel as panel layout option" + +compile + From 68dfba9e2a61d076bd2b2d373c82037df5fdf4aa Mon Sep 17 00:00:00 2001 From: Mason Hock Date: Sat, 5 Oct 2019 01:08:09 -0700 Subject: [PATCH 06/11] update for etiona --- helpers/make-mate-panel | 60 +++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 36 deletions(-) diff --git a/helpers/make-mate-panel b/helpers/make-mate-panel index dcbf22a..6f07858 100644 --- a/helpers/make-mate-panel +++ b/helpers/make-mate-panel @@ -1,6 +1,7 @@ #!/bin/sh # # Copyright (C) 2016-2017 Ruben Rodriguez +# Copyright (C) 2017 Mason Hock # # 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 @@ -17,7 +18,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=5 +VERSION=6 . ./config @@ -26,23 +27,25 @@ sed 's/"tooltip", tooltip,/"tooltip", "Trisquel",/; s/"has-arrow", TRUE,/"has-ar # Custom layout cat << EOF > data/panel-default-layout.layout -[Toplevel bottom] -expand=true +[Toplevel top] orientation=bottom -size=42 +expand=true +size=44 -[Object mate-menu] +[Object briskmenu] locked=true position=0 -toplevel-id=bottom -object-type=menu - +panel-right-stick=false +toplevel-id=top +applet-iid=BriskMenuFactory::BriskMenu +object-type=applet [Object files] locked=true position=20 -launcher-location=/usr/share/applications/caja-home.desktop -toplevel-id=bottom +launcher-location=caja.desktop +panel-right-stick=false +toplevel-id=top object-type=launcher menu-path=applications:/ @@ -50,49 +53,34 @@ menu-path=applications:/ locked=true position=30 launcher-location=/usr/share/applications/browser.desktop -toplevel-id=bottom +panel-right-stick=false +toplevel-id=top object-type=launcher menu-path=applications:/ -[Object window-list] -object-type=applet -applet-iid=WnckletFactory::WindowListApplet -toplevel-id=bottom +[Object windowlistapplet] +locked=true position=40 -locked=true - -[Object notification-area] +panel-right-stick=false +toplevel-id=top +applet-iid=WnckletFactory::WindowListApplet object-type=applet -applet-iid=NotificationAreaAppletFactory::NotificationArea -toplevel-id=bottom -position=30 -panel-right-stick=true -locked=true [Object indicatorappletcomplete] -object-type=applet -applet-iid=IndicatorAppletCompleteFactory::IndicatorAppletComplete -toplevel-id=bottom +locked=true position=20 panel-right-stick=true -locked=true - -[Object clock] +toplevel-id=top +applet-iid=IndicatorAppletCompleteFactory::IndicatorAppletComplete object-type=applet -applet-iid=ClockAppletFactory::ClockApplet -toplevel-id=bottom -position=10 -panel-right-stick=true -locked=true [Object showdesktopapplet] locked=true position=0 panel-right-stick=true -toplevel-id=bottom +toplevel-id=top applet-iid=WnckletFactory::ShowDesktopApplet object-type=applet - EOF cp data/panel-default-layout.layout data/ubuntu.layout From 4509b7fff4bbe983b3049aa38b5e13b41471dfa5 Mon Sep 17 00:00:00 2001 From: Mason Hock Date: Fri, 11 Oct 2019 12:50:12 -0700 Subject: [PATCH 07/11] don't send hostname in dhcp requests --- helpers/make-network-manager | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 helpers/make-network-manager diff --git a/helpers/make-network-manager b/helpers/make-network-manager new file mode 100644 index 0000000..d8d3ae7 --- /dev/null +++ b/helpers/make-network-manager @@ -0,0 +1,35 @@ +#!/bin/sh +# +# Copyright (C) 2019 Mason Hock +# +# 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 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. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# + +VERSION=1 + +. ./config + +sed -i '/add_hostname4 (str, hostname, use_fqdn)/d' src/dhcp/nm-dhcp-dhclient-utils.c + +sed -i '/fqdn_expected/,/send fqdn.server-update/{/send fqdn.fqdn/,/send fqdn.server-update/d;}' src/dhcp/tests/test-dhcp-dhclient.c + +sed -i '/fqdn_options_override_expected/,/send fqdn.server-update/{/send fqdn.fqdn/,/send fqdn.server-update/d;}' src/dhcp/tests/test-dhcp-dhclient.c + +sed -i '/override_hostname_expected/,/send host-name/{/send host-name/d;}' src/dhcp/tests/test-dhcp-dhclient.c + +changelog "Never send hostname in DHCP requests" + +compile + From 9c24ad6d8536bb5d212aca7112ad6627adb854be Mon Sep 17 00:00:00 2001 From: Mason Hock Date: Fri, 11 Oct 2019 12:50:43 -0700 Subject: [PATCH 08/11] Revert "don't send hostname in dhcp requests" (wrong branch) This reverts commit 4509b7fff4bbe983b3049aa38b5e13b41471dfa5. --- helpers/make-network-manager | 35 ----------------------------------- 1 file changed, 35 deletions(-) delete mode 100644 helpers/make-network-manager diff --git a/helpers/make-network-manager b/helpers/make-network-manager deleted file mode 100644 index d8d3ae7..0000000 --- a/helpers/make-network-manager +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2019 Mason Hock -# -# 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 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. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=1 - -. ./config - -sed -i '/add_hostname4 (str, hostname, use_fqdn)/d' src/dhcp/nm-dhcp-dhclient-utils.c - -sed -i '/fqdn_expected/,/send fqdn.server-update/{/send fqdn.fqdn/,/send fqdn.server-update/d;}' src/dhcp/tests/test-dhcp-dhclient.c - -sed -i '/fqdn_options_override_expected/,/send fqdn.server-update/{/send fqdn.fqdn/,/send fqdn.server-update/d;}' src/dhcp/tests/test-dhcp-dhclient.c - -sed -i '/override_hostname_expected/,/send host-name/{/send host-name/d;}' src/dhcp/tests/test-dhcp-dhclient.c - -changelog "Never send hostname in DHCP requests" - -compile - From 3c0ec40e5c026b37001177d9cc14756de7e857cd Mon Sep 17 00:00:00 2001 From: Mason Hock Date: Fri, 8 Nov 2019 09:58:01 -0800 Subject: [PATCH 09/11] fix helper name --- .../trisquel-style-session-buttons.patch | 0 helpers/{make-mate-applet-brisk-menu => make-brisk-menu} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename helpers/DATA/{mate-applet-brisk-menu => brisk-menu}/trisquel-style-session-buttons.patch (100%) rename helpers/{make-mate-applet-brisk-menu => make-brisk-menu} (100%) diff --git a/helpers/DATA/mate-applet-brisk-menu/trisquel-style-session-buttons.patch b/helpers/DATA/brisk-menu/trisquel-style-session-buttons.patch similarity index 100% rename from helpers/DATA/mate-applet-brisk-menu/trisquel-style-session-buttons.patch rename to helpers/DATA/brisk-menu/trisquel-style-session-buttons.patch diff --git a/helpers/make-mate-applet-brisk-menu b/helpers/make-brisk-menu similarity index 100% rename from helpers/make-mate-applet-brisk-menu rename to helpers/make-brisk-menu From 944592494ed86d0d77e71874e7c2df933c8561e3 Mon Sep 17 00:00:00 2001 From: Mason Hock Date: Fri, 8 Nov 2019 09:59:12 -0800 Subject: [PATCH 10/11] revert changes to action buttons --- helpers/make-brisk-menu | 3 --- 1 file changed, 3 deletions(-) diff --git a/helpers/make-brisk-menu b/helpers/make-brisk-menu index ffc60c4..fee58f5 100644 --- a/helpers/make-brisk-menu +++ b/helpers/make-brisk-menu @@ -21,9 +21,6 @@ VERSION=1 . ./config -cp $DATA/trisquel-style-session-buttons.patch debian/patches/ -echo "trisquel-style-session-buttons.patch" >> debian/patches/series - sed '/dark-theme/{N;s/false/true/}' -i data/com.solus-project.brisk-menu.gschema.xml sed '/label-visible/{N;s/true/false/}' -i data/com.solus-project.brisk-menu.gschema.xml sed "/pinned-shortcuts/{N;s/'matecc.desktop'/'gnome-app-install.desktop', 'matecc.desktop'/}" -i data/com.solus-project.brisk-menu.gschema.xml From 2516036d009e52ab7fb00c2b60c165f11f910d89 Mon Sep 17 00:00:00 2001 From: Mason Hock Date: Fri, 8 Nov 2019 11:02:13 -0800 Subject: [PATCH 11/11] go back to original menu --- .../trisquel-style-session-buttons.patch | 101 ------------------ helpers/make-brisk-menu | 31 ------ helpers/make-mate-panel | 5 +- 3 files changed, 2 insertions(+), 135 deletions(-) delete mode 100644 helpers/DATA/brisk-menu/trisquel-style-session-buttons.patch delete mode 100644 helpers/make-brisk-menu diff --git a/helpers/DATA/brisk-menu/trisquel-style-session-buttons.patch b/helpers/DATA/brisk-menu/trisquel-style-session-buttons.patch deleted file mode 100644 index a343e50..0000000 --- a/helpers/DATA/brisk-menu/trisquel-style-session-buttons.patch +++ /dev/null @@ -1,101 +0,0 @@ -diff --git a/src/frontend/classic/classic-window.c b/src/frontend/classic/classic-window.c -index 9fd6b2b..3c316c0 100644 ---- a/src/frontend/classic/classic-window.c -+++ b/src/frontend/classic/classic-window.c -@@ -640,52 +640,63 @@ static void brisk_classic_window_setup_session_controls(BriskClassicWindow *self - { - GtkWidget *widget = NULL; - GtkWidget *box = NULL; -- GtkStyleContext *style = NULL; -+ GtkWidget *button = NULL; -+ GtkWidget *image = NULL; -+ GtkWidget *label = NULL; - -- box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); -+ box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); - gtk_widget_set_margin_bottom(box, 4); - -- gtk_box_pack_end(GTK_BOX(self->sidebar_wrap), box, FALSE, FALSE, 0); -- gtk_widget_set_halign(box, GTK_ALIGN_CENTER); -+ gtk_box_pack_end(GTK_BOX(self->sidebar_wrap), box, TRUE, TRUE, 0); - - /* Add a separator for visual consistency */ - widget = gtk_separator_new(GTK_ORIENTATION_HORIZONTAL); - gtk_box_pack_end(GTK_BOX(self->sidebar_wrap), widget, FALSE, FALSE, 3); - -- /* Logout */ -- widget = gtk_button_new_from_icon_name("brisk_system-log-out-symbolic", GTK_ICON_SIZE_MENU); -- self->button_logout = widget; -- g_signal_connect_swapped(widget, "clicked", G_CALLBACK(brisk_menu_window_logout), self); -- gtk_widget_set_tooltip_text(widget, _("End the current session")); -- gtk_widget_set_can_focus(widget, FALSE); -- gtk_container_add(GTK_CONTAINER(box), widget); -- style = gtk_widget_get_style_context(widget); -- gtk_style_context_add_class(style, GTK_STYLE_CLASS_FLAT); -- gtk_style_context_add_class (style, "session-button"); -- - /* Lock */ -- widget = gtk_button_new_from_icon_name("system-lock-screen-symbolic", -- GTK_ICON_SIZE_SMALL_TOOLBAR); -- self->button_lock = widget; -- g_signal_connect_swapped(widget, "clicked", G_CALLBACK(brisk_menu_window_lock), self); -+ button = gtk_button_new(); -+ widget = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); -+ image = gtk_image_new_from_icon_name("system-lock-screen", GTK_ICON_SIZE_MENU); -+ gtk_box_pack_start(GTK_BOX(widget), image, FALSE, FALSE, 0); -+ label = gtk_label_new("Lock Screen"); -+ gtk_box_pack_start(GTK_BOX(widget), label, FALSE, FALSE, 0); -+ gtk_container_add(GTK_CONTAINER(button), widget); -+ self->button_logout = button; -+ g_signal_connect_swapped(button, "clicked", G_CALLBACK(brisk_menu_window_lock), self); - gtk_widget_set_tooltip_text(widget, _("Lock the screen")); -- gtk_widget_set_can_focus(widget, FALSE); -- gtk_container_add(GTK_CONTAINER(box), widget); -- style = gtk_widget_get_style_context(widget); -- gtk_style_context_add_class(style, GTK_STYLE_CLASS_FLAT); -- gtk_style_context_add_class (style, "session-button"); -+ gtk_container_add(GTK_CONTAINER(box), button); -+ gtk_button_set_relief(button, GTK_RELIEF_NONE); -+ gtk_widget_set_margin_end(image, 7); -+ -+ /* Logout */ -+ button = gtk_button_new(); -+ widget = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); -+ image = gtk_image_new_from_icon_name("application-exit", GTK_ICON_SIZE_MENU); -+ gtk_box_pack_start(GTK_BOX(widget), image, FALSE, FALSE, 0); -+ label = gtk_label_new("Log Out"); -+ gtk_box_pack_start(GTK_BOX(widget), label, FALSE, FALSE, 0); -+ gtk_container_add(GTK_CONTAINER(button), widget); -+ self->button_logout = button; -+ g_signal_connect_swapped(button, "clicked", G_CALLBACK(brisk_menu_window_logout), self); -+ gtk_widget_set_tooltip_text(widget, _("End the current session")); -+ gtk_container_add(GTK_CONTAINER(box), button); -+ gtk_button_set_relief(button, GTK_RELIEF_NONE); -+ gtk_widget_set_margin_end(image, 7); - - /* Shutdown */ -- widget = -- gtk_button_new_from_icon_name("system-shutdown-symbolic", GTK_ICON_SIZE_SMALL_TOOLBAR); -- self->button_shutdown = widget; -- g_signal_connect_swapped(widget, "clicked", G_CALLBACK(brisk_menu_window_shutdown), self); -+ button = gtk_button_new(); -+ widget = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); -+ image = gtk_image_new_from_icon_name("system-shutdown", GTK_ICON_SIZE_MENU); -+ gtk_box_pack_start(GTK_BOX(widget), image, FALSE, FALSE, 0); -+ label = gtk_label_new("Power Off"); -+ gtk_box_pack_start(GTK_BOX(widget), label, FALSE, FALSE, 0); -+ gtk_container_add(GTK_CONTAINER(button), widget); -+ self->button_logout = button; -+ g_signal_connect_swapped(button, "clicked", G_CALLBACK(brisk_menu_window_shutdown), self); - gtk_widget_set_tooltip_text(widget, _("Turn off the device")); -- gtk_widget_set_can_focus(widget, FALSE); -- gtk_container_add(GTK_CONTAINER(box), widget); -- style = gtk_widget_get_style_context(widget); -- gtk_style_context_add_class(style, GTK_STYLE_CLASS_FLAT); -- gtk_style_context_add_class (style, "session-button"); -+ gtk_container_add(GTK_CONTAINER(box), button); -+ gtk_button_set_relief(button, GTK_RELIEF_NONE); -+ gtk_widget_set_margin_end(image, 7); - } - - /** diff --git a/helpers/make-brisk-menu b/helpers/make-brisk-menu deleted file mode 100644 index fee58f5..0000000 --- a/helpers/make-brisk-menu +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2019 Mason Hock -# -# 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 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. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=1 - -. ./config - -sed '/dark-theme/{N;s/false/true/}' -i data/com.solus-project.brisk-menu.gschema.xml -sed '/label-visible/{N;s/true/false/}' -i data/com.solus-project.brisk-menu.gschema.xml -sed "/pinned-shortcuts/{N;s/'matecc.desktop'/'gnome-app-install.desktop', 'matecc.desktop'/}" -i data/com.solus-project.brisk-menu.gschema.xml -sed '/search-position/{N;s/top/bottom/}' -i data/com.solus-project.brisk-menu.gschema.xml - -changelog "Customized for Trisquel" - -compile diff --git a/helpers/make-mate-panel b/helpers/make-mate-panel index 6f07858..9f871dc 100644 --- a/helpers/make-mate-panel +++ b/helpers/make-mate-panel @@ -32,13 +32,12 @@ orientation=bottom expand=true size=44 -[Object briskmenu] +[Object menu] locked=true position=0 panel-right-stick=false toplevel-id=top -applet-iid=BriskMenuFactory::BriskMenu -object-type=applet +object-type=menu [Object files] locked=true