dnrops
/
metasploit-framework
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Whoops fix pane splitting. 

And minor scroll speed improvement on payload popup.



git-svn-id: file:///home/svn/framework3/trunk@13720 4d416f70-5f16-0410-b530-b9f4589650da
This commit is contained in:
Matt Weeks 2011-09-12 00:49:41 +00:00
parent ea2a1be834
commit 5847de9435
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/gui/msfgui.jar
View File

Binary file not shown.

2
external/source/gui/msfguijava/src/msfgui/MainFrame.java vendored
View File

@ -139,7 +139,7 @@ public class MainFrame extends FrameView {
if(props.containsKey("tabLayout")){
java.awt.Container mainPane = getFrame().getContentPane();
Component realigned = DraggableTabbedPane.restoreSplitLayout(
props.get("tabLayout"), mainPane, (DraggableTabbedPane)tabbedPane);
props.get("tabLayout"), getFrame(), (DraggableTabbedPane)tabbedPane);
mainPane.removeAll();
mainPane.add(realigned);
}

8
external/source/gui/msfguijava/src/msfgui/PayloadPopup.form vendored
View File

@ -27,19 +27,19 @@
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<Component id="jScrollPane1" alignment="1" pref="795" max="32767" attributes="0"/>
<Component id="mainScrollPane" alignment="1" pref="795" max="32767" attributes="0"/>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Component id="jScrollPane1" alignment="0" max="32767" attributes="0"/>
<Component id="mainScrollPane" alignment="0" max="32767" attributes="0"/>
</Group>
</DimensionLayout>
</Layout>
<SubComponents>
<Container class="javax.swing.JScrollPane" name="jScrollPane1">
<Container class="javax.swing.JScrollPane" name="mainScrollPane">
<Properties>
<Property name="name" type="java.lang.String" value="jScrollPane1" noResource="true"/>
<Property name="name" type="java.lang.String" value="mainScrollPane" noResource="true"/>
</Properties>
<Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>

13
external/source/gui/msfguijava/src/msfgui/PayloadPopup.java vendored
View File

@ -45,6 +45,7 @@ public class PayloadPopup extends ModuleInfoWindow {
encoderCombo.setSelectedIndex(defaultEncoder);
}catch(MsfException xre){
}
mainScrollPane.getVerticalScrollBar().setUnitIncrement(40);
}
private void doRun(boolean console) {
@ -228,7 +229,7 @@ public class PayloadPopup extends ModuleInfoWindow {
private void initComponents() {
buttonGroup1 = new javax.swing.ButtonGroup();
jScrollPane1 = new javax.swing.JScrollPane();
mainScrollPane = new javax.swing.JScrollPane();
mainPanel = new javax.swing.JPanel();
timesField = new javax.swing.JTextField();
encoderCombo = new javax.swing.JComboBox();
@ -260,7 +261,7 @@ public class PayloadPopup extends ModuleInfoWindow {
setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
setName("Form"); // NOI18N
jScrollPane1.setName("jScrollPane1"); // NOI18N
mainScrollPane.setName("mainScrollPane"); // NOI18N
mainPanel.setName("mainPanel"); // NOI18N
@ -495,17 +496,17 @@ public class PayloadPopup extends ModuleInfoWindow {
.addContainerGap())
);
jScrollPane1.setViewportView(mainPanel);
mainScrollPane.setViewportView(mainPanel);
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
getContentPane().setLayout(layout);
layout.setHorizontalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(jScrollPane1, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 795, Short.MAX_VALUE)
.addComponent(mainScrollPane, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 795, Short.MAX_VALUE)
);
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(jScrollPane1)
.addComponent(mainScrollPane)
);
pack();
@ -633,8 +634,8 @@ public class PayloadPopup extends ModuleInfoWindow {
private javax.swing.JButton generateButton;
private javax.swing.JButton handleButton;
private javax.swing.JButton handleConsoleButton;
private javax.swing.JScrollPane jScrollPane1;
private javax.swing.JPanel mainPanel;
private javax.swing.JScrollPane mainScrollPane;
private javax.swing.JComboBox outputCombo;
private javax.swing.JLabel outputLabel;
private javax.swing.JTextArea outputPane;