jeena/Bungloo
Archived
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Jeena Paradies 2013-05-21 20:07:18 +02:00
commit 553462209b
11 changed files with 63 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Linux/Makefile.exmp
View file

@ -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:

18
Linux/debian/changelog
View file

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

4
Linux/deploy.sh
View file

@ -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

2
Mac/Controller.h
View file

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

8
Mac/Controller.m
View file

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

16
Mac/ViewDelegate.m
View file

@ -103,20 +103,16 @@
- (NSArray *)webView:(WebView *)sender contextMenuItemsForElement:(NSDictionary *)element defaultMenuItems:(NSArray *)defaultMenuItems
{
// FIXME
/*
//remove reload menu item
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];
if ([item tag] == WebMenuItemTagReload) {
[menuItems removeObject:item];
break;
}
}
}*/
return defaultMenuItems;
return menuItems;
}
- (void)reload:(id)sender {

5
WebKit/css/default.css
View file

@ -442,3 +442,8 @@ form.search input {
padding: 10px;
font-size: 1.2em;
}
p.noresult {
padding : 10px;
text-align : center;
}

5
WebKit/scripts/controller/Search.js
View file

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

9
WebKit/scripts/helper/Core.js
View file

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

4
Windows/installer.iss
View file

@ -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

2
Windows/setup.py
View file

@ -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",