Changeset 2095

Timestamp:

08/15/12 13:08:27 (12 years ago)

Author:

twagoo

Message:

Moved the public/workspace switch out of Browse into a separate class and added it to both Browse and BrowserOverviewList?, it being optional (off by default) in the latter. Also made the action buttons bar optional. Now the browser panel in Editor can have different controls than the main browser.

Location:

ComponentRegistry/branches/ComponentRegistry-1.12.0/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry

Files:

• browser/Browse.mxml (modified) (4 diffs)
• browser/BrowserOverviewList.mxml (modified) (2 diffs)
• common/components/SpaceSwitch.mxml (added)
• editor/Editor.mxml (modified) (1 diff)

ComponentRegistry/branches/ComponentRegistry-1.12.0/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/browser/Browse.mxml

@@ -7 +7 @@
                    height="100%"
                    label="Component Browser"
-                   implements="clarin.cmdi.componentregistry.common.components.RegistryView"
+                   implements="clarin.cmdi.componentregistry.common.components.RegistryView" xmlns:components="clarin.cmdi.componentregistry.common.components.*"
                    >
         <mx:Metadata>
@@ -162 +162 @@
                         }
                         
-                        private static const USERSPACE_LABEL:String = "Work space";
-                        private static const PUBLICSPACE_LABEL:String = "Public space";
-                        [Bindable]
-                        public var spaces:ArrayCollection = new ArrayCollection([{label: PUBLICSPACE_LABEL, data: 1}, {label: USERSPACE_LABEL, data: 2}]);
-                        
                         private function setUserSpace(event:Event = null):void {
                                 if (Config.instance.userSpace) {
@@ -173 +168 @@
                                         userSpaceCB.selectedIndex = 0;
                                 }
-                        }
-                        
-                        private function userSpaceCloseHandler(event:Event):void {
-                                if (Credentials.instance.isLoggedIn()) {
-                                        Config.instance.userSpace = ComboBox(event.target).selectedItem.data == 2;
-                                } else if (userSpaceCB.selectedIndex != 0) {
-                                        userSpaceCB.selectedIndex = 0;
-                                        new Login().show(this, Config.VIEW_BROWSE, Config.SPACE_USER, null);
-                                }
-                                
                         }
                 ]]>
@@ -205 +190 @@
                         
                         <mx:Box paddingTop="5" paddingLeft="5">
-                                <mx:ComboBox id="userSpaceCB"
-                                                         dataProvider="{spaces}"
-                                                         width="110"
-                                                         close="userSpaceCloseHandler(event);"
-                                                         />
+                                <components:SpaceSwitch id="userSpaceCB"  />
                         </mx:Box>
-                                                
+                        
                         <mx:TabNavigator id="tabnav"
                                                          width="100%"

ComponentRegistry/branches/ComponentRegistry-1.12.0/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/browser/BrowserOverviewList.mxml

@@ -34 +34 @@
                         [Bindable]
                         public var viewStack:RegistryViewStack;
+                        
+                        [Bindable]
+                        public var buttonsEnabled:Boolean = true;
+                        
+                        [Bindable]
+                        public var spaceSwitchEnabled:Boolean = false;
                         
                         public function set browserDataProvider(dataProvider:ArrayCollection):void {
@@ -104 +110 @@
                          paddingRight="5"
                          width="100%">
-        
+                
+                <mx:Box paddingTop="5" paddingLeft="5" 
+                                visible="{spaceSwitchEnabled}" 
+                                includeInLayout="{spaceSwitchEnabled}">
+                        <comp:SpaceSwitch id="userSpaceCB" />
+                </mx:Box>
+                
                 <mx:HBox horizontalAlign="left"
                                  verticalAlign="middle"
-                                 width="70%">
+                                 width="70%"
+                                 visible="{buttonsEnabled}"
+                                 >
                         
                         <mx:Button label="Create new" 

ComponentRegistry/branches/ComponentRegistry-1.12.0/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/editor/Editor.mxml

@@ -48 +48 @@
                                 <browser:BrowserOverviewList id="componentsPaletteOverview"
                                                                                          width="100%" height="90%"
+                                                                                         buttonsEnabled="false"
+                                                                                         spaceSwitchEnabled="true"
                                                                                          browserDataProvider="{componentsSrv.itemDescriptions}"
                                                                                          browserColumns="{browserColumns.getComponentColumns()}"