From b1d5c36aa58f4b37387beb5bd2058e7dc8f04808 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Sun, 25 Jan 2009 21:03:32 +0000 Subject: Remove unused fonts languages and autodetectors stuff. Bug #558407. svn path=/trunk/; revision=8731 --- data/Makefile.am | 1 - data/epiphany.pc.in | 1 - data/epiphany.schemas.in | 21 -------- data/generate-font-schemas.py | 112 ------------------------------------------ data/glade/prefs-dialog.glade | 46 +---------------- 5 files changed, 1 insertion(+), 180 deletions(-) delete mode 100755 data/generate-font-schemas.py (limited to 'data') diff --git a/data/Makefile.am b/data/Makefile.am index 38981eb88..ec74a1e56 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,4 +1,3 @@ - SUBDIRS = art glade icons ui @INTLTOOL_SERVER_RULE@ diff --git a/data/epiphany.pc.in b/data/epiphany.pc.in index 9fbc69d9a..150ccb2fb 100644 --- a/data/epiphany.pc.in +++ b/data/epiphany.pc.in @@ -8,7 +8,6 @@ datarootdir=@datarootdir@ datadir=@datadir@ icondir=@datadir@/@PACKAGE@/icons features=@EPIPHANY_FEATURES@ -engine=@with_engine@ Name: Epiphany Browser Description: GNOME Web Browser diff --git a/data/epiphany.schemas.in b/data/epiphany.schemas.in index 51bcb107e..81fadca59 100644 --- a/data/epiphany.schemas.in +++ b/data/epiphany.schemas.in @@ -389,27 +389,6 @@ The path of the folder where to download files to; or "Downloads" to use the default downloads folder, or "Desktop" to use the desktop folder. - - /schemas/apps/epiphany/web/autodetect_encoding - /apps/epiphany/web/autodetect_encoding - epiphany - string - - - The encoding autodetector. Empty string means autodetect is off - - The encoding autodetector. Valid entries are "" (autodetectors - off), "cjk_parallel_state_machine" (autodetect east asian encodings), - "ja_parallel_state_machine" (autodetect japanese encodings), - "ko_parallel_state_machine" (autodetect korean encodings), "ruprob" - (autodetect russian encodings), "ukprob" (autodetect ukrainian encodings), - "zh_parallel_state_machine" (autodetect chinese encodings), - "zhcn_parallel_state_machine" (autodetect simplified chinese encodings), - "zhtw_parallel_state_machine" (autodetect traditional chinese encodings) - and "universal_charset_detector" (autodetect most encodings). - - - /schemas/apps/epiphany/web/cookie_accept /apps/epiphany/web/cookie_accept diff --git a/data/generate-font-schemas.py b/data/generate-font-schemas.py deleted file mode 100755 index 5c1570694..000000000 --- a/data/generate-font-schemas.py +++ /dev/null @@ -1,112 +0,0 @@ -#!/usr/bin/env python -# -*- coding: UTF-8 -*- -# -# Copyright © 2005 Christian Persch -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -# $Id$ - -import sys, codecs -from xml import dom; - -sys.stdout = codecs.getwriter("utf-8")(sys.__stdout__) - -def appendTextNode(doc, schemaNode, tag, text): - node = doc.createElement(tag) - schemaNode.appendChild(node) - textNode = doc.createTextNode(text) - node.appendChild(textNode) - - -def appendLocaleNode(doc, schemaNode, localeName, shortSchemaText): - localeNode = doc.createElement("locale") - localeNode.setAttribute("name", localeName) - schemaNode.appendChild(localeNode) - - appendTextNode(doc, localeNode, "short", shortSchemaText) - appendTextNode(doc, localeNode, "long", shortSchemaText) - - -def append_schema(doc, schemalistNode, key, datatype, default, description, schemaText): - schemaNode = doc.createElement("schema") - schemalistNode.appendChild(schemaNode) - appendTextNode (doc, schemaNode, "key", "/schemas" + key) - appendTextNode (doc, schemaNode, "applyto", key) - appendTextNode (doc, schemaNode, "owner", "epiphany") - appendTextNode (doc, schemaNode, "type", datatype) - appendTextNode (doc, schemaNode, "default", default) - appendLocaleNode (doc, schemaNode, "C", schemaText) - - -def append_schemas(docNode, schemalistNode, group): - base = "/apps/epiphany/web/" - append_schema(doc, schemalistNode, base + "fixed_font_size_" + group, - "int", "12", "Monospace font size", - "Monospaced font size for \"" + group + "\"") - append_schema(doc, schemalistNode, base + "font_monospace_" + group, - "string", "monospace", "Monospace font", - "Monospaced font for \"" + group + "\"") - append_schema(doc, schemalistNode, base + "variable_font_size_" + group, - "int", "12", "Proportional font size", - "Variable width font size for \"" + group + "\"") - append_schema(doc, schemalistNode, base + "font_variable_" + group, - "string", "sans-serif", "Proportional font", - "Variable width font for \"" + group + "\"") - append_schema(doc, schemalistNode, base + "minimum_font_size_" + group, - "int", "7", "Minimum font size", - "Minimum font size for \"" + group + "\"") - - -# keep this list in sync with lib/ephy-langs.c -font_languages = [ - "ar", - "el", - "he", - "ja", - "ko", - "th", - "tr", - "x-armn", - "x-baltic", - "x-beng", - "x-cans", - "x-central-euro", - "x-cyrillic", - "x-devanagari", - "x-ethi", - "x-geor", - "x-gujr", - "x-guru", - "x-khmr", - "x-mlym", - "x-tamil", - "x-unicode", - "x-western", - "zh-CN", - "zh-HK", - "zh-TW" ] - -doc = dom.getDOMImplementation().createDocument(None, "gconfschemafile", None) - -schemalistNode = doc.createElement("schemalist") -doc.documentElement.appendChild(schemalistNode) - -for lang in font_languages: - append_schemas(doc, schemalistNode, lang) - -doc.writexml(sys.stdout) - -# Remember to pass the output through "xmllint --format" diff --git a/data/glade/prefs-dialog.glade b/data/glade/prefs-dialog.glade index 1b9fce8a7..95890b4eb 100644 --- a/data/glade/prefs-dialog.glade +++ b/data/glade/prefs-dialog.glade @@ -1324,7 +1324,7 @@ True - 2 + 1 2 False 6 @@ -1359,35 +1359,6 @@ - - - True - Au_todetect: - True - False - GTK_JUSTIFY_CENTER - False - False - 1 - 0.5 - 0 - 0 - auto_encoding_combo - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - True @@ -1402,21 +1373,6 @@ fill - - - - True - False - True - - - 1 - 2 - 1 - 2 - fill - - -- cgit v1.2.3