RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 18:28:12 +00:00
Code Issues Activity Actions

Taskbar: Support arbitrary executables as QuickLaunch entries

Browse source
This commit is contained in:
Maciej 2021-12-29 17:06:14 +01:00 • committed by Andreas Kling
parent 2e8e959896
commit 3022baddc2
2 changed files with 51 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5,13 +5,18 @@
*/
#include "QuickLaunchWidget.h"
#include "LibCore/IODevice.h"
#include <AK/LexicalPath.h>
#include <LibConfig/Client.h>
#include <LibCore/MimeData.h>
#include <LibCore/Process.h>
#include <LibCore/System.h>
#include <LibGUI/BoxLayout.h>
#include <LibGUI/FileIconProvider.h>
#include <LibGUI/Menu.h>
#include <LibGUI/MessageBox.h>
#include <serenity.h>
#include <sys/stat.h>
namespace Taskbar {
@ -39,6 +44,24 @@ ErrorOr<void> QuickLaunchEntryAppFile::launch() const
return {};
}
ErrorOr<void> QuickLaunchEntryExecutable::launch() const
{
auto pid = Core::Process::spawn(m_path);
if (pid < 0)
return Error::from_syscall("Core::Process::spawn", -errno);
return {};
}
GUI::Icon QuickLaunchEntryExecutable::icon() const
{
return GUI::FileIconProvider::icon_for_executable(m_path);
}
String QuickLaunchEntryExecutable::name() const
{
return LexicalPath { m_path }.basename();
}
QuickLaunchWidget::QuickLaunchWidget()
{
set_shrink_to_fit(true);
@ -73,17 +96,26 @@ QuickLaunchWidget::~QuickLaunchWidget()
OwnPtr<QuickLaunchEntry> QuickLaunchEntry::create_from_config_value(StringView value)
{
if (value.ends_with(".af")) {
if (!value.starts_with("/") && value.ends_with(".af")) {
auto af_path = String::formatted("{}/{}", Desktop::AppFile::APP_FILES_DIRECTORY, value);
return make<QuickLaunchEntryAppFile>(Desktop::AppFile::open(af_path));
}
return {};
} else
return create_from_path(value);
}
OwnPtr<QuickLaunchEntry> QuickLaunchEntry::create_from_path(StringView path)
{
if (path.ends_with(".af"))
return make<QuickLaunchEntryAppFile>(Desktop::AppFile::open(path));
auto stat_or_error = Core::System::stat(path);
if (stat_or_error.is_error()) {
dbgln("Failed to stat quick launch entry file: {}", stat_or_error.release_error());
return {};
}
auto stat = stat_or_error.release_value();
if (stat.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))
return make<QuickLaunchEntryExecutable>(path);
dbgln("Config value {} is not a valid quick launch entry", path);
return {};
}
@ -140,7 +172,7 @@ void QuickLaunchWidget::drop_event(GUI::DropEvent& event)
if (entry) {
auto item_name = entry->name().replace(" ", "", true);
add_or_adjust_button(item_name, entry.release_nonnull());
Config::write_string("Taskbar", quick_launch, item_name, url.basename());
Config::write_string("Taskbar", quick_launch, item_name, url.path());
}
}
}