enshort namespaces

This commit is contained in:
yggverse 2024-07-21 20:25:09 +03:00
parent 2d7b3d1965
commit ee2f8ba3b1
21 changed files with 93 additions and 133 deletions

View file

@ -6,12 +6,6 @@ namespace Yggverse\Yoda\Entity\Browser\Container;
use \Yggverse\Yoda\Entity\Browser\Container;
use \Yggverse\Yoda\Entity\Browser\Container\Page\Title;
use \Yggverse\Yoda\Entity\Browser\Container\Page\Navbar;
use \Yggverse\Yoda\Entity\Browser\Container\Page\Progressbar;
use \Yggverse\Yoda\Entity\Browser\Container\Page\Content;
use \Yggverse\Yoda\Entity\Browser\Container\Page\Response;
use \Yggverse\Yoda\Model\Connection;
use \Yggverse\Yoda\Model\Filesystem;
@ -23,11 +17,11 @@ class Page
public Container $container;
// Requirements
public Title $title;
public Navbar $navbar;
public Progressbar $progressbar;
public Content $content;
public Response $response;
public Page\Title $title;
public Page\Navbar $navbar;
public Page\Progressbar $progressbar;
public Page\Content $content;
public Page\Response $response;
public function __construct(
Container $container
@ -41,12 +35,12 @@ class Page
);
// Init title
$this->title = new Title(
$this->title = new Page\Title(
$this
);
// Init navbar
$this->navbar = new Navbar(
$this->navbar = new Page\Navbar(
$this
);
@ -55,7 +49,7 @@ class Page
);
// Init content
$this->content = new Content(
$this->content = new Page\Content(
$this
);
@ -67,7 +61,7 @@ class Page
);
// Init progress bar
$this->progressbar = new Progressbar(
$this->progressbar = new Page\Progressbar(
$this
);
@ -76,7 +70,7 @@ class Page
);
// Init response bar
$this->response = new Response(
$this->response = new Page\Response(
$this
);

View file

@ -6,11 +6,6 @@ namespace Yggverse\Yoda\Entity\Browser\Container\Page;
use \Yggverse\Yoda\Entity\Browser\Container\Page;
use \Yggverse\Yoda\Entity\Browser\Container\Page\Content\Gemtext;
use \Yggverse\Yoda\Entity\Browser\Container\Page\Content\Image;
use \Yggverse\Yoda\Entity\Browser\Container\Page\Content\Plain;
use \Yggverse\Yoda\Entity\Browser\Container\Page\Content\Viewport;
use \Yggverse\Yoda\Model\Filesystem;
class Content
@ -21,7 +16,7 @@ class Content
public Page $page;
// Requirements
public Viewport $viewport;
public Content\Viewport $viewport;
// Defaults
public const MARGIN = 8;
@ -50,7 +45,7 @@ class Content
);
// Init scrolled window viewport
$this->viewport = new Viewport(
$this->viewport = new Content\Viewport(
$this
);
@ -72,7 +67,7 @@ class Content
$title = null;
$document = new Gemtext(
$document = new Content\Gemtext(
$this
);
@ -108,7 +103,7 @@ class Content
case Filesystem::MIME_TEXT_PLAIN:
$document = new Plain(
$document = new Content\Plain(
$this
);
@ -123,7 +118,7 @@ class Content
case Filesystem::MIME_IMAGE_PNG:
case Filesystem::MIME_IMAGE_WEBP:
$document = new Image(
$document = new Content\Image(
$this
);
@ -135,7 +130,7 @@ class Content
default:
$document = new Plain(
$document = new Content\Plain(
$this
);

View file

@ -6,10 +6,6 @@ namespace Yggverse\Yoda\Entity\Browser\Container\Page\Content;
use \Yggverse\Yoda\Entity\Browser\Container\Page\Content;
use \Yggverse\Yoda\Entity\Browser\Container\Page\Content\Gemtext;
use \Yggverse\Yoda\Entity\Browser\Container\Page\Content\Image;
use \Yggverse\Yoda\Entity\Browser\Container\Page\Content\Plain;
class Viewport
{
public \GtkViewport $gtk;

View file

@ -5,8 +5,6 @@ declare(strict_types=1);
namespace Yggverse\Yoda\Entity\Browser\Container\Page\Navbar;
use \Yggverse\Yoda\Entity\Browser\Container\Page\Navbar;
use \Yggverse\Yoda\Entity\Browser\Container\Page\Navbar\History\Back;
use \Yggverse\Yoda\Entity\Browser\Container\Page\Navbar\History\Forward;
use \Yggverse\Yoda\Model\History as Memory;
@ -19,8 +17,8 @@ class History
public Memory $memory;
// Requirements
public Back $back;
public Forward $forward;
public History\Back $back;
public History\Forward $forward;
public function __construct(
Navbar $navbar
@ -37,7 +35,7 @@ class History
\GtkButtonBoxStyle::EXPAND
);
$this->back = new Back(
$this->back = new History\Back(
$this->navbar
);
@ -45,7 +43,7 @@ class History
$this->back->gtk
);
$this->forward = new Forward(
$this->forward = new History\Forward(
$this->navbar
);

View file

@ -4,12 +4,14 @@ declare(strict_types=1);
namespace Yggverse\Yoda\Entity\Browser\Container\Page;
use \Yggverse\Yoda\Entity\Browser\Container\Page;
class Progressbar
{
public \GtkProgressBar $gtk;
// Dependencies
public \Yggverse\Yoda\Entity\Browser\Container\Page $page;
public Page $page;
// Defaults
private bool $_active = false;
@ -17,7 +19,7 @@ class Progressbar
private float $_step = 0.02;
public function __construct(
\Yggverse\Yoda\Entity\Browser\Container\Page $page,
Page $page,
) {
// Init dependencies
$this->page = $page;

View file

@ -6,9 +6,6 @@ namespace Yggverse\Yoda\Entity\Browser\Container\Page;
use \Yggverse\Yoda\Entity\Browser\Container\Page;
use \Yggverse\Yoda\Entity\Browser\Container\Page\Response\Query;
use \Yggverse\Yoda\Entity\Browser\Container\Page\Response\Send;
use \Yggverse\Net\Address;
class Response
@ -19,8 +16,8 @@ class Response
public Page $page;
// Requirements
public Query $query;
public Send $send;
public Response\Query $query;
public Response\Send $send;
// Defaults
public const MARGIN = 8;
@ -58,7 +55,7 @@ class Response
);
// Init query field
$this->query = new Query(
$this->query = new Response\Query(
$this
);
@ -70,7 +67,7 @@ class Response
);
// Init send button
$this->send = new Send(
$this->send = new Response\Send(
$this
);

View file

@ -4,15 +4,17 @@ declare(strict_types=1);
namespace Yggverse\Yoda\Entity\Browser\Container\Page\Response;
use \Yggverse\Yoda\Entity\Browser\Container\Page\Response;
class Query extends \Yggverse\Yoda\Abstract\Entity\Entry
{
public \Yggverse\Yoda\Entity\Browser\Container\Page\Response $response;
public Response $response;
// Defaults
protected string $_placeholder = 'Enter response...';
public function __construct(
\Yggverse\Yoda\Entity\Browser\Container\Page\Response $response
Response $response
) {
// Use parent features
parent::__construct();

View file

@ -4,16 +4,18 @@ declare(strict_types=1);
namespace Yggverse\Yoda\Entity\Browser\Container\Page\Response;
use \Yggverse\Yoda\Entity\Browser\Container\Page\Response;
class Send extends \Yggverse\Yoda\Abstract\Entity\Button
{
// Dependencies
public \Yggverse\Yoda\Entity\Browser\Container\Page\Response $response;
public Response $response;
// Defaults
protected string $_label = 'Send';
public function __construct(
\Yggverse\Yoda\Entity\Browser\Container\Page\Response $response
Response $response
) {
// Use parent features
parent::__construct();

View file

@ -5,7 +5,6 @@ declare(strict_types=1);
namespace Yggverse\Yoda\Entity\Browser\Container;
use \Yggverse\Yoda\Entity\Browser\Container;
use \Yggverse\Yoda\Entity\Browser\Container\Page;
class Tab
{