OSDN Git Service
(root)
/
opentween
/
open-tween.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
AppendSettingDialog.TwitterConfigurationをTwitter.Configurationに移動
[opentween/open-tween.git]
/
OpenTween
/
Tween.cs
diff --git
a/OpenTween/Tween.cs
b/OpenTween/Tween.cs
index
d88c1bf
..
641268f
100644
(file)
--- a/
OpenTween/Tween.cs
+++ b/
OpenTween/Tween.cs
@@
-899,7
+899,7
@@
namespace OpenTween
AllrepliesToolStripMenuItem.Checked = tw.AllAtReply;
//画像投稿サービス
AllrepliesToolStripMenuItem.Checked = tw.AllAtReply;
//画像投稿サービス
- ImageSelector.Initialize(tw,
SettingDialog.Twitter
Configuration, _cfgCommon.UseImageServiceName, _cfgCommon.UseImageService);
+ ImageSelector.Initialize(tw,
this.tw.
Configuration, _cfgCommon.UseImageServiceName, _cfgCommon.UseImageService);
//ウィンドウ設定
this.ClientSize = _cfgLocal.FormSize;
//ウィンドウ設定
this.ClientSize = _cfgLocal.FormSize;
@@
-2434,7
+2434,7
@@
namespace OpenTween
case MyCommon.WORKERTYPE.Configuration:
try
{
case MyCommon.WORKERTYPE.Configuration:
try
{
- this.
SettingDialog.TwitterConfiguration = tw.ConfigurationApi
();
+ this.
tw.RefreshConfiguration
();
}
catch (WebApiException ex) { ret = ex.Message; }
break;
}
catch (WebApiException ex) { ret = ex.Message; }
break;
@@
-2929,11
+2929,11
@@
namespace OpenTween
break;
case MyCommon.WORKERTYPE.Configuration:
//_waitFollower = false
break;
case MyCommon.WORKERTYPE.Configuration:
//_waitFollower = false
- if (
SettingDialog.Twitter
Configuration.PhotoSizeLimit != 0)
+ if (
this.tw.
Configuration.PhotoSizeLimit != 0)
{
foreach (var service in this.ImageSelector.GetServices())
{
{
foreach (var service in this.ImageSelector.GetServices())
{
- service.UpdateTwitterConfiguration(this.
SettingDialog.Twitter
Configuration);
+ service.UpdateTwitterConfiguration(this.
tw.
Configuration);
}
}
this.PurgeListViewItemCache();
}
}
this.PurgeListViewItemCache();
@@
-3793,7
+3793,7
@@
namespace OpenTween
this._cfgLocal.ProxyAddress, this._cfgLocal.ProxyPort,
this._cfgLocal.ProxyUser, this._cfgLocal.ProxyPassword);
this._cfgLocal.ProxyAddress, this._cfgLocal.ProxyPort,
this._cfgLocal.ProxyUser, this._cfgLocal.ProxyPassword);
- ImageSelector.Reset(tw,
SettingDialog.Twitter
Configuration);
+ ImageSelector.Reset(tw,
this.tw.
Configuration);
try
{
try
{
@@
-4898,7
+4898,7
@@
namespace OpenTween
last_url_invalid_match = Regex.IsMatch(lasturl, Twitter.url_invalid_short_domain, RegexOptions.IgnoreCase);
if (!last_url_invalid_match)
{
last_url_invalid_match = Regex.IsMatch(lasturl, Twitter.url_invalid_short_domain, RegexOptions.IgnoreCase);
if (!last_url_invalid_match)
{
- pLen += lasturl.Length -
SettingDialog.Twitter
Configuration.ShortUrlLength;
+ pLen += lasturl.Length -
this.tw.
Configuration.ShortUrlLength;
}
}
}
}
@@
-4906,7
+4906,7
@@
namespace OpenTween
{
if (last_url_invalid_match)
{
{
if (last_url_invalid_match)
{
- pLen += lasturl.Length -
SettingDialog.Twitter
Configuration.ShortUrlLength;
+ pLen += lasturl.Length -
this.tw.
Configuration.ShortUrlLength;
}
pLen += path.Length;
}
}
pLen += path.Length;
}
@@
-4914,8
+4914,8
@@
namespace OpenTween
else
{
int shortUrlLength = protocol == "https://"
else
{
int shortUrlLength = protocol == "https://"
- ?
SettingDialog.Twitter
Configuration.ShortUrlLengthHttps
- :
SettingDialog.Twitter
Configuration.ShortUrlLength;
+ ?
this.tw.
Configuration.ShortUrlLengthHttps
+ :
this.tw.
Configuration.ShortUrlLength;
pLen += url.Length - shortUrlLength;
}
pLen += url.Length - shortUrlLength;
}
@@
-4927,7
+4927,7
@@
namespace OpenTween
}
if (ImageSelector.Visible && !string.IsNullOrEmpty(ImageSelector.ServiceName))
{
}
if (ImageSelector.Visible && !string.IsNullOrEmpty(ImageSelector.ServiceName))
{
- pLen -=
SettingDialog.Twitter
Configuration.CharactersReservedPerMedia;
+ pLen -=
this.tw.
Configuration.CharactersReservedPerMedia;
}
return pLen;
}
}
return pLen;
}
@@
-10673,7
+10673,7
@@
namespace OpenTween
GetTimeline(MyCommon.WORKERTYPE.NoRetweetIds, 0, "");
// 取得失敗の場合は再試行する
GetTimeline(MyCommon.WORKERTYPE.NoRetweetIds, 0, "");
// 取得失敗の場合は再試行する
- if (
SettingDialog.Twitter
Configuration.PhotoSizeLimit == 0)
+ if (
this.tw.
Configuration.PhotoSizeLimit == 0)
GetTimeline(MyCommon.WORKERTYPE.Configuration, 0, "");
// 権限チェック read/write権限(xAuthで取得したトークン)の場合は再認証を促す
GetTimeline(MyCommon.WORKERTYPE.Configuration, 0, "");
// 権限チェック read/write権限(xAuthで取得したトークン)の場合は再認証を促す
@@
-11233,10
+11233,10
@@
namespace OpenTween
public bool IsTwitterId(string name)
{
public bool IsTwitterId(string name)
{
- if (
SettingDialog.TwitterConfiguration.NonUsernamePaths == null || SettingDialog.Twitter
Configuration.NonUsernamePaths.Length == 0)
+ if (
this.tw.Configuration.NonUsernamePaths == null || this.tw.
Configuration.NonUsernamePaths.Length == 0)
return !Regex.Match(name, @"^(about|jobs|tos|privacy|who_to_follow|download|messages)$", RegexOptions.IgnoreCase).Success;
else
return !Regex.Match(name, @"^(about|jobs|tos|privacy|who_to_follow|download|messages)$", RegexOptions.IgnoreCase).Success;
else
- return !
SettingDialog.Twitter
Configuration.NonUsernamePaths.Contains(name.ToLower());
+ return !
this.tw.
Configuration.NonUsernamePaths.Contains(name.ToLower());
}
private string GetUserId()
}
private string GetUserId()