From: <kp...@us...> - 2008-05-31 09:51:07
|
Revision: 12738 http://jedit.svn.sourceforge.net/jedit/?rev=12738&view=rev Author: kpouer Date: 2008-05-31 02:51:06 -0700 (Sat, 31 May 2008) Log Message: ----------- removed unused properties from the old status bar api Modified Paths: -------------- jEdit/trunk/org/gjt/sp/jedit/gui/StatusBar.java jEdit/trunk/org/gjt/sp/jedit/jedit.props jEdit/trunk/org/gjt/sp/jedit/jedit_gui.props Modified: jEdit/trunk/org/gjt/sp/jedit/gui/StatusBar.java =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/gui/StatusBar.java 2008-05-31 09:43:02 UTC (rev 12737) +++ jEdit/trunk/org/gjt/sp/jedit/gui/StatusBar.java 2008-05-31 09:51:06 UTC (rev 12738) @@ -29,10 +29,7 @@ import javax.swing.text.Segment; import javax.swing.*; import java.awt.event.*; -import java.awt.font.*; -import java.awt.geom.*; import java.awt.*; -import java.text.*; import java.util.StringTokenizer; import org.gjt.sp.jedit.io.*; import org.gjt.sp.jedit.textarea.*; @@ -102,16 +99,6 @@ Color bg = jEdit.getColorProperty("view.status.background"); showCaretStatus = jEdit.getBooleanProperty("view.status.show-caret-status"); - showEditMode = jEdit.getBooleanProperty("view.status.show-edit-mode"); - showFoldMode = jEdit.getBooleanProperty("view.status.show-fold-mode"); - showEncoding = jEdit.getBooleanProperty("view.status.show-encoding"); - showWrap = jEdit.getBooleanProperty("view.status.show-wrap"); - showMultiSelect = jEdit.getBooleanProperty("view.status.show-multi-select"); - showRectSelect = jEdit.getBooleanProperty("view.status.show-rect-select"); - showOverwrite = jEdit.getBooleanProperty("view.status.show-overwrite"); - showLineSeperator = jEdit.getBooleanProperty("view.status.show-line-seperator"); - boolean showMemory = jEdit.getBooleanProperty("view.status.show-memory"); - boolean showClock = jEdit.getBooleanProperty("view.status.show-clock"); panel.setBackground(bg); panel.setForeground(fg); @@ -119,7 +106,7 @@ caretStatus.setForeground(fg); message.setBackground(bg); message.setForeground(fg); - + // retarded GTK look and feel! Font font = new JLabel().getFont(); //UIManager.getFont("Label.font"); @@ -152,8 +139,8 @@ Widget widget = getWidget(token); if (widget == null) { - Log.log(Log.WARNING, this, "Widget " + token + " doesn't exists"); - continue; + Log.log(Log.WARNING, this, "Widget " + token + " doesn't exists"); + continue; } Component c = widget.getComponent(); c.setBackground(bg); @@ -168,7 +155,7 @@ } } currentBar = statusBar; - } + } updateBufferStatus(); updateMiscStatus(); } //}}} @@ -262,6 +249,7 @@ //{{{ setMessage() method /** * Displays a status message. + * @param message the message to display, it can be null */ public void setMessage(String message) { @@ -397,7 +385,7 @@ rectSelectWidget.update(); overwriteWidget.update(); } //}}} - + //{{{ Private members private String currentBar; private View view; @@ -421,14 +409,6 @@ private Segment seg = new Segment(); private boolean showCaretStatus; - private boolean showEditMode; - private boolean showFoldMode; - private boolean showEncoding; - private boolean showWrap; - private boolean showMultiSelect; - private boolean showRectSelect; - private boolean showOverwrite; - private boolean showLineSeperator; //}}} static final String caretTestStr = "9999,999-999 99%"; @@ -452,14 +432,14 @@ return overwriteWidget; if ("lineSep".equals(name)) return lineSepWidget; - + return _getWidget(name); } //}}} //{{{ _getWidget() method private Widget _getWidget(String name) { - StatusWidgetFactory widgetFactory = + StatusWidgetFactory widgetFactory = (StatusWidgetFactory) ServiceManager.getService("org.gjt.sp.jedit.gui.statusbar.StatusWidget", name); if (widgetFactory == null) { @@ -468,7 +448,7 @@ } return widgetFactory.getWidget(view); } //}}} - + //{{{ MouseHandler class class MouseHandler extends MouseAdapter { Modified: jEdit/trunk/org/gjt/sp/jedit/jedit.props =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/jedit.props 2008-05-31 09:43:02 UTC (rev 12737) +++ jEdit/trunk/org/gjt/sp/jedit/jedit.props 2008-05-31 09:51:06 UTC (rev 12738) @@ -350,16 +350,6 @@ view.status.background=white view.status.visible=true view.status.show-caret-status=true -view.status.show-edit-mode=true -view.status.show-fold-mode=true -view.status.show-encoding=true -view.status.show-wrap=true -view.status.show-multi-select=true -view.status.show-rect-select=true -view.status.show-overwrite=true -view.status.show-line-seperator=true -view.status.show-memory=true -view.status.show-clock=false view.status.memory.foreground=#cccccc view.status.memory.background=#666699a #}}} Modified: jEdit/trunk/org/gjt/sp/jedit/jedit_gui.props =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/jedit_gui.props 2008-05-31 09:43:02 UTC (rev 12737) +++ jEdit/trunk/org/gjt/sp/jedit/jedit_gui.props 2008-05-31 09:51:06 UTC (rev 12738) @@ -878,20 +878,13 @@ from? [{0}] view.status.wrap-changed=Word wrap mode is now "{0}" view.status.wrap-tooltip=Word wrap mode (click to change) +view.status.bufferset-tooltip=BufferSet scope is {0} #}}} #{{{ Status bar component visibility view.status=( mode , fold , encoding ) wrap multiSelect rectSelect overwrite lineSep memory-status clock view.status.show-caret-status=true -view.status.show-edit-mode=true -view.status.show-fold-mode=true -view.status.show-encoding=true -view.status.show-wrap=true -view.status.show-multi-select=true -view.status.show-overwrite=true -view.status.show-line-seperator=true -view.status.show-memory=true #}}} #}}} @@ -938,7 +931,7 @@ Ben Williams\n\ Bertalan Fodor\n\ Bill McMilleon\n\ - Bj�rn "Vampire" Kautler\n\ + Bj\xF6rn "Vampire" Kautler\n\ Brad Mace\n\ Brant Langer Gurganus\n\ Brett Smith\n\ @@ -1989,11 +1982,6 @@ options.status.edit.widgetLabel=Choose a widget: #}}} -#{{{ Status bar pane - - -#}}} - #{{{ Syntax Highlighting pane options.syntax.label=Syntax Highlighting options.syntax.code=new SyntaxHiliteOptionPane(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |