Browse Source

Merge pull request #1678 in BA/design from ~ABEL.CHEN/design:feature/10.0 to feature/10.0

* commit '1a26d21d9fba2cf71a7480a38a0676a51da36e14':
  fix
master
superman 7 years ago
parent
commit
eed89b7203
  1. 6
      designer/src/com/fr/design/webattr/ViewToolBarPane.java
  2. 6
      designer/src/com/fr/design/webattr/ViewWebSettingPane.java

6
designer/src/com/fr/design/webattr/ViewToolBarPane.java

@ -118,9 +118,9 @@ public class ViewToolBarPane extends AbstractEditToolBarPane {
} else {
webView.setToolBarManagers(new ToolBarManager[0]);
}
webView.setIsSortFuncCheck(this.sortCheckBox.isSelected());
webView.setIsConditionFuncCheck(this.conditonFilterBox.isSelected());
webView.setIsListFuncCheck(this.listFilterBox.isSelected());
webView.setSortFuncCheck(this.sortCheckBox.isSelected());
webView.setConditionFuncCheck(this.conditonFilterBox.isSelected());
webView.setListFuncCheck(this.listFilterBox.isSelected());
for (int i = 0; i < eventPane.update().size(); i++) {
Listener listener = eventPane.update().get(i);
webView.addListener(listener);

6
designer/src/com/fr/design/webattr/ViewWebSettingPane.java

@ -51,9 +51,9 @@ public class ViewWebSettingPane extends WebSettingPane<WebView> {
@Override
protected WebView updateSubWebSettingBean() {
WebView webView = new WebView();
webView.setIsListFuncCheck(listFilterBox.isSelected());
webView.setIsConditionFuncCheck(conditionFilterBox.isSelected());
webView.setIsSortFuncCheck(sortCheckBox.isSelected());
webView.setListFuncCheck(listFilterBox.isSelected());
webView.setConditionFuncCheck(conditionFilterBox.isSelected());
webView.setSortFuncCheck(sortCheckBox.isSelected());
return webView;
}

Loading…
Cancel
Save