Skip to content

Commit

Permalink
panel: Implement default logout user interface
Browse files Browse the repository at this point in the history 
When a user clicks the logout button in the menu and no command is set,
open a default logout interface.
  • Loading branch information
@soreau
soreau committed Aug 15, 2021
1 parent deffdba commit c236ee2
Show file tree
Hide file tree
Showing 3 changed files with 199 additions and 1 deletion.
25 changes: 25 additions & 0 deletions metadata/panel.xml
View file
Expand Up @@ -179,8 +179,33 @@
</option>
<option name="menu_logout_command" type="string">
<_short>Menu Logout Command</_short>
<_long>If not specified, a default logout interface will be used.</_long>
<default></default>
</option>
<option name="logout_command" type="string">
<_short>Logout Button Command</_short>
<default>wayland-logout</default>
</option>
<option name="reboot_command" type="string">
<_short>Reboot Button Command</_short>
<default>systemctl reboot</default>
</option>
<option name="shutdown_command" type="string">
<_short>Shutdown Button Command</_short>
<default>systemctl poweroff</default>
</option>
<option name="suspend_command" type="string">
<_short>Suspend Button Command</_short>
<default>systemctl suspend</default>
</option>
<option name="hibernate_command" type="string">
<_short>Hibernate Button Command</_short>
<default>systemctl hibernate</default>
</option>
<option name="switchuser_command" type="string">
<_short>Switch User Button Command</_short>
<default>dm-tool switch-to-greeter</default>
</option>
</group>
<group>
<_short>Volume</_short>
Expand Down
132 changes: 131 additions & 1 deletion src/panel/widgets/menu.cpp
View file
Expand Up @@ -302,9 +302,137 @@ void WayfireMenu::update_popover_layout()
popover_layout_box.show_all();
}

void WayfireLogoutUI::on_logout_click()
{
ui.hide();
g_spawn_command_line_async(std::string(logout_command).c_str(), NULL);
}

void WayfireLogoutUI::on_reboot_click()
{
ui.hide();
g_spawn_command_line_async(std::string(reboot_command).c_str(), NULL);
}

void WayfireLogoutUI::on_shutdown_click()
{
ui.hide();
g_spawn_command_line_async(std::string(shutdown_command).c_str(), NULL);
}

void WayfireLogoutUI::on_suspend_click()
{
ui.hide();
g_spawn_command_line_async(std::string(suspend_command).c_str(), NULL);
}

void WayfireLogoutUI::on_hibernate_click()
{
ui.hide();
g_spawn_command_line_async(std::string(hibernate_command).c_str(), NULL);
}

void WayfireLogoutUI::on_switchuser_click()
{
ui.hide();
g_spawn_command_line_async(std::string(switchuser_command).c_str(), NULL);
}

void WayfireLogoutUI::on_cancel_click()
{
ui.hide();
}

#define LOGOUT_BUTTON_SIZE 125
#define LOGOUT_BUTTON_MARGIN 5

void WayfireLogoutUI::create_logout_ui_button(WayfireLogoutUIButton *button, const char *icon, const char *label)
{
button->button.set_size_request(LOGOUT_BUTTON_SIZE, LOGOUT_BUTTON_SIZE);
button->image.set_from_icon_name(icon, Gtk::ICON_SIZE_DIALOG);
button->label.set_text(label);
button->layout.pack_start(button->image, true, false);
button->layout.pack_start(button->label, true, false);
button->button.add(button->layout);
}

const std::string get_ui_title()
{
std::string title;

title = "Log out";

auto full_user_name = g_get_real_name();
if (!full_user_name || !strcmp(full_user_name, "Unknown"))
{
return title.c_str();
}

return title + ' ' + full_user_name;
}

WayfireLogoutUI::WayfireLogoutUI()
{
create_logout_ui_button(&logout, "system-log-out", "Log Out");
logout.button.signal_clicked().connect_notify(
sigc::mem_fun(this, &WayfireLogoutUI::on_logout_click));
top_layout.pack_start(logout.button, true, false);

create_logout_ui_button(&reboot, "system-reboot", "Reboot");
reboot.button.signal_clicked().connect_notify(
sigc::mem_fun(this, &WayfireLogoutUI::on_reboot_click));
top_layout.pack_start(reboot.button, true, false);

create_logout_ui_button(&shutdown, "system-shutdown", "Shut Down");
shutdown.button.signal_clicked().connect_notify(
sigc::mem_fun(this, &WayfireLogoutUI::on_shutdown_click));
top_layout.pack_start(shutdown.button, true, false);

create_logout_ui_button(&suspend, "emblem-synchronizing", "Suspend");
suspend.button.signal_clicked().connect_notify(
sigc::mem_fun(this, &WayfireLogoutUI::on_suspend_click));
middle_layout.pack_start(suspend.button, true, false);

create_logout_ui_button(&hibernate, "weather-clear-night", "Hibernate");
hibernate.button.signal_clicked().connect_notify(
sigc::mem_fun(this, &WayfireLogoutUI::on_hibernate_click));
middle_layout.pack_start(hibernate.button, true, false);

create_logout_ui_button(&switchuser, "system-users", "Switch User");
switchuser.button.signal_clicked().connect_notify(
sigc::mem_fun(this, &WayfireLogoutUI::on_switchuser_click));
middle_layout.pack_start(switchuser.button, true, false);

cancel.button.set_size_request(100, 50);
cancel.button.set_label("Cancel");
bottom_layout.pack_start(cancel.button, true, false);
cancel.button.signal_clicked().connect_notify(
sigc::mem_fun(this, &WayfireLogoutUI::on_cancel_click));

top_layout.set_spacing(LOGOUT_BUTTON_MARGIN);
middle_layout.set_spacing(LOGOUT_BUTTON_MARGIN);
bottom_layout.set_spacing(LOGOUT_BUTTON_MARGIN);
main_layout.set_spacing(LOGOUT_BUTTON_MARGIN);
main_layout.add(top_layout);
main_layout.add(middle_layout);
main_layout.add(bottom_layout);
ui.set_title(get_ui_title().c_str());
ui.set_keep_above(true);
ui.set_resizable(false);
ui.add(main_layout);
}

void WayfireMenu::on_logout_click()
{
g_spawn_command_line_async(std::string(menu_logout_command).c_str(), NULL);
if (!std::string(menu_logout_command).empty())
{
g_spawn_command_line_async(std::string(menu_logout_command).c_str(), NULL);
return;
}

/* If no command specified for logout, show our own logout window */
logout_ui->ui.present();
logout_ui->ui.show_all();
}

void WayfireMenu::refresh()
Expand Down Expand Up @@ -356,6 +484,8 @@ void WayfireMenu::init(Gtk::HBox *container)
popover_layout_box.pack_end(hbox_bottom);
popover_layout_box.pack_end(separator);

logout_ui = std::make_unique<WayfireLogoutUI>();

load_menu_items_all();
update_popover_layout();

Expand Down
43 changes: 43 additions & 0 deletions src/panel/widgets/menu.hpp
View file
Expand Up @@ -6,6 +6,7 @@
#include <giomm/desktopappinfo.h>
#include <gtkmm/entry.h>
#include <gtkmm/image.h>
#include <gtkmm/window.h>
#include <gtkmm/flowbox.h>
#include <gtkmm/scrolledwindow.h>
#include <gtkmm/separator.h>
Expand Down Expand Up @@ -35,6 +36,46 @@ class WfMenuMenuItem : public Gtk::HBox
void on_click();
};

class WayfireLogoutUIButton
{
public:
Gtk::VBox layout;
Gtk::Image image;
Gtk::Label label;
Gtk::Button button;
};

class WayfireLogoutUI
{
public:
WayfireLogoutUI();
WfOption<std::string> logout_command{"panel/logout_command"};
WfOption<std::string> reboot_command{"panel/reboot_command"};
WfOption<std::string> shutdown_command{"panel/shutdown_command"};
WfOption<std::string> suspend_command{"panel/suspend_command"};
WfOption<std::string> hibernate_command{"panel/hibernate_command"};
WfOption<std::string> switchuser_command{"panel/switchuser_command"};
Gtk::Window ui;
WayfireLogoutUIButton logout;
WayfireLogoutUIButton reboot;
WayfireLogoutUIButton shutdown;
WayfireLogoutUIButton suspend;
WayfireLogoutUIButton hibernate;
WayfireLogoutUIButton switchuser;
WayfireLogoutUIButton cancel;
Gtk::VBox main_layout;
Gtk::HBox top_layout, middle_layout, bottom_layout;
void create_logout_ui_button(WayfireLogoutUIButton *button,
const char *icon, const char *label);
void on_logout_click();
void on_reboot_click();
void on_shutdown_click();
void on_suspend_click();
void on_hibernate_click();
void on_switchuser_click();
void on_cancel_click();
};

class WayfireMenu : public WayfireWidget
{
Gtk::Box flowbox_container;
Expand All @@ -48,6 +89,7 @@ class WayfireMenu : public WayfireWidget
Gtk::Button logout_button;
Gtk::ScrolledWindow scrolled_window;
std::unique_ptr<WayfireMenuButton> button;
std::unique_ptr<WayfireLogoutUI> logout_ui;

void load_menu_item(AppInfo app_info);
void load_menu_items_from_dir(std::string directory);
Expand All @@ -74,6 +116,7 @@ class WayfireMenu : public WayfireWidget
WfOption<std::string> menu_icon{"panel/menu_icon"};
WfOption<int> menu_size{"panel/launchers_size"};
void update_popover_layout();
void create_logout_ui();
void on_logout_click();

public:
Expand Down

0 comments on commit c236ee2

Please sign in to comment.