diff --git a/Million/MainForm.Designer.cs b/Million/MainForm.Designer.cs
index c05df02..af70e20 100644
--- a/Million/MainForm.Designer.cs
+++ b/Million/MainForm.Designer.cs
@@ -28,20 +28,184 @@
///
private void InitializeComponent()
{
+ this.ribbonControl_MainMenu = new DevExpress.XtraBars.Ribbon.RibbonControl();
+ this.barButtonItem_Setting = new DevExpress.XtraBars.BarButtonItem();
+ this.skinRibbonGalleryBarItem1 = new DevExpress.XtraBars.SkinRibbonGalleryBarItem();
+ this.barButtonItem_MenuMode = new DevExpress.XtraBars.BarButtonItem();
+ this.barButtonItem_GoogleOCRTest = new DevExpress.XtraBars.BarButtonItem();
+ this.ribbonPage_InputData = new DevExpress.XtraBars.Ribbon.RibbonPage();
+ this.ribbonPageGroup_OneClickProcess = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
+ this.ribbonPageGroup_InputData = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
+ this.ribbonPageGroup_Setting = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
+ this.ribbonPageGroup_SkinEditor = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
+ this.barButtonItem_CharView = new DevExpress.XtraBars.BarButtonItem();
+ this.barButtonItem_Analysis = new DevExpress.XtraBars.BarButtonItem();
+ this.barButtonItem_Simulator = new DevExpress.XtraBars.BarButtonItem();
+ this.ribbonPageGroup_AccumulateData = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
+ this.barButtonItem_AccumulateData = new DevExpress.XtraBars.BarButtonItem();
+ ((System.ComponentModel.ISupportInitialize)(this.ribbonControl_MainMenu)).BeginInit();
this.SuspendLayout();
//
+ // ribbonControl_MainMenu
+ //
+ this.ribbonControl_MainMenu.ExpandCollapseItem.Id = 0;
+ this.ribbonControl_MainMenu.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+ this.ribbonControl_MainMenu.Items.AddRange(new DevExpress.XtraBars.BarItem[] {
+ this.ribbonControl_MainMenu.ExpandCollapseItem,
+ this.barButtonItem_Setting,
+ this.skinRibbonGalleryBarItem1,
+ this.barButtonItem_MenuMode,
+ this.barButtonItem_GoogleOCRTest,
+ this.barButtonItem_CharView,
+ this.barButtonItem_Analysis,
+ this.barButtonItem_Simulator,
+ this.barButtonItem_AccumulateData});
+ this.ribbonControl_MainMenu.Location = new System.Drawing.Point(0, 0);
+ this.ribbonControl_MainMenu.MaxItemId = 24;
+ this.ribbonControl_MainMenu.Name = "ribbonControl_MainMenu";
+ this.ribbonControl_MainMenu.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] {
+ this.ribbonPage_InputData});
+ this.ribbonControl_MainMenu.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False;
+ this.ribbonControl_MainMenu.ShowDisplayOptionsMenuButton = DevExpress.Utils.DefaultBoolean.True;
+ this.ribbonControl_MainMenu.ShowExpandCollapseButton = DevExpress.Utils.DefaultBoolean.True;
+ this.ribbonControl_MainMenu.ShowMoreCommandsButton = DevExpress.Utils.DefaultBoolean.False;
+ this.ribbonControl_MainMenu.ShowPageHeadersInFormCaption = DevExpress.Utils.DefaultBoolean.False;
+ this.ribbonControl_MainMenu.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Show;
+ this.ribbonControl_MainMenu.ShowQatLocationSelector = false;
+ this.ribbonControl_MainMenu.ShowToolbarCustomizeItem = false;
+ this.ribbonControl_MainMenu.Size = new System.Drawing.Size(842, 120);
+ this.ribbonControl_MainMenu.Toolbar.ShowCustomizeItem = false;
+ this.ribbonControl_MainMenu.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden;
+ //
+ // barButtonItem_Setting
+ //
+ this.barButtonItem_Setting.Caption = "환경 설정";
+ this.barButtonItem_Setting.Id = 3;
+ this.barButtonItem_Setting.Name = "barButtonItem_Setting";
+ this.barButtonItem_Setting.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large;
+ //
+ // skinRibbonGalleryBarItem1
+ //
+ this.skinRibbonGalleryBarItem1.Caption = "skinRibbonGalleryBarItem1";
+ this.skinRibbonGalleryBarItem1.Id = 8;
+ this.skinRibbonGalleryBarItem1.Name = "skinRibbonGalleryBarItem1";
+ //
+ // barButtonItem_MenuMode
+ //
+ this.barButtonItem_MenuMode.Caption = "데이터 입력/결과 숨기기";
+ this.barButtonItem_MenuMode.Id = 14;
+ this.barButtonItem_MenuMode.Name = "barButtonItem_MenuMode";
+ this.barButtonItem_MenuMode.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large;
+ //
+ // barButtonItem_GoogleOCRTest
+ //
+ this.barButtonItem_GoogleOCRTest.Caption = "Goole OCR Test";
+ this.barButtonItem_GoogleOCRTest.Id = 19;
+ this.barButtonItem_GoogleOCRTest.Name = "barButtonItem_GoogleOCRTest";
+ this.barButtonItem_GoogleOCRTest.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large;
+ //
+ // ribbonPage_InputData
+ //
+ this.ribbonPage_InputData.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] {
+ this.ribbonPageGroup_OneClickProcess,
+ this.ribbonPageGroup_InputData,
+ this.ribbonPageGroup_AccumulateData,
+ this.ribbonPageGroup_Setting,
+ this.ribbonPageGroup_SkinEditor});
+ this.ribbonPage_InputData.Name = "ribbonPage_InputData";
+ this.ribbonPage_InputData.Text = "주요 메뉴";
+ //
+ // ribbonPageGroup_OneClickProcess
+ //
+ this.ribbonPageGroup_OneClickProcess.ItemLinks.Add(this.barButtonItem_CharView);
+ this.ribbonPageGroup_OneClickProcess.Name = "ribbonPageGroup_OneClickProcess";
+ this.ribbonPageGroup_OneClickProcess.Text = "차트";
+ //
+ // ribbonPageGroup_InputData
+ //
+ this.ribbonPageGroup_InputData.ItemLinks.Add(this.barButtonItem_Analysis);
+ this.ribbonPageGroup_InputData.ItemLinks.Add(this.barButtonItem_Simulator);
+ this.ribbonPageGroup_InputData.Name = "ribbonPageGroup_InputData";
+ this.ribbonPageGroup_InputData.Text = "데이터 분석";
+ //
+ // ribbonPageGroup_Setting
+ //
+ this.ribbonPageGroup_Setting.ItemLinks.Add(this.barButtonItem_Setting);
+ this.ribbonPageGroup_Setting.Name = "ribbonPageGroup_Setting";
+ this.ribbonPageGroup_Setting.Text = " 환경 설정";
+ //
+ // ribbonPageGroup_SkinEditor
+ //
+ this.ribbonPageGroup_SkinEditor.ItemLinks.Add(this.skinRibbonGalleryBarItem1);
+ this.ribbonPageGroup_SkinEditor.Name = "ribbonPageGroup_SkinEditor";
+ this.ribbonPageGroup_SkinEditor.Text = "스킨 에디터";
+ this.ribbonPageGroup_SkinEditor.Visible = false;
+ //
+ // barButtonItem_CharView
+ //
+ this.barButtonItem_CharView.Caption = "차트 뷰어";
+ this.barButtonItem_CharView.Id = 20;
+ this.barButtonItem_CharView.Name = "barButtonItem_CharView";
+ this.barButtonItem_CharView.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large;
+ //
+ // barButtonItem_Analysis
+ //
+ this.barButtonItem_Analysis.Caption = "데이터 분석";
+ this.barButtonItem_Analysis.Id = 21;
+ this.barButtonItem_Analysis.Name = "barButtonItem_Analysis";
+ this.barButtonItem_Analysis.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large;
+ //
+ // barButtonItem_Simulator
+ //
+ this.barButtonItem_Simulator.Caption = "시뮬레이터";
+ this.barButtonItem_Simulator.Id = 22;
+ this.barButtonItem_Simulator.Name = "barButtonItem_Simulator";
+ this.barButtonItem_Simulator.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large;
+ //
+ // ribbonPageGroup_AccumulateData
+ //
+ this.ribbonPageGroup_AccumulateData.ItemLinks.Add(this.barButtonItem_AccumulateData);
+ this.ribbonPageGroup_AccumulateData.Name = "ribbonPageGroup_AccumulateData";
+ this.ribbonPageGroup_AccumulateData.Text = "데이터 누적";
+ //
+ // barButtonItem_AccumulateData
+ //
+ this.barButtonItem_AccumulateData.Caption = "데이터 누적";
+ this.barButtonItem_AccumulateData.Id = 23;
+ this.barButtonItem_AccumulateData.Name = "barButtonItem_AccumulateData";
+ this.barButtonItem_AccumulateData.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large;
+ //
// MainForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(800, 450);
+ this.ClientSize = new System.Drawing.Size(842, 522);
+ this.Controls.Add(this.ribbonControl_MainMenu);
this.Name = "MainForm";
this.Text = "Million";
+ ((System.ComponentModel.ISupportInitialize)(this.ribbonControl_MainMenu)).EndInit();
this.ResumeLayout(false);
+ this.PerformLayout();
}
#endregion
+
+ private DevExpress.XtraBars.Ribbon.RibbonControl ribbonControl_MainMenu;
+ private DevExpress.XtraBars.BarButtonItem barButtonItem_Setting;
+ private DevExpress.XtraBars.SkinRibbonGalleryBarItem skinRibbonGalleryBarItem1;
+ private DevExpress.XtraBars.BarButtonItem barButtonItem_MenuMode;
+ private DevExpress.XtraBars.BarButtonItem barButtonItem_GoogleOCRTest;
+ private DevExpress.XtraBars.BarButtonItem barButtonItem_CharView;
+ private DevExpress.XtraBars.BarButtonItem barButtonItem_Analysis;
+ private DevExpress.XtraBars.BarButtonItem barButtonItem_Simulator;
+ private DevExpress.XtraBars.Ribbon.RibbonPage ribbonPage_InputData;
+ private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup_OneClickProcess;
+ private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup_InputData;
+ private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup_AccumulateData;
+ private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup_Setting;
+ private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup_SkinEditor;
+ private DevExpress.XtraBars.BarButtonItem barButtonItem_AccumulateData;
}
}
diff --git a/Million/Million.csproj b/Million/Million.csproj
index d94ea42..19a18a0 100644
--- a/Million/Million.csproj
+++ b/Million/Million.csproj
@@ -33,6 +33,29 @@
4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll
@@ -78,11 +101,11 @@
AccumulateDataUI.cs
-
+
Form
-
- CharSimulastorForm.cs
+
+ CharSimulatorForm.cs
Form
@@ -114,8 +137,8 @@
AccumulateDataUI.cs
-
- CharSimulastorForm.cs
+
+ CharSimulatorForm.cs
ChartViewerForm.cs
diff --git a/Million/Properties/licenses.licx b/Million/Properties/licenses.licx
index 952a3dc..8741a54 100644
--- a/Million/Properties/licenses.licx
+++ b/Million/Properties/licenses.licx
@@ -1 +1,3 @@
DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v18.2.UI, Version=18.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v18.2, Version=18.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.DashboardWin.DashboardDesigner, DevExpress.Dashboard.v18.2.Win, Version=18.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/Million/SubForm/CharSimulastorForm.Designer.cs b/Million/SubForm/CharSimulatorForm.Designer.cs
similarity index 97%
rename from Million/SubForm/CharSimulastorForm.Designer.cs
rename to Million/SubForm/CharSimulatorForm.Designer.cs
index efa8b59..bd613d3 100644
--- a/Million/SubForm/CharSimulastorForm.Designer.cs
+++ b/Million/SubForm/CharSimulatorForm.Designer.cs
@@ -1,6 +1,6 @@
namespace Million.SubForm
{
- partial class CharSimulastorForm
+ partial class CharSimulatorForm
{
///
/// Required designer variable.
diff --git a/Million/SubForm/CharSimulastorForm.cs b/Million/SubForm/CharSimulatorForm.cs
similarity index 78%
rename from Million/SubForm/CharSimulastorForm.cs
rename to Million/SubForm/CharSimulatorForm.cs
index 15aeeb1..684edfc 100644
--- a/Million/SubForm/CharSimulastorForm.cs
+++ b/Million/SubForm/CharSimulatorForm.cs
@@ -14,9 +14,9 @@ namespace Million.SubForm
///
/// 차트 시뮬레이터 폼
///
- public partial class CharSimulastorForm : DevExpress.XtraEditors.XtraForm
+ public partial class CharSimulatorForm : DevExpress.XtraEditors.XtraForm
{
- public CharSimulastorForm()
+ public CharSimulatorForm()
{
InitializeComponent();
}
diff --git a/Million/SubForm/CharSimulastorForm.resx b/Million/SubForm/CharSimulatorForm.resx
similarity index 100%
rename from Million/SubForm/CharSimulastorForm.resx
rename to Million/SubForm/CharSimulatorForm.resx