OSDN -- オープンソース・ソフトウェアの開発とダウンロード
日本語の翻訳状況 translation status for ja
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

コミット

タグ
未設定

よく使われているワード(クリックで追加)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

OmegaChartのソースコードの保守


コミットメタ情報

リビジョン47353f91edd15fbe3e3fded2396ead55aecf73f2 (tree)
日時2014-04-20 15:42:24
作者panacoran <panacoran@user...>
コミッターpanacoran

ログメッセージ

株価データのダウンロード元を選択可能にする

変更サマリ

差分

--- a/Download.cs
+++ b/Download.cs
@@ -57,6 +57,8 @@ namespace Zanetti.Forms
5757 private System.Windows.Forms.TextBox _nameTextBox;
5858 private System.Windows.Forms.Label _progressLabel;
5959 private System.Windows.Forms.ProgressBar _progressBar;
60+ private ComboBox comboBoxSource;
61+ private Label labelStockDataSource;
6062 /// <summary>
6163 /// 必要なデザイナ変数です。
6264 /// </summary>
@@ -114,299 +116,306 @@ namespace Zanetti.Forms
114116 /// </summary>
115117 private void InitializeComponent()
116118 {
117- this._okButton = new System.Windows.Forms.Button();
118- this._cancelButton = new System.Windows.Forms.Button();
119- this._donationButton = new System.Windows.Forms.Button();
120- this._orderGroup = new System.Windows.Forms.GroupBox();
121- this._currenciesCheckBox = new System.Windows.Forms.CheckBox();
122- this._commodityCheckBox = new System.Windows.Forms.CheckBox();
123- this._stockCheckBox = new System.Windows.Forms.CheckBox();
124- this._sectorsCheckBox = new System.Windows.Forms.CheckBox();
125- this._stockGroup = new System.Windows.Forms.GroupBox();
126- this._dateBox = new System.Windows.Forms.ComboBox();
127- this._radioDailyStock = new System.Windows.Forms.RadioButton();
128- this._radioAllStock = new System.Windows.Forms.RadioButton();
129-#if KENMILLE
130- this._radioKenmilleStock = new System.Windows.Forms.RadioButton();
131-#endif
132- this._allStockButton = new System.Windows.Forms.Button();
133- this._indicesCheckBox = new System.Windows.Forms.CheckBox();
119+ this._okButton = new System.Windows.Forms.Button();
120+ this._cancelButton = new System.Windows.Forms.Button();
121+ this._donationButton = new System.Windows.Forms.Button();
122+ this._orderGroup = new System.Windows.Forms.GroupBox();
123+ this._currenciesCheckBox = new System.Windows.Forms.CheckBox();
124+ this._commodityCheckBox = new System.Windows.Forms.CheckBox();
125+ this._stockCheckBox = new System.Windows.Forms.CheckBox();
126+ this._sectorsCheckBox = new System.Windows.Forms.CheckBox();
127+ this._stockGroup = new System.Windows.Forms.GroupBox();
128+ this.comboBoxSource = new System.Windows.Forms.ComboBox();
129+ this.labelStockDataSource = new System.Windows.Forms.Label();
130+ this._dateBox = new System.Windows.Forms.ComboBox();
131+ this._radioDailyStock = new System.Windows.Forms.RadioButton();
132+ this._radioAllStock = new System.Windows.Forms.RadioButton();
133+ this._allStockButton = new System.Windows.Forms.Button();
134+ this._indicesCheckBox = new System.Windows.Forms.CheckBox();
135+ this._namingCheckBox = new System.Windows.Forms.CheckBox();
136+ this._namingGroup = new System.Windows.Forms.GroupBox();
137+ this._nameTextBox = new System.Windows.Forms.TextBox();
138+ this._nameLabel = new System.Windows.Forms.Label();
139+ this._locationBox = new System.Windows.Forms.ComboBox();
140+ this._locationLabel = new System.Windows.Forms.Label();
141+ this._progressBar = new System.Windows.Forms.ProgressBar();
142+ this._progressLabel = new System.Windows.Forms.Label();
143+ this._orderGroup.SuspendLayout();
144+ this._stockGroup.SuspendLayout();
145+ this._namingGroup.SuspendLayout();
146+ this.SuspendLayout();
147+ //
148+ // _okButton
149+ //
150+ this._okButton.DialogResult = System.Windows.Forms.DialogResult.OK;
151+ this._okButton.FlatStyle = System.Windows.Forms.FlatStyle.System;
152+ this._okButton.Location = new System.Drawing.Point(272, 320);
153+ this._okButton.Name = "_okButton";
154+ this._okButton.Size = new System.Drawing.Size(75, 23);
155+ this._okButton.TabIndex = 0;
156+ this._okButton.Text = "開始";
157+ this._okButton.Click += new System.EventHandler(this.OnOK);
158+ //
159+ // _cancelButton
160+ //
161+ this._cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
162+ this._cancelButton.FlatStyle = System.Windows.Forms.FlatStyle.System;
163+ this._cancelButton.Location = new System.Drawing.Point(360, 320);
164+ this._cancelButton.Name = "_cancelButton";
165+ this._cancelButton.Size = new System.Drawing.Size(75, 23);
166+ this._cancelButton.TabIndex = 1;
167+ this._cancelButton.Text = "キャンセル";
168+ this._cancelButton.Click += new System.EventHandler(this.OnCancel);
169+ //
170+ // _donationButton
171+ //
172+ this._donationButton.FlatStyle = System.Windows.Forms.FlatStyle.System;
173+ this._donationButton.Location = new System.Drawing.Point(16, 320);
174+ this._donationButton.Name = "_donationButton";
175+ this._donationButton.Size = new System.Drawing.Size(80, 24);
176+ this._donationButton.TabIndex = 100;
177+ this._donationButton.Text = "寄付について...";
178+ this._donationButton.Click += new System.EventHandler(this.OnDonationButtonClick);
179+ //
180+ // _orderGroup
181+ //
182+ this._orderGroup.Controls.Add(this._currenciesCheckBox);
183+ this._orderGroup.Controls.Add(this._commodityCheckBox);
184+ this._orderGroup.Controls.Add(this._stockCheckBox);
185+ this._orderGroup.Controls.Add(this._sectorsCheckBox);
186+ this._orderGroup.Controls.Add(this._stockGroup);
187+ this._orderGroup.Controls.Add(this._indicesCheckBox);
188+ this._orderGroup.FlatStyle = System.Windows.Forms.FlatStyle.System;
189+ this._orderGroup.Location = new System.Drawing.Point(8, 6);
190+ this._orderGroup.Name = "_orderGroup";
191+ this._orderGroup.Size = new System.Drawing.Size(440, 176);
192+ this._orderGroup.TabIndex = 2;
193+ this._orderGroup.TabStop = false;
194+ this._orderGroup.Text = "ダウンロードするデータの選択";
195+ //
196+ // _currenciesCheckBox
197+ //
198+ this._currenciesCheckBox.FlatStyle = System.Windows.Forms.FlatStyle.System;
199+ this._currenciesCheckBox.Location = new System.Drawing.Point(224, 120);
200+ this._currenciesCheckBox.Name = "_currenciesCheckBox";
201+ this._currenciesCheckBox.Size = new System.Drawing.Size(168, 24);
202+ this._currenciesCheckBox.TabIndex = 6;
203+ this._currenciesCheckBox.Text = "為替(&C)";
204+ //
205+ // _commodityCheckBox
206+ //
207+ this._commodityCheckBox.FlatStyle = System.Windows.Forms.FlatStyle.System;
208+ this._commodityCheckBox.Location = new System.Drawing.Point(224, 144);
209+ this._commodityCheckBox.Name = "_commodityCheckBox";
210+ this._commodityCheckBox.Size = new System.Drawing.Size(168, 24);
211+ this._commodityCheckBox.TabIndex = 8;
212+ this._commodityCheckBox.Text = "商品先物(&O)";
213+ this._commodityCheckBox.Visible = false;
214+ //
215+ // _stockCheckBox
216+ //
217+ this._stockCheckBox.FlatStyle = System.Windows.Forms.FlatStyle.System;
218+ this._stockCheckBox.Location = new System.Drawing.Point(16, 15);
219+ this._stockCheckBox.Name = "_stockCheckBox";
220+ this._stockCheckBox.Size = new System.Drawing.Size(176, 24);
221+ this._stockCheckBox.TabIndex = 3;
222+ this._stockCheckBox.Text = "国内株式(&S)";
223+ this._stockCheckBox.CheckedChanged += new System.EventHandler(this.OnAdjustStockDownload);
224+ //
225+ // _sectorsCheckBox
226+ //
227+ this._sectorsCheckBox.FlatStyle = System.Windows.Forms.FlatStyle.System;
228+ this._sectorsCheckBox.Location = new System.Drawing.Point(16, 144);
229+ this._sectorsCheckBox.Name = "_sectorsCheckBox";
230+ this._sectorsCheckBox.Size = new System.Drawing.Size(168, 24);
231+ this._sectorsCheckBox.TabIndex = 7;
232+ this._sectorsCheckBox.Text = "業種別指数(&E)";
233+ //
234+ // _stockGroup
235+ //
236+ this._stockGroup.Controls.Add(this.comboBoxSource);
237+ this._stockGroup.Controls.Add(this.labelStockDataSource);
238+ this._stockGroup.Controls.Add(this._dateBox);
239+ this._stockGroup.Controls.Add(this._radioDailyStock);
240+ this._stockGroup.Controls.Add(this._radioAllStock);
241+ this._stockGroup.Controls.Add(this._allStockButton);
242+ this._stockGroup.Enabled = false;
243+ this._stockGroup.FlatStyle = System.Windows.Forms.FlatStyle.System;
244+ this._stockGroup.Location = new System.Drawing.Point(8, 22);
245+ this._stockGroup.Name = "_stockGroup";
246+ this._stockGroup.Size = new System.Drawing.Size(424, 96);
247+ this._stockGroup.TabIndex = 4;
248+ this._stockGroup.TabStop = false;
249+ //
250+ // comboBoxSource
251+ //
252+ this.comboBoxSource.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
253+ this.comboBoxSource.FormattingEnabled = true;
254+ this.comboBoxSource.Location = new System.Drawing.Point(208, 67);
255+ this.comboBoxSource.Name = "comboBoxSource";
256+ this.comboBoxSource.Size = new System.Drawing.Size(100, 20);
257+ this.comboBoxSource.TabIndex = 5;
258+ //
259+ // labelStockDataSource
260+ //
261+ this.labelStockDataSource.Location = new System.Drawing.Point(30, 67);
262+ this.labelStockDataSource.Name = "labelStockDataSource";
263+ this.labelStockDataSource.Size = new System.Drawing.Size(90, 24);
264+ this.labelStockDataSource.TabIndex = 4;
265+ this.labelStockDataSource.Text = "株価データソース";
266+ this.labelStockDataSource.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
267+ //
268+ // _dateBox
269+ //
270+ this._dateBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
271+ this._dateBox.Enabled = false;
272+ this._dateBox.Location = new System.Drawing.Point(208, 16);
273+ this._dateBox.Name = "_dateBox";
274+ this._dateBox.Size = new System.Drawing.Size(137, 20);
275+ this._dateBox.TabIndex = 1;
276+ //
277+ // _radioDailyStock
278+ //
279+ this._radioDailyStock.Checked = true;
280+ this._radioDailyStock.FlatStyle = System.Windows.Forms.FlatStyle.System;
281+ this._radioDailyStock.Location = new System.Drawing.Point(16, 16);
282+ this._radioDailyStock.Name = "_radioDailyStock";
283+ this._radioDailyStock.Size = new System.Drawing.Size(152, 24);
284+ this._radioDailyStock.TabIndex = 0;
285+ this._radioDailyStock.TabStop = true;
286+ this._radioDailyStock.Text = "次の日付以降・全銘柄(&D)";
287+ this._radioDailyStock.CheckedChanged += new System.EventHandler(this.OnAdjustDailyStockCheckBox);
288+ //
289+ // _radioAllStock
290+ //
291+ this._radioAllStock.FlatStyle = System.Windows.Forms.FlatStyle.System;
292+ this._radioAllStock.Location = new System.Drawing.Point(16, 40);
293+ this._radioAllStock.Name = "_radioAllStock";
294+ this._radioAllStock.Size = new System.Drawing.Size(192, 24);
295+ this._radioAllStock.TabIndex = 2;
296+ this._radioAllStock.Text = "データの初期化(&A)";
297+ this._radioAllStock.CheckedChanged += new System.EventHandler(this.OnAllStockRadioButtonCheckedChanged);
298+ //
299+ // _allStockButton
300+ //
301+ this._allStockButton.Enabled = false;
302+ this._allStockButton.FlatStyle = System.Windows.Forms.FlatStyle.System;
303+ this._allStockButton.Location = new System.Drawing.Point(254, 40);
304+ this._allStockButton.Name = "_allStockButton";
305+ this._allStockButton.Size = new System.Drawing.Size(96, 24);
306+ this._allStockButton.TabIndex = 3;
307+ this._allStockButton.Text = "初期化(&S)...";
308+ this._allStockButton.Click += new System.EventHandler(this.OnInitializeButtonClicked);
309+ //
310+ // _indicesCheckBox
311+ //
312+ this._indicesCheckBox.FlatStyle = System.Windows.Forms.FlatStyle.System;
313+ this._indicesCheckBox.Location = new System.Drawing.Point(16, 120);
314+ this._indicesCheckBox.Name = "_indicesCheckBox";
315+ this._indicesCheckBox.Size = new System.Drawing.Size(168, 24);
316+ this._indicesCheckBox.TabIndex = 5;
317+ this._indicesCheckBox.Text = "株価指数(&I)";
318+ //
319+ // _namingCheckBox
320+ //
321+ this._namingCheckBox.Checked = true;
322+ this._namingCheckBox.CheckState = System.Windows.Forms.CheckState.Checked;
323+ this._namingCheckBox.FlatStyle = System.Windows.Forms.FlatStyle.System;
324+ this._namingCheckBox.Location = new System.Drawing.Point(24, 194);
325+ this._namingCheckBox.Name = "_namingCheckBox";
326+ this._namingCheckBox.Size = new System.Drawing.Size(384, 24);
327+ this._namingCheckBox.TabIndex = 9;
328+ this._namingCheckBox.Text = "このダウンロード設定を保存して次回以降再利用する(&P)";
329+ this._namingCheckBox.CheckedChanged += new System.EventHandler(this.OnAdjustNamingCheckBox);
330+ //
331+ // _namingGroup
332+ //
333+ this._namingGroup.Controls.Add(this._nameTextBox);
334+ this._namingGroup.Controls.Add(this._nameLabel);
335+ this._namingGroup.Controls.Add(this._locationBox);
336+ this._namingGroup.Controls.Add(this._locationLabel);
337+ this._namingGroup.FlatStyle = System.Windows.Forms.FlatStyle.System;
338+ this._namingGroup.Location = new System.Drawing.Point(8, 200);
339+ this._namingGroup.Name = "_namingGroup";
340+ this._namingGroup.Size = new System.Drawing.Size(440, 56);
341+ this._namingGroup.TabIndex = 9;
342+ this._namingGroup.TabStop = false;
343+ //
344+ // _nameTextBox
345+ //
346+ this._nameTextBox.Location = new System.Drawing.Point(328, 24);
347+ this._nameTextBox.Name = "_nameTextBox";
348+ this._nameTextBox.Size = new System.Drawing.Size(104, 19);
349+ this._nameTextBox.TabIndex = 3;
350+ //
351+ // _nameLabel
352+ //
353+ this._nameLabel.Location = new System.Drawing.Point(240, 24);
354+ this._nameLabel.Name = "_nameLabel";
355+ this._nameLabel.Size = new System.Drawing.Size(48, 23);
356+ this._nameLabel.TabIndex = 2;
357+ this._nameLabel.Text = "名前(&N)";
358+ this._nameLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
359+ //
360+ // _locationBox
361+ //
362+ this._locationBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
363+ this._locationBox.Location = new System.Drawing.Point(128, 24);
364+ this._locationBox.Name = "_locationBox";
365+ this._locationBox.Size = new System.Drawing.Size(104, 20);
366+ this._locationBox.TabIndex = 1;
367+ //
368+ // _locationLabel
369+ //
370+ this._locationLabel.Location = new System.Drawing.Point(16, 24);
371+ this._locationLabel.Name = "_locationLabel";
372+ this._locationLabel.Size = new System.Drawing.Size(104, 23);
373+ this._locationLabel.TabIndex = 0;
374+ this._locationLabel.Text = "保存場所(&L)";
375+ this._locationLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
376+ //
377+ // _progressBar
378+ //
379+ this._progressBar.Location = new System.Drawing.Point(8, 288);
380+ this._progressBar.Name = "_progressBar";
381+ this._progressBar.Size = new System.Drawing.Size(440, 23);
382+ this._progressBar.TabIndex = 10;
383+ //
384+ // _progressLabel
385+ //
386+ this._progressLabel.Location = new System.Drawing.Point(8, 264);
387+ this._progressLabel.Name = "_progressLabel";
388+ this._progressLabel.Size = new System.Drawing.Size(344, 16);
389+ this._progressLabel.TabIndex = 11;
390+ this._progressLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
391+ //
392+ // DownloadDialog
393+ //
394+ this.AcceptButton = this._okButton;
395+ this.AutoScaleBaseSize = new System.Drawing.Size(5, 12);
396+ this.CancelButton = this._cancelButton;
397+ this.ClientSize = new System.Drawing.Size(458, 352);
398+ this.Controls.Add(this._orderGroup);
399+ this.Controls.Add(this._progressLabel);
400+ this.Controls.Add(this._progressBar);
401+ this.Controls.Add(this._namingCheckBox);
402+ this.Controls.Add(this._namingGroup);
403+ this.Controls.Add(this._cancelButton);
404+ this.Controls.Add(this._okButton);
405+ this.Controls.Add(this._donationButton);
406+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
407+ this.MaximizeBox = false;
408+ this.MinimizeBox = false;
409+ this.Name = "DownloadDialog";
410+ this.ShowInTaskbar = false;
411+ this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
412+ this.Text = "データのダウンロード";
413+ this._orderGroup.ResumeLayout(false);
414+ this._stockGroup.ResumeLayout(false);
415+ this._namingGroup.ResumeLayout(false);
416+ this._namingGroup.PerformLayout();
417+ this.ResumeLayout(false);
134418
135- this._namingCheckBox = new System.Windows.Forms.CheckBox();
136- this._namingGroup = new System.Windows.Forms.GroupBox();
137- this._nameTextBox = new System.Windows.Forms.TextBox();
138- this._nameLabel = new System.Windows.Forms.Label();
139- this._locationBox = new System.Windows.Forms.ComboBox();
140- this._locationLabel = new System.Windows.Forms.Label();
141- this._progressBar = new System.Windows.Forms.ProgressBar();
142- this._progressLabel = new System.Windows.Forms.Label();
143- this._stockGroup.SuspendLayout();
144- this._namingGroup.SuspendLayout();
145- this.SuspendLayout();
146- //
147- // _okButton
148- //
149- this._okButton.DialogResult = System.Windows.Forms.DialogResult.OK;
150- this._okButton.FlatStyle = System.Windows.Forms.FlatStyle.System;
151- this._okButton.Location = new System.Drawing.Point(272, 320);
152- this._okButton.Name = "_okButton";
153- this._okButton.TabIndex = 0;
154- this._okButton.Text = "開始";
155- this._okButton.Click += new System.EventHandler(this.OnOK);
156- //
157- // _cancelButton
158- //
159- this._cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
160- this._cancelButton.FlatStyle = System.Windows.Forms.FlatStyle.System;
161- this._cancelButton.Location = new System.Drawing.Point(360, 320);
162- this._cancelButton.Name = "_cancelButton";
163- this._cancelButton.TabIndex = 1;
164- this._cancelButton.Text = "キャンセル";
165- this._cancelButton.Click += new System.EventHandler(this.OnCancel);
166- //
167- // _donationButton
168- //
169- this._donationButton.FlatStyle = System.Windows.Forms.FlatStyle.System;
170- this._donationButton.Location = new System.Drawing.Point(16, 320);
171- this._donationButton.Name = "_donationButton";
172- this._donationButton.TabIndex = 100;
173- this._donationButton.Size = new Size(80, 24);
174- this._donationButton.Text = "寄付について...";
175- this._donationButton.Click += new System.EventHandler(this.OnDonationButtonClick);
176- //
177- // _orderGroup
178- //
179- this._orderGroup.Controls.Add(this._currenciesCheckBox);
180- this._orderGroup.Controls.Add(this._commodityCheckBox);
181- this._orderGroup.Controls.Add(this._stockCheckBox);
182- this._orderGroup.Controls.Add(this._sectorsCheckBox);
183- this._orderGroup.Controls.Add(this._stockGroup);
184- this._orderGroup.Controls.Add(this._indicesCheckBox);
185- this._orderGroup.Location = new System.Drawing.Point(8, 6);
186- this._orderGroup.Text = "ダウンロードするデータの選択";
187- this._orderGroup.Name = "_orderGroup";
188- this._orderGroup.FlatStyle = FlatStyle.System;
189- this._orderGroup.Size = new System.Drawing.Size(440, 176);
190- this._orderGroup.TabIndex = 2;
191- //
192- // _stockCheckBox
193- //
194- this._stockCheckBox.FlatStyle = System.Windows.Forms.FlatStyle.System;
195- this._stockCheckBox.Location = new System.Drawing.Point(16, 15);
196- this._stockCheckBox.Name = "_stockCheckBox";
197- this._stockCheckBox.Size = new System.Drawing.Size(176, 24);
198- this._stockCheckBox.TabIndex = 3;
199- this._stockCheckBox.Text = "国内株式(&S)";
200- this._stockCheckBox.CheckedChanged += new System.EventHandler(this.OnAdjustStockDownload);
201- //
202- // _stockGroup
203- //
204- this._stockGroup.Controls.Add(this._dateBox);
205- this._stockGroup.Controls.Add(this._radioDailyStock);
206- this._stockGroup.Controls.Add(this._radioAllStock);
207- this._stockGroup.Controls.Add(this._allStockButton);
208-#if KENMILLE
209- this._stockGroup.Controls.Add(this._radioKenmilleStock);
210-#endif
211- this._stockGroup.Enabled = false;
212- this._stockGroup.FlatStyle = System.Windows.Forms.FlatStyle.System;
213- this._stockGroup.Location = new System.Drawing.Point(8, 22);
214- this._stockGroup.Name = "_stockGroup";
215- this._stockGroup.Size = new System.Drawing.Size(424, 96);
216- this._stockGroup.TabIndex = 4;
217- this._stockGroup.TabStop = false;
218- //
219- // _radioDailyStock
220- //
221- this._radioDailyStock.FlatStyle = System.Windows.Forms.FlatStyle.System;
222- this._radioDailyStock.Location = new System.Drawing.Point(16, 16);
223- this._radioDailyStock.Name = "_radioDailyStock";
224- this._radioDailyStock.Size = new System.Drawing.Size(152, 24);
225- this._radioDailyStock.TabIndex = 0;
226- this._radioDailyStock.Checked = true;
227- this._radioDailyStock.Text = "次の日付以降・全銘柄(&D)";
228- this._radioDailyStock.CheckedChanged += new System.EventHandler(this.OnAdjustDailyStockCheckBox);
229- //
230- // _dateBox
231- //
232- this._dateBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
233- this._dateBox.Enabled = false;
234- this._dateBox.Location = new System.Drawing.Point(208, 16);
235- this._dateBox.Name = "_dateBox";
236- this._dateBox.Size = new System.Drawing.Size(137, 20);
237- this._dateBox.TabIndex = 1;
238- //
239- // _radioAllStock
240- //
241- this._radioAllStock.FlatStyle = System.Windows.Forms.FlatStyle.System;
242- this._radioAllStock.Location = new System.Drawing.Point(16, 40);
243- this._radioAllStock.Name = "_radioAllStock";
244- this._radioAllStock.Size = new System.Drawing.Size(192, 24);
245- this._radioAllStock.TabIndex = 2;
246- this._radioAllStock.CheckedChanged += new EventHandler(OnAllStockRadioButtonCheckedChanged);
247- this._radioAllStock.Text = "データの初期化(&A)";
248- //
249- // _allStockButton
250- //
251- this._allStockButton.FlatStyle = System.Windows.Forms.FlatStyle.System;
252- this._allStockButton.Location = new System.Drawing.Point(254, 40);
253- this._allStockButton.Name = "_allStockButton";
254- this._allStockButton.Size = new System.Drawing.Size(96, 24);
255- this._allStockButton.TabIndex = 3;
256- this._allStockButton.Enabled = false;
257- this._allStockButton.Click += new EventHandler(OnInitializeButtonClicked);
258- this._allStockButton.Text = "初期化(&S)...";
259-#if KENMILLE
260- //
261- // _radioKenmilleStock
262- //
263- this._radioKenmilleStock.FlatStyle = System.Windows.Forms.FlatStyle.System;
264- this._radioKenmilleStock.Location = new System.Drawing.Point(16, 64);
265- this._radioKenmilleStock.Name = "_radioKenmilleStock";
266- this._radioKenmilleStock.Size = new System.Drawing.Size(192, 24);
267- this._radioKenmilleStock.TabIndex = 4;
268- this._radioKenmilleStock.Text = "ケンミレニアムから取得(含信用残)(&K)";
269-#endif
270- //
271- // _indicesCheckBox
272- //
273- this._indicesCheckBox.FlatStyle = System.Windows.Forms.FlatStyle.System;
274- this._indicesCheckBox.Location = new System.Drawing.Point(16, 120);
275- this._indicesCheckBox.Name = "_indicesCheckBox";
276- this._indicesCheckBox.Size = new System.Drawing.Size(168, 24);
277- this._indicesCheckBox.TabIndex = 5;
278- this._indicesCheckBox.Text = "株価指数(&I)";
279- //
280- // _currenciesCheckBox
281- //
282- this._currenciesCheckBox.FlatStyle = System.Windows.Forms.FlatStyle.System;
283- this._currenciesCheckBox.Location = new System.Drawing.Point(224, 120);
284- this._currenciesCheckBox.Name = "_currenciesCheckBox";
285- this._currenciesCheckBox.Size = new System.Drawing.Size(168, 24);
286- this._currenciesCheckBox.TabIndex = 6;
287- this._currenciesCheckBox.Text = "為替(&C)";
288- //
289- // _sectorsCheckBox
290- //
291- this._sectorsCheckBox.FlatStyle = System.Windows.Forms.FlatStyle.System;
292- this._sectorsCheckBox.Location = new System.Drawing.Point(16, 144);
293- this._sectorsCheckBox.Name = "_sectorsCheckBox";
294- this._sectorsCheckBox.Size = new System.Drawing.Size(168, 24);
295- this._sectorsCheckBox.TabIndex = 7;
296- this._sectorsCheckBox.Text = "業種別指数(&E)";
297- //
298- // _commodityCheckBox
299- //
300- this._commodityCheckBox.FlatStyle = System.Windows.Forms.FlatStyle.System;
301- this._commodityCheckBox.Location = new System.Drawing.Point(224, 144);
302- this._commodityCheckBox.Name = "_commodityCheckBox";
303- this._commodityCheckBox.Size = new System.Drawing.Size(168, 24);
304- this._commodityCheckBox.TabIndex = 8;
305- this._commodityCheckBox.Text = "商品先物(&O)";
306- this._commodityCheckBox.Visible = false;
307- //
308- // _namingCheckBox
309- //
310- this._namingCheckBox.Checked = true;
311- this._namingCheckBox.CheckState = System.Windows.Forms.CheckState.Checked;
312- this._namingCheckBox.FlatStyle = System.Windows.Forms.FlatStyle.System;
313- this._namingCheckBox.Location = new System.Drawing.Point(24, 194);
314- this._namingCheckBox.Name = "_namingCheckBox";
315- this._namingCheckBox.Size = new System.Drawing.Size(384, 24);
316- this._namingCheckBox.TabIndex = 9;
317- this._namingCheckBox.Text = "このダウンロード設定を保存して次回以降再利用する(&P)";
318- this._namingCheckBox.CheckedChanged += new EventHandler(OnAdjustNamingCheckBox);
319- //
320- // _namingGroup
321- //
322- this._namingGroup.Controls.Add(this._nameTextBox);
323- this._namingGroup.Controls.Add(this._nameLabel);
324- this._namingGroup.Controls.Add(this._locationBox);
325- this._namingGroup.Controls.Add(this._locationLabel);
326- this._namingGroup.FlatStyle = System.Windows.Forms.FlatStyle.System;
327- this._namingGroup.Location = new System.Drawing.Point(8, 200);
328- this._namingGroup.Name = "_namingGroup";
329- this._namingGroup.Size = new System.Drawing.Size(440, 56);
330- this._namingGroup.TabIndex = 9;
331- this._namingGroup.TabStop = false;
332- //
333- // _locationLabel
334- //
335- this._locationLabel.Location = new System.Drawing.Point(16, 24);
336- this._locationLabel.Name = "_locationLabel";
337- this._locationLabel.Size = new System.Drawing.Size(104, 23);
338- this._locationLabel.TabIndex = 0;
339- this._locationLabel.Text = "保存場所(&L)";
340- this._locationLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
341- //
342- // _locationBox
343- //
344- this._locationBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
345- this._locationBox.Location = new System.Drawing.Point(128, 24);
346- this._locationBox.Name = "_locationBox";
347- this._locationBox.Size = new System.Drawing.Size(104, 20);
348- this._locationBox.TabIndex = 1;
349- //
350- // _nameLabel
351- //
352- this._nameLabel.Location = new System.Drawing.Point(240, 24);
353- this._nameLabel.Name = "_nameLabel";
354- this._nameLabel.Size = new System.Drawing.Size(48, 23);
355- this._nameLabel.TabIndex = 2;
356- this._nameLabel.Text = "名前(&N)";
357- this._nameLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
358- //
359- // _nameTextBox
360- //
361- this._nameTextBox.Location = new System.Drawing.Point(328, 24);
362- this._nameTextBox.Name = "_nameTextBox";
363- this._nameTextBox.Size = new System.Drawing.Size(104, 19);
364- this._nameTextBox.TabIndex = 3;
365- this._nameTextBox.Text = "";
366- //
367- // _progressBar
368- //
369- this._progressBar.Location = new System.Drawing.Point(8, 288);
370- this._progressBar.Name = "_progressBar";
371- this._progressBar.Size = new System.Drawing.Size(440, 23);
372- this._progressBar.TabIndex = 10;
373- //
374- // _progressLabel
375- //
376- this._progressLabel.Location = new System.Drawing.Point(8, 264);
377- this._progressLabel.Name = "_progressLabel";
378- this._progressLabel.Size = new System.Drawing.Size(344, 16);
379- this._progressLabel.TabIndex = 11;
380- this._progressLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
381- //
382- // DownloadWizard
383- //
384- this.AcceptButton = this._okButton;
385- this.AutoScaleBaseSize = new System.Drawing.Size(5, 12);
386- this.CancelButton = this._cancelButton;
387- this.ClientSize = new System.Drawing.Size(458, 352);
388- this.Controls.Add(this._orderGroup);
389- this.Controls.Add(this._progressLabel);
390- this.Controls.Add(this._progressBar);
391- this.Controls.Add(this._namingCheckBox);
392- this.Controls.Add(this._namingGroup);
393- this.Controls.Add(this._cancelButton);
394- this.Controls.Add(this._okButton);
395- this.Controls.Add(this._donationButton);
396- this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
397- this.MaximizeBox = false;
398- this.MinimizeBox = false;
399- this.Name = "DownloadWizard";
400- this.ShowInTaskbar = false;
401- this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
402-#if BUILD_INITIAL_DATA
403- this.Text = "データのダウンロード (初期データ構築版)";
404-#else
405- this.Text = "データのダウンロード";
406-#endif
407- this._stockGroup.ResumeLayout(false);
408- this._namingGroup.ResumeLayout(false);
409- this.ResumeLayout(false);
410419 }
411420 #endregion
412421
@@ -422,9 +431,11 @@ namespace Zanetti.Forms
422431 private const int PANEL_LEFT = 8;
423432 //各ページの初期化
424433 private void ShowOrderGroup() {
425- if(_currentOrder==null) _currentOrder = DownloadOrder.CreateDefault();
434+ comboBoxSource.Items.AddRange(DownloadOrder.StockDataSourceNames);
426435
436+ if(_currentOrder==null) _currentOrder = DownloadOrder.CreateDefault();
427437 _stockCheckBox.Checked = _currentOrder.Stock!=DownloadOrder.StockDownload.None;
438+ comboBoxSource.SelectedIndex = (int)_currentOrder.Source;
428439 //日付指定DLのみしか所期状態では選択できないようにする
429440 _indicesCheckBox.Checked = _currentOrder.ForeignIndices;
430441 _sectorsCheckBox.Checked = _currentOrder.Sectors;
@@ -467,6 +478,7 @@ namespace Zanetti.Forms
467478 else
468479 return false;
469480
481+ _currentOrder.Source = (DownloadOrder.StockDataSource)comboBoxSource.SelectedIndex;
470482 _currentOrder.ForeignIndices = _indicesCheckBox.Checked;
471483 _currentOrder.DomesticIndices = _indicesCheckBox.Checked;
472484 _currentOrder.Sectors = _sectorsCheckBox.Checked;
--- a/Download.resx
+++ b/Download.resx
@@ -3,7 +3,7 @@
33 <!--
44 Microsoft ResX Schema
55
6- Version 1.3
6+ Version 2.0
77
88 The primary goals of this format is to allow a simple XML format
99 that is mostly human readable. The generation and parsing of the
@@ -14,16 +14,17 @@
1414
1515 ... ado.net/XML headers & schema ...
1616 <resheader name="resmimetype">text/microsoft-resx</resheader>
17- <resheader name="version">1.3</resheader>
17+ <resheader name="version">2.0</resheader>
1818 <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
1919 <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20- <data name="Name1">this is my long string</data>
20+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
2121 <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
2222 <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23- [base64 mime encoded serialized .NET Framework object]
23+ <value>[base64 mime encoded serialized .NET Framework object]</value>
2424 </data>
2525 <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26- [base64 mime encoded string representing a byte array form of the .NET Framework object]
26+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+ <comment>This is a comment</comment>
2728 </data>
2829
2930 There are any number of "resheader" rows that contain simple
@@ -35,7 +36,7 @@
3536 Classes that don't support this are serialized and stored with the
3637 mimetype set.
3738
38- The mimetype is used forserialized objects, and tells the
39+ The mimetype is used for serialized objects, and tells the
3940 ResXResourceReader how to depersist the object. This is currently not
4041 extensible. For a given mimetype the value must be set accordingly:
4142
@@ -45,7 +46,7 @@
4546
4647 mimetype: application/x-microsoft.net.object.binary.base64
4748 value : The object must be serialized with
48- : System.Serialization.Formatters.Binary.BinaryFormatter
49+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
4950 : and then encoded with base64 encoding.
5051
5152 mimetype: application/x-microsoft.net.object.soap.base64
@@ -59,18 +60,37 @@
5960 : and then encoded with base64 encoding.
6061 -->
6162 <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
6264 <xsd:element name="root" msdata:IsDataSet="true">
6365 <xsd:complexType>
6466 <xsd:choice maxOccurs="unbounded">
67+ <xsd:element name="metadata">
68+ <xsd:complexType>
69+ <xsd:sequence>
70+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
71+ </xsd:sequence>
72+ <xsd:attribute name="name" use="required" type="xsd:string" />
73+ <xsd:attribute name="type" type="xsd:string" />
74+ <xsd:attribute name="mimetype" type="xsd:string" />
75+ <xsd:attribute ref="xml:space" />
76+ </xsd:complexType>
77+ </xsd:element>
78+ <xsd:element name="assembly">
79+ <xsd:complexType>
80+ <xsd:attribute name="alias" type="xsd:string" />
81+ <xsd:attribute name="name" type="xsd:string" />
82+ </xsd:complexType>
83+ </xsd:element>
6584 <xsd:element name="data">
6685 <xsd:complexType>
6786 <xsd:sequence>
6887 <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
6988 <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
7089 </xsd:sequence>
71- <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
90+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
7291 <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
7392 <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+ <xsd:attribute ref="xml:space" />
7494 </xsd:complexType>
7595 </xsd:element>
7696 <xsd:element name="resheader">
@@ -89,258 +109,12 @@
89109 <value>text/microsoft-resx</value>
90110 </resheader>
91111 <resheader name="version">
92- <value>1.3</value>
112+ <value>2.0</value>
93113 </resheader>
94114 <resheader name="reader">
95- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
115+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
96116 </resheader>
97117 <resheader name="writer">
98- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
118+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
99119 </resheader>
100- <data name="_okButton.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
101- <value>False</value>
102- </data>
103- <data name="_okButton.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
104- <value>Private</value>
105- </data>
106- <data name="_okButton.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
107- <value>Private</value>
108- </data>
109- <data name="_cancelButton.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
110- <value>False</value>
111- </data>
112- <data name="_cancelButton.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
113- <value>Private</value>
114- </data>
115- <data name="_cancelButton.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
116- <value>Private</value>
117- </data>
118- <data name="_orderPanel.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
119- <value>False</value>
120- </data>
121- <data name="_orderPanel.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
122- <value>True</value>
123- </data>
124- <data name="_orderPanel.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
125- <value>Private</value>
126- </data>
127- <data name="_orderPanel.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
128- <value>8, 8</value>
129- </data>
130- <data name="_orderPanel.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
131- <value>True</value>
132- </data>
133- <data name="_orderPanel.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
134- <value>Private</value>
135- </data>
136- <data name="_currenciesCheckBox.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
137- <value>False</value>
138- </data>
139- <data name="_currenciesCheckBox.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
140- <value>Private</value>
141- </data>
142- <data name="_currenciesCheckBox.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
143- <value>Private</value>
144- </data>
145- <data name="_stockCheckBox.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
146- <value>False</value>
147- </data>
148- <data name="_stockCheckBox.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
149- <value>Private</value>
150- </data>
151- <data name="_stockCheckBox.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
152- <value>Private</value>
153- </data>
154- <data name="_sectorsCheckBox.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
155- <value>False</value>
156- </data>
157- <data name="_sectorsCheckBox.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
158- <value>Private</value>
159- </data>
160- <data name="_sectorsCheckBox.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
161- <value>Private</value>
162- </data>
163- <data name="_stockGroup.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
164- <value>Private</value>
165- </data>
166- <data name="_stockGroup.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
167- <value>8, 8</value>
168- </data>
169- <data name="_stockGroup.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
170- <value>True</value>
171- </data>
172- <data name="_stockGroup.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
173- <value>False</value>
174- </data>
175- <data name="_stockGroup.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
176- <value>True</value>
177- </data>
178- <data name="_stockGroup.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
179- <value>Private</value>
180- </data>
181- <data name="_dateHelpLabel.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
182- <value>False</value>
183- </data>
184- <data name="_dateHelpLabel.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
185- <value>Private</value>
186- </data>
187- <data name="_dateHelpLabel.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
188- <value>Private</value>
189- </data>
190- <data name="_dateBox.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
191- <value>Private</value>
192- </data>
193- <data name="_dateBox.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
194- <value>False</value>
195- </data>
196- <data name="_dateBox.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
197- <value>Private</value>
198- </data>
199- <data name="_radioDailyStock.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
200- <value>False</value>
201- </data>
202- <data name="_radioDailyStock.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
203- <value>Private</value>
204- </data>
205- <data name="_radioDailyStock.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
206- <value>Private</value>
207- </data>
208- <data name="_radioBookmarkStock.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
209- <value>False</value>
210- </data>
211- <data name="_radioBookmarkStock.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
212- <value>Private</value>
213- </data>
214- <data name="_radioBookmarkStock.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
215- <value>Private</value>
216- </data>
217- <data name="_radioAllStock.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
218- <value>False</value>
219- </data>
220- <data name="_radioAllStock.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
221- <value>Private</value>
222- </data>
223- <data name="_radioAllStock.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
224- <value>Private</value>
225- </data>
226- <data name="_indicesCheckBox.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
227- <value>False</value>
228- </data>
229- <data name="_indicesCheckBox.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
230- <value>Private</value>
231- </data>
232- <data name="_indicesCheckBox.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
233- <value>Private</value>
234- </data>
235- <data name="_namingCheckBox.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
236- <value>False</value>
237- </data>
238- <data name="_namingCheckBox.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
239- <value>Private</value>
240- </data>
241- <data name="_namingCheckBox.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
242- <value>Private</value>
243- </data>
244- <data name="_namingGroup.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
245- <value>Private</value>
246- </data>
247- <data name="_namingGroup.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
248- <value>8, 8</value>
249- </data>
250- <data name="_namingGroup.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
251- <value>True</value>
252- </data>
253- <data name="_namingGroup.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
254- <value>False</value>
255- </data>
256- <data name="_namingGroup.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
257- <value>True</value>
258- </data>
259- <data name="_namingGroup.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
260- <value>Private</value>
261- </data>
262- <data name="_nameTextBox.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
263- <value>Private</value>
264- </data>
265- <data name="_nameTextBox.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
266- <value>False</value>
267- </data>
268- <data name="_nameTextBox.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
269- <value>Private</value>
270- </data>
271- <data name="_nameLabel.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
272- <value>False</value>
273- </data>
274- <data name="_nameLabel.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
275- <value>Private</value>
276- </data>
277- <data name="_nameLabel.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
278- <value>Private</value>
279- </data>
280- <data name="_locationBox.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
281- <value>Private</value>
282- </data>
283- <data name="_locationBox.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
284- <value>False</value>
285- </data>
286- <data name="_locationBox.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
287- <value>Private</value>
288- </data>
289- <data name="_locationLabel.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
290- <value>False</value>
291- </data>
292- <data name="_locationLabel.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
293- <value>Private</value>
294- </data>
295- <data name="_locationLabel.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
296- <value>Private</value>
297- </data>
298- <data name="_progressBar.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
299- <value>False</value>
300- </data>
301- <data name="_progressBar.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
302- <value>Private</value>
303- </data>
304- <data name="_progressBar.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
305- <value>Private</value>
306- </data>
307- <data name="_progressLabel.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
308- <value>False</value>
309- </data>
310- <data name="_progressLabel.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
311- <value>Private</value>
312- </data>
313- <data name="_progressLabel.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
314- <value>Private</value>
315- </data>
316- <data name="$this.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
317- <value>False</value>
318- </data>
319- <data name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
320- <value>(Default)</value>
321- </data>
322- <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
323- <value>False</value>
324- </data>
325- <data name="$this.Localizable" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
326- <value>False</value>
327- </data>
328- <data name="$this.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
329- <value>8, 8</value>
330- </data>
331- <data name="$this.Name">
332- <value>DownloadWizard</value>
333- </data>
334- <data name="$this.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
335- <value>True</value>
336- </data>
337- <data name="$this.TrayHeight" type="System.Int32, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
338- <value>80</value>
339- </data>
340- <data name="$this.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
341- <value>True</value>
342- </data>
343- <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
344- <value>Private</value>
345- </data>
346120 </root>
\ No newline at end of file
--- a/DownloadOrder.cs
+++ b/DownloadOrder.cs
@@ -27,7 +27,19 @@ namespace Zanetti.DataSource
2727 SingleBrand //１銘柄
2828 }
2929
30- private string _name; //名前をつけていなければnull
30+ public enum StockDataSource
31+ {
32+ Mujinzou,
33+ KdbCom,
34+ Yahoo
35+ }
36+
37+ static public string[] StockDataSourceNames
38+ {
39+ get { return new[] {"無尽蔵", "k-db.com", "Yahoo時系列"}; }
40+ }
41+
42+ private string _name; //名前をつけていなければnull
3143 private StockDownload _stock;
3244 private bool _domesticIndices;
3345 private bool _foreignIndices;
@@ -56,6 +68,7 @@ namespace Zanetti.DataSource
5668 _stock = value;
5769 }
5870 }
71+ public StockDataSource Source { get; set; }
5972 public bool DomesticIndices {
6073 get {
6174 return _domesticIndices;
@@ -146,14 +159,19 @@ namespace Zanetti.DataSource
146159 case StockDownload.Bookmark:
147160 throw new NotSupportedException("ブックマーク内のダウンロードはサポートされていません。");
148161 case StockDownload.Recent:
149-#if YAHOO
150- stock_ds = new Specialized.YahooDataSource(_dateArray);
151-#elif MUJINZOU
152- stock_ds = new Specialized.MujinzouDataSource(_dateArray);
153-#else
154- stock_ds = new Specialized.KdbComDataSource(_dateArray);
155-#endif
156- break;
162+ switch (Source)
163+ {
164+ case StockDataSource.Mujinzou:
165+ stock_ds = new Specialized.MujinzouDataSource(_dateArray);
166+ break;
167+ case StockDataSource.KdbCom:
168+ stock_ds = new Specialized.KdbComDataSource(_dateArray);
169+ break;
170+ case StockDataSource.Yahoo:
171+ stock_ds = new Specialized.YahooDataSource(_dateArray);
172+ break;
173+ }
174+ break;
157175 }
158176 if(stock_ds!=null) col.Add(stock_ds);
159177 #endif //BUILD_INITIAL_DATA
@@ -187,6 +205,7 @@ namespace Zanetti.DataSource
187205 public void Load(StorageNode node) {
188206 _name = node["name"];
189207 _stock = (StockDownload)Enum.Parse(typeof(StockDownload), node.GetValue("stock", "All"));
208+ Source = (StockDataSource)Enum.Parse(typeof(StockDataSource), node.GetValue("source", "Mujinzou"));
190209 _domesticIndices = Util.ParseBool(node["domesticIndices"], true);
191210 _foreignIndices = Util.ParseBool(node["foreignIndices"], true);
192211 _sectors = Util.ParseBool(node["sectors"], false);
@@ -197,6 +216,7 @@ namespace Zanetti.DataSource
197216 StorageNode node = new StorageNode();
198217 if(_name!=null) node["name"] = _name;
199218 node["stock"] = _stock.ToString();
219+ node["source"] = Source.ToString();
200220 node["domesticIndices"] = _domesticIndices.ToString();
201221 node["foreignIndices"] = _foreignIndices.ToString();
202222 node["sectors"] = _sectors.ToString();
@@ -212,6 +232,7 @@ namespace Zanetti.DataSource
212232 r.ForeignIndices = true;
213233 r.Currencies = true;
214234 r.Commodities = false;
235+ r.Source = StockDataSource.Mujinzou;
215236 r.Stock = StockDownload.All;
216237 return r;
217238 }
--- a/zanetti.csproj
+++ b/zanetti.csproj
@@ -24,7 +24,7 @@
2424 <DebugType>full</DebugType>
2525 <Optimize>false</Optimize>
2626 <OutputPath>bin\Debug\</OutputPath>
27- <DefineConstants>TRACE;DEBUG;ENABLE_SUPPORT_COMMAND;YAHOO</DefineConstants>
27+ <DefineConstants>TRACE;DEBUG;ENABLE_SUPPORT_COMMAND</DefineConstants>
2828 <ErrorReport>prompt</ErrorReport>
2929 <WarningLevel>4</WarningLevel>
3030 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -33,7 +33,7 @@
3333 <DebugType>pdbonly</DebugType>
3434 <Optimize>true</Optimize>
3535 <OutputPath>bin\Release\</OutputPath>
36- <DefineConstants>TRACE;YAHOO</DefineConstants>
36+ <DefineConstants>TRACE</DefineConstants>
3737 <ErrorReport>prompt</ErrorReport>
3838 <WarningLevel>4</WarningLevel>
3939 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>