Browse Source

rename markup widget to reader

CPP-GTK4
yggverse 3 months ago
parent
commit
e26c4c906c
  1. 4
      Makefile
  2. 4
      po/POTFILES.in
  3. 4
      src/app/browser/main/tab/page/content/text/gemini.cpp
  4. 14
      src/app/browser/main/tab/page/content/text/gemini/reader.cpp
  5. 10
      src/app/browser/main/tab/page/content/text/gemini/reader.hpp
  6. 4
      src/app/browser/main/tab/page/content/text/plain.cpp
  7. 4
      src/app/browser/main/tab/page/content/text/plain/reader.cpp
  8. 10
      src/app/browser/main/tab/page/content/text/plain/reader.hpp

4
Makefile

@ -19,9 +19,9 @@ SRCS = src/app.cpp\ @@ -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\

4
po/POTFILES.in

@ -14,9 +14,9 @@ src/app/browser/main/tab/page.cpp @@ -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

4
src/app/browser/main/tab/page/content/text/gemini.cpp

@ -1,5 +1,5 @@ @@ -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( @@ -15,7 +15,7 @@ Gemini::Gemini(
);
set_child(
* Gtk::make_managed<gemini::Markup>(
* Gtk::make_managed<gemini::Reader>(
GEMTEXT
)
);

14
src/app/browser/main/tab/page/content/text/gemini/markup.cpp → src/app/browser/main/tab/page/content/text/gemini/reader.cpp

@ -1,8 +1,8 @@ @@ -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( @@ -23,7 +23,7 @@ Markup::Markup(
);
set_markup(
Markup::make(
Reader::make(
GEMTEXT
)
);
@ -41,7 +41,7 @@ Markup::Markup( @@ -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( @@ -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( @@ -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( @@ -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

10
src/app/browser/main/tab/page/content/text/gemini/markup.hpp → src/app/browser/main/tab/page/content/text/gemini/reader.hpp

@ -1,5 +1,5 @@ @@ -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 <glibmm/markup.h>
#include <glibmm/regex.h>
@ -8,7 +8,7 @@ @@ -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 @@ -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
#endif // APP_BROWSER_MAIN_TAB_PAGE_CONTENT_TEXT_GEMINI_READER_HPP

4
src/app/browser/main/tab/page/content/text/plain.cpp

@ -1,5 +1,5 @@ @@ -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( @@ -14,7 +14,7 @@ Plain::Plain(
);
set_child(
* Gtk::make_managed<plain::Markup>(
* Gtk::make_managed<plain::Reader>(
TEXT
)
);

4
src/app/browser/main/tab/page/content/text/plain/markup.cpp → src/app/browser/main/tab/page/content/text/plain/reader.cpp

@ -1,8 +1,8 @@ @@ -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

10
src/app/browser/main/tab/page/content/text/plain/markup.hpp → src/app/browser/main/tab/page/content/text/plain/reader.hpp

@ -1,5 +1,5 @@ @@ -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 <glibmm/markup.h>
#include <glibmm/ustring.h>
@ -7,17 +7,17 @@ @@ -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
#endif // APP_BROWSER_MAIN_TAB_PAGE_CONTENT_TEXT_PLAIN_READER_HPP
Loading…
Cancel
Save