Merged the sample browser preview panel with the description panel.studio-1.4-dev

This allows developers to check the screenshots without switching tabs.

Change-Id: I55ca42b0876eee311ed786bd1245231924f98d93

3 files changed, 13 insertions, 26 deletions

diff --git a/android-studio-plugin/src/com/google/gct/idea/samples/SampleBrowserStep.form b/android-studio-plugin/src/com/google/gct/idea/samples/SampleBrowserStep.form
index 2cf5bf1..f5c21f8 100644
--- a/android-studio-plugin/src/com/google/gct/idea/samples/SampleBrowserStep.form
+++ b/android-studio-plugin/src/com/google/gct/idea/samples/SampleBrowserStep.form
@@ -41,16 +41,17 @@
           </scrollpane>
         </children>
       </grid>
-      <tabbedpane id="f8030">
+      <grid id="f3cdd" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+        <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
           <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
         <border type="none"/>
         <children>
-          <scrollpane id="1cf96" class="com.intellij.ui.components.JBScrollPane">
+          <scrollpane id="1cf96" class="com.intellij.ui.components.JBScrollPane" binding="myDescriptionScrollPane">
             <constraints>
-              <tabbedpane title="Description"/>
+              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <horizontalScrollBarPolicy value="31"/>
@@ -78,33 +79,18 @@
                     </constraints>
                     <properties/>
                   </component>
-                  <vspacer id="9d9c6">
+                  <component id="6d3ea" class="com.google.gct.idea.samples.SamplePreviewPanel" binding="mySamplePreviewPanel">
                     <constraints>
-                      <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+                      <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
                     </constraints>
-                  </vspacer>
+                    <properties/>
+                  </component>
                 </children>
               </grid>
             </children>
           </scrollpane>
-          <scrollpane id="6c39c" class="com.intellij.ui.components.JBScrollPane" binding="mySamplePreviewScrollPanel">
-            <constraints>
-              <tabbedpane title="Preview"/>
-            </constraints>
-            <properties>
-              <horizontalScrollBarPolicy value="31"/>
-              <verticalScrollBarPolicy value="22"/>
-            </properties>
-            <border type="none"/>
-            <children>
-              <component id="6d3ea" class="com.google.gct.idea.samples.SamplePreviewPanel" binding="mySamplePreviewPanel">
-                <constraints/>
-                <properties/>
-              </component>
-            </children>
-          </scrollpane>
         </children>
-      </tabbedpane>
+      </grid>
     </children>
   </grid>
 </form>
diff --git a/android-studio-plugin/src/com/google/gct/idea/samples/SampleBrowserStep.java b/android-studio-plugin/src/com/google/gct/idea/samples/SampleBrowserStep.java
index 4162c45..0ef930e 100644
--- a/android-studio-plugin/src/com/google/gct/idea/samples/SampleBrowserStep.java
+++ b/android-studio-plugin/src/com/google/gct/idea/samples/SampleBrowserStep.java
@@ -60,7 +60,7 @@ public class SampleBrowserStep extends DynamicWizardStepWithHeaderAndDescription
   private SearchTextField mySearchBox;
   private JPanel myDescriptionPanel;
   private SamplePreviewPanel mySamplePreviewPanel;
-  private JBScrollPane mySamplePreviewScrollPanel;
+  private JBScrollPane myDescriptionScrollPane;
   private final SampleCollection mySampleList;
   private static final Key<Sample> SAMPLE_SCREENSHOT = createKey("SampleScreenshot", Scope.STEP, Sample.class);
 
@@ -100,8 +100,9 @@ public class SampleBrowserStep extends DynamicWizardStepWithHeaderAndDescription
     });
     myUrlField.setOpaque(false);
     myDescriptionPanel.setBackground(UIUtil.getTextFieldBackground());
+    mySamplePreviewPanel.setBackground(UIUtil.getTextFieldBackground());
     // for better mouse wheel scrolling
-    mySamplePreviewScrollPanel.getVerticalScrollBar().setUnitIncrement(16);
+    myDescriptionScrollPane.getVerticalScrollBar().setUnitIncrement(16);
   }
 
   @Override
diff --git a/android-studio-plugin/src/com/google/gct/idea/samples/SamplePreviewPanel.java b/android-studio-plugin/src/com/google/gct/idea/samples/SamplePreviewPanel.java
index 91da3bd..6220175 100644
--- a/android-studio-plugin/src/com/google/gct/idea/samples/SamplePreviewPanel.java
+++ b/android-studio-plugin/src/com/google/gct/idea/samples/SamplePreviewPanel.java
@@ -146,7 +146,7 @@ public class SamplePreviewPanel extends JPanel implements ComponentListener {
       ((Graphics2D)g).setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
       String text = GctBundle.message("sample.browser.no.preview");
       if (myHasPreview) {
-        text = "Loading...";
+        text = "Loading preview...";
       }
       Rectangle2D r = g.getFontMetrics().getStringBounds(text, g);
       g.drawString(text, 1, (int) r.getHeight());