-
-
Notifications
You must be signed in to change notification settings - Fork 49
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert "PartitionBar: cleanup and code style (#751)"
This reverts commit fcd8366.
- Loading branch information
1 parent
93df033
commit da647eb
Showing
4 changed files
with
97 additions
and
64 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,83 +1,105 @@ | ||
| /* | ||
| * SPDX-License-Identifier: GPL-3.0-or-later | ||
| * SPDX-FileCopyrightText: 2018-2024 elementary, Inc. (https://elementary.io) | ||
| // -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*- | ||
| /*- | ||
| * Copyright (c) 2018 elementary LLC. (https://elementary.io) | ||
| * | ||
| * 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 3 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, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| * Authored by: Michael Aaron Murphy <[email protected]> | ||
| */ | ||
|
|
||
| public class Installer.PartitionBar : Gtk.Box { | ||
| public class Installer.PartitionBar : Gtk.EventBox { | ||
| public Gtk.Box container; | ||
|
|
||
| public uint64 start; | ||
| public uint64 end; | ||
| public uint64 used; | ||
| public new string path; | ||
| public string? vg; | ||
|
|
||
| public Gtk.Label label; | ||
| public Gtk.Popover menu; | ||
| public Distinst.FileSystem filesystem; | ||
|
|
||
| public signal void decrypted (InstallerDaemon.LuksCredentials credential); | ||
|
|
||
| public Icon? icon { get; set; default = null; } | ||
|
|
||
| public bool lvm { get; construct; } | ||
| public InstallerDaemon.Partition partition { get; construct; } | ||
| public string parent_path { get; construct; } | ||
|
|
||
| public string? volume_group { get; private set; } | ||
| public Gtk.Popover menu { get; private set; } | ||
|
|
||
| private Gtk.GestureMultiPress click_gesture; | ||
|
|
||
| public PartitionBar ( | ||
| InstallerDaemon.Partition partition, | ||
| string parent_path, | ||
| uint64 sector_size, | ||
| bool lvm, | ||
| SetMount set_mount, | ||
| UnsetMount unset_mount, | ||
| MountSetFn mount_set | ||
| ) { | ||
| Object ( | ||
| lvm: lvm, | ||
| parent_path: parent_path, | ||
| partition: partition | ||
| ); | ||
|
|
||
| if (partition.filesystem == LUKS) { | ||
| menu = new DecryptMenu (partition.device_path); | ||
| public PartitionBar (InstallerDaemon.Partition part, string parent_path, | ||
| uint64 sector_size, bool lvm, SetMount set_mount, | ||
| UnsetMount unset_mount, MountSetFn mount_set) { | ||
| start = part.start_sector; | ||
| end = part.end_sector; | ||
|
|
||
| var usage = part.sectors_used; | ||
| if (usage.tag == 1) { | ||
| used = usage.value; | ||
| } else { | ||
| used = end - start; | ||
| } | ||
|
|
||
| path = part.device_path; | ||
| filesystem = part.filesystem; | ||
| vg = (Distinst.FileSystem.LVM == filesystem) | ||
| ? part.current_lvm_volume_group | ||
| : null; | ||
| tooltip_text = path; | ||
|
|
||
| var style_context = get_style_context (); | ||
| style_context.add_class (Distinst.strfilesys (filesystem)); | ||
|
|
||
| container = new Gtk.Box (Gtk.Orientation.VERTICAL, 0); | ||
|
|
||
| if (filesystem == Distinst.FileSystem.LUKS) { | ||
| menu = new DecryptMenu (path); | ||
| ((DecryptMenu)menu).decrypted.connect ((creds) => decrypted (creds)); | ||
| } else { | ||
| menu = new PartitionMenu (partition.device_path, parent_path, partition.filesystem, lvm, set_mount, unset_mount, mount_set, this); | ||
| menu = new PartitionMenu (path, parent_path, filesystem, lvm, | ||
| set_mount, unset_mount, mount_set, this); | ||
| } | ||
|
|
||
| menu.relative_to = this; | ||
| menu.position = BOTTOM; | ||
| menu.relative_to = container; | ||
| menu.position = Gtk.PositionType.BOTTOM; | ||
|
|
||
| add (container); | ||
| add_events (Gdk.EventMask.BUTTON_PRESS_MASK); | ||
| button_press_event.connect (() => { | ||
| show_popover (); | ||
| return true; | ||
| }); | ||
| } | ||
|
|
||
| class construct { | ||
| set_css_name ("block"); | ||
| } | ||
|
|
||
| construct { | ||
| volume_group = (partition.filesystem == LVM) ? partition.current_lvm_volume_group : null; | ||
|
|
||
| var image = new Gtk.Image () { | ||
| hexpand = true, | ||
| halign = END, | ||
| valign = END | ||
| }; | ||
|
|
||
| add (image); | ||
| hexpand = true; | ||
| tooltip_text = partition.device_path; | ||
|
|
||
| get_style_context ().add_class (Distinst.strfilesys (partition.filesystem)); | ||
|
|
||
| click_gesture = new Gtk.GestureMultiPress (this); | ||
| click_gesture.released.connect (menu.popup); | ||
|
|
||
| bind_property ("icon", image, "gicon", SYNC_CREATE); | ||
| } | ||
|
|
||
| public uint64 get_size () { | ||
| return partition.end_sector - partition.start_sector; | ||
| return end - start; | ||
| } | ||
|
|
||
| public double get_percent (uint64 disk_sectors) { | ||
| return (((double) this.get_size () / (double) disk_sectors)); | ||
| } | ||
|
|
||
| public int calculate_length (int alloc_width, uint64 disk_sectors) { | ||
| var percent = ((double) get_size () / (double) disk_sectors); | ||
| var request = alloc_width * percent; | ||
| var request = alloc_width * get_percent (disk_sectors); | ||
| if (request < 20) request = 20; | ||
| return (int) request; | ||
| } | ||
|
|
||
| public void show_popover () { | ||
| menu.popup (); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters