Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Hide user settings in Demo Mode #172

Merged
merged 6 commits into from
Jan 2, 2023
Merged

Hide user settings in Demo Mode #172

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
db28615
Add Utils to check if running in demo mode
meisenzahl Dec 30, 2022
3fdc673
Indicator: Hide User related stuff in demo mode
meisenzahl Dec 30, 2022
7042aa6
Fix whitespace
meisenzahl Dec 30, 2022
cf25e2a
Utils: Add more tests to check if running in Demo Mode
meisenzahl Dec 30, 2022
2eb7fe8
Satisfy linter
meisenzahl Dec 30, 2022
1410eb4
Move is_running_in_demo_mode to Indicator.vala
meisenzahl Jan 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
54 changes: 37 additions & 17 deletions src/Indicator.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,27 +132,30 @@ public class Session.Indicator : Wingpanel.Indicator {
};

if (server_type == Wingpanel.IndicatorManager.ServerType.SESSION) {
var users_separator = new Gtk.Separator (Gtk.Orientation.HORIZONTAL) {
margin_top = 3,
margin_bottom = 3
};
if (!is_running_in_demo_mode ()) {
var users_separator = new Gtk.Separator (Gtk.Orientation.HORIZONTAL) {
margin_top = 3,
margin_bottom = 3
};

var scrolled_box = new Gtk.ScrolledWindow (null, null) {
hexpand = true,
hscrollbar_policy = Gtk.PolicyType.NEVER,
max_content_height = 300,
propagate_natural_height = true
};
scrolled_box.add (manager.user_grid);

main_box.add (scrolled_box);
main_box.add (user_settings);
main_box.add (users_separator);
}

var logout_separator = new Gtk.Separator (Gtk.Orientation.HORIZONTAL) {
margin_top = 3,
margin_bottom = 3
};

var scrolled_box = new Gtk.ScrolledWindow (null, null) {
hexpand = true,
hscrollbar_policy = Gtk.PolicyType.NEVER,
max_content_height = 300,
propagate_natural_height = true
};
scrolled_box.add (manager.user_grid);

main_box.add (scrolled_box);
main_box.add (user_settings);
main_box.add (users_separator);
main_box.add (lock_screen);
main_box.add (log_out);
main_box.add (logout_separator);
Expand Down Expand Up @@ -289,7 +292,7 @@ public class Session.Indicator : Wingpanel.Indicator {
}

public override void opened () {
if (server_type == Wingpanel.IndicatorManager.ServerType.SESSION) {
if (server_type == Wingpanel.IndicatorManager.ServerType.SESSION && !is_running_in_demo_mode ()) {
manager.update_all ();
}

Expand Down Expand Up @@ -357,7 +360,7 @@ public class Session.Indicator : Wingpanel.Indicator {
private async void update_tooltip () {
string description;

if (server_type == Wingpanel.IndicatorManager.ServerType.SESSION) {
if (server_type == Wingpanel.IndicatorManager.ServerType.SESSION && !is_running_in_demo_mode ()) {
if (active_user_real_name == null) {
active_user_real_name = Environment.get_real_name ();
}
Expand Down Expand Up @@ -386,6 +389,23 @@ public class Session.Indicator : Wingpanel.Indicator {
accel_label
);
}

private bool is_running_in_demo_mode () {
var proc_cmdline = File.new_for_path ("/proc/cmdline");
try {
var @is = proc_cmdline.read ();
var dis = new DataInputStream (@is);

var line = dis.read_line ();
if ("boot=casper" in line || "boot=live" in line || "rd.live.image" in line) {
return true;
}
} catch (Error e) {
critical ("Couldn't detect if running in Demo Mode: %s", e.message);
}

return false;
}
}

public Wingpanel.Indicator? get_indicator (Module module, Wingpanel.IndicatorManager.ServerType server_type) {
Expand Down