Author: colossus
Date: 2007-08-12 19:50:28 +0000 (Sun, 12 Aug 2007)
New Revision: 25978
Modified:
xarchiver/trunk/src/7zip.c
xarchiver/trunk/src/interface.c
xarchiver/trunk/src/interface.h
xarchiver/trunk/src/main.c
xarchiver/trunk/src/main.h
xarchiver/trunk/src/rar.c
xarchiver/trunk/src/rar.h
Log:
Fixed location entry visibility when it is not checked in the prefs dialog.
Fixed 7z command when only 7zr executable is in path.
Fixed missed padlock entry in rar.
Modified: xarchiver/trunk/src/7zip.c
===================================================================
--- xarchiver/trunk/src/7zip.c 2007-08-12 16:42:57 UTC (rev 25977)
+++ xarchiver/trunk/src/7zip.c 2007-08-12 19:50:28 UTC (rev 25978)
@@ -21,6 +21,7 @@
#include "7zip.h"
extern gboolean sevenzr;
+extern gboolean sevenza;
extern void xa_create_liststore ( XArchive *archive, gchar *columns_names[]);
gchar *exe;
@@ -31,11 +32,10 @@
if (sevenzr)
exe = "7zr ";
- else
+ if (sevenza)
exe = "7za ";
gchar *command = g_strconcat ( exe,"l " , archive->escaped_path, NULL );
- g_print (command);
archive->has_sfx = archive->has_properties = archive->can_add =
archive->can_extract = archive->has_test = TRUE;
archive->dummy_size = 0;
archive->nr_of_files = 0;
Modified: xarchiver/trunk/src/interface.c
===================================================================
--- xarchiver/trunk/src/interface.c 2007-08-12 16:42:57 UTC (rev 25977)
+++ xarchiver/trunk/src/interface.c 2007-08-12 19:50:28 UTC (rev 25978)
@@ -47,15 +47,13 @@
extern gboolean unrar;
-GtkWidget *create_MainWindow (void)
+void xa_create_mainwindow (GtkWidget *MainWindow,gboolean show_location)
{
GdkPixbuf *icon;
GtkIconTheme *icon_theme;
tooltips = gtk_tooltips_new ();
accel_group = gtk_accel_group_new ();
-
- MainWindow = gtk_window_new (GTK_WINDOW_TOPLEVEL);
xa_set_window_title (MainWindow , NULL);
icon_theme = gtk_icon_theme_get_default();
@@ -392,7 +390,8 @@
location_entry = gtk_entry_new();
gtk_box_pack_start (GTK_BOX (hbox1), location_entry, TRUE, TRUE, 0);
g_signal_connect (G_OBJECT (location_entry), "activate",
G_CALLBACK (xa_location_entry_activated), NULL);
- gtk_widget_show_all(toolbar2);
+ if (show_location)
+ gtk_widget_show_all(toolbar2);
/* Create the notebook widget */
notebook = GTK_NOTEBOOK(gtk_notebook_new() );
@@ -463,7 +462,6 @@
g_signal_connect (MainWindow, "key-press-event", G_CALLBACK
(key_press_function), NULL);
gtk_window_add_accel_group (GTK_WINDOW (MainWindow), accel_group);
- return MainWindow;
}
int xa_progressbar_pulse (gpointer data)
@@ -481,15 +479,15 @@
gint id;
GtkTreeSelection *selection;
- id = xa_find_archive_index ( page_num );
+ id = xa_find_archive_index (page_num);
if (id == -1)
return;
xa_set_window_title (MainWindow , archive[id]->path);
if (archive[id]->type == XARCHIVETYPE_ISO)
- gtk_widget_set_sensitive ( iso_info,TRUE );
+ gtk_widget_set_sensitive (iso_info,TRUE);
else
- gtk_widget_set_sensitive ( iso_info,FALSE );
+ gtk_widget_set_sensitive (iso_info,FALSE);
if ( GTK_WIDGET_VISIBLE (viewport2) )
{
@@ -502,7 +500,6 @@
gtk_widget_set_sensitive ( Stop_button , TRUE);
return;
}
-
xa_set_button_state
(1,1,GTK_WIDGET_IS_SENSITIVE(close1),archive[id]->can_add,archive[id]->can_extract,archive[id]->has_sfx,archive[id]->has_test,archive[id]->has_properties);
here:
@@ -515,7 +512,7 @@
{
selection = gtk_tree_view_get_selection ( GTK_TREE_VIEW
(archive[id]->treeview) );
gint selected = gtk_tree_selection_count_selected_rows (
selection );
- if (selected == 0 )
+ if (selected == 0)
xa_disable_delete_view_buttons (FALSE);
else
{
@@ -534,6 +531,9 @@
gtk_widget_set_sensitive ( view_menu, TRUE );
}
}
+ /* Let's set the location entry */
+ if (archive[id]->location_entry_path != NULL)
+
gtk_entry_set_text(GTK_ENTRY(location_entry),archive[id]->location_entry_path);
gtk_widget_grab_focus (GTK_WIDGET(archive[id]->treeview));
}
}
Modified: xarchiver/trunk/src/interface.h
===================================================================
--- xarchiver/trunk/src/interface.h 2007-08-12 16:42:57 UTC (rev 25977)
+++ xarchiver/trunk/src/interface.h 2007-08-12 19:50:28 UTC (rev 25978)
@@ -119,7 +119,7 @@
void set_label (GtkWidget *label,gchar *text);
int xa_progressbar_pulse (gpointer data);
GtkWidget *view_win ( gchar *title);
-GtkWidget *create_MainWindow (void);
+void xa_create_mainwindow (GtkWidget *MainWindow,gboolean show_location);
GtkWidget *create_archive_properties_window (void);
void xa_handle_navigation_buttons (GtkMenuItem *menuitem, gpointer user_data);
void xa_add_page (XArchive *archive);
Modified: xarchiver/trunk/src/main.c
===================================================================
--- xarchiver/trunk/src/main.c 2007-08-12 16:42:57 UTC (rev 25977)
+++ xarchiver/trunk/src/main.c 2007-08-12 19:50:28 UTC (rev 25978)
@@ -34,7 +34,7 @@
gboolean error_output, file_to_open, ask_and_extract, ask_and_add;
gboolean cli = FALSE;
gboolean unrar = FALSE;
-gboolean sevenzr = FALSE;
+gboolean sevenzr = FALSE, sevenza = FALSE;
extern gchar *current_open_directory;
Prefs_dialog_data *prefs_window = NULL;
@@ -93,10 +93,10 @@
if (cli == TRUE)
{
- GetAvailableCompressors();
+ xa_get_available_archivers();
ArchiveSuffix = g_list_reverse (ArchiveSuffix);
ArchiveType = g_list_reverse (ArchiveType);
- MainWindow = create_MainWindow ();
+ // MainWindow = create_MainWindow (FALSE);
gtk_main_iteration_do (FALSE);
g_print ("Xarchiver " VERSION " (\xC2\xA9)2005-2007 Giuseppe
Torelli (colossus73)\n\n");
@@ -219,13 +219,15 @@
}
else
{
- GetAvailableCompressors();
+ xa_get_available_archivers();
ArchiveSuffix = g_list_reverse (ArchiveSuffix);
ArchiveType = g_list_reverse (ArchiveType);
- MainWindow = create_MainWindow ();
+ MainWindow = gtk_window_new (GTK_WINDOW_TOPLEVEL);
prefs_window = xa_create_prefs_dialog();
xa_prefs_load_options (prefs_window);
+
+ xa_create_mainwindow (MainWindow,gtk_toggle_button_get_active
(GTK_TOGGLE_BUTTON (prefs_window->show_location_bar)));
if
(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefs_window->check_save_geometry))
&& prefs_window->geometry[0] != -1)
{
@@ -283,7 +285,7 @@
return result;
}
-void GetAvailableCompressors()
+void xa_get_available_archivers()
{
absolute_path = g_find_program_in_path("arj");
if ( absolute_path )
@@ -404,9 +406,11 @@
}
}
absolute_path = g_find_program_in_path("7za");
- if (absolute_path == NULL)
+ if (absolute_path != NULL)
+ sevenza = TRUE;
+ else
absolute_path = g_find_program_in_path("7zr");
- if (absolute_path)
+ if (absolute_path != NULL)
{
sevenzr = TRUE;
ArchiveType = g_list_prepend ( ArchiveType, "7z");
Modified: xarchiver/trunk/src/main.h
===================================================================
--- xarchiver/trunk/src/main.h 2007-08-12 16:42:57 UTC (rev 25977)
+++ xarchiver/trunk/src/main.h 2007-08-12 19:50:28 UTC (rev 25978)
@@ -31,7 +31,7 @@
GList *ArchiveType;
const gchar *locale;
-void GetAvailableCompressors();
+void xa_get_available_archivers();
gchar *config_file;
gchar *get_argv_filename(const gchar *filename);
gboolean SpawnSyncCommand ( gchar *command );
Modified: xarchiver/trunk/src/rar.c
===================================================================
--- xarchiver/trunk/src/rar.c 2007-08-12 16:42:57 UTC (rev 25977)
+++ xarchiver/trunk/src/rar.c 2007-08-12 19:50:28 UTC (rev 25978)
@@ -29,7 +29,7 @@
unsigned short int i;
gchar *command = NULL;
gchar *rar = NULL;
- jump_header = read_filename = last_line = FALSE;
+ jump_header = read_filename = last_line = encrypted = FALSE;
if (unrar)
{
@@ -49,7 +49,7 @@
archive->nr_of_dirs = 0;
archive->nc = 9;
archive->parse_output = xa_get_rar_line_content;
- archive->format ="RAR";
+ archive->format = "RAR";
xa_spawn_async_process (archive,command,0);
g_free ( command );
@@ -62,7 +62,7 @@
archive->column_types[i] = types[i];
char *names[]=
{(_("Original")),(_("Compressed")),(_("Ratio")),(_("Date")),(_("Time")),(_("Permissions")),(_("CRC")),(_("Method")),(_("Version"))};
- xa_create_liststore (archive,names);
+ xa_create_liststore (archive,names);
}
void xa_get_rar_line_content (gchar *line, gpointer data)
@@ -73,10 +73,8 @@
gpointer item[9];
unsigned short int i = 0;
unsigned int linesize,n,a;
- gboolean encrypted,dir;
+ gboolean dir = FALSE;
- encrypted = dir = FALSE;
-
if (last_line)
return;
@@ -202,5 +200,6 @@
entry = xa_set_archive_entries_for_each_row
(archive,filename,encrypted,item);
g_free(filename);
read_filename = FALSE;
+ encrypted = FALSE;
}
}
Modified: xarchiver/trunk/src/rar.h
===================================================================
--- xarchiver/trunk/src/rar.h 2007-08-12 16:42:57 UTC (rev 25977)
+++ xarchiver/trunk/src/rar.h 2007-08-12 19:50:28 UTC (rev 25978)
@@ -24,7 +24,7 @@
#include "string_utils.h"
#include "support.h"
#include "archive.h"
-gboolean jump_header,read_filename, last_line;
+gboolean jump_header,read_filename, last_line, encrypted;
gchar *filename;
void xa_open_rar ( XArchive *archive );
#endif
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
