diff --git a/src/app/browser.cpp b/src/app/browser.cpp index a9a2d31f..03fa5603 100644 --- a/src/app/browser.cpp +++ b/src/app/browser.cpp @@ -34,7 +34,7 @@ Browser::Browser( // Init actions add_action( - "tab", + "tab_append", sigc::mem_fun( * this, & Browser::mainTabAppend diff --git a/src/app/browser/header/menu.cpp b/src/app/browser/header/menu.cpp index 094f7172..8e2c6cae 100644 --- a/src/app/browser/header/menu.cpp +++ b/src/app/browser/header/menu.cpp @@ -4,45 +4,56 @@ using namespace app::browser::header; Menu::Menu() { - // Init defaults + // Set widget defaults set_tooltip_text( TOOLTIP ); - // Build tab submenu + // Build tab submenu model tab = Gio::Menu::create(); - tab->append( - _("New tab.."), - "win.tab" - ); + tab->append( + _("New tab.."), + "win.tab_append" + ); - // Build tool submenu + tab->append( + _("Close active"), + "win.tab_close" + ); + + tab->append( + _("Close all"), + "win.tab_close_all" + ); + + // Build tool submenu model tool = Gio::Menu::create(); - tool->append( - _("Debug"), - "win.debug" - ); + tool->append( + _("Debug"), + "win.debug" + ); - // Build main menu + // Build main menu model main = Gio::Menu::create(); - main->append_submenu( - _("Tab"), - tab - ); + main->append_submenu( + _("Tab"), + tab + ); - main->append_submenu( - _("Tool"), - tool - ); + main->append_submenu( + _("Tool"), + tool + ); - main->append( - _("Quit"), - "app.quit" - ); + main->append( + _("Quit"), + "app.quit" + ); + // Apply model set_menu_model( main ); diff --git a/src/app/browser/header/tab.hpp b/src/app/browser/header/tab.hpp index 4a6fcb5b..2bf23d2d 100644 --- a/src/app/browser/header/tab.hpp +++ b/src/app/browser/header/tab.hpp @@ -10,7 +10,7 @@ namespace app::browser::header { public: - const char* ACTION = "win.tab"; + const char* ACTION = "win.tab_append"; const char* ICON = "tab-new-symbolic"; const char* TOOLTIP = _("New tab"); diff --git a/src/main.cpp b/src/main.cpp index db6cc20b..3ffbc1d0 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -28,7 +28,7 @@ int main( // Init accels @TODO db settings app->set_accel_for_action( - "win.tab", + "win.tab_append", "t" );