mirror of
https://github.com/YGGverse/Yoda.git
synced 2025-03-12 13:41:34 +00:00
remove extra constructions
This commit is contained in:
parent
8e1e42f609
commit
41650a9775
@ -179,26 +179,7 @@ void Page::navigation_reload(
|
|||||||
|
|
||||||
progress_fraction = 0;
|
progress_fraction = 0;
|
||||||
|
|
||||||
// Begin progress listener in main thread (as this method use async data loader)
|
action__update->activate();
|
||||||
Glib::signal_timeout().connect(
|
|
||||||
[this]() -> bool
|
|
||||||
{
|
|
||||||
// Page update in progress..
|
|
||||||
if (progress_fraction < 1)
|
|
||||||
{
|
|
||||||
return true; // continue
|
|
||||||
}
|
|
||||||
|
|
||||||
// Page update completed, reset progress_fraction anyway
|
|
||||||
progress_fraction = 0;
|
|
||||||
|
|
||||||
// Activate window update action
|
|
||||||
action__update->signal_activate();
|
|
||||||
|
|
||||||
return false; // stop iteration
|
|
||||||
},
|
|
||||||
500 // @TODO add timeout
|
|
||||||
);
|
|
||||||
|
|
||||||
// Connect scheme driver
|
// Connect scheme driver
|
||||||
if ("file" == pageNavigation->get_request_scheme())
|
if ("file" == pageNavigation->get_request_scheme())
|
||||||
@ -237,6 +218,8 @@ void Page::navigation_reload(
|
|||||||
|
|
||||||
progress_fraction = .25;
|
progress_fraction = .25;
|
||||||
|
|
||||||
|
action__update->activate();
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
GioSocketConnection = GioSocketClient->connect_to_uri_finish(
|
GioSocketConnection = GioSocketClient->connect_to_uri_finish(
|
||||||
@ -252,6 +235,8 @@ void Page::navigation_reload(
|
|||||||
description = EXCEPTION.what();
|
description = EXCEPTION.what();
|
||||||
|
|
||||||
progress_fraction = 1;
|
progress_fraction = 1;
|
||||||
|
|
||||||
|
action__update->activate();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Connection established, begin request
|
// Connection established, begin request
|
||||||
@ -275,6 +260,8 @@ void Page::navigation_reload(
|
|||||||
|
|
||||||
progress_fraction = .5;
|
progress_fraction = .5;
|
||||||
|
|
||||||
|
action__update->activate();
|
||||||
|
|
||||||
// Response
|
// Response
|
||||||
GioSocketConnection->get_input_stream()->read_async( // | read_all_async
|
GioSocketConnection->get_input_stream()->read_async( // | read_all_async
|
||||||
buffer,
|
buffer,
|
||||||
@ -292,6 +279,8 @@ void Page::navigation_reload(
|
|||||||
|
|
||||||
progress_fraction = .75;
|
progress_fraction = .75;
|
||||||
|
|
||||||
|
action__update->activate();
|
||||||
|
|
||||||
// Parse meta
|
// Parse meta
|
||||||
auto meta = Glib::Regex::split_simple(
|
auto meta = Glib::Regex::split_simple(
|
||||||
R"regex(^(\d+)?\s([\w]+\/[\w]+)?)regex",
|
R"regex(^(\d+)?\s([\w]+\/[\w]+)?)regex",
|
||||||
@ -317,6 +306,8 @@ void Page::navigation_reload(
|
|||||||
|
|
||||||
progress_fraction = .8;
|
progress_fraction = .8;
|
||||||
|
|
||||||
|
action__update->activate();
|
||||||
|
|
||||||
pageContent->set_text_gemini( // @TODO
|
pageContent->set_text_gemini( // @TODO
|
||||||
buffer
|
buffer
|
||||||
);
|
);
|
||||||
@ -330,6 +321,8 @@ void Page::navigation_reload(
|
|||||||
description = _("MIME type not supported");
|
description = _("MIME type not supported");
|
||||||
|
|
||||||
progress_fraction = 1;
|
progress_fraction = 1;
|
||||||
|
|
||||||
|
action__update->activate();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -344,6 +337,8 @@ void Page::navigation_reload(
|
|||||||
);
|
);
|
||||||
|
|
||||||
progress_fraction = 1;
|
progress_fraction = 1;
|
||||||
|
|
||||||
|
action__update->activate();
|
||||||
}
|
}
|
||||||
|
|
||||||
GioSocketConnection->close();
|
GioSocketConnection->close();
|
||||||
|
@ -86,9 +86,7 @@ namespace app::browser::main::tab
|
|||||||
Glib::ustring description;
|
Glib::ustring description;
|
||||||
|
|
||||||
// Tools
|
// Tools
|
||||||
double progress_fraction; // Page preparation status, wanted for following needs:
|
double progress_fraction; // async load indication (progress bar)
|
||||||
// * indication widgets (progress bar)
|
|
||||||
// * toggle window update action in main thread (e.g. on async data loading complete)
|
|
||||||
|
|
||||||
// Actions
|
// Actions
|
||||||
Glib::RefPtr<Gio::SimpleAction> action__update;
|
Glib::RefPtr<Gio::SimpleAction> action__update;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user