mirrors/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity.git synced 2025-01-24 02:12:09 -05:00
Code Issues Projects Releases Packages Wiki Activity

Taskbar: Remove QuickLaunch entries if corresponding file was deleted

Browse source
This commit is contained in:
Maciej 2021-12-29 18:15:21 +01:00 • committed by Andreas Kling
parent 0252c1f8fa
commit 2cda579b07
2 changed files with 33 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
Userland/Services/Taskbar/QuickLaunchWidget.cpp
View file

@ -5,13 +5,14 @@
*/
#include "QuickLaunchWidget.h"
#include "LibCore/IODevice.h"
#include "LibDesktop/Launcher.h"
#include <AK/LexicalPath.h>
#include <Kernel/API/InodeWatcherFlags.h>
#include <LibConfig/Client.h>
#include <LibCore/FileWatcher.h>
#include <LibCore/MimeData.h>
#include <LibCore/Process.h>
#include <LibCore/System.h>
#include <LibDesktop/Launcher.h>
#include <LibGUI/BoxLayout.h>
#include <LibGUI/FileIconProvider.h>
#include <LibGUI/Menu.h>
@ -133,14 +134,37 @@ OwnPtr<QuickLaunchEntry> QuickLaunchEntry::create_from_path(StringView path)
dbgln("Failed to stat quick launch entry file: {}", stat_or_error.release_error());
return {};
}
auto stat = stat_or_error.release_value();
if (S_ISREG(stat.st_mode) && (stat.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
return make<QuickLaunchEntryExecutable>(path);
return make<QuickLaunchEntryFile>(path);
}
static String sanitize_entry_name(String const& name)
{
return name.replace(" ", "", true).replace("=", "", true);
}
void QuickLaunchWidget::add_or_adjust_button(String const& button_name, NonnullOwnPtr<QuickLaunchEntry>&& entry)
{
auto file_name_to_watch = entry->file_name_to_watch();
if (!file_name_to_watch.is_null()) {
if (!m_watcher) {
// FIXME: Propagate errors
m_watcher = MUST(Core::FileWatcher::create());
m_watcher->on_change = [this](Core::FileWatcherEvent const& event) {
auto name = sanitize_entry_name(event.event_path);
dbgln("Removing QuickLaunch entry {}", name);
auto button = find_child_of_type_named<GUI::Button>(name);
if (button)
remove_child(*button);
};
}
// FIXME: Propagate errors
MUST(m_watcher->add_watch(file_name_to_watch, Core::FileWatcherEvent::Type::Deleted));
}
auto button = find_child_of_type_named<GUI::Button>(button_name);
if (!button)
button = &add<GUI::Button>();
@ -192,7 +216,7 @@ void QuickLaunchWidget::drop_event(GUI::DropEvent& event)
for (auto& url : urls) {
auto entry = QuickLaunchEntry::create_from_path(url.path());
if (entry) {
auto item_name = entry->name().replace(" ", "", true).replace("=", "", true);
auto item_name = sanitize_entry_name(entry->name());
add_or_adjust_button(item_name, entry.release_nonnull());
Config::write_string("Taskbar", quick_launch, item_name, url.path());
}

6
Userland/Services/Taskbar/QuickLaunchWidget.h
View file

@ -7,6 +7,7 @@
#pragma once
#include <LibConfig/Listener.h>
#include <LibCore/FileWatcher.h>
#include <LibDesktop/AppFile.h>
#include <LibGUI/Button.h>
#include <LibGUI/Frame.h>
@ -19,6 +20,7 @@ public:
virtual ErrorOr<void> launch() const = 0;
virtual GUI::Icon icon() const = 0;
virtual String name() const = 0;
virtual String file_name_to_watch() const = 0;
static OwnPtr<QuickLaunchEntry> create_from_config_value(StringView path);
static OwnPtr<QuickLaunchEntry> create_from_path(StringView path);
@ -34,6 +36,7 @@ public:
virtual ErrorOr<void> launch() const override;
virtual GUI::Icon icon() const override { return m_app_file->icon(); }
virtual String name() const override { return m_app_file->name(); }
virtual String file_name_to_watch() const override { return {}; }
private:
NonnullRefPtr<Desktop::AppFile> m_app_file;
@ -49,6 +52,7 @@ public:
virtual ErrorOr<void> launch() const override;
virtual GUI::Icon icon() const override;
virtual String name() const override;
virtual String file_name_to_watch() const override { return m_path; }
private:
String m_path;
@ -63,6 +67,7 @@ public:
virtual ErrorOr<void> launch() const override;
virtual GUI::Icon icon() const override;
virtual String name() const override;
virtual String file_name_to_watch() const override { return m_path; }
private:
String m_path;
@ -86,6 +91,7 @@ private:
RefPtr<GUI::Menu> m_context_menu;
RefPtr<GUI::Action> m_context_menu_default_action;
String m_context_menu_app_name;
RefPtr<Core::FileWatcher> m_watcher;
};
}