infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix locking issue and set default LnF to nimbus. (works better with, e.g. Backtrack) 

git-svn-id: file:///home/svn/framework3/trunk@12052 4d416f70-5f16-0410-b530-b9f4589650da
unstable
Matt Weeks 2011-03-21 03:08:20 +00:00
parent 68374e11ef
commit b06e9b5696
4 changed files with 14 additions and 9 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.

1
external/source/gui/msfguijava/src/msfgui/DraggableTabbedPane.java vendored
View File

@ -139,6 +139,7 @@ public class DraggableTabbedPane extends JTabbedPane{
for(int i = 0; i < pane.getTabCount(); i++)
if(pane.getComponentAt(i).equals(subParent))
pane.setSelectedIndex(i);
lastFocusListener = (FocusListener)pane.focusListeners.get(pane.getSelectedComponent());
//Also make containing window show up
for(par = pane.getParent(); !(par instanceof Window); par = par.getParent())
;

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

@ -28,6 +28,7 @@ import javax.swing.JOptionPane;
import javax.swing.JPopupMenu;
import javax.swing.SwingUtilities;
import javax.swing.UIManager;
import javax.swing.UIManager.LookAndFeelInfo;
import javax.swing.UnsupportedLookAndFeelException;
import javax.swing.table.DefaultTableModel;
import org.jdesktop.application.Task;
@ -1936,8 +1937,13 @@ nameloop: for (int i = 0; i < names.length; i++) {
UIManager.setLookAndFeel(classname);
info.put("LnF", classname);
}catch(Exception ulafex){
UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
info.put("LnF", UIManager.getSystemLookAndFeelClassName());
String newLnF = UIManager.getSystemLookAndFeelClassName();
//Prefer nimbus
for(LookAndFeelInfo lookAndFeel : UIManager.getInstalledLookAndFeels())
if(lookAndFeel.getClassName().equals("com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel"))
newLnF = "com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel";
UIManager.setLookAndFeel(newLnF);
info.put("LnF", newLnF);
}
SwingUtilities.updateComponentTreeUI(this.getFrame());
this.getFrame().pack();

12
external/source/gui/msfguijava/src/msfgui/MeterpFileBrowser.java vendored
View File

@ -6,8 +6,6 @@ import java.awt.event.ActionListener;
import java.awt.event.FocusEvent;
import java.awt.event.FocusListener;
import java.awt.event.MouseEvent;
import java.awt.event.WindowEvent;
import java.awt.event.WindowFocusListener;
import java.io.File;
import java.io.IOException;
import java.util.HashMap;
@ -151,17 +149,17 @@ public class MeterpFileBrowser extends MsfFrame {
lock.unlock();
}
});
//Get initial view
lock.lock();
// Some exploits open in C:\Windows\system32. Too many files in there! Try to move to C:\ which should be more manageable
executeCommand("cd \"C:\\\\\"");
getFiles();
//See if we need to move our tab
Map props = MsfguiApp.getPropertiesNode();
if(!props.get("tabWindowPreference").equals("window")){
((DraggableTabbedPane)tabbedPane).moveTabTo(0, DraggableTabbedPane.getTabPane(interactPane));
DraggableTabbedPane.show(mainPanel);
}
//Get initial view
lock.lock();
// Some exploits open in C:\Windows\system32. Too many files in there! Try to move to C:\ which should be more manageable
executeCommand("cd \"C:\\\\\"");
getFiles();
}
/** Calls meterpreter_write with the session ID and Base64 encoded text. */