mirror of
https://github.com/YGGverse/Yoda.git
synced 2026-03-31 16:45:27 +00:00
delegate close action to the browser window
This commit is contained in:
parent
881e1b78d6
commit
3f4a5536ca
6 changed files with 23 additions and 15 deletions
14
src/app.cpp
14
src/app.cpp
|
|
@ -18,20 +18,6 @@ int main(
|
|||
"io.github.yggverse.Yoda"
|
||||
);
|
||||
|
||||
// Init actions
|
||||
app->add_action(
|
||||
"quit",
|
||||
[app]
|
||||
{
|
||||
app->quit();
|
||||
}
|
||||
);
|
||||
|
||||
app->set_accel_for_action(
|
||||
"app.quit",
|
||||
"<Primary>q"
|
||||
);
|
||||
|
||||
// Launch browser component
|
||||
return app->make_window_and_run<app::Browser>(
|
||||
argc,
|
||||
|
|
|
|||
|
|
@ -151,6 +151,20 @@ Browser::Browser(
|
|||
"<Primary>Right"
|
||||
);
|
||||
|
||||
// Init actions
|
||||
const auto ACTION__QUIT = add_action(
|
||||
"quit",
|
||||
[this]
|
||||
{
|
||||
close();
|
||||
}
|
||||
);
|
||||
|
||||
APP->set_accel_for_action(
|
||||
"win.quit",
|
||||
"<Primary>q"
|
||||
);
|
||||
|
||||
// Init widget
|
||||
set_title(
|
||||
_("Yoda")
|
||||
|
|
@ -164,6 +178,7 @@ Browser::Browser(
|
|||
// Init components
|
||||
browserHeader = Gtk::make_managed<browser::Header>(
|
||||
ACTION__DEBUG,
|
||||
ACTION__QUIT,
|
||||
ACTION__MAIN_TAB_APPEND,
|
||||
ACTION__MAIN_TAB_CLOSE_ACTIVE,
|
||||
ACTION__MAIN_TAB_CLOSE_ALL,
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ using namespace app::browser;
|
|||
|
||||
Header::Header(
|
||||
const Glib::RefPtr<Gio::SimpleAction> & ACTION__DEBUG,
|
||||
const Glib::RefPtr<Gio::SimpleAction> & ACTION__QUIT,
|
||||
const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_APPEND,
|
||||
const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_CLOSE_ACTIVE,
|
||||
const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_CLOSE_ALL,
|
||||
|
|
@ -22,6 +23,7 @@ Header::Header(
|
|||
// Init components
|
||||
headerMenu = Gtk::make_managed<header::Menu>(
|
||||
ACTION__DEBUG,
|
||||
ACTION__QUIT,
|
||||
ACTION__MAIN_TAB_APPEND,
|
||||
ACTION__MAIN_TAB_CLOSE_ACTIVE,
|
||||
ACTION__MAIN_TAB_CLOSE_ALL,
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@ namespace app::browser
|
|||
|
||||
Header(
|
||||
const Glib::RefPtr<Gio::SimpleAction> & ACTION__DEBUG,
|
||||
const Glib::RefPtr<Gio::SimpleAction> & ACTION__QUIT,
|
||||
const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_APPEND,
|
||||
const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_CLOSE_ACTIVE,
|
||||
const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_CLOSE_ALL,
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ using namespace app::browser::header;
|
|||
|
||||
Menu::Menu(
|
||||
const Glib::RefPtr<Gio::SimpleAction> & ACTION__DEBUG,
|
||||
const Glib::RefPtr<Gio::SimpleAction> & ACTION__QUIT,
|
||||
const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_APPEND,
|
||||
const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_CLOSE_ACTIVE,
|
||||
const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_CLOSE_ALL,
|
||||
|
|
@ -128,7 +129,9 @@ Menu::Menu(
|
|||
|
||||
MENU__MAIN->append(
|
||||
_("Quit"),
|
||||
"app.quit" // @TODO
|
||||
get_action_detailed_name(
|
||||
ACTION__QUIT
|
||||
)
|
||||
);
|
||||
|
||||
set_menu_model(
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@ namespace app::browser::header
|
|||
|
||||
Menu(
|
||||
const Glib::RefPtr<Gio::SimpleAction> & ACTION__DEBUG,
|
||||
const Glib::RefPtr<Gio::SimpleAction> & ACTION__QUIT,
|
||||
const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_APPEND,
|
||||
const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_CLOSE_ACTIVE,
|
||||
const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_CLOSE_ALL,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue