mirror of
https://github.com/greenshot/greenshot
synced 2025-08-20 21:43:24 -07:00
Merge remote-tracking branch 'remotes/origin/master' into release/1.2.9
This commit is contained in:
commit
0323705513
276 changed files with 5382 additions and 3666 deletions
|
@ -18,7 +18,6 @@
|
|||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
using System;
|
||||
|
||||
namespace GreenshotBoxPlugin {
|
||||
/// <summary>
|
||||
|
|
|
@ -22,12 +22,9 @@ using System.ComponentModel;
|
|||
using System.Drawing;
|
||||
using Greenshot.Plugin;
|
||||
using GreenshotPlugin.Core;
|
||||
using log4net;
|
||||
|
||||
namespace GreenshotBoxPlugin {
|
||||
public class BoxDestination : AbstractDestination {
|
||||
private static ILog LOG = LogManager.GetLogger(typeof(BoxDestination));
|
||||
|
||||
private readonly BoxPlugin _plugin;
|
||||
public BoxDestination(BoxPlugin plugin) {
|
||||
_plugin = plugin;
|
||||
|
|
|
@ -18,20 +18,14 @@
|
|||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
using System;
|
||||
using System.Drawing;
|
||||
using System.Windows.Forms;
|
||||
|
||||
using GreenshotBoxPlugin.Forms;
|
||||
using GreenshotPlugin.Core;
|
||||
|
||||
namespace GreenshotBoxPlugin {
|
||||
/// <summary>
|
||||
/// Description of PasswordRequestForm.
|
||||
/// </summary>
|
||||
public partial class SettingsForm : BoxForm {
|
||||
string boxTicket = string.Empty;
|
||||
|
||||
public SettingsForm(BoxConfiguration config) {
|
||||
//
|
||||
// The InitializeComponent() call is required for Windows Forms designer support.
|
||||
|
|
|
@ -22,7 +22,6 @@
|
|||
using Greenshot.Plugin;
|
||||
using System.Reflection;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Security;
|
||||
|
||||
// General Information about an assembly is controlled through the following
|
||||
// set of attributes. Change these attribute values to modify the information
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue