mirror of
https://github.com/YGGverse/Yoda.git
synced 2026-04-01 00:55:28 +00:00
make children widgets managed
This commit is contained in:
parent
75aaa6e717
commit
02b0b42b6b
14 changed files with 25 additions and 77 deletions
|
|
@ -33,7 +33,7 @@ Page::Page(
|
|||
);
|
||||
|
||||
// Init components
|
||||
pageNavbar = new page::Navbar(
|
||||
pageNavbar = Gtk::make_managed<page::Navbar>(
|
||||
REQUEST
|
||||
);
|
||||
|
||||
|
|
@ -41,13 +41,13 @@ Page::Page(
|
|||
* pageNavbar
|
||||
);
|
||||
|
||||
pageProgressbar = new page::Progressbar();
|
||||
pageProgressbar = Gtk::make_managed<page::Progressbar>();
|
||||
|
||||
append(
|
||||
* pageProgressbar
|
||||
);
|
||||
|
||||
pageContent = new page::Content();
|
||||
pageContent = Gtk::make_managed<page::Content>();
|
||||
|
||||
append(
|
||||
* pageContent
|
||||
|
|
@ -61,13 +61,6 @@ Page::Page(
|
|||
);
|
||||
}
|
||||
|
||||
Page::~Page()
|
||||
{
|
||||
delete pageNavbar;
|
||||
delete pageContent;
|
||||
delete pageProgressbar;
|
||||
}
|
||||
|
||||
// Getters
|
||||
Glib::ustring Page::get_title()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@
|
|||
#include <glibmm/stringutils.h>
|
||||
#include <glibmm/ustring.h>
|
||||
#include <gtkmm/box.h>
|
||||
#include <gtkmm/object.h>
|
||||
|
||||
namespace app::browser::main::tab
|
||||
{
|
||||
|
|
@ -55,8 +56,6 @@ namespace app::browser::main::tab
|
|||
const Glib::ustring & REQUEST = ""
|
||||
);
|
||||
|
||||
~Page();
|
||||
|
||||
// Getters
|
||||
Glib::ustring get_title();
|
||||
Glib::ustring get_subtitle();
|
||||
|
|
|
|||
|
|
@ -36,25 +36,25 @@ Navbar::Navbar(
|
|||
);
|
||||
|
||||
// Init components
|
||||
navbarBase = new navbar::Base();
|
||||
navbarBase = Gtk::make_managed<navbar::Base>();
|
||||
|
||||
append(
|
||||
* navbarBase
|
||||
);
|
||||
|
||||
navbarHistory = new navbar::History();
|
||||
navbarHistory = Gtk::make_managed<navbar::History>();
|
||||
|
||||
append(
|
||||
* navbarHistory
|
||||
);
|
||||
|
||||
navbarUpdate = new navbar::Update();
|
||||
navbarUpdate = Gtk::make_managed<navbar::Update>();
|
||||
|
||||
append(
|
||||
* navbarUpdate
|
||||
);
|
||||
|
||||
navbarRequest = new navbar::Request(
|
||||
navbarRequest = Gtk::make_managed<navbar::Request>(
|
||||
REQUEST
|
||||
);
|
||||
|
||||
|
|
@ -62,7 +62,7 @@ Navbar::Navbar(
|
|||
* navbarRequest
|
||||
);
|
||||
|
||||
navbarBookmark = new navbar::Bookmark();
|
||||
navbarBookmark = Gtk::make_managed<navbar::Bookmark>();
|
||||
|
||||
append(
|
||||
* navbarBookmark
|
||||
|
|
@ -86,15 +86,6 @@ Navbar::Navbar(
|
|||
);
|
||||
}
|
||||
|
||||
Navbar::~Navbar()
|
||||
{
|
||||
delete navbarBase;
|
||||
delete navbarBookmark;
|
||||
delete navbarHistory;
|
||||
delete navbarRequest;
|
||||
delete navbarUpdate;
|
||||
};
|
||||
|
||||
// Actions
|
||||
void Navbar::back()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
#include <giomm/simpleactiongroup.h>
|
||||
#include <glibmm/ustring.h>
|
||||
#include <gtkmm/box.h>
|
||||
#include <gtkmm/object.h>
|
||||
|
||||
namespace app::browser::main::tab::page
|
||||
{
|
||||
|
|
@ -35,8 +36,6 @@ namespace app::browser::main::tab::page
|
|||
const Glib::ustring & REQUEST
|
||||
);
|
||||
|
||||
~Navbar();
|
||||
|
||||
// Actions
|
||||
void back();
|
||||
|
||||
|
|
|
|||
|
|
@ -10,25 +10,19 @@ History::History()
|
|||
"linked" // merge children elements
|
||||
);
|
||||
|
||||
historyBack = new history::Back();
|
||||
historyBack = Gtk::make_managed<history::Back>();
|
||||
|
||||
append(
|
||||
* historyBack
|
||||
);
|
||||
|
||||
historyForward = new history::Forward();
|
||||
historyForward = Gtk::make_managed<history::Forward>();
|
||||
|
||||
append(
|
||||
* historyForward
|
||||
);
|
||||
}
|
||||
|
||||
History::~History()
|
||||
{
|
||||
delete historyBack;
|
||||
delete historyForward;
|
||||
};
|
||||
|
||||
// Actions
|
||||
void History::back()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
#include <glibmm/i18n.h>
|
||||
#include <glibmm/ustring.h>
|
||||
#include <gtkmm/box.h>
|
||||
#include <gtkmm/object.h>
|
||||
#include <vector>
|
||||
|
||||
namespace app::browser::main::tab::page::navbar
|
||||
|
|
@ -36,8 +37,6 @@ namespace app::browser::main::tab::page::navbar
|
|||
|
||||
History();
|
||||
|
||||
~History();
|
||||
|
||||
void back();
|
||||
void forward();
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue