--- a/SettingsDialog.st	Thu Feb 20 13:37:05 2003 +0100
+++ b/SettingsDialog.st	Thu Feb 20 13:43:41 2003 +0100
@@ -216,14 +216,14 @@
                                 #label: 'Save as...'
                                 #name: 'Button1'
                                 #translateLabel: true
-                                #model: #saveSettings
+                                #model: #saveSettingsIntoFile
                                 #extent: #(#Point 128 22)
                               )
                              #(#ActionButtonSpec
                                 #label: 'Load from...'
                                 #name: 'Button2'
                                 #translateLabel: true
-                                #model: #loadSettings
+                                #model: #loadSettingsFromFile
                                 #extent: #(#Point 128 22)
                               )
                              )
@@ -356,12 +356,12 @@
               #(
                #(#MenuItem
                   #label: 'Load from...'
-                  #itemValue: #loadSettings
+                  #itemValue: #loadSettingsFromFile
                   #translateLabel: true
                 )
                #(#MenuItem
                   #label: 'Save as...'
-                  #itemValue: #saveSettings
+                  #itemValue: #saveSettingsIntoFile
                   #translateLabel: true
                 )
                #(#MenuItem
@@ -414,12 +414,13 @@
 !
 
 doReload
-
-    | item |
+    |item|
 
     item := self selectedItem value.
-    (item isNil or:[item isCategory or:[item application isNil]]) ifTrue:[ ^ self].
-    item application loadRequest.
+    (item isNil or:[item isCategory or:[item application isNil]]) ifTrue:[
+        ^ self
+    ].
+    item application readSettings
 !
 
 doSave
@@ -428,7 +429,7 @@
     item := self selectedItem value.
     (item isNil or:[item isCategory or:[item application isNil]]) ifTrue:[ ^ self].
     self withWaitCursorDo:[
-        item application saveSettings.
+        item application saveSettingsIfUnsavedChangesArePresent.
     ].
 !
 
@@ -442,11 +443,10 @@
 !
 
 sendLoadRequestToAll
-
-    self applicationList do:[ : applItem |
+    self applicationList do:[:applItem | 
         (applItem isCategory not and:[applItem application notNil]) ifTrue:[
-            ^ applItem application loadRequest 
-        ].
+            ^ applItem application readSettings
+        ]
     ].
     ^ true
 !
@@ -808,7 +808,7 @@
 
 !SettingsDialog methodsFor:'menu actions'!
 
-loadSettings
+loadSettingsFromFile
 
     "restore settings from a settings-file."
 
@@ -837,7 +837,7 @@
     ].
 !
 
-saveSettings
+saveSettingsIntoFile
     SettingsDialog saveSettingsIntoFile.
 ! !
 
@@ -925,7 +925,7 @@
 !SettingsDialog class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/SettingsDialog.st,v 1.15 2003-02-13 11:19:55 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/SettingsDialog.st,v 1.16 2003-02-20 12:43:41 cg Exp $'
 ! !
 
 SettingsDialog initialize!