From 2208e5df25c23f7e5c7eac614118ed32ef252f42 Mon Sep 17 00:00:00 2001 From: yggverse Date: Tue, 10 Sep 2024 07:50:15 +0300 Subject: [PATCH] rename subtitle to description --- src/app/browser.cpp | 2 +- src/app/browser/main.cpp | 4 ++-- src/app/browser/main.hpp | 2 +- src/app/browser/main/tab.cpp | 6 +++--- src/app/browser/main/tab.hpp | 2 +- src/app/browser/main/tab/page.cpp | 12 ++++++------ src/app/browser/main/tab/page.hpp | 8 ++++---- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/app/browser.cpp b/src/app/browser.cpp index 52307d12..56ec5b11 100644 --- a/src/app/browser.cpp +++ b/src/app/browser.cpp @@ -17,7 +17,7 @@ Browser::Browser( browserHeader->refresh( browserMain->get_current_tab_page_title(), - browserMain->get_current_tab_page_subtitle() + browserMain->get_current_tab_page_description() ); } ); diff --git a/src/app/browser/main.cpp b/src/app/browser/main.cpp index a1836ea4..faf81d7d 100644 --- a/src/app/browser/main.cpp +++ b/src/app/browser/main.cpp @@ -113,9 +113,9 @@ Glib::ustring Main::get_current_tab_page_title() ); }; -Glib::ustring Main::get_current_tab_page_subtitle() +Glib::ustring Main::get_current_tab_page_description() { - return mainTab->get_page_subtitle( + return mainTab->get_page_description( mainTab->get_current_page() ); }; \ No newline at end of file diff --git a/src/app/browser/main.hpp b/src/app/browser/main.hpp index cba55d2f..76cbfcd9 100644 --- a/src/app/browser/main.hpp +++ b/src/app/browser/main.hpp @@ -55,7 +55,7 @@ namespace app::browser // Getters Glib::ustring get_current_tab_page_title(); - Glib::ustring get_current_tab_page_subtitle(); + Glib::ustring get_current_tab_page_description(); }; } diff --git a/src/app/browser/main/tab.cpp b/src/app/browser/main/tab.cpp index f1d83dae..87845830 100644 --- a/src/app/browser/main/tab.cpp +++ b/src/app/browser/main/tab.cpp @@ -187,7 +187,7 @@ void Tab::refresh( TAB_PAGE->refresh( tab::Page::MIME::UNDEFINED, TAB_PAGE->get_title(), - TAB_PAGE->get_subtitle(), + TAB_PAGE->get_description(), 0 // @TODO ); @@ -293,12 +293,12 @@ Glib::ustring Tab::get_page_title( )->get_title(); }; -Glib::ustring Tab::get_page_subtitle( +Glib::ustring Tab::get_page_description( const int & PAGE_NUMBER ) { return get_tabPage( PAGE_NUMBER - )->get_subtitle(); + )->get_description(); }; // Private helpers diff --git a/src/app/browser/main/tab.hpp b/src/app/browser/main/tab.hpp index 4d0b59f5..ef4c5439 100644 --- a/src/app/browser/main/tab.hpp +++ b/src/app/browser/main/tab.hpp @@ -103,7 +103,7 @@ namespace app::browser::main const int & PAGE_NUMBER ); - Glib::ustring get_page_subtitle( + Glib::ustring get_page_description( const int & PAGE_NUMBER ); }; diff --git a/src/app/browser/main/tab/page.cpp b/src/app/browser/main/tab/page.cpp index 6152c509..add56529 100644 --- a/src/app/browser/main/tab/page.cpp +++ b/src/app/browser/main/tab/page.cpp @@ -45,11 +45,11 @@ Page::Page( void Page::refresh( const MIME & MIME, const Glib::ustring & TITLE, - const Glib::ustring & SUBTITLE, + const Glib::ustring & DESCRIPTION, const double & PROGRESS_FRACTION ) { title = TITLE; // @TODO copy - subtitle = SUBTITLE; + description = DESCRIPTION; pageNavigation->refresh( PROGRESS_FRACTION @@ -201,7 +201,7 @@ void Page::navigation_update( ); pageContent->set_text_plain( // @TODO - subtitle + description ); } } @@ -219,7 +219,7 @@ void Page::navigation_update( ); pageContent->set_text_plain( // @TODO - subtitle + description ); } @@ -302,9 +302,9 @@ Glib::ustring Page::get_title() return title; } -Glib::ustring Page::get_subtitle() +Glib::ustring Page::get_description() { - return subtitle; + return description; } Glib::ustring Page::get_navigation_request_text() diff --git a/src/app/browser/main/tab/page.hpp b/src/app/browser/main/tab/page.hpp index 7b3ce09f..093e854e 100644 --- a/src/app/browser/main/tab/page.hpp +++ b/src/app/browser/main/tab/page.hpp @@ -38,7 +38,7 @@ namespace app::browser::main::tab MIME mime; Glib::ustring title; - Glib::ustring subtitle; + Glib::ustring description; // Socket char buffer[0xfffff]; // 1Mb @@ -63,7 +63,7 @@ namespace app::browser::main::tab void refresh( const MIME & MIME, const Glib::ustring & TITLE, - const Glib::ustring & SUBTITLE, + const Glib::ustring & DESCRIPTION, const double & PROGRESS_FRACTION ); @@ -75,9 +75,9 @@ namespace app::browser::main::tab void navigation_history_forward(); // Getters - Page::MIME get_mime(); + MIME get_mime(); Glib::ustring get_title(); - Glib::ustring get_subtitle(); + Glib::ustring get_description(); Glib::ustring get_navigation_request_text();