From 9d4fff969fdeff6062d6dd74c82c0773b806eecc Mon Sep 17 00:00:00 2001 From: jaeyong lee Date: Mon, 8 Aug 2016 16:42:45 +0900 Subject: [PATCH] [SRADA-987] Hide "Recodring" option on Preference dialog. Change-Id: I8c81b127a11648374db24aac59b9d6eece7cb43c --- .../ui/toolbar/setting/PreferencesDialog.java | 122 +-------------------- 1 file changed, 2 insertions(+), 120 deletions(-) diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/PreferencesDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/PreferencesDialog.java index 10a6d84..ab7e9ed 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/PreferencesDialog.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/PreferencesDialog.java @@ -79,9 +79,6 @@ public class PreferencesDialog extends DAMessageBox { private DACustomToggleButton sourceviewtoggle = null; - private DACustomToggleButton recordingtoggle = null; - private DACustomToggleButton autostoptoggle = null; - private DACustomToggleButton periodicallytoggle = null; private DACustomCombo systemRateCombo = null; @@ -184,7 +181,6 @@ public class PreferencesDialog extends DAMessageBox { marginview_one.setLayout(new FillLayout()); int generalviewHeight = (LABLE_HEIGTH) * 3 + (LABLE_INTERVAL) * 2; - int recordingviewHeight = (LABLE_HEIGTH) * 2 + (LABLE_INTERVAL); int screenshotviewHeight = (LABLE_HEIGTH) + 9; // add "General" button @@ -241,57 +237,9 @@ public class PreferencesDialog extends DAMessageBox { functionRateCombo = makeDACustomCombo(generalvalues, "ms"); Composite marginview_two = new Composite(baseCom, SWT.NONE); - marginview_two.setLayoutData(new RowData(SWT.DEFAULT, LABLE_INTERVAL)); + marginview_two.setLayoutData(new RowData(SWT.DEFAULT, (int)(LABLE_INTERVAL*1.5))); marginview_two.setLayout(new FillLayout()); - // add "Recording" button - DACustomButton recordingExtend = createFoldingButton(baseCom, PreferencesDialogLabels.RECORDING); - - // "Recording" view - final Composite recordinglview = new Composite(baseCom, SWT.NONE); - final RowData recordingviewdata = new RowData(SWT.DEFAULT, recordingviewHeight); - recordinglview.setLayoutData(recordingviewdata); - recordinglview.setBackground(ColorResources.DIALOG_CONTENT_BACKGROUND); - recordinglview.setLayout(new FormLayout()); - - Composite recordinglabel = new Composite(recordinglview, SWT.NONE); - form = new FormData(); - form.top = new FormAttachment(0, 0); - form.left = new FormAttachment(0, LABLE_LEFT_MARGIN); - form.bottom = new FormAttachment(100, 0); - form.width = 180; - recordinglabel.setLayoutData(form); - recordinglabel.setLayout(layout); - recordinglabel.setBackground(ColorResources.DIALOG_CONTENT_BACKGROUND); - - createLabel(recordinglabel, PreferencesDialogLabels.RECORDING); - createLabel(recordinglabel, PreferencesDialogLabels.AUTOSTOP_WHILE_REPLAYING); - - Composite recordingvalues = new Composite(recordinglview, SWT.NONE); - form = new FormData(); - form.top = new FormAttachment(0, 0); - form.left = new FormAttachment(recordinglabel, 70); - form.right = new FormAttachment(100, 0); - form.bottom = new FormAttachment(100, 0); - recordingvalues.setLayoutData(form); - recordingvalues.setLayout(layout); - recordingvalues.setBackground(ColorResources.DIALOG_CONTENT_BACKGROUND); - - recordingtoggle = createToggleButton(recordingvalues); - recordingtoggle.addClickListener(new DACustomButtonClickEventListener() { - - @Override - public void handleClickEvent(DACustomButton button) { - autostoptoggle.setEnabled(recordingtoggle.isToggled()); - } - }); - - autostoptoggle = createToggleButton(recordingvalues); - - Composite marginview_three = new Composite(baseCom, SWT.NONE); - marginview_three.setLayoutData(new RowData(SWT.DEFAULT, LABLE_INTERVAL)); - marginview_three.setLayout(new FillLayout()); - // add "Screenshot" button DACustomButton screenshotExtend = createFoldingButton(baseCom, PreferencesDialogLabels.SCREENSHOT); @@ -355,19 +303,6 @@ public class PreferencesDialog extends DAMessageBox { } }); - recordingExtend.addClickListener(new DACustomButtonClickEventListener() { - @Override - public void handleClickEvent(DACustomButton button) { - recordingviewdata.exclude = !recordingviewdata.exclude; - recordinglview.setVisible(!recordingviewdata.exclude); - - recordinglview.getParent().pack(true); - - scrolledComp.setContent(baseCom); - scrolledComp.setMinSize(baseCom.computeSize(SWT.DEFAULT, SWT.DEFAULT)); - } - }); - screenshotExtend.addClickListener(new DACustomButtonClickEventListener() { @Override public void handleClickEvent(DACustomButton button) { @@ -475,7 +410,6 @@ public class PreferencesDialog extends DAMessageBox { private void setSelectedOptions() { int value = SettingDataManager.INSTANCE.getOptionsPreferencesValue(FlatPreferences.SOURCE_VIEW); - if (value == 1) { sourceviewtoggle.setToggled(true); MenuBar.getInstance().setSourceView(true); @@ -490,24 +424,7 @@ public class PreferencesDialog extends DAMessageBox { value = SettingDataManager.INSTANCE.getOptionsPreferencesValue(FlatPreferences.FUNCTION_SAMPLING_RATE); functionRateCombo.setText(String.valueOf(value)); - value = SettingDataManager.INSTANCE.getOptionsPreferencesValue(FlatPreferences.RECORDING); - - if (value == 1) { - recordingtoggle.setToggled(true); - } else { - recordingtoggle.setToggled(false); - } - - value = SettingDataManager.INSTANCE.getOptionsPreferencesValue(FlatPreferences.AUTO_STOP); - - if (value == 1) { - autostoptoggle.setToggled(true); - } else { - autostoptoggle.setToggled(false); - } - value = SettingDataManager.INSTANCE.getOptionsPreferencesValue(FlatPreferences.SCREENSHOT_PERIODICALLY); - if (value != 0) { periodicallytoggle.setToggled(true); screenshotRateCombo.setEnabled(true); @@ -520,7 +437,6 @@ public class PreferencesDialog extends DAMessageBox { private void setToDefault() { int value = FlatPreferences.SOURCE_VIEW.getDefaultValue(); - if (value == 1) { sourceviewtoggle.setToggled(true); } else { @@ -528,35 +444,12 @@ public class PreferencesDialog extends DAMessageBox { } value = FlatPreferences.SYSTEM_SAMPLING_RATE.getDefaultValue(); - systemRateCombo.setText(String.valueOf(value)); - + value = FlatPreferences.FUNCTION_SAMPLING_RATE.getDefaultValue(); - functionRateCombo.setText(String.valueOf(value)); - value = FlatPreferences.RECORDING.getDefaultValue(); - - if (value == 1) { - recordingtoggle.setToggled(true); - - value = FlatPreferences.AUTO_STOP.getDefaultValue(); - - if (value == 1) { - autostoptoggle.setToggled(true); - } else { - autostoptoggle.setToggled(false); - } - - autostoptoggle.setEnabled(true); - } else { - recordingtoggle.setToggled(false); - autostoptoggle.setToggled(false); - autostoptoggle.setEnabled(false); - } - value = FlatPreferences.SCREENSHOT_PERIODICALLY.getDefaultValue(); - if (value != 0) { periodicallytoggle.setToggled(true); screenshotRateCombo.setEnabled(true); @@ -650,17 +543,6 @@ public class PreferencesDialog extends DAMessageBox { return; } - if (recordingtoggle.isToggled()) { - SettingDataManager.INSTANCE.addOptionsSelectedPreference(FlatPreferences.RECORDING, 1); - } else { - SettingDataManager.INSTANCE.addOptionsSelectedPreference(FlatPreferences.RECORDING, 0); - } - - if (autostoptoggle.isToggled()) { - SettingDataManager.INSTANCE.addOptionsSelectedPreference(FlatPreferences.AUTO_STOP, 1); - } else { - SettingDataManager.INSTANCE.addOptionsSelectedPreference(FlatPreferences.AUTO_STOP, 0); - } if (periodicallytoggle.isToggled()) { int rate = 1; -- 2.7.4