[Commits] [SCM] claws branch, gtk3, updated. 4.0.0-73-gda1269449
jonathan at claws-mail.org
jonathan at claws-mail.org
Mon Aug 23 16:32:47 UTC 2021
The branch, gtk3 has been updated
via da1269449866334b732c09516cde2c236b7cf2f3 (commit)
via ad5dd473e75f1437588ffe04df667166aca78ae2 (commit)
from 13a8e7744b16fee45aed79088421c39560d5282d (commit)
Summary of changes:
src/plugins/pdf_viewer/Makefile.am | 66 +++++++++++++++++++---
src/plugins/pdf_viewer/claws.def | 37 ++++++++++++
.../{address_keeper => pdf_viewer}/plugin.def | 0
src/plugins/pdf_viewer/poppler_viewer.c | 6 ++
src/plugins/pdf_viewer/poppler_viewer.h | 2 +
src/plugins/{libravatar => pdf_viewer}/version.rc | 4 +-
6 files changed, 104 insertions(+), 11 deletions(-)
create mode 100644 src/plugins/pdf_viewer/claws.def
copy src/plugins/{address_keeper => pdf_viewer}/plugin.def (100%)
copy src/plugins/{libravatar => pdf_viewer}/version.rc (87%)
- Log -----------------------------------------------------------------
commit da1269449866334b732c09516cde2c236b7cf2f3
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Mon Aug 23 04:27:04 2021 -0700
add widget names to pdf viewer plugin
diff --git a/src/plugins/pdf_viewer/poppler_viewer.c b/src/plugins/pdf_viewer/poppler_viewer.c
index 100d7b086..c04f594a6 100644
--- a/src/plugins/pdf_viewer/poppler_viewer.c
+++ b/src/plugins/pdf_viewer/poppler_viewer.c
@@ -1756,6 +1756,7 @@ static MimeViewer *pdf_viewer_create(void)
viewer->mimeviewer.print = pdf_viewer_print;
#endif
viewer->scrollwin = gtk_scrolled_window_new(NULL, NULL);
+ gtk_widget_set_name(GTK_WIDGET(viewer->scrollwin), "document");
viewer->scrollwin_index = gtk_scrolled_window_new(NULL, NULL);
viewer->pdf_view_ebox = gtk_event_box_new();
gtk_event_box_set_visible_window(GTK_EVENT_BOX(viewer->pdf_view_ebox), FALSE);
@@ -1780,8 +1781,10 @@ static MimeViewer *pdf_viewer_create(void)
viewer->widgets_table = gtk_grid_new();
viewer->doc_index_pane = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL);
+ gtk_widget_set_name(GTK_WIDGET(viewer->doc_index_pane), "document_pane");
viewer->frame_index = gtk_frame_new(NULL);
+ gtk_widget_set_name(GTK_WIDGET(viewer->frame_index), "document_index");
gtk_frame_set_shadow_type(GTK_FRAME(viewer->frame_index), GTK_SHADOW_IN);
gtk_widget_set_size_request(viewer->frame_index, 18, -1);
gtk_frame_set_label(GTK_FRAME(viewer->frame_index), _("Document Index"));
@@ -1836,6 +1839,9 @@ static MimeViewer *pdf_viewer_create(void)
viewer->vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
viewer->hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
+ gtk_widget_set_name(GTK_WIDGET(viewer->vbox), "pdf_viewer");
+ gtk_widget_set_name(GTK_WIDGET(viewer->hbox), "buttons");
+
/* treeview */
tree_store = gtk_tree_store_new(N_INDEX_COLUMNS,
G_TYPE_STRING,
commit ad5dd473e75f1437588ffe04df667166aca78ae2
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Aug 22 17:04:29 2021 -0700
port pdf viewer plugin to windows
diff --git a/src/plugins/pdf_viewer/Makefile.am b/src/plugins/pdf_viewer/Makefile.am
index d5ce4b22e..54688d849 100644
--- a/src/plugins/pdf_viewer/Makefile.am
+++ b/src/plugins/pdf_viewer/Makefile.am
@@ -1,8 +1,55 @@
-# Copyright 1999-2014 the Claws Mail team.
+# Copyright 1999-2021 the Claws Mail team.
# This file is part of Claws Mail package, and distributed under the
# terms of the General Public License version 3 (or later).
# See COPYING file for license details.
+EXTRA_DIST = claws.def plugin.def version.rc
+
+IFLAGS = \
+ -I$(top_builddir)/src \
+ -I$(top_srcdir)/src \
+ -I$(top_srcdir)/src/common \
+ -I$(top_builddir)/src/common \
+ -I$(top_srcdir)/src/gtk
+
+if OS_WIN32
+
+LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RC) \
+ `echo $(DEFS) $(DEFAULT_INCLUDES) $(IFLAGS) | \
+ sed -e 's/-I/--include-dir /g;s/-D/--define /g'`
+
+%.lo: %.rc
+ $(LTRCCOMPILE) -i $< -o $@
+
+plugin_res = version.lo
+plugin_res_ldflag = -Wl,.libs/version.o
+export_symbols = -export-symbols $(srcdir)/plugin.def
+plugin_deps = libclaws.a $(plugin_res) plugin.def
+plugin_ldadd = -L. -lclaws
+
+libclaws.a: claws.def
+ $(DLLTOOL) --output-lib $@ --def $<
+
+else
+plugin_res =
+plugin_res_ldflag =
+export_symbols =
+plugin_deps =
+plugin_ldadd =
+endif
+
+if PLATFORM_WIN32
+no_undefined = -no-undefined
+else
+no_undefined =
+endif
+
+if CYGWIN
+cygwin_export_lib = -L$(top_builddir)/src -lclaws-mail
+else
+cygwin_export_lib =
+endif
+
plugindir = $(pkglibdir)/plugins
if BUILD_PDF_VIEWER_PLUGIN
@@ -10,20 +57,21 @@ plugin_LTLIBRARIES = pdf_viewer.la
endif
pdf_viewer_la_SOURCES = \
- poppler_viewer.c \
- poppler_viewer.h
+ poppler_viewer.c \
+ poppler_viewer.h
pdf_viewer_la_LDFLAGS = \
- -avoid-version -module \
+ $(plugin_res_ldflag) $(no_undefined) $(export_symbols) \
+ -avoid-version -module
+
+pdf_viewer_la_DEPENDENCIES = $(plugin_deps)
+
+pdf_viewer_la_LIBADD = $(plugin_ldadd) $(cygwin_export_lib) \
$(GTK_LIBS) \
$(POPPLER_LIBS)
pdf_viewer_la_CPPFLAGS = \
- -I$(top_builddir)/src \
- -I$(top_srcdir)/src \
- -I$(top_srcdir)/src/common \
- -I$(top_builddir)/src/common \
- -I$(top_srcdir)/src/gtk \
+ $(IFLAGS) \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
$(ENCHANT_CFLAGS) \
diff --git a/src/plugins/pdf_viewer/claws.def b/src/plugins/pdf_viewer/claws.def
new file mode 100644
index 000000000..7cd57d3b1
--- /dev/null
+++ b/src/plugins/pdf_viewer/claws.def
@@ -0,0 +1,37 @@
+LIBRARY CLAWS-MAIL.EXE
+EXPORTS
+alertpanel_error
+alertpanel_full
+alertpanel_warning
+check_plugin_version
+claws_unlink
+compose_new
+conv_get_locale_charset_str
+debug_print_real
+execute_command_line
+get_tmp_file
+gtkutils_scroll_one_line
+gtkutils_scroll_page
+input_dialog_with_invisible
+main_window_cursor_normal
+main_window_cursor_wait
+mainwindow_get_mainwindow
+mimeview_register_viewer_factory
+mimeview_unregister_viewer_factory
+open_uri
+prefs_common_get_uri_cmd
+printing_get_renderer_data
+printing_get_zoom
+printing_print_full
+printing_set_n_pages
+procmime_get_content_type_str
+procmime_get_mime_type
+procmime_get_part
+procmime_get_part_file_name
+procmime_get_tmp_file_name
+procmime_mimeinfo_get_parameter
+stock_pixbuf_gdk
+stock_pixmap_widget
+strretchomp
+summary_print
+to_human_readable
diff --git a/src/plugins/pdf_viewer/plugin.def b/src/plugins/pdf_viewer/plugin.def
new file mode 100644
index 000000000..8916a5d7c
--- /dev/null
+++ b/src/plugins/pdf_viewer/plugin.def
@@ -0,0 +1,10 @@
+EXPORTS
+ plugin_desc
+ plugin_done
+ plugin_init
+ plugin_licence
+ plugin_name
+ plugin_type
+ plugin_provides
+ plugin_version
+
diff --git a/src/plugins/pdf_viewer/poppler_viewer.h b/src/plugins/pdf_viewer/poppler_viewer.h
index e1cf28ee4..689e96c7f 100644
--- a/src/plugins/pdf_viewer/poppler_viewer.h
+++ b/src/plugins/pdf_viewer/poppler_viewer.h
@@ -26,7 +26,9 @@
//#include <unistd.h>
#include <stdio.h>
#include <gtk/gtk.h>
+#ifndef G_OS_WIN32
#include <gdk/gdkx.h>
+#endif
#include <gdk/gdkkeysyms.h>
#include <poppler.h>
#include <version.h>
diff --git a/src/plugins/pdf_viewer/version.rc b/src/plugins/pdf_viewer/version.rc
new file mode 100644
index 000000000..907e22c28
--- /dev/null
+++ b/src/plugins/pdf_viewer/version.rc
@@ -0,0 +1,36 @@
+1 VERSIONINFO
+ FILEVERSION 0, 0, 0, 0
+ PRODUCTVERSION 0, 0, 0, 0
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "000004b0"
+ BEGIN
+ VALUE "FileDescription", "Claws Mail PDF Viewer Plugin\0"
+ VALUE "FileVersion", "0.0.0.0\0"
+ VALUE "ProductVersion", "0.0.0.0 Win32\0"
+ VALUE "LegalCopyright", "GPL / © 1999-2021 Hiroyuki Yamamoto & The Claws Mail Team\0"
+ VALUE "CompanyName", "GNU / Free Software Foundation\0"
+ VALUE "ProductName", "Claws Mail\0"
+// VALUE "Comments", "\0"
+// VALUE "InternalName", "\0"
+// VALUE "LegalTrademarks", "\0"
+// VALUE "OriginalFilename", "\0"
+// VALUE "PrivateBuild", "\0"
+// VALUE "SpecialBuild", "\0"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x0, 1200
+ END
+END
-----------------------------------------------------------------------
hooks/post-receive
--
Claws Mail
More information about the Commits
mailing list