YGGverse
/
Yoda
mirror of https://github.com/YGGverse/Yoda.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

rename close action

CPP-GTK4
yggverse 3 months ago
parent
f23a54c58a
commit
5868ed822f
11 changed files with 38 additions and 31 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      src/app/browser.cpp
  2. 6
      src/app/browser/header.cpp
  3. 3
      src/app/browser/header.hpp
  4. 14
      src/app/browser/header/menu.cpp
  5. 3
      src/app/browser/header/menu.hpp
  6. 4
      src/app/browser/main.cpp
  7. 2
      src/app/browser/main.hpp
  8. 6
      src/app/browser/main/tab.cpp
  9. 4
      src/app/browser/main/tab.hpp
  10. 6
      src/app/browser/main/tab/label.cpp
  11. 4
      src/app/browser/main/tab/label.hpp

15
src/app/browser.cpp
Unescape View File

@ -51,8 +51,8 @@ Browser::Browser(
"<Primary>t" "<Primary>t"
); );
const auto ACTION__MAIN_TAB_CLOSE = add_action( const auto ACTION__MAIN_TAB_CLOSE_ACTIVE = add_action(
"main_tab_close", "main_tab_close_active",
[this] [this]
{ {
browserMain->tab_close(); browserMain->tab_close();
@ -79,13 +79,15 @@ Browser::Browser(
false false
); );
add_action( const auto ACTION__MAIN_TAB_CLOSE_ALL = add_action(
"main_tab_close_all", "main_tab_close_all",
[this] [this]
{ {
browserMain->tab_close_all(); browserMain->tab_close_all();
} }
)->set_enabled( );
ACTION__MAIN_TAB_CLOSE_ALL->set_enabled(
false false
); );
@ -154,7 +156,8 @@ Browser::Browser(
browserHeader = Gtk::make_managed<browser::Header>( browserHeader = Gtk::make_managed<browser::Header>(
ACTION__DEBUG, ACTION__DEBUG,
ACTION__MAIN_TAB_APPEND, ACTION__MAIN_TAB_APPEND,
ACTION__MAIN_TAB_CLOSE, ACTION__MAIN_TAB_CLOSE_ACTIVE,
ACTION__MAIN_TAB_CLOSE_ALL,
ACTION__MAIN_TAB_PAGE_NAVIGATION_HISTORY_BACK, ACTION__MAIN_TAB_PAGE_NAVIGATION_HISTORY_BACK,
ACTION__MAIN_TAB_PAGE_NAVIGATION_HISTORY_FORWARD, ACTION__MAIN_TAB_PAGE_NAVIGATION_HISTORY_FORWARD,
ACTION__MAIN_TAB_PAGE_NAVIGATION_UPDATE ACTION__MAIN_TAB_PAGE_NAVIGATION_UPDATE
@ -166,7 +169,7 @@ Browser::Browser(
browserMain = Gtk::make_managed<browser::Main>( browserMain = Gtk::make_managed<browser::Main>(
ACTION__REFRESH, ACTION__REFRESH,
ACTION__MAIN_TAB_CLOSE, ACTION__MAIN_TAB_CLOSE_ACTIVE,
ACTION__MAIN_TAB_PAGE_NAVIGATION_HISTORY_BACK, ACTION__MAIN_TAB_PAGE_NAVIGATION_HISTORY_BACK,
ACTION__MAIN_TAB_PAGE_NAVIGATION_HISTORY_FORWARD, ACTION__MAIN_TAB_PAGE_NAVIGATION_HISTORY_FORWARD,
ACTION__MAIN_TAB_PAGE_NAVIGATION_UPDATE ACTION__MAIN_TAB_PAGE_NAVIGATION_UPDATE

6
src/app/browser/header.cpp
Unescape View File

@ -8,7 +8,8 @@ using namespace app::browser;
Header::Header( Header::Header(
const Glib::RefPtr<Gio::SimpleAction> & ACTION__DEBUG, const Glib::RefPtr<Gio::SimpleAction> & ACTION__DEBUG,
const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_APPEND, const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_APPEND,
const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_CLOSE, const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_CLOSE_ACTIVE,
const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_CLOSE_ALL,
const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_PAGE_NAVIGATION_HISTORY_BACK, const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_PAGE_NAVIGATION_HISTORY_BACK,
const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_PAGE_NAVIGATION_HISTORY_FORWARD, const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_PAGE_NAVIGATION_HISTORY_FORWARD,
const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_PAGE_NAVIGATION_UPDATE const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_PAGE_NAVIGATION_UPDATE
@ -22,7 +23,8 @@ Header::Header(
headerMenu = Gtk::make_managed<header::Menu>( headerMenu = Gtk::make_managed<header::Menu>(
ACTION__DEBUG, ACTION__DEBUG,
ACTION__MAIN_TAB_APPEND, ACTION__MAIN_TAB_APPEND,
ACTION__MAIN_TAB_CLOSE, ACTION__MAIN_TAB_CLOSE_ACTIVE,
ACTION__MAIN_TAB_CLOSE_ALL,
ACTION__MAIN_TAB_PAGE_NAVIGATION_HISTORY_BACK, ACTION__MAIN_TAB_PAGE_NAVIGATION_HISTORY_BACK,
ACTION__MAIN_TAB_PAGE_NAVIGATION_HISTORY_FORWARD, ACTION__MAIN_TAB_PAGE_NAVIGATION_HISTORY_FORWARD,
ACTION__MAIN_TAB_PAGE_NAVIGATION_UPDATE ACTION__MAIN_TAB_PAGE_NAVIGATION_UPDATE

3
src/app/browser/header.hpp
Unescape View File

@ -31,7 +31,8 @@ namespace app::browser
Header( Header(
const Glib::RefPtr<Gio::SimpleAction> & ACTION__DEBUG, const Glib::RefPtr<Gio::SimpleAction> & ACTION__DEBUG,
const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_APPEND, const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_APPEND,
const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_CLOSE, const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_CLOSE_ACTIVE,
const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_CLOSE_ALL,
const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_PAGE_NAVIGATION_HISTORY_BACK, const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_PAGE_NAVIGATION_HISTORY_BACK,
const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_PAGE_NAVIGATION_HISTORY_FORWARD, const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_PAGE_NAVIGATION_HISTORY_FORWARD,
const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_PAGE_NAVIGATION_UPDATE const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_PAGE_NAVIGATION_UPDATE

14
src/app/browser/header/menu.cpp
Unescape View File

@ -5,7 +5,8 @@ using namespace app::browser::header;
Menu::Menu( Menu::Menu(
const Glib::RefPtr<Gio::SimpleAction> & ACTION__DEBUG, const Glib::RefPtr<Gio::SimpleAction> & ACTION__DEBUG,
const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_APPEND, const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_APPEND,
const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_CLOSE, const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_CLOSE_ACTIVE,
const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_CLOSE_ALL,
const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_PAGE_NAVIGATION_HISTORY_BACK, const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_PAGE_NAVIGATION_HISTORY_BACK,
const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_PAGE_NAVIGATION_HISTORY_FORWARD, const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_PAGE_NAVIGATION_HISTORY_FORWARD,
const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_PAGE_NAVIGATION_UPDATE const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_PAGE_NAVIGATION_UPDATE
@ -74,7 +75,7 @@ Menu::Menu(
MENU__MAIN_TAB_CLOSE->append( MENU__MAIN_TAB_CLOSE->append(
_("Active tab"), _("Active tab"),
get_action_detailed_name( get_action_detailed_name(
ACTION__MAIN_TAB_CLOSE ACTION__MAIN_TAB_CLOSE_ACTIVE
) )
); );
@ -83,24 +84,23 @@ Menu::Menu(
MENU__MAIN_TAB_CLOSE->append( MENU__MAIN_TAB_CLOSE->append(
_("All tabs to left"), _("All tabs to left"),
get_action_detailed_name( get_action_detailed_name(
ACTION__MAIN_TAB_CLOSE ACTION__MAIN_TAB_CLOSE_LEFT
) )
); );
MENU__MAIN_TAB_CLOSE->append( MENU__MAIN_TAB_CLOSE->append(
_("All tabs to right"), _("All tabs to right"),
get_action_detailed_name( get_action_detailed_name(
ACTION__MAIN_TAB_CLOSE ACTION__MAIN_TAB_CLOSE_RIGHT
) )
); );
*/
MENU__MAIN_TAB_CLOSE->append( MENU__MAIN_TAB_CLOSE->append(
_("All tabs"), _("All tabs"),
get_action_detailed_name( get_action_detailed_name(
ACTION__MAIN_TAB_CLOSE ACTION__MAIN_TAB_CLOSE_ALL
) )
); );
*/
MENU__MAIN_TAB->append_submenu( MENU__MAIN_TAB->append_submenu(
_("Close"), _("Close"),

3
src/app/browser/header/menu.hpp
Unescape View File

@ -20,7 +20,8 @@ namespace app::browser::header
Menu( Menu(
const Glib::RefPtr<Gio::SimpleAction> & ACTION__DEBUG, const Glib::RefPtr<Gio::SimpleAction> & ACTION__DEBUG,
const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_APPEND, const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_APPEND,
const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_CLOSE, const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_CLOSE_ACTIVE,
const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_CLOSE_ALL,
const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_PAGE_NAVIGATION_HISTORY_BACK, const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_PAGE_NAVIGATION_HISTORY_BACK,
const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_PAGE_NAVIGATION_HISTORY_FORWARD, const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_PAGE_NAVIGATION_HISTORY_FORWARD,
const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_PAGE_NAVIGATION_UPDATE const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_PAGE_NAVIGATION_UPDATE

4
src/app/browser/main.cpp
Unescape View File

@ -5,7 +5,7 @@ using namespace app::browser;
Main::Main( Main::Main(
const Glib::RefPtr<Gio::SimpleAction> & ACTION__REFRESH, const Glib::RefPtr<Gio::SimpleAction> & ACTION__REFRESH,
const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_CLOSE, const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_CLOSE_ACTIVE,
const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_PAGE_NAVIGATION_HISTORY_BACK, const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_PAGE_NAVIGATION_HISTORY_BACK,
const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_PAGE_NAVIGATION_HISTORY_FORWARD, const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_PAGE_NAVIGATION_HISTORY_FORWARD,
const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_PAGE_NAVIGATION_UPDATE const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_PAGE_NAVIGATION_UPDATE
@ -22,7 +22,7 @@ Main::Main(
// Init components // Init components
mainTab = Gtk::make_managed<main::Tab>( mainTab = Gtk::make_managed<main::Tab>(
ACTION__REFRESH, ACTION__REFRESH,
ACTION__MAIN_TAB_CLOSE, ACTION__MAIN_TAB_CLOSE_ACTIVE,
ACTION__MAIN_TAB_PAGE_NAVIGATION_HISTORY_BACK, ACTION__MAIN_TAB_PAGE_NAVIGATION_HISTORY_BACK,
ACTION__MAIN_TAB_PAGE_NAVIGATION_HISTORY_FORWARD, ACTION__MAIN_TAB_PAGE_NAVIGATION_HISTORY_FORWARD,
ACTION__MAIN_TAB_PAGE_NAVIGATION_UPDATE ACTION__MAIN_TAB_PAGE_NAVIGATION_UPDATE

2
src/app/browser/main.hpp
Unescape View File

@ -27,7 +27,7 @@ namespace app::browser
Main( Main(
const Glib::RefPtr<Gio::SimpleAction> & ACTION__REFRESH, const Glib::RefPtr<Gio::SimpleAction> & ACTION__REFRESH,
const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_CLOSE, const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_CLOSE_ACTIVE,
const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_PAGE_NAVIGATION_HISTORY_BACK, const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_PAGE_NAVIGATION_HISTORY_BACK,
const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_PAGE_NAVIGATION_HISTORY_FORWARD, const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_PAGE_NAVIGATION_HISTORY_FORWARD,
const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_PAGE_NAVIGATION_UPDATE const Glib::RefPtr<Gio::SimpleAction> & ACTION__MAIN_TAB_PAGE_NAVIGATION_UPDATE

6
src/app/browser/main/tab.cpp
Unescape View File

@ -6,14 +6,14 @@ using namespace app::browser::main;
Tab::Tab( Tab::Tab(
const Glib::RefPtr<Gio::SimpleAction> & ACTION__REFRESH, const Glib::RefPtr<Gio::SimpleAction> & ACTION__REFRESH,
const Glib::RefPtr<Gio::SimpleAction> & ACTION__TAB_CLOSE, const Glib::RefPtr<Gio::SimpleAction> & ACTION__TAB_CLOSE_ACTIVE,
const Glib::RefPtr<Gio::SimpleAction> & ACTION__TAB_PAGE_NAVIGATION_HISTORY_BACK, const Glib::RefPtr<Gio::SimpleAction> & ACTION__TAB_PAGE_NAVIGATION_HISTORY_BACK,
const Glib::RefPtr<Gio::SimpleAction> & ACTION__TAB_PAGE_NAVIGATION_HISTORY_FORWARD, const Glib::RefPtr<Gio::SimpleAction> & ACTION__TAB_PAGE_NAVIGATION_HISTORY_FORWARD,
const Glib::RefPtr<Gio::SimpleAction> & ACTION__TAB_PAGE_NAVIGATION_UPDATE const Glib::RefPtr<Gio::SimpleAction> & ACTION__TAB_PAGE_NAVIGATION_UPDATE
) { ) {
// Init actions // Init actions
action__refresh = ACTION__REFRESH; action__refresh = ACTION__REFRESH;
action__tab_close = ACTION__TAB_CLOSE; action__tab_close_active = ACTION__TAB_CLOSE_ACTIVE;
action__tab_page_navigation_history_back = ACTION__TAB_PAGE_NAVIGATION_HISTORY_BACK; action__tab_page_navigation_history_back = ACTION__TAB_PAGE_NAVIGATION_HISTORY_BACK;
action__tab_page_navigation_history_forward = ACTION__TAB_PAGE_NAVIGATION_HISTORY_FORWARD; action__tab_page_navigation_history_forward = ACTION__TAB_PAGE_NAVIGATION_HISTORY_FORWARD;
action__tab_page_navigation_update = ACTION__TAB_PAGE_NAVIGATION_UPDATE; action__tab_page_navigation_update = ACTION__TAB_PAGE_NAVIGATION_UPDATE;
@ -65,7 +65,7 @@ void Tab::append(
); );
auto tabLabel = new tab::Label( auto tabLabel = new tab::Label(
action__tab_close action__tab_close_active
); );
int page_number = append_page( int page_number = append_page(

4
src/app/browser/main/tab.hpp
Unescape View File

@ -19,7 +19,7 @@ namespace app::browser::main
{ {
// Actions // Actions
Glib::RefPtr<Gio::SimpleAction> action__refresh, Glib::RefPtr<Gio::SimpleAction> action__refresh,
action__tab_close, action__tab_close_active,
action__tab_page_navigation_history_back, action__tab_page_navigation_history_back,
action__tab_page_navigation_history_forward, action__tab_page_navigation_history_forward,
action__tab_page_navigation_update; action__tab_page_navigation_update;
@ -41,7 +41,7 @@ namespace app::browser::main
Tab( Tab(
const Glib::RefPtr<Gio::SimpleAction> & ACTION__REFRESH, const Glib::RefPtr<Gio::SimpleAction> & ACTION__REFRESH,
const Glib::RefPtr<Gio::SimpleAction> & ACTION__TAB_CLOSE, const Glib::RefPtr<Gio::SimpleAction> & ACTION__TAB_CLOSE_ACTIVE,
const Glib::RefPtr<Gio::SimpleAction> & ACTION__TAB_PAGE_NAVIGATION_HISTORY_BACK, const Glib::RefPtr<Gio::SimpleAction> & ACTION__TAB_PAGE_NAVIGATION_HISTORY_BACK,
const Glib::RefPtr<Gio::SimpleAction> & ACTION__TAB_PAGE_NAVIGATION_HISTORY_FORWARD, const Glib::RefPtr<Gio::SimpleAction> & ACTION__TAB_PAGE_NAVIGATION_HISTORY_FORWARD,
const Glib::RefPtr<Gio::SimpleAction> & ACTION__TAB_PAGE_NAVIGATION_UPDATE const Glib::RefPtr<Gio::SimpleAction> & ACTION__TAB_PAGE_NAVIGATION_UPDATE

6
src/app/browser/main/tab/label.cpp
Unescape View File

@ -3,10 +3,10 @@
using namespace app::browser::main::tab; using namespace app::browser::main::tab;
Label::Label( Label::Label(
const Glib::RefPtr<Gio::SimpleAction> & ACTION__CLOSE const Glib::RefPtr<Gio::SimpleAction> & ACTION__CLOSE_ACTIVE
) { ) {
// Init actions // Init actions
action__close = ACTION__CLOSE; action__close_active = ACTION__CLOSE_ACTIVE;
// Setup label controller // Setup label controller
auto GtkGestureClick = Gtk::GestureClick::create(); auto GtkGestureClick = Gtk::GestureClick::create();
@ -21,7 +21,7 @@ Label::Label(
{ {
if (n == 2) // double click if (n == 2) // double click
{ {
action__close->activate(); action__close_active->activate();
} }
} }
); );

4
src/app/browser/main/tab/label.hpp
Unescape View File

@ -12,12 +12,12 @@ namespace app::browser::main::tab
{ {
class Label : public Gtk::Label class Label : public Gtk::Label
{ {
Glib::RefPtr<Gio::SimpleAction> action__close; Glib::RefPtr<Gio::SimpleAction> action__close_active;
public: public:
Label( Label(
const Glib::RefPtr<Gio::SimpleAction> & ACTION__CLOSE const Glib::RefPtr<Gio::SimpleAction> & ACTION__CLOSE_ACTIVE
); );
}; };
} }

Write Preview
Loading…
Cancel
Save