[gnote] Update export to HTML
- From: Aurimas Černius <aurimasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnote] Update export to HTML
- Date: Sat, 12 Oct 2019 12:21:54 +0000 (UTC)
commit 95c5fc03013fcacfb20f34c3a8961efec11a9fc8
Author: Aurimas Černius <aurisc4 gmail com>
Date: Sat Oct 12 15:15:43 2019 +0300
Update export to HTML
src/addins/exporttohtml/exporttohtmldialog.cpp | 7 ++++---
src/addins/exporttohtml/exporttohtmlnoteaddin.cpp | 3 ++-
2 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/src/addins/exporttohtml/exporttohtmldialog.cpp b/src/addins/exporttohtml/exporttohtmldialog.cpp
index 24a81c47..68e4fc36 100644
--- a/src/addins/exporttohtml/exporttohtmldialog.cpp
+++ b/src/addins/exporttohtml/exporttohtmldialog.cpp
@@ -1,7 +1,7 @@
/*
* gnote
*
- * Copyright (C) 2011-2012,2017 Aurimas Cernius
+ * Copyright (C) 2011-2012,2017,2019 Aurimas Cernius
* Copyright (C) 2009 Hubert Figuiere
*
* This program is free software: you can redistribute it and/or modify
@@ -27,6 +27,7 @@
#include "sharp/files.hpp"
#include "exporttohtmldialog.hpp"
+#include "ignote.hpp"
#include "preferences.hpp"
namespace exporttohtml {
@@ -94,7 +95,7 @@ void ExportToHtmlDialog::set_export_linked_all(bool value)
void ExportToHtmlDialog::save_preferences()
{
Glib::ustring dir = sharp::file_dirname(get_filename());
- Glib::RefPtr<Gio::Settings> settings = gnote::Preferences::obj().get_schema_settings(SCHEMA_EXPORTHTML);
+ Glib::RefPtr<Gio::Settings> settings =
gnote::IGnote::obj().preferences().get_schema_settings(SCHEMA_EXPORTHTML);
settings->set_string(EXPORTHTML_LAST_DIRECTORY, dir);
settings->set_boolean(EXPORTHTML_EXPORT_LINKED, get_export_linked());
settings->set_boolean(EXPORTHTML_EXPORT_LINKED_ALL, get_export_linked_all());
@@ -103,7 +104,7 @@ void ExportToHtmlDialog::save_preferences()
void ExportToHtmlDialog::load_preferences(const Glib::ustring & default_file)
{
- Glib::RefPtr<Gio::Settings> settings = gnote::Preferences::obj().get_schema_settings(SCHEMA_EXPORTHTML);
+ Glib::RefPtr<Gio::Settings> settings =
gnote::IGnote::obj().preferences().get_schema_settings(SCHEMA_EXPORTHTML);
Glib::ustring last_dir = settings->get_string(EXPORTHTML_LAST_DIRECTORY);
if (last_dir.empty()) {
last_dir = Glib::get_home_dir();
diff --git a/src/addins/exporttohtml/exporttohtmlnoteaddin.cpp
b/src/addins/exporttohtml/exporttohtmlnoteaddin.cpp
index 5cd13ca2..7c758c81 100644
--- a/src/addins/exporttohtml/exporttohtmlnoteaddin.cpp
+++ b/src/addins/exporttohtml/exporttohtmlnoteaddin.cpp
@@ -33,6 +33,7 @@
#include "sharp/xsltargumentlist.hpp"
#include "debug.hpp"
#include "iactionmanager.hpp"
+#include "ignote.hpp"
#include "preferences.hpp"
#include "notewindow.hpp"
#include "utils.hpp"
@@ -233,7 +234,7 @@ void ExportToHtmlNoteAddin::write_html_for_note (sharp::StreamWriter & writer,
args.add_param ("export-linked-all", "", export_linked_all);
args.add_param ("root-note", "", gnote::utils::XmlEncoder::encode(note->get_title()));
- Glib::RefPtr<Gio::Settings> settings = Preferences::obj().get_schema_settings(Preferences::SCHEMA_GNOTE);
+ Glib::RefPtr<Gio::Settings> settings =
gnote::IGnote::obj().preferences().get_schema_settings(Preferences::SCHEMA_GNOTE);
if (settings->get_boolean(Preferences::ENABLE_CUSTOM_FONT)) {
Glib::ustring font_face = settings->get_string(Preferences::CUSTOM_FONT_FACE);
Pango::FontDescription font_desc (font_face);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]