debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add Korean encoding to the available of character encodings

Browse source
This commit is contained in:
Woo Youngho 2009-10-31 22:51:35 +01:00 committed by Christian Dywan
parent 6f69a04905
commit 657822c15c
4 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
midori/midori-browser.c
View file

@ -3213,6 +3213,8 @@ _action_view_encoding_activate (GtkAction* action,
encoding = "BIG5"; encoding = "BIG5";
else if (!strcmp (name, "EncodingJapanese")) else if (!strcmp (name, "EncodingJapanese"))
encoding = "SHIFT_JIS"; encoding = "SHIFT_JIS";
else if (!strcmp (name, "EncodingKorean"))
encoding = "EUC-KR";
else if (!strcmp (name, "EncodingRussian")) else if (!strcmp (name, "EncodingRussian"))
encoding = "KOI8-R"; encoding = "KOI8-R";
else if (!strcmp (name, "EncodingUnicode")) else if (!strcmp (name, "EncodingUnicode"))
@ -4817,6 +4819,9 @@ static const GtkRadioActionEntry encoding_entries[] = {
/* i18n: A double underscore "__" is used to prevent an unwanted mnemonic */ /* i18n: A double underscore "__" is used to prevent an unwanted mnemonic */
N_("Japanese (SHIFT__JIS)"), "", N_("Japanese (SHIFT__JIS)"), "",
NULL, 1 }, NULL, 1 },
{ "EncodingKorean", NULL,
N_("Korean (EUC-KR)"), "",
NULL, 1 },
{ "EncodingRussian", NULL, { "EncodingRussian", NULL,
N_("Russian (KOI8-R)"), "", N_("Russian (KOI8-R)"), "",
NULL, 1 }, NULL, 1 },
@ -4983,6 +4988,7 @@ static const gchar* ui_markup =
"<menuitem action='EncodingAutomatic'/>" "<menuitem action='EncodingAutomatic'/>"
"<menuitem action='EncodingChinese'/>" "<menuitem action='EncodingChinese'/>"
"<menuitem action='EncodingJapanese'/>" "<menuitem action='EncodingJapanese'/>"
"<menuitem action='EncodingKorean'/>"
"<menuitem action='EncodingRussian'/>" "<menuitem action='EncodingRussian'/>"
"<menuitem action='EncodingUnicode'/>" "<menuitem action='EncodingUnicode'/>"
"<menuitem action='EncodingWestern'/>" "<menuitem action='EncodingWestern'/>"

1
midori/midori-view.c
View file

@ -1975,6 +1975,7 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view,
{ "EncodingAutomatic" }, { "EncodingAutomatic" },
{ "EncodingChinese" }, { "EncodingChinese" },
{ "EncodingJapanese" }, { "EncodingJapanese" },
{ "EncodingKorean" },
{ "EncodingRussian" }, { "EncodingRussian" },
{ "EncodingUnicode" }, { "EncodingUnicode" },
{ "EncodingWestern" }, { "EncodingWestern" },

6
midori/midori-websettings.c
View file

@ -211,6 +211,7 @@ midori_preferred_encoding_get_type (void)
static const GEnumValue values[] = { static const GEnumValue values[] = {
{ MIDORI_ENCODING_CHINESE, "MIDORI_ENCODING_CHINESE", N_("Chinese (BIG5)") }, { MIDORI_ENCODING_CHINESE, "MIDORI_ENCODING_CHINESE", N_("Chinese (BIG5)") },
{ MIDORI_ENCODING_JAPANESE, "MIDORI_ENCODING_JAPANESE", N_("Japanese (SHIFT_JIS)") }, { MIDORI_ENCODING_JAPANESE, "MIDORI_ENCODING_JAPANESE", N_("Japanese (SHIFT_JIS)") },
{ MIDORI_ENCODING_KOREAN, "MIDORI_ENCODING_KOREAN", N_("Korean (EUC-KR)") },
{ MIDORI_ENCODING_RUSSIAN, "MIDORI_ENCODING_RUSSIAN", N_("Russian (KOI8-R)") }, { MIDORI_ENCODING_RUSSIAN, "MIDORI_ENCODING_RUSSIAN", N_("Russian (KOI8-R)") },
{ MIDORI_ENCODING_UNICODE, "MIDORI_ENCODING_UNICODE", N_("Unicode (UTF-8)") }, { MIDORI_ENCODING_UNICODE, "MIDORI_ENCODING_UNICODE", N_("Unicode (UTF-8)") },
{ MIDORI_ENCODING_WESTERN, "MIDORI_ENCODING_WESTERN", N_("Western (ISO-8859-1)") }, { MIDORI_ENCODING_WESTERN, "MIDORI_ENCODING_WESTERN", N_("Western (ISO-8859-1)") },
@ -1011,6 +1012,8 @@ notify_default_encoding_cb (GObject* object,
web_settings->preferred_encoding = MIDORI_ENCODING_CHINESE; web_settings->preferred_encoding = MIDORI_ENCODING_CHINESE;
else if (!strcmp (encoding, "SHIFT_JIS")) else if (!strcmp (encoding, "SHIFT_JIS"))
web_settings->preferred_encoding = MIDORI_ENCODING_JAPANESE; web_settings->preferred_encoding = MIDORI_ENCODING_JAPANESE;
else if (!strcmp (encoding, "EUC-KR"))
web_settings->preferred_encoding = MIDORI_ENCODING_KOREAN;
else if (!strcmp (encoding, "KOI8-R")) else if (!strcmp (encoding, "KOI8-R"))
web_settings->preferred_encoding = MIDORI_ENCODING_RUSSIAN; web_settings->preferred_encoding = MIDORI_ENCODING_RUSSIAN;
else if (!strcmp (encoding, "UTF-8")) else if (!strcmp (encoding, "UTF-8"))
@ -1266,6 +1269,9 @@ midori_web_settings_set_property (GObject* object,
case MIDORI_ENCODING_JAPANESE: case MIDORI_ENCODING_JAPANESE:
g_object_set (object, "default-encoding", "SHIFT_JIS", NULL); g_object_set (object, "default-encoding", "SHIFT_JIS", NULL);
break; break;
case MIDORI_ENCODING_KOREAN:
g_object_set (object, "default-encoding", "EUC-KR", NULL);
break;
case MIDORI_ENCODING_RUSSIAN: case MIDORI_ENCODING_RUSSIAN:
g_object_set (object, "default-encoding", "KOI8-R", NULL); g_object_set (object, "default-encoding", "KOI8-R", NULL);
break; break;

1
midori/midori-websettings.h
View file

@ -76,6 +76,7 @@ typedef enum
{ {
MIDORI_ENCODING_CHINESE, MIDORI_ENCODING_CHINESE,
MIDORI_ENCODING_JAPANESE, MIDORI_ENCODING_JAPANESE,
MIDORI_ENCODING_KOREAN,
MIDORI_ENCODING_RUSSIAN, MIDORI_ENCODING_RUSSIAN,
MIDORI_ENCODING_UNICODE, MIDORI_ENCODING_UNICODE,
MIDORI_ENCODING_WESTERN, MIDORI_ENCODING_WESTERN,