Merge branch 'master' of github.com:jeena/Bungloo

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:

Linux/debian/changelog

@@ -1,3 +1,21 @@
+bungloo (1.4.3) raring; urgency=high
+
+  [ Jeena Paradies ]
+  * bugfix with SingleApplication
+
+ -- Jeena Paradies <spam@jeenaparadies.net>  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
+  * Added single application mode
+  * Added --new-message
+  * Added close window shortcut
+  * Bugfixes
+
+ -- Jeena Paradies <spam@jeenaparadies.net>  Tue, 28 Apr 2013 00:50:00 +0100
+
 bungloo (1.4.0) quantal; urgency=low
 
   [ Jeena Paradies ]

Linux/deploy.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION="1.4.0"
+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

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;

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];

Mac/ViewDelegate.m

@@ -103,20 +103,16 @@
 
 - (NSArray *)webView:(WebView *)sender contextMenuItemsForElement:(NSDictionary *)element defaultMenuItems:(NSArray *)defaultMenuItems
 {
-	// FIXME
+	//remove reload menu item
-	/*
+    NSMutableArray *menuItems = [NSMutableArray arrayWithArray:defaultMenuItems];
-	NSMutableArray *menuItems = [NSMutableArray arrayWithArray:defaultMenuItems];
+	for (NSMenuItem* item in defaultMenuItems) {
-
+		if ([item tag] == WebMenuItemTagReload) {
-	for (NSMenuItem*item in defaultMenuItems) {
+			[menuItems removeObject:item];
-		if ([[item title] isEqualToString:@"Reload"]) {
+            break;
-			//[item setAction:@selector(reload:)];
-			//[item setTarget:self];
-		} else {
-			[menuItems addObject:item];
 		}
-	}*/
+	}
 
-	return defaultMenuItems;
+	return menuItems;
 }
 
 - (void)reload:(id)sender {

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;
 }

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);

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");
+        var self = this;
-        a.className = "map";
+        setTimeout(function(){
-        a.href = this.mapHref(lat, lng);
+                   var a = document.createElement("a");
-        var img = document.createElement("img");
+                   a.className = "map";
-        img.src = this.mapSrc(lat, lng);
+                   a.href = self.mapHref(lat, lng);
-        a.appendChild(img);
+                   var img = document.createElement("img");
-        images.appendChild(a);
+                   img.src = self.mapSrc(lat, lng);
+                   a.appendChild(img);
+                   images.appendChild(a);
+        }, 200);
     }
 
     Core.prototype.addYouTube = function(id, images) {

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.3"
 #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

Windows/setup.py

@@ -22,7 +22,7 @@ files += [('imageformats', imageformats)]
 
 setup(
     name = "Bungloo",
-    version = "1.4.0",
+    version = "1.4.3",
     author = "Jeena Paradies",
     author_email = "spam@jeenaparadies.net",
     url = "http://jabs.nu/bungloo",