mirror of
https://github.com/YGGverse/Yoda.git
synced 2026-04-01 00:55:28 +00:00
rename methods, use namespace
This commit is contained in:
parent
9cc75a8fcf
commit
b8b59e6f56
9 changed files with 20 additions and 20 deletions
|
|
@ -197,7 +197,7 @@ class Page
|
||||||
);
|
);
|
||||||
|
|
||||||
// Refresh header by new title if current page is active
|
// Refresh header by new title if current page is active
|
||||||
if ($this === $this->container->tab->getPage())
|
if ($this === $this->container->tab->get())
|
||||||
{
|
{
|
||||||
$this->container->browser->header->setTitle(
|
$this->container->browser->header->setTitle(
|
||||||
$this->title->getValue(),
|
$this->title->getValue(),
|
||||||
|
|
@ -231,7 +231,7 @@ class Page
|
||||||
);
|
);
|
||||||
|
|
||||||
// Refresh header by new title if current page is active
|
// Refresh header by new title if current page is active
|
||||||
if ($this === $this->container->tab->getPage())
|
if ($this === $this->container->tab->get())
|
||||||
{
|
{
|
||||||
$this->container->browser->header->setTitle(
|
$this->container->browser->header->setTitle(
|
||||||
$this->title->getValue(),
|
$this->title->getValue(),
|
||||||
|
|
@ -264,7 +264,7 @@ class Page
|
||||||
);
|
);
|
||||||
|
|
||||||
// Refresh header by new title if current page is active
|
// Refresh header by new title if current page is active
|
||||||
if ($this === $this->container->tab->getPage())
|
if ($this === $this->container->tab->get())
|
||||||
{
|
{
|
||||||
$this->container->browser->header->setTitle(
|
$this->container->browser->header->setTitle(
|
||||||
$this->title->getValue()
|
$this->title->getValue()
|
||||||
|
|
|
||||||
|
|
@ -90,7 +90,7 @@ class Content
|
||||||
);
|
);
|
||||||
|
|
||||||
// Refresh header by new title if current page is active
|
// Refresh header by new title if current page is active
|
||||||
if ($this->page === $this->page->container->tab->getPage())
|
if ($this->page === $this->page->container->tab->get())
|
||||||
{
|
{
|
||||||
$this->page->container->browser->header->setTitle(
|
$this->page->container->browser->header->setTitle(
|
||||||
$this->page->title->getValue(),
|
$this->page->title->getValue(),
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,7 @@ class Request extends \Yggverse\Yoda\Abstract\Entity\Browser\Container\Page\Navb
|
||||||
$entry->get_text()
|
$entry->get_text()
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->navbar->page->container->tab->updateSession();
|
$this->navbar->page->container->tab->update();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function _onKeyRelease(
|
protected function _onKeyRelease(
|
||||||
|
|
@ -26,7 +26,7 @@ class Request extends \Yggverse\Yoda\Abstract\Entity\Browser\Container\Page\Navb
|
||||||
{
|
{
|
||||||
$this->navbar->refresh();
|
$this->navbar->refresh();
|
||||||
|
|
||||||
$this->navbar->page->container->tab->updateSession();
|
$this->navbar->page->container->tab->update();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function _onChanged(
|
protected function _onChanged(
|
||||||
|
|
@ -40,7 +40,7 @@ class Request extends \Yggverse\Yoda\Abstract\Entity\Browser\Container\Page\Navb
|
||||||
1000, // wait for one second to apply changes
|
1000, // wait for one second to apply changes
|
||||||
function()
|
function()
|
||||||
{
|
{
|
||||||
$this->navbar->page->container->tab->updateSession();
|
$this->navbar->page->container->tab->update();
|
||||||
|
|
||||||
return false; // stop
|
return false; // stop
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -36,7 +36,7 @@ class Tab
|
||||||
// Restore previous session
|
// Restore previous session
|
||||||
foreach ($this->container->browser->database->getSession() as $session)
|
foreach ($this->container->browser->database->getSession() as $session)
|
||||||
{
|
{
|
||||||
$this->appendPage(
|
$this->append(
|
||||||
$session->request,
|
$session->request,
|
||||||
boolval( // open
|
boolval( // open
|
||||||
parse_url(
|
parse_url(
|
||||||
|
|
@ -56,7 +56,7 @@ class Tab
|
||||||
int $page_num
|
int $page_num
|
||||||
) {
|
) {
|
||||||
// Update header bar title
|
// Update header bar title
|
||||||
if ($page = $this->getPage($page_num))
|
if ($page = $this->get($page_num))
|
||||||
{
|
{
|
||||||
$this->container->browser->header->setTitle(
|
$this->container->browser->header->setTitle(
|
||||||
$page->title->getValue(),
|
$page->title->getValue(),
|
||||||
|
|
@ -117,7 +117,7 @@ class Tab
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function appendPage(
|
public function append(
|
||||||
?string $request = null,
|
?string $request = null,
|
||||||
bool $open = true,
|
bool $open = true,
|
||||||
bool $focus = true
|
bool $focus = true
|
||||||
|
|
@ -167,9 +167,9 @@ class Tab
|
||||||
$this->gtk->show();
|
$this->gtk->show();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getPage(
|
public function get(
|
||||||
?int $page_num = null
|
?int $page_num = null
|
||||||
): ?\Yggverse\Yoda\Entity\Browser\Container\Page
|
): ?Page
|
||||||
{
|
{
|
||||||
// Get current page number on $page_num is null
|
// Get current page number on $page_num is null
|
||||||
if (is_null($page_num))
|
if (is_null($page_num))
|
||||||
|
|
@ -197,7 +197,7 @@ class Tab
|
||||||
?int $page_num = null
|
?int $page_num = null
|
||||||
): void
|
): void
|
||||||
{
|
{
|
||||||
if ($page = $this->getPage($page_num))
|
if ($page = $this->get($page_num))
|
||||||
{
|
{
|
||||||
$this->gtk->remove_page(
|
$this->gtk->remove_page(
|
||||||
$this->gtk->page_num(
|
$this->gtk->page_num(
|
||||||
|
|
@ -246,11 +246,11 @@ class Tab
|
||||||
// Update session
|
// Update session
|
||||||
if ($session)
|
if ($session)
|
||||||
{
|
{
|
||||||
$this->updateSession();
|
$this->update();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public function updateSession(): void
|
public function update(): void
|
||||||
{
|
{
|
||||||
$pid = pcntl_fork();
|
$pid = pcntl_fork();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -77,7 +77,7 @@ class Table
|
||||||
// Focus on browser
|
// Focus on browser
|
||||||
// $this->content->container->history->browser->gtk->present();
|
// $this->content->container->history->browser->gtk->present();
|
||||||
|
|
||||||
$this->content->container->history->browser->container->tab->appendPage(
|
$this->content->container->history->browser->container->tab->append(
|
||||||
$this->getSelectedUrl()
|
$this->getSelectedUrl()
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ class Open extends \Yggverse\Yoda\Abstract\Entity\Browser\History\Container\Navb
|
||||||
\GtkButton $entity
|
\GtkButton $entity
|
||||||
): void
|
): void
|
||||||
{
|
{
|
||||||
$this->navbar->container->history->browser->container->tab->appendPage(
|
$this->navbar->container->history->browser->container->tab->append(
|
||||||
$this->navbar->container->content->table->getSelectedUrl()
|
$this->navbar->container->content->table->getSelectedUrl()
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -84,7 +84,7 @@ class Open
|
||||||
{
|
{
|
||||||
foreach ($dialog->get_filenames() as $filename)
|
foreach ($dialog->get_filenames() as $filename)
|
||||||
{
|
{
|
||||||
$this->file->menu->browser->container->tab->appendPage(
|
$this->file->menu->browser->container->tab->append(
|
||||||
sprintf(
|
sprintf(
|
||||||
'file://%s',
|
'file://%s',
|
||||||
$filename
|
$filename
|
||||||
|
|
|
||||||
|
|
@ -58,7 +58,7 @@ class Save
|
||||||
|
|
||||||
if (\GtkResponseType::APPLY == $dialog->run())
|
if (\GtkResponseType::APPLY == $dialog->run())
|
||||||
{
|
{
|
||||||
if ($page = $this->file->menu->browser->container->tab->getPage())
|
if ($page = $this->file->menu->browser->container->tab->get())
|
||||||
{
|
{
|
||||||
file_put_contents(
|
file_put_contents(
|
||||||
$dialog->get_filename(),
|
$dialog->get_filename(),
|
||||||
|
|
|
||||||
|
|
@ -33,7 +33,7 @@ class Add
|
||||||
'activate',
|
'activate',
|
||||||
function()
|
function()
|
||||||
{
|
{
|
||||||
$this->tab->menu->browser->container->tab->appendPage(
|
$this->tab->menu->browser->container->tab->append(
|
||||||
null,
|
null,
|
||||||
false
|
false
|
||||||
);
|
);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue