EADS-3642: Missing ToolBar in PL/SQL Navigator
authorRifki Razick <riralk@netbeans.org>
Tue, 23 Apr 2013 17:07:42 +0530
changeset 379cba50693f45f
parent 378 b5e9611ec327
child 380 adfbec8b17b6
EADS-3642: Missing ToolBar in PL/SQL Navigator
PLSQL/Navigator/src/org/netbeans/modules/plsql/navigator/NavigatorTopComponent.form
PLSQL/Navigator/src/org/netbeans/modules/plsql/navigator/NavigatorTopComponent.java
     1.1 --- a/PLSQL/Navigator/src/org/netbeans/modules/plsql/navigator/NavigatorTopComponent.form	Fri Apr 19 11:03:52 2013 +0200
     1.2 +++ b/PLSQL/Navigator/src/org/netbeans/modules/plsql/navigator/NavigatorTopComponent.form	Tue Apr 23 17:07:42 2013 +0530
     1.3 @@ -1,4 +1,4 @@
     1.4 -<?xml version="1.1" encoding="UTF-8" ?>
     1.5 +<?xml version="1.0" encoding="UTF-8" ?>
     1.6  
     1.7  <Form version="1.3" maxVersion="1.3" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
     1.8    <AuxValues>
     1.9 @@ -16,11 +16,8 @@
    1.10    <Layout>
    1.11      <DimensionLayout dim="0">
    1.12        <Group type="103" groupAlignment="0" attributes="0">
    1.13 -          <Group type="102" alignment="0" attributes="0">
    1.14 -              <Component id="jToolBar1" min="-2" pref="100" max="-2" attributes="0"/>
    1.15 -              <EmptySpace max="-2" attributes="0"/>
    1.16 -          </Group>
    1.17            <Component id="jScrollPane1" alignment="0" pref="409" max="32767" attributes="0"/>
    1.18 +          <Component id="jToolBar1" alignment="0" max="32767" attributes="0"/>
    1.19        </Group>
    1.20      </DimensionLayout>
    1.21      <DimensionLayout dim="1">
    1.22 @@ -56,7 +53,16 @@
    1.23      </Container>
    1.24      <Container class="javax.swing.JToolBar" name="jToolBar1">
    1.25        <Properties>
    1.26 +        <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
    1.27 +          <Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo">
    1.28 +            <EmptyBorder/>
    1.29 +          </Border>
    1.30 +        </Property>
    1.31 +        <Property name="floatable" type="boolean" value="false"/>
    1.32 +        <Property name="rollover" type="boolean" value="true"/>
    1.33 +        <Property name="borderPainted" type="boolean" value="false"/>
    1.34          <Property name="focusable" type="boolean" value="false"/>
    1.35 +        <Property name="opaque" type="boolean" value="false"/>
    1.36        </Properties>
    1.37  
    1.38        <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBoxLayout"/>
    1.39 @@ -73,9 +79,6 @@
    1.40              <Property name="actionCommand" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
    1.41                <Connection code="&quot;SORT_SOURCE&quot;" type="code"/>
    1.42              </Property>
    1.43 -            <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
    1.44 -              <Border info="null"/>
    1.45 -            </Property>
    1.46              <Property name="focusable" type="boolean" value="false"/>
    1.47              <Property name="horizontalTextPosition" type="int" value="0"/>
    1.48              <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
    1.49 @@ -108,9 +111,6 @@
    1.50              <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
    1.51                <ResourceString bundle="org/netbeans/modules/plsql/navigator/Bundle.properties" key="OpenIDE-toolTip-sort-byAlpha" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
    1.52              </Property>
    1.53 -            <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
    1.54 -              <Border info="null"/>
    1.55 -            </Property>
    1.56              <Property name="focusable" type="boolean" value="false"/>
    1.57              <Property name="horizontalTextPosition" type="int" value="0"/>
    1.58              <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
     2.1 --- a/PLSQL/Navigator/src/org/netbeans/modules/plsql/navigator/NavigatorTopComponent.java	Fri Apr 19 11:03:52 2013 +0200
     2.2 +++ b/PLSQL/Navigator/src/org/netbeans/modules/plsql/navigator/NavigatorTopComponent.java	Tue Apr 23 17:07:42 2013 +0530
     2.3 @@ -97,13 +97,17 @@
     2.4          jTree1.setToggleClickCount(Integer.MAX_VALUE);
     2.5          jScrollPane1.setViewportView(jTree1);
     2.6  
     2.7 +        jToolBar1.setBorder(javax.swing.BorderFactory.createEmptyBorder());
     2.8 +        jToolBar1.setFloatable(false);
     2.9 +        jToolBar1.setRollover(true);
    2.10 +        jToolBar1.setBorderPainted(false);
    2.11          jToolBar1.setFocusable(false);
    2.12 +        jToolBar1.setOpaque(false);
    2.13  
    2.14          btnSortPosition.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/netbeans/modules/plsql/navigator/resources/sortPosition.png"))); // NOI18N
    2.15          btnSortPosition.setSelected(true);
    2.16          btnSortPosition.setToolTipText(org.openide.util.NbBundle.getMessage(NavigatorTopComponent.class, "OpenIDE-toolTip-Sort-by-Source")); // NOI18N
    2.17          btnSortPosition.setActionCommand("SORT_SOURCE");
    2.18 -        btnSortPosition.setBorder(null);
    2.19          btnSortPosition.setFocusable(false);
    2.20          btnSortPosition.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
    2.21          btnSortPosition.setMargin(new java.awt.Insets(0, 14, 0, 14));
    2.22 @@ -116,7 +120,6 @@
    2.23  
    2.24          btnSortAlpha.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/netbeans/modules/plsql/navigator/resources/sortAlpha.png"))); // NOI18N
    2.25          btnSortAlpha.setToolTipText(org.openide.util.NbBundle.getMessage(NavigatorTopComponent.class, "OpenIDE-toolTip-sort-byAlpha")); // NOI18N
    2.26 -        btnSortAlpha.setBorder(null);
    2.27          btnSortAlpha.setFocusable(false);
    2.28          btnSortAlpha.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
    2.29          btnSortAlpha.setMargin(new java.awt.Insets(0, 14, 0, 14));
    2.30 @@ -131,10 +134,8 @@
    2.31          this.setLayout(layout);
    2.32          layout.setHorizontalGroup(
    2.33              layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
    2.34 -            .add(layout.createSequentialGroup()
    2.35 -                .add(jToolBar1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 100, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
    2.36 -                .addContainerGap())
    2.37              .add(jScrollPane1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 409, Short.MAX_VALUE)
    2.38 +            .add(jToolBar1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
    2.39          );
    2.40          layout.setVerticalGroup(
    2.41              layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)