[overlord-commits] Overlord SVN: r851 - in bpm-console/trunk: gui/war/src/main/java/org/jboss/bpm/console/client and 1 other directories.

overlord-commits at lists.jboss.org overlord-commits at lists.jboss.org
Fri Oct 23 06:01:38 EDT 2009


Author: heiko.braun at jboss.com
Date: 2009-10-23 06:01:38 -0400 (Fri, 23 Oct 2009)
New Revision: 851

Modified:
   bpm-console/trunk/BPMC.iws
   bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/PreferencesView.java
   bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/SettingsEditor.java
   bpm-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css
Log:
Cleanup settings layout

Modified: bpm-console/trunk/BPMC.iws
===================================================================
--- bpm-console/trunk/BPMC.iws	2009-10-23 09:27:50 UTC (rev 850)
+++ bpm-console/trunk/BPMC.iws	2009-10-23 10:01:38 UTC (rev 851)
@@ -216,7 +216,46 @@
   </component>
   <component name="FileColors" enabled="false" enabledForTabs="false" />
   <component name="FileEditorManager">
-    <leaf />
+    <leaf>
+      <file leaf-file-name="SettingsEditor.java" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/SettingsEditor.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="123" column="30" selection-start="3747" selection-end="3747" vertical-scroll-proportion="0.48899755">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="console.css" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="337" column="35" selection-start="5200" selection-end="5200" vertical-scroll-proportion="0.6926771">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="ProcessEditor.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="100" column="60" selection-start="3634" selection-end="3669" vertical-scroll-proportion="0.52100843">
+              <folding>
+                <element signature="class#2386:3598" expanded="false" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PreferencesView.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/PreferencesView.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="40" column="13" selection-start="1690" selection-end="1690" vertical-scroll-proportion="0.15647922">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
   </component>
   <component name="FindManager">
     <FindUsagesManager>
@@ -762,6 +801,56 @@
           <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
         </PATH_ELEMENT>
         <PATH_ELEMENT>
+          <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/process" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+      </PATH>
+      <PATH>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="BPMC.ipr" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="gui-war" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org/jboss" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
           <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/engine" />
           <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
         </PATH_ELEMENT>
@@ -1084,13 +1173,13 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="328" y="52" width="1278" height="980" extended-state="0" />
-    <editor active="false" />
+    <editor active="true" />
     <layout>
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
       <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
       <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="7" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3213995" order="0" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3213995" order="0" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39290988" order="1" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.27420667" order="1" />
       <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32992035" order="8" />
@@ -1199,27 +1288,6 @@
     <option name="myLastEditedConfigurable" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common/PagingCallback.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="29" column="13" selection-start="1194" selection-end="1194" vertical-scroll-proportion="0.17286915">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="336" column="42" selection-start="5185" selection-end="5185" vertical-scroll-proportion="0.72989196">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar:///Users/hbraun/.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic/0.1.10/gwt-mosaic-0.1.10.jar!/org/gwt/mosaic/ui/client/Caption.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="7" column="61" selection-start="458" selection-end="458" vertical-scroll-proportion="0.12631579">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java">
       <provider selected="true" editor-type-id="text-editor">
         <state line="125" column="61" selection-start="3887" selection-end="3887" vertical-scroll-proportion="0.9779951">
@@ -1241,13 +1309,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="154" column="68" selection-start="5081" selection-end="5143" vertical-scroll-proportion="0.70537895">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common/PagingPanel.java">
       <provider selected="true" editor-type-id="text-editor">
         <state line="121" column="52" selection-start="3130" selection-end="3130" vertical-scroll-proportion="0.62064826">
@@ -1310,6 +1371,36 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="100" column="60" selection-start="3634" selection-end="3669" vertical-scroll-proportion="0.52100843">
+          <folding>
+            <element signature="class#2386:3598" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/PreferencesView.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="40" column="13" selection-start="1690" selection-end="1690" vertical-scroll-proportion="0.15647922">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="337" column="35" selection-start="5200" selection-end="5200" vertical-scroll-proportion="0.6926771">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/SettingsEditor.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="123" column="30" selection-start="3747" selection-end="3747" vertical-scroll-proportion="0.48899755">
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
 

Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/PreferencesView.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/PreferencesView.java	2009-10-23 09:27:50 UTC (rev 850)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/PreferencesView.java	2009-10-23 10:01:38 UTC (rev 851)
@@ -29,6 +29,8 @@
 import com.mvc4g.client.ViewInterface;
 import org.gwt.mosaic.ui.client.layout.BoxLayout;
 import org.gwt.mosaic.ui.client.layout.LayoutPanel;
+import org.gwt.mosaic.ui.client.layout.FillLayoutData;
+import org.gwt.mosaic.ui.client.CaptionLayoutPanel;
 import org.jboss.bpm.console.client.common.HeaderLabel;
 
 import java.util.List;
@@ -36,7 +38,7 @@
 /**
  * @author Heiko.Braun <heiko.braun at jboss.com>
  */
-public class PreferencesView extends LayoutPanel implements ViewInterface
+public class PreferencesView extends CaptionLayoutPanel implements ViewInterface
 {
 
   public final static String ID = PreferencesView.class.getName();
@@ -52,13 +54,15 @@
 
   public PreferencesView()
   {
-    super(new BoxLayout(BoxLayout.Orientation.VERTICAL));
+    super("User Preferences");
+    
+    LayoutPanel layout = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL));
 
     this.appContext = Registry.get(ApplicationContext.class);
-    this.add(new HeaderLabel("User Preferences"));
+    //layout.add(new HeaderLabel("User Preferences"));
     
     LayoutPanel defaultToolPanel = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.HORIZONTAL));
-    defaultToolPanel.setPadding(10);
+    
     defaultToolPanel.add(
         new HTML("<b>Default Tool</b><br>" +
         "Select the tool that should be loaded upon login.")
@@ -96,6 +100,8 @@
     );
 
     // parent
-    this.add(defaultToolPanel);    
+    layout.add(defaultToolPanel);
+
+    this.add(layout);
   }
 }

Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/SettingsEditor.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/SettingsEditor.java	2009-10-23 09:27:50 UTC (rev 850)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/SettingsEditor.java	2009-10-23 10:01:38 UTC (rev 851)
@@ -87,55 +87,49 @@
     layout();
   }
 
-  private LayoutPanel createPrefPanel()
+  private CaptionLayoutPanel createPrefPanel()
   {
-    final ScrollLayoutPanel layoutPanel = new ScrollLayoutPanel(
-        new BoxLayout(BoxLayout.Orientation.VERTICAL)
-    );
-    layoutPanel.setPadding(5);
-
     PreferencesView prefView = new PreferencesView();
-    layoutPanel.add(prefView);
     controller.addView(PreferencesView.ID, prefView);
     
-    return layoutPanel;
+    return prefView;
   }
 
-  private LayoutPanel createSystemPanel()
+  private CaptionLayoutPanel createSystemPanel()
   {
-    final ScrollLayoutPanel layoutPanel = new ScrollLayoutPanel(
-        new BoxLayout(BoxLayout.Orientation.VERTICAL)
-    );
-    layoutPanel.setPadding(10);
+    final CaptionLayoutPanel captionPanel = new CaptionLayoutPanel("System Settings");    
 
+    LayoutPanel layoutPanel = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL));
+
     // console info
-    HeaderLabel console = new HeaderLabel("Console Info");    
+    Label console = new Label("Console Info");    
     layoutPanel.add(console, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
 
     Grid g1 = new Grid(1,2);
-    g1.setWidget(0,0, new Label("Version:"));
-    g1.setWidget(0,1, new Label(Version.VERSION));
+    g1.setWidget(0,0, new HTML("Version:"));
+    g1.setWidget(0,1, new HTML(Version.VERSION));
     g1.getColumnFormatter().setWidth(0, "20%");
 
     layoutPanel.add(g1, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
 
     // server info
-    HeaderLabel server = new HeaderLabel("Server Info");
+    Label server = new Label("Server Info");
     layoutPanel.add(server, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
 
     ServerStatusView serverStatus = new ServerStatusView(appContext);
     serverStatus.initialize();
 
     Grid g2 = new Grid(1,2);
-    g2.setWidget(0,0, new Label("Host:"));
-    g2.setWidget(0,1, new Label(appContext.getConfig().getConsoleServerUrl()));
+    g2.setWidget(0,0, new HTML("Host:"));
+    g2.setWidget(0,1, new HTML(appContext.getConfig().getConsoleServerUrl()));
 
     g2.getColumnFormatter().setWidth(0, "20%");
 
     layoutPanel.add(g2, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
 
     LayoutPanel pluginPanel = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL));
-    HeaderLabel label = new HeaderLabel("Plugins:");    
+    pluginPanel.setPadding(0);
+    Label label = new Label("Plugins:");
 
     pluginPanel.add(label);
     pluginPanel.add(serverStatus);
@@ -145,7 +139,8 @@
     // view and actions
     super.controller.addView(ServerStatusView.ID, serverStatus);
 
-    return layoutPanel;
+    captionPanel.add(layoutPanel);
+    return captionPanel;
   }
 
   public String getEditorId()

Modified: bpm-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css
===================================================================
--- bpm-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css	2009-10-23 09:27:50 UTC (rev 850)
+++ bpm-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css	2009-10-23 10:01:38 UTC (rev 851)
@@ -343,4 +343,10 @@
   font-size:8px;
   background-color:#dfe8f6;
   border-bottom: 1px solid #bbbbbb;  
+}
+
+/* mosaic overrides */
+
+.mosaic-Label {
+  font-weight:bold;
 }
\ No newline at end of file



More information about the overlord-commits mailing list