diff --git a/DiskGazer/App.config b/DiskGazer/App.config
index 320c28a..924afd8 100644
--- a/DiskGazer/App.config
+++ b/DiskGazer/App.config
@@ -1,6 +1,6 @@
-
+
diff --git a/DiskGazer/Common/NotificationObject.cs b/DiskGazer/Common/NotificationObject.cs
index cd6bd09..276c76f 100644
--- a/DiskGazer/Common/NotificationObject.cs
+++ b/DiskGazer/Common/NotificationObject.cs
@@ -13,7 +13,7 @@ public abstract class NotificationObject : INotifyPropertyChanged
{
public event PropertyChangedEventHandler PropertyChanged;
- protected virtual void RaisePropertyChanged(Expression> propertyExpression)
+ protected void RaisePropertyChanged(Expression> propertyExpression)
{
if (propertyExpression == null)
throw new ArgumentNullException("propertyExpression");
@@ -25,7 +25,7 @@ protected virtual void RaisePropertyChanged(Expression> propertyExpre
this.RaisePropertyChanged(memberExpression.Member.Name);
}
- protected virtual void RaisePropertyChanged([CallerMemberName] string propertyName = null)
+ protected void RaisePropertyChanged([CallerMemberName] string propertyName = null)
{
var handler = this.PropertyChanged;
if (handler != null)
diff --git a/DiskGazer/DiskGazer.csproj b/DiskGazer/DiskGazer.csproj
index bfb6cce..f29edf4 100644
--- a/DiskGazer/DiskGazer.csproj
+++ b/DiskGazer/DiskGazer.csproj
@@ -1,5 +1,5 @@
-
+
Debug
@@ -9,7 +9,7 @@
Properties
DiskGazer
DiskGazer
- v4.5
+ v4.5.2
512
{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
4
@@ -171,7 +171,9 @@
-
+
+ Designer
+
diff --git a/DiskGazer/Library/MonitorAware.dll b/DiskGazer/Library/MonitorAware.dll
index 0707367..2572160 100644
Binary files a/DiskGazer/Library/MonitorAware.dll and b/DiskGazer/Library/MonitorAware.dll differ
diff --git a/DiskGazer/Library/MonitorAware.xml b/DiskGazer/Library/MonitorAware.xml
index 7b77773..c6bfde0 100644
--- a/DiskGazer/Library/MonitorAware.xml
+++ b/DiskGazer/Library/MonitorAware.xml
@@ -158,13 +158,6 @@
Color profile changed event args
-
-
- Constructor
-
- Old color profile path
- New color profile path
-
Old color profile path
@@ -175,6 +168,13 @@
New color profile path
+
+
+ Constructor
+
+ Old color profile path
+ New color profile path
+
Check color profile.
@@ -200,6 +200,16 @@
Default DPI
+
+
+ X-axis value of DPI
+
+
+
+
+ Y-axis value of DPI
+
+
Constructor
@@ -249,16 +259,6 @@
String containing X and Y values of this structure
-
-
- X-axis value of DPI
-
-
-
-
- Y-axis value of DPI
-
-
PropertyChanged event
@@ -269,13 +269,6 @@
DPI changed event args
-
-
- Constructor
-
- Old DPI
- New DPI
-
Old DPI
@@ -286,6 +279,13 @@
New DPI
+
+
+ Constructor
+
+ Old DPI
+ New DPI
+
Check DPI.
@@ -336,16 +336,194 @@
Source Rect
DPI struct
+
+
+ Get Per-Monitor DPI of the monitor in which the notification area is contained.
+
+ DPI struct
+
Handler for
+
+
+ Window activated changed event
+
+
+ Args true: Window is being activated.
+ Args false: Window is being deactivated.
+
+
+
+
+ DWM colorization color changed event
+
+ This event is fired when default Window chrome color is changed.
+
+
+
+ Handle window messages.
+
+ The window handle
+ The message ID
+ The message's wParam value
+ The message's lParam value
+ Whether the message was handled
+ Return value depending on the particular message
+ This is an implementation of System.Windows.Interop.HwndSourceHook.
+
+
+
+ Equivalent to LOWORD
+
+ Dword (unit)
+ Low-order Word (ushort)
+
+
+
+ Equivalent to HIWORD
+
+ Dword (uint)
+ High-order Word (ushort)
+
+
+
+ If no display monitor intersects, returns null.
+
+
+
+
+ If no display monitor intersects, returns a handle to the primary display monitor.
+
+
+
+
+ If no display monitor intersects, returns a handle to the display monitor that is nearest to the rectangle.
+
+
+
+
+ Not DPI aware
+
+
+
+
+ System DPI aware
+
+
+
+
+ Per-Monitor DPI aware
+
+
+
+
+ Effective DPI that incorporates accessibility overrides and matches what Desktop Window Manage (DWM) uses to scale desktop applications
+
+
+
+
+ DPI that ensures rendering at a compliant angular resolution on the screen, without incorporating accessibility overrides
+
+
+
+
+ Linear DPI of the screen as measured on the screen itself
+
+
+
+
+ Default DPI
+
+
+
+
+ Activated by some method other than a mouse click.
+
+
+
+
+ Activated by a mouse click.
+
+
+
+
+ Deactivated.
+
+
+
+
+ Some other window is maximized.
+
+
+
+
+ The window has been maximized.
+
+
+
+
+ Some other window has been restored to its former size.
+
+
+
+
+ The window has been minimized.
+
+
+
+
+ The window has been resized, but neither the SIZE_MINIMIZED nor SIZE_MAXIMIZED value applies.
+
+
Handler for
+
+
+ Status of a
+
+
+
+
+ A Window stands still.
+
+
+
+
+ A Window's location is being changed.
+
+
+
+
+ A Window's size is being changed.
+
+
+
+
+ DPI and other information on a
+
+
+
+
+ Whether target Window is Per-Monitor DPI aware (readonly)
+
+
+
+
+ System DPI (readonly)
+
+
+
+
+ Per-Monitor DPI of current monitor (public readonly)
+
+ This property cannot become a binding target because it has no public setter.
+
Dependency property key for
@@ -356,6 +534,12 @@
Dependency property for
+
+
+ Per-Monitor DPI of target Window (public readonly)
+
+ This property cannot become a binding target because it has no public setter.
+
Dependency property key for
@@ -366,6 +550,12 @@
Dependency property for
+
+
+ Color profile path of target Window (public readonly)
+
+ This property cannot become a binding target because it has no public setter.
+
Dependency property key for
@@ -376,6 +566,20 @@
Dependency property for
+
+
+ DPI changed event
+
+ This event is fired when DPI of target Window is changed. It is not necessarily the same timing
+ when DPI of the monitor to which target Window belongs is changed.
+
+
+
+ Color profile path changed event
+
+ This event is fired when color profile path of the monitor to which target Window belongs has
+ changed and Window's move/resize which caused the change has exited.
+
Default constructor
@@ -460,223 +664,12 @@
Object: Block.
-
+
- Whether target Window is Per-Monitor DPI aware (readonly)
+ Drawing maximize icon
-
-
- System DPI (readonly)
-
-
-
-
- Per-Monitor DPI of current monitor (public readonly)
-
- This property cannot become a binding target because it has no public setter.
-
-
-
- Per-Monitor DPI of target Window (public readonly)
-
- This property cannot become a binding target because it has no public setter.
-
-
-
- Color profile path of target Window (public readonly)
-
- This property cannot become a binding target because it has no public setter.
-
-
-
- DPI changed event
-
- This event is fired when DPI of target Window is changed. It is not necessarily the same timing
- when DPI of the monitor to which target Window belongs is changed.
-
-
-
- Color profile path changed event
-
- This event is fired when color profile path of the monitor to which target Window belongs has
- changed and Window's move/resize which caused the change has exited.
-
-
-
- Status of a
-
-
-
-
- A Window stands still.
-
-
-
-
- A Window's location is being changed.
-
-
-
-
- A Window's size is being changed.
-
-
-
-
- DPI and other information on a
-
-
-
-
- Handle window messages.
-
- The window handle
- The message ID
- The message's wParam value
- The message's lParam value
- Whether the message was handled
- Return value depending on the particular message
- This is an implementation of System.Windows.Interop.HwndSourceHook.
-
-
-
- Window activated changed event
-
-
- Args true: Window is being activated.
- Args false: Window is being deactivated.
-
-
-
-
- DWM colorization color changed event
-
- This event is fired when default Window chrome color is changed.
-
-
-
- Equivalent to LOWORD
-
- Dword (unit)
- Low-order Word (ushort)
-
-
-
- Equivalent to HIWORD
-
- Dword (uint)
- High-order Word (ushort)
-
-
-
- Activated by some method other than a mouse click.
-
-
-
-
- Activated by a mouse click.
-
-
-
-
- Deactivated.
-
-
-
-
- Some other window is maximized.
-
-
-
-
- The window has been maximized.
-
-
-
-
- Some other window has been restored to its former size.
-
-
-
-
- The window has been minimized.
-
-
-
-
- The window has been resized, but neither the SIZE_MINIMIZED nor SIZE_MAXIMIZED value applies.
-
-
-
-
- If no display monitor intersects, returns null.
-
-
-
-
- If no display monitor intersects, returns a handle to the primary display monitor.
-
-
-
-
- If no display monitor intersects, returns a handle to the display monitor that is nearest to the rectangle.
-
-
-
-
- Not DPI aware
-
-
-
-
- System DPI aware
-
-
-
-
- Per-Monitor DPI aware
-
-
-
-
- Effective DPI that incorporates accessibility overrides and matches what Desktop Window Manage (DWM) uses to scale desktop applications
-
-
-
-
- DPI that ensures rendering at a compliant angular resolution on the screen, without incorporating accessibility overrides
-
-
-
-
- Linear DPI of the screen as measured on the screen itself
-
-
-
-
- Default DPI
-
-
-
-
- Drawing maximize icon
-
-
-
-
- Interface for drawing icon
-
-
-
-
- Draw icon.
-
- DrawingContext of canvas
- Factor from default DPI
- Icon foreground Brush
-
-
+
Draw maximize icon.
@@ -715,31 +708,6 @@
-
-
- Dependency property for
-
-
-
-
- Dependency property for
-
-
-
-
- Dependency property for
-
-
-
-
- Dependency property for
-
-
-
-
- Dependency property for
-
-
Whether the owner Window is about to be activated (internal)
@@ -749,28 +717,53 @@
For binding only between code behind.
+
+
+ Dependency property for
+
+
Caption button background Brush when the owner Window is activated
Default value (Transparent) is to make whole button area hit test visible.
+
+
+ Dependency property for
+
+
Caption button background Brush when the owner Window is deactivated
Default value (Transparent) is to make whole button area hit test visible.
+
+
+ Dependency property for
+
+
Geometry for button icon
+
+
+ Dependency property for
+
+
Drawing icon to be used by IconCanvas
+
+
+ Dependency property for
+
+
Canvas for drawing icon
@@ -788,16 +781,32 @@
+
+
+ Icon foreground Brush
+
+ Black by OS's default.
+
Dependency property for
+
+
+ Drawing icon
+
+
Dependency property for
+
+
+ LayoutTransform of ancestor FrameworkElement
+
+
Dependency property for
@@ -817,21 +826,18 @@
Factor from default DPI
Icon foreground Brush
-
-
- Icon foreground Brush
-
- Black by OS's default.
-
-
+
- Drawing icon
+ Interface for drawing icon
-
+
- LayoutTransform of ancestor FrameworkElement
+ Draw icon.
+ DrawingContext of canvas
+ Factor from default DPI
+ Icon foreground Brush
@@ -923,267 +929,99 @@
-
-
- Convert whether object is null to Visibility.
-
-
-
-
- Convert whether object is null to Visibility.
-
- Source object
-
-
-
- If not null, Visibility.Visible. If null, Visibility.Collapsed.
-
-
-
- Not implemented
-
-
-
-
-
-
-
-
-
- Theme for ExtendedWindow
-
-
-
-
- Default theme
-
-
-
-
- Plain theme
-
-
-
-
- Light color theme
-
-
-
-
- Dark color theme
-
-
-
-
- Per-Monitor DPI aware and customizable chrome Window
-
-
-
-
- Default constructor
-
-
-
-
- OnApplyTemplate
-
-
-
-
- OnSourceInitialized
-
-
-
-
-
- OnStateChanged
-
-
-
-
-
- OnClosing
-
-
-
-
-
- OnClosed
-
-
-
-
-
- Dependency property for
-
-
-
-
- Dependency property for
-
-
-
-
- Dependency property for
-
-
-
-
- Dependency property for
-
-
-
-
- Dependency property for
-
-
-
-
- Dependency property for
-
-
-
-
- Dependency property for
-
-
-
-
- Dependency property for
-
-
-
-
- Dependency property for
-
-
-
-
- Dependency property for
-
-
-
-
- Dependency property for
-
-
-
-
- Dependency property for
-
-
-
-
- Default value of
-
- This value seems to have to be defined before dependency property.
-
-
-
- Dependency property for
-
-
-
-
- Dependency property for
-
-
-
-
- Dependency property for
-
-
-
-
- Default value of
-
- This value seems to have to be defined before dependency property.
-
-
-
- Dependency property for
-
-
-
+
- Dependency property for
+ Convert whether object is null to Visibility.
-
+
- Dependency property for
+ Convert whether object is null to Visibility.
+ Source object
+
+
+
+ If not null, Visibility.Visible. If null, Visibility.Collapsed.
-
+
- Dependency property for
+ Not implemented
+
+
+
+
+
-
+
- Dependency property for
+ Theme for ExtendedWindow
-
+
- Dependency property for
+ Default theme
-
+
- Dependency property for
+ Plain theme
-
+
- Dependency property for
+ Light color theme
-
+
- Dependency property for
+ Dark color theme
-
+
- Dependency property for
+ Per-Monitor DPI aware and customizable chrome Window
-
+
- Dependency property for
+ Default constructor
-
+
- Dependency property for
+ Handler for
-
+
- Adjust layout of Window parts.
+ OnApplyTemplate
-
+
- Whether checking background is due.
+ OnSourceInitialized
- Default value must be true to execute initial check.
+
-
+
- Whether checking default chrome background is due.
+ OnStateChanged
+
-
+
- Chrome background color to be actually used
+ OnClosing
+
-
+
- Handler for
+ OnClosed
+
@@ -1240,90 +1078,187 @@
Window theme out of ExtendedTheme
+
+
+ Dependency property for
+
+
Window theme Uri
+
+
+ Dependency property for
+
+
Whether minimize button is visible
+
+
+ Dependency property for
+
+
Whether maximize button is visible
+
+
+ Dependency property for
+
+
Whether restore button is visible
+
+
+ Dependency property for
+
+
Whether to keep title and content margin even when a Window is maximized
False by OS's default.
+
+
+ Dependency property for
+
+
Whether to blend colors for caption buttons' visual style with their normal color
This blending is for the case the colors are translucent.
+
+
+ Dependency property for
+
+
Whether to use OS's default chrome background
Default value must be false to execute initial check.
+
+
+ Dependency property for
+
+
OS's default chrome background Brush when a Window is activated (public readonly)
Default value (SystemColors.ActiveCaptionBrush) is merely for fall back.
+
+
+ Dependency property for
+
+
+
+
+ Dependency property for
+
+
Chrome background Brush when a Window is activated
+
+
+ Dependency property for
+
+
Chrome foreground Brush when a Window is activated
Black by OS's default.
+
+
+ Dependency property for
+
+
Chrome background Brush when a Window is deactivated
Default value (#FFebebeb) is for OS's default.
+
+
+ Default value of
+
+ This value seems to have to be defined before dependency property.
+
+
+
+ Dependency property for
+
+
Chrome foreground Brush when a Window is deactivated
Black by OS's default.
+
+
+ Dependency property for
+
+
Chrome border thickness (chrome outer border)
1 by OS's default.
+
+
+ Dependency property for
+
+
Chrome border Brush
Default value (#3C000000) is for reproducing OS's default.
+
+
+ Default value of
+
+ This value seems to have to be defined before dependency property.
+
+
+
+ Dependency property for
+
+
Title bar background Brush
+
+
+ Dependency property for
+
+
Title bar height when a Window is other than maximized
@@ -1333,55 +1268,126 @@
SystemParameters.WindowResizeBorderThickness.Top and SystemParameters.WindowNonClientFrameThickness.Top
which includes chrome border thickness.
+
+
+ Dependency property for
+
+
Title bar height when a Window is maximized
+
+
+ Dependency property for
+
+
Title bar padding at the left side
+
+
+ Dependency property for
+
+
Title bar padding at the right side
+
+
+ Dependency property for
+
+
Size of icon (Window.Icon) in title bar
+
+
+ Dependency property for
+
+
Alignment of title (Window.Title) in title bar
+
+
+ Dependency property for
+
+
Font size of title (Window.Title) in title bar
Default value (14) is for OS's default.
+
+
+ Dependency property for
+
+
Content (Window.Content) margin
Default value (6,0,6,6) is for reproducing OS's default.
+
+
+ Dependency property for
+
+
Content border thickness (chrome inner border)
1 by OS's default.
+
+
+ Dependency property for
+
+
Content border Brush
Default value is the same as that of ChromeBorderBrush.
+
+
+ Dependency property for
+
+
+
+
+ Adjust layout of Window parts.
+
+
+
+
+ Whether checking background is due.
+
+ Default value must be true to execute initial check.
+
+
+
+ Whether checking default chrome background is due.
+
+
+
+
+ Chrome background color to be actually used
+
+
Caption button background Brush (internal)
@@ -1457,6 +1463,11 @@
Per-Monitor DPI aware window
+
+
+ Handler for
+
+
OnSourceInitialized
@@ -1469,10 +1480,5 @@
-
-
- Handler for
-
-
diff --git a/DiskGazer/Models/DiskSearcher.cs b/DiskGazer/Models/DiskSearcher.cs
index c346664..df416a1 100644
--- a/DiskGazer/Models/DiskSearcher.cs
+++ b/DiskGazer/Models/DiskSearcher.cs
@@ -24,50 +24,51 @@ internal static List Search()
return diskRosterPre;
}
-
+
///
/// Search drives by WMI (Win32_DiskDrive).
///
/// List of disk information
private static void SearchDiskDrive(ref List diskRosterPre)
{
- var searcher = new ManagementObjectSearcher("SELECT * FROM Win32_DiskDrive");
-
- foreach (var drive in searcher.Get())
+ using (var searcher = new ManagementObjectSearcher("SELECT * FROM Win32_DiskDrive"))
{
- if (drive["Index"] == null) // Index number of physical drive
- continue;
-
- int index;
- if (!int.TryParse(drive["Index"].ToString(), out index))
- continue;
-
- var info = new DiskInfo();
- info.PhysicalDrive = index;
-
- if (drive["Model"] != null)
- {
- info.Model = drive["Model"].ToString();
- }
-
- if (drive["InterfaceType"] != null)
- {
- info.InterfaceType = drive["InterfaceType"].ToString();
- }
-
- if (drive["MediaType"] != null)
+ foreach (var drive in searcher.Get())
{
- info.MediaTypeDiskDrive = drive["MediaType"].ToString();
+ if (drive["Index"] == null) // Index number of physical drive
+ continue;
+
+ int index;
+ if (!int.TryParse(drive["Index"].ToString(), out index))
+ continue;
+
+ var info = new DiskInfo();
+ info.PhysicalDrive = index;
+
+ if (drive["Model"] != null)
+ {
+ info.Model = drive["Model"].ToString();
+ }
+
+ if (drive["InterfaceType"] != null)
+ {
+ info.InterfaceType = drive["InterfaceType"].ToString();
+ }
+
+ if (drive["MediaType"] != null)
+ {
+ info.MediaTypeDiskDrive = drive["MediaType"].ToString();
+ }
+
+ if (drive["Size"] != null)
+ {
+ long numSize;
+ if (long.TryParse(drive["Size"].ToString(), out numSize))
+ info.SizeWMI = numSize;
+ }
+
+ diskRosterPre.Add(info);
}
-
- if (drive["Size"] != null)
- {
- long numSize;
- if (long.TryParse(drive["Size"].ToString(), out numSize))
- info.SizeWMI = numSize;
- }
-
- diskRosterPre.Add(info);
}
}
@@ -81,33 +82,34 @@ private static void SearchPhysicalDisk(ref List diskRosterPre)
if (!OsVersion.IsEightOrNewer)
return;
- var searcher = new ManagementObjectSearcher(@"\\.\Root\Microsoft\Windows\Storage", "SELECT * FROM MSFT_PhysicalDisk");
-
- foreach (var drive in searcher.Get())
+ using (var searcher = new ManagementObjectSearcher(@"\\.\Root\Microsoft\Windows\Storage", "SELECT * FROM MSFT_PhysicalDisk"))
{
- if (drive["DeviceId"] == null) // Index number of physical drive
- continue;
-
- int numId;
- if (!int.TryParse(drive["DeviceId"].ToString(), out numId))
- continue;
-
- var info = diskRosterPre.FirstOrDefault(x => x.PhysicalDrive == numId);
- if (info == null)
- continue;
-
- if (drive["MediaType"] != null)
- {
- int numMediaType;
- if (int.TryParse(drive["MediaType"].ToString(), out numMediaType))
- info.MediaTypePhysicalDisk = numMediaType;
- }
-
- if (drive["SpindleSpeed"] != null)
+ foreach (var drive in searcher.Get())
{
- uint numSpindleSpeed;
- if (uint.TryParse(drive["SpindleSpeed"].ToString(), out numSpindleSpeed))
- info.SpindleSpeed = numSpindleSpeed;
+ if (drive["DeviceId"] == null) // Index number of physical drive
+ continue;
+
+ int numId;
+ if (!int.TryParse(drive["DeviceId"].ToString(), out numId))
+ continue;
+
+ var info = diskRosterPre.FirstOrDefault(x => x.PhysicalDrive == numId);
+ if (info == null)
+ continue;
+
+ if (drive["MediaType"] != null)
+ {
+ int numMediaType;
+ if (int.TryParse(drive["MediaType"].ToString(), out numMediaType))
+ info.MediaTypePhysicalDisk = numMediaType;
+ }
+
+ if (drive["SpindleSpeed"] != null)
+ {
+ uint numSpindleSpeed;
+ if (uint.TryParse(drive["SpindleSpeed"].ToString(), out numSpindleSpeed))
+ info.SpindleSpeed = numSpindleSpeed;
+ }
}
}
}
diff --git a/DiskGazer/Models/Settings.cs b/DiskGazer/Models/Settings.cs
index 3345823..72631a5 100644
--- a/DiskGazer/Models/Settings.cs
+++ b/DiskGazer/Models/Settings.cs
@@ -13,11 +13,8 @@ public class Settings : NotificationObject
private Settings()
{ }
- public static Settings Current
- {
- get { return _current ?? (_current = new Settings()); }
- }
- private static Settings _current;
+ public static Settings Current { get { return _current; } }
+ private static readonly Settings _current = new Settings();
#region Settings
diff --git a/DiskGazer/Properties/AssemblyInfo.cs b/DiskGazer/Properties/AssemblyInfo.cs
index 6a259ff..3ed473a 100644
--- a/DiskGazer/Properties/AssemblyInfo.cs
+++ b/DiskGazer/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
// すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を
// 既定値にすることができます:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.1.0")]
-[assembly: AssemblyFileVersion("1.0.1.0")]
+[assembly: AssemblyVersion("1.1.0.2")]
+[assembly: AssemblyFileVersion("1.1.0.2")]
diff --git a/DiskGazer/Properties/Resources.Designer.cs b/DiskGazer/Properties/Resources.Designer.cs
index 963e8fe..877d972 100644
--- a/DiskGazer/Properties/Resources.Designer.cs
+++ b/DiskGazer/Properties/Resources.Designer.cs
@@ -1,10 +1,10 @@
//------------------------------------------------------------------------------
//
-// このコードはツールによって生成されました。
-// ランタイム バージョン:4.0.30319.35317
+// This code was generated by a tool.
+// Runtime Version:4.0.30319.42000
//
-// このファイルへの変更は、以下の状況下で不正な動作の原因になったり、
-// コードが再生成されるときに損失したりします。
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
//
//------------------------------------------------------------------------------
@@ -13,12 +13,12 @@ namespace DiskGazer.Properties {
///
- /// ローカライズされた文字列などを検索するための、厳密に型指定されたリソース クラスです。
+ /// A strongly-typed resource class, for looking up localized strings, etc.
///
- // このクラスは StronglyTypedResourceBuilder クラスが ResGen
- // または Visual Studio のようなツールを使用して自動生成されました。
- // メンバーを追加または削除するには、.ResX ファイルを編集して、/str オプションと共に
- // ResGen を実行し直すか、または VS プロジェクトをビルドし直します。
+ // This class was auto-generated by the StronglyTypedResourceBuilder
+ // class via a tool like ResGen or Visual Studio.
+ // To add or remove a member, edit your .ResX file then rerun ResGen
+ // with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
@@ -33,7 +33,7 @@ internal Resources() {
}
///
- /// このクラスで使用されているキャッシュされた ResourceManager インスタンスを返します。
+ /// Returns the cached ResourceManager instance used by this class.
///
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager {
@@ -47,8 +47,8 @@ internal Resources() {
}
///
- /// 厳密に型指定されたこのリソース クラスを使用して、すべての検索リソースに対し、
- /// 現在のスレッドの CurrentUICulture プロパティをオーバーライドします。
+ /// Overrides the current thread's CurrentUICulture property for all
+ /// resource lookups using this strongly typed resource class.
///
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture {
@@ -61,7 +61,7 @@ internal Resources() {
}
///
- /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
///
internal static System.Drawing.Bitmap Camera_16xLG {
get {
@@ -71,7 +71,7 @@ internal static System.Drawing.Bitmap Camera_16xLG {
}
///
- /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
///
internal static System.Drawing.Bitmap Close_16xLG {
get {
@@ -81,7 +81,7 @@ internal static System.Drawing.Bitmap Close_16xLG {
}
///
- /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
///
internal static System.Drawing.Bitmap gear_16xLG {
get {
@@ -91,7 +91,7 @@ internal static System.Drawing.Bitmap gear_16xLG {
}
///
- /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
///
internal static System.Drawing.Bitmap refresh_16xLG {
get {
@@ -101,7 +101,7 @@ internal static System.Drawing.Bitmap refresh_16xLG {
}
///
- /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
///
internal static System.Drawing.Bitmap save_16xLG {
get {
diff --git a/DiskGazer/Properties/Settings.Designer.cs b/DiskGazer/Properties/Settings.Designer.cs
index 2564130..792ee7c 100644
--- a/DiskGazer/Properties/Settings.Designer.cs
+++ b/DiskGazer/Properties/Settings.Designer.cs
@@ -1,10 +1,10 @@
//------------------------------------------------------------------------------
//
-// このコードはツールによって生成されました。
-// ランタイム バージョン:4.0.30319.34014
+// This code was generated by a tool.
+// Runtime Version:4.0.30319.42000
//
-// このファイルへの変更は、以下の状況下で不正な動作の原因になったり、
-// コードが再生成されるときに損失したりします。
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
//
//------------------------------------------------------------------------------
diff --git a/DiskGazer/Views/MainWindow.xaml b/DiskGazer/Views/MainWindow.xaml
index d1bf79c..4bd7a25 100644
--- a/DiskGazer/Views/MainWindow.xaml
+++ b/DiskGazer/Views/MainWindow.xaml
@@ -7,7 +7,7 @@
xmlns:controls="clr-namespace:DiskGazer.Views.Controls"
xmlns:converters="clr-namespace:DiskGazer.Views.Converters"
x:Name="MainWindowRoot"
- Title="{Binding Source={x:Static views:ProductInfo.NameVersionMiddle}, Mode=OneWay}"
+ Title="{Binding Source={x:Static views:ProductInfo.NameVersionShort}, Mode=OneWay}"
FontFamily="Verdana" FontSize="11"
Width="600" Height="460"
Icon="/DiskGazer;component/Resources/Gazer.ico"
diff --git a/README.md b/README.md
index 322ec26..782894a 100644
--- a/README.md
+++ b/README.md
@@ -5,8 +5,8 @@ Disk Gazer is a benchmark tool specialized for measuring transfer rate of physic
##Requirements
- * Windows 8 or newer
- * Windows 7 (required to install .NET Framework 4.5)
+ * Windows 7 or newer
+ * .NET Framework 4.5.2
##Development
@@ -16,6 +16,10 @@ The logic for sequential read test is based on that of [CrystalDiskMark][1] (3.0
##History
+Ver 1.1.0 2015-8-22
+
+ - Changed target framework to 4.5.2
+
Ver 1.0.1 2015-6-14
- Fixed possible exception