From: <ez...@us...> - 2024-03-29 16:09:41
|
Revision: 25714 http://sourceforge.net/p/jedit/svn/25714 Author: ezust Date: 2024-03-29 16:09:39 +0000 (Fri, 29 Mar 2024) Log Message: ----------- Get rid of Floatable Toolbars option - it never worked properly anyway. Modified Paths: -------------- jEdit/trunk/modes/qdoc.xml jEdit/trunk/org/gjt/sp/jedit/GUIUtilities.java jEdit/trunk/org/gjt/sp/jedit/options/ViewOptionPane.java jEdit/trunk/org/jedit/localization/jedit_cs.props jEdit/trunk/org/jedit/localization/jedit_de.props jEdit/trunk/org/jedit/localization/jedit_en.props jEdit/trunk/org/jedit/localization/jedit_ja.props jEdit/trunk/org/jedit/localization/jedit_ko.props jEdit/trunk/org/jedit/localization/jedit_ru.props jEdit/trunk/org/jedit/localization/jedit_zh-tw.props jEdit/trunk/org/jedit/localization/jedit_zh.props Modified: jEdit/trunk/modes/qdoc.xml =================================================================== --- jEdit/trunk/modes/qdoc.xml 2024-03-14 08:02:03 UTC (rev 25713) +++ jEdit/trunk/modes/qdoc.xml 2024-03-29 16:09:39 UTC (rev 25714) @@ -3,8 +3,8 @@ <!-- - This mode file for QDoc, which is a documentation file format used by - The Qt Group, www.qt.io + This mode file is for QDoc, which is a documentation file format used by + The Qt Group, www.qt.io. --> <MODE> <PROPS> Modified: jEdit/trunk/org/gjt/sp/jedit/GUIUtilities.java =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/GUIUtilities.java 2024-03-14 08:02:03 UTC (rev 25713) +++ jEdit/trunk/org/gjt/sp/jedit/GUIUtilities.java 2024-03-29 16:09:39 UTC (rev 25714) @@ -472,7 +472,6 @@ JToolBar toolB = new JToolBar(); toolB.setName(name); toolB.setLayout(new FlowLayout(FlowLayout.LEFT, 0, 0)); - toolB.setFloatable(jEdit.getBooleanProperty("view.toolbar.floatable")); String buttons = jEdit.getProperty(name); if(buttons != null) @@ -956,7 +955,7 @@ * @return an integer indicating the option selected by the user * @since jEdit 4.3pre12 */ - @SuppressWarnings({"unchecked"}) + @SuppressWarnings({"unchecked"}) public static int listConfirm(final Component comp, final String name, final String[] args, final Object[] listModel, final List selectedItems) { @@ -1873,7 +1872,7 @@ break; } } //}}} - + //{{{ cancelResizeSave() method private void cancelResizeSave() { Modified: jEdit/trunk/org/gjt/sp/jedit/options/ViewOptionPane.java =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/options/ViewOptionPane.java 2024-03-14 08:02:03 UTC (rev 25713) +++ jEdit/trunk/org/gjt/sp/jedit/options/ViewOptionPane.java 2024-03-29 16:09:39 UTC (rev 25714) @@ -88,20 +88,13 @@ addComponent(layoutPanel); - /* Floatable Toolbars */ - floatableToolbars = new JCheckBox(jEdit.getProperty( - "options.view.floatableToolbars")); - floatableToolbars.setSelected(jEdit.getBooleanProperty( - "view.toolbar.floatable")); - addComponent(floatableToolbars); - - /* Abbreviate pathnames when possible */ + /* Abbreviate pathnames when possible */ abbreviatePaths = new JCheckBox(jEdit.getProperty( "options.view.abbreviatePaths")); abbreviatePaths.setSelected(jEdit.getBooleanProperty( "view.abbreviatePaths")); addComponent(abbreviatePaths); - + /* Show full path */ showFullPath = new JCheckBox(jEdit.getProperty( "options.view.showFullPath")); @@ -243,9 +236,8 @@ jEdit.setBooleanProperty("view.toolbar.alternateLayout", layout.getIcon() == layoutIcon3 || layout.getIcon() == layoutIcon4); - jEdit.setBooleanProperty("view.abbreviatePaths",abbreviatePaths.isSelected()); + jEdit.setBooleanProperty("view.abbreviatePaths",abbreviatePaths.isSelected()); jEdit.setBooleanProperty("view.showFullPath",showFullPath.isSelected()); - jEdit.setBooleanProperty("view.toolbar.floatable", floatableToolbars.isSelected()); jEdit.setBooleanProperty("view.showSearchbar",showSearchbar .isSelected()); @@ -272,7 +264,6 @@ private JButton alternateDockingLayout, alternateToolBarLayout; private JCheckBox abbreviatePaths; private JCheckBox showFullPath; - private JCheckBox floatableToolbars; private JCheckBox showSearchbar; private JCheckBox beepOnSearchAutoWrap; private JCheckBox showBufferSwitcher; Modified: jEdit/trunk/org/jedit/localization/jedit_cs.props =================================================================== --- jEdit/trunk/org/jedit/localization/jedit_cs.props 2024-03-14 08:02:03 UTC (rev 25713) +++ jEdit/trunk/org/jedit/localization/jedit_cs.props 2024-03-29 16:09:39 UTC (rev 25714) @@ -1640,7 +1640,6 @@ #{{{ View pane options.view.label=Pohled options.view.viewLayout=Rozmístění pohledu -options.view.floatableToolbars=Plovoucí panely nástrojů options.view.alternateDockingLayout=Alternativní rozmístění dokovaných oken options.view.alternateToolBarLayout=Alternativní rozmístění panelů nástrojů options.view.showFullPath=Zobrazit úplnou cestu bufferu v panelu názvu Modified: jEdit/trunk/org/jedit/localization/jedit_de.props =================================================================== --- jEdit/trunk/org/jedit/localization/jedit_de.props 2024-03-14 08:02:03 UTC (rev 25713) +++ jEdit/trunk/org/jedit/localization/jedit_de.props 2024-03-29 16:09:39 UTC (rev 25714) @@ -1909,7 +1909,6 @@ #{{{ View pane options.view.label=Ansicht options.view.viewLayout=Ansichtslayout -options.view.floatableToolbars=Frei positionierbare Symbolleisten options.view.alternateDockingLayout=Alternatives Dock-Layout options.view.alternateToolBarLayout=Alternatives Symbolleisten-Layout options.view.abbreviatePaths=Pfade mit Namen von Umgebungsvariablen abkürzen, wenn möglich Modified: jEdit/trunk/org/jedit/localization/jedit_en.props =================================================================== --- jEdit/trunk/org/jedit/localization/jedit_en.props 2024-03-14 08:02:03 UTC (rev 25713) +++ jEdit/trunk/org/jedit/localization/jedit_en.props 2024-03-29 16:09:39 UTC (rev 25714) @@ -1888,7 +1888,6 @@ #{{{ View pane options.view.label=View options.view.viewLayout=View layout -options.view.floatableToolbars=Floatable Toolbars options.view.alternateDockingLayout=Alternate docked window placement options.view.alternateToolBarLayout=Alternate tool bar placement options.view.abbreviatePaths=Abbreviate paths with environment variables when possible Modified: jEdit/trunk/org/jedit/localization/jedit_ja.props =================================================================== --- jEdit/trunk/org/jedit/localization/jedit_ja.props 2024-03-14 08:02:03 UTC (rev 25713) +++ jEdit/trunk/org/jedit/localization/jedit_ja.props 2024-03-29 16:09:39 UTC (rev 25714) @@ -1633,7 +1633,6 @@ #{{{ View pane options.view.label=ビュー options.view.viewLayout=ビューレイアウト -options.view.floatableToolbars=フロート可能なツールバー options.view.alternateDockingLayout=別のドッキングウィンドウ配置 options.view.alternateToolBarLayout=別のツールバー配置 options.view.showFullPath=タイトルバーにバッファのフルパスを表示 Modified: jEdit/trunk/org/jedit/localization/jedit_ko.props =================================================================== --- jEdit/trunk/org/jedit/localization/jedit_ko.props 2024-03-14 08:02:03 UTC (rev 25713) +++ jEdit/trunk/org/jedit/localization/jedit_ko.props 2024-03-29 16:09:39 UTC (rev 25714) @@ -1606,7 +1606,6 @@ #{{{ View pane options.view.label=보기 options.view.viewLayout=jEdit 뷰 레이아웃 -options.view.floatableToolbars=유동 툴바 options.view.alternateDockingLayout=도킹 창 위치 전환 options.view.alternateToolBarLayout=툴바 위치 전환 options.view.abbreviatePaths=환경변수로 단축 경로 사용 Modified: jEdit/trunk/org/jedit/localization/jedit_ru.props =================================================================== --- jEdit/trunk/org/jedit/localization/jedit_ru.props 2024-03-14 08:02:03 UTC (rev 25713) +++ jEdit/trunk/org/jedit/localization/jedit_ru.props 2024-03-29 16:09:39 UTC (rev 25714) @@ -1856,7 +1856,6 @@ #{{{ View pane options.view.label=Вид options.view.viewLayout=Схема -options.view.floatableToolbars=Плавающие панели options.view.alternateDockingLayout=Изменить положение дока options.view.alternateToolBarLayout=Изменить положение панели инструментов options.view.abbreviatePaths=Сокращать пути с помощью переменных окружения, если возможно Modified: jEdit/trunk/org/jedit/localization/jedit_zh-tw.props =================================================================== --- jEdit/trunk/org/jedit/localization/jedit_zh-tw.props 2024-03-14 08:02:03 UTC (rev 25713) +++ jEdit/trunk/org/jedit/localization/jedit_zh-tw.props 2024-03-29 16:09:39 UTC (rev 25714) @@ -1796,7 +1796,6 @@ #{{{ View pane options.view.label=視窗 options.view.viewLayout=查看佈局 -options.view.floatableToolbars=流通工具欄 options.view.alternateDockingLayout=備用停靠視窗位置 options.view.alternateToolBarLayout=備用工具欄的位置 options.view.abbreviatePaths=可能時,使用環境變數縮寫路徑 Modified: jEdit/trunk/org/jedit/localization/jedit_zh.props =================================================================== --- jEdit/trunk/org/jedit/localization/jedit_zh.props 2024-03-14 08:02:03 UTC (rev 25713) +++ jEdit/trunk/org/jedit/localization/jedit_zh.props 2024-03-29 16:09:39 UTC (rev 25714) @@ -1619,7 +1619,6 @@ #{{{ View pane options.view.label=视图 options.view.viewLayout=查看布局 -options.view.floatableToolbars=流通工具栏 options.view.alternateDockingLayout=备用停靠窗口位置 options.view.alternateToolBarLayout=备用工具栏的位置 options.view.abbreviatePaths=可能时,使用环境变量缩写路径 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |