Browse Source

REPORT-5794 DesignerFrame和HistoryTemplateListPane的改动, release里有, feature里没有, 合代码冲突了, 需要手动patch

master
MoMeak 7 years ago
parent
commit
b77d5e65a7
  1. 5
      designer_base/src/com/fr/design/mainframe/DesignerFrame.java

5
designer_base/src/com/fr/design/mainframe/DesignerFrame.java

@ -22,7 +22,6 @@ import com.fr.design.gui.imenu.UIMenuHighLight;
import com.fr.design.gui.iscrollbar.UIScrollBar; import com.fr.design.gui.iscrollbar.UIScrollBar;
import com.fr.design.gui.itoolbar.UIToolbar; import com.fr.design.gui.itoolbar.UIToolbar;
import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.mainframe.hold.DefaultTitlePlace;
import com.fr.design.mainframe.loghandler.LogMessageBar; import com.fr.design.mainframe.loghandler.LogMessageBar;
import com.fr.design.mainframe.toolbar.ToolBarMenuDock; import com.fr.design.mainframe.toolbar.ToolBarMenuDock;
import com.fr.design.mainframe.toolbar.ToolBarMenuDockPlus; import com.fr.design.mainframe.toolbar.ToolBarMenuDockPlus;
@ -319,9 +318,9 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
if (processor != null) { if (processor != null) {
processor.hold(northEastPane, LogMessageBar.getInstance(), ad.createBBSLoginPane()); processor.hold(northEastPane, LogMessageBar.getInstance(), ad.createBBSLoginPane());
} }
northEastPane.add(ad.createAlphafinePane()); northEastPane.add(ad.createAlphaFinePane());
if (!DesignerEnvManager.getEnvManager().getAlphaFineConfigManager().isEnabled()) { if (!DesignerEnvManager.getEnvManager().getAlphaFineConfigManager().isEnabled()) {
ad.createAlphafinePane().setVisible(false); ad.createAlphaFinePane().setVisible(false);
} }
northEastPane.add(ad.createBBSLoginPane()); northEastPane.add(ad.createBBSLoginPane());
} }

Loading…
Cancel
Save