Revision | 231 (tree) |
---|---|
Zeit | 2010-10-31 12:33:46 |
Autor | rankingloid |
Add the option of IsSendingUserSession (for searchtag)
@@ -680,10 +680,10 @@ | ||
680 | 680 | { |
681 | 681 | if (textBoxTagSearchInterval.Text == "") |
682 | 682 | { |
683 | - textBoxTagSearchInterval.Text = "12"; | |
683 | + textBoxTagSearchInterval.Text = "8"; | |
684 | 684 | } |
685 | - double interval_min = 10.0; | |
686 | - double interval_max = 12.0; | |
685 | + double interval_min = 8.0; | |
686 | + double interval_max = 10.0; | |
687 | 687 | try |
688 | 688 | { |
689 | 689 | IJStringUtil.ParseDlInterval(textBoxTagSearchInterval.Text, ref interval_min, ref interval_max); |
@@ -693,9 +693,9 @@ | ||
693 | 693 | textBoxInfo.AppendText("タグ検索の間隔の指定が正しくありません。\r\n"); |
694 | 694 | return false; |
695 | 695 | } |
696 | - if (interval_min < 5.0) | |
696 | + if (interval_min < 3.0) | |
697 | 697 | { |
698 | - textBoxInfo.AppendText("タグ検索の間隔は5秒未満にはできません。\r\n"); | |
698 | + textBoxInfo.AppendText("タグ検索の間隔は3秒未満にはできません。\r\n"); | |
699 | 699 | return false; |
700 | 700 | } |
701 | 701 | return true; |
@@ -77,6 +77,7 @@ | ||
77 | 77 | this.checkBoxIsNoCache = new System.Windows.Forms.CheckBox(); |
78 | 78 | this.errorProvider1 = new System.Windows.Forms.ErrorProvider(this.components); |
79 | 79 | this.tabPageOther2 = new System.Windows.Forms.TabPage(); |
80 | + this.buttonGetMyMylistList = new System.Windows.Forms.Button(); | |
80 | 81 | this.labelCopyRight = new System.Windows.Forms.Label(); |
81 | 82 | this.label26 = new System.Windows.Forms.Label(); |
82 | 83 | this.label15 = new System.Windows.Forms.Label(); |
@@ -471,7 +472,8 @@ | ||
471 | 472 | this.radioButtonMakeUserIdFromDir = new System.Windows.Forms.RadioButton(); |
472 | 473 | this.radioButtonMakeUserIdFromFile = new System.Windows.Forms.RadioButton(); |
473 | 474 | this.label45 = new System.Windows.Forms.Label(); |
474 | - this.buttonGetMyMylistList = new System.Windows.Forms.Button(); | |
475 | + this.checkBoxIsSendingUserSession = new System.Windows.Forms.CheckBox(); | |
476 | + this.label52 = new System.Windows.Forms.Label(); | |
475 | 477 | this.selectFileBoxMakeUserIdFromFile = new nicorank.SelectFileBox(); |
476 | 478 | this.selectFileBoxMakeUserIdFromDir = new nicorank.SelectFileBox(); |
477 | 479 | this.splitContainer1.Panel1.SuspendLayout(); |
@@ -1023,9 +1025,9 @@ | ||
1023 | 1025 | this.checkBoxIsNoCache.CheckState = System.Windows.Forms.CheckState.Checked; |
1024 | 1026 | this.checkBoxIsNoCache.Location = new System.Drawing.Point(17, 180); |
1025 | 1027 | this.checkBoxIsNoCache.Name = "checkBoxIsNoCache"; |
1026 | - this.checkBoxIsNoCache.Size = new System.Drawing.Size(312, 16); | |
1028 | + this.checkBoxIsNoCache.Size = new System.Drawing.Size(316, 16); | |
1027 | 1029 | this.checkBoxIsNoCache.TabIndex = 36; |
1028 | - this.checkBoxIsNoCache.Text = "HTTP通信時にヘッダにCache-Control: max-age=0 をつける"; | |
1030 | + this.checkBoxIsNoCache.Text = "HTTP通信時にヘッダに Cache-Control: max-age=0 をつける"; | |
1029 | 1031 | this.toolTip1.SetToolTip(this.checkBoxIsNoCache, "チェックをONにすると、データがキャッシュされないようになります"); |
1030 | 1032 | this.checkBoxIsNoCache.UseVisualStyleBackColor = true; |
1031 | 1033 | this.checkBoxIsNoCache.CheckedChanged += new System.EventHandler(this.checkBoxIsNoCache_CheckedChanged); |
@@ -1047,14 +1049,24 @@ | ||
1047 | 1049 | this.tabPageOther2.Controls.Add(this.textBoxFont); |
1048 | 1050 | this.tabPageOther2.Controls.Add(this.label58); |
1049 | 1051 | this.tabPageOther2.Controls.Add(this.buttonFont); |
1050 | - this.tabPageOther2.Location = new System.Drawing.Point(4, 38); | |
1052 | + this.tabPageOther2.Location = new System.Drawing.Point(4, 40); | |
1051 | 1053 | this.tabPageOther2.Name = "tabPageOther2"; |
1052 | 1054 | this.tabPageOther2.Padding = new System.Windows.Forms.Padding(3); |
1053 | - this.tabPageOther2.Size = new System.Drawing.Size(552, 338); | |
1055 | + this.tabPageOther2.Size = new System.Drawing.Size(552, 336); | |
1054 | 1056 | this.tabPageOther2.TabIndex = 14; |
1055 | 1057 | this.tabPageOther2.Text = "おまけ"; |
1056 | 1058 | this.tabPageOther2.UseVisualStyleBackColor = true; |
1057 | 1059 | // |
1060 | + // buttonGetMyMylistList | |
1061 | + // | |
1062 | + this.buttonGetMyMylistList.Location = new System.Drawing.Point(308, 226); | |
1063 | + this.buttonGetMyMylistList.Name = "buttonGetMyMylistList"; | |
1064 | + this.buttonGetMyMylistList.Size = new System.Drawing.Size(146, 23); | |
1065 | + this.buttonGetMyMylistList.TabIndex = 9; | |
1066 | + this.buttonGetMyMylistList.Text = "自分のマイリスト番号取得"; | |
1067 | + this.buttonGetMyMylistList.UseVisualStyleBackColor = true; | |
1068 | + this.buttonGetMyMylistList.Click += new System.EventHandler(this.buttonGetMyMylistList_Click); | |
1069 | + // | |
1058 | 1070 | // labelCopyRight |
1059 | 1071 | // |
1060 | 1072 | this.labelCopyRight.AutoSize = true; |
@@ -1197,6 +1209,7 @@ | ||
1197 | 1209 | // |
1198 | 1210 | // tabPage2 |
1199 | 1211 | // |
1212 | + this.tabPage2.Controls.Add(this.label52); | |
1200 | 1213 | this.tabPage2.Controls.Add(this.groupBox35); |
1201 | 1214 | this.tabPage2.Controls.Add(this.groupBox34); |
1202 | 1215 | this.tabPage2.Controls.Add(this.buttonCustomRankFileOutputDefault); |
@@ -1218,10 +1231,10 @@ | ||
1218 | 1231 | this.tabPage2.Controls.Add(this.label65); |
1219 | 1232 | this.tabPage2.Controls.Add(this.label22); |
1220 | 1233 | this.tabPage2.Controls.Add(this.label23); |
1221 | - this.tabPage2.Location = new System.Drawing.Point(4, 38); | |
1234 | + this.tabPage2.Location = new System.Drawing.Point(4, 40); | |
1222 | 1235 | this.tabPage2.Name = "tabPage2"; |
1223 | 1236 | this.tabPage2.Padding = new System.Windows.Forms.Padding(3); |
1224 | - this.tabPage2.Size = new System.Drawing.Size(552, 338); | |
1237 | + this.tabPage2.Size = new System.Drawing.Size(552, 336); | |
1225 | 1238 | this.tabPage2.TabIndex = 20; |
1226 | 1239 | this.tabPage2.Text = "上級者向け"; |
1227 | 1240 | this.tabPage2.UseVisualStyleBackColor = true; |
@@ -1412,7 +1425,7 @@ | ||
1412 | 1425 | this.textBoxTagSearchInterval.Name = "textBoxTagSearchInterval"; |
1413 | 1426 | this.textBoxTagSearchInterval.Size = new System.Drawing.Size(55, 19); |
1414 | 1427 | this.textBoxTagSearchInterval.TabIndex = 21; |
1415 | - this.textBoxTagSearchInterval.Text = "12"; | |
1428 | + this.textBoxTagSearchInterval.Text = "8"; | |
1416 | 1429 | // |
1417 | 1430 | // textBoxDlInterval |
1418 | 1431 | // |
@@ -1440,8 +1453,8 @@ | ||
1440 | 1453 | this.checkBoxIsRankFileCustomize.Size = new System.Drawing.Size(165, 16); |
1441 | 1454 | this.checkBoxIsRankFileCustomize.TabIndex = 26; |
1442 | 1455 | this.checkBoxIsRankFileCustomize.Text = "ランクファイルをカスタマイズする"; |
1456 | + this.toolTip1.SetToolTip(this.checkBoxIsRankFileCustomize, "ランクファイルのカスタマイズ機能はβ版であり、誤りを含む可能性があります。\r\n結果が正しいことを十分確認した上でご使用ください。"); | |
1443 | 1457 | this.checkBoxIsRankFileCustomize.UseVisualStyleBackColor = true; |
1444 | - this.checkBoxIsRankFileCustomize.Click += new System.EventHandler(this.checkBoxIsRankFileCustomize_Click); | |
1445 | 1458 | this.checkBoxIsRankFileCustomize.CheckedChanged += new System.EventHandler(this.checkBoxIsRankFileCustomize_CheckedChanged); |
1446 | 1459 | // |
1447 | 1460 | // label71 |
@@ -1519,6 +1532,7 @@ | ||
1519 | 1532 | // |
1520 | 1533 | // tabPage7 |
1521 | 1534 | // |
1535 | + this.tabPage7.Controls.Add(this.checkBoxIsSendingUserSession); | |
1522 | 1536 | this.tabPage7.Controls.Add(this.buttonSelectVideocutPath); |
1523 | 1537 | this.tabPage7.Controls.Add(this.textBoxVideocutPath); |
1524 | 1538 | this.tabPage7.Controls.Add(this.label44); |
@@ -1537,9 +1551,9 @@ | ||
1537 | 1551 | this.tabPage7.Controls.Add(this.label19); |
1538 | 1552 | this.tabPage7.Controls.Add(this.label18); |
1539 | 1553 | this.tabPage7.Controls.Add(this.label16); |
1540 | - this.tabPage7.Location = new System.Drawing.Point(4, 38); | |
1554 | + this.tabPage7.Location = new System.Drawing.Point(4, 40); | |
1541 | 1555 | this.tabPage7.Name = "tabPage7"; |
1542 | - this.tabPage7.Size = new System.Drawing.Size(552, 338); | |
1556 | + this.tabPage7.Size = new System.Drawing.Size(552, 336); | |
1543 | 1557 | this.tabPage7.TabIndex = 6; |
1544 | 1558 | this.tabPage7.Text = "設定"; |
1545 | 1559 | this.tabPage7.UseVisualStyleBackColor = true; |
@@ -1602,7 +1616,7 @@ | ||
1602 | 1616 | // |
1603 | 1617 | // buttonLoadConfig |
1604 | 1618 | // |
1605 | - this.buttonLoadConfig.Location = new System.Drawing.Point(16, 231); | |
1619 | + this.buttonLoadConfig.Location = new System.Drawing.Point(17, 253); | |
1606 | 1620 | this.buttonLoadConfig.Name = "buttonLoadConfig"; |
1607 | 1621 | this.buttonLoadConfig.Size = new System.Drawing.Size(127, 23); |
1608 | 1622 | this.buttonLoadConfig.TabIndex = 15; |
@@ -1612,7 +1626,7 @@ | ||
1612 | 1626 | // |
1613 | 1627 | // buttonSaveConfig |
1614 | 1628 | // |
1615 | - this.buttonSaveConfig.Location = new System.Drawing.Point(16, 202); | |
1629 | + this.buttonSaveConfig.Location = new System.Drawing.Point(17, 224); | |
1616 | 1630 | this.buttonSaveConfig.Name = "buttonSaveConfig"; |
1617 | 1631 | this.buttonSaveConfig.Size = new System.Drawing.Size(127, 23); |
1618 | 1632 | this.buttonSaveConfig.TabIndex = 14; |
@@ -1729,10 +1743,10 @@ | ||
1729 | 1743 | this.tabPageTimer.Controls.Add(this.comboBoxTimer1); |
1730 | 1744 | this.tabPageTimer.Controls.Add(this.label3); |
1731 | 1745 | this.tabPageTimer.Controls.Add(this.checkBoxTimer1); |
1732 | - this.tabPageTimer.Location = new System.Drawing.Point(4, 38); | |
1746 | + this.tabPageTimer.Location = new System.Drawing.Point(4, 40); | |
1733 | 1747 | this.tabPageTimer.Name = "tabPageTimer"; |
1734 | 1748 | this.tabPageTimer.Padding = new System.Windows.Forms.Padding(3); |
1735 | - this.tabPageTimer.Size = new System.Drawing.Size(552, 338); | |
1749 | + this.tabPageTimer.Size = new System.Drawing.Size(552, 336); | |
1736 | 1750 | this.tabPageTimer.TabIndex = 12; |
1737 | 1751 | this.tabPageTimer.Text = "タイマー"; |
1738 | 1752 | this.tabPageTimer.UseVisualStyleBackColor = true; |
@@ -1873,9 +1887,9 @@ | ||
1873 | 1887 | this.tabPageMylist.Controls.Add(this.groupBox23); |
1874 | 1888 | this.tabPageMylist.Controls.Add(this.groupBox14); |
1875 | 1889 | this.tabPageMylist.Controls.Add(this.label33); |
1876 | - this.tabPageMylist.Location = new System.Drawing.Point(4, 38); | |
1890 | + this.tabPageMylist.Location = new System.Drawing.Point(4, 40); | |
1877 | 1891 | this.tabPageMylist.Name = "tabPageMylist"; |
1878 | - this.tabPageMylist.Size = new System.Drawing.Size(552, 338); | |
1892 | + this.tabPageMylist.Size = new System.Drawing.Size(552, 336); | |
1879 | 1893 | this.tabPageMylist.TabIndex = 11; |
1880 | 1894 | this.tabPageMylist.Text = "マイリスト"; |
1881 | 1895 | this.tabPageMylist.UseVisualStyleBackColor = true; |
@@ -2229,8 +2243,8 @@ | ||
2229 | 2243 | this.textBoxCommentTime.Name = "textBoxCommentTime"; |
2230 | 2244 | this.textBoxCommentTime.Size = new System.Drawing.Size(36, 19); |
2231 | 2245 | this.textBoxCommentTime.TabIndex = 1; |
2246 | + this.textBoxCommentTime.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxForDouble_Validating); | |
2232 | 2247 | this.textBoxCommentTime.Validated += new System.EventHandler(this.textBox_Validated); |
2233 | - this.textBoxCommentTime.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxForDouble_Validating); | |
2234 | 2248 | // |
2235 | 2249 | // buttonComment |
2236 | 2250 | // |
@@ -2394,9 +2408,9 @@ | ||
2394 | 2408 | // |
2395 | 2409 | this.tabPage5.Controls.Add(this.groupBox33); |
2396 | 2410 | this.tabPage5.Controls.Add(this.groupBox22); |
2397 | - this.tabPage5.Location = new System.Drawing.Point(4, 38); | |
2411 | + this.tabPage5.Location = new System.Drawing.Point(4, 40); | |
2398 | 2412 | this.tabPage5.Name = "tabPage5"; |
2399 | - this.tabPage5.Size = new System.Drawing.Size(552, 338); | |
2413 | + this.tabPage5.Size = new System.Drawing.Size(552, 336); | |
2400 | 2414 | this.tabPage5.TabIndex = 4; |
2401 | 2415 | this.tabPage5.Text = "画像・動画作成"; |
2402 | 2416 | this.tabPage5.UseVisualStyleBackColor = true; |
@@ -2673,10 +2687,10 @@ | ||
2673 | 2687 | this.tabPage14.Controls.Add(this.checkBoxIsOverwrite); |
2674 | 2688 | this.tabPage14.Controls.Add(this.groupBoxTransIncludeWav); |
2675 | 2689 | this.tabPage14.Controls.Add(this.checkBoxIsFlvToMp3); |
2676 | - this.tabPage14.Location = new System.Drawing.Point(4, 38); | |
2690 | + this.tabPage14.Location = new System.Drawing.Point(4, 40); | |
2677 | 2691 | this.tabPage14.Name = "tabPage14"; |
2678 | 2692 | this.tabPage14.Padding = new System.Windows.Forms.Padding(3); |
2679 | - this.tabPage14.Size = new System.Drawing.Size(552, 338); | |
2693 | + this.tabPage14.Size = new System.Drawing.Size(552, 336); | |
2680 | 2694 | this.tabPage14.TabIndex = 17; |
2681 | 2695 | this.tabPage14.Text = "動画変換"; |
2682 | 2696 | this.tabPage14.UseVisualStyleBackColor = true; |
@@ -2887,8 +2901,8 @@ | ||
2887 | 2901 | this.textBoxTransCutStart.Name = "textBoxTransCutStart"; |
2888 | 2902 | this.textBoxTransCutStart.Size = new System.Drawing.Size(41, 19); |
2889 | 2903 | this.textBoxTransCutStart.TabIndex = 1; |
2904 | + this.textBoxTransCutStart.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxForDouble_Validating); | |
2890 | 2905 | this.textBoxTransCutStart.Validated += new System.EventHandler(this.textBox_Validated); |
2891 | - this.textBoxTransCutStart.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxForDouble_Validating); | |
2892 | 2906 | // |
2893 | 2907 | // textBoxCutListPath |
2894 | 2908 | // |
@@ -2908,8 +2922,8 @@ | ||
2908 | 2922 | this.textBoxTransCutEnd.Name = "textBoxTransCutEnd"; |
2909 | 2923 | this.textBoxTransCutEnd.Size = new System.Drawing.Size(40, 19); |
2910 | 2924 | this.textBoxTransCutEnd.TabIndex = 2; |
2925 | + this.textBoxTransCutEnd.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxForDouble_Validating); | |
2911 | 2926 | this.textBoxTransCutEnd.Validated += new System.EventHandler(this.textBox_Validated); |
2912 | - this.textBoxTransCutEnd.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxForDouble_Validating); | |
2913 | 2927 | // |
2914 | 2928 | // labelTransCut1 |
2915 | 2929 | // |
@@ -2965,8 +2979,8 @@ | ||
2965 | 2979 | this.textBoxTransFadeIn.Name = "textBoxTransFadeIn"; |
2966 | 2980 | this.textBoxTransFadeIn.Size = new System.Drawing.Size(35, 19); |
2967 | 2981 | this.textBoxTransFadeIn.TabIndex = 1; |
2982 | + this.textBoxTransFadeIn.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxForDouble_Validating); | |
2968 | 2983 | this.textBoxTransFadeIn.Validated += new System.EventHandler(this.textBox_Validated); |
2969 | - this.textBoxTransFadeIn.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxForDouble_Validating); | |
2970 | 2984 | // |
2971 | 2985 | // checkBoxTransIsFadeOut |
2972 | 2986 | // |
@@ -2986,8 +3000,8 @@ | ||
2986 | 3000 | this.textBoxTransFadeOut.Name = "textBoxTransFadeOut"; |
2987 | 3001 | this.textBoxTransFadeOut.Size = new System.Drawing.Size(35, 19); |
2988 | 3002 | this.textBoxTransFadeOut.TabIndex = 3; |
3003 | + this.textBoxTransFadeOut.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxForDouble_Validating); | |
2989 | 3004 | this.textBoxTransFadeOut.Validated += new System.EventHandler(this.textBox_Validated); |
2990 | - this.textBoxTransFadeOut.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxForDouble_Validating); | |
2991 | 3005 | // |
2992 | 3006 | // labelTransFadeIn |
2993 | 3007 | // |
@@ -3125,9 +3139,9 @@ | ||
3125 | 3139 | this.tabPage9.Controls.Add(this.label46); |
3126 | 3140 | this.tabPage9.Controls.Add(this.groupBox4); |
3127 | 3141 | this.tabPage9.Controls.Add(this.groupBox3); |
3128 | - this.tabPage9.Location = new System.Drawing.Point(4, 38); | |
3142 | + this.tabPage9.Location = new System.Drawing.Point(4, 40); | |
3129 | 3143 | this.tabPage9.Name = "tabPage9"; |
3130 | - this.tabPage9.Size = new System.Drawing.Size(552, 338); | |
3144 | + this.tabPage9.Size = new System.Drawing.Size(552, 336); | |
3131 | 3145 | this.tabPage9.TabIndex = 8; |
3132 | 3146 | this.tabPage9.Text = "リスト作成・更新"; |
3133 | 3147 | this.tabPage9.UseVisualStyleBackColor = true; |
@@ -3242,10 +3256,10 @@ | ||
3242 | 3256 | this.tabPage8.Controls.Add(this.checkBoxIsGettingDetailNew); |
3243 | 3257 | this.tabPage8.Controls.Add(this.label87); |
3244 | 3258 | this.tabPage8.Controls.Add(this.panel1); |
3245 | - this.tabPage8.Location = new System.Drawing.Point(4, 21); | |
3259 | + this.tabPage8.Location = new System.Drawing.Point(4, 22); | |
3246 | 3260 | this.tabPage8.Name = "tabPage8"; |
3247 | 3261 | this.tabPage8.Padding = new System.Windows.Forms.Padding(3); |
3248 | - this.tabPage8.Size = new System.Drawing.Size(499, 225); | |
3262 | + this.tabPage8.Size = new System.Drawing.Size(499, 224); | |
3249 | 3263 | this.tabPage8.TabIndex = 6; |
3250 | 3264 | this.tabPage8.Text = "タグ検索"; |
3251 | 3265 | this.tabPage8.UseVisualStyleBackColor = true; |
@@ -3309,8 +3323,8 @@ | ||
3309 | 3323 | this.textBoxTagSearchPageEnd.Name = "textBoxTagSearchPageEnd"; |
3310 | 3324 | this.textBoxTagSearchPageEnd.Size = new System.Drawing.Size(42, 19); |
3311 | 3325 | this.textBoxTagSearchPageEnd.TabIndex = 8; |
3326 | + this.textBoxTagSearchPageEnd.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxForNumber1_Validating); | |
3312 | 3327 | this.textBoxTagSearchPageEnd.Validated += new System.EventHandler(this.textBox_Validated); |
3313 | - this.textBoxTagSearchPageEnd.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxForNumber1_Validating); | |
3314 | 3328 | // |
3315 | 3329 | // textBoxTagSearchPageStart |
3316 | 3330 | // |
@@ -3318,8 +3332,8 @@ | ||
3318 | 3332 | this.textBoxTagSearchPageStart.Name = "textBoxTagSearchPageStart"; |
3319 | 3333 | this.textBoxTagSearchPageStart.Size = new System.Drawing.Size(37, 19); |
3320 | 3334 | this.textBoxTagSearchPageStart.TabIndex = 7; |
3335 | + this.textBoxTagSearchPageStart.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxForNumber1_Validating); | |
3321 | 3336 | this.textBoxTagSearchPageStart.Validated += new System.EventHandler(this.textBox_Validated); |
3322 | - this.textBoxTagSearchPageStart.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxForNumber1_Validating); | |
3323 | 3337 | // |
3324 | 3338 | // numericUpDownConditionMylistNew |
3325 | 3339 | // |
@@ -3356,8 +3370,8 @@ | ||
3356 | 3370 | this.textBoxTagSearchUpper.Size = new System.Drawing.Size(55, 19); |
3357 | 3371 | this.textBoxTagSearchUpper.TabIndex = 13; |
3358 | 3372 | this.textBoxTagSearchUpper.Visible = false; |
3373 | + this.textBoxTagSearchUpper.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxForNumber0_Validating); | |
3359 | 3374 | this.textBoxTagSearchUpper.Validated += new System.EventHandler(this.textBox_Validated); |
3360 | - this.textBoxTagSearchUpper.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxForNumber0_Validating); | |
3361 | 3375 | // |
3362 | 3376 | // textBoxTagSearchLower |
3363 | 3377 | // |
@@ -3366,8 +3380,8 @@ | ||
3366 | 3380 | this.textBoxTagSearchLower.Size = new System.Drawing.Size(55, 19); |
3367 | 3381 | this.textBoxTagSearchLower.TabIndex = 11; |
3368 | 3382 | this.textBoxTagSearchLower.Visible = false; |
3383 | + this.textBoxTagSearchLower.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxForNumber0_Validating); | |
3369 | 3384 | this.textBoxTagSearchLower.Validated += new System.EventHandler(this.textBox_Validated); |
3370 | - this.textBoxTagSearchLower.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxForNumber0_Validating); | |
3371 | 3385 | // |
3372 | 3386 | // labelTagSearchTo |
3373 | 3387 | // |
@@ -3598,10 +3612,10 @@ | ||
3598 | 3612 | this.tabPage4.Controls.Add(this.buttonAnalyzeRanking); |
3599 | 3613 | this.tabPage4.Controls.Add(this.label5); |
3600 | 3614 | this.tabPage4.Controls.Add(this.textBoxSavedRankDir); |
3601 | - this.tabPage4.Location = new System.Drawing.Point(4, 21); | |
3615 | + this.tabPage4.Location = new System.Drawing.Point(4, 22); | |
3602 | 3616 | this.tabPage4.Name = "tabPage4"; |
3603 | 3617 | this.tabPage4.Padding = new System.Windows.Forms.Padding(3); |
3604 | - this.tabPage4.Size = new System.Drawing.Size(499, 225); | |
3618 | + this.tabPage4.Size = new System.Drawing.Size(499, 224); | |
3605 | 3619 | this.tabPage4.TabIndex = 0; |
3606 | 3620 | this.tabPage4.Text = "ランキング解析"; |
3607 | 3621 | this.tabPage4.UseVisualStyleBackColor = true; |
@@ -3694,10 +3708,10 @@ | ||
3694 | 3708 | // |
3695 | 3709 | this.tabPage1.Controls.Add(this.groupBox28); |
3696 | 3710 | this.tabPage1.Controls.Add(this.groupBox27); |
3697 | - this.tabPage1.Location = new System.Drawing.Point(4, 21); | |
3711 | + this.tabPage1.Location = new System.Drawing.Point(4, 22); | |
3698 | 3712 | this.tabPage1.Name = "tabPage1"; |
3699 | 3713 | this.tabPage1.Padding = new System.Windows.Forms.Padding(3); |
3700 | - this.tabPage1.Size = new System.Drawing.Size(499, 225); | |
3714 | + this.tabPage1.Size = new System.Drawing.Size(499, 224); | |
3701 | 3715 | this.tabPage1.TabIndex = 7; |
3702 | 3716 | this.tabPage1.Text = "マイリスト・新着"; |
3703 | 3717 | this.tabPage1.UseVisualStyleBackColor = true; |
@@ -3742,8 +3756,8 @@ | ||
3742 | 3756 | this.textBoxNewArrivalStart.Size = new System.Drawing.Size(46, 19); |
3743 | 3757 | this.textBoxNewArrivalStart.TabIndex = 0; |
3744 | 3758 | this.textBoxNewArrivalStart.Text = "1"; |
3759 | + this.textBoxNewArrivalStart.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxForNumber1_Validating); | |
3745 | 3760 | this.textBoxNewArrivalStart.Validated += new System.EventHandler(this.textBox_Validated); |
3746 | - this.textBoxNewArrivalStart.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxForNumber1_Validating); | |
3747 | 3761 | // |
3748 | 3762 | // textBoxNewArrivalEnd |
3749 | 3763 | // |
@@ -3752,8 +3766,8 @@ | ||
3752 | 3766 | this.textBoxNewArrivalEnd.Size = new System.Drawing.Size(46, 19); |
3753 | 3767 | this.textBoxNewArrivalEnd.TabIndex = 1; |
3754 | 3768 | this.textBoxNewArrivalEnd.Text = "10"; |
3769 | + this.textBoxNewArrivalEnd.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxForNumber1_Validating); | |
3755 | 3770 | this.textBoxNewArrivalEnd.Validated += new System.EventHandler(this.textBox_Validated); |
3756 | - this.textBoxNewArrivalEnd.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxForNumber1_Validating); | |
3757 | 3771 | // |
3758 | 3772 | // label17 |
3759 | 3773 | // |
@@ -3815,10 +3829,10 @@ | ||
3815 | 3829 | this.tabPage16.Controls.Add(this.label104); |
3816 | 3830 | this.tabPage16.Controls.Add(this.label102); |
3817 | 3831 | this.tabPage16.Controls.Add(this.textBoxSavedRankNicoChartDir); |
3818 | - this.tabPage16.Location = new System.Drawing.Point(4, 21); | |
3832 | + this.tabPage16.Location = new System.Drawing.Point(4, 22); | |
3819 | 3833 | this.tabPage16.Name = "tabPage16"; |
3820 | 3834 | this.tabPage16.Padding = new System.Windows.Forms.Padding(3); |
3821 | - this.tabPage16.Size = new System.Drawing.Size(499, 225); | |
3835 | + this.tabPage16.Size = new System.Drawing.Size(499, 224); | |
3822 | 3836 | this.tabPage16.TabIndex = 5; |
3823 | 3837 | this.tabPage16.Text = "ニコチャート"; |
3824 | 3838 | this.tabPage16.UseVisualStyleBackColor = true; |
@@ -3903,10 +3917,10 @@ | ||
3903 | 3917 | this.tabPage12.Controls.Add(this.groupBox5); |
3904 | 3918 | this.tabPage12.Controls.Add(this.buttonSort); |
3905 | 3919 | this.tabPage12.Controls.Add(this.groupBox1); |
3906 | - this.tabPage12.Location = new System.Drawing.Point(4, 21); | |
3920 | + this.tabPage12.Location = new System.Drawing.Point(4, 22); | |
3907 | 3921 | this.tabPage12.Name = "tabPage12"; |
3908 | 3922 | this.tabPage12.Padding = new System.Windows.Forms.Padding(3); |
3909 | - this.tabPage12.Size = new System.Drawing.Size(499, 225); | |
3923 | + this.tabPage12.Size = new System.Drawing.Size(499, 224); | |
3910 | 3924 | this.tabPage12.TabIndex = 2; |
3911 | 3925 | this.tabPage12.Text = "情報取得・更新"; |
3912 | 3926 | this.tabPage12.UseVisualStyleBackColor = true; |
@@ -4014,10 +4028,10 @@ | ||
4014 | 4028 | this.tabPage15.Controls.Add(this.label98); |
4015 | 4029 | this.tabPage15.Controls.Add(this.textBoxDiff2Path); |
4016 | 4030 | this.tabPage15.Controls.Add(this.textBoxDiff1Path); |
4017 | - this.tabPage15.Location = new System.Drawing.Point(4, 21); | |
4031 | + this.tabPage15.Location = new System.Drawing.Point(4, 22); | |
4018 | 4032 | this.tabPage15.Name = "tabPage15"; |
4019 | 4033 | this.tabPage15.Padding = new System.Windows.Forms.Padding(3); |
4020 | - this.tabPage15.Size = new System.Drawing.Size(499, 225); | |
4034 | + this.tabPage15.Size = new System.Drawing.Size(499, 224); | |
4021 | 4035 | this.tabPage15.TabIndex = 4; |
4022 | 4036 | this.tabPage15.Text = "差分作成"; |
4023 | 4037 | this.tabPage15.UseVisualStyleBackColor = true; |
@@ -4283,10 +4297,10 @@ | ||
4283 | 4297 | // |
4284 | 4298 | this.tabPage6.Controls.Add(this.buttonShowFilterTester); |
4285 | 4299 | this.tabPage6.Controls.Add(this.buttonCalculateSum); |
4286 | - this.tabPage6.Location = new System.Drawing.Point(4, 21); | |
4300 | + this.tabPage6.Location = new System.Drawing.Point(4, 22); | |
4287 | 4301 | this.tabPage6.Name = "tabPage6"; |
4288 | 4302 | this.tabPage6.Padding = new System.Windows.Forms.Padding(3); |
4289 | - this.tabPage6.Size = new System.Drawing.Size(499, 225); | |
4303 | + this.tabPage6.Size = new System.Drawing.Size(499, 224); | |
4290 | 4304 | this.tabPage6.TabIndex = 8; |
4291 | 4305 | this.tabPage6.Text = "ツール"; |
4292 | 4306 | this.tabPage6.UseVisualStyleBackColor = true; |
@@ -4422,10 +4436,10 @@ | ||
4422 | 4436 | this.tabPageFileDl.Controls.Add(this.groupBox32); |
4423 | 4437 | this.tabPageFileDl.Controls.Add(this.groupBox31); |
4424 | 4438 | this.tabPageFileDl.Controls.Add(this.groupBox18); |
4425 | - this.tabPageFileDl.Location = new System.Drawing.Point(4, 38); | |
4439 | + this.tabPageFileDl.Location = new System.Drawing.Point(4, 40); | |
4426 | 4440 | this.tabPageFileDl.Name = "tabPageFileDl"; |
4427 | 4441 | this.tabPageFileDl.Padding = new System.Windows.Forms.Padding(3); |
4428 | - this.tabPageFileDl.Size = new System.Drawing.Size(552, 338); | |
4442 | + this.tabPageFileDl.Size = new System.Drawing.Size(552, 336); | |
4429 | 4443 | this.tabPageFileDl.TabIndex = 1; |
4430 | 4444 | this.tabPageFileDl.Text = "ファイルDL"; |
4431 | 4445 | this.tabPageFileDl.UseVisualStyleBackColor = true; |
@@ -4638,10 +4652,10 @@ | ||
4638 | 4652 | this.tabPageLogin.Controls.Add(this.groupBox25); |
4639 | 4653 | this.tabPageLogin.Controls.Add(this.groupBox26); |
4640 | 4654 | this.tabPageLogin.Controls.Add(this.buttonCheckLogin); |
4641 | - this.tabPageLogin.Location = new System.Drawing.Point(4, 38); | |
4655 | + this.tabPageLogin.Location = new System.Drawing.Point(4, 40); | |
4642 | 4656 | this.tabPageLogin.Name = "tabPageLogin"; |
4643 | 4657 | this.tabPageLogin.Padding = new System.Windows.Forms.Padding(3); |
4644 | - this.tabPageLogin.Size = new System.Drawing.Size(552, 338); | |
4658 | + this.tabPageLogin.Size = new System.Drawing.Size(552, 336); | |
4645 | 4659 | this.tabPageLogin.TabIndex = 19; |
4646 | 4660 | this.tabPageLogin.Text = "ログイン"; |
4647 | 4661 | this.tabPageLogin.UseVisualStyleBackColor = true; |
@@ -4932,10 +4946,10 @@ | ||
4932 | 4946 | this.tabPageDlRank.Controls.Add(this.textBoxRankingDlHour); |
4933 | 4947 | this.tabPageDlRank.Controls.Add(this.groupBox17); |
4934 | 4948 | this.tabPageDlRank.Controls.Add(this.buttonDlRank); |
4935 | - this.tabPageDlRank.Location = new System.Drawing.Point(4, 38); | |
4949 | + this.tabPageDlRank.Location = new System.Drawing.Point(4, 40); | |
4936 | 4950 | this.tabPageDlRank.Name = "tabPageDlRank"; |
4937 | 4951 | this.tabPageDlRank.Padding = new System.Windows.Forms.Padding(3); |
4938 | - this.tabPageDlRank.Size = new System.Drawing.Size(552, 338); | |
4952 | + this.tabPageDlRank.Size = new System.Drawing.Size(552, 336); | |
4939 | 4953 | this.tabPageDlRank.TabIndex = 21; |
4940 | 4954 | this.tabPageDlRank.Text = "ランキングDL"; |
4941 | 4955 | this.tabPageDlRank.UseVisualStyleBackColor = true; |
@@ -5261,9 +5275,9 @@ | ||
5261 | 5275 | this.tabPageTagComment.Controls.Add(this.textBoxTagVideoId); |
5262 | 5276 | this.tabPageTagComment.Controls.Add(this.groupBox24); |
5263 | 5277 | this.tabPageTagComment.Controls.Add(this.groupBox16); |
5264 | - this.tabPageTagComment.Location = new System.Drawing.Point(4, 38); | |
5278 | + this.tabPageTagComment.Location = new System.Drawing.Point(4, 40); | |
5265 | 5279 | this.tabPageTagComment.Name = "tabPageTagComment"; |
5266 | - this.tabPageTagComment.Size = new System.Drawing.Size(552, 338); | |
5280 | + this.tabPageTagComment.Size = new System.Drawing.Size(552, 336); | |
5267 | 5281 | this.tabPageTagComment.TabIndex = 22; |
5268 | 5282 | this.tabPageTagComment.Text = "タグ・コメント"; |
5269 | 5283 | this.tabPageTagComment.UseVisualStyleBackColor = true; |
@@ -5289,10 +5303,10 @@ | ||
5289 | 5303 | this.tabPage3.Controls.Add(this.label45); |
5290 | 5304 | this.tabPage3.Controls.Add(this.selectFileBoxMakeUserIdFromFile); |
5291 | 5305 | this.tabPage3.Controls.Add(this.selectFileBoxMakeUserIdFromDir); |
5292 | - this.tabPage3.Location = new System.Drawing.Point(4, 38); | |
5306 | + this.tabPage3.Location = new System.Drawing.Point(4, 40); | |
5293 | 5307 | this.tabPage3.Name = "tabPage3"; |
5294 | 5308 | this.tabPage3.Padding = new System.Windows.Forms.Padding(3); |
5295 | - this.tabPage3.Size = new System.Drawing.Size(552, 338); | |
5309 | + this.tabPage3.Size = new System.Drawing.Size(552, 336); | |
5296 | 5310 | this.tabPage3.TabIndex = 23; |
5297 | 5311 | this.tabPage3.Text = "おまけ2"; |
5298 | 5312 | this.tabPage3.UseVisualStyleBackColor = true; |
@@ -5379,16 +5393,28 @@ | ||
5379 | 5393 | this.label45.TabIndex = 0; |
5380 | 5394 | this.label45.Text = "投稿者情報作成"; |
5381 | 5395 | // |
5382 | - // buttonGetMyMylistList | |
5396 | + // checkBoxIsSendingUserSession | |
5383 | 5397 | // |
5384 | - this.buttonGetMyMylistList.Location = new System.Drawing.Point(308, 226); | |
5385 | - this.buttonGetMyMylistList.Name = "buttonGetMyMylistList"; | |
5386 | - this.buttonGetMyMylistList.Size = new System.Drawing.Size(146, 23); | |
5387 | - this.buttonGetMyMylistList.TabIndex = 9; | |
5388 | - this.buttonGetMyMylistList.Text = "自分のマイリスト番号取得"; | |
5389 | - this.buttonGetMyMylistList.UseVisualStyleBackColor = true; | |
5390 | - this.buttonGetMyMylistList.Click += new System.EventHandler(this.buttonGetMyMylistList_Click); | |
5398 | + this.checkBoxIsSendingUserSession.AutoSize = true; | |
5399 | + this.checkBoxIsSendingUserSession.Location = new System.Drawing.Point(17, 202); | |
5400 | + this.checkBoxIsSendingUserSession.Name = "checkBoxIsSendingUserSession"; | |
5401 | + this.checkBoxIsSendingUserSession.Size = new System.Drawing.Size(392, 16); | |
5402 | + this.checkBoxIsSendingUserSession.TabIndex = 40; | |
5403 | + this.checkBoxIsSendingUserSession.Text = "タグ・キーワード検索時に user_session を送る(通常はチェックしないでください)"; | |
5404 | + this.toolTip1.SetToolTip(this.checkBoxIsSendingUserSession, "チェックをONにすると、データがキャッシュされないようになります"); | |
5405 | + this.checkBoxIsSendingUserSession.UseVisualStyleBackColor = true; | |
5391 | 5406 | // |
5407 | + // label52 | |
5408 | + // | |
5409 | + this.label52.AutoSize = true; | |
5410 | + this.label52.Font = new System.Drawing.Font("MS UI Gothic", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128))); | |
5411 | + this.label52.ForeColor = System.Drawing.Color.Red; | |
5412 | + this.label52.Location = new System.Drawing.Point(129, 169); | |
5413 | + this.label52.Name = "label52"; | |
5414 | + this.label52.Size = new System.Drawing.Size(138, 12); | |
5415 | + this.label52.TabIndex = 40; | |
5416 | + this.label52.Text = "β版機能のため、使用注意"; | |
5417 | + // | |
5392 | 5418 | // selectFileBoxMakeUserIdFromFile |
5393 | 5419 | // |
5394 | 5420 | this.selectFileBoxMakeUserIdFromFile.FileDialog = this.openFileDialog1; |
@@ -5420,8 +5446,8 @@ | ||
5420 | 5446 | this.Controls.Add(this.tabControl1); |
5421 | 5447 | this.Name = "FormMain"; |
5422 | 5448 | this.Text = "ニコニコランキングメーカー"; |
5449 | + this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.FormMain_FormClosed); | |
5423 | 5450 | this.Load += new System.EventHandler(this.FormMain_Load); |
5424 | - this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.FormMain_FormClosed); | |
5425 | 5451 | this.splitContainer1.Panel1.ResumeLayout(false); |
5426 | 5452 | this.splitContainer1.Panel1.PerformLayout(); |
5427 | 5453 | this.splitContainer1.Panel2.ResumeLayout(false); |
@@ -5999,6 +6025,8 @@ | ||
5999 | 6025 | private System.Windows.Forms.Button buttonMakeUserId; |
6000 | 6026 | private System.Windows.Forms.LinkLabel linkLabelMakuUserId; |
6001 | 6027 | private System.Windows.Forms.Button buttonGetMyMylistList; |
6028 | + private System.Windows.Forms.CheckBox checkBoxIsSendingUserSession; | |
6029 | + private System.Windows.Forms.Label label52; | |
6002 | 6030 | } |
6003 | 6031 | } |
6004 | 6032 |
@@ -395,6 +395,7 @@ | ||
395 | 395 | searching_tag_option.getting_detail_interval = textBoxGettingDetailInterval.Text; |
396 | 396 | searching_tag_option.is_create_ticket = checkBoxSaveSearch.Checked; |
397 | 397 | searching_tag_option.redundant_seatching_method = GetRedundantSeatchingMethod(); |
398 | + searching_tag_option.is_sending_user_session = checkBoxIsSendingUserSession.Checked; | |
398 | 399 | |
399 | 400 | // 処理の最初にボタンのテキストを「中止」にする |
400 | 401 | NicoRankManager.ThreadStarterDelegate ts_delegate = delegate { |
@@ -1144,14 +1145,6 @@ | ||
1144 | 1145 | StartThread(nicorank_mgr_.MakeAviFromScript, null, false); |
1145 | 1146 | } |
1146 | 1147 | |
1147 | - private void checkBoxIsRankFileCustomize_Click(object sender, EventArgs e) | |
1148 | - { | |
1149 | - if (checkBoxIsRankFileCustomize.Checked) | |
1150 | - { | |
1151 | - MessageBox.Show("ランクファイルのカスタマイズ機能はβ版であり、\r\n誤りを含む可能性があります。\r\n結果が正しいことを十分確認した上でご使用ください。"); | |
1152 | - } | |
1153 | - } | |
1154 | - | |
1155 | 1148 | private void listBoxSortNew_SelectedIndexChanged(object sender, EventArgs e) |
1156 | 1149 | { |
1157 | 1150 | string[] condition_label_text = { "", "再生数が", "", "コメント数が", "マイリスト数が" }; |
@@ -593,6 +593,8 @@ | ||
593 | 593 | |
594 | 594 | public string save_html_dir; |
595 | 595 | |
596 | + public bool is_sending_user_session; | |
597 | + | |
596 | 598 | // 検索チケットID |
597 | 599 | public string ticket_id; |
598 | 600 | // 検索チケット作成フラグ |
@@ -13,6 +13,7 @@ | ||
13 | 13 | public class NicoNetworkManager |
14 | 14 | { |
15 | 15 | private NicoNetwork niconico_network_; |
16 | + private NicoNetwork niconico_no_user_session_network_ = new NicoNetwork(); | |
16 | 17 | private MessageOut msgout_; |
17 | 18 | private CancelObject cancel_object_; |
18 | 19 |
@@ -28,6 +29,8 @@ | ||
28 | 29 | niconico_network_ = network; |
29 | 30 | msgout_ = msgout; |
30 | 31 | cancel_object_ = cancel_object; |
32 | + | |
33 | + niconico_no_user_session_network_.ReloadCookie(NicoNetwork.CookieKind.None); | |
31 | 34 | } |
32 | 35 | |
33 | 36 | public void SetDelegateSetDonwloadInfo(StringDelegate dlg) |
@@ -203,6 +206,9 @@ | ||
203 | 206 | } |
204 | 207 | else |
205 | 208 | { |
209 | + // ニコニコ動画では、タグ(キーワード)検索の際、なぜかログインしているとアクセス制限がきつく、していないと弱い。 | |
210 | + // そのため、タグ検索のときだけログインしないというオプションを用意している。 | |
211 | + NicoNetwork network = (option.is_sending_user_session ? niconico_network_ : niconico_no_user_session_network_); | |
206 | 212 | wait_required = true; |
207 | 213 | while (true) |
208 | 214 | { |
@@ -210,11 +216,11 @@ | ||
210 | 216 | { |
211 | 217 | if (is_searching_kind_tag) |
212 | 218 | { |
213 | - str = niconico_network_.GetSearchTag(tag_word, page, option.GetSortMethod(), option.GetSearchOrder()); | |
219 | + str = network.GetSearchTag(tag_word, page, option.GetSortMethod(), option.GetSearchOrder()); | |
214 | 220 | } |
215 | 221 | else |
216 | 222 | { |
217 | - str = niconico_network_.GetSearchKeyword(tag_word, page, option.GetSortMethod(), option.GetSearchOrder()); | |
223 | + str = network.GetSearchKeyword(tag_word, page, option.GetSortMethod(), option.GetSearchOrder()); | |
218 | 224 | } |
219 | 225 | if (str.IndexOf("ここから先をご利用いただくにはログインしてください") >= 0) |
220 | 226 | { |
@@ -232,6 +232,9 @@ | ||
232 | 232 | writer.WriteLine("getting_detail_interval={0}", option.getting_detail_interval ?? string.Empty); |
233 | 233 | |
234 | 234 | writer.WriteLine("redundant_seatching_method={0}", option.redundant_seatching_method.ToString()); |
235 | + | |
236 | + writer.WriteLine("save_html_dir={0}", option.save_html_dir); | |
237 | + writer.WriteLine("is_sending_user_session={0}", option.is_sending_user_session); | |
235 | 238 | } |
236 | 239 | |
237 | 240 | return option_text.ToString(); |
@@ -331,6 +334,12 @@ | ||
331 | 334 | case "redundant_seatching_method": |
332 | 335 | option.redundant_seatching_method = (RedundantSearchingMethod)Enum.Parse(typeof(RedundantSearchingMethod), value); |
333 | 336 | break; |
337 | + case "save_html_dir": | |
338 | + option.save_html_dir = value; | |
339 | + break; | |
340 | + case "is_sending_user_session": | |
341 | + option.is_sending_user_session = bool.Parse(value); | |
342 | + break; | |
334 | 343 | default: |
335 | 344 | break; |
336 | 345 | } |