file-roller r2424 - in trunk: . data/glade help help/C src
- From: paobac svn gnome org
- To: svn-commits-list gnome org
- Subject: file-roller r2424 - in trunk: . data/glade help help/C src
- Date: Thu, 14 Aug 2008 16:43:58 +0000 (UTC)
Author: paobac
Date: Thu Aug 14 16:43:58 2008
New Revision: 2424
URL: http://svn.gnome.org/viewvc/file-roller?rev=2424&view=rev
Log:
2008-08-14 Paolo Bacchilega <paobac svn gnome org>
* src/dlg-extract.c: removed the password from the extract dialog,
because this dialog is already full of options and the password
entry is redundant because if the archive is encrypted the
password will be requested during the extraction.
* data/glade/new.glade: removed the requires-version tag which causes
a warning.
Modified:
trunk/ChangeLog
trunk/data/glade/new.glade
trunk/help/C/file-roller.xml
trunk/help/ChangeLog
trunk/src/dlg-extract.c
Modified: trunk/data/glade/new.glade
==============================================================================
--- trunk/data/glade/new.glade (original)
+++ trunk/data/glade/new.glade Thu Aug 14 16:43:58 2008
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
<glade-interface>
- <requires-version lib="gtk+" version="2.12"/>
<widget class="GtkFileChooserDialog" id="filechooserdialog">
<property name="border_width">5</property>
<property name="modal">True</property>
Modified: trunk/help/C/file-roller.xml
==============================================================================
--- trunk/help/C/file-roller.xml (original)
+++ trunk/help/C/file-roller.xml Thu Aug 14 16:43:58 2008
@@ -1509,10 +1509,10 @@
<variablelist>
<!-- ============= -->
<varlistentry>
- <term><guilabel>Files</guilabel></term>
+ <term><guilabel>Extract</guilabel></term>
<listitem>
<para>
- Select one of the following extract options:
+ Select the files to be extracted:
</para>
<variablelist>
<varlistentry>
@@ -1542,65 +1542,58 @@
</variablelist>
</listitem>
</varlistentry>
- <!-- ============= -->
- <varlistentry>
- <term><guilabel>Re-create folders</guilabel></term>
- <listitem><para>
- Select this option to reconstruct the folder structure when extracting the specified files. </para>
- <para>For example, you specify <filename>/tmp</filename> in the <guilabel>Filename</guilabel> text box and choose to extract all files. The archive contains a subfolder called <filename>doc</filename>.
- <itemizedlist>
- <listitem><para>
- If you select the <guilabel>Re-create folders</guilabel> option, &app; extracts the contents of the subfolder to <filename>/tmp/doc</filename>.
- </para>
- </listitem>
- <listitem><para>
- If you do not select the <guilabel>Re-create folders</guilabel> option, &app; does not create any subfolders. Instead, &app; extracts all files from the archive, including files from subfolders, to <filename>/tmp</filename>.
- </para>
- </listitem>
- </itemizedlist>
- </para></listitem>
- </varlistentry>
- <!-- ============= -->
- <varlistentry>
- <term><guilabel>Overwrite existing files</guilabel> </term>
- <listitem><para>
- Select this option to overwrite any files in the destination folder that have the same name as the specified files. </para>
- <para>
- If you do not select this option, &app; does not extract the specified file if an existing file with the same name already exists in the destination folder.</para>
- </listitem>
- </varlistentry>
- <!-- ============= -->
+ <!-- ============= -->
<varlistentry>
- <term><guilabel>Do not extract older files</guilabel> </term>
- <listitem><para>This option is only effective while the <guilabel>Overwrite existing files</guilabel> option is selected.
- </para>
- <para>
- Select the <guilabel>Do not extract older files</guilabel> option to extract the specified file only if the destination folder does not contain the specified file, or if the destination folder contains an older version of the specified file. &app; uses the modification date to determine which file is the most recent. If the version of the file in the archive is older, &app; does not extract the specified file to the destination folder.</para>
- <para>
- If you do not select the <guilabel>Do not extract older files</guilabel> option while the <guilabel>Overwrite existing files</guilabel> option is selected, &app; extracts the specified file from the archive and overwrites the previous contents of the destination folder.
- </para></listitem>
- </varlistentry>
- <!-- ============= -->
- <varlistentry>
- <term><guilabel>Password</guilabel></term>
- <listitem><para>This option is only enabled if the archive type supports encryption. Currently, only 7-ZIP, ZIP, RAR and ARJ archives support encryption. </para>
- <para>
- If the archive contains encrypted files, enter the required password in the <guilabel>Password</guilabel> text box to decrypt the specified files during the extraction process. The required password is the encryption password that was specified when the archive was created. For more information, see <xref linkend="file-roller-encrypt-files"/>.
- </para>
+ <term><guilabel>Actions</guilabel></term>
+ <listitem>
<para>
- Alternatively, you can enter the required password in the <guilabel>Password</guilabel> dialog. To display the <guilabel>Password</guilabel> dialog, choose <menuchoice><guimenu>Edit</guimenu> <guimenuitem>Password</guimenuitem></menuchoice>.
- </para>
- </listitem>
- </varlistentry>
- <!-- ============= -->
- <varlistentry>
- <term><guilabel>Open destination folder after extraction</guilabel></term>
- <listitem><para>
- Select this option to display the contents of the destination folder in a file manager window when the extraction of the specified files is completed. </para>
- </listitem>
- </varlistentry>
- </variablelist>
-</sect1>
+ Select the following extract options:
+ </para>
+ <variablelist>
+ <varlistentry>
+ <term><guilabel>Re-create folders</guilabel></term>
+ <listitem><para>
+ Select this option to reconstruct the folder structure when extracting the specified files. </para>
+ <para>For example, you specify <filename>/tmp</filename> in the <guilabel>Filename</guilabel> text box and choose to extract all files. The archive contains a subfolder called <filename>doc</filename>.
+ <itemizedlist>
+ <listitem><para>
+ If you select the <guilabel>Re-create folders</guilabel> option, &app; extracts the contents of the subfolder to <filename>/tmp/doc</filename>.
+ </para>
+ </listitem>
+ <listitem><para>
+ If you do not select the <guilabel>Re-create folders</guilabel> option, &app; does not create any subfolders. Instead, &app; extracts all files from the archive, including files from subfolders, to <filename>/tmp</filename>.
+ </para>
+ </listitem>
+ </itemizedlist>
+ </para></listitem>
+ </varlistentry>
+ <!-- ============= -->
+ <varlistentry>
+ <term><guilabel>Overwrite existing files</guilabel> </term>
+ <listitem><para>
+ Select this option to overwrite any files in the destination folder that have the same name as the specified files. </para>
+ <para>
+ If you do not select this option, &app; does not extract the specified file if an existing file with the same name already exists in the destination folder.</para>
+ </listitem>
+ </varlistentry>
+ <!-- ============= -->
+ <varlistentry>
+ <term><guilabel>Do not extract older files</guilabel> </term>
+ <listitem>
+ <para>This option is only effective while the <guilabel>Overwrite existing files</guilabel> option is selected.
+ </para>
+ <para>
+ Select the <guilabel>Do not extract older files</guilabel> option to extract the specified file only if the destination folder does not contain the specified file, or if the destination folder contains an older version of the specified file. &app; uses the modification date to determine which file is the most recent. If the version of the file in the archive is older, &app; does not extract the specified file to the destination folder.</para>
+ <para>
+ If you do not select the <guilabel>Do not extract older files</guilabel> option while the <guilabel>Overwrite existing files</guilabel> option is selected, &app; extracts the specified file from the archive and overwrites the previous contents of the destination folder.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </sect1>
</article>
Modified: trunk/src/dlg-extract.c
==============================================================================
--- trunk/src/dlg-extract.c (original)
+++ trunk/src/dlg-extract.c Thu Aug 14 16:43:58 2008
@@ -50,8 +50,6 @@
GtkWidget *e_recreate_dir_checkbutton;
GtkWidget *e_overwrite_checkbutton;
GtkWidget *e_not_newer_checkbutton;
- GtkWidget *e_password_entry;
- GtkWidget *e_password_hbox;
gboolean extract_clicked;
} DialogData;
@@ -85,7 +83,6 @@
gboolean pattern_files;
gboolean junk_paths;
GList *file_list;
- char *password;
char *base_dir = NULL;
GError *error = NULL;
@@ -206,16 +203,6 @@
selected_files = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->e_selected_radiobutton));
pattern_files = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->e_files_radiobutton));
- if (GTK_WIDGET_SENSITIVE (data->e_password_entry)) {
- password = _gtk_entry_get_locale_text (GTK_ENTRY (data->e_password_entry));
- if ((password != NULL) && (password[0] == 0)) {
- g_free (password);
- password = NULL;
- }
- }
- else
- password = NULL;
-
/* create the file list. */
file_list = NULL;
@@ -232,7 +219,6 @@
if (file_list == NULL) {
gtk_widget_destroy (data->dialog);
g_free (extract_to_dir);
- g_free (password);
return FALSE;
}
}
@@ -250,7 +236,6 @@
/* extract ! */
- fr_window_set_password (window, password);
fr_window_archive_extract (window,
file_list,
extract_to_dir,
@@ -263,7 +248,6 @@
path_list_free (file_list);
g_free (extract_to_dir);
g_free (base_dir);
- g_free (password);
return TRUE;
}
@@ -338,7 +322,6 @@
GtkWidget *hbox30;
GtkWidget *label48;
GtkWidget *vbox15;
- GtkWidget *label31;
vbox1 = gtk_vbox_new (FALSE, 6);
gtk_container_set_border_width (GTK_CONTAINER (vbox1), 0);
@@ -350,7 +333,7 @@
gtk_box_pack_start (GTK_BOX (hbox28), vbox19, TRUE, TRUE, 0);
e_files_label = gtk_label_new ("");
- set_bold_label (e_files_label, _("Files"));
+ set_bold_label (e_files_label, _("Extract"));
gtk_box_pack_start (GTK_BOX (vbox19), e_files_label, FALSE, FALSE, 0);
gtk_label_set_justify (GTK_LABEL (e_files_label), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (e_files_label), 0, 0.5);
@@ -426,19 +409,6 @@
data->e_not_newer_checkbutton = gtk_check_button_new_with_mnemonic (_("Do not e_xtract older files"));
gtk_box_pack_start (GTK_BOX (vbox15), data->e_not_newer_checkbutton, FALSE, FALSE, 0);
- data->e_password_hbox = gtk_hbox_new (FALSE, 5);
- gtk_box_pack_start (GTK_BOX (vbox15), data->e_password_hbox, TRUE, TRUE, 0);
-
- label31 = gtk_label_new_with_mnemonic (_("_Password:"));
- gtk_box_pack_start (GTK_BOX (data->e_password_hbox), label31, FALSE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (label31), GTK_JUSTIFY_LEFT);
-
- data->e_password_entry = gtk_entry_new ();
- gtk_box_pack_start (GTK_BOX (data->e_password_hbox), data->e_password_entry, TRUE, TRUE, 0);
- gtk_entry_set_activates_default (GTK_ENTRY (data->e_password_entry), TRUE);
- gtk_entry_set_visibility (GTK_ENTRY (data->e_password_entry), FALSE);
- gtk_label_set_mnemonic_widget (GTK_LABEL (label31), data->e_password_entry);
-
gtk_widget_show_all (vbox1);
return vbox1;
@@ -488,13 +458,6 @@
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->e_all_radiobutton), TRUE);
}
- if (window->archive->command->propPassword) {
- gtk_widget_set_sensitive (data->e_password_hbox, TRUE);
- _gtk_entry_set_locale_text (GTK_ENTRY (data->e_password_entry), fr_window_get_password (window));
- }
- else
- gtk_widget_set_sensitive (data->e_password_hbox, FALSE);
-
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->e_overwrite_checkbutton), eel_gconf_get_boolean (PREF_EXTRACT_OVERWRITE, FALSE));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->e_not_newer_checkbutton), eel_gconf_get_boolean (PREF_EXTRACT_SKIP_NEWER, FALSE));
if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->e_overwrite_checkbutton))) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
