mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2025-01-07 19:57:45 +03:00
dc65543fa9
Prior to this commit, there was a set_filename() function that could set
the window title, but actually it never did that. It was called only
in one place -- by the 'Save as...' action, but it always failed to
change anything, because there was a check that tried to reassign
the same filename. :/
This patch:
1. removes that check, and therefore
2. renames the function to simply `update_window_title()`,
3. starts calling the function from more places (at startup and after
loading a file),
4. changes the window title order
(`{app_name} - {filename}` -> `{filename} - {app_name}`) to match
the other applications style on the system. :^)
82 lines
2.6 KiB
C++
82 lines
2.6 KiB
C++
/*
|
|
* Copyright (c) 2020-2022, the SerenityOS developers.
|
|
*
|
|
* SPDX-License-Identifier: BSD-2-Clause
|
|
*/
|
|
|
|
#include "HelpWindow.h"
|
|
#include "LibFileSystemAccessClient/Client.h"
|
|
#include "Spreadsheet.h"
|
|
#include "SpreadsheetWidget.h"
|
|
#include <AK/ScopeGuard.h>
|
|
#include <AK/Try.h>
|
|
#include <LibCore/ArgsParser.h>
|
|
#include <LibCore/File.h>
|
|
#include <LibCore/System.h>
|
|
#include <LibGUI/Application.h>
|
|
#include <LibGUI/Clipboard.h>
|
|
#include <LibGUI/FilePicker.h>
|
|
#include <LibGUI/Icon.h>
|
|
#include <LibGUI/Menu.h>
|
|
#include <LibGUI/Menubar.h>
|
|
#include <LibGUI/MessageBox.h>
|
|
#include <LibGUI/Window.h>
|
|
#include <LibMain/Main.h>
|
|
#include <unistd.h>
|
|
|
|
ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|
{
|
|
TRY(Core::System::pledge("stdio recvfd sendfd rpath fattr unix cpath wpath thread", nullptr));
|
|
|
|
auto app = GUI::Application::construct(arguments);
|
|
|
|
const char* filename = nullptr;
|
|
|
|
Core::ArgsParser args_parser;
|
|
args_parser.add_positional_argument(filename, "File to read from", "file", Core::ArgsParser::Required::No);
|
|
|
|
args_parser.parse(arguments);
|
|
|
|
if (filename) {
|
|
if (!Core::File::exists(filename) || Core::File::is_directory(filename)) {
|
|
warnln("File does not exist or is a directory: {}", filename);
|
|
return 1;
|
|
}
|
|
}
|
|
|
|
TRY(Core::System::unveil("/tmp/portal/webcontent", "rw"));
|
|
// For writing temporary files when exporting.
|
|
TRY(Core::System::unveil("/tmp", "crw"));
|
|
TRY(Core::System::unveil("/etc", "r"));
|
|
TRY(Core::System::unveil(Core::StandardPaths::home_directory().characters(), "rwc"));
|
|
TRY(Core::System::unveil("/res", "r"));
|
|
TRY(Core::System::unveil(nullptr, nullptr));
|
|
|
|
auto app_icon = GUI::Icon::default_icon("app-spreadsheet");
|
|
auto window = GUI::Window::construct();
|
|
window->resize(640, 480);
|
|
window->set_icon(app_icon.bitmap_for_size(16));
|
|
|
|
auto& spreadsheet_widget = window->set_main_widget<Spreadsheet::SpreadsheetWidget>(*window, NonnullRefPtrVector<Spreadsheet::Sheet> {}, filename == nullptr);
|
|
|
|
spreadsheet_widget.initialize_menubar(*window);
|
|
spreadsheet_widget.update_window_title();
|
|
|
|
window->on_close_request = [&]() -> GUI::Window::CloseRequestDecision {
|
|
if (spreadsheet_widget.request_close())
|
|
return GUI::Window::CloseRequestDecision::Close;
|
|
return GUI::Window::CloseRequestDecision::StayOpen;
|
|
};
|
|
|
|
window->show();
|
|
|
|
if (filename) {
|
|
auto response = FileSystemAccessClient::Client::the().try_request_file_read_only_approved(window, filename);
|
|
if (response.is_error())
|
|
return 1;
|
|
spreadsheet_widget.load_file(*response.value());
|
|
}
|
|
|
|
return app->exec();
|
|
}
|