Merge pull request #127 from d2phap/develop

v3.5 Development

.gitignore

@@ -155,3 +155,6 @@ $RECYCLE.BIN/
 # Mac desktop service store files
 .DS_Store
 *.cache
+*.cache
+*.cache
+Source/ImageGlass/obj/Debug/DesignTimeResolveAssemblyReferences.cache

Source/Components/ImageGlass.Core/ImageGlass.Core.csproj

@@ -82,11 +82,13 @@
  <HintPath>..\..\packages\IconLib.Unofficial.0.73.0\lib\net20\IconLib.dll</HintPath>
  <Private>True</Private>
  </Reference>
- <Reference Include="Imazen.WebP">
+ <Reference Include="Imazen.WebP, Version=9.0.1.0, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
  <HintPath>..\..\ImageGlass\Imazen.WebP.dll</HintPath>
  </Reference>
- <Reference Include="Svg">
- <HintPath>..\..\ImageGlass\Svg.dll</HintPath>
+ <Reference Include="Svg, Version=2.2.1.1459, Culture=neutral, PublicKeyToken=12a0bac221edeae2, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\Svg.2.2.1\lib\net35\Svg.dll</HintPath>
+ <Private>True</Private>
  </Reference>
  <Reference Include="System" />
  <Reference Include="System.Data" />

Source/Components/ImageGlass.Core/InputBox.cs

@@ -1,6 +1,6 @@
 /*
 ImageGlass Project - Image viewer for Windows
-Copyright (C) 2014 DUONG DIEU PHAP
+Copyright (C) 2016 DUONG DIEU PHAP
 Project homepage: http://imageglass.org
 
 This program is free software: you can redistribute it and/or modify
@@ -26,17 +26,7 @@ namespace ImageGlass.Core
 {
  public class InputBox
  {
- private static bool _isNumberOnly = false;
- private static string _message = "";
-
- /// <summary>
- /// Get, set input style
- /// </summary>
- public static bool IsNumberOnly
- {
- get { return _isNumberOnly; }
- set { _isNumberOnly = value; }
- }
+ private static string _message = string.Empty;
 
  /// <summary>
  /// Get, set the message user inputs
@@ -55,41 +45,41 @@ public static string Message
  /// <returns></returns>
  public static DialogResult ShowDiaLog(string title, string message)
  {
- frmDialogBox f = new frmDialogBox(title, message);
- f.Title = title;
- f.IsNumberOnly = false;
- f.ShowDialog();
-
- //Lưu nội dung vừa nhập
- InputBox.Message = f.Content;
-
- return f.DialogResult;
+ return InputBox.ShowDiaLog(title, message, string.Empty, false);
  }
 
+ /// <summary>
+ /// Show input dialog box
+ /// </summary>
+ /// <param name="title">Title</param>
+ /// <param name="message">Message</param>
+ /// <param name="defaultValue">Default value</param>
+ /// <returns></returns>
  public static DialogResult ShowDiaLog(string title, string message, string defaultValue)
  {
- frmDialogBox f = new frmDialogBox(title, message);
- f.Title = title;
- f.IsNumberOnly = false;
- f.Content = defaultValue;
- f.ShowDialog();
-
- //Lưu nội dung vừa nhập
- InputBox.Message = f.Content;
-
- return f.DialogResult;
+ return InputBox.ShowDiaLog(title, message, defaultValue, false);
  }
 
+ /// <summary>
+ /// Show input dialog box
+ /// </summary>
+ /// <param name="title">Title</param>
+ /// <param name="message">Message</param>
+ /// <param name="defaultValue">Default value</param>
+ /// <param name="isNumberOnly">Number input</param>
+ /// <returns></returns>
  public static DialogResult ShowDiaLog(string title, string message, string defaultValue, bool isNumberOnly)
  {
  frmDialogBox f = new frmDialogBox(title, message);
  f.Title = title;
  f.IsNumberOnly = isNumberOnly;
  f.Content = defaultValue;
- f.ShowDialog();
 
- //Lưu nội dung vừa nhập
- InputBox.Message = f.Content;
+ if (f.ShowDialog() == DialogResult.OK)
+ {
+ //Save input data
+ InputBox.Message = f.Content;
+ }
 
  return f.DialogResult;
  }

Source/Components/ImageGlass.Core/frmDialogBox.cs

@@ -1,9 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
 
 namespace ImageGlass.Core
@@ -22,7 +17,7 @@ public string Title
  set
  {
  _title = value;
- this.Text = _title;
+ Text = _title;
  }
  }
 
@@ -57,28 +52,28 @@ public frmDialogBox()
  {
  InitializeComponent();
 
- this.Title = "";
- this.Message = "";
- this.IsNumberOnly = false;
+ Title = "";
+ Message = "";
+ IsNumberOnly = false;
 
- this.Text = _title;
+ Text = _title;
  lblMessage.Text = _message;
  }
 
  public frmDialogBox(string title, string message)
  {
  InitializeComponent();
 
- this.Title = title;
- this.Message = message;
- this.IsNumberOnly = false;
+ Title = title;
+ Message = message;
+ IsNumberOnly = false;
 
- this.Text = _title;
+ Text = _title;
  lblMessage.Text = _message;
  }
 
  /// <summary>
- /// Di chuyển form 
+ /// Moving form 
  /// </summary>
  /// <param name="m"></param>
  protected override void WndProc(ref Message m)
@@ -97,24 +92,24 @@ protected override void WndProc(ref Message m)
 
  private void lblClose_Click(object sender, EventArgs e)
  {
- this.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+ DialogResult = DialogResult.Cancel;
  }
 
  private void btnOK_Click(object sender, EventArgs e)
  {
- this.DialogResult = System.Windows.Forms.DialogResult.OK;
+ DialogResult = DialogResult.OK;
  }
 
  private void txtValue_KeyPress(object sender, KeyPressEventArgs e)
  {
- if (this.IsNumberOnly)
+ if (IsNumberOnly)
  {
  if (char.IsDigit(e.KeyChar) || e.KeyChar == (char)8 || e.KeyChar == (char)9 ||
  e.KeyChar == (char)46 || e.KeyChar == (char)37 || e.KeyChar == (char)39)
  { }
  else
  {
- //Không cho nhập
+ //Prevent input char
  e.Handled = true;
  }
  }
@@ -125,12 +120,18 @@ private void DialogBox_Load(object sender, EventArgs e)
  txtValue.Focus();
  }
 
+ protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
+ {
+ // disable parent form shotcuts
+ return false;
+ }
+
  private void frmDialogBox_KeyDown(object sender, KeyEventArgs e)
  {
  //close dialog
  if (e.KeyCode == Keys.Escape && !e.Control && !e.Shift && !e.Alt)
  {
- this.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+ DialogResult = DialogResult.Cancel;
  }
  }
  }

Source/Components/ImageGlass.Core/frmDialogBox.resx

@@ -112,9 +112,9 @@
  <value>2.0</value>
  </resheader>
  <resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
 </root>

Source/Components/ImageGlass.Core/packages.config

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
  <package id="IconLib.Unofficial" version="0.73.0" targetFramework="net40" />
+ <package id="Svg" version="2.2.1" targetFramework="net40" />
  <package id="System.Drawing.PSD" version="0.1.0" targetFramework="net40" />
 </packages>

Source/Components/ImageGlass.FileList/ImageGlass.FileListItem.cs

@@ -110,25 +110,25 @@ public Bitmap ImgAvatar
  private void FileListItem_MouseLeave(object sender, EventArgs e)
  {
  _mouseEvent = 4;
- this.Invalidate();
+ Invalidate();
  }
 
  private void FileListItem_MouseDown(object sender, MouseEventArgs e)
  {
  _mouseEvent = 2;
- this.Invalidate();
+ Invalidate();
  }
 
  private void FileListItem_MouseUp(object sender, MouseEventArgs e)
  {
  _mouseEvent = 3;
- this.Invalidate();
+ Invalidate();
  }
 
  private void FileListItem_MouseEnter(object sender, EventArgs e)
  {
- _mouseEvent = 1; 
- this.Invalidate();
+ _mouseEvent = 1;
+ Invalidate();
  }
  #endregion
 
@@ -194,7 +194,7 @@ private void FileListItem_Load(object sender, EventArgs e)
  str = _title + " - version: " + _currenVersion + "\r\n" + _path;
  }
 
- this.tip1.SetToolTip(this, str);
+ tip1.SetToolTip(this, str);
  }