From 63bc991bdad6bd7d840c8afe075b9dbe3f0996cb Mon Sep 17 00:00:00 2001 From: yggverse Date: Mon, 8 Jul 2024 21:01:14 +0300 Subject: [PATCH] move Page entity out of Tab namespace --- .../Browser/Container/Page/Navbar/Button.php | 18 ++++++++++++++ .../Browser/Container/Page/Navbar/Entry.php | 18 ++++++++++++++ .../Container/Tab/Page/Navbar/Button.php | 18 -------------- .../Container/Tab/Page/Navbar/Entry.php | 18 -------------- .../Browser/Container/{Tab => }/Page.php | 24 +++++++++---------- .../Container/{Tab => }/Page/Content.php | 18 +++++++------- .../Container/{Tab => }/Page/Content/Data.php | 6 ++--- .../{Tab => }/Page/Content/Viewport.php | 6 ++--- .../Container/{Tab => }/Page/Navbar.php | 22 ++++++++--------- .../Container/{Tab => }/Page/Navbar/Base.php | 4 ++-- .../Container/{Tab => }/Page/Navbar/Go.php | 4 ++-- .../{Tab => }/Page/Navbar/History.php | 14 +++++------ .../{Tab => }/Page/Navbar/History/Back.php | 4 ++-- .../{Tab => }/Page/Navbar/History/Forward.php | 4 ++-- .../{Tab => }/Page/Navbar/Request.php | 4 ++-- .../Container/{Tab => }/Page/Response.php | 14 +++++------ .../{Tab => }/Page/Response/Query.php | 6 ++--- .../{Tab => }/Page/Response/Send.php | 6 ++--- .../Container/{Tab => }/Page/Title.php | 8 +++---- src/Entity/Browser/Container/Tab.php | 4 ++-- .../Container/{Tab => }/Page/Title/Label.php | 2 +- 21 files changed, 111 insertions(+), 111 deletions(-) create mode 100644 src/Abstract/Entity/Browser/Container/Page/Navbar/Button.php create mode 100644 src/Abstract/Entity/Browser/Container/Page/Navbar/Entry.php delete mode 100644 src/Abstract/Entity/Browser/Container/Tab/Page/Navbar/Button.php delete mode 100644 src/Abstract/Entity/Browser/Container/Tab/Page/Navbar/Entry.php rename src/Entity/Browser/Container/{Tab => }/Page.php (66%) rename src/Entity/Browser/Container/{Tab => }/Page/Content.php (94%) rename src/Entity/Browser/Container/{Tab => }/Page/Content/Data.php (96%) rename src/Entity/Browser/Container/{Tab => }/Page/Content/Viewport.php (59%) rename src/Entity/Browser/Container/{Tab => }/Page/Navbar.php (68%) rename src/Entity/Browser/Container/{Tab => }/Page/Navbar/Base.php (92%) rename src/Entity/Browser/Container/{Tab => }/Page/Navbar/Go.php (82%) rename src/Entity/Browser/Container/{Tab => }/Page/Navbar/History.php (69%) rename src/Entity/Browser/Container/{Tab => }/Page/Navbar/History/Back.php (87%) rename src/Entity/Browser/Container/{Tab => }/Page/Navbar/History/Forward.php (87%) rename src/Entity/Browser/Container/{Tab => }/Page/Navbar/Request.php (82%) rename src/Entity/Browser/Container/{Tab => }/Page/Response.php (83%) rename src/Entity/Browser/Container/{Tab => }/Page/Response/Query.php (75%) rename src/Entity/Browser/Container/{Tab => }/Page/Response/Send.php (73%) rename src/Entity/Browser/Container/{Tab => }/Page/Title.php (84%) rename src/Gtk/Browser/Container/{Tab => }/Page/Title/Label.php (83%) diff --git a/src/Abstract/Entity/Browser/Container/Page/Navbar/Button.php b/src/Abstract/Entity/Browser/Container/Page/Navbar/Button.php new file mode 100644 index 00000000..94b0be69 --- /dev/null +++ b/src/Abstract/Entity/Browser/Container/Page/Navbar/Button.php @@ -0,0 +1,18 @@ +navbar = $navbar; + } +} diff --git a/src/Abstract/Entity/Browser/Container/Page/Navbar/Entry.php b/src/Abstract/Entity/Browser/Container/Page/Navbar/Entry.php new file mode 100644 index 00000000..43363795 --- /dev/null +++ b/src/Abstract/Entity/Browser/Container/Page/Navbar/Entry.php @@ -0,0 +1,18 @@ +navbar = $navbar; + } +} diff --git a/src/Abstract/Entity/Browser/Container/Tab/Page/Navbar/Button.php b/src/Abstract/Entity/Browser/Container/Tab/Page/Navbar/Button.php deleted file mode 100644 index 4e857d71..00000000 --- a/src/Abstract/Entity/Browser/Container/Tab/Page/Navbar/Button.php +++ /dev/null @@ -1,18 +0,0 @@ -navbar = $navbar; - } -} diff --git a/src/Abstract/Entity/Browser/Container/Tab/Page/Navbar/Entry.php b/src/Abstract/Entity/Browser/Container/Tab/Page/Navbar/Entry.php deleted file mode 100644 index 1d4e4634..00000000 --- a/src/Abstract/Entity/Browser/Container/Tab/Page/Navbar/Entry.php +++ /dev/null @@ -1,18 +0,0 @@ -navbar = $navbar; - } -} diff --git a/src/Entity/Browser/Container/Tab/Page.php b/src/Entity/Browser/Container/Page.php similarity index 66% rename from src/Entity/Browser/Container/Tab/Page.php rename to src/Entity/Browser/Container/Page.php index 39251329..5905e5f2 100644 --- a/src/Entity/Browser/Container/Tab/Page.php +++ b/src/Entity/Browser/Container/Page.php @@ -2,31 +2,31 @@ declare(strict_types=1); -namespace Yggverse\Yoda\Entity\Browser\Container\Tab; +namespace Yggverse\Yoda\Entity\Browser\Container; -use \Yggverse\Yoda\Entity\Browser\Container\Tab\Page\Title; -use \Yggverse\Yoda\Entity\Browser\Container\Tab\Page\Navbar; -use \Yggverse\Yoda\Entity\Browser\Container\Tab\Page\Content; -use \Yggverse\Yoda\Entity\Browser\Container\Tab\Page\Response; +use \Yggverse\Yoda\Entity\Browser\Container\Page\Title; +use \Yggverse\Yoda\Entity\Browser\Container\Page\Navbar; +use \Yggverse\Yoda\Entity\Browser\Container\Page\Content; +use \Yggverse\Yoda\Entity\Browser\Container\Page\Response; class Page { public \GtkBox $gtk; // Dependencies - public \Yggverse\Yoda\Entity\Browser\Container\Tab $tab; + public \Yggverse\Yoda\Entity\Browser\Container $container; // Requirements - public \Yggverse\Yoda\Entity\Browser\Container\Tab\Page\Title $title; - public \Yggverse\Yoda\Entity\Browser\Container\Tab\Page\Navbar $navbar; - public \Yggverse\Yoda\Entity\Browser\Container\Tab\Page\Content $content; - public \Yggverse\Yoda\Entity\Browser\Container\Tab\Page\Response $response; + public \Yggverse\Yoda\Entity\Browser\Container\Page\Title $title; + public \Yggverse\Yoda\Entity\Browser\Container\Page\Navbar $navbar; + public \Yggverse\Yoda\Entity\Browser\Container\Page\Content $content; + public \Yggverse\Yoda\Entity\Browser\Container\Page\Response $response; public function __construct( - \Yggverse\Yoda\Entity\Browser\Container\Tab $tab + \Yggverse\Yoda\Entity\Browser\Container $container ) { // Init dependencies - $this->tab = $tab; + $this->container = $container; // Init container $this->gtk = new \GtkBox( diff --git a/src/Entity/Browser/Container/Tab/Page/Content.php b/src/Entity/Browser/Container/Page/Content.php similarity index 94% rename from src/Entity/Browser/Container/Tab/Page/Content.php rename to src/Entity/Browser/Container/Page/Content.php index 62c86d49..4adf9a3b 100644 --- a/src/Entity/Browser/Container/Tab/Page/Content.php +++ b/src/Entity/Browser/Container/Page/Content.php @@ -2,27 +2,27 @@ declare(strict_types=1); -namespace Yggverse\Yoda\Entity\Browser\Container\Tab\Page; +namespace Yggverse\Yoda\Entity\Browser\Container\Page; -use \Yggverse\Yoda\Entity\Browser\Container\Tab\Page\Content\Data; -use \Yggverse\Yoda\Entity\Browser\Container\Tab\Page\Content\Viewport; +use \Yggverse\Yoda\Entity\Browser\Container\Page\Content\Data; +use \Yggverse\Yoda\Entity\Browser\Container\Page\Content\Viewport; class Content { public \GtkScrolledWindow $gtk; // Dependencies - public \Yggverse\Yoda\Entity\Browser\Container\Tab\Page $page; + public \Yggverse\Yoda\Entity\Browser\Container\Page $page; // Requirements - public \Yggverse\Yoda\Entity\Browser\Container\Tab\Page\Content\Data $data; - public \Yggverse\Yoda\Entity\Browser\Container\Tab\Page\Content\Viewport $viewport; + public \Yggverse\Yoda\Entity\Browser\Container\Page\Content\Data $data; + public \Yggverse\Yoda\Entity\Browser\Container\Page\Content\Viewport $viewport; // Defaults private int $_margin = 8; public function __construct( - \Yggverse\Yoda\Entity\Browser\Container\Tab\Page $page + \Yggverse\Yoda\Entity\Browser\Container\Page $page ) { $this->page = $page; @@ -92,7 +92,7 @@ class Content ); // Update history in database - $this->page->tab->container->browser->database->renewHistory( + $this->page->container->browser->database->renewHistory( $address->get(), // @TODO title ); @@ -408,7 +408,7 @@ class Content $this->page->refresh(); // Update window header - $this->page->tab->container->browser->header->setTitle( + $this->page->container->browser->header->setTitle( $this->page->title->getValue(), $this->page->title->getSubtitle(), ); diff --git a/src/Entity/Browser/Container/Tab/Page/Content/Data.php b/src/Entity/Browser/Container/Page/Content/Data.php similarity index 96% rename from src/Entity/Browser/Container/Tab/Page/Content/Data.php rename to src/Entity/Browser/Container/Page/Content/Data.php index b02cafc3..1003f03e 100644 --- a/src/Entity/Browser/Container/Tab/Page/Content/Data.php +++ b/src/Entity/Browser/Container/Page/Content/Data.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Yggverse\Yoda\Entity\Browser\Container\Tab\Page\Content; +namespace Yggverse\Yoda\Entity\Browser\Container\Page\Content; use \Yggverse\Gemtext\Document; use \Yggverse\Net\Address; @@ -12,10 +12,10 @@ class Data public \GtkLabel $gtk; // Dependencies - public \Yggverse\Yoda\Entity\Browser\Container\Tab\Page\Content $content; + public \Yggverse\Yoda\Entity\Browser\Container\Page\Content $content; public function __construct( - \Yggverse\Yoda\Entity\Browser\Container\Tab\Page\Content $content + \Yggverse\Yoda\Entity\Browser\Container\Page\Content $content ) { // Init dependency $this->content = $content; diff --git a/src/Entity/Browser/Container/Tab/Page/Content/Viewport.php b/src/Entity/Browser/Container/Page/Content/Viewport.php similarity index 59% rename from src/Entity/Browser/Container/Tab/Page/Content/Viewport.php rename to src/Entity/Browser/Container/Page/Content/Viewport.php index 1cc951de..35459f41 100644 --- a/src/Entity/Browser/Container/Tab/Page/Content/Viewport.php +++ b/src/Entity/Browser/Container/Page/Content/Viewport.php @@ -2,17 +2,17 @@ declare(strict_types=1); -namespace Yggverse\Yoda\Entity\Browser\Container\Tab\Page\Content; +namespace Yggverse\Yoda\Entity\Browser\Container\Page\Content; class Viewport { public \GtkViewport $gtk; // Dependencies - public \Yggverse\Yoda\Entity\Browser\Container\Tab\Page\Content $content; + public \Yggverse\Yoda\Entity\Browser\Container\Page\Content $content; public function __construct( - \Yggverse\Yoda\Entity\Browser\Container\Tab\Page\Content $content + \Yggverse\Yoda\Entity\Browser\Container\Page\Content $content ) { // Init dependencies $this->content = $content; diff --git a/src/Entity/Browser/Container/Tab/Page/Navbar.php b/src/Entity/Browser/Container/Page/Navbar.php similarity index 68% rename from src/Entity/Browser/Container/Tab/Page/Navbar.php rename to src/Entity/Browser/Container/Page/Navbar.php index f96ccb03..1381dddb 100644 --- a/src/Entity/Browser/Container/Tab/Page/Navbar.php +++ b/src/Entity/Browser/Container/Page/Navbar.php @@ -2,31 +2,31 @@ declare(strict_types=1); -namespace Yggverse\Yoda\Entity\Browser\Container\Tab\Page; +namespace Yggverse\Yoda\Entity\Browser\Container\Page; -use \Yggverse\Yoda\Entity\Browser\Container\Tab\Page\Navbar\Base; -use \Yggverse\Yoda\Entity\Browser\Container\Tab\Page\Navbar\Go; -use \Yggverse\Yoda\Entity\Browser\Container\Tab\Page\Navbar\History; -use \Yggverse\Yoda\Entity\Browser\Container\Tab\Page\Navbar\Request; +use \Yggverse\Yoda\Entity\Browser\Container\Page\Navbar\Base; +use \Yggverse\Yoda\Entity\Browser\Container\Page\Navbar\Go; +use \Yggverse\Yoda\Entity\Browser\Container\Page\Navbar\History; +use \Yggverse\Yoda\Entity\Browser\Container\Page\Navbar\Request; class Navbar { public \GtkBox $gtk; // Dependencies - public \Yggverse\Yoda\Entity\Browser\Container\Tab\Page $page; + public \Yggverse\Yoda\Entity\Browser\Container\Page $page; // Requirements - public \Yggverse\Yoda\Entity\Browser\Container\Tab\Page\Navbar\Base $base; - public \Yggverse\Yoda\Entity\Browser\Container\Tab\Page\Navbar\Go $go; - public \Yggverse\Yoda\Entity\Browser\Container\Tab\Page\Navbar\History $history; - public \Yggverse\Yoda\Entity\Browser\Container\Tab\Page\Navbar\Request $request; + public \Yggverse\Yoda\Entity\Browser\Container\Page\Navbar\Base $base; + public \Yggverse\Yoda\Entity\Browser\Container\Page\Navbar\Go $go; + public \Yggverse\Yoda\Entity\Browser\Container\Page\Navbar\History $history; + public \Yggverse\Yoda\Entity\Browser\Container\Page\Navbar\Request $request; // Defaults private int $_margin = 8; public function __construct( - \Yggverse\Yoda\Entity\Browser\Container\Tab\Page $page + \Yggverse\Yoda\Entity\Browser\Container\Page $page ) { // Init dependencies $this->page = $page; diff --git a/src/Entity/Browser/Container/Tab/Page/Navbar/Base.php b/src/Entity/Browser/Container/Page/Navbar/Base.php similarity index 92% rename from src/Entity/Browser/Container/Tab/Page/Navbar/Base.php rename to src/Entity/Browser/Container/Page/Navbar/Base.php index 3aaaf181..15e1d595 100644 --- a/src/Entity/Browser/Container/Tab/Page/Navbar/Base.php +++ b/src/Entity/Browser/Container/Page/Navbar/Base.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Yggverse\Yoda\Entity\Browser\Container\Tab\Page\Navbar; +namespace Yggverse\Yoda\Entity\Browser\Container\Page\Navbar; -class Base extends \Yggverse\Yoda\Abstract\Entity\Browser\Container\Tab\Page\Navbar\Button +class Base extends \Yggverse\Yoda\Abstract\Entity\Browser\Container\Page\Navbar\Button { protected string $_label = 'Base'; diff --git a/src/Entity/Browser/Container/Tab/Page/Navbar/Go.php b/src/Entity/Browser/Container/Page/Navbar/Go.php similarity index 82% rename from src/Entity/Browser/Container/Tab/Page/Navbar/Go.php rename to src/Entity/Browser/Container/Page/Navbar/Go.php index e59a2c40..75cbc479 100644 --- a/src/Entity/Browser/Container/Tab/Page/Navbar/Go.php +++ b/src/Entity/Browser/Container/Page/Navbar/Go.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Yggverse\Yoda\Entity\Browser\Container\Tab\Page\Navbar; +namespace Yggverse\Yoda\Entity\Browser\Container\Page\Navbar; -class Go extends \Yggverse\Yoda\Abstract\Entity\Browser\Container\Tab\Page\Navbar\Button +class Go extends \Yggverse\Yoda\Abstract\Entity\Browser\Container\Page\Navbar\Button { protected string $_label = 'Go'; diff --git a/src/Entity/Browser/Container/Tab/Page/Navbar/History.php b/src/Entity/Browser/Container/Page/Navbar/History.php similarity index 69% rename from src/Entity/Browser/Container/Tab/Page/Navbar/History.php rename to src/Entity/Browser/Container/Page/Navbar/History.php index ea57f353..311c69c7 100644 --- a/src/Entity/Browser/Container/Tab/Page/Navbar/History.php +++ b/src/Entity/Browser/Container/Page/Navbar/History.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace Yggverse\Yoda\Entity\Browser\Container\Tab\Page\Navbar; +namespace Yggverse\Yoda\Entity\Browser\Container\Page\Navbar; -use \Yggverse\Yoda\Entity\Browser\Container\Tab\Page\Navbar\History\Back; -use \Yggverse\Yoda\Entity\Browser\Container\Tab\Page\Navbar\History\Forward; +use \Yggverse\Yoda\Entity\Browser\Container\Page\Navbar\History\Back; +use \Yggverse\Yoda\Entity\Browser\Container\Page\Navbar\History\Forward; class History { @@ -14,14 +14,14 @@ class History // Dependencies public \Yggverse\Yoda\Model\History $memory; - public \Yggverse\Yoda\Entity\Browser\Container\Tab\Page\Navbar $navbar; + public \Yggverse\Yoda\Entity\Browser\Container\Page\Navbar $navbar; // Requirements - public \Yggverse\Yoda\Entity\Browser\Container\Tab\Page\Navbar\History\Back $back; - public \Yggverse\Yoda\Entity\Browser\Container\Tab\Page\Navbar\History\Forward $forward; + public \Yggverse\Yoda\Entity\Browser\Container\Page\Navbar\History\Back $back; + public \Yggverse\Yoda\Entity\Browser\Container\Page\Navbar\History\Forward $forward; public function __construct( - \Yggverse\Yoda\Entity\Browser\Container\Tab\Page\Navbar $navbar + \Yggverse\Yoda\Entity\Browser\Container\Page\Navbar $navbar ) { $this->memory = new \Yggverse\Yoda\Model\History(); diff --git a/src/Entity/Browser/Container/Tab/Page/Navbar/History/Back.php b/src/Entity/Browser/Container/Page/Navbar/History/Back.php similarity index 87% rename from src/Entity/Browser/Container/Tab/Page/Navbar/History/Back.php rename to src/Entity/Browser/Container/Page/Navbar/History/Back.php index 04e96bac..36328725 100644 --- a/src/Entity/Browser/Container/Tab/Page/Navbar/History/Back.php +++ b/src/Entity/Browser/Container/Page/Navbar/History/Back.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Yggverse\Yoda\Entity\Browser\Container\Tab\Page\Navbar\History; +namespace Yggverse\Yoda\Entity\Browser\Container\Page\Navbar\History; -class Back extends \Yggverse\Yoda\Abstract\Entity\Browser\Container\Tab\Page\Navbar\Button +class Back extends \Yggverse\Yoda\Abstract\Entity\Browser\Container\Page\Navbar\Button { protected string $_label = 'Back'; diff --git a/src/Entity/Browser/Container/Tab/Page/Navbar/History/Forward.php b/src/Entity/Browser/Container/Page/Navbar/History/Forward.php similarity index 87% rename from src/Entity/Browser/Container/Tab/Page/Navbar/History/Forward.php rename to src/Entity/Browser/Container/Page/Navbar/History/Forward.php index 359692aa..c063c5bf 100644 --- a/src/Entity/Browser/Container/Tab/Page/Navbar/History/Forward.php +++ b/src/Entity/Browser/Container/Page/Navbar/History/Forward.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Yggverse\Yoda\Entity\Browser\Container\Tab\Page\Navbar\History; +namespace Yggverse\Yoda\Entity\Browser\Container\Page\Navbar\History; -class Forward extends \Yggverse\Yoda\Abstract\Entity\Browser\Container\Tab\Page\Navbar\Button +class Forward extends \Yggverse\Yoda\Abstract\Entity\Browser\Container\Page\Navbar\Button { protected string $_label = 'Forward'; diff --git a/src/Entity/Browser/Container/Tab/Page/Navbar/Request.php b/src/Entity/Browser/Container/Page/Navbar/Request.php similarity index 82% rename from src/Entity/Browser/Container/Tab/Page/Navbar/Request.php rename to src/Entity/Browser/Container/Page/Navbar/Request.php index 30ed3731..a80c75f6 100644 --- a/src/Entity/Browser/Container/Tab/Page/Navbar/Request.php +++ b/src/Entity/Browser/Container/Page/Navbar/Request.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Yggverse\Yoda\Entity\Browser\Container\Tab\Page\Navbar; +namespace Yggverse\Yoda\Entity\Browser\Container\Page\Navbar; -class Request extends \Yggverse\Yoda\Abstract\Entity\Browser\Container\Tab\Page\Navbar\Entry +class Request extends \Yggverse\Yoda\Abstract\Entity\Browser\Container\Page\Navbar\Entry { protected string $_placeholder = 'URL or search term...'; diff --git a/src/Entity/Browser/Container/Tab/Page/Response.php b/src/Entity/Browser/Container/Page/Response.php similarity index 83% rename from src/Entity/Browser/Container/Tab/Page/Response.php rename to src/Entity/Browser/Container/Page/Response.php index 67ceafdb..64909ea3 100644 --- a/src/Entity/Browser/Container/Tab/Page/Response.php +++ b/src/Entity/Browser/Container/Page/Response.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace Yggverse\Yoda\Entity\Browser\Container\Tab\Page; +namespace Yggverse\Yoda\Entity\Browser\Container\Page; -use \Yggverse\Yoda\Entity\Browser\Container\Tab\Page\Response\Query; -use \Yggverse\Yoda\Entity\Browser\Container\Tab\Page\Response\Send; +use \Yggverse\Yoda\Entity\Browser\Container\Page\Response\Query; +use \Yggverse\Yoda\Entity\Browser\Container\Page\Response\Send; use \Yggverse\Net\Address; @@ -14,17 +14,17 @@ class Response public \GtkBox $gtk; // Dependencies - public \Yggverse\Yoda\Entity\Browser\Container\Tab\Page $page; + public \Yggverse\Yoda\Entity\Browser\Container\Page $page; // Requirements - public \Yggverse\Yoda\Entity\Browser\Container\Tab\Page\Response\Query $query; - public \Yggverse\Yoda\Entity\Browser\Container\Tab\Page\Response\Send $send; + public \Yggverse\Yoda\Entity\Browser\Container\Page\Response\Query $query; + public \Yggverse\Yoda\Entity\Browser\Container\Page\Response\Send $send; // Defaults private int $_margin = 8; public function __construct( - \Yggverse\Yoda\Entity\Browser\Container\Tab\Page $page + \Yggverse\Yoda\Entity\Browser\Container\Page $page ) { // Init dependencies $this->page = $page; diff --git a/src/Entity/Browser/Container/Tab/Page/Response/Query.php b/src/Entity/Browser/Container/Page/Response/Query.php similarity index 75% rename from src/Entity/Browser/Container/Tab/Page/Response/Query.php rename to src/Entity/Browser/Container/Page/Response/Query.php index 716be8e5..1c00851b 100644 --- a/src/Entity/Browser/Container/Tab/Page/Response/Query.php +++ b/src/Entity/Browser/Container/Page/Response/Query.php @@ -2,17 +2,17 @@ declare(strict_types=1); -namespace Yggverse\Yoda\Entity\Browser\Container\Tab\Page\Response; +namespace Yggverse\Yoda\Entity\Browser\Container\Page\Response; class Query extends \Yggverse\Yoda\Abstract\Entity\Entry { - public \Yggverse\Yoda\Entity\Browser\Container\Tab\Page\Response $response; + public \Yggverse\Yoda\Entity\Browser\Container\Page\Response $response; // Defaults protected string $_placeholder = 'Enter response...'; public function __construct( - \Yggverse\Yoda\Entity\Browser\Container\Tab\Page\Response $response + \Yggverse\Yoda\Entity\Browser\Container\Page\Response $response ) { // Use parent features parent::__construct(); diff --git a/src/Entity/Browser/Container/Tab/Page/Response/Send.php b/src/Entity/Browser/Container/Page/Response/Send.php similarity index 73% rename from src/Entity/Browser/Container/Tab/Page/Response/Send.php rename to src/Entity/Browser/Container/Page/Response/Send.php index 5dded6af..19b1c2c1 100644 --- a/src/Entity/Browser/Container/Tab/Page/Response/Send.php +++ b/src/Entity/Browser/Container/Page/Response/Send.php @@ -2,18 +2,18 @@ declare(strict_types=1); -namespace Yggverse\Yoda\Entity\Browser\Container\Tab\Page\Response; +namespace Yggverse\Yoda\Entity\Browser\Container\Page\Response; class Send extends \Yggverse\Yoda\Abstract\Entity\Button { // Dependencies - public \Yggverse\Yoda\Entity\Browser\Container\Tab\Page\Response $response; + public \Yggverse\Yoda\Entity\Browser\Container\Page\Response $response; // Defaults protected string $_label = 'Send'; public function __construct( - \Yggverse\Yoda\Entity\Browser\Container\Tab\Page\Response $response + \Yggverse\Yoda\Entity\Browser\Container\Page\Response $response ) { // Use parent features parent::__construct(); diff --git a/src/Entity/Browser/Container/Tab/Page/Title.php b/src/Entity/Browser/Container/Page/Title.php similarity index 84% rename from src/Entity/Browser/Container/Tab/Page/Title.php rename to src/Entity/Browser/Container/Page/Title.php index 2e4eb9e6..c62e044e 100644 --- a/src/Entity/Browser/Container/Tab/Page/Title.php +++ b/src/Entity/Browser/Container/Page/Title.php @@ -2,16 +2,16 @@ declare(strict_types=1); -namespace Yggverse\Yoda\Entity\Browser\Container\Tab\Page; +namespace Yggverse\Yoda\Entity\Browser\Container\Page; -use \Yggverse\Yoda\Gtk\Browser\Container\Tab\Page\Title\Label; +use \Yggverse\Yoda\Gtk\Browser\Container\Page\Title\Label; class Title { public Label $gtk; // Dependencies - public \Yggverse\Yoda\Entity\Browser\Container\Tab\Page $page; + public \Yggverse\Yoda\Entity\Browser\Container\Page $page; // Defaults private int $_ellipsize = 3; @@ -20,7 +20,7 @@ class Title private ?string $_subtitle = null; public function __construct( - \Yggverse\Yoda\Entity\Browser\Container\Tab\Page $page, + \Yggverse\Yoda\Entity\Browser\Container\Page $page, ) { // Init dependencies $this->page = $page; diff --git a/src/Entity/Browser/Container/Tab.php b/src/Entity/Browser/Container/Tab.php index a82e3751..a6084e87 100644 --- a/src/Entity/Browser/Container/Tab.php +++ b/src/Entity/Browser/Container/Tab.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace Yggverse\Yoda\Entity\Browser\Container; -use \Yggverse\Yoda\Entity\Browser\Container\Tab\Page; +use \Yggverse\Yoda\Entity\Browser\Container\Page; class Tab { @@ -73,7 +73,7 @@ class Tab ): void { $page = new Page( - $this + $this->container ); if ($request) diff --git a/src/Gtk/Browser/Container/Tab/Page/Title/Label.php b/src/Gtk/Browser/Container/Page/Title/Label.php similarity index 83% rename from src/Gtk/Browser/Container/Tab/Page/Title/Label.php rename to src/Gtk/Browser/Container/Page/Title/Label.php index 2e01d1e6..1403e772 100644 --- a/src/Gtk/Browser/Container/Tab/Page/Title/Label.php +++ b/src/Gtk/Browser/Container/Page/Title/Label.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Yggverse\Yoda\Gtk\Browser\Container\Tab\Page\Title; +namespace Yggverse\Yoda\Gtk\Browser\Container\Page\Title; class Label extends \GtkLabel {