From 4bd830472347f98430c16dd4d861019273dc32ab Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Wed, 21 Mar 2012 01:55:11 +0000 Subject: [PATCH] Restore the search history functionality with Gtk+ < 2.24 --- po/de.po | 48 ++++++++++++++++++++++++------------------------ po/es.po | 48 ++++++++++++++++++++++++------------------------ po/fr.po | 48 ++++++++++++++++++++++++------------------------ po/it.po | 48 ++++++++++++++++++++++++------------------------ src/editor.c | 5 +++-- 5 files changed, 99 insertions(+), 98 deletions(-) diff --git a/po/de.po b/po/de.po index 650e7f6..41b7dde 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Editor 0.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-24 23:00-0500\n" +"POT-Creation-Date: 2012-03-21 02:54+0100\n" "PO-Revision-Date: 2010-04-07 22:05+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: German\n" @@ -152,94 +152,94 @@ msgstr "" msgid "Find:" msgstr "Suchen:" -#: ../src/editor.c:283 +#: ../src/editor.c:289 msgid "Case-sensitive" msgstr "" -#: ../src/editor.c:285 +#: ../src/editor.c:291 msgid "Wrap" msgstr "" -#: ../src/editor.c:319 +#: ../src/editor.c:325 msgid "Text editor - " msgstr "" -#: ../src/editor.c:320 +#: ../src/editor.c:326 msgid "(Untitled)" msgstr "(Unbenannt)" -#: ../src/editor.c:433 +#: ../src/editor.c:439 msgid "translator-credits" msgstr "Pierre Pronchery " -#: ../src/editor.c:469 +#: ../src/editor.c:475 msgid "Could not save configuration" msgstr "" -#: ../src/editor.c:486 ../src/editor.c:495 ../src/editor.c:853 -#: ../src/editor.c:858 +#: ../src/editor.c:492 ../src/editor.c:501 ../src/editor.c:859 +#: ../src/editor.c:864 msgid "Question" msgstr "" -#: ../src/editor.c:511 ../src/editor.c:515 +#: ../src/editor.c:517 ../src/editor.c:521 msgid "Error" msgstr "Fehler" -#: ../src/editor.c:537 ../src/editor.c:690 +#: ../src/editor.c:543 ../src/editor.c:696 msgid "" "There are unsaved changes.\n" "Discard or save them?" msgstr "" -#: ../src/editor.c:648 +#: ../src/editor.c:654 msgid "Insert file..." msgstr "Datei einfügen..." -#: ../src/editor.c:654 ../src/editor.c:767 +#: ../src/editor.c:660 ../src/editor.c:773 msgid "Text files" msgstr "Text Dateien" -#: ../src/editor.c:658 ../src/editor.c:771 +#: ../src/editor.c:664 ../src/editor.c:777 msgid "All files" msgstr "Alle Dateien" -#: ../src/editor.c:696 +#: ../src/editor.c:702 msgid "Discard" msgstr "Löschen" -#: ../src/editor.c:761 +#: ../src/editor.c:767 msgid "Open file..." msgstr "Offnen..." -#: ../src/editor.c:829 +#: ../src/editor.c:835 msgid "Partial write" msgstr "" -#: ../src/editor.c:857 +#: ../src/editor.c:863 msgid "This file already exists. Overwrite?" msgstr "" -#: ../src/editor.c:866 +#: ../src/editor.c:872 msgid "Allocation error" msgstr "" -#: ../src/editor.c:881 +#: ../src/editor.c:887 msgid "Save as..." msgstr "" -#: ../src/editor.c:938 +#: ../src/editor.c:944 msgid "Text editor preferences" msgstr "Text Editor Einstellungen" -#: ../src/editor.c:955 +#: ../src/editor.c:961 msgid "Font:" msgstr "" -#: ../src/editor.c:965 +#: ../src/editor.c:971 msgid "Wrap mode:" msgstr "" -#: ../src/editor.c:1176 +#: ../src/editor.c:1182 msgid "Text not found" msgstr "" diff --git a/po/es.po b/po/es.po index ea3f35d..67aafd5 100644 --- a/po/es.po +++ b/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Editor 0.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-24 23:00-0500\n" +"POT-Creation-Date: 2012-03-21 02:54+0100\n" "PO-Revision-Date: 2010-04-07 22:07+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: Spanish\n" @@ -152,94 +152,94 @@ msgstr "" msgid "Find:" msgstr "" -#: ../src/editor.c:283 +#: ../src/editor.c:289 msgid "Case-sensitive" msgstr "" -#: ../src/editor.c:285 +#: ../src/editor.c:291 msgid "Wrap" msgstr "" -#: ../src/editor.c:319 +#: ../src/editor.c:325 msgid "Text editor - " msgstr "" -#: ../src/editor.c:320 +#: ../src/editor.c:326 msgid "(Untitled)" msgstr "" -#: ../src/editor.c:433 +#: ../src/editor.c:439 msgid "translator-credits" msgstr "" -#: ../src/editor.c:469 +#: ../src/editor.c:475 msgid "Could not save configuration" msgstr "" -#: ../src/editor.c:486 ../src/editor.c:495 ../src/editor.c:853 -#: ../src/editor.c:858 +#: ../src/editor.c:492 ../src/editor.c:501 ../src/editor.c:859 +#: ../src/editor.c:864 msgid "Question" msgstr "" -#: ../src/editor.c:511 ../src/editor.c:515 +#: ../src/editor.c:517 ../src/editor.c:521 msgid "Error" msgstr "" -#: ../src/editor.c:537 ../src/editor.c:690 +#: ../src/editor.c:543 ../src/editor.c:696 msgid "" "There are unsaved changes.\n" "Discard or save them?" msgstr "" -#: ../src/editor.c:648 +#: ../src/editor.c:654 msgid "Insert file..." msgstr "" -#: ../src/editor.c:654 ../src/editor.c:767 +#: ../src/editor.c:660 ../src/editor.c:773 msgid "Text files" msgstr "" -#: ../src/editor.c:658 ../src/editor.c:771 +#: ../src/editor.c:664 ../src/editor.c:777 msgid "All files" msgstr "" -#: ../src/editor.c:696 +#: ../src/editor.c:702 msgid "Discard" msgstr "" -#: ../src/editor.c:761 +#: ../src/editor.c:767 msgid "Open file..." msgstr "" -#: ../src/editor.c:829 +#: ../src/editor.c:835 msgid "Partial write" msgstr "" -#: ../src/editor.c:857 +#: ../src/editor.c:863 msgid "This file already exists. Overwrite?" msgstr "" -#: ../src/editor.c:866 +#: ../src/editor.c:872 msgid "Allocation error" msgstr "" -#: ../src/editor.c:881 +#: ../src/editor.c:887 msgid "Save as..." msgstr "" -#: ../src/editor.c:938 +#: ../src/editor.c:944 msgid "Text editor preferences" msgstr "" -#: ../src/editor.c:955 +#: ../src/editor.c:961 msgid "Font:" msgstr "" -#: ../src/editor.c:965 +#: ../src/editor.c:971 msgid "Wrap mode:" msgstr "" -#: ../src/editor.c:1176 +#: ../src/editor.c:1182 msgid "Text not found" msgstr "" diff --git a/po/fr.po b/po/fr.po index 53eee8d..fb53e99 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Editor 0.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-24 23:00-0500\n" +"POT-Creation-Date: 2012-03-21 02:54+0100\n" "PO-Revision-Date: 2010-04-11 12:32+0200\n" "Last-Translator: Calimero \n" "Language-Team: French\n" @@ -152,42 +152,42 @@ msgstr "mots puis caractères" msgid "Find:" msgstr "Chercher :" -#: ../src/editor.c:283 +#: ../src/editor.c:289 msgid "Case-sensitive" msgstr "Sensible à la casse" -#: ../src/editor.c:285 +#: ../src/editor.c:291 msgid "Wrap" msgstr "Boucler" -#: ../src/editor.c:319 +#: ../src/editor.c:325 msgid "Text editor - " msgstr "Éditeur de texte - " -#: ../src/editor.c:320 +#: ../src/editor.c:326 msgid "(Untitled)" msgstr "(Sans titre)" -#: ../src/editor.c:433 +#: ../src/editor.c:439 msgid "translator-credits" msgstr "" "Calimero \n" "Pierre Pronchery " -#: ../src/editor.c:469 +#: ../src/editor.c:475 msgid "Could not save configuration" msgstr "Erreur lors de la sauvegarde de la configuration" -#: ../src/editor.c:486 ../src/editor.c:495 ../src/editor.c:853 -#: ../src/editor.c:858 +#: ../src/editor.c:492 ../src/editor.c:501 ../src/editor.c:859 +#: ../src/editor.c:864 msgid "Question" msgstr "Question" -#: ../src/editor.c:511 ../src/editor.c:515 +#: ../src/editor.c:517 ../src/editor.c:521 msgid "Error" msgstr "Erreur" -#: ../src/editor.c:537 ../src/editor.c:690 +#: ../src/editor.c:543 ../src/editor.c:696 msgid "" "There are unsaved changes.\n" "Discard or save them?" @@ -195,55 +195,55 @@ msgstr "" "Il y a des changements non enregistrés.\n" "Abandonner ou enregistrer ?" -#: ../src/editor.c:648 +#: ../src/editor.c:654 msgid "Insert file..." msgstr "Insérer un fichier..." -#: ../src/editor.c:654 ../src/editor.c:767 +#: ../src/editor.c:660 ../src/editor.c:773 msgid "Text files" msgstr "Fichiers texte" -#: ../src/editor.c:658 ../src/editor.c:771 +#: ../src/editor.c:664 ../src/editor.c:777 msgid "All files" msgstr "Tous les fichiers" -#: ../src/editor.c:696 +#: ../src/editor.c:702 msgid "Discard" msgstr "Annuler" -#: ../src/editor.c:761 +#: ../src/editor.c:767 msgid "Open file..." msgstr "Ouvrir un fichier..." -#: ../src/editor.c:829 +#: ../src/editor.c:835 msgid "Partial write" msgstr "Écriture partielle" -#: ../src/editor.c:857 +#: ../src/editor.c:863 msgid "This file already exists. Overwrite?" msgstr "Le fichier existe déjà. L'écraser ?" -#: ../src/editor.c:866 +#: ../src/editor.c:872 msgid "Allocation error" msgstr "Erreur d'allocation" -#: ../src/editor.c:881 +#: ../src/editor.c:887 msgid "Save as..." msgstr "Enregistrer sous..." -#: ../src/editor.c:938 +#: ../src/editor.c:944 msgid "Text editor preferences" msgstr "Préférences de l'éditeur de texte" -#: ../src/editor.c:955 +#: ../src/editor.c:961 msgid "Font:" msgstr "Police :" -#: ../src/editor.c:965 +#: ../src/editor.c:971 msgid "Wrap mode:" msgstr "Retour à la ligne :" -#: ../src/editor.c:1176 +#: ../src/editor.c:1182 msgid "Text not found" msgstr "Texte non trouvé" diff --git a/po/it.po b/po/it.po index f0d5d2e..59b90ed 100644 --- a/po/it.po +++ b/po/it.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Editor 0.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-24 23:00-0500\n" +"POT-Creation-Date: 2012-03-21 02:54+0100\n" "PO-Revision-Date: 2010-04-09 16:43+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: Italian\n" @@ -153,94 +153,94 @@ msgstr "" msgid "Find:" msgstr "" -#: ../src/editor.c:283 +#: ../src/editor.c:289 msgid "Case-sensitive" msgstr "" -#: ../src/editor.c:285 +#: ../src/editor.c:291 msgid "Wrap" msgstr "" -#: ../src/editor.c:319 +#: ../src/editor.c:325 msgid "Text editor - " msgstr "" -#: ../src/editor.c:320 +#: ../src/editor.c:326 msgid "(Untitled)" msgstr "" -#: ../src/editor.c:433 +#: ../src/editor.c:439 msgid "translator-credits" msgstr "" -#: ../src/editor.c:469 +#: ../src/editor.c:475 msgid "Could not save configuration" msgstr "" -#: ../src/editor.c:486 ../src/editor.c:495 ../src/editor.c:853 -#: ../src/editor.c:858 +#: ../src/editor.c:492 ../src/editor.c:501 ../src/editor.c:859 +#: ../src/editor.c:864 msgid "Question" msgstr "" -#: ../src/editor.c:511 ../src/editor.c:515 +#: ../src/editor.c:517 ../src/editor.c:521 msgid "Error" msgstr "" -#: ../src/editor.c:537 ../src/editor.c:690 +#: ../src/editor.c:543 ../src/editor.c:696 msgid "" "There are unsaved changes.\n" "Discard or save them?" msgstr "" -#: ../src/editor.c:648 +#: ../src/editor.c:654 msgid "Insert file..." msgstr "" -#: ../src/editor.c:654 ../src/editor.c:767 +#: ../src/editor.c:660 ../src/editor.c:773 msgid "Text files" msgstr "" -#: ../src/editor.c:658 ../src/editor.c:771 +#: ../src/editor.c:664 ../src/editor.c:777 msgid "All files" msgstr "" -#: ../src/editor.c:696 +#: ../src/editor.c:702 msgid "Discard" msgstr "" -#: ../src/editor.c:761 +#: ../src/editor.c:767 msgid "Open file..." msgstr "" -#: ../src/editor.c:829 +#: ../src/editor.c:835 msgid "Partial write" msgstr "" -#: ../src/editor.c:857 +#: ../src/editor.c:863 msgid "This file already exists. Overwrite?" msgstr "" -#: ../src/editor.c:866 +#: ../src/editor.c:872 msgid "Allocation error" msgstr "" -#: ../src/editor.c:881 +#: ../src/editor.c:887 msgid "Save as..." msgstr "" -#: ../src/editor.c:938 +#: ../src/editor.c:944 msgid "Text editor preferences" msgstr "" -#: ../src/editor.c:955 +#: ../src/editor.c:961 msgid "Font:" msgstr "" -#: ../src/editor.c:965 +#: ../src/editor.c:971 msgid "Wrap mode:" msgstr "" -#: ../src/editor.c:1176 +#: ../src/editor.c:1182 msgid "Text not found" msgstr "" diff --git a/src/editor.c b/src/editor.c index 5e07f07..c8a018a 100644 --- a/src/editor.c +++ b/src/editor.c @@ -279,9 +279,10 @@ Editor * editor_new(void) editor->fi_entry = gtk_bin_get_child(GTK_BIN(editor->fi_text)); gtk_combo_box_set_entry_text_column(GTK_COMBO_BOX(editor->fi_text), 0); #else - editor->fi_text = gtk_entry_new(); - editor->fi_entry = editor->fi_text; + editor->fi_text = gtk_combo_box_entry_new_with_model(GTK_TREE_MODEL( + editor->fi_store), 0); #endif + editor->fi_entry = gtk_bin_get_child(GTK_BIN(editor->fi_text)); g_signal_connect_swapped(editor->fi_entry, "activate", G_CALLBACK( _editor_on_find_clicked), editor); gtk_box_pack_start(GTK_BOX(hbox), editor->fi_text, FALSE, TRUE, 0);