diff -Nru slimbooktouchpad-1.12beta/changelog slimbooktouchpad-1.13beta/changelog --- slimbooktouchpad-1.12beta/changelog 1970-01-01 00:00:00.000000000 +0000 +++ slimbooktouchpad-1.13beta/changelog 2017-09-28 11:18:30.000000000 +0000 @@ -0,0 +1,118 @@ +slimbooktouchpad (1.13beta) xenial; urgency=low + + * Added functionality for Synaptics + + -- slimbook Wed, 28 Sep 2017 13:00:00 +0200 + +slimbooktouchpad (1.12beta) xenial; urgency=low + + * Solved bugs + + -- slimbook Wed, 23 Aug 2017 12:00:00 +0200 + +slimbooktouchpad (1.11beta) xenial; urgency=low + + * Solved bugs + + -- slimbook Wed, 09 Aug 2017 10:30:00 +0200 + +slimbooktouchpad (1.10beta) xenial; urgency=low + + * Solved bugs + + -- slimbook Wed, 24 May 2017 11:30:00 +0200 + +slimbooktouchpad (1.9beta) xenial; urgency=low + + * Solved bugs + + -- slimbook Tue, 11 May 2017 10:28:00 +0200 + +slimbooktouchpad (1.8beta) xenial; urgency=low + + * Solved bugs + + -- slimbook Tue, 10 May 2017 12:28:00 +0200 + +slimbooktouchpad (1.7beta) xenial; urgency=low + + * Solved bugs + + -- slimbook Tue, 27 Apr 2017 11:14:00 +0200 + +slimbooktouchpad (1.6beta) xenial; urgency=low + + * Solved bugs + + -- slimbook Tue, 26 Apr 2017 11:14:00 +0200 + +slimbooktouchpad (1.5beta) xenial; urgency=low + + * Solved bugs and new changes + + -- slimbook Tue, 10 Apr 2017 13:29:00 +0200 + +slimbooktouchpad (1.4beta) xenial; urgency=low + + * Solved bugs + + -- slimbook Tue, 7 Apr 2017 16:29:00 +0200 + +slimbooktouchpad (1.3beta) xenial; urgency=low + + * New features + + -- slimbook Tue, 7 Apr 2017 11:20:00 +0200 + +slimbooktouchpad (1.2beta) xenial; urgency=low + + * New features and solved bugs + + -- slimbook Tue, 3 Apr 2017 11:20:00 +0200 + +slimbooktouchpad (1.0beta) xenial; urgency=low + + * New features + + -- slimbook Tue, 28 Mar 2017 17:50:00 +0200 + +slimbooktouchpad (0.1.5beta) xenial; urgency=low + + * Solved dependencies + + -- slimbook Wed, 20 Jun 2016 11:15:00 +0200 + +slimbooktouchpad (0.1.4beta) xenial; urgency=low + + * Removed the bug report button + + -- slimbook Wed, 1 Jun 2016 17:15:00 +0200 + +slimbooktouchpad (0.1.3beta) xenial; urgency=medium + + * Fixed a code bug + + -- slimbook Thu, 19 May 2016 12:50:00 +0200 + +slimbooktouchpad (0.1.2beta) xenial; urgency=low + + * «Preferences» dialog created + * Now you can choose if you want to autostart Slimbook Touchpad + * Added compatibility with «ImPS/2 Generic Wheel Mouse" controller + + -- slimbook Thu, 19 May 2016 11:30:00 +0200 + +slimbooktouchpad (0.1.1beta) xenial; urgency=low + + * Fixed a bug that does not allow Slimbook Touchpad to start correctly on boot + + -- slimbook Thu, 19 May 2016 13:50:00 +0200 + +slimbooktouchpad (0.1.0beta) xenial; urgency=low + + * Slimbook Touchpad has been created + * Added function to unable and disable touchpad + * Now you can join our Twitter, Facebook, YouTube Channel and Google+ Accounts! + * Don't forget to report bugs with our application indicator + + -- slimbook Wed, 11 May 2016 12:25:00 +0200 Binary files /tmp/tmpuLwmz2/nna5ewUYAz/slimbooktouchpad-1.12beta/comun.pyc and /tmp/tmpuLwmz2/exbfAE9gZi/slimbooktouchpad-1.13beta/comun.pyc differ Binary files /tmp/tmpuLwmz2/nna5ewUYAz/slimbooktouchpad-1.12beta/configurator.pyc and /tmp/tmpuLwmz2/exbfAE9gZi/slimbooktouchpad-1.13beta/configurator.pyc differ diff -Nru slimbooktouchpad-1.12beta/debian/changelog slimbooktouchpad-1.13beta/debian/changelog --- slimbooktouchpad-1.12beta/debian/changelog 2017-08-23 09:52:00.000000000 +0000 +++ slimbooktouchpad-1.13beta/debian/changelog 2017-09-28 11:18:44.000000000 +0000 @@ -1,3 +1,9 @@ +slimbooktouchpad (1.13beta) xenial; urgency=low + + * Added functionality for Synaptics + + -- slimbook Wed, 28 Sep 2017 13:00:00 +0200 + slimbooktouchpad (1.12beta) xenial; urgency=low * Solved bugs diff -Nru slimbooktouchpad-1.12beta/debian/install slimbooktouchpad-1.13beta/debian/install --- slimbooktouchpad-1.12beta/debian/install 2017-08-23 10:16:20.000000000 +0000 +++ slimbooktouchpad-1.13beta/debian/install 2017-08-31 11:57:44.000000000 +0000 @@ -1,17 +1,17 @@ slimbooktouchpad /usr/bin/ debian/changelog /usr/share/slimbooktouchpad/ -comun.py /usr/share/slimbooktouchpad/ -configurator.py /usr/share/slimbooktouchpad/ slimbooktouchpad.desktop /usr/share/applications/ slimbooktouchpad-autostart.desktop /usr/share/slimbooktouchpad/ images/*.png /usr/share/slimbooktouchpad/images/ images/*.jpg /usr/share/slimbooktouchpad/images slimbooktouchpad.png /usr/share/pixmaps/ +comun.py /usr/share/slimbooktouchpad/ +configurator.py /usr/share/slimbooktouchpad/ preferences /usr/share/slimbooktouchpad/ preferences2 /usr/share/slimbooktouchpad/ preferences3 /usr/share/slimbooktouchpad/ +synclient.py /usr/share/slimbooktouchpad/ slimbooktouchpad.conf /usr/share/slimbooktouchpad/ slimbooktouchpad_synaptics.conf /usr/share/slimbooktouchpad/ startpreferences.py /usr/share/slimbooktouchpad/ -synclient.py /usr/share/slimbooktouchpad/ SlimbookTouchpadPreferences.desktop /usr/share/applications/ Binary files /tmp/tmpuLwmz2/nna5ewUYAz/slimbooktouchpad-1.12beta/images/bug.png and /tmp/tmpuLwmz2/exbfAE9gZi/slimbooktouchpad-1.13beta/images/bug.png differ Binary files /tmp/tmpuLwmz2/nna5ewUYAz/slimbooktouchpad-1.12beta/images/facebook.png and /tmp/tmpuLwmz2/exbfAE9gZi/slimbooktouchpad-1.13beta/images/facebook.png differ Binary files /tmp/tmpuLwmz2/nna5ewUYAz/slimbooktouchpad-1.12beta/images/google.png and /tmp/tmpuLwmz2/exbfAE9gZi/slimbooktouchpad-1.13beta/images/google.png differ Binary files /tmp/tmpuLwmz2/nna5ewUYAz/slimbooktouchpad-1.12beta/images/slimbook.png and /tmp/tmpuLwmz2/exbfAE9gZi/slimbooktouchpad-1.13beta/images/slimbook.png differ Binary files /tmp/tmpuLwmz2/nna5ewUYAz/slimbooktouchpad-1.12beta/images/twitter.png and /tmp/tmpuLwmz2/exbfAE9gZi/slimbooktouchpad-1.13beta/images/twitter.png differ Binary files /tmp/tmpuLwmz2/nna5ewUYAz/slimbooktouchpad-1.12beta/images/youtube.png and /tmp/tmpuLwmz2/exbfAE9gZi/slimbooktouchpad-1.13beta/images/youtube.png differ diff -Nru slimbooktouchpad-1.12beta/preferences3 slimbooktouchpad-1.13beta/preferences3 --- slimbooktouchpad-1.12beta/preferences3 2017-08-22 09:30:26.000000000 +0000 +++ slimbooktouchpad-1.13beta/preferences3 2017-10-02 08:37:56.000000000 +0000 @@ -18,6 +18,7 @@ import re import webbrowser import sys +import time import comun from synclient import Synclient @@ -279,13 +280,17 @@ if configuration.get('VertEdgeScroll'): os.system("synclient VertEdgeScroll=1") + #os.system("synclient RightEdge=3120") else: os.system("synclient VertEdgeScroll=0") + #os.system("synclient RightEdge=4000") if configuration.get('HorizEdgeScroll'): os.system("synclient HorizEdgeScroll=1") + #os.system("synclient BottomEdge=2103") else: os.system("synclient HorizEdgeScroll=0") + #os.system("synclient BottomEdge=3000") if configuration.get('CircularScrolling'): os.system("synclient CircularScrolling=1") @@ -304,9 +309,10 @@ os.system("synclient HorizScrollDelta=" + str(abs(int(synclient.get('HorizScrollDelta'))))) if configuration.get('disable_on_typing'): - os.system("syndaemon -k -i " + str(configuration.get('seconds')) + " -d &") + os.system("syndaemon -i" + str(configuration.get('seconds')) + " -d") else: os.system("killall syndaemon") + os.system("synclient TouchpadOff=0") def load_preferences(self): @@ -317,6 +323,11 @@ configuration.set_defaults() configuration.read() + if config.get('CONFIGURATION', 'icono')=='1': + numero = False + else: + numero = True + self.switch2.set_active(numero) #stat3 = self.on_switch_activated3(self.switch3) self.switch3.set_active(configuration.get('show_notifications')) # self.checkbutton2.set_active(configuration.get('on_mouse_plugged')) diff -Nru slimbooktouchpad-1.12beta/Slimbookpreferences.desktop slimbooktouchpad-1.13beta/Slimbookpreferences.desktop --- slimbooktouchpad-1.12beta/Slimbookpreferences.desktop 1970-01-01 00:00:00.000000000 +0000 +++ slimbooktouchpad-1.13beta/Slimbookpreferences.desktop 2017-08-22 10:00:16.000000000 +0000 @@ -0,0 +1,12 @@ +[Desktop Entry] +Type=Application +Exec=python /usr/share/slimbooktouchpad/startpreferences.py +Icon=/usr/share/slimbooktouchpad/slimbooktouchpad.png +Hidden=false +NoDisplay=false +X-GNOME-Autostart-enabled=true +Name[es_ES]=Slimbookpreferences +Name=Slimbook Touchpad Autostart +Comment[es_ES]=Arranque de autoinicio de Slimbook Touchpad +Comment=Slimbook Touchpad's autostart executable +X-GNOME-Autostart-Delay=2 diff -Nru slimbooktouchpad-1.12beta/slimbooktouchpad slimbooktouchpad-1.13beta/slimbooktouchpad --- slimbooktouchpad-1.12beta/slimbooktouchpad 2017-08-22 10:51:26.000000000 +0000 +++ slimbooktouchpad-1.13beta/slimbooktouchpad 2017-08-31 11:41:48.000000000 +0000 @@ -240,21 +240,18 @@ def getDeviceId(): try: - data = subprocess.check_output(['hwinfo', '--mouse']) - data2 = subprocess.check_output(['xinput', '--list']) + # data = subprocess.check_output(['hwinfo', '--mouse']) + # data2 = subprocess.check_output(['xinput', '--list']) + data = subprocess.check_output(['xinput', '--list']) except Exception: - #print("xinput not found!") - print("hwinfo not found!") - sys.exit(); + print("xinput o hwinfo not found!") + #print("hwinfo not found!") + sys.exit() deviceId = 'none' - array_data = [] #AÑADIDO - modelo = 'none' - for line in data.splitlines(): line = line.lower() - array_data.append(line) if 'imexps/2' in line and 'pointer' in line: line = line.strip() match = re.search('id=([0-9]+)', line) @@ -263,38 +260,67 @@ line = line.strip() match = re.search('id=([0-9]+)', line) deviceId = str(match.group(1)) - elif 'imps/2' in line and 'pointer' in line: + elif 'elantech' in line and 'pointer' in line: line = line.strip() match = re.search('id=([0-9]+)', line) deviceId = str(match.group(1)) - elif 'ah6q.bgo0soimom3' in line: #AÑADIDO - line = line.strip() - match = re.search(r'unique id: ([a-z0-9\.]*)', line) - deviceId = str(match.group(1)) - elif 'ah6q.9ugl5dibwf5' in line: #AÑADIDO - line = line.strip() - match = re.search(r'unique id: ([a-z0-9\.]*)', line) - deviceId = str(match.group(1)) - - for index,item in enumerate(array_data): - if 'ah6q.bgo0soimom3' in item: - model = array_data[index + 2].strip() - match = re.search(r'model: ([\"a-z\/0-9\ ]*)', model) - modelName = str(match.group(1)) - modelo = modelName.rsplit('"')[1] - elif 'ah6q.9ugl5dibwf5' in item: - model = array_data[index + 2].strip() - match = re.search(r'model: ([\"a-z\/0-9\ ]*)', model) - modelName = str(match.group(1)) - modelo = modelName.rsplit('"')[1] - - for lines in data2.splitlines(): - lines = lines.lower() - if modelo in lines and 'pointer' in lines: - lines = lines.strip() - match = re.search('id=([0-9]+)', lines) + elif 'imps/2' in line and 'pointer' in line: + line = line.strip() + match = re.search('id=([0-9]+)', line) deviceId = str(match.group(1)) + + + + # array_data = [] #AÑADIDO + # modelo = 'none' + # + # for line in data.splitlines(): + # line = line.lower() + # array_data.append(line) + # if 'imexps/2' in line and 'pointer' in line: + # line = line.strip() + # match = re.search('id=([0-9]+)', line) + # deviceId = str(match.group(1)) + # elif 'synaptics' in line and 'pointer' in line: + # line = line.strip() + # match = re.search('id=([0-9]+)', line) + # deviceId = str(match.group(1)) + # elif 'imps/2' in line and 'pointer' in line: + # line = line.strip() + # match = re.search('id=([0-9]+)', line) + # deviceId = str(match.group(1)) + # elif 'ah6q.bgo0soimom3' in line: #AÑADIDO + # line = line.strip() + # match = re.search(r'unique id: ([a-z0-9\.]*)', line) + # deviceId = str(match.group(1)) + # elif 'ah6q.9ugl5dibwf5' in line: #AÑADIDO + # line = line.strip() + # match = re.search(r'unique id: ([a-z0-9\.]*)', line) + # deviceId = str(match.group(1)) + # + # for index,item in enumerate(array_data): + # if 'ah6q.bgo0soimom3' in item: + # model = array_data[index + 2].strip() + # match = re.search(r'model: ([\"a-z\/0-9\ ]*)', model) + # modelName = str(match.group(1)) + # modelo = modelName.rsplit('"')[1] + # elif 'ah6q.9ugl5dibwf5' in item: + # model = array_data[index + 2].strip() + # match = re.search(r'model: ([\"a-z\/0-9\ ]*)', model) + # modelName = str(match.group(1)) + # modelo = modelName.rsplit('"')[1] + # + # for lines in data2.splitlines(): + # lines = lines.lower() + # if modelo in lines and 'pointer' in lines: + # lines = lines.strip() + # match = re.search('id=([0-9]+)', lines) + # deviceId = str(match.group(1)) + + + + if deviceId == 'none': print('Touch Device not found') sys.exit(); diff -Nru slimbooktouchpad-1.12beta/SlimbookTouchpadPreferences.desktop slimbooktouchpad-1.13beta/SlimbookTouchpadPreferences.desktop --- slimbooktouchpad-1.12beta/SlimbookTouchpadPreferences.desktop 2017-08-23 08:55:07.000000000 +0000 +++ slimbooktouchpad-1.13beta/SlimbookTouchpadPreferences.desktop 2017-08-22 10:00:16.000000000 +0000 @@ -6,7 +6,7 @@ NoDisplay=false X-GNOME-Autostart-enabled=true Name[es_ES]=SlimbookTouchpadPreferences -Name=Slimbook Touchpad Preferences +Name=Slimbook Touchpad Autostart Comment[es_ES]=Arranque de autoinicio de Slimbook Touchpad Comment=Slimbook Touchpad's autostart executable X-GNOME-Autostart-Delay=2 Binary files /tmp/tmpuLwmz2/nna5ewUYAz/slimbooktouchpad-1.12beta/synclient.pyc and /tmp/tmpuLwmz2/exbfAE9gZi/slimbooktouchpad-1.13beta/synclient.pyc differ