Wed Apr 5 21:48:39 PDT 2000 Michael Jennings <mej@eterm.org>

	There are now two different sets of settings you can save.  You can
	save user settings, which are the things that one would generally
	consider to be user-specific (toggles, text colors, etc.).  You can
	also save theme settings, which saves *everything*, including the
	stuff that user settings don't include (like imageclasses, menus,
	etc.).  Settings are saved to user.cfg and theme.cfg, respectively.

	Also, Eterm will now detect if it cannot write to the location from
	which it got the theme (i.e., a system-wide directory), and will fall
	back on ~/.Eterm/themes/<theme>.  It WILL create this directory tree
	if it does not already exist.

	Hopefully this will make more people happy. :-)


SVN revision: 2440

8 files changed, 41 insertions, 8 deletions

diff --git a/themes/Eterm/menus.cfg b/themes/Eterm/menus.cfg
index c826a14..99f73ee 100644
--- a/themes/Eterm/menus.cfg
+++ b/themes/Eterm/menus.cfg
@@ -917,10 +917,14 @@ begin menu
   end
   separator
   begin menuitem
-    text "Save Settings..."
+    text "Save User Settings..."
     action string "\e]6;71\a"
   end
   begin menuitem
+    text "Save Theme Settings..."
+    action string "\e]6;71;theme\a"
+  end
+  begin menuitem
     text "Exit"
     action string "\e]6;70\a"
   end
diff --git a/themes/auto/menus.cfg b/themes/auto/menus.cfg
index 88a8cf0..99f73ee 100644
--- a/themes/auto/menus.cfg
+++ b/themes/auto/menus.cfg
@@ -904,6 +904,10 @@ begin menu
   end
   -
   begin menuitem
+    text "New Window..."
+    action string "\e]6;73;Eterm\a"
+  end
+  begin menuitem
     text "Version"
     action string "\e[8n"
   end
@@ -913,10 +917,14 @@ begin menu
   end
   separator
   begin menuitem
-    text "Save Settings..."
+    text "Save User Settings..."
     action string "\e]6;71\a"
   end
   begin menuitem
+    text "Save Theme Settings..."
+    action string "\e]6;71;theme\a"
+  end
+  begin menuitem
     text "Exit"
     action string "\e]6;70\a"
   end
diff --git a/themes/cEterm/menus.cfg b/themes/cEterm/menus.cfg
index c826a14..99f73ee 100644
--- a/themes/cEterm/menus.cfg
+++ b/themes/cEterm/menus.cfg
@@ -917,10 +917,14 @@ begin menu
   end
   separator
   begin menuitem
-    text "Save Settings..."
+    text "Save User Settings..."
     action string "\e]6;71\a"
   end
   begin menuitem
+    text "Save Theme Settings..."
+    action string "\e]6;71;theme\a"
+  end
+  begin menuitem
     text "Exit"
     action string "\e]6;70\a"
   end
diff --git a/themes/chooser/menus.cfg b/themes/chooser/menus.cfg
index 9f332cf..539b9fb 100644
--- a/themes/chooser/menus.cfg
+++ b/themes/chooser/menus.cfg
@@ -983,6 +983,7 @@ begin menu
   STRING_ITEM(`Version', `\e[8n')
   STRING_ITEM(`Status', `\e[9n')
   separator
-  STRING_ITEM(`Save Settings...', `\e]6;71\a')
+  STRING_ITEM(`Save User Settings...', `\e]6;71\a')
+  STRING_ITEM(`Save Theme Settings...', `\e]6;71;theme\a')
   STRING_ITEM(`Exit', `\e]6;70\a')
 end
diff --git a/themes/emacs/menus.cfg b/themes/emacs/menus.cfg
index 7b09fdd..488f5ad 100644
--- a/themes/emacs/menus.cfg
+++ b/themes/emacs/menus.cfg
@@ -1127,10 +1127,14 @@ begin menu
   end
   separator
   begin menuitem
-    text "Save Settings..."
+    text "Save User Settings..."
     action string "\e]6;71\a"
   end
   begin menuitem
+    text "Save Theme Settings..."
+    action string "\e]6;71;theme\a"
+  end
+  begin menuitem
     text "Exit"
     action string "\e]6;70\a"
   end
diff --git a/themes/irc/menus.cfg b/themes/irc/menus.cfg
index c826a14..99f73ee 100644
--- a/themes/irc/menus.cfg
+++ b/themes/irc/menus.cfg
@@ -917,10 +917,14 @@ begin menu
   end
   separator
   begin menuitem
-    text "Save Settings..."
+    text "Save User Settings..."
     action string "\e]6;71\a"
   end
   begin menuitem
+    text "Save Theme Settings..."
+    action string "\e]6;71;theme\a"
+  end
+  begin menuitem
     text "Exit"
     action string "\e]6;70\a"
   end
diff --git a/themes/mutt/menus.cfg b/themes/mutt/menus.cfg
index c512f3e..ea9b084 100644
--- a/themes/mutt/menus.cfg
+++ b/themes/mutt/menus.cfg
@@ -1061,10 +1061,14 @@ begin menu
   end
   separator
   begin menuitem
-    text "Save Settings..."
+    text "Save User Settings..."
     action string "\e]6;71\a"
   end
   begin menuitem
+    text "Save Theme Settings..."
+    action string "\e]6;71;theme\a"
+  end
+  begin menuitem
     text "Exit"
     action string "\e]6;70\a"
   end
diff --git a/themes/trans/menus.cfg b/themes/trans/menus.cfg
index c826a14..99f73ee 100644
--- a/themes/trans/menus.cfg
+++ b/themes/trans/menus.cfg
@@ -917,10 +917,14 @@ begin menu
   end
   separator
   begin menuitem
-    text "Save Settings..."
+    text "Save User Settings..."
     action string "\e]6;71\a"
   end
   begin menuitem
+    text "Save Theme Settings..."
+    action string "\e]6;71;theme\a"
+  end
+  begin menuitem
     text "Exit"
     action string "\e]6;70\a"
   end