Author: colossus
Date: 2008-11-10 10:52:06 +0000 (Mon, 10 Nov 2008)
New Revision: 28706
Modified:
xarchiver/trunk/src/add_dialog.c
xarchiver/trunk/src/add_dialog.h
xarchiver/trunk/src/bzip2.c
xarchiver/trunk/src/extract_dialog.c
xarchiver/trunk/src/main.c
xarchiver/trunk/src/new_dialog.c
xarchiver/trunk/src/tar.c
Log:
Changed lzop suffix to lzo.
Fixed inability to add bzip2/gzip/lzma/lzop compressed files. Thanks to Frank
Caraballo for pointing it out.
Made the Options tab in the add dialog to be grayed out when adding with the
above formats.
Modified: xarchiver/trunk/src/add_dialog.c
===================================================================
--- xarchiver/trunk/src/add_dialog.c 2008-11-10 06:53:10 UTC (rev 28705)
+++ xarchiver/trunk/src/add_dialog.c 2008-11-10 10:52:06 UTC (rev 28706)
@@ -25,7 +25,7 @@
Add_dialog_data *xa_create_add_dialog()
{
- GtkWidget
*label1,*label2,*label3,*label4,*label5,*label7,*hbox1,*hbox2,*hbox3,*hbox4,*option_notebook_vbox;
+ GtkWidget
*label1,*label2,*label3,*label4,*label5,*label7,*hbox1,*hbox2,*hbox3,*hbox4;
GtkWidget
*dialog_action_area1,*alignment1,*alignment2,*alignment3,*vbox3,*frame2,*frame3,*frame4,*alignment4;
Add_dialog_data *add_dialog;
@@ -84,14 +84,14 @@
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(add_dialog->no_store_path),TRUE);
/* Options page */
- option_notebook_vbox = gtk_vbox_new (FALSE, 0);
- gtk_container_add (GTK_CONTAINER (add_dialog->notebook1),
option_notebook_vbox);
+ add_dialog->option_notebook_vbox = gtk_vbox_new (FALSE, 0);
+ gtk_container_add (GTK_CONTAINER (add_dialog->notebook1),
add_dialog->option_notebook_vbox);
label2 = gtk_label_new (_("Options"));
gtk_notebook_set_tab_label (GTK_NOTEBOOK (add_dialog->notebook1),
gtk_notebook_get_nth_page (GTK_NOTEBOOK (add_dialog->notebook1), 1), label2);
hbox2 = gtk_hbox_new (TRUE, 10);
- gtk_box_pack_start (GTK_BOX (option_notebook_vbox), hbox2, TRUE, TRUE,
0);
+ gtk_box_pack_start (GTK_BOX (add_dialog->option_notebook_vbox), hbox2,
TRUE, TRUE, 0);
gtk_container_set_border_width (GTK_CONTAINER (hbox2), 5);
frame4 = gtk_frame_new (NULL);
@@ -134,7 +134,7 @@
gtk_frame_set_label_widget (GTK_FRAME (frame4), label7);
hbox3 = gtk_hbox_new (TRUE, 10);
- gtk_box_pack_start (GTK_BOX (option_notebook_vbox), hbox3, TRUE, TRUE,
0);
+ gtk_box_pack_start (GTK_BOX (add_dialog->option_notebook_vbox), hbox3,
TRUE, TRUE, 0);
gtk_container_set_border_width (GTK_CONTAINER (hbox3), 5);
frame2 = gtk_frame_new (NULL);
@@ -209,7 +209,7 @@
else
gtk_widget_set_size_request (add_dialog->dialog1,530,420);
- if (archive->type == XARCHIVETYPE_BZIP2 || archive->type ==
XARCHIVETYPE_GZIP || archive->type == XARCHIVETYPE_LZMA)
+ if (archive->type == XARCHIVETYPE_BZIP2 || archive->type ==
XARCHIVETYPE_GZIP || archive->type == XARCHIVETYPE_LZMA || archive->type ==
XARCHIVETYPE_LZOP)
gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(add_dialog->filechooserwidget1),FALSE);
else
gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(add_dialog->filechooserwidget1),TRUE);
@@ -222,12 +222,18 @@
else
gtk_widget_set_sensitive(add_dialog->store_path,TRUE);
/* 7z doesn't appear to let the user chooses if storing full paths */
- if (archive->type == XARCHIVETYPE_7ZIP || archive->type ==
XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP || archive->type ==
XARCHIVETYPE_LZMA)
+ if (archive->type == XARCHIVETYPE_7ZIP || archive->type ==
XARCHIVETYPE_LZOP || archive->type == XARCHIVETYPE_BZIP2 || archive->type ==
XARCHIVETYPE_GZIP || archive->type == XARCHIVETYPE_LZMA)
{
- gtk_widget_set_sensitive(label3,FALSE);
- gtk_widget_set_sensitive(add_dialog->store_path,FALSE);
- gtk_widget_set_sensitive(add_dialog->no_store_path,FALSE);
+ flag = FALSE;
}
+ else
+ flag = TRUE;
+
+ gtk_widget_set_sensitive(add_dialog->option_notebook_vbox,flag);
+ gtk_widget_set_sensitive(label3,flag);
+ gtk_widget_set_sensitive(add_dialog->store_path,flag);
+ gtk_widget_set_sensitive(add_dialog->no_store_path,flag);
+
if (archive->type != XARCHIVETYPE_7ZIP)
g_signal_connect (G_OBJECT
(add_dialog->update),"toggled",G_CALLBACK (add_update_fresh_toggled_cb) ,
add_dialog);
Modified: xarchiver/trunk/src/add_dialog.h
===================================================================
--- xarchiver/trunk/src/add_dialog.h 2008-11-10 06:53:10 UTC (rev 28705)
+++ xarchiver/trunk/src/add_dialog.h 2008-11-10 10:52:06 UTC (rev 28706)
@@ -32,6 +32,7 @@
GSList *path_group;
GtkWidget *store_path;
GtkWidget *no_store_path;
+ GtkWidget *option_notebook_vbox;
GtkWidget *remove_files;
GtkWidget *update;
GtkWidget *freshen;
Modified: xarchiver/trunk/src/bzip2.c
===================================================================
--- xarchiver/trunk/src/bzip2.c 2008-11-10 06:53:10 UTC (rev 28705)
+++ xarchiver/trunk/src/bzip2.c 2008-11-10 10:52:06 UTC (rev 28706)
@@ -87,7 +87,7 @@
{
archive->format = "LZOP";
executable = "lzop ";
- len = 5;
+ len = 4;
} /* else fail? */
archive->can_add = archive->has_test = archive->has_sfx = FALSE;
archive->has_properties = archive->can_extract = TRUE;
Modified: xarchiver/trunk/src/extract_dialog.c
===================================================================
--- xarchiver/trunk/src/extract_dialog.c 2008-11-10 06:53:10 UTC (rev
28705)
+++ xarchiver/trunk/src/extract_dialog.c 2008-11-10 10:52:06 UTC (rev
28706)
@@ -815,7 +815,9 @@
archive->type = XARCHIVETYPE_TAR_LZMA;
archive->extract = extract[XARCHIVETYPE_TAR_LZMA];
}
- else if (g_str_has_suffix(archive->escaped_path,".tar.lzop")||
g_str_has_suffix (archive->escaped_path,".tzo"))
+ else if (g_str_has_suffix(archive->escaped_path,".tar.lzop") ||
+ g_str_has_suffix (archive->escaped_path,".tzo") ||
+ g_str_has_suffix(archive->escaped_path,".tar.lzo"))
{
archive->type = XARCHIVETYPE_TAR_LZOP;
archive->extract = extract[XARCHIVETYPE_TAR_LZOP];
Modified: xarchiver/trunk/src/main.c
===================================================================
--- xarchiver/trunk/src/main.c 2008-11-10 06:53:10 UTC (rev 28705)
+++ xarchiver/trunk/src/main.c 2008-11-10 10:52:06 UTC (rev 28706)
@@ -395,8 +395,8 @@
absolute_path = g_find_program_in_path("lzop");
if ( absolute_path )
{
- ArchiveType = g_list_append(ArchiveType, "lzop");
- ArchiveSuffix = g_list_append(ArchiveSuffix, "*.lzop");
+ ArchiveType = g_list_append(ArchiveType, "lzo");
+ ArchiveSuffix = g_list_append(ArchiveSuffix, "*.lzo");
g_free (absolute_path);
}
Modified: xarchiver/trunk/src/new_dialog.c
===================================================================
--- xarchiver/trunk/src/new_dialog.c 2008-11-10 06:53:10 UTC (rev 28705)
+++ xarchiver/trunk/src/new_dialog.c 2008-11-10 10:52:06 UTC (rev 28706)
@@ -209,7 +209,7 @@
type = XARCHIVETYPE_GZIP;
else if (strcmp ( ComboArchiveType,"lzma") == 0)
type = XARCHIVETYPE_LZMA;
- else if (strcmp ( ComboArchiveType,"lzop") == 0)
+ else if (strcmp ( ComboArchiveType,"lzo") == 0)
type = XARCHIVETYPE_LZOP;
else if (strcmp ( ComboArchiveType,"rar") == 0)
type = XARCHIVETYPE_RAR;
Modified: xarchiver/trunk/src/tar.c
===================================================================
--- xarchiver/trunk/src/tar.c 2008-11-10 06:53:10 UTC (rev 28705)
+++ xarchiver/trunk/src/tar.c 2008-11-10 10:52:06 UTC (rev 28706)
@@ -253,6 +253,22 @@
files->str , NULL );
break;
+ case XARCHIVETYPE_BZIP2:
+ command = g_strconcat("sh -c \"bzip2 -c ",files->str,">
",archive->escaped_path,"\"",NULL);
+ break;
+
+ case XARCHIVETYPE_GZIP:
+ command = g_strconcat("sh -c \"gzip -c ",files->str,">
",archive->escaped_path,"\"",NULL);
+ break;
+
+ case XARCHIVETYPE_LZMA:
+ command = g_strconcat("sh -c \"lzma -c ",files->str,">
",archive->escaped_path,"\"",NULL);
+ break;
+
+ case XARCHIVETYPE_LZOP:
+ command = g_strconcat("sh -c \"lzop -c ",files->str,">
",archive->escaped_path,"\"",NULL);
+ break;
+
default:
command = NULL;
}
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
