DeforaOS/Browser
DeforaOS/Browser
2
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

Fixed copy & paste within the location bar

Browse Source
This commit is contained in:
Pierre Pronchery 2011-01-31 01:17:36 +00:00
parent 0d9e14022f
commit 9e2be9211a
5 changed files with 69 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
po/de.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Browser 0.1.4\n" "Project-Id-Version: Browser 0.1.4\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: 2010-03-29 23:28+0200\n"
"Last-Translator: Pierre Pronchery <khorben@defora.org>\n" "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
"Language-Team: English\n" "Language-Team: English\n"
@ -267,8 +267,8 @@ msgstr "Aktualisierung..."
msgid "New folder" msgid "New folder"
msgstr "Neu Ordner" msgstr "Neu Ordner"
#: ../src/callbacks.c:195 ../src/callbacks.c:201 ../src/callbacks.c:1029 #: ../src/callbacks.c:195 ../src/callbacks.c:201 ../src/callbacks.c:1050
#: ../src/callbacks.c:1034 ../src/desktopicon.c:796 ../src/desktopicon.c:801 #: ../src/callbacks.c:1055 ../src/desktopicon.c:796 ../src/desktopicon.c:801
#: ../src/desktopicon.c:848 ../src/desktopicon.c:853 #: ../src/desktopicon.c:848 ../src/desktopicon.c:853
msgid "Warning" msgid "Warning"
msgstr "Achtung" msgstr "Achtung"
@ -278,40 +278,40 @@ msgstr "Achtung"
msgid "Are you sure you want to delete %lu file(s)?" msgid "Are you sure you want to delete %lu file(s)?"
msgstr "" msgstr ""
#: ../src/callbacks.c:760 #: ../src/callbacks.c:781
msgid "New" msgid "New"
msgstr "Neu" 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" msgid "Folder"
msgstr "Ordner" msgstr "Ordner"
#: ../src/callbacks.c:776 ../src/desktop.c:342 #: ../src/callbacks.c:797 ../src/desktop.c:342
msgid "Symbolic link..." msgid "Symbolic link..."
msgstr "" msgstr ""
#: ../src/callbacks.c:780 ../src/desktop.c:346 #: ../src/callbacks.c:801 ../src/desktop.c:346
msgid "Text file" msgid "Text file"
msgstr "" msgstr ""
#: ../src/callbacks.c:815 ../src/desktop.c:445 #: ../src/callbacks.c:836 ../src/desktop.c:445
msgid "New text file.txt" msgid "New text file.txt"
msgstr "" msgstr ""
#: ../src/callbacks.c:862 #: ../src/callbacks.c:883
msgid "Open in new _window" msgid "Open in new _window"
msgstr "Offnen in neue Fenster" msgstr "Offnen in neue Fenster"
#: ../src/callbacks.c:890 #: ../src/callbacks.c:911
msgid "_Unmount" msgid "_Unmount"
msgstr "" 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 #: ../src/view.c:111
msgid "Open _with..." msgid "Open _with..."
msgstr "Offnen _mit..." 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?" msgid "Are you sure you want to execute this file?"
msgstr "" msgstr ""

24
po/es.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Browser 0.1.4\n" "Project-Id-Version: Browser 0.1.4\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: 2010-03-30 01:04+0200\n"
"Last-Translator: Pierre Pronchery <khorben@defora.org>\n" "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
"Language-Team: Spanish\n" "Language-Team: Spanish\n"
@ -267,8 +267,8 @@ msgstr ""
msgid "New folder" msgid "New folder"
msgstr "" msgstr ""
#: ../src/callbacks.c:195 ../src/callbacks.c:201 ../src/callbacks.c:1029 #: ../src/callbacks.c:195 ../src/callbacks.c:201 ../src/callbacks.c:1050
#: ../src/callbacks.c:1034 ../src/desktopicon.c:796 ../src/desktopicon.c:801 #: ../src/callbacks.c:1055 ../src/desktopicon.c:796 ../src/desktopicon.c:801
#: ../src/desktopicon.c:848 ../src/desktopicon.c:853 #: ../src/desktopicon.c:848 ../src/desktopicon.c:853
msgid "Warning" msgid "Warning"
msgstr "" msgstr ""
@ -278,40 +278,40 @@ msgstr ""
msgid "Are you sure you want to delete %lu file(s)?" msgid "Are you sure you want to delete %lu file(s)?"
msgstr "" msgstr ""
#: ../src/callbacks.c:760 #: ../src/callbacks.c:781
msgid "New" msgid "New"
msgstr "" 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" msgid "Folder"
msgstr "" msgstr ""
#: ../src/callbacks.c:776 ../src/desktop.c:342 #: ../src/callbacks.c:797 ../src/desktop.c:342
msgid "Symbolic link..." msgid "Symbolic link..."
msgstr "" msgstr ""
#: ../src/callbacks.c:780 ../src/desktop.c:346 #: ../src/callbacks.c:801 ../src/desktop.c:346
msgid "Text file" msgid "Text file"
msgstr "" msgstr ""
#: ../src/callbacks.c:815 ../src/desktop.c:445 #: ../src/callbacks.c:836 ../src/desktop.c:445
msgid "New text file.txt" msgid "New text file.txt"
msgstr "" msgstr ""
#: ../src/callbacks.c:862 #: ../src/callbacks.c:883
msgid "Open in new _window" msgid "Open in new _window"
msgstr "" msgstr ""
#: ../src/callbacks.c:890 #: ../src/callbacks.c:911
msgid "_Unmount" msgid "_Unmount"
msgstr "" 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 #: ../src/view.c:111
msgid "Open _with..." msgid "Open _with..."
msgstr "" 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?" msgid "Are you sure you want to execute this file?"
msgstr "" msgstr ""

24
po/fr.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Browser 0.1.4\n" "Project-Id-Version: Browser 0.1.4\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: 2010-03-29 23:28+0200\n"
"Last-Translator: Pierre Pronchery <khorben@defora.org>\n" "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
"Language-Team: French\n" "Language-Team: French\n"
@ -267,8 +267,8 @@ msgstr "Actualisation du dossier..."
msgid "New folder" msgid "New folder"
msgstr "Nouveau dossier" msgstr "Nouveau dossier"
#: ../src/callbacks.c:195 ../src/callbacks.c:201 ../src/callbacks.c:1029 #: ../src/callbacks.c:195 ../src/callbacks.c:201 ../src/callbacks.c:1050
#: ../src/callbacks.c:1034 ../src/desktopicon.c:796 ../src/desktopicon.c:801 #: ../src/callbacks.c:1055 ../src/desktopicon.c:796 ../src/desktopicon.c:801
#: ../src/desktopicon.c:848 ../src/desktopicon.c:853 #: ../src/desktopicon.c:848 ../src/desktopicon.c:853
msgid "Warning" msgid "Warning"
msgstr "Avertissement" msgstr "Avertissement"
@ -278,40 +278,40 @@ msgstr "Avertissement"
msgid "Are you sure you want to delete %lu file(s)?" msgid "Are you sure you want to delete %lu file(s)?"
msgstr "Voulez-vous vraiment effacer %lu fichier(s)?" msgstr "Voulez-vous vraiment effacer %lu fichier(s)?"
#: ../src/callbacks.c:760 #: ../src/callbacks.c:781
msgid "New" msgid "New"
msgstr "Nouveau" 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" msgid "Folder"
msgstr "Dossier" msgstr "Dossier"
#: ../src/callbacks.c:776 ../src/desktop.c:342 #: ../src/callbacks.c:797 ../src/desktop.c:342
msgid "Symbolic link..." msgid "Symbolic link..."
msgstr "Lien symbolique..." msgstr "Lien symbolique..."
#: ../src/callbacks.c:780 ../src/desktop.c:346 #: ../src/callbacks.c:801 ../src/desktop.c:346
msgid "Text file" msgid "Text file"
msgstr "Fichier texte" msgstr "Fichier texte"
#: ../src/callbacks.c:815 ../src/desktop.c:445 #: ../src/callbacks.c:836 ../src/desktop.c:445
msgid "New text file.txt" msgid "New text file.txt"
msgstr "Nouveau fichier texte.txt" msgstr "Nouveau fichier texte.txt"
#: ../src/callbacks.c:862 #: ../src/callbacks.c:883
msgid "Open in new _window" msgid "Open in new _window"
msgstr "Ouvrir dans une _nouvelle fenêtre" msgstr "Ouvrir dans une _nouvelle fenêtre"
#: ../src/callbacks.c:890 #: ../src/callbacks.c:911
msgid "_Unmount" msgid "_Unmount"
msgstr "Démonter" 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 #: ../src/view.c:111
msgid "Open _with..." msgid "Open _with..."
msgstr "Ouvrir _avec..." 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?" msgid "Are you sure you want to execute this file?"
msgstr "Voulez-vous vraiment exécuter ce fichier ?" msgstr "Voulez-vous vraiment exécuter ce fichier ?"

24
po/it.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Browser 0.1.4\n" "Project-Id-Version: Browser 0.1.4\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: 2010-04-07 23:18+0200\n"
"Last-Translator: Pierre Pronchery <khorben@defora.org>\n" "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
"Language-Team: Italian\n" "Language-Team: Italian\n"
@ -267,8 +267,8 @@ msgstr ""
msgid "New folder" msgid "New folder"
msgstr "" msgstr ""
#: ../src/callbacks.c:195 ../src/callbacks.c:201 ../src/callbacks.c:1029 #: ../src/callbacks.c:195 ../src/callbacks.c:201 ../src/callbacks.c:1050
#: ../src/callbacks.c:1034 ../src/desktopicon.c:796 ../src/desktopicon.c:801 #: ../src/callbacks.c:1055 ../src/desktopicon.c:796 ../src/desktopicon.c:801
#: ../src/desktopicon.c:848 ../src/desktopicon.c:853 #: ../src/desktopicon.c:848 ../src/desktopicon.c:853
msgid "Warning" msgid "Warning"
msgstr "" msgstr ""
@ -278,40 +278,40 @@ msgstr ""
msgid "Are you sure you want to delete %lu file(s)?" msgid "Are you sure you want to delete %lu file(s)?"
msgstr "" msgstr ""
#: ../src/callbacks.c:760 #: ../src/callbacks.c:781
msgid "New" msgid "New"
msgstr "" 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" msgid "Folder"
msgstr "" msgstr ""
#: ../src/callbacks.c:776 ../src/desktop.c:342 #: ../src/callbacks.c:797 ../src/desktop.c:342
msgid "Symbolic link..." msgid "Symbolic link..."
msgstr "" msgstr ""
#: ../src/callbacks.c:780 ../src/desktop.c:346 #: ../src/callbacks.c:801 ../src/desktop.c:346
msgid "Text file" msgid "Text file"
msgstr "" msgstr ""
#: ../src/callbacks.c:815 ../src/desktop.c:445 #: ../src/callbacks.c:836 ../src/desktop.c:445
msgid "New text file.txt" msgid "New text file.txt"
msgstr "" msgstr ""
#: ../src/callbacks.c:862 #: ../src/callbacks.c:883
msgid "Open in new _window" msgid "Open in new _window"
msgstr "" msgstr ""
#: ../src/callbacks.c:890 #: ../src/callbacks.c:911
msgid "_Unmount" msgid "_Unmount"
msgstr "" 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 #: ../src/view.c:111
msgid "Open _with..." msgid "Open _with..."
msgstr "" 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?" msgid "Are you sure you want to execute this file?"
msgstr "" msgstr ""

21
src/callbacks.c
View File

@ -321,7 +321,14 @@ void on_back(gpointer data)
void on_copy(gpointer data) void on_copy(gpointer data)
{ {
Browser * browser = 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_foreach(browser->selection, (GFunc)free, NULL);
g_list_free(browser->selection); g_list_free(browser->selection);
browser->selection = _copy_selection(browser); browser->selection = _copy_selection(browser);
@ -333,7 +340,14 @@ void on_copy(gpointer data)
void on_cut(gpointer data) void on_cut(gpointer data)
{ {
Browser * browser = 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_foreach(browser->selection, (GFunc)free, NULL);
g_list_free(browser->selection); g_list_free(browser->selection);
browser->selection = _copy_selection(browser); browser->selection = _copy_selection(browser);
@ -369,8 +383,15 @@ void on_home(gpointer data)
void on_paste(gpointer data) void on_paste(gpointer data)
{ {
Browser * browser = data; Browser * browser = data;
GtkWidget * entry;
char * p = browser->current->data; 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) if(browser->selection == NULL)
return; return;
browser->selection = g_list_append(browser->selection, p); browser->selection = g_list_append(browser->selection, p);