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

The "Cancel" button had no callback either

Browse Source
This commit is contained in:
Pierre Pronchery 2011-01-31 03:44:14 +00:00
parent 028a207284
commit 4f096a2271
5 changed files with 44 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
po/de.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Browser 0.1.4\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-01-31 04:41+0100\n"
"POT-Creation-Date: 2011-01-31 04:43+0100\n"
"PO-Revision-Date: 2010-03-29 23:28+0200\n"
"Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
"Language-Team: English\n"
@ -187,8 +187,8 @@ msgstr ""
#: ../src/browser.c:592 ../src/browser.c:597 ../src/copy.c:668
#: ../src/copy.c:672 ../src/delete.c:421 ../src/delete.c:426
#: ../src/desktop.c:1440 ../src/desktop.c:1445 ../src/move.c:444
#: ../src/move.c:448 ../src/properties.c:114 ../src/properties.c:118
#: ../src/desktop.c:1440 ../src/desktop.c:1445 ../src/move.c:452
#: ../src/move.c:456 ../src/properties.c:114 ../src/properties.c:118
#: ../src/view.c:364 ../src/view.c:367
msgid "Error"
msgstr "Fehler"
@ -351,7 +351,7 @@ msgstr ""
msgid "Speed: "
msgstr ""
#: ../src/copy.c:206 ../src/delete.c:159 ../src/move.c:151
#: ../src/copy.c:206 ../src/delete.c:159 ../src/move.c:154
#, c-format
msgid "File %u of %u"
msgstr ""
@ -373,11 +373,11 @@ msgid "MB"
msgstr ""
#: ../src/copy.c:692 ../src/copy.c:696 ../src/delete.c:327 ../src/delete.c:331
#: ../src/delete.c:359 ../src/delete.c:364 ../src/move.c:468 ../src/move.c:472
#: ../src/delete.c:359 ../src/delete.c:364 ../src/move.c:476 ../src/move.c:480
msgid "Question"
msgstr ""
#: ../src/copy.c:695 ../src/move.c:471
#: ../src/copy.c:695 ../src/move.c:479
#, c-format
msgid ""
"%s will be overwritten\n"
@ -500,15 +500,15 @@ msgstr "Usage: browser [Ordner...]\n"
msgid "Could not load MIME globs"
msgstr ""
#: ../src/move.c:99
#: ../src/move.c:100
msgid "Move file(s)"
msgstr ""
#: ../src/move.c:107
#: ../src/move.c:108
msgid "Moving: "
msgstr ""
#: ../src/move.c:498
#: ../src/move.c:506
msgid ""
"Usage: move [-fi] file...\n"
" -f\tDo not prompt for confirmation if the destination path exists\n"

18
po/es.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Browser 0.1.4\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-01-31 04:41+0100\n"
"POT-Creation-Date: 2011-01-31 04:43+0100\n"
"PO-Revision-Date: 2010-03-30 01:04+0200\n"
"Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
"Language-Team: Spanish\n"
@ -187,8 +187,8 @@ msgstr ""
#: ../src/browser.c:592 ../src/browser.c:597 ../src/copy.c:668
#: ../src/copy.c:672 ../src/delete.c:421 ../src/delete.c:426
#: ../src/desktop.c:1440 ../src/desktop.c:1445 ../src/move.c:444
#: ../src/move.c:448 ../src/properties.c:114 ../src/properties.c:118
#: ../src/desktop.c:1440 ../src/desktop.c:1445 ../src/move.c:452
#: ../src/move.c:456 ../src/properties.c:114 ../src/properties.c:118
#: ../src/view.c:364 ../src/view.c:367
msgid "Error"
msgstr ""
@ -351,7 +351,7 @@ msgstr ""
msgid "Speed: "
msgstr ""
#: ../src/copy.c:206 ../src/delete.c:159 ../src/move.c:151
#: ../src/copy.c:206 ../src/delete.c:159 ../src/move.c:154
#, c-format
msgid "File %u of %u"
msgstr ""
@ -373,11 +373,11 @@ msgid "MB"
msgstr ""
#: ../src/copy.c:692 ../src/copy.c:696 ../src/delete.c:327 ../src/delete.c:331
#: ../src/delete.c:359 ../src/delete.c:364 ../src/move.c:468 ../src/move.c:472
#: ../src/delete.c:359 ../src/delete.c:364 ../src/move.c:476 ../src/move.c:480
msgid "Question"
msgstr ""
#: ../src/copy.c:695 ../src/move.c:471
#: ../src/copy.c:695 ../src/move.c:479
#, c-format
msgid ""
"%s will be overwritten\n"
@ -500,15 +500,15 @@ msgstr ""
msgid "Could not load MIME globs"
msgstr ""
#: ../src/move.c:99
#: ../src/move.c:100
msgid "Move file(s)"
msgstr ""
#: ../src/move.c:107
#: ../src/move.c:108
msgid "Moving: "
msgstr ""
#: ../src/move.c:498
#: ../src/move.c:506
msgid ""
"Usage: move [-fi] file...\n"
" -f\tDo not prompt for confirmation if the destination path exists\n"

18
po/fr.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Browser 0.1.4\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-01-31 04:41+0100\n"
"POT-Creation-Date: 2011-01-31 04:43+0100\n"
"PO-Revision-Date: 2010-03-29 23:28+0200\n"
"Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
"Language-Team: French\n"
@ -187,8 +187,8 @@ msgstr " Chemin: "
#: ../src/browser.c:592 ../src/browser.c:597 ../src/copy.c:668
#: ../src/copy.c:672 ../src/delete.c:421 ../src/delete.c:426
#: ../src/desktop.c:1440 ../src/desktop.c:1445 ../src/move.c:444
#: ../src/move.c:448 ../src/properties.c:114 ../src/properties.c:118
#: ../src/desktop.c:1440 ../src/desktop.c:1445 ../src/move.c:452
#: ../src/move.c:456 ../src/properties.c:114 ../src/properties.c:118
#: ../src/view.c:364 ../src/view.c:367
msgid "Error"
msgstr "Erreur"
@ -351,7 +351,7 @@ msgstr "Nom de fichier: "
msgid "Speed: "
msgstr "Débit: "
#: ../src/copy.c:206 ../src/delete.c:159 ../src/move.c:151
#: ../src/copy.c:206 ../src/delete.c:159 ../src/move.c:154
#, c-format
msgid "File %u of %u"
msgstr "Fichier %u sur %u"
@ -373,11 +373,11 @@ msgid "MB"
msgstr "Mio"
#: ../src/copy.c:692 ../src/copy.c:696 ../src/delete.c:327 ../src/delete.c:331
#: ../src/delete.c:359 ../src/delete.c:364 ../src/move.c:468 ../src/move.c:472
#: ../src/delete.c:359 ../src/delete.c:364 ../src/move.c:476 ../src/move.c:480
msgid "Question"
msgstr "Question"
#: ../src/copy.c:695 ../src/move.c:471
#: ../src/copy.c:695 ../src/move.c:479
#, c-format
msgid ""
"%s will be overwritten\n"
@ -528,15 +528,15 @@ msgstr "Usage: browser [dossier...]\n"
msgid "Could not load MIME globs"
msgstr "Impossible de charger les infos MIME"
#: ../src/move.c:99
#: ../src/move.c:100
msgid "Move file(s)"
msgstr "Déplacer des fichier(s)"
#: ../src/move.c:107
#: ../src/move.c:108
msgid "Moving: "
msgstr "Déplacement de : "
#: ../src/move.c:498
#: ../src/move.c:506
msgid ""
"Usage: move [-fi] file...\n"
" -f\tDo not prompt for confirmation if the destination path exists\n"

18
po/it.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Browser 0.1.4\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-01-31 04:41+0100\n"
"POT-Creation-Date: 2011-01-31 04:43+0100\n"
"PO-Revision-Date: 2010-04-07 23:18+0200\n"
"Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
"Language-Team: Italian\n"
@ -187,8 +187,8 @@ msgstr ""
#: ../src/browser.c:592 ../src/browser.c:597 ../src/copy.c:668
#: ../src/copy.c:672 ../src/delete.c:421 ../src/delete.c:426
#: ../src/desktop.c:1440 ../src/desktop.c:1445 ../src/move.c:444
#: ../src/move.c:448 ../src/properties.c:114 ../src/properties.c:118
#: ../src/desktop.c:1440 ../src/desktop.c:1445 ../src/move.c:452
#: ../src/move.c:456 ../src/properties.c:114 ../src/properties.c:118
#: ../src/view.c:364 ../src/view.c:367
msgid "Error"
msgstr ""
@ -351,7 +351,7 @@ msgstr ""
msgid "Speed: "
msgstr ""
#: ../src/copy.c:206 ../src/delete.c:159 ../src/move.c:151
#: ../src/copy.c:206 ../src/delete.c:159 ../src/move.c:154
#, c-format
msgid "File %u of %u"
msgstr ""
@ -373,11 +373,11 @@ msgid "MB"
msgstr ""
#: ../src/copy.c:692 ../src/copy.c:696 ../src/delete.c:327 ../src/delete.c:331
#: ../src/delete.c:359 ../src/delete.c:364 ../src/move.c:468 ../src/move.c:472
#: ../src/delete.c:359 ../src/delete.c:364 ../src/move.c:476 ../src/move.c:480
msgid "Question"
msgstr ""
#: ../src/copy.c:695 ../src/move.c:471
#: ../src/copy.c:695 ../src/move.c:479
#, c-format
msgid ""
"%s will be overwritten\n"
@ -500,15 +500,15 @@ msgstr ""
msgid "Could not load MIME globs"
msgstr ""
#: ../src/move.c:99
#: ../src/move.c:100
msgid "Move file(s)"
msgstr ""
#: ../src/move.c:107
#: ../src/move.c:108
msgid "Moving: "
msgstr ""
#: ../src/move.c:498
#: ../src/move.c:506
msgid ""
"Usage: move [-fi] file...\n"
" -f\tDo not prompt for confirmation if the destination path exists\n"

8
src/move.c
View File

@ -75,6 +75,7 @@ static int _move_filename_error(Move * move, char const * filename, int ret);
static void _move_refresh(Move * move);
/* callbacks */
static void _move_on_closex(void);
static void _move_on_cancel(void);
static gboolean _move_idle_first(gpointer data);
static int _move(Prefs * prefs, unsigned int filec, char * filev[])
@ -126,6 +127,8 @@ static int _move(Prefs * prefs, unsigned int filec, char * filev[])
gtk_box_pack_start(GTK_BOX(vbox), move.progress, TRUE, TRUE, 0);
hbox = gtk_hbox_new(FALSE, 4);
widget = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
g_signal_connect_swapped(G_OBJECT(widget), "clicked", G_CALLBACK(
_move_on_cancel), NULL);
gtk_box_pack_end(GTK_BOX(hbox), widget, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
gtk_container_set_border_width(GTK_CONTAINER(move.window), 4);
@ -162,6 +165,11 @@ static void _move_on_closex(void)
gtk_main_quit();
}
static void _move_on_cancel(void)
{
gtk_main_quit();
}
static int _move_single(Move * move, char const * src, char const * dst);
static gboolean _move_idle_multiple(gpointer data);
static gboolean _move_idle_first(gpointer data)