From de0f7345c9cd5295fb4335b59b16713481a16fef Mon Sep 17 00:00:00 2001 From: Lee Date: Tue, 27 Nov 2012 12:51:19 +0900 Subject: [PATCH] [Title] Snapshot, open trace dialgo disign fix [Desc.] design fix [Issue] - --- .../src/org/tizen/dynamicanalyzer/nl/AnalyzerLabels.properties | 2 +- .../src/org/tizen/dynamicanalyzer/theme/DAThemeWhite.java | 2 +- .../src/org/tizen/dynamicanalyzer/ui/file/FileChartView.java | 1 - .../org/tizen/dynamicanalyzer/ui/info/snapshot/SnapshotView.java | 6 +++--- .../src/org/tizen/dynamicanalyzer/ui/toolbar/ToolbarArea.java | 4 ---- .../dynamicanalyzer/ui/toolbar/opentrace/OpenTraceDialog.java | 9 ++++----- .../dynamicanalyzer/ui/toolbar/opentrace/SaveFilesTable.java | 4 ++-- .../dynamicanalyzer/ui/toolbar/opentrace/TempFilesTable.java | 4 ++-- 8 files changed, 13 insertions(+), 19 deletions(-) diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/AnalyzerLabels.properties b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/AnalyzerLabels.properties index 63f44c1..8132a85 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/AnalyzerLabels.properties +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/AnalyzerLabels.properties @@ -83,7 +83,7 @@ OPEN_TRACE_DLG_SAVED_FILE=Saved file OPEN_TRACE_DLG_TEMP_FILE=Temporary file OPEN_TRACE_DLG_TEMP_FILE_NAME=Temporary file name OPEN_TRACE_DLG_TRACE_FILE_NAME=Trace file name -OPEN_TRACE_DLG_TRACE_DATE=Created time +OPEN_TRACE_DLG_TRACE_DATE=Create time PATH_WARNING=Please install the Tizen SDK OS_WARNING=Not supported OS diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/theme/DAThemeWhite.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/theme/DAThemeWhite.java index 3c21ac0..060f73e 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/theme/DAThemeWhite.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/theme/DAThemeWhite.java @@ -416,7 +416,7 @@ public class DAThemeWhite extends DATheme { setColor("thread_graph_lock_acquire_color", new RGB(227, 123, 30)); //$NON-NLS-1$ setColor("thread_graph_lock_release_color", new RGB(0, 148, 170)); //$NON-NLS-1$ - setColor("snapshot_viewer_bg_color", new RGB(186, 186, 186)); //$NON-NLS-1$ + setColor("snapshot_viewer_bg_color", new RGB(255, 255, 255)); //$NON-NLS-1$ } public Color getColor(String colorName, RGB rgb) { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartView.java index abcaa54..dbda9c7 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartView.java @@ -88,7 +88,6 @@ public class FileChartView extends DAView { } List> inputs = logs.getLogs(); FileChartManager.getInstance().getLogListQueue().putLog(inputs); -// FileChartManager.getInstance().makeData(inputs); } @Override diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/SnapshotView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/SnapshotView.java index 622de17..832a3aa 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/SnapshotView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/SnapshotView.java @@ -89,7 +89,7 @@ public class SnapshotView extends DAView { // process graph Composite processComp = new Composite(contents, SWT.NONE); data = new FormData(); - data.top = new FormAttachment(snapshot, 2); + data.top = new FormAttachment(snapshot, 3); // data.left = new FormAttachment(50, 0); data.right = new FormAttachment(100, 0); data.width = 90; @@ -112,7 +112,7 @@ public class SnapshotView extends DAView { cpuGrp = new FourBarGraph(contents, SWT.NONE, FourBarGraph.TYPE_PERCENT); data = new FormData(); - data.top = new FormAttachment(snapshot, 2); + data.top = new FormAttachment(snapshot, 3); data.right = new FormAttachment(processComp, -3); data.width = 90; data.height = 90; @@ -129,7 +129,7 @@ public class SnapshotView extends DAView { Composite emptyComp = new Composite(contents, SWT.NONE); emptyComp.setBackground(ColorResources.WHITE); data = new FormData(); - data.top = new FormAttachment(snapshot, 2); + data.top = new FormAttachment(snapshot, 3); data.right = new FormAttachment(cpuGrp, -3); data.left = new FormAttachment(0, 0); data.height = 75; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ToolbarArea.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ToolbarArea.java index 6ddca49..fd35177 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ToolbarArea.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ToolbarArea.java @@ -59,14 +59,10 @@ import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.resources.FontResources; import org.tizen.dynamicanalyzer.resources.ImageResources; import org.tizen.dynamicanalyzer.services.RecordStateSourceProvider; -import org.tizen.dynamicanalyzer.ui.page.DAPageComposite; -import org.tizen.dynamicanalyzer.ui.range.RangeDataManager; -import org.tizen.dynamicanalyzer.ui.range.RangePage; import org.tizen.dynamicanalyzer.ui.timeline.TimelinePage; import org.tizen.dynamicanalyzer.ui.toolbar.opentrace.OpenTraceDialog; import org.tizen.dynamicanalyzer.ui.widgets.ComboButtonRenderer; import org.tizen.dynamicanalyzer.ui.widgets.DADialog; -import org.tizen.dynamicanalyzer.ui.widgets.DATabComposite; import org.tizen.dynamicanalyzer.ui.widgets.TitleComboPopupRenderer; import org.tizen.dynamicanalyzer.ui.widgets.TitleComboRenderer; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/OpenTraceDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/OpenTraceDialog.java index 4a65f1c..3be8fec 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/OpenTraceDialog.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/OpenTraceDialog.java @@ -447,20 +447,19 @@ public class OpenTraceDialog extends DAMessageBox { e.gc.setBackground(ColorResources.WHITE); e.gc.fillRectangle(rect); - e.gc.setForeground(ColorResources.BLACK); + e.gc.setForeground(ColorResources.OPEN_TRACE_TABLE_OUTLINE_COLOR); e.gc.drawRectangle(rect.x, rect.y, rect.width - 1, rect.height - 1); - e.gc.drawRectangle(rect.x + 2, rect.y + 2, rect.width - 5, - rect.height - 5); if (!application.isEmpty() && !device.isEmpty()) { + e.gc.setFont(FontResources.TABLE_CONTENTS); String inputText = "Applicatoin : " + application; Point textSize = e.gc.textExtent(inputText, SWT.DRAW_MNEMONIC); - int fontHeight = textSize.y; + int fontHeight = textSize.y + 3; int x = rect.x + 7; int y = rect.y + 4; - e.gc.setForeground(ColorResources.BLACK); + e.gc.setForeground(ColorResources.OPEN_TRACE_SAVE_CONTENTS_COLOR); e.gc.drawText(inputText, x, y); inputText = "Device : " + device; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/SaveFilesTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/SaveFilesTable.java index 05d7367..614bc0b 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/SaveFilesTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/SaveFilesTable.java @@ -143,9 +143,9 @@ public class SaveFilesTable extends DATableComposite { gridItem.setData(OpenTraceDialog.CURRENT_KEY, OpenTraceDialog.CURRENT); gridItem.setToolTipText(TRACE_NAME_INDEX, - "current project file - can't delete"); + "current trace - can't delete"); gridItem.setToolTipText(DATE_INDEX, - "current project file - can't delete"); + "current trace - can't delete"); } else { gridItem.setData(OpenTraceDialog.CURRENT_KEY, OpenTraceDialog.OTHERS); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/TempFilesTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/TempFilesTable.java index 5f22bc7..5a51f7d 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/TempFilesTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/TempFilesTable.java @@ -113,9 +113,9 @@ public class TempFilesTable extends DATableComposite { gridItem.setData(OpenTraceDialog.CURRENT_KEY, OpenTraceDialog.CURRENT); gridItem.setToolTipText(TRACE_NAME_INDEX, - "current project file - can't delete"); + "current trace - can't delete"); gridItem.setToolTipText(DATE_INDEX, - "current project file - can't delete"); + "current trace - can't delete"); } else { gridItem.setData(OpenTraceDialog.CURRENT_KEY, OpenTraceDialog.OTHERS); -- 2.7.4