fanruan
/
design
6
0
Fork 2
Code Issues 2 Pull Requests Releases Wiki Activity
Browse Source

use UIPopupMenu

master
hzzz 7 years ago
parent
9d84491d12
commit
b8fbd2ecc0
2 changed files with 8 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      designer_base/src/com/fr/design/actions/help/AboutPane.java
  2. 13
      designer_form/src/com/fr/design/mainframe/FormParaWidgetPane.java

2
designer_base/src/com/fr/design/actions/help/AboutPane.java
Unescape View File

@ -47,7 +47,7 @@ public class AboutPane extends JPanel {
BoxCenterAlignmentCopyablePane buildCopyPane = new BoxCenterAlignmentCopyablePane( BoxCenterAlignmentCopyablePane buildCopyPane = new BoxCenterAlignmentCopyablePane(
getBuildTitle(), getBuildTitle(),
GeneralUtils.readFullBuildNO(), GeneralUtils.readBuildNO(),
new String[]{ new String[]{
Inter.getLocText("FR-Designer-Basic_Copy_Build_NO"), Inter.getLocText("FR-Designer-Basic_Copy_Build_NO"),
Inter.getLocText("FR-Designer-Basic_Copy_Build_NO_OK") Inter.getLocText("FR-Designer-Basic_Copy_Build_NO_OK")

13
designer_form/src/com/fr/design/mainframe/FormParaWidgetPane.java
Unescape View File

@ -11,6 +11,7 @@ import com.fr.design.gui.core.WidgetOption;
import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.icontainer.UIScrollPane; import com.fr.design.gui.icontainer.UIScrollPane;
import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.imenu.UIPopupMenu;
import com.fr.design.module.DesignModuleFactory; import com.fr.design.module.DesignModuleFactory;
import com.fr.design.utils.gui.LayoutUtils; import com.fr.design.utils.gui.LayoutUtils;
import com.fr.form.ui.*; import com.fr.form.ui.*;
@ -31,8 +32,8 @@ public class FormParaWidgetPane extends JPanel {
private List<WidgetOption> predifinedwidgeList = new ArrayList<WidgetOption>(); private List<WidgetOption> predifinedwidgeList = new ArrayList<WidgetOption>();
private JPopupMenu chartTypePopupMenu; private UIPopupMenu chartTypePopupMenu;
private JPopupMenu widgetTypePopupMenu; private UIPopupMenu widgetTypePopupMenu;
private WidgetOption[] widgetOptions = null; private WidgetOption[] widgetOptions = null;
private WidgetOption[] chartOptions = null; private WidgetOption[] chartOptions = null;
private WidgetOption[] layoutOptions = null; private WidgetOption[] layoutOptions = null;
@ -120,7 +121,7 @@ public class FormParaWidgetPane extends JPanel {
widgetPane.add(createJSeparator(height)); widgetPane.add(createJSeparator(height));
widgetPane.add(eastScrollPane); widgetPane.add(eastScrollPane);
widgetTypePopupMenu = new JPopupMenu(); widgetTypePopupMenu = new UIPopupMenu();
widgetTypePopupMenu.add(widgetPane); widgetTypePopupMenu.add(widgetPane);
} }
} }
@ -135,7 +136,7 @@ public class FormParaWidgetPane extends JPanel {
int x = COMMON_CHAR_NUM * (widgetButtonWidth + smallGAP); int x = COMMON_CHAR_NUM * (widgetButtonWidth + smallGAP);
int y = (int) Math.ceil(chartOptions.length / ((double) COMMON_CHAR_NUM)) * (widgetButtonHeight + smallGAP); int y = (int) Math.ceil(chartOptions.length / ((double) COMMON_CHAR_NUM)) * (widgetButtonHeight + smallGAP);
componentsPara.setPreferredSize(new Dimension(x, y)); componentsPara.setPreferredSize(new Dimension(x, y));
chartTypePopupMenu = new JPopupMenu(); chartTypePopupMenu = new UIPopupMenu();
chartTypePopupMenu.add(componentsPara); chartTypePopupMenu.add(componentsPara);
} }
} }
@ -254,7 +255,7 @@ public class FormParaWidgetPane extends JPanel {
initChartTypePopUp(); initChartTypePopUp();
chartTypePopupMenu.show(FormParaWidgetPane.this, chartTypePopupMenu.show(FormParaWidgetPane.this,
(int) jSeparatorLayout.getLocation().getX() + BORDER, (int) jSeparatorLayout.getLocation().getX() + BORDER,
(int) jSeparatorLayout.getLocation().getY() - BORDER); (int) jSeparatorLayout.getLocation().getY());
} }
}); });
labelPane.add(chartPopUpButton, BorderLayout.EAST); labelPane.add(chartPopUpButton, BorderLayout.EAST);
@ -274,7 +275,7 @@ public class FormParaWidgetPane extends JPanel {
initWidgetTypePopUp(); initWidgetTypePopUp();
widgetTypePopupMenu.show(FormParaWidgetPane.this, widgetTypePopupMenu.show(FormParaWidgetPane.this,
(int) jSeparatorChart.getLocation().getX() + BORDER, (int) jSeparatorChart.getLocation().getX() + BORDER,
(int) jSeparatorChart.getLocation().getY() - BORDER); (int) jSeparatorChart.getLocation().getY());
} }
}); });

Write Preview
Loading…
Cancel
Save