Hidetaka Iwai
tyuyu****@sings*****
2004年 3月 2日 (火) 01:53:56 JST
岩井＠札幌です。 0.1.3からロケーションエントリで、http等で始まらない入力は検索語として google検索するようになりましたが、設定で以前のようにhttp://として開け るよう選択できるパッチを作成しましたので、添付します。 (参考: http://pc.2ch.net/test/read.cgi/linux/1074000711/806) # どの項目に突っ込むか迷ったのですが、結局一般に... -- Hidetaka Iwai tyuyu****@sings***** -------------- next part -------------- diff -urN kazehakase/po/ja.po kazehakase.entry/po/ja.po --- kazehakase/po/ja.po 2004-03-02 00:27:24.000000000 +0900 +++ kazehakase.entry/po/ja.po 2004-03-02 01:10:18.000000000 +0900 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: kazehakase 0.0.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-02-28 22:52+0900\n" -"PO-Revision-Date: 2003-10-24 21:24+0900\n" +"POT-Creation-Date: 2004-03-02 01:05+0900\n" +"PO-Revision-Date: 2004-03-02 01:10+0900\n" "Last-Translator: Takuro Ashie <ashie****@homa*****>\n" "Language-Team: Takuro Ashie <ashie****@homa*****>\n" "MIME-Version: 1.0\n" @@ -569,15 +569,15 @@ msgid "Sidebar _Right" msgstr "????????????????(_R)" -#: src/actions/kz-actions.c:1265 src/prefs_ui/prefs_general.c:70 +#: src/actions/kz-actions.c:1265 src/prefs_ui/prefs_general.c:71 msgid "Beginner" msgstr "????? -#: src/actions/kz-actions.c:1266 src/prefs_ui/prefs_general.c:71 +#: src/actions/kz-actions.c:1266 src/prefs_ui/prefs_general.c:72 msgid "Medium" msgstr "?????? -#: src/actions/kz-actions.c:1267 src/prefs_ui/prefs_general.c:72 +#: src/actions/kz-actions.c:1267 src/prefs_ui/prefs_general.c:73 msgid "Expert" msgstr "??g?? @@ -993,18 +993,18 @@ msgid "/General" msgstr "/???¬" -#: src/prefs_ui/prefs_general.c:160 +#: src/prefs_ui/prefs_general.c:161 msgid "General" msgstr "???¬" #. #. * Start Page #. -#: src/prefs_ui/prefs_general.c:168 +#: src/prefs_ui/prefs_general.c:169 msgid "Start page" msgstr "?????????" -#: src/prefs_ui/prefs_general.c:185 +#: src/prefs_ui/prefs_general.c:186 msgid "" "If you want to set \"Home page\", please click right button of mouse on " "\"Home\" button of main window." @@ -1012,57 +1012,61 @@ "?у????????????????????茵у???????????????????????????????у??????????????" "?§?????????????????????????????????????? -#: src/prefs_ui/prefs_general.c:198 +#: src/prefs_ui/prefs_general.c:199 msgid "_Location: " msgstr "?????(_L): " -#: src/prefs_ui/prefs_general.c:227 +#: src/prefs_ui/prefs_general.c:228 msgid "Cu_rrent page" msgstr "???????????(_R)" -#: src/prefs_ui/prefs_general.c:239 +#: src/prefs_ui/prefs_general.c:240 msgid "_Blank page" msgstr "??????????(_B)" #. #. * User agent #. -#: src/prefs_ui/prefs_general.c:250 +#: src/prefs_ui/prefs_general.c:251 #, fuzzy msgid "User agent" msgstr "User-agent(_U):" -#: src/prefs_ui/prefs_general.c:261 +#: src/prefs_ui/prefs_general.c:262 msgid "Ove_rride user agent" msgstr "" -#: src/prefs_ui/prefs_general.c:275 +#: src/prefs_ui/prefs_general.c:276 msgid "_User-agent: " msgstr "User-agent(_U):" #. #. * Bookmark menu #. -#: src/prefs_ui/prefs_general.c:294 +#: src/prefs_ui/prefs_general.c:295 msgid "Bookmark menu" msgstr "????????????????????" -#: src/prefs_ui/prefs_general.c:307 +#: src/prefs_ui/prefs_general.c:308 msgid "Keep menu _open by middle click" msgstr "???????????????????????????????????(_O)" #. #. * Entry Box behaviour #. -#: src/prefs_ui/prefs_general.c:319 +#: src/prefs_ui/prefs_general.c:320 msgid "Location entry and google entry" msgstr "?????????§???¨???????¨Google????¨??????" -#: src/prefs_ui/prefs_general.c:330 +#: src/prefs_ui/prefs_general.c:331 msgid "Open in _new tab by default" msgstr "???????????§????????????(_N)" -#: src/prefs_ui/prefs_general.c:352 +#: src/prefs_ui/prefs_general.c:340 +msgid "Open anything as _URI" +msgstr "?????§??URI?¨???????" + +#: src/prefs_ui/prefs_general.c:362 msgid "_UI Level: " msgstr "UI??????(_U): " diff -urN kazehakase/src/actions/kz-location-entry-action.c kazehakase.entry/src/actions/kz-location-entry-action.c --- kazehakase/src/actions/kz-location-entry-action.c 2004-03-02 00:27:25.000000000 +0900 +++ kazehakase.entry/src/actions/kz-location-entry-action.c 2004-03-02 00:55:27.000000000 +0900 @@ -412,8 +412,13 @@ get_modified_uri(const gchar *uri) { gchar *modified_uri; + gboolean asuri; - if (g_str_has_prefix(uri, "http://") || + KZ_CONF_GET("Global", "entry_open_anything_as_uri", asuri, BOOL); + + + if (asuri || + g_str_has_prefix(uri, "http://") || g_str_has_prefix(uri, "https://") || g_str_has_prefix(uri, "ftp://") || g_str_has_prefix(uri, "file://")) diff -urN kazehakase/src/prefs_ui/prefs_general.c kazehakase.entry/src/prefs_ui/prefs_general.c --- kazehakase/src/prefs_ui/prefs_general.c 2004-03-02 00:27:25.000000000 +0900 +++ kazehakase.entry/src/prefs_ui/prefs_general.c 2004-03-02 00:54:26.000000000 +0900 @@ -55,6 +55,7 @@ GtkWidget *keep_bookmark_menu_frame; GtkWidget *keep_bookmark_menu_vbox; GtkWidget *open_in_new_tab; + GtkWidget *open_anything_as_uri; GtkOptionMenu *ui_menu; gboolean changed; } KzPrefsGeneral; @@ -146,7 +147,7 @@ GtkWidget *label, *entry, *button; GtkWidget *option_menu, *menu, *check; gchar *value; - gboolean keep = FALSE, newtab = FALSE; + gboolean keep = FALSE, newtab = FALSE, asurl = FALSE; #if 0 GtkWidget *check; gboolean override = FALSE; @@ -336,6 +337,15 @@ G_CALLBACK(cb_changed), prefsui); gtk_widget_show(check); + check = gtk_check_button_new_with_mnemonic(_("Open anything as _URI")); + prefsui->open_anything_as_uri = check; + gtk_box_pack_start(GTK_BOX(vbox), check, FALSE, FALSE, 2); + KZ_CONF_GET("Global", "entry_open_anything_as_uri", asurl, BOOL); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check), asurl); + g_signal_connect(G_OBJECT(check), "toggled", + G_CALLBACK(cb_changed), prefsui); + gtk_widget_show(check); + /* * UI Level */ @@ -388,7 +398,7 @@ case GTK_RESPONSE_APPLY: { const gchar *value; - gboolean keep, newtab; + gboolean keep, newtab, asuri; #if 0 gboolean override; #endif @@ -425,6 +435,11 @@ (GTK_TOGGLE_BUTTON(prefsui->open_in_new_tab)); KZ_CONF_SET("Global", "entry_open_in_new_tab", newtab, BOOL); + /* entry box behaviour */ + asuri = gtk_toggle_button_get_active + (GTK_TOGGLE_BUTTON(prefsui->open_anything_as_uri)); + KZ_CONF_SET("Global", "entry_open_anything_as_uri", asuri, BOOL); + /* UI level */ if (prefsui->changed) {
