Easy Watermark - Version 0.2.1

Version Description

some changes on settings page

Release Info

Developer	szaleq
Plugin	Easy Watermark
Version	0.2.1
Comparing to
See all releases

Code changes from version 0.2 to 0.2.1

Files changed (19) hide show

EasyWatermark.php +0 -2
EasyWatermarkPlugin.php +127 -50
EasyWatermarkSettings.php +87 -6
css/style.css +64 -0
images/alignment-background-dk.jpg +0 -0
images/alignment-background-lt.jpg +0 -0
images/alignment-background.jpg +0 -0
index.php +2 -3
js/interface.js +19 -4
languages/easy-watermark-pl_PL.mo +0 -0
languages/easy-watermark-pl_PL.po +94 -65
languages/easy-watermark.pot +85 -63
plugin.php +14 -5
readme.txt +7 -5
screenshot-1.png +0 -0
screenshot-2.png +0 -0
screenshot-3.png +0 -0
settings-form-image.php +21 -17
settings-form-text.php +24 -1

EasyWatermark.php CHANGED Viewed

	@@ -34,8 +34,6 @@
34	* - watermark scaling
35	* Any other ideas, pleas contact me.
36	*/
37	- namespace szaleq\Plugins\EasyWatermark;
38	- /* Namespace is only needed for WP plugin, can be removed or changed if using this class separately. */
39
40	class EasyWatermark
41	{


34	* - watermark scaling
35	* Any other ideas, pleas contact me.
36	*/


37
38	class EasyWatermark
39	{

EasyWatermarkPlugin.php CHANGED Viewed

@@ -3,12 +3,11 @@
              * This file is a part of EasyWatermark Wordpress plugin.
              * @see readme.txt
              */
-            -
            namespace szaleq\Plugins\EasyWatermark;
             /**
              * Main plugin class
              */
-            -
            class Plugin extends Core
+            {
             	/**
             	 * @var string  plugin name
@@ -23,7 +22,12 @@ class Plugin extends Core
             	/**
             	 * @var string  plugin version
             	 */
-            -
            	protected static $version = '0.2';
             	private $settings;
@@ -39,11 +43,14 @@ class Plugin extends Core
             	 */
             	public function __construct(){
-            -
            		$this->add_action('admin_menu', 'add_media_page')
             			->add_filter('media_row_actions', 'add_media_row_action', 10, 3)
             			->add_filter('attachment_fields_to_edit', 'add_attachment_field', 10, 2)
             			->add_action('add_attachment', 'add_watermark_after_upload');
             		new EasyWatermarkSettings($this);
+            	}
@@ -132,8 +139,8 @@ class Plugin extends Core
             		return $metadata;
+            	}
-            -
            	private function add_watermark($id){
-            -
            		if($this->settings['image']['watermark_path'] != '' || $this->settings['text']['text'] == null){
             			$post = get_post($id);
             			$filepath = get_attached_file($id);
@@ -141,6 +148,9 @@ class Plugin extends Core
             				$this->add_error('Invalid mime type.');
             				return false;
+            			}
             			return $this->create_watermark($filepath, $post->post_mime_type);
+            		}
@@ -282,58 +292,125 @@ class Plugin extends Core
+            	}
             	public static function upgrade($version){
-            -
            		$oldSettings = get_option(static::$pluginSlug.'-settings');
-            -
            		$defaults = EasyWatermarkSettings::getDefaults();
-            -
-            -
            		$imgTypes = array();
-            -
            		foreach($oldSettings['image_types'] as $type){
-            -
            			$imgTypes[] = $type;
+            		}
-            -
            		$general = array(
-            -
            			'auto_add' => $oldSettings['auto_add'],
-            -
            			'image_types' => $imgTypes
-            -
            		);
-            -
-            -
            		switch($version){
-            -
            			case '0.1.1':
-            -
            				$image = array(
-            -
            					'watermark_url' => $oldSettings['image']['url'],
-            -
            					'watermark_id' => $oldSettings['image']['id'],
-            -
            					'watermark_path' => $oldSettings['image']['path'],
-            -
            					'watermark_mime' => $oldSettings['image']['mime'],
-            -
            					'position_x' => $oldSettings['image']['position_x'],
-            -
            					'position_y' => $oldSettings['image']['position_y'],
-            -
            					'offset_x' => $oldSettings['image']['offset_x'],
-            -
            					'offset_y' => $oldSettings['image']['offset_y'],
-            -
            					'opacity' => $oldSettings['image']['opacity']
-            -
            				);
-            -
            				break;
-            -
            			default:
-            -
            				$image = array(
-            -
            					'watermark_url' => $oldSettings['image']['url'],
-            -
            					'watermark_id' => $oldSettings['image']['id'],
-            -
            					'watermark_path' => $oldSettings['image']['path'],
-            -
            					'watermark_mime' => $oldSettings['image']['mime'],
-            -
            					'position_x' => $oldSettings['image']['position-horizontal'],
-            -
            					'position_y' => $oldSettings['image']['position-vert'],
-            -
            					'offset_x' => $oldSettings['image']['offset-horizontal'],
-            -
            					'offset_y' => $oldSettings['image']['offset-vert'],
-            -
            					'opacity' => $oldSettings['image']['alpha']
-            -
            				);
-            -
            				break;
+            		}
-            -
            		$settings = array(
-            -
            			'general' => array_merge($defaults['general'], $general),
-            -
            			'image' => array_merge($defaults['image'], $image),
-            -
            			'text' => $defaults['text']
-            -
            		);
-            -
            		delete_option(static::$pluginSlug.'-settings');
             		static::install($settings);
+            	}
             	private function add_error($msg){
             		$this->messages[] = array('error', $msg);
+            	}


3	* This file is a part of EasyWatermark Wordpress plugin.
4	* @see readme.txt
5	*/

6
7	/**
8	* Main plugin class
9	*/
10	+ class EasyWatermarkPlugin extends ewPluginCore
11	{
12	/**
13	* @var string plugin name

22	/**
23	* @var string plugin version
24	*/
25	+ protected static $version = '0.2.1';
26	+
27	+ /**
28	+ * @var string plugin class name
29	+ */
30	+ protected static $className = 'EasyWatermarkPlugin';
31
32	private $settings;
33

43	*/
44	public function __construct(){
45
46	+ $this->add_action('init', 'plugin_init')
47	+ ->add_action('admin_menu', 'add_media_page')
48	->add_filter('media_row_actions', 'add_media_row_action', 10, 3)
49	->add_filter('attachment_fields_to_edit', 'add_attachment_field', 10, 2)
50	->add_action('add_attachment', 'add_watermark_after_upload');
51	+ }
52
53	+ public function plugin_init(){
54	new EasyWatermarkSettings($this);
55	}
56

139	return $metadata;
140	}
141
142	+ private function add_watermark($id, $checkMime = false){
143	+ if($this->settings['image']['watermark_path'] != '' \|\| $this->settings['text']['text'] != null){
144	$post = get_post($id);
145	$filepath = get_attached_file($id);
146

148	$this->add_error('Invalid mime type.');
149	return false;
150	}
151	+ if($checkMime && !in_array($post->post_mime_type, $this->settings['general']['image_types'])){
152	+ return false;
153	+ }
154
155	return $this->create_watermark($filepath, $post->post_mime_type);
156	}

292	}
293
294	public static function upgrade($version){
295	+ if($version == '0.2'){
296	+ $settings['image'] = get_option(static::$pluginSlug.'-settings-image');
297	+ $settings['text'] = get_option(static::$pluginSlug.'-settings-text');



298	}
299	+ else {
300	+ $oldSettings = get_option(static::$pluginSlug.'-settings');
301	+ $defaults = EasyWatermarkSettings::getDefaults();
302
303	+ $imgTypes = array();
304	+ foreach($oldSettings['image_types'] as $type){
305	+ $imgTypes[] = $type;
306	+ }
307	+
308	+ $general = array(
309	+ 'auto_add' => $oldSettings['auto_add'],
310	+ 'image_types' => $imgTypes
311	+ );
312	+
313	+ switch($version){
314	+ case '0.1.1':
315	+ $image = array(
316	+ 'watermark_url' => $oldSettings['image']['url'],
317	+ 'watermark_id' => $oldSettings['image']['id'],
318	+ 'watermark_path' => $oldSettings['image']['path'],
319	+ 'watermark_mime' => $oldSettings['image']['mime'],
320	+ 'position_x' => $oldSettings['image']['position_x'],
321	+ 'position_y' => $oldSettings['image']['position_y'],
322	+ 'offset_x' => $oldSettings['image']['offset_x'],
323	+ 'offset_y' => $oldSettings['image']['offset_y'],
324	+ 'opacity' => $oldSettings['image']['opacity']
325	+ );
326	+ break;
327	+ default:
328	+ $image = array(
329	+ 'watermark_url' => $oldSettings['image']['url'],
330	+ 'watermark_id' => $oldSettings['image']['id'],
331	+ 'watermark_path' => $oldSettings['image']['path'],
332	+ 'watermark_mime' => $oldSettings['image']['mime'],
333	+ 'position_x' => $oldSettings['image']['position-horizontal'],
334	+ 'position_y' => $oldSettings['image']['position-vert'],
335	+ 'offset_x' => $oldSettings['image']['offset-horizontal'],
336	+ 'offset_y' => $oldSettings['image']['offset-vert'],
337	+ 'opacity' => $oldSettings['image']['alpha']
338	+ );
339	+ break;
340	+ }
341	+
342	+ $settings = array(
343	+ 'general' => array_merge($defaults['general'], $general),
344	+ 'image' => array_merge($defaults['image'], $image),
345	+ 'text' => $defaults['text']
346	+ );
347	+ delete_option(static::$pluginSlug.'-settings');
348	}
349
350	+ $settings['image']['alignment'] = static::getAlignment($settings['image']['position_x'], $settings['image']['position_y']);
351	+ $settings['text']['alignment'] = static::getAlignment($settings['text']['position_x'], $settings['text']['position_y']);



352

353	static::install($settings);
354	}
355
356	+ private static function getAlignment($x, $y){
357	+ $a = false;
358	+ switch($y){
359	+ case 'top':
360	+ switch($x){
361	+ case 'lft':
362	+ case 'left':
363	+ $a = 1;
364	+ break;
365	+ case 'ctr':
366	+ case 'center':
367	+ $a = 2;
368	+ break;
369	+ case 'rgt':
370	+ case 'right':
371	+ $a = 3;
372	+ break;
373	+ }
374	+ break;
375	+ case 'mdl':
376	+ case 'middle':
377	+ switch($x){
378	+ case 'lft':
379	+ case 'left':
380	+ $a = 4;
381	+ break;
382	+ case 'ctr':
383	+ case 'center':
384	+ $a = 5;
385	+ break;
386	+ case 'rgt':
387	+ case 'right':
388	+ $a = 6;
389	+ break;
390	+ }
391	+ break;
392	+ case 'btm':
393	+ case 'bottom':
394	+ switch($x){
395	+ case 'lft':
396	+ case 'left':
397	+ $a = 7;
398	+ break;
399	+ case 'ctr':
400	+ case 'center':
401	+ $a = 8;
402	+ break;
403	+ case 'rgt':
404	+ case 'right':
405	+ $a = 9;
406	+ break;
407	+ }
408	+ break;
409	+ }
410	+
411	+ return $a;
412	+ }
413	+
414	private function add_error($msg){
415	$this->messages[] = array('error', $msg);
416	}

EasyWatermarkSettings.php CHANGED Viewed

@@ -1,5 +1,4 @@
             <?php
-            -
            namespace szaleq\Plugins\EasyWatermark;
             class EasyWatermarkSettings
+            {
@@ -9,7 +8,7 @@ class EasyWatermarkSettings
             	private static $defaults = array(
             		'general' => array(
-            -
            			'auto_add' => true,
             			'image_types' => array('jpeg', 'png', 'gif'),
             			'watermark_type' => 3
             		),
@@ -18,15 +17,17 @@ class EasyWatermarkSettings
             			'watermark_id' => null,
             			'watermark_path' => null,
             			'watermark_mime' => null,
-            -
            			'position_x' => 'ctr',
-            -
            			'position_y' => 'mdl',
             			'offset_x' => 100,
             			'offset_y' => 100,
             			'opacity' => 100
             		),
             		'text' => array(
-            -
            			'position_x' => 'ctr',
-            -
            			'position_y' => 'mdl',
             			'offset_x' => 0,
             			'offset_y' => 0,
             			'opacity' => 60,
@@ -130,10 +131,90 @@ class EasyWatermarkSettings
             			$input['watermark_path'] = get_attached_file($input['watermark_id']);
+            		}
             		return $input;
+            	}
             	public function sanitize_settings_text($input){
             		return $input;
+            	}


1	<?php

2
3	class EasyWatermarkSettings
4	{

8
9	private static $defaults = array(
10	'general' => array(
11	+ 'auto_add' => '1',
12	'image_types' => array('jpeg', 'png', 'gif'),
13	'watermark_type' => 3
14	),

17	'watermark_id' => null,
18	'watermark_path' => null,
19	'watermark_mime' => null,
20	+ 'position_x' => 'center',
21	+ 'position_y' => 'middle',
22	+ 'alignment' => 5,
23	'offset_x' => 100,
24	'offset_y' => 100,
25	'opacity' => 100
26	),
27	'text' => array(
28	+ 'position_x' => 'center',
29	+ 'position_y' => 'middle',
30	+ 'alignment' => 5,
31	'offset_x' => 0,
32	'offset_y' => 0,
33	'opacity' => 60,

131
132	$input['watermark_path'] = get_attached_file($input['watermark_id']);
133	}
134	+
135	+ switch($input['alignment']){
136	+ case '1':
137	+ $input['position_x'] = 'left';
138	+ $input['position_y'] = 'top';
139	+ break;
140	+ case '2':
141	+ $input['position_x'] = 'center';
142	+ $input['position_y'] = 'top';
143	+ break;
144	+ case '3':
145	+ $input['position_x'] = 'right';
146	+ $input['position_y'] = 'top';
147	+ break;
148	+ case '4':
149	+ $input['position_x'] = 'left';
150	+ $input['position_y'] = 'middle';
151	+ break;
152	+ case '5':
153	+ $input['position_x'] = 'center';
154	+ $input['position_y'] = 'middle';
155	+ break;
156	+ case '6':
157	+ $input['position_x'] = 'right';
158	+ $input['position_y'] = 'middle';
159	+ break;
160	+ case '7':
161	+ $input['position_x'] = 'left';
162	+ $input['position_y'] = 'bottom';
163	+ break;
164	+ case '8':
165	+ $input['position_x'] = 'center';
166	+ $input['position_y'] = 'bottom';
167	+ break;
168	+ case '9':
169	+ $input['position_x'] = 'right';
170	+ $input['position_y'] = 'bottom';
171	+ break;
172	+ }
173	+
174	return $input;
175	}
176
177	public function sanitize_settings_text($input){
178	+
179	+ switch($input['alignment']){
180	+ case '1':
181	+ $input['position_x'] = 'left';
182	+ $input['position_y'] = 'top';
183	+ break;
184	+ case '2':
185	+ $input['position_x'] = 'center';
186	+ $input['position_y'] = 'top';
187	+ break;
188	+ case '3':
189	+ $input['position_x'] = 'right';
190	+ $input['position_y'] = 'top';
191	+ break;
192	+ case '4':
193	+ $input['position_x'] = 'left';
194	+ $input['position_y'] = 'middle';
195	+ break;
196	+ case '5':
197	+ $input['position_x'] = 'center';
198	+ $input['position_y'] = 'middle';
199	+ break;
200	+ case '6':
201	+ $input['position_x'] = 'right';
202	+ $input['position_y'] = 'middle';
203	+ break;
204	+ case '7':
205	+ $input['position_x'] = 'left';
206	+ $input['position_y'] = 'bottom';
207	+ break;
208	+ case '8':
209	+ $input['position_x'] = 'center';
210	+ $input['position_y'] = 'bottom';
211	+ break;
212	+ case '9':
213	+ $input['position_x'] = 'right';
214	+ $input['position_y'] = 'bottom';
215	+ break;
216	+ }
217	+
218	return $input;
219	}
220

css/style.css CHANGED Viewed

@@ -14,3 +14,67 @@
             	position:absolute;
             	background:url(../images/select2.png) 50% 50%;
+            }


14	position:absolute;
15	background:url(../images/select2.png) 50% 50%;
16	}
17	+
18	+ #alignmentbox {
19	+ width:243px;
20	+ height:183px;
21	+ padding:3px 0 0 3px;
22	+ background:#ddd;
23	+ }
24	+
25	+ #alignmentbox label {
26	+ display:block;
27	+ float:left;
28	+ width:78px;
29	+ height:58px;
30	+ margin:0 3px 3px 0;
31	+ line-height:58px;
32	+ text-align:center;
33	+ background-image: url(../images/alignment-background-lt.jpg);
34	+ background-repeat: no-repeat;
35	+ }
36	+
37	+ #alignmentbox label.current,
38	+ #alignmentbox label.current:hover {
39	+ background-image: url(../images/alignment-background.jpg);
40	+ }
41	+
42	+ #alignmentbox label:hover {
43	+ background-image: url(../images/alignment-background-dk.jpg);
44	+ }
45	+
46	+ label#alignment-1-label {
47	+ background-position: left top;
48	+ }
49	+
50	+ label#alignment-2-label {
51	+ background-position: -81px 0;
52	+ }
53	+
54	+ label#alignment-3-label {
55	+ background-position: -162px 0;
56	+ }
57	+
58	+ label#alignment-4-label {
59	+ background-position: 0 -61px;
60	+ }
61	+
62	+ label#alignment-5-label {
63	+ background-position: -81px -61px;
64	+ }
65	+
66	+ label#alignment-6-label {
67	+ background-position: -162px -61px;
68	+ }
69	+
70	+ label#alignment-7-label {
71	+ background-position: 0 -122px;
72	+ }
73	+
74	+ label#alignment-8-label {
75	+ background-position: -81px -122px;
76	+ }
77	+
78	+ label#alignment-9-label {
79	+ background-position: -162px -122px;
80	+ }

images/alignment-background-dk.jpg ADDED Viewed

Binary file

images/alignment-background-lt.jpg ADDED Viewed

Binary file

images/alignment-background.jpg ADDED Viewed

Binary file

index.php CHANGED Viewed

	@@ -2,13 +2,12 @@
2	/*
3	Plugin Name: Easy Watermark
4	Description: This plugin can automatically add image and text watermark to pictures as they are uploaded to wordpress media library. You can also watermark existing images manually (all at once or an every single image). Watermark image can be a png, gif (alpha channel supported in both cases) or jpg. It's also possibile to set watermark opacity (doesn't apply to png with alpha channel). For text watermark you can select font, set color, size, angel and opacity.
5	- Version: 0.2
6	Author: Wojtek Szałkiewicz
7	Author URI: http://szalkiewicz.pl/
8	License: GPLv2 or later
9	License URI: http://www.gnu.org/licenses/gpl-2.0.html
10	*/
11	- namespace szaleq\Plugins;
12
13	require_once dirname(__FILE__) . '/plugin.php';
14	require_once dirname(__FILE__) . '/EasyWatermark.php';
	@@ -17,4 +16,4 @@ require_once dirname(__FILE__) . '/EasyWatermarkSettings.php';
17
18	if(is_admin())
19	// init plugin only in admin panel
20	- ~~EasyWatermark\Plugin~~::init();


2	/*
3	Plugin Name: Easy Watermark
4	Description: This plugin can automatically add image and text watermark to pictures as they are uploaded to wordpress media library. You can also watermark existing images manually (all at once or an every single image). Watermark image can be a png, gif (alpha channel supported in both cases) or jpg. It's also possibile to set watermark opacity (doesn't apply to png with alpha channel). For text watermark you can select font, set color, size, angel and opacity.
5	+ Version: 0.2.1
6	Author: Wojtek Szałkiewicz
7	Author URI: http://szalkiewicz.pl/
8	License: GPLv2 or later
9	License URI: http://www.gnu.org/licenses/gpl-2.0.html
10	*/

11
12	require_once dirname(__FILE__) . '/plugin.php';
13	require_once dirname(__FILE__) . '/EasyWatermark.php';

16
17	if(is_admin())
18	// init plugin only in admin panel
19	+ EasyWatermarkPlugin::init();

js/interface.js CHANGED Viewed

@@ -19,13 +19,28 @@
             		$('#easy-watermark-settings-form').submit();
             	});
-            -
            	$('#colorselector').ColorPicker({
             		onSubmit: function(hsb, hex, rgb, el){
-            -
            			$('#easy-watermark-color').val(hex);
-            -
            			$('#colorselector div').css('backgroundColor', '#' + hex);
             		},
             		onBeforeShow: function () {
-            -
            			$(this).ColorPickerSetColor($(this).attr('data-color'));
+            		}
             	});
             }(jQuery))


19	$('#easy-watermark-settings-form').submit();
20	});
21
22	+ var picker = $('#colorselector');
23	+ var input = $('#easy-watermark-color')
24	+
25	+ picker.ColorPicker({
26	onSubmit: function(hsb, hex, rgb, el){
27	+ picker.children('div').css('backgroundColor', '#' + hex);
28	+ input.val(hex);
29	},
30	onBeforeShow: function () {
31	+ $(this).ColorPickerSetColor(input.val());
32	+ }
33	+ });
34	+
35	+ $('#alignmentbox input').css('visibility', 'hidden');
36	+ $('#alignmentbox input:checked').each(function(){
37	+ $(this).parent().addClass('current');
38	+ });
39	+
40	+ $('#alignmentbox :radio').click(function(){
41	+ if($(this).is(":checked")){
42	+ $('#alignmentbox label').removeClass('current');
43	+ $(this).parent().addClass('current');
44	}
45	});
46	}(jQuery))

languages/easy-watermark-pl_PL.mo CHANGED Viewed

Binary file

languages/easy-watermark-pl_PL.po CHANGED Viewed

	@@ -1,68 +1,72 @@
1	msgid ""
2	msgstr ""
3	- "Project-Id-Version: Easy Watermark 0.2\n"
4	"Report-Msgid-Bugs-To: \n"
5	- "POT-Creation-Date: 2013-03-29 22:55+0100\n"
6	- "PO-Revision-Date: 2013-03-29 23:05+0100\n"
7	"Last-Translator: Wojtek Szałkiewicz <wojtek@szalkiewicz.pl>\n"
8	"Language-Team: Wojtek Szałkiewicz <wojtek@szalkiewicz.pl>\n"
9	"Language: Polish\n"
10	"MIME-Version: 1.0\n"
11	"Content-Type: text/plain; charset=UTF-8\n"
12	"Content-Transfer-Encoding: 8bit\n"




13
14	- #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:71
15	- #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:87
16	msgid "Add watermark"
17	msgstr "Dodaj znak wodny"
18
19	- #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:~~168~~
20	#, php-format
21	msgid "Not supported mime type of %s. Skipping..."
22	msgstr "Nieobsługiwany typ pliku %s. Omijanie..."
23
24	- #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:~~173~~
25	#, php-format
26	msgid "Watermark successfully added to %s"
27	msgstr "Znak wodny dodany do %s"
28
29	- #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:~~224~~
30	- #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkSettings.php:84
31	msgid "Easy Watermark"
32	msgstr ""
33
34	- #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:~~231~~
35	- #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:~~249~~
36	msgid "Watermark successfully added."
37	msgstr "Znak wodny został dodany."
38
39	- #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:~~231~~
40	- #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:~~240~~
41	msgid "Go back"
42	msgstr "Wróć"
43
44	- #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:~~231~~
45	msgid "or"
46	msgstr "lub"
47
48	- #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:~~231~~
49	- #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:~~240~~
50	msgid "go to edit page"
51	msgstr "idź na stronę edycji"
52
53	- #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:~~249~~
54	msgid "Go to Media Library"
55	msgstr "Idź do biblioteki mediów"
56
57	- #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:~~258~~
58	msgid "Add watermark to all images"
59	msgstr "Dodaj znak wodny do wszystkich obrazów"
60
61	- #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:~~258~~
62	msgid "Be carefull with that option. If some images alredy has watermark, it will be added though."
63	msgstr "Bądź ostrożny używając tej opcji. Jeśli któreś zdjęcia posiadają już znak wodny, zostanie on dodany po raz drugi."
64
65	- #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkSettings.php:~~170~~
66	msgid "Settings"
67	msgstr "Ustawienia"
68
	@@ -119,6 +123,10 @@ msgstr "Ustaw jako znak wodny"
119	msgid "Select/Upload Image"
120	msgstr "Wybierz/wgraj obraz"
121




122	#: /media/szaleq/Data/easy-watermark/trunk/settings-form-image.php:17
123	msgid "Loading preview..."
124	msgstr "Ładowanie podglądu..."
	@@ -132,89 +140,103 @@ msgid "Remove image"
132	msgstr "Usuń obraz"
133
134	#: /media/szaleq/Data/easy-watermark/trunk/settings-form-image.php:19
135	- msgid "Note: if \"Auto watermark\" option is ~~ticked~~, ~~untick~~ it ~~before~~ ~~uploading~~ ~~new~~ watermark ~~image~~ or ~~remove~~ ~~current~~ image ~~first~~."
136	- msgstr "Uwaga: Jeśli opcja \"~~Automatycznie~~ dodawanie\" jest ~~zaznaczona~~, ~~odznacz~~ ją ~~przed~~ ~~wgrywaniem~~ ~~nowego~~ ~~znaku~~ ~~wodnego~~ ~~lub~~ ~~usuń~~ ~~najpierw~~ ~~bieżący~~ ~~znak~~ ~~wodny~~."




137
138	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-image.php:23
139	- msgid "Image ~~position~~"
140	- msgstr "~~Pozycja~~ obrazu"
















141
142	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-image.php:24
143	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:7




















144	msgid "vertical"
145	msgstr "pionowa"
146
147	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-~~image~~.php:25
148	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:8
149	msgid "top"
150	msgstr "góra"
151
152	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-~~image~~.php:26
153	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:9
154	msgid "middle"
155	msgstr "środek"
156
157	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-~~image~~.php:27
158	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:10
159	msgid "bottom"
160	msgstr "dół"
161
162	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-~~image~~.php:28
163	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:11
164	msgid "offset"
165	msgstr ""
166
167	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-~~image~~.php:29
168	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:12
169	msgid "horizontal"
170	msgstr "pozioma"
171
172	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-~~image~~.php:30
173	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:13
174	msgid "left"
175	msgstr "do lewej"
176
177	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-~~image~~.php:31
178	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:14
179	msgid "center"
180	msgstr "wyśrodkowany"
181
182	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-~~image~~.php:32
183	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:15
184	msgid "right"
185	msgstr "do prawej"
186
187	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-~~image~~.php:34
188	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:17
189	- msgid "Offset can be defined in pixels (just numeric value) or as percentage (e.g. '33%')"
190	- msgstr "Offset może być ustawiony w pikselach (po porstu numer) lub procentowo (np. '33%')"
191	-
192	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-image.php:37
193	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:42
194	- msgid "Opacity"
195	- msgstr "Nieprzezroczystość"
196	-
197	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-image.php:37
198	- msgid "Opacity does not affect the png images with opacity chanel."
199	- msgstr "Ta opcja nie dotyczy obrazów png posiadających kanał alfa."
200	-
201	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:6
202	- msgid "Text position"
203	- msgstr "Pozycja tekstu"
204	-
205	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:20
206	msgid "Font"
207	msgstr "Czcionka"
208
209	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:31
210	msgid "Text color"
211	msgstr "Kolor tekstu"
212
213	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:34
214	msgid "Text size"
215	msgstr "Rozmiar tekstu"
216
217	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:38
218	msgid "Text angle"
219	msgstr "Kąt obrotu tekstu"
220
	@@ -230,3 +252,10 @@ msgstr "Przejdź do Easy Watermark"
230	msgid "Save Changes"
231	msgstr "Zapisz zmiany"
232


1	msgid ""
2	msgstr ""
3	+ "Project-Id-Version: Easy Watermark 0.2.1\n"
4	"Report-Msgid-Bugs-To: \n"
5	+ "POT-Creation-Date: 2013-04-02 20:54+0100\n"
6	+ "PO-Revision-Date: 2013-04-02 20:56+0100\n"
7	"Last-Translator: Wojtek Szałkiewicz <wojtek@szalkiewicz.pl>\n"
8	"Language-Team: Wojtek Szałkiewicz <wojtek@szalkiewicz.pl>\n"
9	"Language: Polish\n"
10	"MIME-Version: 1.0\n"
11	"Content-Type: text/plain; charset=UTF-8\n"
12	"Content-Transfer-Encoding: 8bit\n"
13	+ "X-Poedit-Language: Polish\n"
14	+ "X-Poedit-KeywordsList: __;_e\n"
15	+ "X-Poedit-Basepath: .\n"
16	+ "X-Poedit-SearchPath-0: /media/szaleq/Data/easy-watermark/trunk\n"
17
18	+ #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:70
19	+ #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:86
20	msgid "Add watermark"
21	msgstr "Dodaj znak wodny"
22
23	+ #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:170
24	#, php-format
25	msgid "Not supported mime type of %s. Skipping..."
26	msgstr "Nieobsługiwany typ pliku %s. Omijanie..."
27
28	+ #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:175
29	#, php-format
30	msgid "Watermark successfully added to %s"
31	msgstr "Znak wodny dodany do %s"
32
33	+ #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:226
34	+ #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkSettings.php:86
35	msgid "Easy Watermark"
36	msgstr ""
37
38	+ #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:233
39	+ #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:251
40	msgid "Watermark successfully added."
41	msgstr "Znak wodny został dodany."
42
43	+ #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:233
44	+ #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:242
45	msgid "Go back"
46	msgstr "Wróć"
47
48	+ #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:233
49	msgid "or"
50	msgstr "lub"
51
52	+ #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:233
53	+ #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:242
54	msgid "go to edit page"
55	msgstr "idź na stronę edycji"
56
57	+ #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:251
58	msgid "Go to Media Library"
59	msgstr "Idź do biblioteki mediów"
60
61	+ #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:260
62	msgid "Add watermark to all images"
63	msgstr "Dodaj znak wodny do wszystkich obrazów"
64
65	+ #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:260
66	msgid "Be carefull with that option. If some images alredy has watermark, it will be added though."
67	msgstr "Bądź ostrożny używając tej opcji. Jeśli któreś zdjęcia posiadają już znak wodny, zostanie on dodany po raz drugi."
68
69	+ #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkSettings.php:252
70	msgid "Settings"
71	msgstr "Ustawienia"
72

123	msgid "Select/Upload Image"
124	msgstr "Wybierz/wgraj obraz"
125
126	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-image.php:8
127	+ msgid "Note: If you want to upload a new image, make sure that \"Auto watermark\" option is unticked or text watermark is not set. Otherwise uploaded image will be watermarked."
128	+ msgstr "Uwaga: Jeśli chcesz wgrać nowy obraz, upewnij się, że opcja \"Automatyczne dodawanie\" jest odznaczona, tekstowy znak wodny nie jest ustawiony. W przeciwnym wypadku wgrywany obraz zostanie oznaczony znakiem wodnym."
129	+
130	#: /media/szaleq/Data/easy-watermark/trunk/settings-form-image.php:17
131	msgid "Loading preview..."
132	msgstr "Ładowanie podglądu..."

140	msgstr "Usuń obraz"
141
142	#: /media/szaleq/Data/easy-watermark/trunk/settings-form-image.php:19
143	+ msgid "Note: If you want to upload a new image, make sure that \"Auto watermark\" option is unticked, or remove current image and unset text watermark first. Otherwise uploaded image will be watermarked."
144	+ msgstr "Uwaga: Jeśli chcesz wgrać nowy obraz, upewnij się, że opcja \"Automatyczne dodawanie\" jest odznaczona, lub usuń bieżący obraz i zresetuj tekstowy znak wodny. W przeciwnym wypadku wgrywany obraz zostanie oznaczony znakiem wodnym."
145	+
146	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-image.php:22
147	+ msgid "Image alignment"
148	+ msgstr "Wyrównanie obrazu"
149
150	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-image.php:35
151	+ msgid "Image offset"
152	+ msgstr "Offset obrazu"
153	+
154	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-image.php:36
155	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:20
156	+ msgid "x"
157	+ msgstr ""
158	+
159	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-image.php:38
160	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:22
161	+ msgid "y"
162	+ msgstr ""
163	+
164	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-image.php:39
165	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:23
166	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:39
167	+ msgid "Offset can be defined in pixels (just numeric value) or as percentage (e.g. '33%')"
168	+ msgstr "Offset może być ustawiony w pikselach (po porstu numer) lub procentowo (np. '33%')"
169
170	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-image.php:41
171	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:65
172	+ msgid "Opacity"
173	+ msgstr "Nieprzezroczystość"
174	+
175	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-image.php:41
176	+ msgid "Opacity does not affect the png images with opacity chanel."
177	+ msgstr "Ta opcja nie dotyczy obrazów png posiadających kanał alfa."
178	+
179	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:6
180	+ msgid "Text alignment"
181	+ msgstr "Wyrównanie tekstu"
182	+
183	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:19
184	+ msgid "Text offset"
185	+ msgstr "Offset tekstu"
186	+
187	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:28
188	+ msgid "Text position"
189	+ msgstr "Pozycja tekstu"
190	+
191	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:29
192	msgid "vertical"
193	msgstr "pionowa"
194
195	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:30

196	msgid "top"
197	msgstr "góra"
198
199	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:31

200	msgid "middle"
201	msgstr "środek"
202
203	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:32

204	msgid "bottom"
205	msgstr "dół"
206
207	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:33

208	msgid "offset"
209	msgstr ""
210
211	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:34

212	msgid "horizontal"
213	msgstr "pozioma"
214
215	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:35

216	msgid "left"
217	msgstr "do lewej"
218
219	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:36

220	msgid "center"
221	msgstr "wyśrodkowany"
222
223	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:37

224	msgid "right"
225	msgstr "do prawej"
226
227	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:43


















228	msgid "Font"
229	msgstr "Czcionka"
230
231	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:54
232	msgid "Text color"
233	msgstr "Kolor tekstu"
234
235	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:57
236	msgid "Text size"
237	msgstr "Rozmiar tekstu"
238
239	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:61
240	msgid "Text angle"
241	msgstr "Kąt obrotu tekstu"
242

252	msgid "Save Changes"
253	msgstr "Zapisz zmiany"
254
255	+ #~ msgid ""
256	+ #~ "Note: if \"Auto watermark\" option is ticked, untick it before uploading "
257	+ #~ "new watermark image or remove current image first."
258	+ #~ msgstr ""
259	+ #~ "Uwaga: Jeśli opcja \"Automatycznie dodawanie\" jest zaznaczona, odznacz "
260	+ #~ "ją przed wgrywaniem nowego znaku wodnego lub usuń najpierw bieżący znak "
261	+ #~ "wodny."

languages/easy-watermark.pot CHANGED Viewed

	@@ -1,68 +1,72 @@
1	msgid ""
2	msgstr ""
3	- "Project-Id-Version: Easy Watermark 0.2\n"
4	"Report-Msgid-Bugs-To: \n"
5	- "POT-Creation-Date: 2013-03-29 22:55+0100\n"
6	- "PO-Revision-Date: 2013-03-29 22:55+0100\n"
7	"Last-Translator: Wojtek Szałkiewicz <wojtek@szalkiewicz.pl>\n"
8	"Language-Team: Wojtek Szałkiewicz <wojtek@szalkiewicz.pl>\n"
9	"Language: \n"
10	"MIME-Version: 1.0\n"
11	"Content-Type: text/plain; charset=UTF-8\n"
12	"Content-Transfer-Encoding: 8bit\n"




13
14	- #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:71
15	- #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:87
16	msgid "Add watermark"
17	msgstr ""
18
19	- #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:~~168~~
20	#, php-format
21	msgid "Not supported mime type of %s. Skipping..."
22	msgstr ""
23
24	- #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:~~173~~
25	#, php-format
26	msgid "Watermark successfully added to %s"
27	msgstr ""
28
29	- #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:~~224~~
30	- #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkSettings.php:84
31	msgid "Easy Watermark"
32	msgstr ""
33
34	- #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:~~231~~
35	- #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:~~249~~
36	msgid "Watermark successfully added."
37	msgstr ""
38
39	- #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:~~231~~
40	- #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:~~240~~
41	msgid "Go back"
42	msgstr ""
43
44	- #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:~~231~~
45	msgid "or"
46	msgstr ""
47
48	- #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:~~231~~
49	- #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:~~240~~
50	msgid "go to edit page"
51	msgstr ""
52
53	- #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:~~249~~
54	msgid "Go to Media Library"
55	msgstr ""
56
57	- #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:~~258~~
58	msgid "Add watermark to all images"
59	msgstr ""
60
61	- #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:~~258~~
62	msgid "Be carefull with that option. If some images alredy has watermark, it will be added though."
63	msgstr ""
64
65	- #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkSettings.php:~~170~~
66	msgid "Settings"
67	msgstr ""
68
	@@ -119,6 +123,10 @@ msgstr ""
119	msgid "Select/Upload Image"
120	msgstr ""
121




122	#: /media/szaleq/Data/easy-watermark/trunk/settings-form-image.php:17
123	msgid "Loading preview..."
124	msgstr ""
	@@ -132,89 +140,103 @@ msgid "Remove image"
132	msgstr ""
133
134	#: /media/szaleq/Data/easy-watermark/trunk/settings-form-image.php:19
135	- msgid "Note: if \"Auto watermark\" option is ~~ticked~~, ~~untick~~ it ~~before~~ ~~uploading~~ ~~new~~ watermark ~~image~~ or ~~remove~~ ~~current~~ image ~~first~~."





































136	msgstr ""
137
138	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-~~image~~.php:23
139	- msgid "~~Image~~ ~~position~~"




140	msgstr ""
141
142	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-~~image~~.php:24
143	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:7
144	msgid "vertical"
145	msgstr ""
146
147	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-~~image~~.php:25
148	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:8
149	msgid "top"
150	msgstr ""
151
152	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-~~image~~.php:26
153	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:9
154	msgid "middle"
155	msgstr ""
156
157	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-~~image~~.php:27
158	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:10
159	msgid "bottom"
160	msgstr ""
161
162	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-~~image~~.php:28
163	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:11
164	msgid "offset"
165	msgstr ""
166
167	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-~~image~~.php:29
168	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:12
169	msgid "horizontal"
170	msgstr ""
171
172	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-~~image~~.php:30
173	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:13
174	msgid "left"
175	msgstr ""
176
177	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-~~image~~.php:31
178	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:14
179	msgid "center"
180	msgstr ""
181
182	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-~~image~~.php:32
183	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:15
184	msgid "right"
185	msgstr ""
186
187	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-~~image~~.php:34
188	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:17
189	- msgid "Offset can be defined in pixels (just numeric value) or as percentage (e.g. '33%')"
190	- msgstr ""
191	-
192	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-image.php:37
193	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:42
194	- msgid "Opacity"
195	- msgstr ""
196	-
197	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-image.php:37
198	- msgid "Opacity does not affect the png images with opacity chanel."
199	- msgstr ""
200	-
201	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:6
202	- msgid "Text position"
203	- msgstr ""
204	-
205	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:20
206	msgid "Font"
207	msgstr ""
208
209	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:31
210	msgid "Text color"
211	msgstr ""
212
213	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:34
214	msgid "Text size"
215	msgstr ""
216
217	- #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:38
218	msgid "Text angle"
219	msgstr ""
220


1	msgid ""
2	msgstr ""
3	+ "Project-Id-Version: Easy Watermark 0.2.1\n"
4	"Report-Msgid-Bugs-To: \n"
5	+ "POT-Creation-Date: 2013-04-02 21:18+0100\n"
6	+ "PO-Revision-Date: 2013-04-02 21:19+0100\n"
7	"Last-Translator: Wojtek Szałkiewicz <wojtek@szalkiewicz.pl>\n"
8	"Language-Team: Wojtek Szałkiewicz <wojtek@szalkiewicz.pl>\n"
9	"Language: \n"
10	"MIME-Version: 1.0\n"
11	"Content-Type: text/plain; charset=UTF-8\n"
12	"Content-Transfer-Encoding: 8bit\n"
13	+ "X-Poedit-Language: English\n"
14	+ "X-Poedit-KeywordsList: __;_e\n"
15	+ "X-Poedit-Basepath: .\n"
16	+ "X-Poedit-SearchPath-0: /media/szaleq/Data/easy-watermark/trunk\n"
17
18	+ #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:75
19	+ #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:91
20	msgid "Add watermark"
21	msgstr ""
22
23	+ #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:175
24	#, php-format
25	msgid "Not supported mime type of %s. Skipping..."
26	msgstr ""
27
28	+ #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:180
29	#, php-format
30	msgid "Watermark successfully added to %s"
31	msgstr ""
32
33	+ #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:231
34	+ #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkSettings.php:86
35	msgid "Easy Watermark"
36	msgstr ""
37
38	+ #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:238
39	+ #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:256
40	msgid "Watermark successfully added."
41	msgstr ""
42
43	+ #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:238
44	+ #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:247
45	msgid "Go back"
46	msgstr ""
47
48	+ #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:238
49	msgid "or"
50	msgstr ""
51
52	+ #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:238
53	+ #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:247
54	msgid "go to edit page"
55	msgstr ""
56
57	+ #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:256
58	msgid "Go to Media Library"
59	msgstr ""
60
61	+ #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:265
62	msgid "Add watermark to all images"
63	msgstr ""
64
65	+ #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkPlugin.php:265
66	msgid "Be carefull with that option. If some images alredy has watermark, it will be added though."
67	msgstr ""
68
69	+ #: /media/szaleq/Data/easy-watermark/trunk/EasyWatermarkSettings.php:252
70	msgid "Settings"
71	msgstr ""
72

123	msgid "Select/Upload Image"
124	msgstr ""
125
126	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-image.php:8
127	+ msgid "Note: If you want to upload a new image, make sure that \"Auto watermark\" option is unticked or text watermark is not set. Otherwise uploaded image will be watermarked."
128	+ msgstr ""
129	+
130	#: /media/szaleq/Data/easy-watermark/trunk/settings-form-image.php:17
131	msgid "Loading preview..."
132	msgstr ""

140	msgstr ""
141
142	#: /media/szaleq/Data/easy-watermark/trunk/settings-form-image.php:19
143	+ msgid "Note: If you want to upload a new image, make sure that \"Auto watermark\" option is unticked, or remove current image and unset text watermark first. Otherwise uploaded image will be watermarked."
144	+ msgstr ""
145	+
146	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-image.php:22
147	+ msgid "Image alignment"
148	+ msgstr ""
149	+
150	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-image.php:35
151	+ msgid "Image offset"
152	+ msgstr ""
153	+
154	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-image.php:36
155	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:20
156	+ msgid "x"
157	+ msgstr ""
158	+
159	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-image.php:38
160	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:22
161	+ msgid "y"
162	+ msgstr ""
163	+
164	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-image.php:39
165	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:23
166	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:39
167	+ msgid "Offset can be defined in pixels (just numeric value) or as percentage (e.g. '33%')"
168	+ msgstr ""
169	+
170	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-image.php:41
171	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:65
172	+ msgid "Opacity"
173	+ msgstr ""
174	+
175	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-image.php:41
176	+ msgid "Opacity does not affect the png images with opacity chanel."
177	+ msgstr ""
178	+
179	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:6
180	+ msgid "Text alignment"
181	msgstr ""
182
183	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:19
184	+ msgid "Text offset"
185	+ msgstr ""
186	+
187	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:28
188	+ msgid "Text position"
189	msgstr ""
190
191	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:29

192	msgid "vertical"
193	msgstr ""
194
195	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:30

196	msgid "top"
197	msgstr ""
198
199	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:31

200	msgid "middle"
201	msgstr ""
202
203	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:32

204	msgid "bottom"
205	msgstr ""
206
207	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:33

208	msgid "offset"
209	msgstr ""
210
211	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:34

212	msgid "horizontal"
213	msgstr ""
214
215	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:35

216	msgid "left"
217	msgstr ""
218
219	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:36

220	msgid "center"
221	msgstr ""
222
223	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:37

224	msgid "right"
225	msgstr ""
226
227	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:43


















228	msgid "Font"
229	msgstr ""
230
231	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:54
232	msgid "Text color"
233	msgstr ""
234
235	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:57
236	msgid "Text size"
237	msgstr ""
238
239	+ #: /media/szaleq/Data/easy-watermark/trunk/settings-form-text.php:61
240	msgid "Text angle"
241	msgstr ""
242

plugin.php CHANGED Viewed

	@@ -7,9 +7,8 @@
7	* It's a part of package in which you found it.
8	* See readme.txt for more information.
9	*/
10	- namespace szaleq\Plugins\EasyWatermark;
11
12	- class ~~Core~~
13	{
14	/**
15	* @var string plugin name
	@@ -26,6 +25,16 @@ class Core
26	*/
27	protected static $version;
28










29	/**
30	* Initiates plugin by creating an object of inheriting class,
31	* registers activation and uninstall hooks,
	@@ -35,11 +44,11 @@ class Core
35	*/
36	public static function init(){
37	// Register install and uninstall methods
38	- register_activation_hook(__FILE__, array(~~self~~, 'install'));
39	- register_uninstall_hook(__FILE__, array(~~self~~, 'uninstall'));
40
41	$version = get_option(static::$pluginSlug . '-version');
42	- if(!$version \|\| version_compare($version, static::$version, '<')){
43	// Version from database is lower than current, upgrade...
44	static::upgrade($version);
45	}


7	* It's a part of package in which you found it.
8	* See readme.txt for more information.
9	*/

10
11	+ class ewPluginCore
12	{
13	/**
14	* @var string plugin name

25	*/
26	protected static $version;
27
28	+ /**
29	+ * @var string plugin class name
30	+ */
31	+ protected static $className;
32	+
33	+ /**
34	+ * @var string main plugin file
35	+ */
36	+ protected static $mainFile = 'index.php';
37	+
38	/**
39	* Initiates plugin by creating an object of inheriting class,
40	* registers activation and uninstall hooks,

44	*/
45	public static function init(){
46	// Register install and uninstall methods
47	+ register_activation_hook(dirname(__FILE__) . DIRECTORY_SEPARATOR . static::$mainFile, array(static::$className, 'install'));
48	+ register_uninstall_hook(dirname(__FILE__) . DIRECTORY_SEPARATOR . static::$mainFile, array(static::$className, 'uninstall'));
49
50	$version = get_option(static::$pluginSlug . '-version');
51	+ if($version & version_compare($version, static::$version, '<')){
52	// Version from database is lower than current, upgrade...
53	static::upgrade($version);
54	}

readme.txt CHANGED Viewed

	@@ -1,9 +1,10 @@
1	=== Easy Watermark ===
2	Contributors: szaleq

3	Tags: watermark, image, picture, photo, media, gallery, signature, transparent, upload, admin
4	Requires at least: 3.3
5	Tested up to: 3.5.1
6	- Stable tag: 0.2
7	License: GPLv2 or later
8	License URI: http://www.gnu.org/licenses/gpl-2.0.html
9
	@@ -13,15 +14,13 @@ Automatically adds watermark to images when they are uploaded to the WordPress M
13
14	This plugin can automatically add image and text watermark to pictures as they are uploaded to wordpress media library. You can also watermark existing images manually (all at once or an every single image). Watermark image can be a png, gif (alpha channel supported in both cases) or jpg. It's also possibile to set watermark opacity (doesn't apply to png with alpha channel). For text watermark you can select font, set color, size, angel and opacity.
15
16	- This plugin requires PHP 5.3 or higher.
17	-
18	The possibility of defining many watermarks is coming soon. Check for updates.
19
20	Please, contact me if you have any questions/ideas or issues.
21
22	== Installation ==
23
24	- Note: Easy Watermark requires at ~~least~~ ~~PHP~~ ~~5.3~~ ~~with~~ GD ~~extension~~ ~~installed~~ ~~and~~ ~~enabled~~.
25
26	1. Unpack easy-watermark.zip and upload its content to the `/wp-content/plugins/` directory
27	1. Activate the plugin through the 'Plugins' menu in WordPress
	@@ -36,7 +35,7 @@ Unfortunately, not yet. Keeping oryginal pictures feature is in plans, so it wil
36	You can go to "Media >> Easy Watermark" and click "Add watermark to all images" button. If you wont to add watermark to single images, you can find links titled "Add watermark" in the media library (see screenshots) or "Add watermark" button on image edit page.
37
38	= How can I adjust watermark image position? =
39	- Watermark position can be adjusted vertically and horizontally by selecting alignment (left, center, right, top, middle, bottom). You can also define horizontal and vertical offset, for example if vertical alignment is set to bottom with offset 100 and horizontal alignment is right with offset 200, watermark will show up 100px from lower edge and 200px from right edge of the picture.
40
41	= Can I add both, text and image watermark at once? =
42	Yes, there is a posibility to add only image, only text or both.
	@@ -55,6 +54,9 @@ If you have any other questions, please contact me.
55
56	== Changelog ==
57



58	= 0.2 =
59	* added text watermark handling
60	* corrected issue with auto adding watermark on upload


1	=== Easy Watermark ===
2	Contributors: szaleq
3	+ Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=5MCXMBU3ETUDY&lc=PL&item_name=EawyWatermark%20Wordpress%20Plugin&currency_code=PLN&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted
4	Tags: watermark, image, picture, photo, media, gallery, signature, transparent, upload, admin
5	Requires at least: 3.3
6	Tested up to: 3.5.1
7	+ Stable tag: 0.2.1
8	License: GPLv2 or later
9	License URI: http://www.gnu.org/licenses/gpl-2.0.html
10

14
15	This plugin can automatically add image and text watermark to pictures as they are uploaded to wordpress media library. You can also watermark existing images manually (all at once or an every single image). Watermark image can be a png, gif (alpha channel supported in both cases) or jpg. It's also possibile to set watermark opacity (doesn't apply to png with alpha channel). For text watermark you can select font, set color, size, angel and opacity.
16


17	The possibility of defining many watermarks is coming soon. Check for updates.
18
19	Please, contact me if you have any questions/ideas or issues.
20
21	== Installation ==
22
23	+ Note: Easy Watermark requires GD extension installed and enabled on a server to work.
24
25	1. Unpack easy-watermark.zip and upload its content to the `/wp-content/plugins/` directory
26	1. Activate the plugin through the 'Plugins' menu in WordPress

35	You can go to "Media >> Easy Watermark" and click "Add watermark to all images" button. If you wont to add watermark to single images, you can find links titled "Add watermark" in the media library (see screenshots) or "Add watermark" button on image edit page.
36
37	= How can I adjust watermark image position? =
38	+ Watermark position can be adjusted vertically and horizontally by selecting alignment (left, center, right, top, middle, bottom). You can also define horizontal and vertical offset.
39
40	= Can I add both, text and image watermark at once? =
41	Yes, there is a posibility to add only image, only text or both.

54
55	== Changelog ==
56
57	+ = 0.2.1 =
58	+ * some changes on settings page
59	+
60	= 0.2 =
61	* added text watermark handling
62	* corrected issue with auto adding watermark on upload

screenshot-1.png DELETED Viewed

Binary file

screenshot-2.png DELETED Viewed

Binary file

screenshot-3.png DELETED Viewed

Binary file

settings-form-image.php CHANGED Viewed

	@@ -5,7 +5,7 @@
5	<?php
6	if(empty($watermark_url)) :
7	?>
8	- <a class="button-secondary" id="select-image-button" data-choose="<?php _e('Choose Watermark Image', 'easy-watermark'); ?>" data-button-label="<?php _e('Set as Watermark Image', 'easy-watermark'); ?>" href="#"><?php _e('Select/Upload Image', 'easy-watermark'); ?></a>
9	<br/>
10	<input id="easy-watermark-position_y" name="easy-watermark-settings-image[position_y]" type="hidden" value="<?php echo $position_y; ?>" />
11	<input id="easy-watermark-position_x" name="easy-watermark-settings-image[position_x]" type="hidden" value="<?php echo $position_x; ?>" />
	@@ -16,24 +16,28 @@ if(empty($watermark_url)) :
16	<img id="watermark-preview" style="max-height:200px;width:auto;cursor:pointer;" src="<?php echo $watermark_url; ?>" />
17	<span style="display:none;" id="loading-preview"><?php _e('Loading preview...', 'easy-watermark'); ?></span>
18	<p class="description"><?php _e('Click on image to change it.', 'easy-watermark'); ?> <a href="#" class="remove-image"><?php _e('Remove image', 'easy-watermark'); ?></a><br />
19	- <?php _e('Note: if "Auto watermark" option is ~~ticked~~, ~~untick~~ it ~~before~~ ~~uploading~~ ~~new~~ watermark ~~image~~ or ~~remove~~ ~~current~~ image ~~first~~.', 'easy-watermark'); ?></p>
20	</td>
21	</tr>
22	-
23	- <tr ~~valign~~="~~top~~" ~~class="watermark-options"><th scope="row"><?php _e('Image position', 'easy-watermark'); ?></th~~>
24	- <td><~~strong>~~ <?php _e('~~vertical~~', ~~'easy-watermark'~~); ~~?>:~~ ~~</strong~~>
25	- <label for="~~easy~~-~~watermark~~-~~position~~-~~top~~"><input id="~~easy-watermark-position-top~~" name="easy-watermark-settings-image[~~position_y~~]" ~~type~~="~~radio~~" ~~value~~="~~top~~" <?php checked('~~top~~', $~~position_y~~); ~~?>/>~~ ~~<?php _e('top', 'easy-watermark'); ?></~~label>
26	- <label for="~~easy~~-~~watermark~~-~~position~~-~~mdl~~"><input id="~~easy-watermark-position-mdl~~" name="easy-watermark-settings-image[~~position_y~~]" ~~type~~="~~radio~~" ~~value~~="~~mdl~~" <?php ~~echo~~ checked('~~mdl~~', $~~position_y~~); ?> ~~/> <?php _e('middle', 'easy-watermark'); ?></~~label>
27	- <label for="~~easy~~-~~watermark~~-~~position~~-~~btm~~"><input id="~~easy-watermark-position-btm~~" name="easy-watermark-settings-image[~~position_y~~]" ~~type~~="~~radio~~" ~~value~~="~~btm~~" <?php ~~echo~~ checked('~~btm~~', $~~position_y~~); ?> ~~/> <?php _e('bottom', 'easy-watermark'); ?></~~label~~><br />~~
28	- <label for="easy-watermark-~~position~~-~~offset_y~~"> <?php _e('~~offset~~', ~~'easy-watermark'~~); ~~?>:~~ </label>
29	- <~~input~~ ~~size~~="3" ~~type~~="~~text~~" id="~~easy-watermark-position-offset_y~~" name="easy-watermark-settings-image[~~offset_y~~]" value="~~<?php~~ ~~echo $offset_y; ?>~~" ~~/><br /><br /><strong>~~ <?php _e('~~horizontal~~', ~~'easy-watermark'~~); ~~?>:~~ ~~</strong~~>
30	- <label for="~~easy~~-~~watermark~~-~~position~~-~~lft~~"><input id="~~easy-watermark-position-lft~~" name="easy-watermark-settings-image[~~position_x~~]" ~~type~~="~~radio~~" ~~value~~="~~lft~~" <?php checked('~~lft~~', $~~position_x~~); ~~?>/>~~ ~~<?php _e('left', 'easy-watermark'); ?></~~label>
31	- <label for="~~easy~~-~~watermark~~-~~position~~-~~ctr~~"><input id="~~easy-watermark-position-ctr~~" name="easy-watermark-settings-image[~~position_x~~]" ~~type~~="~~radio~~" ~~value~~="~~ctr~~" <?php checked('~~ctr~~', $~~position_x~~); ?> ~~/> <?php _e('center', 'easy-watermark'); ?></~~label>
32	- <label for="~~easy~~-~~watermark~~-~~position~~-~~rgt~~"><input id="~~easy-watermark-position-rgt~~" name="easy-watermark-settings-image[~~position_x~~]" ~~type~~="~~radio~~" ~~value~~="~~rgt~~" <?php checked('~~rgt~~', $~~position_x~~); ?> ~~/> <?php _e('right', 'easy-watermark'); ?></~~label~~><br />~~
33	- ~~<label for="easy-watermark-position-offset_x">offset:~~ </~~label~~>
34	- <input type="text" size="3" id="easy-watermark-position-offset_x" name="easy-watermark-settings-image[offset_x]" value="<?php echo $offset_x; ?>"/><p class="description"><?php _e('Offset can be defined in pixels (just numeric value) or as percentage (e.g. \'33%\')', 'easy-watermark'); ?></p>
35	- </td>
36	- </tr>




37	<tr valign="top" class="watermark-options"><th scope="row"><?php _e('Opacity', 'easy-watermark'); ?></th><td><input id="easy-watermark-opacity" name="easy-watermark-settings-image[opacity]" size="3" type="text" value="<?php echo $opacity; ?>" /> %<p class="description"><?php _e('Opacity does not affect the png images with opacity chanel.', 'easy-watermark'); ?></p>
38	<?php endif; ?>
39	</td>


5	<?php
6	if(empty($watermark_url)) :
7	?>
8	+ <a class="button-secondary" id="select-image-button" data-choose="<?php _e('Choose Watermark Image', 'easy-watermark'); ?>" data-button-label="<?php _e('Set as Watermark Image', 'easy-watermark'); ?>" href="#"><?php _e('Select/Upload Image', 'easy-watermark'); ?></a><p class="description"> <?php _e('Note: If you want to upload a new image, make sure that "Auto watermark" option is unticked or text watermark is not set. Otherwise uploaded image will be watermarked.', 'easy-watermark'); ?></p>
9	<br/>
10	<input id="easy-watermark-position_y" name="easy-watermark-settings-image[position_y]" type="hidden" value="<?php echo $position_y; ?>" />
11	<input id="easy-watermark-position_x" name="easy-watermark-settings-image[position_x]" type="hidden" value="<?php echo $position_x; ?>" />

16	<img id="watermark-preview" style="max-height:200px;width:auto;cursor:pointer;" src="<?php echo $watermark_url; ?>" />
17	<span style="display:none;" id="loading-preview"><?php _e('Loading preview...', 'easy-watermark'); ?></span>
18	<p class="description"><?php _e('Click on image to change it.', 'easy-watermark'); ?> <a href="#" class="remove-image"><?php _e('Remove image', 'easy-watermark'); ?></a><br />
19	+ <?php _e('Note: If you want to upload a new image, make sure that "Auto watermark" option is unticked, or remove current image and unset text watermark first. Otherwise uploaded image will be watermarked.', 'easy-watermark'); ?></p>
20	</td>
21	</tr>
22	+ <tr valign="top" class="watermark-options"><th scope="row"><?php _e('Image alignment', 'easy-watermark'); ?></th><td>
23	+ <div id="alignmentbox">
24	+ <label for="alignment-1" id="alignment-1-label"><input type="radio" name="easy-watermark-settings-image[alignment]" value="1" id="alignment-1" <?php checked('1', $alignment); ?> /></label>
25	+ <label for="alignment-2" id="alignment-2-label"><input type="radio" name="easy-watermark-settings-image[alignment]" value="2" id="alignment-2" <?php checked('2', $alignment); ?> /></label>
26	+ <label for="alignment-3" id="alignment-3-label"><input type="radio" name="easy-watermark-settings-image[alignment]" value="3" id="alignment-3" <?php checked('3', $alignment); ?> /></label>
27	+ <label for="alignment-4" id="alignment-4-label"><input type="radio" name="easy-watermark-settings-image[alignment]" value="4" id="alignment-4" <?php checked('4', $alignment); ?> /></label>
28	+ <label for="alignment-5" id="alignment-5-label"><input type="radio" name="easy-watermark-settings-image[alignment]" value="5" id="alignment-5" <?php checked('5', $alignment); ?> /></label>
29	+ <label for="alignment-6" id="alignment-6-label"><input type="radio" name="easy-watermark-settings-image[alignment]" value="6" id="alignment-6" <?php checked('6', $alignment); ?> /></label>
30	+ <label for="alignment-7" id="alignment-7-label"><input type="radio" name="easy-watermark-settings-image[alignment]" value="7" id="alignment-7" <?php checked('7', $alignment); ?> /></label>
31	+ <label for="alignment-8" id="alignment-8-label"><input type="radio" name="easy-watermark-settings-image[alignment]" value="8" id="alignment-8" <?php checked('8', $alignment); ?> /></label>
32	+ <label for="alignment-9" id="alignment-9-label"><input type="radio" name="easy-watermark-settings-image[alignment]" value="9" id="alignment-9" <?php checked('9', $alignment); ?> /></label>
33	+ </div>
34	+ </td></tr>
35	+ <tr valign="top" class="watermark-options"><th scope="row"><?php _e('Image offset', 'easy-watermark'); ?></th><td>
36	+ <label for="easy-watermark-position-offset_x"><?php _e('x', 'easy-watermark'); ?>: </label>
37	+ <input size="3" type="text" id="easy-watermark-position-offset_x" name="easy-watermark-settings-image[offset_x]" value="<?php echo $offset_x; ?>" /><br />
38	+ <label for="easy-watermark-position-offset_y"><?php _e('y', 'easy-watermark'); ?>: </label>
39	+ <input type="text" size="3" id="easy-watermark-position-offset_y" name="easy-watermark-settings-image[offset_y]" value="<?php echo $offset_y; ?>"/><p class="description"><?php _e('Offset can be defined in pixels (just numeric value) or as percentage (e.g. \'33%\')', 'easy-watermark'); ?></p>
40	+ </td></tr>
41	<tr valign="top" class="watermark-options"><th scope="row"><?php _e('Opacity', 'easy-watermark'); ?></th><td><input id="easy-watermark-opacity" name="easy-watermark-settings-image[opacity]" size="3" type="text" value="<?php echo $opacity; ?>" /> %<p class="description"><?php _e('Opacity does not affect the png images with opacity chanel.', 'easy-watermark'); ?></p>
42	<?php endif; ?>
43	</td>

settings-form-text.php CHANGED Viewed

	@@ -3,6 +3,28 @@
3	<tr><th scope="row"><?php _e('Text', 'easy-watermark'); ?></th><td>
4	<input type="text" value="<?php echo $text; ?>" name="easy-watermark-settings-text[text]" />
5	</tr>






















6	<tr valign="top" class="watermark-options"><th scope="row"><?php _e('Text position', 'easy-watermark'); ?></th>
7	<td><strong> <?php _e('vertical', 'easy-watermark'); ?>: </strong>
8	<label for="easy-watermark-position-top"><input id="easy-watermark-position-top" name="easy-watermark-settings-text[position_y]" type="radio" value="top" <?php checked('top', $position_y); ?>/> <?php _e('top', 'easy-watermark'); ?></label>
	@@ -17,6 +39,7 @@
17	<input type="text" size="3" id="easy-watermark-position-offset_x" name="easy-watermark-settings-text[offset_x]" value="<?php echo $offset_x; ?>"/><p class="description"><?php _e('Offset can be defined in pixels (just numeric value) or as percentage (e.g. \'33%\')', 'easy-watermark'); ?></p>
18	</td>
19	</tr>

20	<tr><th scope="row"><?php _e('Font', 'easy-watermark'); ?></th><td>
21	<select name="easy-watermark-settings-text[font]">
22	<?php
	@@ -29,7 +52,7 @@
29	</select>
30	</td>
31	<tr><th scope="row"><?php _e('Text color', 'easy-watermark'); ?></th><td>
32	- #<input type="~~text~~" ~~size="6"~~ maxlength="6" name="easy-watermark-settings-text[color]" id="easy-watermark-color" value="<?php echo $color; ?>" /><div id="colorselector" ~~data-color="<?php echo $color; ?>"~~><div style="background-color:#<?php echo $color; ?>"></div></div>
33	</td>
34	<tr><th scope="row"><?php _e('Text size', 'easy-watermark'); ?></th><td>
35	<input type="text" size="3" name="easy-watermark-settings-text[size]" id="easy-watermark-size" value="<?php echo $size; ?>" /> pt


3	<tr><th scope="row"><?php _e('Text', 'easy-watermark'); ?></th><td>
4	<input type="text" value="<?php echo $text; ?>" name="easy-watermark-settings-text[text]" />
5	</tr>
6	+ <tr valign="top" class="watermark-options"><th scope="row"><?php _e('Text alignment', 'easy-watermark'); ?></th><td>
7	+ <div id="alignmentbox">
8	+ <label for="alignment-1" id="alignment-1-label"><input type="radio" name="easy-watermark-settings-text[alignment]" value="1" id="alignment-1" <?php checked('1', $alignment); ?> /></label>
9	+ <label for="alignment-2" id="alignment-2-label"><input type="radio" name="easy-watermark-settings-text[alignment]" value="2" id="alignment-2" <?php checked('2', $alignment); ?> /></label>
10	+ <label for="alignment-3" id="alignment-3-label"><input type="radio" name="easy-watermark-settings-text[alignment]" value="3" id="alignment-3" <?php checked('3', $alignment); ?> /></label>
11	+ <label for="alignment-4" id="alignment-4-label"><input type="radio" name="easy-watermark-settings-text[alignment]" value="4" id="alignment-4" <?php checked('4', $alignment); ?> /></label>
12	+ <label for="alignment-5" id="alignment-5-label"><input type="radio" name="easy-watermark-settings-text[alignment]" value="5" id="alignment-5" <?php checked('5', $alignment); ?> /></label>
13	+ <label for="alignment-6" id="alignment-6-label"><input type="radio" name="easy-watermark-settings-text[alignment]" value="6" id="alignment-6" <?php checked('6', $alignment); ?> /></label>
14	+ <label for="alignment-7" id="alignment-7-label"><input type="radio" name="easy-watermark-settings-text[alignment]" value="7" id="alignment-7" <?php checked('7', $alignment); ?> /></label>
15	+ <label for="alignment-8" id="alignment-8-label"><input type="radio" name="easy-watermark-settings-text[alignment]" value="8" id="alignment-8" <?php checked('8', $alignment); ?> /></label>
16	+ <label for="alignment-9" id="alignment-9-label"><input type="radio" name="easy-watermark-settings-text[alignment]" value="9" id="alignment-9" <?php checked('9', $alignment); ?> /></label>
17	+ </div>
18	+ </td></tr>
19	+ <tr valign="top" class="watermark-options"><th scope="row"><?php _e('Text offset', 'easy-watermark'); ?></th><td>
20	+ <label for="easy-watermark-position-offset_x"><?php _e('x', 'easy-watermark'); ?>: </label>
21	+ <input size="3" type="text" id="easy-watermark-position-offset_x" name="easy-watermark-settings-text[offset_x]" value="<?php echo $offset_x; ?>" /><br />
22	+ <label for="easy-watermark-position-offset_y"><?php _e('y', 'easy-watermark'); ?>: </label>
23	+ <input type="text" size="3" id="easy-watermark-position-offset_y" name="easy-watermark-settings-text[offset_y]" value="<?php echo $offset_y; ?>"/><p class="description"><?php _e('Offset can be defined in pixels (just numeric value) or as percentage (e.g. \'33%\')', 'easy-watermark'); ?></p>
24	+ </td></tr>
25	+
26	+
27	+ <!--
28	<tr valign="top" class="watermark-options"><th scope="row"><?php _e('Text position', 'easy-watermark'); ?></th>
29	<td><strong> <?php _e('vertical', 'easy-watermark'); ?>: </strong>
30	<label for="easy-watermark-position-top"><input id="easy-watermark-position-top" name="easy-watermark-settings-text[position_y]" type="radio" value="top" <?php checked('top', $position_y); ?>/> <?php _e('top', 'easy-watermark'); ?></label>

39	<input type="text" size="3" id="easy-watermark-position-offset_x" name="easy-watermark-settings-text[offset_x]" value="<?php echo $offset_x; ?>"/><p class="description"><?php _e('Offset can be defined in pixels (just numeric value) or as percentage (e.g. \'33%\')', 'easy-watermark'); ?></p>
40	</td>
41	</tr>
42	+ -->
43	<tr><th scope="row"><?php _e('Font', 'easy-watermark'); ?></th><td>
44	<select name="easy-watermark-settings-text[font]">
45	<?php

52	</select>
53	</td>
54	<tr><th scope="row"><?php _e('Text color', 'easy-watermark'); ?></th><td>
55	+ <input type="hidden" maxlength="6" name="easy-watermark-settings-text[color]" id="easy-watermark-color" value="<?php echo $color; ?>" /><div id="colorselector"><div style="background-color:#<?php echo $color; ?>"></div></div>
56	</td>
57	<tr><th scope="row"><?php _e('Text size', 'easy-watermark'); ?></th><td>
58	<input type="text" size="3" name="easy-watermark-settings-text[size]" id="easy-watermark-size" value="<?php echo $size; ?>" /> pt