AbstractSettingsApplication.st
changeset 7007 240e8564ed6a
parent 6999 d298f055491a
child 7071 72b45ddec569
--- a/AbstractSettingsApplication.st	Sat Aug 26 15:32:45 2006 +0200
+++ b/AbstractSettingsApplication.st	Sat Aug 26 15:34:36 2006 +0200
@@ -9711,7 +9711,7 @@
                              (FramedBoxSpec
                                 label: 'Store-DB Repository Setup'
                                 name: 'StoreSetupBox'
-                                layout: (LayoutFrame 0 0 0 0 0 1 -12 1)
+                                layout: (LayoutFrame 0 0 0 0 0 1 0 1)
                                 visibilityChannel: managerIsStoreSourceCodeManager
                                 labelPosition: topLeft
                                 translateLabel: true
@@ -9734,7 +9734,7 @@
                                           )
                                          (ComboBoxSpec
                                             name: 'StoreHostComboBox'
-                                            layout: (LayoutFrame 44 0.25 0 0 -5 1 22 0)
+                                            layout: (LayoutFrame 44 0.25 0 0 0 1 22 0)
                                             enableChannel: useManager
                                             tabable: true
                                             model: storeHostnameHolder
@@ -9767,7 +9767,7 @@
                                           )
                                          (InputFieldSpec
                                             name: 'StoreUserEntryField'
-                                            layout: (LayoutFrame 44 0.25 0 0 -5 1 22 0)
+                                            layout: (LayoutFrame 44 0.25 0 0 0 1 22 0)
                                             enableChannel: useManager
                                             tabable: true
                                             model: storeUsernameHolder
@@ -9808,7 +9808,7 @@
                                     )
                                    (HorizontalPanelViewSpec
                                       name: 'HorizontalPanel4'
-                                      layout: (LayoutFrame -130 1 51 0 -1 1 82 0)
+                                      layout: (LayoutFrame -130 1 51 0 0 1 82 0)
                                       horizontalLayout: fitSpace
                                       verticalLayout: center
                                       horizontalSpace: 3
@@ -9823,7 +9823,7 @@
                                             tabable: true
                                             model: storeConnect
                                             enableChannel: storeConnectEnabled
-                                            extent: (Point 123 22)
+                                            extent: (Point 124 22)
                                           )
                                          )
                                        
@@ -9838,7 +9838,7 @@
                                     )
                                    (SequenceViewSpec
                                       name: 'List2'
-                                      layout: (LayoutFrame 44 0.25 82 0 -5 1 180 0)
+                                      layout: (LayoutFrame 44 0.25 82 0 0 1 180 0)
                                       enableChannel: useManager
                                       tabable: true
                                       model: selectedPerStoreModuleRoot
@@ -9857,7 +9857,7 @@
                                     )
                                    (InputFieldSpec
                                       name: 'perModuleModuleEntryField'
-                                      layout: (LayoutFrame 44 0.25 182 0 -5 1 204 0)
+                                      layout: (LayoutFrame 44 0.25 182 0 0 1 204 0)
                                       enableChannel: useManager
                                       tabable: true
                                       model: perStoreModuleRoot
@@ -9873,7 +9873,7 @@
                                     )
                                    (ComboBoxSpec
                                       name: 'perModuleModuleHostComboBox2'
-                                      layout: (LayoutFrame 44 0.25 207 0 -5 1 229 0)
+                                      layout: (LayoutFrame 44 0.25 207 0 0 1 229 0)
                                       enableChannel: useManager
                                       tabable: true
                                       model: perStoreModuleHostnameHolder
@@ -9904,7 +9904,7 @@
                                     )
                                    (InputFieldSpec
                                       name: 'perModulePasswordEntryField'
-                                      layout: (LayoutFrame 2 0.65 232 0 -5 1 254 0)
+                                      layout: (LayoutFrame 5 0.65 232 0 0 1 254 0)
                                       enableChannel: useManager
                                       tabable: true
                                       model: perStoreModulePasswordHolder
@@ -9914,8 +9914,8 @@
                                     )
                                    (HorizontalPanelViewSpec
                                       name: 'HorizontalPanel5'
-                                      layout: (LayoutFrame 44 0.25 258 0 -1 1 289 0)
-                                      horizontalLayout: fitSpace
+                                      layout: (LayoutFrame 44 0.25 -25 1 -10 0.65 6 1)
+                                      horizontalLayout: fit
                                       verticalLayout: center
                                       horizontalSpace: 3
                                       verticalSpace: 3
@@ -9929,7 +9929,7 @@
                                             tabable: true
                                             model: addPerStoreModuleDB
                                             enableChannel: useManager
-                                            extent: (Point 103 22)
+                                            extent: (Point 97 22)
                                           )
                                          (ActionButtonSpec
                                             label: 'Remove'
@@ -9938,21 +9938,40 @@
                                             tabable: true
                                             model: removePerStoreModuleDB
                                             enableChannel: removeEnabled
-                                            extent: (Point 103 22)
+                                            extent: (Point 98 22)
                                           )
-                                         (ViewSpec
-                                            name: 'Box17'
-                                            extent: (Point 103 10)
-                                          )
+                                         )
+                                       
+                                      )
+                                    )
+                                   (HorizontalPanelViewSpec
+                                      name: 'HorizontalPanel6'
+                                      layout: (LayoutFrame 10 0.65 -25 1 0 1 6 1)
+                                      horizontalLayout: fit
+                                      verticalLayout: center
+                                      horizontalSpace: 3
+                                      verticalSpace: 3
+                                      component: 
+                                     (SpecCollection
+                                        collection: (
                                          (ActionButtonSpec
                                             label: 'Try to Connect'
-                                            name: 'Button4'
+                                            name: 'ConnectPerStoreModuleButton'
                                             translateLabel: true
                                             tabable: true
                                             model: connectPerStoreModuleDB
                                             enableChannel: storeConnectInModuleEnabled
                                             extent: (Point 103 22)
                                           )
+                                         (ActionButtonSpec
+                                            label: 'Browse'
+                                            name: 'BrowsePerStoreModuleButton'
+                                            translateLabel: true
+                                            tabable: true
+                                            model: browsePerStoreModuleDB
+                                            enableChannel: storeConnectInModuleEnabled
+                                            extent: (Point 104 22)
+                                          )
                                          )
                                        
                                       )
@@ -9964,7 +9983,7 @@
                              (FramedBoxSpec
                                 label: 'CVS Sourcecode Manager Setup'
                                 name: 'CVSSetupBox'
-                                layout: (LayoutFrame 0 0 0 0 0 1 -12 1)
+                                layout: (LayoutFrame 0 0 0 0 0 1 0 1)
                                 visibilityChannel: managerIsCVSSourceCodeManager
                                 labelPosition: topLeft
                                 translateLabel: true
@@ -9987,7 +10006,7 @@
                                           )
                                          (InputFieldSpec
                                             name: 'BinDirectoryField'
-                                            layout: (LayoutFrame 64 0.25 0 0 -5 1 22 0)
+                                            layout: (LayoutFrame 64 0.25 0 0 0 1 22 0)
                                             enableChannel: useManager
                                             tabable: true
                                             model: cvsBinDirectoryHolder
@@ -10014,7 +10033,7 @@
                                           )
                                          (ComboBoxSpec
                                             name: 'cvsRootComboBox'
-                                            layout: (LayoutFrame 64 0.25 0 0 -5 1 22 0)
+                                            layout: (LayoutFrame 64 0.25 0 0 0 1 22 0)
                                             enableChannel: useManager
                                             tabable: true
                                             model: cvsRootHolder
@@ -10075,7 +10094,7 @@
                                     )
                                    (SequenceViewSpec
                                       name: 'List1'
-                                      layout: (LayoutFrame 64 0.25 82 0 -5 1 201 0)
+                                      layout: (LayoutFrame 64 0.25 82 0 0 1 201 0)
                                       enableChannel: useManager
                                       tabable: true
                                       model: selectedPerModuleRoot
@@ -10094,7 +10113,7 @@
                                     )
                                    (InputFieldSpec
                                       name: 'perModuleRootModuleEntryField'
-                                      layout: (LayoutFrame 64 0.25 207 0 -5 1 229 0)
+                                      layout: (LayoutFrame 64 0.25 207 0 0 1 229 0)
                                       enableChannel: useManager
                                       tabable: true
                                       model: perModuleRootModule
@@ -10110,7 +10129,7 @@
                                     )
                                    (ComboBoxSpec
                                       name: 'perModuleRootComboBox'
-                                      layout: (LayoutFrame 64 0.25 232 0 -5 1.0 254 0)
+                                      layout: (LayoutFrame 64 0.25 232 0 0 1.0 254 0)
                                       enableChannel: useManager
                                       tabable: true
                                       model: perModuleRoot
@@ -10125,7 +10144,7 @@
                                     )
                                    (HorizontalPanelViewSpec
                                       name: 'HorizontalPanel2'
-                                      layout: (LayoutFrame 64 0.25 258 0 -1 1 289 0)
+                                      layout: (LayoutFrame 64 0.25 -25 1 -1 1 0 1)
                                       horizontalLayout: fitSpace
                                       verticalLayout: center
                                       horizontalSpace: 3
@@ -10177,66 +10196,79 @@
                           )
                           extent: (Point 659 327)
                         )
-                       (ViewSpec
-                          name: 'Box4'
+                       (FramedBoxSpec
+                          label: 'Source Cache'
+                          name: 'FramedBox1'
+                          labelPosition: topLeft
+                          translateLabel: true
                           component: 
                          (SpecCollection
                             collection: (
-                             (LabelSpec
-                                label: 'Source Cache Dir:'
-                                name: 'SourceCacheDirLabel'
-                                layout: (LayoutFrame 0 0.0 0 0 40 0.25 22 0)
-                                translateLabel: true
-                                adjust: right
+                             (ViewSpec
+                                name: 'SourceCacheDirBox'
+                                layout: (LayoutFrame 0 0 0 0 0 1 30 0)
+                                component: 
+                               (SpecCollection
+                                  collection: (
+                                   (LabelSpec
+                                      label: 'Source Cache Dir:'
+                                      name: 'SourceCacheDirLabel'
+                                      layout: (LayoutFrame 0 0.0 0 0 60 0.25 22 0)
+                                      translateLabel: true
+                                      adjust: right
+                                    )
+                                   (InputFieldSpec
+                                      name: 'SourceCacheDirEntryField'
+                                      layout: (LayoutFrame 64 0.25 0 0 0 1 22 0)
+                                      enableChannel: useManager
+                                      model: sourceCacheDir
+                                      immediateAccept: false
+                                      acceptOnReturn: true
+                                      acceptOnTab: true
+                                      acceptOnLostFocus: true
+                                      acceptOnPointerLeave: true
+                                    )
+                                   )
+                                 
+                                )
                               )
-                             (InputFieldSpec
-                                name: 'SourceCacheDirEntryField'
-                                layout: (LayoutFrame 44 0.25 0 0 -5 1 22 0)
-                                enableChannel: useManager
-                                model: sourceCacheDir
-                                immediateAccept: false
-                                acceptOnReturn: true
-                                acceptOnTab: true
-                                acceptOnLostFocus: true
-                                acceptOnPointerLeave: true
+                             (HorizontalPanelViewSpec
+                                name: 'CacheActionsHorizontalPanel'
+                                layout: (LayoutFrame 44 0.25 34 0 0 1 72 0)
+                                horizontalLayout: fitSpace
+                                verticalLayout: center
+                                horizontalSpace: 3
+                                verticalSpace: 3
+                                component: 
+                               (SpecCollection
+                                  collection: (
+                                   (ActionButtonSpec
+                                      label: 'Flush Cache now'
+                                      name: 'FlushCacheNowButton'
+                                      translateLabel: true
+                                      model: flushSourceCache
+                                      enableChannel: useManager
+                                      extent: (Point 209 22)
+                                    )
+                                   (ActionButtonSpec
+                                      label: 'Condense Cache now'
+                                      name: 'CondenseCacheNowButton'
+                                      translateLabel: true
+                                      model: condenseSourceCache
+                                      enableChannel: useManager
+                                      extent: (Point 210 22)
+                                    )
+                                   )
+                                 
+                                )
                               )
                              )
                            
                           )
-                          extent: (Point 659 30)
-                        )
-                       (HorizontalPanelViewSpec
-                          name: 'HorizontalPanel1'
-                          horizontalLayout: fitSpace
-                          verticalLayout: center
-                          horizontalSpace: 30
-                          verticalSpace: 3
-                          component: 
-                         (SpecCollection
-                            collection: (
-                             (ActionButtonSpec
-                                label: 'Flush Cache now'
-                                name: 'FlushCacheNowButton'
-                                translateLabel: true
-                                model: flushSourceCache
-                                enableChannel: useManager
-                                extent: (Point 284 22)
-                              )
-                             (ActionButtonSpec
-                                label: 'Condense Cache now'
-                                name: 'CondenseCacheNowButton'
-                                translateLabel: true
-                                model: condenseSourceCache
-                                enableChannel: useManager
-                                extent: (Point 285 22)
-                              )
-                             )
-                           
-                          )
-                          extent: (Point 659 38)
+                          extent: (Point 659 95)
                         )
                        (ViewSpec
-                          name: 'Box5'
+                          name: 'UseLocalSourceBox'
                           component: 
                          (SpecCollection
                             collection: (
@@ -10254,7 +10286,7 @@
                           extent: (Point 659 25)
                         )
                        (ViewSpec
-                          name: 'Box6'
+                          name: 'CheckForHaltSendsBox'
                           component: 
                          (SpecCollection
                             collection: (
@@ -10573,6 +10605,20 @@
     ].
 !
 
+browsePerStoreModuleDB
+    |testInfo|
+
+    testInfo := StoreSourceCodeManager newDBInfo.
+    testInfo hostAndDBName:(perStoreModuleHostnameHolder value).
+    testInfo userName:(perStoreModuleUsernameHolder value).
+    testInfo password:(perStoreModulePasswordHolder value).
+    self browseStoreDB:testInfo
+!
+
+browseStoreDB:dbInfo
+    Tools::StoreProjectBrowser openOn:dbInfo
+!
+
 connectPerStoreModuleDB
     |testInfo|
 
@@ -13016,5 +13062,5 @@
 !AbstractSettingsApplication class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.243 2006-08-25 17:24:29 cg Exp $'
-! !
+    ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.244 2006-08-26 13:34:36 cg Exp $'
+! !