Merge remote-tracking branch 'refs/remotes/ZCube/master'

ZCube · Jan 21, 2017 · 4320c48 · 4320c48
2 parents 9a43f5f + a10d279
commit 4320c48
Show file tree

Hide file tree

Showing 20 changed files with 2,050 additions and 354 deletions.
diff --git a/ACTWebSocket.Core/ACTWebSocket.Core.csproj b/ACTWebSocket.Core/ACTWebSocket.Core.csproj
@@ -115,6 +115,12 @@
     <Compile Include="Classes\MP3.cs" />
     <Compile Include="Classes\Settings.cs" />
     <Compile Include="Classes\StaticAPI.cs" />
+    <Compile Include="IPC_COPYDATA.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="IPC_COPYDATA.Designer.cs">
+      <DependentUpon>IPC_COPYDATA.cs</DependentUpon>
+    </Compile>
     <Compile Include="Functions\OverlayACTWork.cs" />
     <Compile Include="Functions\OverlayAPI.cs" />
     <Compile Include="Functions\OverlayDataSender.cs" />
@@ -142,6 +148,9 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="IPC_COPYDATA.resx">
+      <DependentUpon>IPC_COPYDATA.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Resources\css\default.css" />
     <EmbeddedResource Include="Resources\img\copy.svg" />
     <EmbeddedResource Include="Resources\img\detail.svg" />

diff --git a/ACTWebSocket.Core/ACTWebSocket.cs b/ACTWebSocket.Core/ACTWebSocket.cs
diff --git a/ACTWebSocket.Core/ACTWebSocket.ko.resx b/ACTWebSocket.Core/ACTWebSocket.ko.resx
@@ -182,49 +182,37 @@
   <data name="serverStatus.Text" xml:space="preserve">
     <value>서버 상태</value>
   </data>
-  <data name="copyURL.Location" type="System.Drawing.Point, System.Drawing">
-    <value>202, 325</value>
-  </data>
   <data name="copyURL.Text" xml:space="preserve">
     <value>URL 복사</value>
   </data>
-  <data name="buttonAddURL.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 325</value>
-  </data>
   <data name="buttonAddURL.Text" xml:space="preserve">
     <value>URL 추가</value>
   </data>
-  <data name="buttonURL.Location" type="System.Drawing.Point, System.Drawing">
-    <value>104, 325</value>
-  </data>
   <data name="buttonURL.Text" xml:space="preserve">
     <value>URL 삭제</value>
   </data>
-  <data name="skinList.Size" type="System.Drawing.Size, System.Drawing">
-    <value>386, 299</value>
+  <data name="buttonOpen.Text" xml:space="preserve">
+    <value>URL 열기</value>
   </data>
-  <data name="buttonOpen.Location" type="System.Drawing.Point, System.Drawing">
-    <value>300, 325</value>
+  <data name="buttonOverlay.Text" xml:space="preserve">
+    <value>오버레이</value>
   </data>
-  <data name="buttonOpen.Text" xml:space="preserve">
-    <value>새 오버레이</value>
+  <data name="groupBox2.Text" xml:space="preserve">
+    <value>웹 스킨</value>
   </data>
-  <data name="buttonManage.Text" xml:space="preserve">
-    <value>오버레이 관리</value>
+  <data name="autostartoverlay.Text" xml:space="preserve">
+    <value>오버레이 자동 시작/종료</value>
   </data>
   <data name="buttonDownload.Text" xml:space="preserve">
     <value>다운로드</value>
   </data>
-  <data name="buttonExit.Text" xml:space="preserve">
-    <value>오버레이 종료</value>
+  <data name="buttonStartStopOverlayProc.Text" xml:space="preserve">
+    <value>OverlayProc 실행/종료</value>
   </data>
-  <data name="buttonStart.Text" xml:space="preserve">
-    <value>실행</value>
-  </data>
-  <data name="autostartoverlay.Text" xml:space="preserve">
-    <value>오버레이 자동 시작</value>
+  <data name="buttonOpenOverlayProcManager.Text" xml:space="preserve">
+    <value>오버레이 관리자</value>
   </data>
-  <data name="$this.Size" type="System.Drawing.Size, System.Drawing">
-    <value>700, 500</value>
+  <data name="groupBox3.Text" xml:space="preserve">
+    <value>파일 스킨</value>
   </data>
 </root>