Merge jv
authorMerge Script
Mon, 24 Aug 2015 06:58:05 +0200
branchjv
changeset 3497 99d1ba0695e3
parent 3494 5a003f33002b (current diff)
parent 3496 76829f8a4156 (diff)
child 3499 b823d15bf638
Merge
--- a/ApplicationModel.st	Thu Jul 30 06:49:36 2015 +0200
+++ b/ApplicationModel.st	Mon Aug 24 06:58:05 2015 +0200
@@ -3156,6 +3156,17 @@
     "Modified (comment): / 07-07-2011 / 17:25:20 / cg"
 !
 
+openDialogModeless
+    "open my window as a modal dialog
+     - assumes that the builder has already setup the interface."
+
+    self window beToolDialog.
+    ^ builder open.
+
+    "Modified: / 14-02-1997 / 20:32:52 / cg"
+    "Modified (comment): / 07-07-2011 / 17:25:45 / cg"
+!
+
 openDialogSpec:aSpec withBindings:bindings
     "open a dialog"
 
@@ -3170,6 +3181,22 @@
 
     "Modified: / 23-01-1998 / 18:18:14 / cg"
     "Created: / 20-05-1998 / 20:27:56 / cg"
+!
+
+openDialogSpecModeless:aSpec withBindings:bindings
+    "open a dialog, but without blocking the caller"
+
+    "/ Notice: the opened dialog will be technically another instance
+    "/ (of SimpleDialog) but use me as aspect provider.
+    "/ It will call postOpenDialog: and postBuildDialog: as callbacks.
+
+    ^ SimpleDialog new
+        openModelessFor:self
+        spec:aSpec
+        withBindings:bindings
+
+    "Modified: / 23-01-1998 / 18:18:14 / cg"
+    "Created: / 20-05-1998 / 20:27:56 / cg"
 ! !
 
 !ApplicationModel methodsFor:'opening-webInterface'!
--- a/SimpleDialog.st	Thu Jul 30 06:49:36 2015 +0200
+++ b/SimpleDialog.st	Mon Aug 24 06:58:05 2015 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 1996 by eXept Software AG
               All Rights Reserved
@@ -463,6 +465,28 @@
     "Modified: / 20.5.1998 / 20:21:28 / cg"
 !
 
+openModelessFor:anApplication interfaceSpec:aSpec withBindings:bindings
+    "open the dialog for some appModel from a given spec;
+     the bindings argument may provide overwriting bindings for the
+     dialog.
+     Return immediately, not blocking the caller"
+
+    self allButOpenFor:anApplication interfaceSpec:aSpec withBindings:bindings.
+    self openDialogModeless
+!
+
+openModelessFor:anApplication spec:aSpec withBindings:bindings
+    "open the dialog for some appModel from a given spec.
+     The bindings argument may provide overwriting bindings for the
+     dialog.
+     Return immediately (i.e non-blocking the caller)"
+
+    self
+        openModelessFor:anApplication 
+        interfaceSpec:aSpec
+        withBindings:bindings
+!
+
 openSpec:aWindowSpec
     "open a window spec.
      Redefned to open modal and to return the accept value instead