From 5ce7d9e852e671752d89aa6e9790c1c2e2050134 Mon Sep 17 00:00:00 2001 From: jeena Date: Sun, 28 Apr 2013 00:57:08 +0200 Subject: [PATCH 1/9] added linux version bump --- Linux/debian/changelog | 11 +++++++++++ Linux/deploy.sh | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Linux/debian/changelog b/Linux/debian/changelog index bcd1ffb..02aa498 100644 --- a/Linux/debian/changelog +++ b/Linux/debian/changelog @@ -1,3 +1,14 @@ +bungloo (1.4.1) quantal; urgency=low + + [ Jeena Paradies ] + * Fixes the bug with wrongly showing uread mentions + * Added single application mode + * Added --new-message + * Added close window shortcut + * Bugfixes + + -- Jeena Paradies Tue, 28 Apr 2013 00:50:00 +0100 + bungloo (1.4.0) quantal; urgency=low [ Jeena Paradies ] diff --git a/Linux/deploy.sh b/Linux/deploy.sh index c2c9fe3..bba2f56 100755 --- a/Linux/deploy.sh +++ b/Linux/deploy.sh @@ -1,6 +1,6 @@ #!/bin/bash -VERSION="1.4.0" +VERSION="1.4.1" DEPLOYPATH="bungloo-${VERSION}" QTPATH="../Qt" SHAREDPATH=".." From f159edf857d76cfd3ed3d54687769fb63c9f6728 Mon Sep 17 00:00:00 2001 From: Jeena Paradies Date: Sun, 28 Apr 2013 02:17:32 +0200 Subject: [PATCH 2/9] version bump windows --- Windows/installer.iss | 4 ++-- Windows/setup.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Windows/installer.iss b/Windows/installer.iss index 12c07c0..f399b0b 100644 --- a/Windows/installer.iss +++ b/Windows/installer.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "Bungloo" -#define MyAppVersion "1.4.0" +#define MyAppVersion "1.4.1" #define MyAppPublisher "Jabs Nu" #define MyAppURL "http://jabs.nu/bungloo" #define MyAppExeName "Bungloo.exe" @@ -22,7 +22,7 @@ AppUpdatesURL={#MyAppURL} DefaultDirName={pf}\{#MyAppName} DefaultGroupName={#MyAppName} AllowNoIcons=yes -LicenseFile=C:\Users\Jeena\Documents\GitHub\Bungloo\LICENCE.txt +LicenseFile=C:\Users\Jeena\Documents\GitHub\Bungloo\LICENSE.txt OutputBaseFilename=setup SetupIconFile=C:\Users\Jeena\Documents\GitHub\Bungloo\images\Icon.ico Compression=lzma diff --git a/Windows/setup.py b/Windows/setup.py index 95687ff..1e573f5 100644 --- a/Windows/setup.py +++ b/Windows/setup.py @@ -22,7 +22,7 @@ files += [('imageformats', imageformats)] setup( name = "Bungloo", - version = "1.4.0", + version = "1.4.1", author = "Jeena Paradies", author_email = "spam@jeenaparadies.net", url = "http://jabs.nu/bungloo", From e792625ca52078ce07c6f6a7fa0e383ba4a0aa6d Mon Sep 17 00:00:00 2001 From: Jeena Paradies Date: Sun, 28 Apr 2013 10:26:07 +0200 Subject: [PATCH 3/9] another version bump --- Windows/installer.iss | 2 +- Windows/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Windows/installer.iss b/Windows/installer.iss index f399b0b..51cf08d 100644 --- a/Windows/installer.iss +++ b/Windows/installer.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "Bungloo" -#define MyAppVersion "1.4.1" +#define MyAppVersion "1.4.3" #define MyAppPublisher "Jabs Nu" #define MyAppURL "http://jabs.nu/bungloo" #define MyAppExeName "Bungloo.exe" diff --git a/Windows/setup.py b/Windows/setup.py index 1e573f5..405a8fb 100644 --- a/Windows/setup.py +++ b/Windows/setup.py @@ -22,7 +22,7 @@ files += [('imageformats', imageformats)] setup( name = "Bungloo", - version = "1.4.1", + version = "1.4.3", author = "Jeena Paradies", author_email = "spam@jeenaparadies.net", url = "http://jabs.nu/bungloo", From b348ed2be2219640ffc6c695d8be60431b7d44f2 Mon Sep 17 00:00:00 2001 From: jeena Date: Sun, 28 Apr 2013 10:27:19 +0200 Subject: [PATCH 4/9] fixed problem with SingleApplication after install --- Linux/Makefile.exmp | 1 + Linux/debian/changelog | 9 ++++++++- Linux/deploy.sh | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Linux/Makefile.exmp b/Linux/Makefile.exmp index 0090838..5c35b0c 100644 --- a/Linux/Makefile.exmp +++ b/Linux/Makefile.exmp @@ -29,6 +29,7 @@ builddeb: $(PYTHON) setup.py sdist $(COMPILE) --dist-dir=../ --prune rename -f 's/$(PROJECT)-(.*)\.tar\.gz/$(PROJECT)_$$1\.orig\.tar\.gz/' ../* # build the package + dpkg-buildpackage -i -I -rfakeroot dpkg-buildpackage -i -I -rfakeroot -S clean: diff --git a/Linux/debian/changelog b/Linux/debian/changelog index 02aa498..8f070d2 100644 --- a/Linux/debian/changelog +++ b/Linux/debian/changelog @@ -1,4 +1,11 @@ -bungloo (1.4.1) quantal; urgency=low +bungloo (1.4.3) raring; urgency=high + + [ Jeena Paradies ] + * bugfix with SingleApplication + + -- Jeena Paradies Tue, 28 Apr 2013 10:10:00 +0100 + +bungloo (1.4.2) raring; urgency=low [ Jeena Paradies ] * Fixes the bug with wrongly showing uread mentions diff --git a/Linux/deploy.sh b/Linux/deploy.sh index bba2f56..6255960 100755 --- a/Linux/deploy.sh +++ b/Linux/deploy.sh @@ -1,6 +1,6 @@ #!/bin/bash -VERSION="1.4.1" +VERSION="1.4.3" DEPLOYPATH="bungloo-${VERSION}" QTPATH="../Qt" SHAREDPATH=".." @@ -15,7 +15,7 @@ mkdir -p $DEPLOYPATH/bungloo touch $DEPLOYPATH/bungloo/__init__.py cp $QTPATH/Bungloo.py $DEPLOYPATH/bin/bungloo -cp $QTPATH/Helper.py $QTPATH/Windows.py $DEPLOYPATH/bungloo +cp $QTPATH/Helper.py $QTPATH/Windows.py $QTPATH/SingleApplication.py $DEPLOYPATH/bungloo cat setup.py.exmp | sed -e "s/{VERSION}/${VERSION}/g" > $DEPLOYPATH/setup.py cat Makefile.exmp | sed -e "s/{VERSION}/${VERSION}/g" > $DEPLOYPATH/Makefile cat bungloo.desktop.exmp | sed -e "s/{VERSION}/${VERSION}/g" > $DEPLOYPATH/bungloo.desktop From 1ac684b43f90ab7eac82c33dcacc5227783b613e Mon Sep 17 00:00:00 2001 From: dblugeon Date: Sun, 5 May 2013 17:34:37 +0200 Subject: [PATCH 5/9] Fix proposition for issue #221 Adding a p element to inform user that his search return no results --- WebKit/css/default.css | 5 +++++ WebKit/scripts/controller/Search.js | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/WebKit/css/default.css b/WebKit/css/default.css index eb29391..ff8bbfd 100644 --- a/WebKit/css/default.css +++ b/WebKit/css/default.css @@ -441,4 +441,9 @@ form.search input { width: 100%; padding: 10px; font-size: 1.2em; +} + +p.noresult { + padding : 10px; + text-align : center; } \ No newline at end of file diff --git a/WebKit/scripts/controller/Search.js b/WebKit/scripts/controller/Search.js index 55b7d57..51ce153 100644 --- a/WebKit/scripts/controller/Search.js +++ b/WebKit/scripts/controller/Search.js @@ -116,6 +116,11 @@ function(HostApp, Core, Paths, URI) { _this.body.appendChild(new_node); } } + } else { + var noresult = document.createElement("p"); + noresult.className = "noresult"; + noresult.textContent = "No Results"; + _this.body.appendChild(noresult); } }, null, false); From e25ccd563557b193844a63bc5f584b56852980da Mon Sep 17 00:00:00 2001 From: dblugeon Date: Sun, 5 May 2013 20:13:54 +0200 Subject: [PATCH 6/9] Remove reload menu Item fixed #178 ref doc : https://developer.apple.com/library/mac/#documentation/Cocoa/Reference/W ebKit/Protocols/WebUIDelegate_Protocol/Reference/Reference.html#//apple_ ref/doc/uid/TP40003838 --- Mac/ViewDelegate.m | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/Mac/ViewDelegate.m b/Mac/ViewDelegate.m index ca50f18..8a4e6af 100644 --- a/Mac/ViewDelegate.m +++ b/Mac/ViewDelegate.m @@ -103,20 +103,16 @@ - (NSArray *)webView:(WebView *)sender contextMenuItemsForElement:(NSDictionary *)element defaultMenuItems:(NSArray *)defaultMenuItems { - // FIXME - /* - NSMutableArray *menuItems = [NSMutableArray arrayWithArray:defaultMenuItems]; - - for (NSMenuItem*item in defaultMenuItems) { - if ([[item title] isEqualToString:@"Reload"]) { - //[item setAction:@selector(reload:)]; - //[item setTarget:self]; - } else { - [menuItems addObject:item]; + //remove reload menu item + NSMutableArray *menuItems = [NSMutableArray arrayWithArray:defaultMenuItems]; + for (NSMenuItem* item in defaultMenuItems) { + if ([item tag] == WebMenuItemTagReload) { + [menuItems removeObject:item]; + break; } - }*/ + } - return defaultMenuItems; + return menuItems; } - (void)reload:(id)sender { From 84d019dfa475eda38bd0a766a69e4eabbe7217bb Mon Sep 17 00:00:00 2001 From: dblugeon Date: Fri, 10 May 2013 23:07:11 +0200 Subject: [PATCH 7/9] close #218 There was two problems. the original problem came from the width calculation of "p.message" elements. In the timeline, first elements have width > 0, after switching to conversation view their width to pass to 0; The switching view needs add a timeout before add open street's map's image. --- WebKit/scripts/helper/Core.js | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/WebKit/scripts/helper/Core.js b/WebKit/scripts/helper/Core.js index 3904231..7f3b350 100644 --- a/WebKit/scripts/helper/Core.js +++ b/WebKit/scripts/helper/Core.js @@ -945,18 +945,21 @@ function(jQuery, Paths, URI, HostApp, Cache) { } Core.prototype.mapSrc = function(lat, lng) { - var width = $("p.message").width(); + var width = $("div:visible p.message").width(); return "http://staticmap.openstreetmap.de/staticmap.php?center=" + lat + "," + lng + "&zoom=3&size=" + width + "x75&markers=" + lat + "," + lng + ",red-pushpin"; } Core.prototype.addMap = function(lat, lng, images) { - var a = document.createElement("a"); - a.className = "map"; - a.href = this.mapHref(lat, lng); - var img = document.createElement("img"); - img.src = this.mapSrc(lat, lng); - a.appendChild(img); - images.appendChild(a); + var self = this; + setTimeout(function(){ + var a = document.createElement("a"); + a.className = "map"; + a.href = self.mapHref(lat, lng); + var img = document.createElement("img"); + img.src = self.mapSrc(lat, lng); + a.appendChild(img); + images.appendChild(a); + }, 200); } Core.prototype.addYouTube = function(id, images) { From 45365e0d79e0b1e685e2795cd3f42f4e4d12bf62 Mon Sep 17 00:00:00 2001 From: dblugeon Date: Fri, 10 May 2013 23:07:11 +0200 Subject: [PATCH 8/9] close #218 There was two problems. the original problem came from the width calculation of "p.message" elements. In the timeline, first elements have width > 0, after switching to conversation view their width to pass to 0; The switching view needs add a timeout before add open street's map's image. --- WebKit/scripts/helper/Core.js | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/WebKit/scripts/helper/Core.js b/WebKit/scripts/helper/Core.js index 3904231..7f3b350 100644 --- a/WebKit/scripts/helper/Core.js +++ b/WebKit/scripts/helper/Core.js @@ -945,18 +945,21 @@ function(jQuery, Paths, URI, HostApp, Cache) { } Core.prototype.mapSrc = function(lat, lng) { - var width = $("p.message").width(); + var width = $("div:visible p.message").width(); return "http://staticmap.openstreetmap.de/staticmap.php?center=" + lat + "," + lng + "&zoom=3&size=" + width + "x75&markers=" + lat + "," + lng + ",red-pushpin"; } Core.prototype.addMap = function(lat, lng, images) { - var a = document.createElement("a"); - a.className = "map"; - a.href = this.mapHref(lat, lng); - var img = document.createElement("img"); - img.src = this.mapSrc(lat, lng); - a.appendChild(img); - images.appendChild(a); + var self = this; + setTimeout(function(){ + var a = document.createElement("a"); + a.className = "map"; + a.href = self.mapHref(lat, lng); + var img = document.createElement("img"); + img.src = self.mapSrc(lat, lng); + a.appendChild(img); + images.appendChild(a); + }, 200); } Core.prototype.addYouTube = function(id, images) { From 9f308a22ca2310dcd9f09721ec685e861dbdd9b1 Mon Sep 17 00:00:00 2001 From: dblugeon Date: Mon, 13 May 2013 21:49:44 +0200 Subject: [PATCH 9/9] Close #189 Use NSResourceLoadDelegate to disable the cookie management to avoid see the timeline via profile view Thanks to https://github.com/poweruser82 --- Mac/Controller.h | 2 ++ Mac/Controller.m | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/Mac/Controller.h b/Mac/Controller.h index d93ffbd..2b2f683 100644 --- a/Mac/Controller.h +++ b/Mac/Controller.h @@ -73,6 +73,8 @@ - (void)notificateViewsAboutDeletedPostWithId:(NSString *)postId byEntity:(NSString*)entity; +- (NSURLRequest *)webView:(WebView *)sender resource:(id)identifier willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)redirectResponse fromDataSource:(WebDataSource *)dataSource; + - (void)setString:(NSString *)string forKey:(NSString *)aKey; - (void)setSecret:(NSString *)string; - (NSString *)secret; diff --git a/Mac/Controller.m b/Mac/Controller.m index ce81fd8..c26e2fb 100644 --- a/Mac/Controller.m +++ b/Mac/Controller.m @@ -26,6 +26,7 @@ - (void)awakeFromNib { [timelineViewWindow setExcludedFromWindowsMenu:YES]; + [timelineView setResourceLoadDelegate:self]; [self initHotKeys]; @@ -432,6 +433,13 @@ [timelineView stringByEvaluatingJavaScriptFromString:fun]; } +/* we disable cookies to avoid see a timeline during the consultation of a profile with which the user are connected through safari cf https://github.com/jeena/Bungloo/issues/189 */ +- (NSURLRequest *)webView:(WebView *)sender resource:(id)identifier willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)redirectResponse fromDataSource:(WebDataSource *)dataSource{ + NSMutableURLRequest * response = [request mutableCopy]; + [response setHTTPShouldHandleCookies:FALSE]; + return response; +} + - (void)loggedIn { [loginActivityIndicator stopAnimation:self];