file-roller r2375 - in trunk: . data src

[paobac svn gnome org]

Author: paobac
Date: Mon Jul 21 21:10:02 2008
New Revision: 2375
URL: http://svn.gnome.org/viewvc/file-roller?rev=2375&view=rev

Log:
2008-07-21  Paolo Bacchilega  <paobac svn gnome org>

	* src/preferences.h: 
	* src/dlg-batch-add.c: 
	* data/file-roller.schemas: 

	Save and restore the volume size.


Modified:
   trunk/ChangeLog
   trunk/data/file-roller.schemas
   trunk/src/dlg-batch-add.c
   trunk/src/preferences.h

Modified: trunk/data/file-roller.schemas
==============================================================================
--- trunk/data/file-roller.schemas	(original)
+++ trunk/data/file-roller.schemas	Mon Jul 21 21:10:02 2008
@@ -410,5 +410,17 @@
         </locale>
       </schema>
 
+      <schema>
+        <key>/schemas/apps/file-roller/dialogs/batch-add/volume_size</key>
+	<applyto>/apps/file-roller/dialogs/batch-add/volume_size</applyto>
+        <owner>file-roller</owner>
+        <type>int</type>
+        <default>0</default>
+        <locale name="C">
+          <short>Default volume size</short>
+          <long>The default size for volumes.</long>
+        </locale>
+      </schema>
+
   </schemalist>
 </gconfschemafile>

Modified: trunk/src/dlg-batch-add.c
==============================================================================
--- trunk/src/dlg-batch-add.c	(original)
+++ trunk/src/dlg-batch-add.c	Mon Jul 21 21:10:02 2008
@@ -44,6 +44,8 @@
 #define ARCHIVE_ICON_SIZE (48)
 #define DEFAULT_EXTENSION ".tar.gz"
 #define BAD_CHARS "/\\*"
+#define MEGABYTE (1024 * 1024)
+
 
 typedef struct {
 	FrWindow   *window;
@@ -131,9 +133,12 @@
 	    && gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->a_volume_checkbutton)))
 	{
 		double value;
+		int    size;
 
 		value = gtk_spin_button_get_value (GTK_SPIN_BUTTON (data->a_volume_spinbutton));
-		fr_window_set_volume_size (data->window, (guint) floor (value * 1024 * 1024));
+		size = floor (value * MEGABYTE);
+		eel_gconf_set_integer (PREF_BATCH_VOLUME_SIZE, size);
+		fr_window_set_volume_size (data->window, (guint) size);
 	}
 }
 
@@ -540,6 +545,7 @@
 	gtk_button_set_label (GTK_BUTTON (add_button), FR_STOCK_CREATE_ARCHIVE);
 	gtk_expander_set_expanded (GTK_EXPANDER (data->a_other_options_expander), eel_gconf_get_boolean (PREF_BATCH_OTHER_OPTIONS, FALSE));
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->a_encrypt_header_checkbutton), eel_gconf_get_boolean (PREF_ENCRYPT_HEADER, FALSE));
+	gtk_spin_button_set_value (GTK_SPIN_BUTTON (data->a_volume_spinbutton), (double) eel_gconf_get_integer (PREF_BATCH_VOLUME_SIZE, 0) / MEGABYTE);
 
 	first_filename = (char*) file_list->data;
 	parent = remove_level_from_path (first_filename);

Modified: trunk/src/preferences.h
==============================================================================
--- trunk/src/preferences.h	(original)
+++ trunk/src/preferences.h	Mon Jul 21 21:10:02 2008
@@ -66,6 +66,7 @@
 
 #define PREF_BATCH_ADD_DEFAULT_EXTENSION "/apps/file-roller/dialogs/batch-add/default_extension"
 #define PREF_BATCH_OTHER_OPTIONS         "/apps/file-roller/dialogs/batch-add/other_options"
+#define PREF_BATCH_VOLUME_SIZE           "/apps/file-roller/dialogs/batch-add/volume_size"
 
 #define PREF_DESKTOP_ICON_THEME         "/desktop/gnome/file_views/icon_theme"
 #define PREF_DESKTOP_MENUS_HAVE_TEAROFF "/desktop/gnome/interface/menus_have_tearoff"