summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Almesberger <werner@almesberger.net>2016-10-30 14:38:18 (GMT)
committerWerner Almesberger <werner@almesberger.net>2016-10-30 14:38:18 (GMT)
commit2aad75cbc2757c6297dbf0785070c6b15030e5ea (patch)
tree93fc07788e39e6d196fce72652f9dd0e0f443bf9
parentd46cbc9f842adbb762bf84830be00350c34e0f93 (diff)
downloadeeshow-2aad75cbc2757c6297dbf0785070c6b15030e5ea.zip
eeshow-2aad75cbc2757c6297dbf0785070c6b15030e5ea.tar.gz
eeshow-2aad75cbc2757c6297dbf0785070c6b15030e5ea.tar.bz2
gui/help.c, help.html, Makefile, README: remove WebKit support
We didn't normally use it, if using it, it would have made things quite slow, and having to support it would complicate generalizing viewer windows (which will happen soon).
-rw-r--r--Makefile10
-rw-r--r--README4
-rw-r--r--gui/help.c27
-rw-r--r--help.html67
4 files changed, 1 insertions, 107 deletions
diff --git a/Makefile b/Makefile
index d573d29..f4a42af 100644
--- a/Makefile
+++ b/Makefile
@@ -78,14 +78,6 @@ BUILD_DATE = $(shell date -u +'%Y%m%d-%H:%MZ')
CFLAGS += -DVERSION='"$(GIT_VERSION)$(GIT_STATUS)"' \
-DBUILD_DATE='"$(BUILD_DATE)"'
-ifneq ($(USE_WEBKIT),)
- CFLAGS += -DUSE_WEBKIT `pkg-config --cflags webkit2gtk-4.0`
- LDLIBS += `pkg-config --libs webkit2gtk-4.0`
- HELP_TEXT = help.html
-else
- HELP_TEXT = help.txt
-endif
-
include Makefile.c-common
.PHONY: test neo900 sch test testref png pngref pdf diff view newref
@@ -117,7 +109,7 @@ eetest: $(EETEST_OBJS) | eediff
#----- Help texts -------------------------------------------------------------
-help.inc: $(HELP_TEXT) Makefile
+help.inc: help.txt Makefile
$(BUILD) sed 's/"/\\"/g;s/.*/"&\\n"/' $< >$@ || \
{ rm -f $@; exit 1; }
diff --git a/README b/README
index fa58953..4d8f0d0 100644
--- a/README
+++ b/README
@@ -42,10 +42,6 @@ On Fedora:
sudo dnf install gtk3-devel cairo-devel libgit2-devel transfig ImageMagick
-If building with USE_WEBKIT=y:
-
-libwebkit2gtk-4.0-dev
-
Furthermore, the xsel command-line utility is required for copy & paste.
diff --git a/gui/help.c b/gui/help.c
index 553f003..545a257 100644
--- a/gui/help.c
+++ b/gui/help.c
@@ -14,10 +14,6 @@
#include <gtk/gtk.h>
-#ifdef USE_WEBKIT
-#include <webkit2/webkit2.h>
-#endif
-
#include "gui/help.h"
@@ -48,27 +44,6 @@ static gboolean key_press_event(GtkWidget *widget, GdkEventKey *event,
}
-#ifdef USE_WEBKIT
-
-static GtkWidget *help_content(void)
-{
- GtkWidget *view;
- WebKitSettings *settings;
-
- view = webkit_web_view_new();
-
- settings = webkit_web_view_get_settings(WEBKIT_WEB_VIEW(view));
- webkit_settings_set_default_font_size(settings, 10);
-
- webkit_web_view_load_html(WEBKIT_WEB_VIEW(view),
-#include "../help.inc"
- , NULL);
-
- return view;
-}
-
-#else /* USE_WEBKIT */
-
static GtkWidget *help_content(void)
{
GtkWidget *scroll, *label;
@@ -90,8 +65,6 @@ static GtkWidget *help_content(void)
return scroll;
}
-#endif /* !USE_WEBKIT */
-
static void new_help_window(void)
{
diff --git a/help.html b/help.html
deleted file mode 100644
index 61d3bb6..0000000
--- a/help.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<HTML>
-<HEAD><TITLE>Eeshow help</TITLE></HEAD>
-
-<H1>Key functions in GUI mode</H1>
-
-<TABLE>
- <TR>
- <TD>+ or =
- <TD>zoom in
- <TR>
- <TD>-
- <TD>zoom out
- <TR>
- <TD>*
- <TD>fit to window
- <TR>
- <TD>Home
- <TD>go to the top sheet
- <TR>
- <TD>Delete or Backspace
- <TD>go to the next higher sheet in hierarchy
- <TR>
- <TD>PgUp
- <TD>go to the previous sheet in sequence
- <TR>
- <TD>PgDn
- <TD>go to the next sheet in sequence
- <TR>
- <TD>Tab
- <TD>toggle between old and new revision
- <TR>
- <TD>Esc
- <TD>cancel current action (exit history, close pop-up,
- de-highlight glabel, close help)
- <TR>
- <TD>E
- <TD>show/hide extra information (pin types)
- <TR>
- <TD>F
- <TD>toggle showing footprints, even if invisible
- <TR>
- <TD>Shift+R
- <TD>idem, for component references
- <TR>
- <TD>Shift+D
- <TD>toggle between "diff" and experimental "delta" mode
- <TR>
- <TD>H
- <TD>open/close help window
- <TR>
- <TD>T
- <TD>toggle performance timer
- <TR>
- <TD>D
- <TD>when comparing revisions, show difference
- <TR>
- <TD>N
- <TD>show newer sheet
- <TR>
- <TD>O
- <TD>show older sheet
- <TR>
- <TD>Q
- <TD>quit the viewer
-</TABLE>
-</BODY>
-</HTML>