From 9e2be9211a54b0798769f000f3d3953522a84e0f Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Mon, 31 Jan 2011 01:17:36 +0000 Subject: [PATCH] Fixed copy & paste within the location bar --- po/de.po | 24 ++++++++++++------------ po/es.po | 24 ++++++++++++------------ po/fr.po | 24 ++++++++++++------------ po/it.po | 24 ++++++++++++------------ src/callbacks.c | 21 +++++++++++++++++++++ 5 files changed, 69 insertions(+), 48 deletions(-) diff --git a/po/de.po b/po/de.po index 6ed1510..b916929 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Browser 0.1.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-26 00:55+0100\n" +"POT-Creation-Date: 2011-01-31 02:17+0100\n" "PO-Revision-Date: 2010-03-29 23:28+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: English\n" @@ -267,8 +267,8 @@ msgstr "Aktualisierung..." msgid "New folder" msgstr "Neu Ordner" -#: ../src/callbacks.c:195 ../src/callbacks.c:201 ../src/callbacks.c:1029 -#: ../src/callbacks.c:1034 ../src/desktopicon.c:796 ../src/desktopicon.c:801 +#: ../src/callbacks.c:195 ../src/callbacks.c:201 ../src/callbacks.c:1050 +#: ../src/callbacks.c:1055 ../src/desktopicon.c:796 ../src/desktopicon.c:801 #: ../src/desktopicon.c:848 ../src/desktopicon.c:853 msgid "Warning" msgstr "Achtung" @@ -278,40 +278,40 @@ msgstr "Achtung" msgid "Are you sure you want to delete %lu file(s)?" msgstr "" -#: ../src/callbacks.c:760 +#: ../src/callbacks.c:781 msgid "New" msgstr "Neu" -#: ../src/callbacks.c:765 ../src/callbacks.c:769 ../src/desktop.c:334 +#: ../src/callbacks.c:786 ../src/callbacks.c:790 ../src/desktop.c:334 msgid "Folder" msgstr "Ordner" -#: ../src/callbacks.c:776 ../src/desktop.c:342 +#: ../src/callbacks.c:797 ../src/desktop.c:342 msgid "Symbolic link..." msgstr "" -#: ../src/callbacks.c:780 ../src/desktop.c:346 +#: ../src/callbacks.c:801 ../src/desktop.c:346 msgid "Text file" msgstr "" -#: ../src/callbacks.c:815 ../src/desktop.c:445 +#: ../src/callbacks.c:836 ../src/desktop.c:445 msgid "New text file.txt" msgstr "" -#: ../src/callbacks.c:862 +#: ../src/callbacks.c:883 msgid "Open in new _window" msgstr "Offnen in neue Fenster" -#: ../src/callbacks.c:890 +#: ../src/callbacks.c:911 msgid "_Unmount" msgstr "" -#: ../src/callbacks.c:925 ../src/desktopicon.c:693 ../src/view.c:100 +#: ../src/callbacks.c:946 ../src/desktopicon.c:693 ../src/view.c:100 #: ../src/view.c:111 msgid "Open _with..." msgstr "Offnen _mit..." -#: ../src/callbacks.c:1033 ../src/desktopicon.c:800 +#: ../src/callbacks.c:1054 ../src/desktopicon.c:800 msgid "Are you sure you want to execute this file?" msgstr "" diff --git a/po/es.po b/po/es.po index c5151b6..72673b9 100644 --- a/po/es.po +++ b/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Browser 0.1.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-26 00:55+0100\n" +"POT-Creation-Date: 2011-01-31 02:17+0100\n" "PO-Revision-Date: 2010-03-30 01:04+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: Spanish\n" @@ -267,8 +267,8 @@ msgstr "" msgid "New folder" msgstr "" -#: ../src/callbacks.c:195 ../src/callbacks.c:201 ../src/callbacks.c:1029 -#: ../src/callbacks.c:1034 ../src/desktopicon.c:796 ../src/desktopicon.c:801 +#: ../src/callbacks.c:195 ../src/callbacks.c:201 ../src/callbacks.c:1050 +#: ../src/callbacks.c:1055 ../src/desktopicon.c:796 ../src/desktopicon.c:801 #: ../src/desktopicon.c:848 ../src/desktopicon.c:853 msgid "Warning" msgstr "" @@ -278,40 +278,40 @@ msgstr "" msgid "Are you sure you want to delete %lu file(s)?" msgstr "" -#: ../src/callbacks.c:760 +#: ../src/callbacks.c:781 msgid "New" msgstr "" -#: ../src/callbacks.c:765 ../src/callbacks.c:769 ../src/desktop.c:334 +#: ../src/callbacks.c:786 ../src/callbacks.c:790 ../src/desktop.c:334 msgid "Folder" msgstr "" -#: ../src/callbacks.c:776 ../src/desktop.c:342 +#: ../src/callbacks.c:797 ../src/desktop.c:342 msgid "Symbolic link..." msgstr "" -#: ../src/callbacks.c:780 ../src/desktop.c:346 +#: ../src/callbacks.c:801 ../src/desktop.c:346 msgid "Text file" msgstr "" -#: ../src/callbacks.c:815 ../src/desktop.c:445 +#: ../src/callbacks.c:836 ../src/desktop.c:445 msgid "New text file.txt" msgstr "" -#: ../src/callbacks.c:862 +#: ../src/callbacks.c:883 msgid "Open in new _window" msgstr "" -#: ../src/callbacks.c:890 +#: ../src/callbacks.c:911 msgid "_Unmount" msgstr "" -#: ../src/callbacks.c:925 ../src/desktopicon.c:693 ../src/view.c:100 +#: ../src/callbacks.c:946 ../src/desktopicon.c:693 ../src/view.c:100 #: ../src/view.c:111 msgid "Open _with..." msgstr "" -#: ../src/callbacks.c:1033 ../src/desktopicon.c:800 +#: ../src/callbacks.c:1054 ../src/desktopicon.c:800 msgid "Are you sure you want to execute this file?" msgstr "" diff --git a/po/fr.po b/po/fr.po index 6b54875..e4a7185 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Browser 0.1.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-26 00:55+0100\n" +"POT-Creation-Date: 2011-01-31 02:17+0100\n" "PO-Revision-Date: 2010-03-29 23:28+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: French\n" @@ -267,8 +267,8 @@ msgstr "Actualisation du dossier..." msgid "New folder" msgstr "Nouveau dossier" -#: ../src/callbacks.c:195 ../src/callbacks.c:201 ../src/callbacks.c:1029 -#: ../src/callbacks.c:1034 ../src/desktopicon.c:796 ../src/desktopicon.c:801 +#: ../src/callbacks.c:195 ../src/callbacks.c:201 ../src/callbacks.c:1050 +#: ../src/callbacks.c:1055 ../src/desktopicon.c:796 ../src/desktopicon.c:801 #: ../src/desktopicon.c:848 ../src/desktopicon.c:853 msgid "Warning" msgstr "Avertissement" @@ -278,40 +278,40 @@ msgstr "Avertissement" msgid "Are you sure you want to delete %lu file(s)?" msgstr "Voulez-vous vraiment effacer %lu fichier(s)?" -#: ../src/callbacks.c:760 +#: ../src/callbacks.c:781 msgid "New" msgstr "Nouveau" -#: ../src/callbacks.c:765 ../src/callbacks.c:769 ../src/desktop.c:334 +#: ../src/callbacks.c:786 ../src/callbacks.c:790 ../src/desktop.c:334 msgid "Folder" msgstr "Dossier" -#: ../src/callbacks.c:776 ../src/desktop.c:342 +#: ../src/callbacks.c:797 ../src/desktop.c:342 msgid "Symbolic link..." msgstr "Lien symbolique..." -#: ../src/callbacks.c:780 ../src/desktop.c:346 +#: ../src/callbacks.c:801 ../src/desktop.c:346 msgid "Text file" msgstr "Fichier texte" -#: ../src/callbacks.c:815 ../src/desktop.c:445 +#: ../src/callbacks.c:836 ../src/desktop.c:445 msgid "New text file.txt" msgstr "Nouveau fichier texte.txt" -#: ../src/callbacks.c:862 +#: ../src/callbacks.c:883 msgid "Open in new _window" msgstr "Ouvrir dans une _nouvelle fenêtre" -#: ../src/callbacks.c:890 +#: ../src/callbacks.c:911 msgid "_Unmount" msgstr "Démonter" -#: ../src/callbacks.c:925 ../src/desktopicon.c:693 ../src/view.c:100 +#: ../src/callbacks.c:946 ../src/desktopicon.c:693 ../src/view.c:100 #: ../src/view.c:111 msgid "Open _with..." msgstr "Ouvrir _avec..." -#: ../src/callbacks.c:1033 ../src/desktopicon.c:800 +#: ../src/callbacks.c:1054 ../src/desktopicon.c:800 msgid "Are you sure you want to execute this file?" msgstr "Voulez-vous vraiment exécuter ce fichier ?" diff --git a/po/it.po b/po/it.po index 4f37a38..405f9c0 100644 --- a/po/it.po +++ b/po/it.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Browser 0.1.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-26 00:55+0100\n" +"POT-Creation-Date: 2011-01-31 02:17+0100\n" "PO-Revision-Date: 2010-04-07 23:18+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: Italian\n" @@ -267,8 +267,8 @@ msgstr "" msgid "New folder" msgstr "" -#: ../src/callbacks.c:195 ../src/callbacks.c:201 ../src/callbacks.c:1029 -#: ../src/callbacks.c:1034 ../src/desktopicon.c:796 ../src/desktopicon.c:801 +#: ../src/callbacks.c:195 ../src/callbacks.c:201 ../src/callbacks.c:1050 +#: ../src/callbacks.c:1055 ../src/desktopicon.c:796 ../src/desktopicon.c:801 #: ../src/desktopicon.c:848 ../src/desktopicon.c:853 msgid "Warning" msgstr "" @@ -278,40 +278,40 @@ msgstr "" msgid "Are you sure you want to delete %lu file(s)?" msgstr "" -#: ../src/callbacks.c:760 +#: ../src/callbacks.c:781 msgid "New" msgstr "" -#: ../src/callbacks.c:765 ../src/callbacks.c:769 ../src/desktop.c:334 +#: ../src/callbacks.c:786 ../src/callbacks.c:790 ../src/desktop.c:334 msgid "Folder" msgstr "" -#: ../src/callbacks.c:776 ../src/desktop.c:342 +#: ../src/callbacks.c:797 ../src/desktop.c:342 msgid "Symbolic link..." msgstr "" -#: ../src/callbacks.c:780 ../src/desktop.c:346 +#: ../src/callbacks.c:801 ../src/desktop.c:346 msgid "Text file" msgstr "" -#: ../src/callbacks.c:815 ../src/desktop.c:445 +#: ../src/callbacks.c:836 ../src/desktop.c:445 msgid "New text file.txt" msgstr "" -#: ../src/callbacks.c:862 +#: ../src/callbacks.c:883 msgid "Open in new _window" msgstr "" -#: ../src/callbacks.c:890 +#: ../src/callbacks.c:911 msgid "_Unmount" msgstr "" -#: ../src/callbacks.c:925 ../src/desktopicon.c:693 ../src/view.c:100 +#: ../src/callbacks.c:946 ../src/desktopicon.c:693 ../src/view.c:100 #: ../src/view.c:111 msgid "Open _with..." msgstr "" -#: ../src/callbacks.c:1033 ../src/desktopicon.c:800 +#: ../src/callbacks.c:1054 ../src/desktopicon.c:800 msgid "Are you sure you want to execute this file?" msgstr "" diff --git a/src/callbacks.c b/src/callbacks.c index dce5584..63a8b4a 100644 --- a/src/callbacks.c +++ b/src/callbacks.c @@ -321,7 +321,14 @@ void on_back(gpointer data) void on_copy(gpointer data) { Browser * browser = data; + GtkWidget * entry; + entry = gtk_bin_get_child(GTK_BIN(browser->tb_path)); + if(gtk_window_get_focus(GTK_WINDOW(browser->window)) == entry) + { + gtk_editable_copy_clipboard(GTK_EDITABLE(entry)); + return; + } g_list_foreach(browser->selection, (GFunc)free, NULL); g_list_free(browser->selection); browser->selection = _copy_selection(browser); @@ -333,7 +340,14 @@ void on_copy(gpointer data) void on_cut(gpointer data) { Browser * browser = data; + GtkWidget * entry; + entry = gtk_bin_get_child(GTK_BIN(browser->tb_path)); + if(gtk_window_get_focus(GTK_WINDOW(browser->window)) == entry) + { + gtk_editable_cut_clipboard(GTK_EDITABLE(entry)); + return; + } g_list_foreach(browser->selection, (GFunc)free, NULL); g_list_free(browser->selection); browser->selection = _copy_selection(browser); @@ -369,8 +383,15 @@ void on_home(gpointer data) void on_paste(gpointer data) { Browser * browser = data; + GtkWidget * entry; char * p = browser->current->data; + entry = gtk_bin_get_child(GTK_BIN(browser->tb_path)); + if(gtk_window_get_focus(GTK_WINDOW(browser->window)) == entry) + { + gtk_editable_paste_clipboard(GTK_EDITABLE(entry)); + return; + } if(browser->selection == NULL) return; browser->selection = g_list_append(browser->selection, p);