Quickfix release: v1.0.1

* Quick fix: Drop the online pasting service http://sprunge.us as it's been non-functional for a while now. Currently using http://ix.io. * Updated localizations. * Added localization for Swedish. Thanks Knezzen!
humdingerb · Feb 12, 2018 · 98d57aa · 98d57aa
1 parent 76aacdd
commit 98d57aa
Show file tree

Hide file tree

Showing 16 changed files with 145 additions and 88 deletions.
diff --git a/ClipView.cpp b/ClipView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016. All rights reserved.
+ * Copyright 2015-2018. All rights reserved.
  * Distributed under the terms of the MIT license.
  *
  * Author:
@@ -278,7 +278,7 @@ ClipView::_ShowPopUpMenu(BPoint screen)
 	BMessage* msg = NULL;
 
 	msg = new BMessage(PASTE_SPRUNGE);
-	BMenuItem* item = new BMenuItem(B_TRANSLATE("Paste to Sprunge.us"), msg, 'P');
+	BMenuItem* item = new BMenuItem(B_TRANSLATE("Paste online"), msg, 'P');
 	menu->AddItem(item);
 
 	msg = new BMessage(FAV_ADD);

diff --git a/Clipdinger.rdef b/Clipdinger.rdef
@@ -5,6 +5,7 @@ resource app_flags B_SINGLE_LAUNCH;
 resource app_version {
 	major  = 1,
 	middle = 0,
+	minor = 1,
 
 	/* 0 = development	1 = alpha			2 = beta
 	   3 = gamma		4 = golden master	5 = final */

diff --git a/Constants.h b/Constants.h
@@ -13,8 +13,8 @@
 
 extern const char* kApplicationSignature;
 
-static const char kVersion[] = "v1.0";
-static const char kCopyright[] = "2015-2016";
+static const char kVersion[] = "v1.0.1";
+static const char kCopyright[] = "2015-2018";
 static const char kSettingsFolder[] = "Clipdinger";
 static const char kSettingsFile[] = "Clipdinger_settings";
 static const char kHistoryFile[] = "Clipdinger_history";

diff --git a/FavView.cpp b/FavView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016. All rights reserved.
+ * Copyright 2015-2018. All rights reserved.
  * Distributed under the terms of the MIT license.
  *
  * Author:
@@ -281,7 +281,7 @@ FavView::_ShowPopUpMenu(BPoint screen)
 	BMessage* msg = NULL;
 
 	msg = new BMessage(PASTE_SPRUNGE);
-	BMenuItem* item = new BMenuItem(B_TRANSLATE("Paste to Sprunge.us"), msg, 'P');
+	BMenuItem* item = new BMenuItem(B_TRANSLATE("Paste online"), msg, 'P');
 	menu->AddItem(item);
 
 	msg = new BMessage(EDIT_TITLE);

diff --git a/MainWindow.cpp b/MainWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016. All rights reserved.
+ * Copyright 2015-2018. All rights reserved.
  * Distributed under the terms of the MIT license.
  *
  * Author:
@@ -345,18 +345,18 @@ MainWindow::MessageReceived(BMessage* message)
 				"if [ -z  \"$stat\" ] ; then "	// network up in general?
 					"URL='%ERROR%' ; "
 				"else "
-					"stat=$(echo -e \"GET http://sprunge.us HTTP/1.0\n\n\" | nc sprunge.us 80 | grep HTTP/1 | awk {'print $2'}) ; "
-					"if [ -z \"$stat\" ] || [ $stat -ne 200 ] ; then "	// sprunge.us only accepts GET and PUT
-						"URL='%ERROR% '$stat ; "
-					"else "
-						"URL=$(clipboard -p | curl -F 'sprunge=<-' http://sprunge.us) ; "
-					"fi ; "
+// 					"stat=$(echo -e \"GET http://ix.io HTTP/1.0\\n\\n\" | nc xi.io 80 | grep HTTP/1 | awk {'print $2'}) ; "
+//					"if [ -z \"$stat\" ] || [ $stat -ne 200 ] ; then "
+//						"URL='%ERROR% '$stat ; "
+//					"else "
+						"URL=$(clipboard -p | curl -F 'f:1=<-' http://ix.io) ; "
+//					"fi ; "
 				"fi ; "
 				"echo $URL ; "
 				"clipboard -c \"$URL\" ; "
 				"exit");
 			command.ReplaceAll("%ERROR%",
-				B_TRANSLATE("Sprunge.us service not available."));
+				B_TRANSLATE("Online paste service not available"));
 			system(command.String());
 			break;
 		}
@@ -503,7 +503,7 @@ MainWindow::_BuildLayout()
 	menuBar->AddItem(menu);
 
 	menu = new BMenu(B_TRANSLATE("Clip"));
-	fMenuPaste = new BMenuItem(B_TRANSLATE("Paste to Sprunge.us"),
+	fMenuPaste = new BMenuItem(B_TRANSLATE("Paste online"),
 		new BMessage(PASTE_SPRUNGE), 'P');
 	menu->AddItem(fMenuPaste);
 	BMessage* message = new BMessage(FAV_ADD);

diff --git a/Makefile b/Makefile
@@ -89,7 +89,7 @@ OPTIMIZE :=
 # 	will recreate only the "locales/en.catkeys" file. Use it as a template
 # 	for creating catkeys for other languages. All localization files must be
 # 	placed in the "locales" subdirectory.
-LOCALES = de en en_GB ro ru uk
+LOCALES = de en en_GB ro ru sv uk
 
 #	Specify all the preprocessor symbols to be defined. The symbols will not
 #	have their values set automatically; you must supply the value (if any) to

diff --git a/ReadMe.html b/ReadMe.html
@@ -101,7 +101,7 @@
 <p><br /></p>
 <p>Clipdinger manages a history of the system clipboard. It solves the problem that you often have to paste some text you've just recently copied to the clipboard, but that has been replaced by something you've copied more recently... It also saves the history so it'll appear just as you left it on the last shutdown.</p>
 <p>If you want to paste some text that isn't in the clipboard any more, simply hit <span class="key">SHIFT</span> <span class="key">ALT</span> <span class="key">V</span> to summon the Clipdinger window. Here you can select an entry with the <span class="key">CursorUp/Down</span> keys and put it into the clipboard or auto-paste it by hitting <span class="key">RETURN</span>.</p>
-<p>After selecting a clip, you can also paste it to the online service <a href="http://sprunge.us">Sprunge.us</a> by hitting <span class="key">ALT</span> <span class="key">P</span>. The returned URL for the clip is put into the clipboard for you to paste into your email or IRC channel etc.</p>
+<p>After selecting a clip, you can also paste it to an online text pasting service by hitting <span class="key">ALT</span> <span class="key">P</span>. The returned URL for the clip is put into the clipboard for you to paste into your email or IRC channel etc.</p>
 <p><span class="key">ESCAPE</span> or <span class="key">ALT</span> <span class="key">W</span> aborts and minimizes the Clipdinger window.</p>
 
 <h2>
@@ -153,7 +153,7 @@ <h2>
 <a id="tips" name="tips">Tips &amp; Tricks</a></h2>
 <ul>
 <li><p>Instead of double-clicking a clip/favorite or hitting <span class="key">RETURN</span> to paste it, you can also drag &amp; drop it into applications or onto the Desktop. That's useful in some situations, especially since it leaves the Clipdinger window open.</p></li>
-<li><p>Hold <span class="key">SHIFT</span> while pasting to sprunge.us to keep the Clipdinger window open. This, too, is probably rarely used, but comes in handy when e.g. sprunging several clips one after another.</p></li>
+<li><p>Hold <span class="key">SHIFT</span> while pasting to an online service to keep the Clipdinger window open. This, too, is probably rarely used, but comes in handy when e.g. pasting several clips one after another.</p></li>
 <li><p>Changes in the settings window can be viewed live in the main window. To find the right fading settings for you, it's best to keep working normally for some time to fill the history and then just play around with the sliders until you're satisfied.</p></li>
 <li><p>Clipdinger's <span class="menu">Auto-paste</span> feature can be a bit tricky: It doesn't know in which application's window you pressed <span class="key">SHIFT</span> <span class="key">ALT</span> <span class="key">V</span> for it to pop up. With activated auto-paste, it simply pastes into last window that was active before you hit <span class="key">RETURN</span> or double-clicked an entry. So, avoid detours...</p></li>
 <li><p>If you want to back-up Clipdinger's settings, history or favorites, or have the need to delete one or all of these files, you'll find them under <span class="path">/boot/home/config/settings/Clipdinger/</span>.</p></li>
@@ -182,6 +182,12 @@ <h2>
 <a href="#"><img src="images/up.png" style="border:none;float:right" alt="index" /></a>
 <a id="history" name="history">History</a></h2>
 
+<p><b>1.0.1</b> - <i>12-02-2017:</i></p>
+<ul>
+<li>Quick fix: Drop the online pasting service http://sprunge.us as it's been non-functional for a while now. Currently using http://ix.io.</li>
+<li>Added localization for Swedish. Thanks Knezzen!</li>
+</ul>
+
 <p><b>1.0</b> - <i>30-12-2016:</i></p>
 <ul>
 <li>Add clips to favorites and re-ordering favorites with drag &amp; drop.</li>

diff --git a/Readme.md b/Readme.md
@@ -6,7 +6,7 @@ Clipdinger manages a history of the system clipboard. It solves the problem that
 
 If you want to paste some text that isn't in the clipboard any more, simply hit _SHIFT_ + _ALT_ + _V_ to summon the Clipdinger window. Here you can select an entry with the _CursorUp/Down_ keys and put it into the clipboard or auto-paste it by hitting _RETURN_.
 
-After selecting a clip, you can also paste it to the online service [Sprunge.us](http://sprunge.us) by hitting _ALT_ + _P_. The returned URL for the clip is put into the clipboard for you to paste into your email or IRC channel etc.
+After selecting a clip, you can also paste it to an online text pasting service by hitting _ALT_ + _P_. The returned URL for the clip is put into the clipboard for you to paste into your email or IRC channel etc.
 
 _ESCAPE_  or _ALT_ + _W_ aborts and minimizes the Clipdinger window.
 
@@ -67,7 +67,7 @@ If you leave your computer or just know that you won't do any copy&paste for a l
 ### Tips & Tricks
 
 *	Instead of double-clicking a clip/favorite or hitting _RETURN_ to paste it, you can also drag & drop it into applications or onto the Desktop. That's useful in some situations, especially since it leaves the Clipdinger window open.
-*	Hold _SHIFT_ while pasting to sprunge.us to keep the Clipdinger window open. This, too, is probably rarely used, but comes in handy when e.g. sprunging several clips one after another.
+*	Hold _SHIFT_ while pasting to an online service to keep the Clipdinger window open. This, too, is probably rarely used, but comes in handy when e.g. pasting several clips one after another.
 *   Changes in the settings window can be viewed live in the main window. To find the right fading settings for you, it's best to keep working normally for some time to fill the history and then just play around with the sliders until you're satisfied.
 *   Clipdinger's _Auto-paste_ feature can be a bit tricky: It doesn't know in which window you pressed _SHIFT_ + _ALT_ + _V_ for it to pop up. With activated auto-paste, it simply pastes into last window that was active before you hit _RETURN_ or double-clicked an entry. So, avoid detours...
 *   If you want to back-up Clipdinger's settings, history or favorites, or have the need to delete one or all of these files, you'll find them under `/boot/home/config/settings/Clipdinger/`.
@@ -90,6 +90,11 @@ Also, thanks to everyone that contributed translations for Clipdinger.
 
 ### History
 
+**1.0.1** - _12-02-2017:_
+
+*	Quick fix: Drop the online pasting service http://sprunge.us as it's been
+	non-functional for a while now. Currently using http://ix.io.
+*	Added localization for Swedish. Thanks Knezzen!
 
 **1.0** - _30-12-2016:_
 

diff --git a/locales/de.catkeys b/locales/de.catkeys
@@ -1,14 +1,14 @@
-1	German	application/x-vnd.humdinger-clipdinger	1393009794
+1	German	application/x-vnd.humdinger-clipdinger	4255599668
 Thank you	Application		Danke
 Clipdinger %version%\n\twritten by Humdinger\n\tCopyright %years%\n\nClipdinger provides a history of clippings of the system clipboard and lets you create favorites.\n\nPlease let me know of any bugs you find or features you miss. Contact info is in the ReadMe, see menu item 'Help'.	Application	Don't change the variables %years% and %version%.	Clipdinger %version%\n\tvon Humdinger\n\tCopyright %years%\n\nClipdinger bietet eine Historie für die Zwischenablage und das Anlegen von Favoriten.\n\nBerichte zu Bugs oder gewünschten Features sind sehr willkommen. Kontaktinfos befinden sich im ReadMe, siehe Menü 'Hilfe'.
 -= No text in clipboard =-	ClipboardMonitor		-= Kein Text in Zwischenablage =-
 Thank you	ClipboardMonitor		Danke
 Clipdinger %version%\n\twritten by Humdinger\n\tCopyright %years%\n\nClipdinger provides a history of clippings of the system clipboard and lets you create favorites.\n\nThis is its clipboard monitor that can be replicated to the Desktop to always show its current contents.	ClipboardMonitor	Don't change the variables %years% and %version%.	Clipdinger %version%\n\tvon Humdinger\n\tCopyright %years%\n\nClipdinger bietet eine Historie für die Zwischenablage und das Anlegen von Favoriten.\n\nDiese Zwischenablagenanzeige kann als Replikant auf dem Desktop genutzt werden, um stets deren aktuellen Inhalt anzuzeigen.
 Add to favorites	ClipList		Zu Favoriten hinzufügen
 Edit title	ClipList		Titel bearbeiten
-Paste to Sprunge.us	ClipList		Auf Sprunge.us hochladen
 Remove	ClipList		Entfernen
 Added:\n%time%\n%date%	ClipList	Tooltip, don't change the variables %time% and %date%.	Hinzu:\n%time%\n%date%
+Paste online	ClipList		Auf Onlineservice hochladen
 Cancel	EditWindow		Abbrechen
 Edit title	EditWindow		Titel bearbeiten
 Leave title empty to return to original title.	EditWindow		Titel leer lassen, um zum Original zurückzukehren.
@@ -28,12 +28,12 @@ Lists	MainWindow		Listen
 Minimize	MainWindow		Minimieren
 Move down	MainWindow		Runter
 Move up	MainWindow		Rauf
-Paste to Sprunge.us	MainWindow		Auf Sprunge.us hochladen
 Pause fading	MainWindow		Abdunkeln anhalten
 Quit	MainWindow		Beenden
 Remove	MainWindow		Entfernen
 Settings…	MainWindow		Einstellungen…
-Sprunge.us service not available.	MainWindow		Sprunge.us nicht verfügbar.
+Online paste service not available	MainWindow		Onlineservice nicht verfügbar
+Paste online	MainWindow		Auf Onlineservice hochladen
 Clipboard monitor	ReplWindow		Zwischenablagenanzeige
 Resize the window to your needs and drag the replicant handle onto the Desktop.\nTry dropping a color e.g. from Icon-O-Matic.	ReplWindow		Fenstergröße anpassen, dann den Replikant am Icon auf den Desktop ziehen.\nDie Farbe lässt sich per Drag&Drop z.B. aus Icon-O-Matic ändern.
 Auto-paste	SettingsWindow		Auto-Einfügen

diff --git a/locales/en.catkeys b/locales/en.catkeys
@@ -1,51 +1,51 @@
-1	English	application/x-vnd.humdinger-clipdinger	1393009794
-Thank you	Application		Thank you
-Clipdinger %version%\n\twritten by Humdinger\n\tCopyright %years%\n\nClipdinger provides a history of clippings of the system clipboard and lets you create favorites.\n\nPlease let me know of any bugs you find or features you miss. Contact info is in the ReadMe, see menu item 'Help'.	Application	Don't change the variables %years% and %version%.	Clipdinger %version%\n\twritten by Humdinger\n\tCopyright %years%\n\nClipdinger provides a history of clippings of the system clipboard and lets you create favorites.\n\nPlease let me know of any bugs you find or features you miss. Contact info is in the ReadMe, see menu item 'Help'.
--= No text in clipboard =-	ClipboardMonitor		-= No text in clipboard =-
-Thank you	ClipboardMonitor		Thank you
-Clipdinger %version%\n\twritten by Humdinger\n\tCopyright %years%\n\nClipdinger provides a history of clippings of the system clipboard and lets you create favorites.\n\nThis is its clipboard monitor that can be replicated to the Desktop to always show its current contents.	ClipboardMonitor	Don't change the variables %years% and %version%.	Clipdinger %version%\n\twritten by Humdinger\n\tCopyright %years%\n\nClipdinger provides a history of clippings of the system clipboard and lets you create favorites.\n\nThis is its clipboard monitor that can be replicated to the Desktop to always show its current contents.
+1	English	application/x-vnd.humdinger-clipdinger	4255599668
+Clipboard monitor	ReplWindow		Clipboard monitor
+Entries fade every %A% minutes.\nThe maximal tint is reached after\n%B% minutes (in %C% steps)	SettingsWindow		Entries fade every %A% minutes.\nThe maximal tint is reached after\n%B% minutes (in %C% steps)
+Title:	EditWindow		Title:
+About Clipdinger	MainWindow		About Clipdinger
 Add to favorites	ClipList		Add to favorites
-Edit title	ClipList		Edit title
-Paste to Sprunge.us	ClipList		Paste to Sprunge.us
-Remove	ClipList		Remove
-Added:\n%time%\n%date%	ClipList	Tooltip, don't change the variables %time% and %date%.	Added:\n%time%\n%date%
-Cancel	EditWindow		Cancel
+Favorites	MainWindow		Favorites
+Thank you	ClipboardMonitor		Thank you
+Lists	MainWindow		Lists
+entries in the clipboard history	SettingsWindow		entries in the clipboard history
 Edit title	EditWindow		Edit title
-Leave title empty to return to original title.	EditWindow		Leave title empty to return to original title.
 OK	EditWindow		OK
-Title:	EditWindow		Title:
-About Clipdinger	MainWindow		About Clipdinger
+Settings…	MainWindow		Settings…
+Remove	MainWindow		Remove
+Move down	MainWindow		Move down
+OK	SettingsWindow		OK
+Paste online	ClipList		Paste online
 Add to favorites	MainWindow		Add to favorites
+Remove	ClipList		Remove
+Entries don't fade over time.	SettingsWindow		Entries don't fade over time.
 App	MainWindow		App
-Clear clip history	MainWindow		Clear clip history
-Clear favorites	MainWindow		Clear favorites
-Clip	MainWindow		Clip
-Clipboard monitor…	MainWindow		Clipboard monitor…
-Edit title	MainWindow		Edit title
-Favorites	MainWindow		Favorites
-Help	MainWindow		Help
-Lists	MainWindow		Lists
 Minimize	MainWindow		Minimize
-Move down	MainWindow		Move down
-Move up	MainWindow		Move up
-Paste to Sprunge.us	MainWindow		Paste to Sprunge.us
-Pause fading	MainWindow		Pause fading
 Quit	MainWindow		Quit
-Remove	MainWindow		Remove
-Settings…	MainWindow		Settings…
-Sprunge.us service not available.	MainWindow		Sprunge.us service not available.
-Clipboard monitor	ReplWindow		Clipboard monitor
-Resize the window to your needs and drag the replicant handle onto the Desktop.\nTry dropping a color e.g. from Icon-O-Matic.	ReplWindow		Resize the window to your needs and drag the replicant handle onto the Desktop.\nTry dropping a color e.g. from Icon-O-Matic.
-Auto-paste	SettingsWindow		Auto-paste
-Auto-start Clipdinger	SettingsWindow		Auto-start Clipdinger
+Clear favorites	MainWindow		Clear favorites
+Edit title	ClipList		Edit title
+Pause fading	MainWindow		Pause fading
+Clipboard monitor…	MainWindow		Clipboard monitor…
 Cancel	SettingsWindow		Cancel
-Clipdinger settings	SettingsWindow		Clipdinger settings
-Delay	SettingsWindow		Delay
-Entries don't fade over time.	SettingsWindow		Entries don't fade over time.
-Entries fade every %A% minutes.\nThe maximal tint is reached after\n%B% minutes (in %C% steps)	SettingsWindow		Entries fade every %A% minutes.\nThe maximal tint is reached after\n%B% minutes (in %C% steps)
-entries in the clipboard history	SettingsWindow		entries in the clipboard history
+Clipdinger	System name		Clipdinger
+Online paste service not available	MainWindow		Online paste service not available
 Fade history entries over time	SettingsWindow		Fade history entries over time
+Leave title empty to return to original title.	EditWindow		Leave title empty to return to original title.
 Max. tint level	SettingsWindow		Max. tint level
-OK	SettingsWindow		OK
+Auto-start Clipdinger	SettingsWindow		Auto-start Clipdinger
+Paste online	MainWindow		Paste online
+Clipdinger %version%\n\twritten by Humdinger\n\tCopyright %years%\n\nClipdinger provides a history of clippings of the system clipboard and lets you create favorites.\n\nPlease let me know of any bugs you find or features you miss. Contact info is in the ReadMe, see menu item 'Help'.	Application	Don't change the variables %years% and %version%.	Clipdinger %version%\n\twritten by Humdinger\n\tCopyright %years%\n\nClipdinger provides a history of clippings of the system clipboard and lets you create favorites.\n\nPlease let me know of any bugs you find or features you miss. Contact info is in the ReadMe, see menu item 'Help'.
 Steps	SettingsWindow		Steps
-Clipdinger	System name		Clipdinger
+Auto-paste	SettingsWindow		Auto-paste
+Help	MainWindow		Help
+-= No text in clipboard =-	ClipboardMonitor		-= No text in clipboard =-
+Thank you	Application		Thank you
+Delay	SettingsWindow		Delay
+Resize the window to your needs and drag the replicant handle onto the Desktop.\nTry dropping a color e.g. from Icon-O-Matic.	ReplWindow		Resize the window to your needs and drag the replicant handle onto the Desktop.\nTry dropping a color e.g. from Icon-O-Matic.
+Clear clip history	MainWindow		Clear clip history
+Clip	MainWindow		Clip
+Clipdinger settings	SettingsWindow		Clipdinger settings
+Clipdinger %version%\n\twritten by Humdinger\n\tCopyright %years%\n\nClipdinger provides a history of clippings of the system clipboard and lets you create favorites.\n\nThis is its clipboard monitor that can be replicated to the Desktop to always show its current contents.	ClipboardMonitor	Don't change the variables %years% and %version%.	Clipdinger %version%\n\twritten by Humdinger\n\tCopyright %years%\n\nClipdinger provides a history of clippings of the system clipboard and lets you create favorites.\n\nThis is its clipboard monitor that can be replicated to the Desktop to always show its current contents.
+Cancel	EditWindow		Cancel
+Move up	MainWindow		Move up
+Added:\n%time%\n%date%	ClipList	Tooltip, don't change the variables %time% and %date%.	Added:\n%time%\n%date%
+Edit title	MainWindow		Edit title