Skip to content

Commit

Permalink
Merge r281
Browse files Browse the repository at this point in the history
  • Loading branch information
@yuyuvn
yuyuvn committed Feb 15, 2014
1 parent 0cb8e34 commit 02734e8
Show file tree
Hide file tree
Showing 20 changed files with 537 additions and 291 deletions.
9 changes: 9 additions & 0 deletions Changelog.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@
KCV Change Log
========================

v2.1.0 r281 - 2/14/2014 Valentines Day Update
* *NEW* Set Cookie Region button now on the start of the program. This allows
you to log into DMM.com without VPN! Just press it once and login!
* All logging is now in CSV format and broken up.
* All ships, operations, and enemy fleets are now translated.
* Added new quests to the quest list. Not 100% tested. Please inform me of
missing translations!
* Vertical - Tightened the space used in the overview page.

v2.1.0 r272 - 2/10/2014
* *NEW* Equipment List! Shows all your current equipment, how many you own, and
who currently has them equipped! Huge amount of detail. (Based Grabacr07)
Expand Down
3 changes: 0 additions & 3 deletions Grabacr07.KanColleViewer/App.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@
<setting name="FeatureBrowserEmulation" serializeAs="String">
<value>8000</value>
</setting>
<setting name="UIContentWidth" serializeAs="String">
<value>1366</value>
</setting>
</Grabacr07.KanColleViewer.Properties.Settings>
</applicationSettings>
</configuration>
4 changes: 2 additions & 2 deletions Grabacr07.KanColleViewer/KanColleViewer-Horizontal.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -584,8 +584,8 @@
<PropertyGroup>
<PostBuildEvent>xcopy /Y "$(TargetDir)KanColleViewer.exe" "$(SolutionDir)KanColleViewer-Compiled"
xcopy /Y "$(TargetDir)KanColleViewer.exe.config" "$(SolutionDir)KanColleViewer-Compiled"
rename "$(SolutionDir)KanColleViewer-Compiled\KanColleViewer.exe" "KanColleViewer-Horiztonal.exe"
rename "$(SolutionDir)KanColleViewer-Compiled\KanColleViewer.exe.config" "KanColleViewer-Horiztonal.exe.config"
rename "$(SolutionDir)KanColleViewer-Compiled\KanColleViewer.exe" "KanColleViewer-Horizontal.exe"
rename "$(SolutionDir)KanColleViewer-Compiled\KanColleViewer.exe.config" "KanColleViewer-Horizontal.exe.config"
xcopy /Y "$(TargetDir)*.dll" "$(SolutionDir)KanColleViewer-Compiled\lib"
xcopy /Y /E /I "$(TargetDir)ja-JP" "$(SolutionDir)KanColleViewer-Compiled\lib\ja-JP"
xcopy /Y /E /I "$(TargetDir)zh-CN" "$(SolutionDir)KanColleViewer-Compiled\lib\zh-CN"
Expand Down
4 changes: 2 additions & 2 deletions Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
// アセンブリに関連付けられている情報を変更するには、
// これらの属性値を変更してください。
[assembly: AssemblyTitle("KanColleViewer!")]
[assembly: AssemblyDescription("KanColleViewer! r272")]
[assembly: AssemblyDescription("KanColleViewer! r281")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("grabacr.net")]
[assembly: AssemblyProduct("KanColleViewer! r272")]
[assembly: AssemblyProduct("KanColleViewer! r281")]
[assembly: AssemblyCopyright("Copyright © 2013 Grabacr07")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
Expand Down
18 changes: 18 additions & 0 deletions Grabacr07.KanColleViewer/Properties/Resources.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions Grabacr07.KanColleViewer/Properties/Resources.ja-JP.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -465,4 +465,10 @@
<data name="Settings_Logging_Enable" xml:space="preserve">
<value>Log drops and crafting results to file</value>
</data>
<data name="StartContent_SetRegionCookieButton" xml:space="preserve">
<value>Set Region Cookie</value>
</data>
<data name="StartContent_SetRegionCookieMessage" xml:space="preserve">
<value>Cookie has been set</value>
</data>
</root>
6 changes: 6 additions & 0 deletions Grabacr07.KanColleViewer/Properties/Resources.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -465,4 +465,10 @@
<data name="Rankings_RankingsList" xml:space="preserve">
<value>Current Rankings</value>
</data>
<data name="StartContent_SetRegionCookieButton" xml:space="preserve">
<value>Set Cookie Region</value>
</data>
<data name="StartContent_SetRegionCookieMessage" xml:space="preserve">
<value>Cookie has been set</value>
</data>
</root>
6 changes: 6 additions & 0 deletions Grabacr07.KanColleViewer/Properties/Resources.zh-CN.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -465,4 +465,10 @@
<data name="Settings_Logging_Enable" xml:space="preserve">
<value>Log drops and crafting results to file</value>
</data>
<data name="StartContent_SetRegionCookieButton" xml:space="preserve">
<value>Set Region Cookie</value>
</data>
<data name="StartContent_SetRegionCookieMessage" xml:space="preserve">
<value>Cookie has been set</value>
</data>
</root>
9 changes: 0 additions & 9 deletions Grabacr07.KanColleViewer/Properties/Settings.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions Grabacr07.KanColleViewer/Properties/Settings.settings
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,5 @@
<Setting Name="FeatureBrowserEmulation" Type="System.Int32" Scope="Application">
<Value Profile="(Default)">8000</Value>
</Setting>
<Setting Name="UIContentWidth" Type="System.String" Scope="Application">
<Value Profile="(Default)">1366</Value>
</Setting>
</Settings>
</SettingsFile>
10 changes: 10 additions & 0 deletions Grabacr07.KanColleViewer/ViewModels/NavigatorViewModel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,5 +156,15 @@ public void Navigate()
this.UriRequested(this, uri);
}
}
public void CookieNavigate()
{
Uri uri;
string CookieInject = "javascript:void(eval(\"document.cookie = 'ckcy=1;expires=Sun, 09 Feb 2019 09:00:09 GMT;domain=osapi.dmm.com;path=/';document.cookie = 'ckcy=1;expires=Sun, 09 Feb 2019 09:00:09 GMT;domain=203.104.209.7;path=/';document.cookie = 'ckcy=1;expires=Sun, 09 Feb 2019 09:00:09 GMT;domain=www.dmm.com;path=/netgame/';\"));location.href=\"";
CookieInject += this.SourceString + "\";";
if (this.UriRequested != null && Uri.TryCreate(CookieInject, UriKind.Absolute, out uri))
{
this.UriRequested(this, uri);
}
}
}
}
43 changes: 43 additions & 0 deletions Grabacr07.KanColleViewer/ViewModels/StartContentViewModel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,42 @@ public string DeleteInternetCacheButtonContent

#endregion

#region CanSetRegionCookie 変更通知プロパティ

private bool _CanSetRegionCookie = true;

public bool CanSetRegionCookie
{
get { return this._CanSetRegionCookie; }
set
{
if (this._CanSetRegionCookie != value)
{
this._CanSetRegionCookie = value;
this.RaisePropertyChanged();
}
}
}

#endregion

#region SetRegionCookieButtonContent 変更通知プロパティ
private string _SetRegionCookieButtonContent = Properties.Resources.StartContent_SetRegionCookieButton;

public string SetRegionCookieButtonContent
{
get { return this._SetRegionCookieButtonContent; }
set
{
if (this._SetRegionCookieButtonContent != value)
{
this._SetRegionCookieButtonContent = value;
this.RaisePropertyChanged();
}
}
}
#endregion

private StartContentViewModel() { }

public async void DeleteInternetCache()
Expand All @@ -85,5 +121,12 @@ public async void DeleteInternetCache()
Debug.WriteLine(ex);
}
}

public void SetRegionCookie()
{
App.ViewModelRoot.Navigator.CookieNavigate();
this.SetRegionCookieButtonContent = Properties.Resources.StartContent_SetRegionCookieMessage;
this.CanSetRegionCookie = false;
}
}
}
16 changes: 9 additions & 7 deletions Grabacr07.KanColleViewer/Views/Contents/Quests.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,11 +182,13 @@
Padding="10" />
</Grid>

<TextBlock Text="{Binding Resources.Quests_Untaken, Source={x:Static models:ResourceService.Current}, Mode=OneWay}"
TextWrapping="Wrap"
FontSize="16"
Visibility="{Binding IsUntaken, Converter={StaticResource BooleanToVisibilityConverter}}"
HorizontalAlignment="Center"
Margin="20,40" />
</Grid>
<Grid MaxWidth="{Binding ElementName=QuestContent, Path=ActualWidth}">
<TextBlock Text="{Binding Resources.Quests_Untaken, Source={x:Static models:ResourceService.Current}, Mode=OneWay}"
TextWrapping="Wrap"
FontSize="16"
Visibility="{Binding IsUntaken, Converter={StaticResource BooleanToVisibilityConverter}}"
HorizontalAlignment="Center"
Margin="20,40" />
</Grid>
</Grid>
</UserControl>
65 changes: 33 additions & 32 deletions Grabacr07.KanColleViewer/Views/Fleets.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,57 +103,58 @@
</ItemsControl.ItemTemplate>
</ListBox>

<ContentControl Grid.Row="1"
Margin="9,3"
Content="{Binding SelectedFleet.State}">
<ContentControl.Resources>
<DataTemplate DataType="{x:Type fleets:ExpeditionViewModel}">
<Border Padding="10,5"
<Grid Grid.Row="1" MaxWidth="{Binding Path=ActualWidth, RelativeSource={RelativeSource AncestorType={x:Type ScrollViewer}}}">
<ContentControl Margin="9,3"
Content="{Binding SelectedFleet.State}">
<ContentControl.Resources>
<DataTemplate DataType="{x:Type fleets:ExpeditionViewModel}">
<Border Padding="10,5"
Background="#FF204080">
<TextBlock Foreground="White">
<TextBlock Foreground="White" TextWrapping="Wrap">
<Run Text="{Binding Resources.MessageBar_Expedition, Source={x:Static models:ResourceService.Current}, Mode=OneWay}" />
<Run Text="{Binding Resources.MessageBar_Expedition_TimeCompletion, Source={x:Static models:ResourceService.Current}, Mode=OneWay}" />
<Run Text="{Binding ReturnTime, Mode=OneWay}" />
<Run Text="{Binding Resources.MessageBar_Expedition_TimeRemaining, Source={x:Static models:ResourceService.Current}, Mode=OneWay}" />
<Run Text="{Binding Remaining, Mode=OneWay}" />
</TextBlock>
</Border>
</DataTemplate>
<DataTemplate DataType="{x:Type fleets:ReSortieBarViewModel}">
<Border x:Name="Border"
</TextBlock>
</Border>
</DataTemplate>
<DataTemplate DataType="{x:Type fleets:ReSortieBarViewModel}">
<Border x:Name="Border"
Padding="10,5"
Background="{DynamicResource FleetReSortieBrushKey}">
<Grid>
<TextBlock Foreground="White">
<Grid>
<TextBlock Foreground="White" TextWrapping="Wrap">
<Run Text="{Binding Message, Mode=OneWay}" />
<Run Text="{Binding Remaining, Mode=OneWay}" />
</TextBlock>
</Grid>
</Border>
<DataTemplate.Triggers>
<DataTrigger Binding="{Binding CanReSortie}"
</TextBlock>
</Grid>
</Border>
<DataTemplate.Triggers>
<DataTrigger Binding="{Binding CanReSortie}"
Value="False">
<Setter TargetName="Border"
<Setter TargetName="Border"
Property="Background"
Value="{DynamicResource FleetRepairingBrushKey}" />
</DataTrigger>
</DataTemplate.Triggers>
</DataTemplate>
<DataTemplate DataType="{x:Type fleets:RepairingBarViewModel}">
<Border x:Name="Border"
</DataTrigger>
</DataTemplate.Triggers>
</DataTemplate>
<DataTemplate DataType="{x:Type fleets:RepairingBarViewModel}">
<Border x:Name="Border"
Padding="10,5"
Background="{DynamicResource FleetRepairingBrushKey}">
<TextBlock Foreground="White">
<TextBlock Foreground="White" TextWrapping="Wrap">
<i:Interaction.Behaviors>
<behaviors:TimerBehavior Proc="{Binding TimerProc}" />
</i:Interaction.Behaviors>
</TextBlock>
</Border>
</DataTemplate>
</ContentControl.Resources>
</ContentControl>
</TextBlock>
</Border>
</DataTemplate>
</ContentControl.Resources>
</ContentControl>
</Grid>

<Grid Grid.Row="3"
<Grid Grid.Row="3"
DataContext="{Binding SelectedFleet}"
d:DataContext="{d:DesignData /SampleData/FleetViewModelSampleData.xaml}">
<ItemsControl ItemsSource="{Binding Ships}"
Expand Down
Loading

0 comments on commit 02734e8

Please sign in to comment.