Easy Watermark - Version 0.4.2

Version Description

  • added possibility to define jpeg quality
Download this release

Release Info

Developer szaleq
Plugin Icon Easy Watermark
Version 0.4.2
Comparing to
See all releases

Code changes from version 0.4.1 to 0.4.2

index.php CHANGED
@@ -2,7 +2,7 @@
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.4.1
6
Author: Wojtek Szałkiewicz
7
Author URI: http://szalkiewicz.pl/
8
License: GPLv2 or later
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.4.2
6
Author: Wojtek Szałkiewicz
7
Author URI: http://szalkiewicz.pl/
8
License: GPLv2 or later
languages/easy-watermark-fr_FR.mo CHANGED
Binary file
languages/easy-watermark-fr_FR.po CHANGED
@@ -1,9 +1,9 @@
1
msgid ""
2
msgstr ""
3
- "Project-Id-Version: Easy Watermark 0.4.1\n"
4
"Report-Msgid-Bugs-To: \n"
5
- "POT-Creation-Date: 2013-05-04 11:02+0100\n"
6
- "PO-Revision-Date: 2013-05-04 11:03+0100\n"
7
"Last-Translator: Regis B <rbrisard@gmail.com>\n"
8
"Language-Team: Wojtek Szałkiewicz <wojtek@szalkiewicz.pl>\n"
9
"Language: French\n"
@@ -12,6 +12,86 @@ msgstr ""
12
"Content-Transfer-Encoding: 8bit\n"
13
"X-Generator: Poedit 1.5.4\n"
14
15
#: /media/szaleq/Data/easy-watermark/trunk/views/about.php:2
16
msgid "About"
17
msgstr "A propos"
@@ -50,16 +130,6 @@ msgstr "Support"
50
msgid "Want to buy me a coffee?"
51
msgstr "Offrez-moi un café !"
52
53
- #: /media/szaleq/Data/easy-watermark/trunk/views/easy-watermark-page.php:4
54
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:100
55
- msgid "Easy Watermark"
56
- msgstr ""
57
-
58
- #: /media/szaleq/Data/easy-watermark/trunk/views/easy-watermark-page.php:10
59
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:177
60
- msgid "Watermark successfully added."
61
- msgstr "Watermark ajouté avec succès."
62
-
63
#: /media/szaleq/Data/easy-watermark/trunk/views/easy-watermark-page.php:10
64
msgid "Go to Media Library"
65
msgstr "Aller à la Bibliothèque de médias"
@@ -121,17 +191,6 @@ msgstr "Sélectionnez les tailles d'image à marquer"
121
msgid "Watermark Type"
122
msgstr "Type de Watermark"
123
124
- #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:24
125
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:81
126
- msgid "Image"
127
- msgstr "Image"
128
-
129
- #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:25
130
- #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:3
131
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:82
132
- msgid "Text"
133
- msgstr "Texte"
134
-
135
#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:26
136
msgid "Image + Text"
137
msgstr "Image + Texte"
@@ -140,6 +199,18 @@ msgstr "Image + Texte"
140
msgid "Choose, whether to apply image, text, or both."
141
msgstr "Choisissez le type de Watermark à appliquer (Image, Texte ou les deux)"
142
143
#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:3
144
msgid "Watermark Image"
145
msgstr "Image du Watermark "
@@ -302,66 +373,6 @@ msgstr "Réglages Easy Watermark"
302
msgid "Save Changes"
303
msgstr ""
304
305
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:184
306
- msgid "Invalid mime type."
307
- msgstr "Type MIME du fichier invalide."
308
-
309
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:187
310
- msgid "No watermark image selected and no watermark text set."
311
- msgstr "Aucune image ou texte Watermark n'est défini."
312
-
313
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:189
314
- msgid "Go to settings page"
315
- msgstr "Allez à la page des réglages"
316
-
317
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:193
318
- msgid "An error has occurred."
319
- msgstr "Une erreur est survenue"
320
-
321
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:199
322
- msgid ""
323
- "Easy Watermark is active, but requires GD library to work. Please enable "
324
- "this extension."
325
- msgstr ""
326
- "Easy Watermark est activé, mais nécessite la présence de la librairie GD. "
327
- "Veuillez activer cette extension."
328
-
329
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:199
330
- msgid "Read more"
331
- msgstr "Lire la suite"
332
-
333
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:219
334
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:220
335
- msgid "Add Watermark"
336
- msgstr "Ajouter Watermark"
337
-
338
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:235
339
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:251
340
- msgid "Add watermark"
341
- msgstr "Ajouter Watermark"
342
-
343
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:390
344
- #, php-format
345
- msgid "Not supported mime type of %s. Skipping..."
346
- msgstr "Type MIME du fichier %s non supporté. Ignoré..."
347
-
348
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:395
349
- #, php-format
350
- msgid "Watermark successfully added to %s"
351
- msgstr "Watermark ajouté avec succès à %s"
352
-
353
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:80
354
- msgid "General"
355
- msgstr "Général"
356
-
357
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:278
358
- msgid "Settings"
359
- msgstr "Réglages"
360
-
361
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:292
362
- msgid "Donate"
363
- msgstr "Faites un don"
364
-
365
#~ msgid "Loading preview..."
366
#~ msgstr "Chargement de l'aperçu..."
367
1
msgid ""
2
msgstr ""
3
+ "Project-Id-Version: Easy Watermark 0.4.2\n"
4
"Report-Msgid-Bugs-To: \n"
5
+ "POT-Creation-Date: 2013-05-16 19:40+0100\n"
6
+ "PO-Revision-Date: 2013-05-17 20:37+0100\n"
7
"Last-Translator: Regis B <rbrisard@gmail.com>\n"
8
"Language-Team: Wojtek Szałkiewicz <wojtek@szalkiewicz.pl>\n"
9
"Language: French\n"
12
"Content-Transfer-Encoding: 8bit\n"
13
"X-Generator: Poedit 1.5.4\n"
14
15
+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:180
16
+ #: /media/szaleq/Data/easy-watermark/trunk/views/easy-watermark-page.php:10
17
+ msgid "Watermark successfully added."
18
+ msgstr "Watermark ajouté avec succès."
19
+
20
+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:186
21
+ msgid "Invalid mime type."
22
+ msgstr "Type MIME du fichier invalide."
23
+
24
+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:189
25
+ msgid "No watermark image selected and no watermark text set."
26
+ msgstr "Aucune image ou texte Watermark n'est défini."
27
+
28
+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:191
29
+ msgid "Go to settings page"
30
+ msgstr "Allez à la page des réglages"
31
+
32
+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:195
33
+ msgid "An error has occurred."
34
+ msgstr "Une erreur est survenue"
35
+
36
+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:201
37
+ msgid ""
38
+ "Easy Watermark is active, but requires GD library to work. Please enable "
39
+ "this extension."
40
+ msgstr ""
41
+ "Easy Watermark est activé, mais nécessite la présence de la librairie GD. "
42
+ "Veuillez activer cette extension."
43
+
44
+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:201
45
+ msgid "Read more"
46
+ msgstr "Lire la suite"
47
+
48
+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:222
49
+ msgid "Add Watermark"
50
+ msgstr "Ajouter Watermark"
51
+
52
+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:242
53
+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:258
54
+ msgid "Add watermark"
55
+ msgstr "Ajouter Watermark"
56
+
57
+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:397
58
+ #, php-format
59
+ msgid "Not supported mime type of %s. Skipping..."
60
+ msgstr "Type MIME du fichier %s non supporté. Ignoré..."
61
+
62
+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:402
63
+ #, php-format
64
+ msgid "Watermark successfully added to %s"
65
+ msgstr "Watermark ajouté avec succès à %s"
66
+
67
+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:83
68
+ msgid "General"
69
+ msgstr "Général"
70
+
71
+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:84
72
+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:24
73
+ msgid "Image"
74
+ msgstr "Image"
75
+
76
+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:85
77
+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:25
78
+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:3
79
+ msgid "Text"
80
+ msgstr "Texte"
81
+
82
+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:103
83
+ #: /media/szaleq/Data/easy-watermark/trunk/views/easy-watermark-page.php:4
84
+ msgid "Easy Watermark"
85
+ msgstr ""
86
+
87
+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:281
88
+ msgid "Settings"
89
+ msgstr "Réglages"
90
+
91
+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:294
92
+ msgid "Donate"
93
+ msgstr "Faites un don"
94
+
95
#: /media/szaleq/Data/easy-watermark/trunk/views/about.php:2
96
msgid "About"
97
msgstr "A propos"
130
msgid "Want to buy me a coffee?"
131
msgstr "Offrez-moi un café !"
132
133
#: /media/szaleq/Data/easy-watermark/trunk/views/easy-watermark-page.php:10
134
msgid "Go to Media Library"
135
msgstr "Aller à la Bibliothèque de médias"
191
msgid "Watermark Type"
192
msgstr "Type de Watermark"
193
194
#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:26
195
msgid "Image + Text"
196
msgstr "Image + Texte"
199
msgid "Choose, whether to apply image, text, or both."
200
msgstr "Choisissez le type de Watermark à appliquer (Image, Texte ou les deux)"
201
202
+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:31
203
+ msgid "Jpeg Quality"
204
+ msgstr "Qualité Jpeg"
205
+
206
+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:32
207
+ msgid ""
208
+ "Set jpeg quality from 0 (worst quality, smaller file) to 100 (best quality, "
209
+ "biggest file)"
210
+ msgstr ""
211
+ "Définissez la qualité de 0 (faible qualité, fichier plus petit) à 100 "
212
+ "(qualité maximale, fichier plus gros)"
213
+
214
#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:3
215
msgid "Watermark Image"
216
msgstr "Image du Watermark "
373
msgid "Save Changes"
374
msgstr ""
375
376
#~ msgid "Loading preview..."
377
#~ msgstr "Chargement de l'aperçu..."
378
languages/easy-watermark-pl_PL.mo CHANGED
Binary file
languages/easy-watermark-pl_PL.po CHANGED
@@ -1,9 +1,9 @@
1
msgid ""
2
msgstr ""
3
- "Project-Id-Version: Easy Watermark 0.4\n"
4
"Report-Msgid-Bugs-To: \n"
5
- "POT-Creation-Date: 2013-05-04 11:00+0100\n"
6
- "PO-Revision-Date: 2013-05-04 11:01+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"
@@ -12,6 +12,86 @@ msgstr ""
12
"Content-Transfer-Encoding: 8bit\n"
13
"X-Generator: Poedit 1.5.4\n"
14
15
#: /media/szaleq/Data/easy-watermark/trunk/views/about.php:2
16
msgid "About"
17
msgstr "O wtyczce"
@@ -49,16 +129,6 @@ msgstr "Wsparcie"
49
msgid "Want to buy me a coffee?"
50
msgstr "Chciałbyś postawić mi kawę?"
51
52
- #: /media/szaleq/Data/easy-watermark/trunk/views/easy-watermark-page.php:4
53
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:100
54
- msgid "Easy Watermark"
55
- msgstr ""
56
-
57
- #: /media/szaleq/Data/easy-watermark/trunk/views/easy-watermark-page.php:10
58
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:177
59
- msgid "Watermark successfully added."
60
- msgstr "Znak wodny został dodany."
61
-
62
#: /media/szaleq/Data/easy-watermark/trunk/views/easy-watermark-page.php:10
63
msgid "Go to Media Library"
64
msgstr "Idź do biblioteki mediów"
@@ -119,17 +189,6 @@ msgstr "Zaznacz rozmiary obrazów, które mają być oznaczane znakiem wodnym"
119
msgid "Watermark Type"
120
msgstr "Typ znaku wodnego"
121
122
- #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:24
123
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:81
124
- msgid "Image"
125
- msgstr "Obraz"
126
-
127
- #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:25
128
- #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:3
129
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:82
130
- msgid "Text"
131
- msgstr "Tekst"
132
-
133
#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:26
134
msgid "Image + Text"
135
msgstr "Obraz i tekst"
@@ -139,6 +198,18 @@ msgid "Choose, whether to apply image, text, or both."
139
msgstr ""
140
"Wybierz, czy jako znak wodny zastosować obraz, tekst, czy tekst z obrazem."
141
142
#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:3
143
msgid "Watermark Image"
144
msgstr "Znak wodny"
@@ -299,66 +370,6 @@ msgstr "Ustawienia Easy Watermark"
299
msgid "Save Changes"
300
msgstr "Zapisz zmiany"
301
302
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:184
303
- msgid "Invalid mime type."
304
- msgstr "Błędny typ mime."
305
-
306
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:187
307
- msgid "No watermark image selected and no watermark text set."
308
- msgstr "Nie ustawiono obrazu ani tekstu znaku wodnego."
309
-
310
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:189
311
- msgid "Go to settings page"
312
- msgstr "Przejdź do ustawień"
313
-
314
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:193
315
- msgid "An error has occurred."
316
- msgstr "Wystąpił błąd."
317
-
318
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:199
319
- msgid ""
320
- "Easy Watermark is active, but requires GD library to work. Please enable "
321
- "this extension."
322
- msgstr ""
323
- "Easy Watermark jest aktywny, ale wymaga biblioteki GD do działania. Proszę, "
324
- "włącz to rozszerzenie."
325
-
326
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:199
327
- msgid "Read more"
328
- msgstr "Czytaj więcej"
329
-
330
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:219
331
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:220
332
- msgid "Add Watermark"
333
- msgstr "Dodaj znak wodny"
334
-
335
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:235
336
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:251
337
- msgid "Add watermark"
338
- msgstr "Dodaj znak wodny"
339
-
340
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:390
341
- #, php-format
342
- msgid "Not supported mime type of %s. Skipping..."
343
- msgstr "Nieobsługiwany typ pliku %s. Omijanie..."
344
-
345
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:395
346
- #, php-format
347
- msgid "Watermark successfully added to %s"
348
- msgstr "Znak wodny dodany do %s"
349
-
350
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:80
351
- msgid "General"
352
- msgstr "Ogólne"
353
-
354
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:278
355
- msgid "Settings"
356
- msgstr "Ustawienia"
357
-
358
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:292
359
- msgid "Donate"
360
- msgstr "Przekaż dotację"
361
-
362
#~ msgid "Loading preview..."
363
#~ msgstr "Ładowanie podglądu..."
364
1
msgid ""
2
msgstr ""
3
+ "Project-Id-Version: Easy Watermark 0.4.2\n"
4
"Report-Msgid-Bugs-To: \n"
5
+ "POT-Creation-Date: 2013-05-16 19:39+0100\n"
6
+ "PO-Revision-Date: 2013-05-17 20:37+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"
12
"Content-Transfer-Encoding: 8bit\n"
13
"X-Generator: Poedit 1.5.4\n"
14
15
+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:180
16
+ #: /media/szaleq/Data/easy-watermark/trunk/views/easy-watermark-page.php:10
17
+ msgid "Watermark successfully added."
18
+ msgstr "Znak wodny został dodany."
19
+
20
+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:186
21
+ msgid "Invalid mime type."
22
+ msgstr "Błędny typ mime."
23
+
24
+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:189
25
+ msgid "No watermark image selected and no watermark text set."
26
+ msgstr "Nie ustawiono obrazu ani tekstu znaku wodnego."
27
+
28
+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:191
29
+ msgid "Go to settings page"
30
+ msgstr "Przejdź do ustawień"
31
+
32
+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:195
33
+ msgid "An error has occurred."
34
+ msgstr "Wystąpił błąd."
35
+
36
+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:201
37
+ msgid ""
38
+ "Easy Watermark is active, but requires GD library to work. Please enable "
39
+ "this extension."
40
+ msgstr ""
41
+ "Easy Watermark jest aktywny, ale wymaga biblioteki GD do działania. Proszę, "
42
+ "włącz to rozszerzenie."
43
+
44
+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:201
45
+ msgid "Read more"
46
+ msgstr "Czytaj więcej"
47
+
48
+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:222
49
+ msgid "Add Watermark"
50
+ msgstr "Dodaj znak wodny"
51
+
52
+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:242
53
+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:258
54
+ msgid "Add watermark"
55
+ msgstr "Dodaj znak wodny"
56
+
57
+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:397
58
+ #, php-format
59
+ msgid "Not supported mime type of %s. Skipping..."
60
+ msgstr "Nieobsługiwany typ pliku %s. Omijanie..."
61
+
62
+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:402
63
+ #, php-format
64
+ msgid "Watermark successfully added to %s"
65
+ msgstr "Znak wodny dodany do %s"
66
+
67
+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:83
68
+ msgid "General"
69
+ msgstr "Ogólne"
70
+
71
+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:84
72
+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:24
73
+ msgid "Image"
74
+ msgstr "Obraz"
75
+
76
+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:85
77
+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:25
78
+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:3
79
+ msgid "Text"
80
+ msgstr "Tekst"
81
+
82
+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:103
83
+ #: /media/szaleq/Data/easy-watermark/trunk/views/easy-watermark-page.php:4
84
+ msgid "Easy Watermark"
85
+ msgstr ""
86
+
87
+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:281
88
+ msgid "Settings"
89
+ msgstr "Ustawienia"
90
+
91
+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:294
92
+ msgid "Donate"
93
+ msgstr "Przekaż dotację"
94
+
95
#: /media/szaleq/Data/easy-watermark/trunk/views/about.php:2
96
msgid "About"
97
msgstr "O wtyczce"
129
msgid "Want to buy me a coffee?"
130
msgstr "Chciałbyś postawić mi kawę?"
131
132
#: /media/szaleq/Data/easy-watermark/trunk/views/easy-watermark-page.php:10
133
msgid "Go to Media Library"
134
msgstr "Idź do biblioteki mediów"
189
msgid "Watermark Type"
190
msgstr "Typ znaku wodnego"
191
192
#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:26
193
msgid "Image + Text"
194
msgstr "Obraz i tekst"
198
msgstr ""
199
"Wybierz, czy jako znak wodny zastosować obraz, tekst, czy tekst z obrazem."
200
201
+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:31
202
+ msgid "Jpeg Quality"
203
+ msgstr "Jakość jpeg"
204
+
205
+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:32
206
+ msgid ""
207
+ "Set jpeg quality from 0 (worst quality, smaller file) to 100 (best quality, "
208
+ "biggest file)"
209
+ msgstr ""
210
+ "Ustaw jakość jpeg od 0 (gorsza jakość, mniejszy plik) do 100 (najlepsza "
211
+ "jakość, największy plik)"
212
+
213
#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:3
214
msgid "Watermark Image"
215
msgstr "Znak wodny"
370
msgid "Save Changes"
371
msgstr "Zapisz zmiany"
372
373
#~ msgid "Loading preview..."
374
#~ msgstr "Ładowanie podglądu..."
375
languages/easy-watermark.pot CHANGED
@@ -1,9 +1,9 @@
1
msgid ""
2
msgstr ""
3
- "Project-Id-Version: Easy Watermark 0.4.1\n"
4
"Report-Msgid-Bugs-To: \n"
5
- "POT-Creation-Date: 2013-05-04 10:59+0100\n"
6
- "PO-Revision-Date: 2013-05-04 10:59+0100\n"
7
"Last-Translator: Wojtek Szałkiewicz <wojtek@szalkiewicz.pl>\n"
8
"Language-Team: Wojtek Szałkiewicz <wojtek@szalkiewicz.pl>\n"
9
"MIME-Version: 1.0\n"
@@ -11,6 +11,84 @@ msgstr ""
11
"Content-Transfer-Encoding: 8bit\n"
12
"X-Generator: Poedit 1.5.4\n"
13
14
#: /media/szaleq/Data/easy-watermark/trunk/views/about.php:2
15
msgid "About"
16
msgstr ""
@@ -47,16 +125,6 @@ msgstr ""
47
msgid "Want to buy me a coffee?"
48
msgstr ""
49
50
- #: /media/szaleq/Data/easy-watermark/trunk/views/easy-watermark-page.php:4
51
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:100
52
- msgid "Easy Watermark"
53
- msgstr ""
54
-
55
- #: /media/szaleq/Data/easy-watermark/trunk/views/easy-watermark-page.php:10
56
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:177
57
- msgid "Watermark successfully added."
58
- msgstr ""
59
-
60
#: /media/szaleq/Data/easy-watermark/trunk/views/easy-watermark-page.php:10
61
msgid "Go to Media Library"
62
msgstr ""
@@ -113,17 +181,6 @@ msgstr ""
113
msgid "Watermark Type"
114
msgstr ""
115
116
- #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:24
117
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:81
118
- msgid "Image"
119
- msgstr ""
120
-
121
- #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:25
122
- #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:3
123
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:82
124
- msgid "Text"
125
- msgstr ""
126
-
127
#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:26
128
msgid "Image + Text"
129
msgstr ""
@@ -132,6 +189,16 @@ msgstr ""
132
msgid "Choose, whether to apply image, text, or both."
133
msgstr ""
134
135
#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:3
136
msgid "Watermark Image"
137
msgstr ""
@@ -281,61 +348,3 @@ msgstr ""
281
#: /media/szaleq/Data/easy-watermark/trunk/views/settings-page.php:22
282
msgid "Save Changes"
283
msgstr ""
284
-
285
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:184
286
- msgid "Invalid mime type."
287
- msgstr ""
288
-
289
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:187
290
- msgid "No watermark image selected and no watermark text set."
291
- msgstr ""
292
-
293
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:189
294
- msgid "Go to settings page"
295
- msgstr ""
296
-
297
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:193
298
- msgid "An error has occurred."
299
- msgstr ""
300
-
301
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:199
302
- msgid ""
303
- "Easy Watermark is active, but requires GD library to work. Please enable "
304
- "this extension."
305
- msgstr ""
306
-
307
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:199
308
- msgid "Read more"
309
- msgstr ""
310
-
311
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:219
312
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:220
313
- msgid "Add Watermark"
314
- msgstr ""
315
-
316
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:235
317
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:251
318
- msgid "Add watermark"
319
- msgstr ""
320
-
321
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:390
322
- #, php-format
323
- msgid "Not supported mime type of %s. Skipping..."
324
- msgstr ""
325
-
326
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:395
327
- #, php-format
328
- msgid "Watermark successfully added to %s"
329
- msgstr ""
330
-
331
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:80
332
- msgid "General"
333
- msgstr ""
334
-
335
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:278
336
- msgid "Settings"
337
- msgstr ""
338
-
339
- #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:292
340
- msgid "Donate"
341
- msgstr ""
1
msgid ""
2
msgstr ""
3
+ "Project-Id-Version: Easy Watermark 0.4.2\n"
4
"Report-Msgid-Bugs-To: \n"
5
+ "POT-Creation-Date: 2013-05-16 19:39+0100\n"
6
+ "PO-Revision-Date: 2013-05-16 19:39+0100\n"
7
"Last-Translator: Wojtek Szałkiewicz <wojtek@szalkiewicz.pl>\n"
8
"Language-Team: Wojtek Szałkiewicz <wojtek@szalkiewicz.pl>\n"
9
"MIME-Version: 1.0\n"
11
"Content-Transfer-Encoding: 8bit\n"
12
"X-Generator: Poedit 1.5.4\n"
13
14
+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:180
15
+ #: /media/szaleq/Data/easy-watermark/trunk/views/easy-watermark-page.php:10
16
+ msgid "Watermark successfully added."
17
+ msgstr ""
18
+
19
+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:186
20
+ msgid "Invalid mime type."
21
+ msgstr ""
22
+
23
+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:189
24
+ msgid "No watermark image selected and no watermark text set."
25
+ msgstr ""
26
+
27
+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:191
28
+ msgid "Go to settings page"
29
+ msgstr ""
30
+
31
+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:195
32
+ msgid "An error has occurred."
33
+ msgstr ""
34
+
35
+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:201
36
+ msgid ""
37
+ "Easy Watermark is active, but requires GD library to work. Please enable "
38
+ "this extension."
39
+ msgstr ""
40
+
41
+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:201
42
+ msgid "Read more"
43
+ msgstr ""
44
+
45
+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:222
46
+ msgid "Add Watermark"
47
+ msgstr ""
48
+
49
+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:242
50
+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:258
51
+ msgid "Add watermark"
52
+ msgstr ""
53
+
54
+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:397
55
+ #, php-format
56
+ msgid "Not supported mime type of %s. Skipping..."
57
+ msgstr ""
58
+
59
+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkPlugin.php:402
60
+ #, php-format
61
+ msgid "Watermark successfully added to %s"
62
+ msgstr ""
63
+
64
+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:83
65
+ msgid "General"
66
+ msgstr ""
67
+
68
+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:84
69
+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:24
70
+ msgid "Image"
71
+ msgstr ""
72
+
73
+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:85
74
+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:25
75
+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-text.php:3
76
+ msgid "Text"
77
+ msgstr ""
78
+
79
+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:103
80
+ #: /media/szaleq/Data/easy-watermark/trunk/views/easy-watermark-page.php:4
81
+ msgid "Easy Watermark"
82
+ msgstr ""
83
+
84
+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:281
85
+ msgid "Settings"
86
+ msgstr ""
87
+
88
+ #: /media/szaleq/Data/easy-watermark/trunk/lib/EasyWatermarkSettings.php:294
89
+ msgid "Donate"
90
+ msgstr ""
91
+
92
#: /media/szaleq/Data/easy-watermark/trunk/views/about.php:2
93
msgid "About"
94
msgstr ""
125
msgid "Want to buy me a coffee?"
126
msgstr ""
127
128
#: /media/szaleq/Data/easy-watermark/trunk/views/easy-watermark-page.php:10
129
msgid "Go to Media Library"
130
msgstr ""
181
msgid "Watermark Type"
182
msgstr ""
183
184
#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:26
185
msgid "Image + Text"
186
msgstr ""
189
msgid "Choose, whether to apply image, text, or both."
190
msgstr ""
191
192
+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:31
193
+ msgid "Jpeg Quality"
194
+ msgstr ""
195
+
196
+ #: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-general.php:32
197
+ msgid ""
198
+ "Set jpeg quality from 0 (worst quality, smaller file) to 100 (best quality, "
199
+ "biggest file)"
200
+ msgstr ""
201
+
202
#: /media/szaleq/Data/easy-watermark/trunk/views/settings-form-image.php:3
203
msgid "Watermark Image"
204
msgstr ""
348
#: /media/szaleq/Data/easy-watermark/trunk/views/settings-page.php:22
349
msgid "Save Changes"
350
msgstr ""
lib/EWPlugin.php CHANGED
@@ -13,17 +13,17 @@ class EWPluginCore extends EWPlugable
13
/**
14
* @var string plugin name
15
*/
16
- protected static $pluginName;
17
18
/**
19
* @var string plugin slug used in setting names etc.
20
*/
21
- protected static $pluginSlug;
22
23
/**
24
* @var string plugin version
25
*/
26
- protected static $version;
27
28
/**
29
* @var string plugin class name
@@ -43,23 +43,22 @@ class EWPluginCore extends EWPlugable
43
* @return object
44
*/
45
public static function init(){
46
- global $ewClass;
47
- $ewClass = self::$className;
48
// Register install and uninstall methods
49
- register_activation_hook(dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR . $ewClass::$mainFile, array($ewClass::$className, 'install'));
50
- register_uninstall_hook(dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR . $ewClass::$mainFile, array($ewClass::$className, 'uninstall'));
51
52
- $version = get_option($ewClass::$pluginSlug . '-version');
53
- if(!empty($version) & version_compare($version, $ewClass::$version, '<')){
54
// Version from database is lower than current, upgrade...
55
- $ewClass::upgrade($version);
56
}
57
58
// Load plugin textdomain
59
- load_plugin_textdomain($ewClass::$pluginSlug, false, '/'.$ewClass::$pluginSlug.'/languages');
60
61
// Create object of plugin class (inheritign this one)
62
- return new $ewClass();
63
}
64
65
/**
@@ -68,8 +67,7 @@ class EWPluginCore extends EWPlugable
68
* @return string
69
*/
70
public static function getName(){
71
- global $ewClass;
72
- return $ewClass::$pluginName;
73
}
74
75
/**
@@ -78,8 +76,7 @@ class EWPluginCore extends EWPlugable
78
* @return string
79
*/
80
public static function getSlug(){
81
- global $ewClass;
82
- return $ewClass::$pluginSlug;
83
}
84
85
@@ -89,8 +86,7 @@ class EWPluginCore extends EWPlugable
89
* @return string
90
*/
91
public static function getVersion(){
92
- global $ewClass;
93
- return $ewClass::$version;
94
}
95
96
/**
@@ -117,9 +113,8 @@ class EWPluginCore extends EWPlugable
117
protected static function upgrade($version){}
118
119
public function __call($name, $args){
120
- global $ewClass;
121
- if(method_exists($ewClass.'::'.$name)){
122
- return $ewClass::$name();
123
}
124
125
return false;
13
/**
14
* @var string plugin name
15
*/
16
+ protected static $pluginName = 'Easy Watermark';
17
18
/**
19
* @var string plugin slug used in setting names etc.
20
*/
21
+ protected static $pluginSlug = 'easy-watermark';
22
23
/**
24
* @var string plugin version
25
*/
26
+ protected static $version = '0.4.2';
27
28
/**
29
* @var string plugin class name
43
* @return object
44
*/
45
public static function init(){
46
// Register install and uninstall methods
47
+ register_activation_hook(dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR . self::$mainFile, array(self::$className, 'install'));
48
+ register_uninstall_hook(dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR . self::$mainFile, array(self::$className, 'uninstall'));
49
50
+ $version = get_option(self::$pluginSlug . '-version');
51
+ if(!empty($version) & version_compare($version, self::$version, '<')){
52
// Version from database is lower than current, upgrade...
53
+ self::upgrade($version);
54
}
55
56
// Load plugin textdomain
57
+ load_plugin_textdomain(self::$pluginSlug, false, '/'.self::$pluginSlug.'/languages');
58
59
// Create object of plugin class (inheritign this one)
60
+ $className = self::$className;
61
+ return new $className();
62
}
63
64
/**
67
* @return string
68
*/
69
public static function getName(){
70
+ return self::$pluginName;
71
}
72
73
/**
76
* @return string
77
*/
78
public static function getSlug(){
79
+ return self::$pluginSlug;
80
}
81
82
86
* @return string
87
*/
88
public static function getVersion(){
89
+ return self::$version;
90
}
91
92
/**
113
protected static function upgrade($version){}
114
115
public function __call($name, $args){
116
+ if(method_exists(array(self, $name))){
117
+ return self::$name();
118
}
119
120
return false;
lib/EasyWatermark.php CHANGED
@@ -1,7 +1,7 @@
1
<?php
2
/**
3
* @package Easy Watermark
4
- * @version 3.0
5
* @license GPL
6
* @author Wojtek Szałkiewicz
7
* @author url http://szalkiewicz.pl
@@ -62,6 +62,11 @@ class EasyWatermark
62
)
63
);
64
65
/**
66
* @var array settings
67
*/
@@ -117,6 +122,16 @@ class EasyWatermark
117
$this->textSet($textSettings);
118
}
119
120
/**
121
* Sets watermark image parameters
122
*
@@ -839,10 +854,22 @@ class EasyWatermark
839
// Return image directly to the browser
840
header('Content-Type: image/'.$type);
841
842
if($type == 'jpg') $type = 'jpeg';
843
$func = 'image'.$type;
844
845
- if(!@$func($this->outputImage, $output)){
846
$this->error = 'could not create output';
847
return false;
848
}
1
<?php
2
/**
3
* @package Easy Watermark
4
+ * @version 3.1
5
* @license GPL
6
* @author Wojtek Szałkiewicz
7
* @author url http://szalkiewicz.pl
62
)
63
);
64
65
+ /**
66
+ * @var integer jpg quality
67
+ */
68
+ private $jpegQuality = 75;
69
+
70
/**
71
* @var array settings
72
*/
122
$this->textSet($textSettings);
123
}
124
125
+ /**
126
+ * Sets jpg quality
127
+ *
128
+ * @param int
129
+ * @return void
130
+ */
131
+ public function setJpegQuality($quality){
132
+ $this->jpegQuality = $quality;
133
+ }
134
+
135
/**
136
* Sets watermark image parameters
137
*
854
// Return image directly to the browser
855
header('Content-Type: image/'.$type);
856
857
+ $params = array(
858
+ $this->outputImage,
859
+ $output
860
+ );
861
+
862
if($type == 'jpg') $type = 'jpeg';
863
+
864
+ if($type == 'jpeg'){
865
+ $params[] = $this->jpegQuality;
866
+ }
867
+
868
$func = 'image'.$type;
869
870
+ $result = @call_user_func_array($func, $params);
871
+
872
+ if(!$result){
873
$this->error = 'could not create output';
874
return false;
875
}
lib/EasyWatermarkPlugin.php CHANGED
@@ -10,28 +10,23 @@
10
class EasyWatermarkPlugin extends ewPluginCore
11
{
12
/**
13
- * @var string plugin name
14
*/
15
- protected static $pluginName = 'Easy Watermark';
16
17
/**
18
- * @var string plugin slug used in setting names etc.
19
*/
20
- protected static $pluginSlug = 'easy-watermark';
21
22
/**
23
- * @var string plugin version
24
*/
25
- protected static $version = '0.4.1';
26
-
27
- private static $GDEnabled;
28
-
29
- private $settings;
30
-
31
- private $messages = array();
32
-
33
private $error = false;
34
35
private $allowedMime = array('image/png', 'image/jpeg', 'image/gif');
36
37
/**
@@ -55,6 +50,11 @@ class EasyWatermarkPlugin extends ewPluginCore
55
$this->test_GD();
56
}
57
58
private function test_GD(){
59
if(extension_loaded('gd') && function_exists('gd_info')){
60
self::$GDEnabled = true;
@@ -64,12 +64,17 @@ class EasyWatermarkPlugin extends ewPluginCore
64
}
65
}
66
67
public static function isGDEnabled(){
68
return self::$GDEnabled;
69
}
70
71
/**
72
- * Performs some actions that need to run before anything else
73
*
74
* @return void
75
*/
@@ -88,7 +93,7 @@ class EasyWatermarkPlugin extends ewPluginCore
88
89
/**
90
* Returns generated jpeg image with text preview to the browser.
91
- * Used for settings page
92
*
93
* @return void
94
*/
@@ -171,13 +176,10 @@ class EasyWatermarkPlugin extends ewPluginCore
171
* @return void
172
*/
173
public function admin_notices(){
174
- if(isset($_GET['watermarked']) && $_GET['watermarked'] == '1') :
175
- ?>
176
- <div class="updated">
177
- <p><?php _e('Watermark successfully added.', 'easy-watermark'); ?></p>
178
- </div>
179
- <?php
180
- elseif(isset($_GET['ew_error'])):
181
echo '<div class="error"><p>';
182
switch($_GET['ew_error']):
183
case '1':
@@ -193,12 +195,11 @@ class EasyWatermarkPlugin extends ewPluginCore
193
_e('An error has occurred.', 'easy-watermark');
194
endswitch;
195
echo '</p></div>';
196
- endif;
197
- if(!EasyWatermarkPlugin::isGDEnabled() && get_current_screen()->id == 'plugins') : ?>
198
- <div class="error">
199
- <p><?php _e('Easy Watermark is active, but requires GD library to work. Please enable this extension.', 'easy-watermark'); ?> <a href="http://www.php.net/manual/en/image.setup.php" target="_blank"><?php _e('Read more', 'easy-watermark'); ?></p>
200
- </div>
201
- <?php endif;
202
}
203
204
/**
@@ -211,23 +212,29 @@ class EasyWatermarkPlugin extends ewPluginCore
211
add_media_page( 'Easy Watermark', 'Easy Watermark', 'upload_files', 'easy-watermark', array($this, 'easy_watermark'));
212
}
213
214
function add_bulk_action_script() {
215
- if($this->isGDEnabled()) :
216
- ?>
217
<script type="text/javascript">
218
jQuery(document).ready(function() {
219
- jQuery('<option>').val('ew_add_watermark').text('<?php _e('Add Watermark', 'easy-watermark')?>').appendTo("select[name='action']");
220
- jQuery('<option>').val('ew_add_watermark').text('<?php _e('Add Watermark', 'easy-watermark')?>').appendTo("select[name='action2']");
221
});
222
</script>
223
- <?php
224
- endif;
225
}
226
227
/**
228
* Creates 'Add watermark' link for each row in media library
229
*
230
- * @return array
231
*/
232
public function add_media_row_action($actions, $post, $detached){
233
if($this->isGDEnabled() && in_array($post->post_mime_type, $this->allowedMime)){
@@ -288,7 +295,7 @@ class EasyWatermarkPlugin extends ewPluginCore
288
else
289
$referer .= '?';
290
291
- $referer .= $result ? 'watermarked=true' : 'ew_error=2';
292
293
wp_redirect($referer);
294
exit;
@@ -485,6 +492,7 @@ class EasyWatermarkPlugin extends ewPluginCore
485
$imageSettings = $this->settings['image'];
486
$textSettings = $this->settings['text'];
487
$this->ew = new EasyWatermark();
488
489
$fontFile = EWBASE . EWDS . 'fonts' . EWDS . $textSettings['font'];
490
if(file_exists($fontFile))
@@ -510,13 +518,11 @@ class EasyWatermarkPlugin extends ewPluginCore
510
}
511
512
public function easy_watermark_style(){
513
- if(get_current_screen()->id == 'media_page_easy-watermark') :
514
- ?>
515
- <style type="text/css" media="screen">
516
- #icon-easy-watermark {background: url(<?php echo plugins_url(); ?>/<?php echo self::$pluginSlug; ?>/images/icon-32.png) no-repeat 2px 0;}
517
- </style>
518
- <?
519
- endif;
520
}
521
522
/**
@@ -689,14 +695,6 @@ class EasyWatermarkPlugin extends ewPluginCore
689
return $a;
690
}
691
692
- private function add_error($msg){
693
- $this->messages[] = array('error', $msg);
694
- }
695
-
696
- private function add_info($msg){
697
- $this->messages[] = array('update', $msg);
698
- }
699
-
700
/**
701
* Sets settings array.
702
*
10
class EasyWatermarkPlugin extends ewPluginCore
11
{
12
/**
13
+ * @var boolean
14
*/
15
+ private static $GDEnabled;
16
17
/**
18
+ * @var array
19
*/
20
+ private $settings;
21
22
/**
23
+ * @var boolean
24
*/
25
private $error = false;
26
27
+ /**
28
+ * @var array
29
+ */
30
private $allowedMime = array('image/png', 'image/jpeg', 'image/gif');
31
32
/**
50
$this->test_GD();
51
}
52
53
+ /**
54
+ * Tests whether the GD library is installed and enabled
55
+ *
56
+ * @return void
57
+ */
58
private function test_GD(){
59
if(extension_loaded('gd') && function_exists('gd_info')){
60
self::$GDEnabled = true;
64
}
65
}
66
67
+ /**
68
+ * Tells whether the GD library is working
69
+ *
70
+ * @return boolean
71
+ */
72
public static function isGDEnabled(){
73
return self::$GDEnabled;
74
}
75
76
/**
77
+ * Performs some actions which need to be done before anything else
78
*
79
* @return void
80
*/
93
94
/**
95
* Returns generated jpeg image with text preview to the browser.
96
+ * Used on settings page
97
*
98
* @return void
99
*/
176
* @return void
177
*/
178
public function admin_notices(){
179
+ if(isset($_GET['watermarked']) && $_GET['watermarked'] == '1'){
180
+ echo '<div class="updated"><p>'.__('Watermark successfully added.', 'easy-watermark').'</p></div>';
181
+ }
182
+ elseif(isset($_GET['ew_error'])){
183
echo '<div class="error"><p>';
184
switch($_GET['ew_error']):
185
case '1':
195
_e('An error has occurred.', 'easy-watermark');
196
endswitch;
197
echo '</p></div>';
198
+ }
199
+
200
+ if(!EasyWatermarkPlugin::isGDEnabled() && get_current_screen()->id == 'plugins'){
201
+ echo '<div class="error"><p>'.__('Easy Watermark is active, but requires GD library to work. Please enable this extension.', 'easy-watermark').' <a href="http://www.php.net/manual/en/image.setup.php" target="_blank">'.__('Read more', 'easy-watermark').'</p></div>';
202
+ }
203
}
204
205
/**
212
add_media_page( 'Easy Watermark', 'Easy Watermark', 'upload_files', 'easy-watermark', array($this, 'easy_watermark'));
213
}
214
215
+ /**
216
+ * Adds javascript code providing 'Add Watermark' bulk action on media page
217
+ *
218
+ * @return void
219
+ */
220
function add_bulk_action_script() {
221
+ if($this->isGDEnabled()) {
222
+ $text = __('Add Watermark', 'easy-watermark');
223
+ echo <<<EOD
224
<script type="text/javascript">
225
jQuery(document).ready(function() {
226
+ jQuery('<option>').val('ew_add_watermark').text('$text').appendTo("select[name='action']");
227
+ jQuery('<option>').val('ew_add_watermark').text('$text').appendTo("select[name='action2']");
228
});
229
</script>
230
+ EOD;
231
+ }
232
}
233
234
/**
235
* Creates 'Add watermark' link for each row in media library
236
*
237
+ * @return array
238
*/
239
public function add_media_row_action($actions, $post, $detached){
240
if($this->isGDEnabled() && in_array($post->post_mime_type, $this->allowedMime)){
295
else
296
$referer .= '?';
297
298
+ $referer .= $result ? 'watermarked=1' : 'ew_error=2';
299
300
wp_redirect($referer);
301
exit;
492
$imageSettings = $this->settings['image'];
493
$textSettings = $this->settings['text'];
494
$this->ew = new EasyWatermark();
495
+ $this->ew->setJpegQuality($this->settings['general']['jpg_quality']);
496
497
$fontFile = EWBASE . EWDS . 'fonts' . EWDS . $textSettings['font'];
498
if(file_exists($fontFile))
518
}
519
520
public function easy_watermark_style(){
521
+ if(get_current_screen()->id == 'media_page_easy-watermark') {
522
+ echo '<style type="text/css" media="screen">
523
+ #icon-easy-watermark {background: url('.plugins_url().'/'.self::$pluginSlug.'/images/icon-32.png) no-repeat 2px 0;}
524
+ </style>';
525
+ }
526
}
527
528
/**
695
return $a;
696
}
697
698
/**
699
* Sets settings array.
700
*
lib/EasyWatermarkSettings.php CHANGED
@@ -24,7 +24,8 @@ class EasyWatermarkSettings
24
'auto_add' => '1',
25
'image_types' => array('image/jpeg', 'image/png', 'image/gif'),
26
'image_sizes' => array('medium', 'large', 'full'),
27
- 'watermark_type' => 3
28
),
29
'image' => array(
30
'watermark_url' => null,
@@ -62,6 +63,8 @@ class EasyWatermarkSettings
62
63
private $tabs;
64
65
public static function getDefaults($section = false){
66
if($section && isset(self::$defaults[$section]))
67
return self::$defaults[$section];
@@ -288,8 +291,7 @@ class EasyWatermarkSettings
288
$this_plugin = plugin_basename(EWBASE . EWDS . 'index.php');
289
}
290
if ($file == $this_plugin) {
291
- require_once EWVIEWS . EWDS . 'donation.php';
292
- $donate_link = '<a href="'.ewDonation::getUrl().'">'.__('Donate', 'easy-watermark').'</a>';
293
array_push($links, $donate_link);
294
}
295
return $links;
24
'auto_add' => '1',
25
'image_types' => array('image/jpeg', 'image/png', 'image/gif'),
26
'image_sizes' => array('medium', 'large', 'full'),
27
+ 'watermark_type' => 3,
28
+ 'jpg_quality' => 75
29
),
30
'image' => array(
31
'watermark_url' => null,
63
64
private $tabs;
65
66
+ private $donationLink = 'https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=wojtek%40szalkiewicz%2epl&lc=GB&item_name=Easy%20Watermark%20Wordpress%20Plugin&currency_code=USD&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHosted';
67
+
68
public static function getDefaults($section = false){
69
if($section && isset(self::$defaults[$section]))
70
return self::$defaults[$section];
291
$this_plugin = plugin_basename(EWBASE . EWDS . 'index.php');
292
}
293
if ($file == $this_plugin) {
294
+ $donate_link = '<a href="'.$this->donationLink.'">'.__('Donate', 'easy-watermark').'</a>';
295
array_push($links, $donate_link);
296
}
297
return $links;
readme.txt CHANGED
@@ -4,7 +4,7 @@ Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=wojte
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.4.1
8
License: GPLv2 or later
9
License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
@@ -78,6 +78,9 @@ With 'Fit to Width' or 'Fit to Height' options watermark dimensions can be set a
78
79
== Changelog ==
80
81
= 0.4.1 =
82
* added an option to scale watermark only for smaller images
83
* added confirmation button for 'Add watermark to all images' action
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.4.2
8
License: GPLv2 or later
9
License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
78
79
== Changelog ==
80
81
+ = 0.4.2 =
82
+ * added possibility to define jpeg quality
83
+
84
= 0.4.1 =
85
* added an option to scale watermark only for smaller images
86
* added confirmation button for 'Add watermark to all images' action
views/about.php CHANGED
@@ -11,7 +11,6 @@
11
<a href="http://wordpress.org/support/plugin/easy-watermark" target="_blank">
12
<?php _e('Support', 'easy-watermark'); ?></a><br/><br/>
13
<strong><?php _e('Want to buy me a coffee?', 'easy-watermark'); ?></strong>
14
- <?php require_once dirname(__FILE__) . '/donation.php';
15
- ewDonation::showButton(); ?>
16
</div><!-- .inside -->
17
</div></div><!-- .metabox-holder -->
11
<a href="http://wordpress.org/support/plugin/easy-watermark" target="_blank">
12
<?php _e('Support', 'easy-watermark'); ?></a><br/><br/>
13
<strong><?php _e('Want to buy me a coffee?', 'easy-watermark'); ?></strong>
14
+ <?php include dirname(__FILE__) . '/donation.php'; ?>
15
</div><!-- .inside -->
16
</div></div><!-- .metabox-holder -->
views/donation.php CHANGED
@@ -1,9 +1,4 @@
1
- <?php defined('EASY_WATERMARK') or die();
2
-
3
- class ewDonation
4
- {
5
- public static function showButton(){
6
- ?>
7
<div id="donation-link">
8
<form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
9
<input type="hidden" name="cmd" value="_s-xclick">
@@ -13,10 +8,3 @@ class ewDonation
13
<img alt="" border="0" src="https://www.paypalobjects.com/pl_PL/i/scr/pixel.gif" width="1" height="1">
14
</form>
15
</div><!-- #donation-link -->
16
- <?
17
- }
18
-
19
- public static function getUrl(){
20
- return 'https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=wojtek%40szalkiewicz%2epl&lc=GB&item_name=Easy%20Watermark%20Wordpress%20Plugin&currency_code=USD&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHosted';
21
- }
22
- }
1
+ <?php defined('EASY_WATERMARK') or die();?>
2
<div id="donation-link">
3
<form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
4
<input type="hidden" name="cmd" value="_s-xclick">
8
<img alt="" border="0" src="https://www.paypalobjects.com/pl_PL/i/scr/pixel.gif" width="1" height="1">
9
</form>
10
</div><!-- #donation-link -->
views/settings-form-general.php CHANGED
@@ -28,4 +28,7 @@
28
<p class="description"><?php _e('Choose, whether to apply image, text, or both.', 'easy-watermark'); ?></p>
29
</td>
30
</tr>
31
</table>
28
<p class="description"><?php _e('Choose, whether to apply image, text, or both.', 'easy-watermark'); ?></p>
29
</td>
30
</tr>
31
+ <tr><th scope="row"><?php _e('Jpeg Quality', 'easy-watermark'); ?></th><td>
32
+ <input type="text" size="3" name="easy-watermark-settings-general[jpg_quality]" id="ew-size" value="<?php echo $jpg_quality; ?>" /><p class="description"><?php _e('Set jpeg quality from 0 (worst quality, smaller file) to 100 (best quality, biggest file)', 'easy-watermark'); ?></p>
33
+ </td>
34
</table>