From e26c4c906c1c2f60cc91050cef414de5cd5674fc Mon Sep 17 00:00:00 2001 From: yggverse Date: Sat, 14 Sep 2024 06:43:41 +0300 Subject: [PATCH] rename markup widget to reader --- Makefile | 4 ++-- po/POTFILES.in | 4 ++-- .../browser/main/tab/page/content/text/gemini.cpp | 4 ++-- .../content/text/gemini/{markup.cpp => reader.cpp} | 14 +++++++------- .../content/text/gemini/{markup.hpp => reader.hpp} | 10 +++++----- .../browser/main/tab/page/content/text/plain.cpp | 4 ++-- .../content/text/plain/{markup.cpp => reader.cpp} | 4 ++-- .../content/text/plain/{markup.hpp => reader.hpp} | 10 +++++----- 8 files changed, 27 insertions(+), 27 deletions(-) rename src/app/browser/main/tab/page/content/text/gemini/{markup.cpp => reader.cpp} (93%) rename src/app/browser/main/tab/page/content/text/gemini/{markup.hpp => reader.hpp} (80%) rename src/app/browser/main/tab/page/content/text/plain/{markup.cpp => reader.cpp} (89%) rename src/app/browser/main/tab/page/content/text/plain/{markup.hpp => reader.hpp} (53%) diff --git a/Makefile b/Makefile index bd7707db..922276c3 100644 --- a/Makefile +++ b/Makefile @@ -19,9 +19,9 @@ SRCS = src/app.cpp\ src/app/browser/main/tab/page/content.cpp\ src/app/browser/main/tab/page/content/text.cpp\ src/app/browser/main/tab/page/content/text/gemini.cpp\ - src/app/browser/main/tab/page/content/text/gemini/markup.cpp\ + src/app/browser/main/tab/page/content/text/gemini/reader.cpp\ src/app/browser/main/tab/page/content/text/plain.cpp\ - src/app/browser/main/tab/page/content/text/plain/markup.cpp\ + src/app/browser/main/tab/page/content/text/plain/reader.cpp\ src/app/browser/main/tab/page/navigation.cpp\ src/app/browser/main/tab/page/navigation/base.cpp\ src/app/browser/main/tab/page/navigation/bookmark.cpp\ diff --git a/po/POTFILES.in b/po/POTFILES.in index fd29e902..b8c1984f 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -14,9 +14,9 @@ src/app/browser/main/tab/page.cpp src/app/browser/main/tab/page/content.cpp src/app/browser/main/tab/page/content/text.cpp src/app/browser/main/tab/page/content/text/gemini.cpp -src/app/browser/main/tab/page/content/text/gemini/markup.cpp +src/app/browser/main/tab/page/content/text/gemini/reader.cpp src/app/browser/main/tab/page/content/text/plain.cpp -src/app/browser/main/tab/page/content/text/plain/markup.cpp +src/app/browser/main/tab/page/content/text/plain/reader.cpp src/app/browser/main/tab/page/navigation.cpp src/app/browser/main/tab/page/navigation/base.cpp src/app/browser/main/tab/page/navigation/bookmark.cpp diff --git a/src/app/browser/main/tab/page/content/text/gemini.cpp b/src/app/browser/main/tab/page/content/text/gemini.cpp index f5281f39..e179c21a 100644 --- a/src/app/browser/main/tab/page/content/text/gemini.cpp +++ b/src/app/browser/main/tab/page/content/text/gemini.cpp @@ -1,5 +1,5 @@ #include "gemini.hpp" -#include "gemini/markup.hpp" +#include "gemini/reader.hpp" using namespace app::browser::main::tab::page::content::text; @@ -15,7 +15,7 @@ Gemini::Gemini( ); set_child( - * Gtk::make_managed( + * Gtk::make_managed( GEMTEXT ) ); diff --git a/src/app/browser/main/tab/page/content/text/gemini/markup.cpp b/src/app/browser/main/tab/page/content/text/gemini/reader.cpp similarity index 93% rename from src/app/browser/main/tab/page/content/text/gemini/markup.cpp rename to src/app/browser/main/tab/page/content/text/gemini/reader.cpp index f4e2ebac..f5a5d51a 100644 --- a/src/app/browser/main/tab/page/content/text/gemini/markup.cpp +++ b/src/app/browser/main/tab/page/content/text/gemini/reader.cpp @@ -1,8 +1,8 @@ -#include "markup.hpp" +#include "reader.hpp" using namespace app::browser::main::tab::page::content::text::gemini; -Markup::Markup( +Reader::Reader( const Glib::ustring & GEMTEXT ) { // Init widget @@ -23,7 +23,7 @@ Markup::Markup( ); set_markup( - Markup::make( + Reader::make( GEMTEXT ) ); @@ -41,7 +41,7 @@ Markup::Markup( } // Match tools -bool Markup::Line::Match::link( +bool Reader::Line::Match::link( const Glib::ustring & GEMTEXT, Glib::ustring & address, Glib::ustring & date, @@ -68,7 +68,7 @@ bool Markup::Line::Match::link( } // Markup tools -Glib::ustring Markup::make( +Glib::ustring Reader::make( const Glib::ustring & GEMTEXT ) { Glib::ustring pango; @@ -89,7 +89,7 @@ Glib::ustring Markup::make( if (Line::Match::link(line, address, date, alt)) { pango.append( - Markup::Make::link( + Reader::Make::link( address, date, alt @@ -114,7 +114,7 @@ Glib::ustring Markup::make( return pango; } -Glib::ustring Markup::Make::link( +Glib::ustring Reader::Make::link( const Glib::ustring & ADDRESS, const Glib::ustring & DATE, const Glib::ustring & ALT diff --git a/src/app/browser/main/tab/page/content/text/gemini/markup.hpp b/src/app/browser/main/tab/page/content/text/gemini/reader.hpp similarity index 80% rename from src/app/browser/main/tab/page/content/text/gemini/markup.hpp rename to src/app/browser/main/tab/page/content/text/gemini/reader.hpp index dfd2fe2a..e76ba6f6 100644 --- a/src/app/browser/main/tab/page/content/text/gemini/markup.hpp +++ b/src/app/browser/main/tab/page/content/text/gemini/reader.hpp @@ -1,5 +1,5 @@ -#ifndef APP_BROWSER_MAIN_TAB_PAGE_CONTENT_TEXT_GEMINI_MARKUP_HPP -#define APP_BROWSER_MAIN_TAB_PAGE_CONTENT_TEXT_GEMINI_MARKUP_HPP +#ifndef APP_BROWSER_MAIN_TAB_PAGE_CONTENT_TEXT_GEMINI_READER_HPP +#define APP_BROWSER_MAIN_TAB_PAGE_CONTENT_TEXT_GEMINI_READER_HPP #include #include @@ -8,7 +8,7 @@ namespace app::browser::main::tab::page::content::text::gemini { - class Markup : public Gtk::Label + class Reader : public Gtk::Label { /* * Tools (currently is private) @@ -44,10 +44,10 @@ namespace app::browser::main::tab::page::content::text::gemini */ public: - Markup( + Reader( const Glib::ustring & GEMTEXT ); }; } -#endif // APP_BROWSER_MAIN_TAB_PAGE_CONTENT_TEXT_GEMINI_MARKUP_HPP \ No newline at end of file +#endif // APP_BROWSER_MAIN_TAB_PAGE_CONTENT_TEXT_GEMINI_READER_HPP \ No newline at end of file diff --git a/src/app/browser/main/tab/page/content/text/plain.cpp b/src/app/browser/main/tab/page/content/text/plain.cpp index 52c67352..789070d7 100644 --- a/src/app/browser/main/tab/page/content/text/plain.cpp +++ b/src/app/browser/main/tab/page/content/text/plain.cpp @@ -1,5 +1,5 @@ #include "plain.hpp" -#include "plain/markup.hpp" +#include "plain/reader.hpp" using namespace app::browser::main::tab::page::content::text; @@ -14,7 +14,7 @@ Plain::Plain( ); set_child( - * Gtk::make_managed( + * Gtk::make_managed( TEXT ) ); diff --git a/src/app/browser/main/tab/page/content/text/plain/markup.cpp b/src/app/browser/main/tab/page/content/text/plain/reader.cpp similarity index 89% rename from src/app/browser/main/tab/page/content/text/plain/markup.cpp rename to src/app/browser/main/tab/page/content/text/plain/reader.cpp index 4a00d095..5468787e 100644 --- a/src/app/browser/main/tab/page/content/text/plain/markup.cpp +++ b/src/app/browser/main/tab/page/content/text/plain/reader.cpp @@ -1,8 +1,8 @@ -#include "markup.hpp" +#include "reader.hpp" using namespace app::browser::main::tab::page::content::text::plain; -Markup::Markup( +Reader::Reader( const Glib::ustring & TEXT ) { // Init widget diff --git a/src/app/browser/main/tab/page/content/text/plain/markup.hpp b/src/app/browser/main/tab/page/content/text/plain/reader.hpp similarity index 53% rename from src/app/browser/main/tab/page/content/text/plain/markup.hpp rename to src/app/browser/main/tab/page/content/text/plain/reader.hpp index 8f93fb5a..9503e918 100644 --- a/src/app/browser/main/tab/page/content/text/plain/markup.hpp +++ b/src/app/browser/main/tab/page/content/text/plain/reader.hpp @@ -1,5 +1,5 @@ -#ifndef APP_BROWSER_MAIN_TAB_PAGE_CONTENT_TEXT_PLAIN_MARKUP_HPP -#define APP_BROWSER_MAIN_TAB_PAGE_CONTENT_TEXT_PLAIN_MARKUP_HPP +#ifndef APP_BROWSER_MAIN_TAB_PAGE_CONTENT_TEXT_PLAIN_READER_HPP +#define APP_BROWSER_MAIN_TAB_PAGE_CONTENT_TEXT_PLAIN_READER_HPP #include #include @@ -7,17 +7,17 @@ namespace app::browser::main::tab::page::content::text::plain { - class Markup : public Gtk::Label + class Reader : public Gtk::Label { /* * Gemini class API */ public: - Markup( + Reader( const Glib::ustring & TEXT ); }; } -#endif // APP_BROWSER_MAIN_TAB_PAGE_CONTENT_TEXT_PLAIN_MARKUP_HPP \ No newline at end of file +#endif // APP_BROWSER_MAIN_TAB_PAGE_CONTENT_TEXT_PLAIN_READER_HPP \ No newline at end of file