Skip to content
Browse files

Merged done with Warrior's branch (Qt and other fixes)

  • Loading branch information...
2 parents 242a441 + 38cef0b commit 643c2a50e3ed4677393e7eccbd30df25c0305655 @satanas committed May 19, 2012
Showing with 107 additions and 2 deletions.
  1. +99 −0 turpial/data/layout/js/jquery.hotkeys.js
  2. +2 −0 turpial/data/layout/js/main.js
  3. +1 −1 turpial/ui/html.py
  4. +5 −1 turpial/ui/qt/main.py
View
99 turpial/data/layout/js/jquery.hotkeys.js
@@ -0,0 +1,99 @@
+/*
+ * jQuery Hotkeys Plugin
+ * Copyright 2010, John Resig
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ *
+ * Based upon the plugin by Tzury Bar Yochay:
+ * http://github.com/tzuryby/hotkeys
+ *
+ * Original idea by:
+ * Binny V A, http://www.openjs.com/scripts/events/keyboard_shortcuts/
+*/
+
+(function(jQuery){
+
+ jQuery.hotkeys = {
+ version: "0.8",
+
+ specialKeys: {
+ 8: "backspace", 9: "tab", 13: "return", 16: "shift", 17: "ctrl", 18: "alt", 19: "pause",
+ 20: "capslock", 27: "esc", 32: "space", 33: "pageup", 34: "pagedown", 35: "end", 36: "home",
+ 37: "left", 38: "up", 39: "right", 40: "down", 45: "insert", 46: "del",
+ 96: "0", 97: "1", 98: "2", 99: "3", 100: "4", 101: "5", 102: "6", 103: "7",
+ 104: "8", 105: "9", 106: "*", 107: "+", 109: "-", 110: ".", 111 : "/",
+ 112: "f1", 113: "f2", 114: "f3", 115: "f4", 116: "f5", 117: "f6", 118: "f7", 119: "f8",
+ 120: "f9", 121: "f10", 122: "f11", 123: "f12", 144: "numlock", 145: "scroll", 191: "/", 224: "meta"
+ },
+
+ shiftNums: {
+ "`": "~", "1": "!", "2": "@", "3": "#", "4": "$", "5": "%", "6": "^", "7": "&",
+ "8": "*", "9": "(", "0": ")", "-": "_", "=": "+", ";": ": ", "'": "\"", ",": "<",
+ ".": ">", "/": "?", "\\": "|"
+ }
+ };
+
+ function keyHandler( handleObj ) {
+ // Only care when a possible input has been specified
+ if ( typeof handleObj.data !== "string" ) {
+ return;
+ }
+
+ var origHandler = handleObj.handler,
+ keys = handleObj.data.toLowerCase().split(" ");
+
+ handleObj.handler = function( event ) {
+ // Don't fire in text-accepting inputs that we didn't directly bind to
+ if ( this !== event.target && (/textarea|select/i.test( event.target.nodeName ) ||
+ event.target.type === "text") ) {
+ return;
+ }
+
+ // Keypress represents characters, not special keys
+ var special = event.type !== "keypress" && jQuery.hotkeys.specialKeys[ event.which ],
+ character = String.fromCharCode( event.which ).toLowerCase(),
+ key, modif = "", possible = {};
+
+ // check combinations (alt|ctrl|shift+anything)
+ if ( event.altKey && special !== "alt" ) {
+ modif += "alt+";
+ }
+
+ if ( event.ctrlKey && special !== "ctrl" ) {
+ modif += "ctrl+";
+ }
+
+ // TODO: Need to make sure this works consistently across platforms
+ if ( event.metaKey && !event.ctrlKey && special !== "meta" ) {
+ modif += "meta+";
+ }
+
+ if ( event.shiftKey && special !== "shift" ) {
+ modif += "shift+";
+ }
+
+ if ( special ) {
+ possible[ modif + special ] = true;
+
+ } else {
+ possible[ modif + character ] = true;
+ possible[ modif + jQuery.hotkeys.shiftNums[ character ] ] = true;
+
+ // "$" can be triggered as "Shift+4" or "Shift+$" or just "$"
+ if ( modif === "shift+" ) {
+ possible[ jQuery.hotkeys.shiftNums[ character ] ] = true;
+ }
+ }
+
+ for ( var i = 0, l = keys.length; i < l; i++ ) {
+ if ( possible[ keys[i] ] ) {
+ return origHandler.apply( this, arguments );
+ }
+ }
+ };
+ }
+
+ jQuery.each([ "keydown", "keyup", "keypress" ], function() {
+ jQuery.event.special[ this ] = { add: keyHandler };
+ });
+
+})( jQuery );
View
2 turpial/data/layout/js/main.js
@@ -852,3 +852,5 @@ function show_avatar(account_id, username) {
function remove_statuses(column_id, number) {
}
+
+jQuery(document).bind('keydown', 'Ctrl+n',function (evt){show_update_box(); return false; });
View
2 turpial/ui/html.py
@@ -77,7 +77,7 @@ def __load_layout(self, res):
# Load default js
- for js in ['jquery', 'jquery.autocomplete', 'common']:
+ for js in ['jquery', 'jquery.hotkeys', 'jquery.autocomplete', 'common']:
filepath = os.path.realpath(os.path.join(JS_LAYOUT_DIR, js + '.js'))
self.scripts.append(filepath)
View
6 turpial/ui/qt/main.py
@@ -318,10 +318,14 @@ def __done_callback(self, arg, userdata):
else:
pass
- for col in self.get_registered_columns():
+ registered_var = self.get_registered_columns()
+
+ for col in registered_var:
if col.account_id == account_id:
self.download_stream(col, True)
self.__add_timer(col)
+ self.resize(300*len(registered_var),480)
+

0 comments on commit 643c2a5

Please sign in to comment.
Something went wrong with that request. Please try again.