[Xfce4-commits] Make parts of the permissions chooser work with multiple files.
Updating branch refs/heads/nick/multiple-file-properties
to 752dc5978620814e60a6e0df152cb33c8959f655 (commit)
from 47793236ca9a5f51cc766e958c7a2e246af3aebc (commit)
commit 752dc5978620814e60a6e0df152cb33c8959f655
Author: Nick Schermer
Date: Thu Sep 13 20:45:19 2012 +0200
Make parts of the permissions chooser work with multiple files.
thunar/thunar-io-jobs.c | 30 ++---
thunar/thunar-io-jobs.h |4 +-
thunar/thunar-permissions-chooser.c | 281 ++
thunar/thunar-permissions-chooser.h | 10 +-
thunar/thunar-properties-dialog.c | 13 +-
5 files changed, 207 insertions(+), 131 deletions(-)
diff --git a/thunar/thunar-io-jobs.c b/thunar/thunar-io-jobs.c
index 859bdef..a90ab69 100644
--- a/thunar/thunar-io-jobs.c
+++ b/thunar/thunar-io-jobs.c
@@ -958,25 +958,20 @@ retry_chown:
ThunarJob *
-thunar_io_jobs_change_group (GFile*file,
+thunar_io_jobs_change_group (GList*files,
guint32 gid,
gboolean recursive)
{
- GList file_list;
+ _thunar_return_val_if_fail (files != NULL, NULL);
- _thunar_return_val_if_fail (G_IS_FILE (file), NULL);
+ /* files are released when the list if destroyed */
+ g_list_foreach (files, (GFunc) g_object_ref, NULL);
- file_list.data = g_object_ref (file);
- file_list.next = NULL;
- file_list.prev = NULL;
-
return thunar_simple_job_launch (_thunar_io_jobs_chown, 4,
- THUNAR_TYPE_G_FILE_LIST, &file_list,
+ THUNAR_TYPE_G_FILE_LIST, files,
G_TYPE_INT, -1,
G_TYPE_INT, (gint) gid,
G_TYPE_BOOLEAN, recursive);
-
- g_object_unref (file_list.data);
}
@@ -1112,30 +1107,25 @@ retry_chown:
ThunarJob *
-thunar_io_jobs_change_mode (GFile *file,
+thunar_io_jobs_change_mode (GList *files,
ThunarFileMode dir_mask,
ThunarFileMode dir_mode,
ThunarFileMode file_mask,
ThunarFileMode file_mode,
gboolean recursive)
{
- GList file_list;
+ _thunar_return_val_if_fail (files != NULL, NULL);
- _thunar_return_val_if_fail (G_IS_FILE (file), NULL);
+ /* files are released when the list if destroyed */
+ g_list_foreach (files, (GFunc) g_object_ref, NULL);
- file_list.data = g_object_ref (file);
- file_list.next = NULL;
- file_list.prev = NULL;
-
return thunar_simple_job_launch (_thunar_io_jobs_chmod, 6,
- THUNAR_TYPE_G_FILE_LIST, &file_list,
+ THUNAR_TYPE_G_FILE_LIST, files,
THUNAR_TYPE_FILE_MODE, dir_mask,
THUNAR_TYPE_FILE_MODE, dir_mode,
THUNAR_TYPE_FILE_MODE, file_mask,
THUNAR_TYPE_FILE_MODE, file_mode,
G_TYPE_BOOLEAN, recursive);
-
- g_object_unref (file_list.data);
}
diff --git a/thunar/thunar-io-jobs.h b/thunar/thunar-io-jobs.h
index 5821c44..11d9c0d 100644
--- a/thunar/thunar-io-jobs.h
+++ b/thunar/thunar-io-jobs.h
@@ -38,10 +38,10 @@ ThunarJob *thunar_io_jobs_link_files (GList
*source_file_list,
ThunarJob *thunar_io_jobs_trash_files (GList *file_list)
G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
ThunarJob *thunar_io_jobs_restore_files(GList *source_file_list,
GList *target_file_list)
G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
-ThunarJob *thunar_io_jobs_change_group (GFile *file,
+ThunarJob *thunar_io_jobs_change_group (GList *files,
guint32gid,
gboolean recursive)
G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
-ThunarJob *thunar_io_jobs_change_mode (GFile *file,
+ThunarJob *thunar_io_jobs_change_mode (GList *files,
ThunarFileMode dir_mask,
ThunarFileMode dir_mode,
ThunarFileMode file_mask,
diff --git a/thunar/thunar-permissions-chooser.c
b/thunar/thunar-permissions-chooser.c
index 576010f..692479e 100644
--- a/thunar/thunar-permissions-chooser.c
+++ b/thunar/thunar-permissions-chooser.c
@@ -58,7 +58,7 @@
enum
{
PROP_0,
- PROP_FILE,
+ PROP_FILES,
PROP_MUTABLE,
};
@@ -91,8 +91,7 @@ static void
thunar_permissions_chooser_change_mode (ThunarP
ThunarFileMode file_mode);
static void thunar_permissions_chooser_acce
[Xfce4-commits] Make chooser button work again if a single file is selected.
Updating branch refs/heads/nick/multiple-file-properties to 47793236ca9a5f51cc766e958c7a2e246af3aebc (commit) from 4e1707ec792c7ed6be19bba5d83bb777d30d9dd0 (commit) commit 47793236ca9a5f51cc766e958c7a2e246af3aebc Author: Nick Schermer Date: Thu Sep 13 18:22:58 2012 +0200 Make chooser button work again if a single file is selected. thunar/thunar-properties-dialog.c |9 + 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/thunar/thunar-properties-dialog.c b/thunar/thunar-properties-dialog.c index e6adc85..907055e 100644 --- a/thunar/thunar-properties-dialog.c +++ b/thunar/thunar-properties-dialog.c @@ -344,7 +344,6 @@ thunar_properties_dialog_init (ThunarPropertiesDialog *dialog) gtk_widget_show (label); dialog->openwith_chooser = thunar_chooser_button_new (); - /*TODO exo_binding_new (G_OBJECT (dialog), "file", G_OBJECT (dialog->openwith_chooser), "file");*/ exo_binding_new (G_OBJECT (dialog->openwith_chooser), "visible", G_OBJECT (label), "visible"); gtk_table_attach (GTK_TABLE (table), dialog->openwith_chooser, 1, 2, row, row + 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 3); gtk_widget_show (dialog->openwith_chooser); @@ -879,6 +878,7 @@ thunar_properties_dialog_update_single (ThunarPropertiesDialog *dialog) gchar *volume_name; ThunarFile*file; ThunarFile*parent_file; + gboolean show_chooser; _thunar_return_if_fail (THUNAR_IS_PROPERTIES_DIALOG (dialog)); _thunar_return_if_fail (g_list_length (dialog->files) == 1); @@ -967,9 +967,10 @@ thunar_properties_dialog_update_single (ThunarPropertiesDialog *dialog) } /* update the application chooser (shown only for non-executable regular files!) */ - g_object_set (G_OBJECT (dialog->openwith_chooser), -"visible", (thunar_file_is_regular (file) && !thunar_file_is_executable (file)), -NULL); + show_chooser = thunar_file_is_regular (file) && !thunar_file_is_executable (file); + gtk_widget_set_visible (dialog->openwith_chooser, show_chooser); + if (show_chooser) +thunar_chooser_button_set_file (THUNAR_CHOOSER_BUTTON (dialog->openwith_chooser), file); /* update the link target */ path = thunar_file_is_symlink (file) ? thunar_file_get_symlink_target (file) : NULL; ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Italian (it) translation to 100%
Updating branch refs/heads/master to 2d7524c2783943d7b16e8fe71154e170ad49 (commit) from c17fe35e6f2ff673bab102e736a327fa7bcc1d73 (commit) commit 2d7524c2783943d7b16e8fe71154e170ad49 Author: Cristian Marchi Date: Thu Sep 13 21:25:41 2012 +0200 l10n: Updated Italian (it) translation to 100% New status: 336 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/it.po | 138 ++ 1 files changed, 67 insertions(+), 71 deletions(-) diff --git a/po/it.po b/po/it.po index b1461cf..75e3dd6 100644 --- a/po/it.po +++ b/po/it.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: xfce4-settings\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-15 02:45+\n" +"POT-Creation-Date: 2012-09-13 14:30+\n" "PO-Revision-Date: 2011-02-26 11:48+0100\n" "Last-Translator: Cristian Marchi \n" "Language-Team: Italian Translation Team \n" @@ -283,7 +283,7 @@ msgstr "Informazioni di versione" #: ../dialogs/display-settings/main.c:1043 #: ../dialogs/keyboard-settings/main.c:76 ../dialogs/mime-settings/main.c:62 #: ../dialogs/mouse-settings/main.c:1597 ../xfce4-settings-editor/main.c:63 -#: ../xfsettingsd/main.c:173 ../xfce4-settings-manager/main.c:60 +#: ../xfsettingsd/main.c:187 ../xfce4-settings-manager/main.c:60 #, c-format msgid "Type '%s --help' for usage." msgstr "Digitare \"%s --help\" per le modalità d'uso" @@ -293,7 +293,7 @@ msgstr "Digitare \"%s --help\" per le modalità d'uso" #: ../dialogs/display-settings/main.c:1062 #: ../dialogs/keyboard-settings/main.c:92 ../dialogs/mime-settings/main.c:81 #: ../dialogs/mouse-settings/main.c:1616 ../xfce4-settings-editor/main.c:82 -#: ../xfsettingsd/main.c:189 ../xfce4-settings-manager/main.c:76 +#: ../xfsettingsd/main.c:203 ../xfce4-settings-manager/main.c:76 msgid "The Xfce development team. All rights reserved." msgstr "Il gruppo di sviluppo di Xfce. Tutti i diritti riservati." @@ -302,7 +302,7 @@ msgstr "Il gruppo di sviluppo di Xfce. Tutti i diritti riservati." #: ../dialogs/display-settings/main.c:1063 #: ../dialogs/keyboard-settings/main.c:93 ../dialogs/mime-settings/main.c:82 #: ../dialogs/mouse-settings/main.c:1617 ../xfce4-settings-editor/main.c:83 -#: ../xfsettingsd/main.c:190 ../xfce4-settings-manager/main.c:77 +#: ../xfsettingsd/main.c:204 ../xfce4-settings-manager/main.c:77 #, c-format msgid "Please report bugs to <%s>." msgstr "Segnalare i problemi a <%s>." @@ -816,62 +816,82 @@ msgstr "C_omportamento" msgid "Blink _delay:" msgstr "I_ntervallo di intermittenza" +# Automatically copied. Please review and remove fuzzy flag. #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:4 +msgid "Change layout option" +msgstr "Opzioni di modifica della disposizione" + +# Automatically copied. Please review and remove fuzzy flag. +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:5 +msgid "Compose key" +msgstr "Composizione chiave" + +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:6 msgid "Cursor" msgstr "Cursore" -#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:5 +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:7 msgid "Define _shortcuts for launching applications:" msgstr "Definizione delle _scorciatoie per avviare le applicazioni:" -#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:6 +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:8 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.desktop.in.h:1 msgid "Edit keyboard settings and application shortcuts" msgstr "Configurazione della tastiera e delle scorciatoie per le applicazioni" -#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:7 +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:9 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:16 msgid "General" msgstr "Generali" -#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:8 +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:10 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.desktop.in.h:2 msgid "Keyboard" msgstr "Tastiera" -#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:9 +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:11 msgid "Keyboard layout" msgstr "Mappatura tastiera" -#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:10 +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:12 msgid "Keyboard layout selection" msgstr "Selezione della mappatura della tastiera" -#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:11 +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:13 msgid "Keyboard model" msgstr "Modello tastiera" -#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:12 +# Automatically copied. Please review and remove fuzzy flag. +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:14 +msgid "Move currently selected item down by one row" +msgstr "Sposta l'elemento selezionato una riga sotto" + +# Automat
[Xfce4-commits] l10n: Updated Italian (it) translation to 100%
Updating branch refs/heads/master to 2c4bc9f183b4da4a91263ef4fb4283283f4c5107 (commit) from 129c27f3b4fe5b813adaf436c2db14c62584f0af (commit) commit 2c4bc9f183b4da4a91263ef4fb4283283f4c5107 Author: Cristian Marchi Date: Thu Sep 13 21:27:30 2012 +0200 l10n: Updated Italian (it) translation to 100% New status: 682 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/it.po | 206 +++-- 1 files changed, 105 insertions(+), 101 deletions(-) diff --git a/po/it.po b/po/it.po index c303126..b34530e 100644 --- a/po/it.po +++ b/po/it.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: Thunar trunk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-14 15:00+\n" +"POT-Creation-Date: 2012-09-13 17:21+\n" "PO-Revision-Date: 2010-07-02 16:42+0100\n" "Last-Translator: Cristian Marchi \n" "Language-Team: Italian Translation Team \n" @@ -131,12 +131,12 @@ msgid "Sort items in descending order" msgstr "Ordina gli elementi in ordine discendente" #. display an error message to the user -#: ../thunar/thunar-application.c:387 +#: ../thunar/thunar-application.c:390 msgid "Failed to launch operation" msgstr "Impossibile avviare l'operazione" #. tell the user that we were unable to launch the file specified -#: ../thunar/thunar-application.c:1048 ../thunar/thunar-application.c:1174 +#: ../thunar/thunar-application.c:1101 ../thunar/thunar-application.c:1227 #: ../thunar/thunar-launcher.c:1057 ../thunar/thunar-location-entry.c:394 #: ../thunar/thunar-location-entry.c:422 #: ../thunar/thunar-shortcuts-view.c:1277 ../thunar/thunar-window.c:1509 @@ -144,65 +144,65 @@ msgstr "Impossibile avviare l'operazione" msgid "Failed to open \"%s\"" msgstr "Impossibile aprire \"%s\"" -#: ../thunar/thunar-application.c:1178 +#: ../thunar/thunar-application.c:1231 #, c-format msgid "Failed to open \"%s\": %s" msgstr "Impossibile aprire \"%s\": %s" #. display an error message -#: ../thunar/thunar-application.c:1242 +#: ../thunar/thunar-application.c:1295 #: ../thunar/thunar-properties-dialog.c:646 -#: ../thunar/thunar-standard-view.c:2265 ../thunar/thunar-tree-view.c:1672 +#: ../thunar/thunar-standard-view.c:2262 ../thunar/thunar-tree-view.c:1672 #, c-format msgid "Failed to rename \"%s\"" msgstr "Impossibile rinominare \"%s\"" -#: ../thunar/thunar-application.c:1344 +#: ../thunar/thunar-application.c:1397 #: ../thunar/thunar-location-buttons.c:1285 -#: ../thunar/thunar-standard-view.c:1886 ../thunar/thunar-tree-view.c:1569 +#: ../thunar/thunar-standard-view.c:1883 ../thunar/thunar-tree-view.c:1569 msgid "New Folder" msgstr "Nuova cartella" -#: ../thunar/thunar-application.c:1345 +#: ../thunar/thunar-application.c:1398 #: ../thunar/thunar-location-buttons.c:1286 -#: ../thunar/thunar-standard-view.c:1887 ../thunar/thunar-tree-view.c:1570 +#: ../thunar/thunar-standard-view.c:1884 ../thunar/thunar-tree-view.c:1570 msgid "Create New Folder" msgstr "Crea nuova cartella" -#: ../thunar/thunar-application.c:1349 +#: ../thunar/thunar-application.c:1402 msgid "New File" msgstr "Nuovo file" -#: ../thunar/thunar-application.c:1350 +#: ../thunar/thunar-application.c:1403 msgid "Create New File" msgstr "Crea un nuovo file" #. generate a title for the create dialog -#: ../thunar/thunar-application.c:1408 ../thunar/thunar-standard-view.c:1932 +#: ../thunar/thunar-application.c:1461 ../thunar/thunar-standard-view.c:1929 #, c-format msgid "Create Document from template \"%s\"" msgstr "Crea documento da un modello \"%s\"" -#: ../thunar/thunar-application.c:1475 +#: ../thunar/thunar-application.c:1528 msgid "Copying files..." msgstr "Copia dei file in corso..." -#: ../thunar/thunar-application.c:1511 +#: ../thunar/thunar-application.c:1564 #, c-format msgid "Copying files to \"%s\"..." msgstr "Copia dei file in \"%s\" in corso..." -#: ../thunar/thunar-application.c:1557 +#: ../thunar/thunar-application.c:1610 #, c-format msgid "Creating symbolic links in \"%s\"..." msgstr "Creazione del collegamento simbolico \"%s\" in corso..." -#: ../thunar/thunar-application.c:1610 +#: ../thunar/thunar-application.c:1663 #, c-format msgid "Moving files into \"%s\"..." msgstr "Spostamento dei file in \"%s\" in corso..." -#: ../thunar/thunar-application.c:1701 +#: ../thunar/thunar-application.c:1754 #, c-format msgid "" "Are you sure that you want to\n" @@ -211,7 +211,7 @@ msgstr "" "Cancellare davvero in modo\n" "permanente \"%s\"?" -#: ../thunar/thunar-application.c:1706 +#: ../thunar/thunar-application.c:1759 #, c-format msgid "" "Are you sure that you want to permanently\n" @@ -226,39 +226,39 @@ msgstr[1] "" "Cancellare davvero in modo\n" "permanente i %u file selezionati?" -#: ../thunar/thunar-application.c:1726 +#: ../thunar/thunar-application.c:1779 msgid "If you delete a file, it is permanently lost." msgstr
[Xfce4-commits] l10n: Updated Italian (it) translation to 100%
Updating branch refs/heads/master to f00d21789eecfc0475eac5b1d61c994c8cadbf32 (commit) from d347bf351b23e508b7a403f7e0dd363ea235da6d (commit) commit f00d21789eecfc0475eac5b1d61c994c8cadbf32 Author: Cristian Marchi Date: Thu Sep 13 21:28:24 2012 +0200 l10n: Updated Italian (it) translation to 100% New status: 32 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/it.po | 126 +- 1 files changed, 59 insertions(+), 67 deletions(-) diff --git a/po/it.po b/po/it.po index d192a1f..d459928 100644 --- a/po/it.po +++ b/po/it.po @@ -2,43 +2,39 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the xfce4-timer-plugin package. # Cristian Marchi , 2009. -# +# msgid "" msgstr "" "Project-Id-Version: xfce4-timer-plugin\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-04 15:53+0300\n" +"POT-Creation-Date: 2006-09-10 21:29+0200\n" "PO-Revision-Date: 2009-02-01 19:33+0100\n" "Last-Translator: Cristian Marchi \n" "Language-Team: Italian \n" -"Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: it\n" # GLOSSARIO # left = mancare # timer = sveglia -#: ../src/xfcetimer.c:108 +#: ../src/xfcetimer.c:100 #, c-format msgid "%dh %dm %ds left" msgstr "Mancano %dore %dminuti %dsecondi" -#: ../src/xfcetimer.c:111 +#: ../src/xfcetimer.c:103 #, c-format msgid "%dm %ds left" msgstr "Mancano %dminuti %dsecondi" -#: ../src/xfcetimer.c:113 +#: ../src/xfcetimer.c:105 #, c-format msgid "%ds left" msgstr "Mancano %dsecondi" -#: ../src/xfcetimer.c:116 -msgid " (Paused)" -msgstr "" - -#: ../src/xfcetimer.c:141 +#: ../src/xfcetimer.c:126 msgid "" "Beeep! :) \n" "Time is up!" @@ -46,110 +42,105 @@ msgstr "" "Driiin! :) \n" "Il tempo è scaduto!" -#: ../src/xfcetimer.c:430 -msgid "Resume timer" -msgstr "Avvia la sveglia" - -#: ../src/xfcetimer.c:436 ../src/xfcetimer.c:504 +#: ../src/xfcetimer.c:424 msgid "Stop timer" msgstr "Interrompi la sveglia" -#: ../src/xfcetimer.c:490 -msgid "Pause timer" -msgstr "Avvia la sveglia" - -#: ../src/xfcetimer.c:506 +#: ../src/xfcetimer.c:426 msgid "Start timer" msgstr "Avvia la sveglia" -#: ../src/xfcetimer.c:516 +#: ../src/xfcetimer.c:436 msgid "Stop the alarm" msgstr "Interrompi la sveglia" -#: ../src/xfcetimer.c:562 ../src/xfcetimer.c:637 +#: ../src/xfcetimer.c:482 ../src/xfcetimer.c:556 #, c-format msgid "%dh %dm %ds" msgstr "%dh %dm %ds" -#: ../src/xfcetimer.c:564 ../src/xfcetimer.c:639 +#: ../src/xfcetimer.c:484 ../src/xfcetimer.c:558 #, c-format msgid "%dm %ds" msgstr "%dm %ds" -#: ../src/xfcetimer.c:566 ../src/xfcetimer.c:641 +#: ../src/xfcetimer.c:486 ../src/xfcetimer.c:560 #, c-format msgid "%ds" msgstr "%ds" -#: ../src/xfcetimer.c:576 ../src/xfcetimer.c:651 +#: ../src/xfcetimer.c:496 ../src/xfcetimer.c:570 #, c-format msgid "At %02d:%02d" msgstr "Alle %02d:%02d" -#: ../src/xfcetimer.c:733 -#, fuzzy -msgid "Name:" +#: ../src/xfcetimer.c:619 +msgid "Name" msgstr "Nome" #. -#: ../src/xfcetimer.c:741 +#: ../src/xfcetimer.c:627 msgid "Enter the countdown time" msgstr "Inserire la durata del conto alla rovescia" -#: ../src/xfcetimer.c:744 +#: ../src/xfcetimer.c:629 msgid "Enter the time of alarm (24h format)" msgstr "Inserire l'ora della sveglia (nel formato a 24 ore)" -#: ../src/xfcetimer.c:756 +#: ../src/xfcetimer.c:640 msgid "h " msgstr "h " -#: ../src/xfcetimer.c:761 +#: ../src/xfcetimer.c:645 msgid "m " msgstr "m " -#: ../src/xfcetimer.c:766 +#: ../src/xfcetimer.c:650 msgid "s " msgstr "s " -#: ../src/xfcetimer.c:769 -#, fuzzy -msgid "or" +#: ../src/xfcetimer.c:653 +msgid "" +"\n" +"or\n" msgstr "" "\n" "or\n" -#: ../src/xfcetimer.c:792 -#, fuzzy -msgid "Command to run:" +#. ** +#: ../src/xfcetimer.c:673 +msgid "" +"\n" +"The command to run" msgstr "" "\n" "Il comando da eseguire" -#: ../src/xfcetimer.c:822 +#: ../src/xfcetimer.c:699 msgid "Add new alarm" msgstr "Aggiungi una nuova sveglia" -#: ../src/xfcetimer.c:861 +#: ../src/xfcetimer.c:737 msgid "Edit alarm" msgstr "Modifica sveglia" -#: ../src/xfcetimer.c:1439 ../src/xfcetimer.c:1448 -msgid "Xfce4 Timer Options" -msgstr "Opzioni della sveglia di Xfce4" +#: ../src/xfcetimer.c:1162 +msgid "Properties" +msgstr "Proprietà" -#: ../src/xfcetimer.c:1450 -msgid "Xfce 4 Timer Plugin" +#: ../src/xfcetimer.c:1174 +msgid "Xfce4 Timer Options" msgstr "Opzioni della sveglia di Xfce4" -#: ../src/xfcetimer.c:1499 -#, fuzzy -msgid "Timer name" +#: ../src/xfcetimer.c:1205 +msgid "" +"Timer\n" +"name" msgstr "" "Nome\n" "sveglia" -#: ../src/xfcetimer.c:1504 +#: ../src/xfcetimer.c:1210 msgid "" "Countdown period /\n" "Alarm time" @@ -157,30 +148,27 @@ msgstr "" "Durata del conto alla rovescia/\n" "ora della svegli
[Xfce4-commits] Make the deep count job handle multiple files.
Updating branch refs/heads/nick/multiple-file-properties
to 79cc5cd893b475488974b309d075884f8f5e5c90 (commit)
from 752dc5978620814e60a6e0df152cb33c8959f655 (commit)
commit 79cc5cd893b475488974b309d075884f8f5e5c90
Author: Nick Schermer
Date: Thu Sep 13 21:53:16 2012 +0200
Make the deep count job handle multiple files.
Not the size label...
thunar/thunar-deep-count-job.c | 85 ++-
thunar/thunar-deep-count-job.h |2 +-
thunar/thunar-size-label.c | 321 +---
thunar/thunar-size-label.h |1 +
4 files changed, 185 insertions(+), 224 deletions(-)
diff --git a/thunar/thunar-deep-count-job.c b/thunar/thunar-deep-count-job.c
index d2c9dfb..bd7f15c 100644
--- a/thunar/thunar-deep-count-job.c
+++ b/thunar/thunar-deep-count-job.c
@@ -2,19 +2,19 @@
/*-
* Copyright (c) 2009 Jannis Pohlmann .
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
*
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*/
@@ -65,7 +65,7 @@ struct _ThunarDeepCountJob
{
ThunarJob __parent__;
- GFile *file;
+ GList *files;
GFileQueryInfoFlags query_flags;
/* the time of the last "status-update" emission */
@@ -95,7 +95,7 @@ thunar_deep_count_job_class_init (ThunarDeepCountJobClass
*klass)
GObjectClass *gobject_class;
gobject_class = G_OBJECT_CLASS (klass);
- gobject_class->finalize = thunar_deep_count_job_finalize;
+ gobject_class->finalize = thunar_deep_count_job_finalize;
job_class = EXO_JOB_CLASS (klass);
job_class->execute = thunar_deep_count_job_execute;
@@ -108,7 +108,7 @@ thunar_deep_count_job_class_init (ThunarDeepCountJobClass
*klass)
* @directory_count: the number of directories.
* @unreadable_directory_count : the number of unreadable directories.
*
- * Emitted by the @job to inform listeners about the number of files,
+ * Emitted by the @job to inform listeners about the number of files,
* directories and bytes counted so far.
**/
deep_count_signals[STATUS_UPDATE] =
@@ -130,7 +130,7 @@ thunar_deep_count_job_class_init (ThunarDeepCountJobClass
*klass)
static void
thunar_deep_count_job_init (ThunarDeepCountJob *job)
{
- job->file = NULL;
+ job->files = NULL;
job->query_flags = G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS;
job->total_size = 0;
job->file_count = 0;
@@ -146,8 +146,7 @@ thunar_deep_count_job_finalize (GObject *object)
{
ThunarDeepCountJob *job = THUNAR_DEEP_COUNT_JOB (object);
- if (G_LIKELY (job->file != NULL))
-g_object_unref (job->file);
+ g_list_free_full (job->files, g_object_unref);
(*G_OBJECT_CLASS (thunar_deep_count_job_parent_class)->finalize) (object);
}
@@ -159,7 +158,7 @@ thunar_deep_count_job_status_update (ThunarDeepCountJob
*job)
{
_thunar_return_if_fail (THUNAR_IS_DEEP_COUNT_JOB (job));
- exo_job_emit (EXO_JOB (job),
+ exo_job_emit (EXO_JOB (job),
deep_count_signals[STATUS_UPDATE],
0,
job->total_size,
@@ -171,9 +170,10 @@ thunar_deep_count_job_status_update (ThunarDeepCountJob
*job)
static gboolean
-thunar_deep_count_job_process (ExoJob *job,
- GFile *file,
- GError **error)
+thunar_deep_count_job_process (ExoJob*job,
+ GFile *file,
+ gboolean toplevel_file,
+ GError **error)
{
ThunarDeepCountJob *count_job = THUNAR_DEEP_COUNT_JOB (job);
GFileEnumerator*enumerator;
@@ -192,7 +192,7 @@ thunar_deep_count_job_process (ExoJob *job,
return FALSE;
/* query size and type of the current file */
- info = g_fil
[Xfce4-commits] Make size label files property read write.
Updating branch refs/heads/nick/multiple-file-properties
to d7e4aa7788d756de624df841093c42fee0d323f8 (commit)
from 79cc5cd893b475488974b309d075884f8f5e5c90 (commit)
commit d7e4aa7788d756de624df841093c42fee0d323f8
Author: Nick Schermer
Date: Thu Sep 13 21:55:46 2012 +0200
Make size label files property read write.
thunar/thunar-size-label.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/thunar/thunar-size-label.c b/thunar/thunar-size-label.c
index 1e27e05..06f06ed 100644
--- a/thunar/thunar-size-label.c
+++ b/thunar/thunar-size-label.c
@@ -122,7 +122,7 @@ thunar_size_label_class_init (ThunarSizeLabelClass *klass)
PROP_FILES,
g_param_spec_boxed ("files", "files",
"files",
THUNARX_TYPE_FILE_INFO_LIST,
- EXO_PARAM_WRITABLE));
+ EXO_PARAM_READWRITE));
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Move some code around in size label.
Updating branch refs/heads/nick/multiple-file-properties
to 7a760461ce74e94820f8193b18092ee9a8643b5e (commit)
from d7e4aa7788d756de624df841093c42fee0d323f8 (commit)
commit 7a760461ce74e94820f8193b18092ee9a8643b5e
Author: Nick Schermer
Date: Thu Sep 13 22:01:49 2012 +0200
Move some code around in size label.
thunar/thunar-size-label.c | 20 +++-
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/thunar/thunar-size-label.c b/thunar/thunar-size-label.c
index 06f06ed..68d95b3 100644
--- a/thunar/thunar-size-label.c
+++ b/thunar/thunar-size-label.c
@@ -167,6 +167,14 @@ thunar_size_label_finalize (GObject *object)
{
ThunarSizeLabel *size_label = THUNAR_SIZE_LABEL (object);
+ /* cancel the pending job (if any) */
+ if (G_UNLIKELY (size_label->job != NULL))
+{
+ g_signal_handlers_disconnect_matched (G_OBJECT (size_label->job),
G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, size_label);
+ exo_job_cancel (EXO_JOB (size_label->job));
+ g_object_unref (size_label->job);
+}
+
/* reset the file property */
thunar_size_label_set_files (size_label, NULL);
@@ -300,6 +308,9 @@ thunar_size_label_files_changed (ThunarSizeLabel
*size_label)
g_signal_connect (size_label->job, "finished", G_CALLBACK
(thunar_size_label_finished), size_label);
g_signal_connect (size_label->job, "status-update", G_CALLBACK
(thunar_size_label_status_update), size_label);
+ /* tell the user that we started calculation */
+ gtk_label_set_text (GTK_LABEL (size_label->label), _("Calculating..."));
+
/* launch the job */
exo_job_launch (EXO_JOB (size_label->job));
}
@@ -476,15 +487,6 @@ thunar_size_label_set_files (ThunarSizeLabel *size_label,
_thunar_return_if_fail (THUNAR_IS_SIZE_LABEL (size_label));
_thunar_return_if_fail (files == NULL || THUNAR_IS_FILE (files->data));
- /* stop a running job */
- if (G_UNLIKELY (size_label->job != NULL))
-{
- g_signal_handlers_disconnect_matched (size_label->job,
G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, size_label);
- exo_job_cancel (EXO_JOB (size_label->job));
- g_object_unref (size_label->job);
- size_label->job = NULL;
-}
-
/* disconnect from the previous files */
for (lp = size_label->files; lp != NULL; lp = lp->next)
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Directly show the throbber for deep count jobs.
Updating branch refs/heads/nick/multiple-file-properties
to aebdb9a7529817d0e83e0492fd1fbfa6539231bb (commit)
from 7a760461ce74e94820f8193b18092ee9a8643b5e (commit)
commit aebdb9a7529817d0e83e0492fd1fbfa6539231bb
Author: Nick Schermer
Date: Thu Sep 13 22:20:32 2012 +0200
Directly show the throbber for deep count jobs.
It gives better feedback if the throbber is shown directly
when a deep count job is started. For single files it is always
hidden.
thunar/thunar-deep-count-job.c | 31 ++
thunar/thunar-size-label.c | 65
2 files changed, 23 insertions(+), 73 deletions(-)
diff --git a/thunar/thunar-deep-count-job.c b/thunar/thunar-deep-count-job.c
index bd7f15c..5a8f7ed 100644
--- a/thunar/thunar-deep-count-job.c
+++ b/thunar/thunar-deep-count-job.c
@@ -130,13 +130,7 @@ thunar_deep_count_job_class_init (ThunarDeepCountJobClass
*klass)
static void
thunar_deep_count_job_init (ThunarDeepCountJob *job)
{
- job->files = NULL;
job->query_flags = G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS;
- job->total_size = 0;
- job->file_count = 0;
- job->directory_count = 0;
- job->unreadable_directory_count = 0;
- job->last_time = 0;
}
@@ -271,11 +265,12 @@ thunar_deep_count_job_process (ExoJob*job,
}
/* emit status update whenever we've finished a directory,
- * but not more than fourth per second */
+ * but not more than four times per second */
real_time = thunar_util_get_real_time ();
if (real_time >= count_job->last_time)
{
- thunar_deep_count_job_status_update (count_job);
+ if (count_job->last_time != 0)
+thunar_deep_count_job_status_update (count_job);
count_job->last_time = real_time + (G_USEC_PER_SEC / 4);
}
}
@@ -299,10 +294,11 @@ static gboolean
thunar_deep_count_job_execute (ExoJob *job,
GError **error)
{
- gboolean success;
- GError *err = NULL;
- GList *lp;
- GFile *gfile;
+ ThunarDeepCountJob *count_job = THUNAR_DEEP_COUNT_JOB (job);
+ gbooleansuccess;
+ GError *err = NULL;
+ GList *lp;
+ GFile *gfile;
_thunar_return_val_if_fail (THUNAR_IS_JOB (job), FALSE);
_thunar_return_val_if_fail (error == NULL || *error == NULL, FALSE);
@@ -311,8 +307,15 @@ thunar_deep_count_job_execute (ExoJob *job,
if (exo_job_set_error_if_cancelled (job, error))
return FALSE;
+ /* reset counters */
+ count_job->total_size = 0;
+ count_job->file_count = 0;
+ count_job->directory_count = 0;
+ count_job->unreadable_directory_count = 0;
+ count_job->last_time = 0;
+
/* count files, directories and compute size of the job files */
- for (lp = THUNAR_DEEP_COUNT_JOB (job)->files; lp != NULL; lp = lp->next)
+ for (lp = count_job->files; lp != NULL; lp = lp->next)
{
gfile = thunar_file_get_file (THUNAR_FILE (lp->data));
success = thunar_deep_count_job_process (job, gfile, TRUE, &err);
@@ -340,7 +343,7 @@ thunar_deep_count_job_execute (ExoJob *job,
else if (!exo_job_is_cancelled (job))
{
/* emit final status update at the very end of the computation */
- thunar_deep_count_job_status_update (THUNAR_DEEP_COUNT_JOB (job));
+ thunar_deep_count_job_status_update (count_job);
}
return success;
diff --git a/thunar/thunar-size-label.c b/thunar/thunar-size-label.c
index 68d95b3..e1462c8 100644
--- a/thunar/thunar-size-label.c
+++ b/thunar/thunar-size-label.c
@@ -71,8 +71,6 @@ static void thunar_size_label_status_update
(ThunarDeepCountJob *j
guint
directory_count,
guint
unreadable_directory_count,
ThunarSizeLabel
*size_label);
-static gboolean thunar_size_label_animate_timer (gpointer
user_data);
-static void thunar_size_label_animate_timer_destroy (gpointer
user_data);
@@ -91,9 +89,6 @@ struct _ThunarSizeLabel
GtkWidget *label;
GtkWidget *throbber;
-
- /* the throbber animation is started after a timeout */
- guint animate_timer_id;
};
@@ -178,10 +173,6 @@ thunar_size_label_finalize (GObject *object)
/* reset the file property */
thunar_size_label_set_files (size_label, NULL);
- /* be sure to cancel any pending animate timer */
- if (G_UNLIKELY (size_label->animate_timer_id != 0))
-g_source_remove (size_label->animate_timer_id);
-
(*G_OBJECT_CLASS (thunar_size_label_parent_class)->finalize) (object);
}
@@ -242,10 +233,6 @@ thunar_size_label_button_press_event (GtkWidget
*ebox,
/* left button press on the throbber cancels the calculation */
if (G_LIKELY (event->button == 1))
{
- /* be sure
[Xfce4-commits] Creating branch bluesabre/display-settings
Updating branch refs/heads/bluesabre/display-settings as new branch to cb07302a36e007874b3a886d959d2216f18aac7f (commit) Branches are created implicitly by pushing. This mail only exists to let you know that there was code pushed to refs/heads/bluesabre/display-settings for the first time. Mails for the commits that lead to the creation of the branch will follow after this mail. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Updated glade files.
Updating branch refs/heads/bluesabre/display-settings to cb07302a36e007874b3a886d959d2216f18aac7f (commit) from 2d7524c2783943d7b16e8fe71154e170ad49 (commit) commit cb07302a36e007874b3a886d959d2216f18aac7f Author: Sean Davis Date: Thu Sep 13 16:14:25 2012 -0400 Updated glade files. dialogs/display-settings/confirmation-dialog.glade | 100 +++--- dialogs/display-settings/display-dialog.glade | 382 dialogs/display-settings/extend-left.png | Bin 0 -> 5205 bytes dialogs/display-settings/extend-right.png | Bin 0 -> 5358 bytes .../display-settings/minimal-display-dialog.glade | 229 +++- dialogs/display-settings/mirror.png| Bin 0 -> 8382 bytes 6 files changed, 417 insertions(+), 294 deletions(-) diff --git a/dialogs/display-settings/confirmation-dialog.glade b/dialogs/display-settings/confirmation-dialog.glade index dbf7c76..7b91c7a 100644 --- a/dialogs/display-settings/confirmation-dialog.glade +++ b/dialogs/display-settings/confirmation-dialog.glade @@ -1,26 +1,71 @@ - + - + +False 5 Confirmation False center dialog-question normal -False True -vertical +False 2 + + +True +False +end + + +Keep this configuration +True +True +True +True +True +False + + +False +False +0 + + + + +Restore the previous configuration +True +True +True +False + + +False +False +1 + + + + +False +True +end +0 + + True +False True +False 0.2000298023224 10 gtk-dialog-question @@ -35,10 +80,11 @@ True -vertical +False True +False 0 0 10 @@ -54,6 +100,7 @@ True +False 0 0 10 @@ -68,53 +115,18 @@ +True +True 1 +True +True 1 - - -True -end - - -Keep this configuration -True -True -True -True -True - - -False -False -0 - - - - -Restore the previous configuration -True -True -True - - -False -False -1 - - - - -False -end -0 - - diff --git a/dialogs/display-settings/display-dialog.glade b/dialogs/display-settings/display-dialog.glade index 4960be6..f3d5da0 100644 --- a/dialogs/display-settings/display-dialog.glade +++ b/dialogs/display-settings/display-dialog.glade @@ -1,25 +1,70 @@ - + - + +False Display center-on-parent 400 350 video-display dialog -False Configure screen settings and layout True -vertical +False 2 + + +True +False +end + + +gtk-help +True +True +True +False +True + + +False +False +0 +True + + + + +gtk-close +True +True +True +False +True + + +False +False +1 +
[Xfce4-commits] Update minimal-display-dialog icons
Updating branch refs/heads/bluesabre/display-settings to a4348a65b7be18a25d4ca73cc24746bbb6e3cb67 (commit) from cb07302a36e007874b3a886d959d2216f18aac7f (commit) commit a4348a65b7be18a25d4ca73cc24746bbb6e3cb67 Author: Simon Steinbeiss Date: Thu Sep 13 23:11:53 2012 +0200 Update minimal-display-dialog icons dialogs/display-settings/extend-left.png | Bin 5205 -> 5867 bytes dialogs/display-settings/extend-right.png | Bin 5358 -> 6059 bytes dialogs/display-settings/mirror.png | Bin 8382 -> 6179 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/dialogs/display-settings/extend-left.png b/dialogs/display-settings/extend-left.png index 46966ac..5e0dbd5 100644 Binary files a/dialogs/display-settings/extend-left.png and b/dialogs/display-settings/extend-left.png differ diff --git a/dialogs/display-settings/extend-right.png b/dialogs/display-settings/extend-right.png index 9577e7b..fc520dc 100644 Binary files a/dialogs/display-settings/extend-right.png and b/dialogs/display-settings/extend-right.png differ diff --git a/dialogs/display-settings/mirror.png b/dialogs/display-settings/mirror.png index bbe903f..adc3ae7 100644 Binary files a/dialogs/display-settings/mirror.png and b/dialogs/display-settings/mirror.png differ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
