tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch '1.x'

Browse source 
# Conflicts:
#	plugins/telephony/kdeconnect_telephony.json
This commit is contained in:
Albert Vaca 2016-09-29 11:01:02 +02:00
commit d49d8d4784
20 changed files with 62 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/battery/kdeconnect_battery.json
View file

@ -14,7 +14,7 @@
"Description[ca@valencia]": "Mostra la bateria del telèfon al costat de la bateria de l'ordinador",
"Description[ca]": "Mostra la bateria del telèfon al costat de la bateria de l'ordinador",
"Description[cs]": "Zobrazit baterii vedle baterie počítače",
"Description[da]": "Vis din telefons batteri ved siden af dit computerbatteri",
"Description[da]": "Vis dit telefonbatteri ved siden af dit computerbatteri",
"Description[de]": "Zeigt den Akku Ihres Telefons neben dem Akku des Rechners",
"Description[el]": "Εμφάνιση μπαταρίας συσκευής δίπλα στη μπαταρία του υπολογιστή",
"Description[es]": "Mostrar la batería del teléfono junto a la batería del equipo",
@ -80,4 +80,4 @@
"X-KdeConnect-SupportedPackageType": [
"kdeconnect.battery"
]
}
}

2
plugins/clipboard/kdeconnect_clipboard.json
View file

@ -80,4 +80,4 @@
"X-KdeConnect-SupportedPackageType": [
"kdeconnect.clipboard"
]
}
}

2
plugins/findmyphone/kdeconnect_findmyphone.json
View file

@ -69,4 +69,4 @@
"X-KdeConnect-OutgoingPackageType": [
"kdeconnect.findmyphone.request"
]
}
}

2
plugins/lockdevice/kdeconnect_lockdevice.json
View file

@ -78,4 +78,4 @@
"kdeconnect.lock.request",
"kdeconnect.lock"
]
}
}

2
plugins/mousepad/kdeconnect_mousepad.json
View file

@ -78,4 +78,4 @@
"X-KdeConnect-SupportedPackageType": [
"kdeconnect.mousepad.request"
]
}
}

39
plugins/mousepad/mousepadplugin.cpp
View file

@ -137,6 +137,21 @@ bool MousepadPlugin::receivePackage(const NetworkPackage& np)
return false;
}
#if HAVE_X11
bool isLeftHanded(Display * display)
{
unsigned char map[20];
int num_buttons = XGetPointerMapping(display, map, 20);
if( num_buttons == 1 ) {
return false;
} else if( num_buttons == 2 ) {
return ( (int)map[0] == 2 && (int)map[1] == 1 );
} else {
return ( (int)map[0] == 3 && (int)map[2] == 1 );
}
}
#endif
#if HAVE_X11
bool MousepadPlugin::handlePackageX11(const NetworkPackage &np)
{
@ -163,26 +178,30 @@ bool MousepadPlugin::handlePackageX11(const NetworkPackage &np)
return false;
}
bool leftHanded = isLeftHanded(display);
int mainMouseButton = leftHanded? RightMouseButton : LeftMouseButton;
int secondaryMouseButton = leftHanded? LeftMouseButton : RightMouseButton;
if (isSingleClick) {
XTestFakeButtonEvent(display, LeftMouseButton, True, 0);
XTestFakeButtonEvent(display, LeftMouseButton, False, 0);
XTestFakeButtonEvent(display, mainMouseButton, True, 0);
XTestFakeButtonEvent(display, mainMouseButton, False, 0);
} else if (isDoubleClick) {
XTestFakeButtonEvent(display, LeftMouseButton, True, 0);
XTestFakeButtonEvent(display, LeftMouseButton, False, 0);
XTestFakeButtonEvent(display, LeftMouseButton, True, 0);
XTestFakeButtonEvent(display, LeftMouseButton, False, 0);
XTestFakeButtonEvent(display, mainMouseButton, True, 0);
XTestFakeButtonEvent(display, mainMouseButton, False, 0);
XTestFakeButtonEvent(display, mainMouseButton, True, 0);
XTestFakeButtonEvent(display, mainMouseButton, False, 0);
} else if (isMiddleClick) {
XTestFakeButtonEvent(display, MiddleMouseButton, True, 0);
XTestFakeButtonEvent(display, MiddleMouseButton, False, 0);
} else if (isRightClick) {
XTestFakeButtonEvent(display, RightMouseButton, True, 0);
XTestFakeButtonEvent(display, RightMouseButton, False, 0);
XTestFakeButtonEvent(display, secondaryMouseButton, True, 0);
XTestFakeButtonEvent(display, secondaryMouseButton, False, 0);
} else if (isSingleHold){
//For drag'n drop
XTestFakeButtonEvent(display, LeftMouseButton, True, 0);
XTestFakeButtonEvent(display, mainMouseButton, True, 0);
} else if (isSingleRelease){
//For drag'n drop. NEVER USED (release is done by tapping, which actually triggers a isSingleClick). Kept here for future-proofnes.
XTestFakeButtonEvent(display, LeftMouseButton, False, 0);
XTestFakeButtonEvent(display, mainMouseButton, False, 0);
} else if (isScroll) {
if (dy < 0) {
XTestFakeButtonEvent(display, MouseWheelDown, True, 0);

4
plugins/mpriscontrol/kdeconnect_mpriscontrol.json
View file

@ -46,7 +46,7 @@
"Name[ca@valencia]": "Receptor del comandament multimèdia",
"Name[ca]": "Receptor del comandament multimèdia",
"Name[cs]": "Dálkový ovladač multimédií",
"Name[da]": "Modtager til multimediekontrol",
"Name[da]": "Multimediekontrol-modtager",
"Name[de]": "Steuerung für Multimedia-Empfänger",
"Name[el]": "Δέκτης ελέγχου πολυμέσων",
"Name[es]": "Receptor de control multimedia",
@ -80,4 +80,4 @@
"X-KdeConnect-SupportedPackageType": [
"kdeconnect.mpris.request"
]
}
}

2
plugins/mprisremote/kdeconnect_mprisremote.json
View file

@ -62,4 +62,4 @@
"X-KdeConnect-SupportedPackageType": [
"kdeconnect.mpris"
]
}
}

2
plugins/notifications/kdeconnect_notifications.json
View file

@ -66,4 +66,4 @@
"X-KdeConnect-SupportedPackageType": [
"kdeconnect.notification"
]
}
}

4
plugins/pausemusic/kdeconnect_pausemusic.json
View file

@ -14,7 +14,7 @@
"Description[ca@valencia]": "Pausa la música/vídeos durant una trucada telefònica",
"Description[ca]": "Pausa la música/vídeos durant una trucada telefònica",
"Description[cs]": "Pozastavit hudbu/video během telefonátu",
"Description[da]": "Sæt musik/videoer på pause under opkald",
"Description[da]": "Sæt musik/video på pause under telefonsamtaler",
"Description[de]": "Hält Musik oder Videos währen eines Anrufs an",
"Description[el]": "Παύση μουσικής/βίντεο κατά τη διάρκεια κλήσης",
"Description[es]": "Pausar música/video durante las llamadas telefónicas",
@ -77,4 +77,4 @@
"X-KdeConnect-SupportedPackageType": [
"kdeconnect.telephony"
]
}
}

2
plugins/ping/kdeconnect_ping.json
View file

@ -61,4 +61,4 @@
"X-KdeConnect-SupportedPackageType": [
"kdeconnect.ping"
]
}
}

7
plugins/remotecommands/kdeconnect_remotecommands.json
View file

@ -31,15 +31,14 @@
"Icon": "system-run",
"Id": "kdeconnect_remotecommands",
"License": "GPL",
"Name": "Execute remote commands",
"Name": "Host remote commands",
"Name[ar]": "نفّذ أوامر بعيدة",
"Name[ast]": "Execución de comandos remotos",
"Name[ca@valencia]": "Executa ordes remotes",
"Name[ca]": "Executa ordres remotes",
"Name[cs]": "Spouštět příkazy vzdáleně",
"Name[da]": "Kør kommandoer udefra",
"Name[da]": "Kør eksterne kommandoer",
"Name[de]": "Entfernte Befehle ausführen",
"Name[el]": "Απομακρυσμένη εκτέλεση εντολών",
"Name[es]": "Ejecute órdenes remotas",
"Name[et]": "Kaugkäskude täitmine",
"Name[it]": "Esegui comandi remoti",
@ -62,4 +61,4 @@
"X-KdeConnect-SupportedPackageType": [
"kdeconnect.runcommand"
]
}
}

6
plugins/remotecontrol/kdeconnect_remotecontrol.json
View file

@ -14,7 +14,7 @@
"Description[ca@valencia]": "Sistemes de control remot",
"Description[ca]": "Sistemes de control remot",
"Description[cs]": "Ovládejte vzdálené systémy",
"Description[da]": "Kontrollér eksterne systemer",
"Description[da]": "Fjernbetjen systemer",
"Description[de]": "Entfernte Systeme steuern",
"Description[el]": "Έλεγχος ανταπόκρισης απομακρυσμένων συστημάτων",
"Description[es]": "Controlar sistemas remotos",
@ -45,7 +45,7 @@
"Name[ca@valencia]": "Control remot",
"Name[ca]": "Control remot",
"Name[cs]": "Dálkové ovládání",
"Name[da]": "FjernBetjening",
"Name[da]": "Fjernbetjening",
"Name[de]": "Fernsteuerung",
"Name[es]": "Control remoto",
"Name[et]": "Kaugjuhtimine",
@ -74,4 +74,4 @@
"kdeconnect.mousepad.request"
],
"X-KdeConnect-SupportedPackageType": []
}
}

8
plugins/runcommand/kdeconnect_runcommand.json
View file

@ -25,9 +25,7 @@
"Description[es]": "Ejecute órdenes de consola remotamente",
"Description[et]": "Konsoolikäskude kaugkäivitamine",
"Description[fi]": "Suorita konsolikomentoja etänä",
"Description[gl]": "Executar ordes de consola remotamente.",
"Description[it]": "Esegui da remoto comandi della console",
"Description[ko]": "원격으로 콘솔 명령 실행",
"Description[nl]": "Commando's in de terminal op afstand laten uitvoeren",
"Description[pl]": "Wykonaj polecenie konsoli zdalnie",
"Description[pt]": "Executar de forma remota comandos da consola",
@ -38,7 +36,6 @@
"Description[tr]": "Konsol komutlarını uzaktan çalıştır",
"Description[uk]": "Віддалене виконання консольних команд",
"Description[x-test]": "xxExecute console commands remotelyxx",
"Description[zh_CN]": "远程执行控制台命令",
"EnabledByDefault": true,
"Icon": "system-run",
"Id": "kdeconnect_runcommand",
@ -55,9 +52,7 @@
"Name[es]": "Ejecutar órdenes",
"Name[et]": "Käskude käivitamine",
"Name[fi]": "Suorita komentoja",
"Name[gl]": "Executar ordes",
"Name[it]": "Esegui comandi",
"Name[ko]": "명령 실행",
"Name[nl]": "Commando's uitvoeren",
"Name[pl]": "Wykonywanie polecenie",
"Name[pt]": "Executar comandos",
@ -68,7 +63,6 @@
"Name[tr]": "Komut çalıştır",
"Name[uk]": "Виконання команд",
"Name[x-test]": "xxRun commandsxx",
"Name[zh_CN]": "执行命令",
"ServiceTypes": [
"KdeConnect/Plugin"
],
@ -81,4 +75,4 @@
"X-KdeConnect-SupportedPackageType": [
"kdeconnect.runcommand.request"
]
}
}

6
plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json
View file

@ -14,7 +14,7 @@
"Description[ca@valencia]": "Inhibeix l'estalvi de pantalla quan es connecta el dispositiu",
"Description[ca]": "Inhibeix l'estalvi de pantalla quan es connecta el dispositiu",
"Description[cs]": "Potlačit spořič pokud je zařízení připojeno",
"Description[da]": "Tilbagehold pauseskærmen når enheden er tilsluttet",
"Description[da]": "Forhindr pauseskærm når enheden er forbundet",
"Description[de]": "Bildschirmschoner unterbinden wenn ein Gerät angeschlossen ist",
"Description[el]": "Απαγόρευση προστασίας οθόνης όταν η συσκευή είναι σε σύνδεση",
"Description[es]": "Inhibir el salvapantallas cuando el dispositivo está conectado",
@ -46,7 +46,7 @@
"Name[ca@valencia]": "Inhibeix l'estalvi de pantalla",
"Name[ca]": "Inhibeix l'estalvi de pantalla",
"Name[cs]": "Potlačit spořič obrazovky",
"Name[da]": "Tilbagehold pauseskærm",
"Name[da]": "Forhindr pauseskærm",
"Name[de]": "Bildschirmschoner unterbinden",
"Name[el]": "Απαγόρευση προστασίας οθόνης",
"Name[es]": "Inhibir salvapantallas",
@ -74,4 +74,4 @@
"Version": "0.1",
"Website": "http://albertvaka.wordpress.com"
}
}
}

4
plugins/sendnotifications/kdeconnect_sendnotifications.json
View file

@ -5,8 +5,6 @@
{
"Email": "holger.k@elberer.de",
"Name": "Holger Kaelberer",
"Name[it]": "Holger Freyther",
"Name[x-test]": "xxHolger Kaelbererxx"
}
],
"Description": "Broadcast this computer's notifications, so they can be shown on other devices.",
@ -65,4 +63,4 @@
"X-KdeConnect-SupportedPackageType": [
"kdeconnect.notification.request"
]
}
}

2
plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
View file

@ -11,7 +11,7 @@ Name[ast]=Axustes del complementu de sincronización d'avisos
Name[ca]=Ajustament del connector Sincronitza les notificacions
Name[ca@valencia]=Ajustament del connector Sincronitza les notificacions
Name[cs]=Nastavení modulu synchronizace upozornění
Name[da]=Indstilling af plugin til bekendtgørelsessynkronisering
Name[da]=Indstilling af plugin til synkronisering af bekendtgørelser
Name[de]=Einstellungen für Benachrichtigungsabgleich-Modul
Name[el]=Ρυθμίσεις πρόσθετου συγχρονισμού ειδοποιήσεων
Name[en_GB]=Notification synchronisation plugin settings

6
plugins/sftp/kdeconnect_sftp.json
View file

@ -15,7 +15,7 @@
"Description[ca@valencia]": "Navega pel sistema de fitxers del dispositiu remot emprant SFTP",
"Description[ca]": "Navega pel sistema de fitxers del dispositiu remot emprant SFTP",
"Description[cs]": "Prohlížejte souborový systém zařízení pomocí SFTP",
"Description[da]": "Gennemse den eksterne enheds filsystem med SFTP",
"Description[da]": "Gennemse filsystemet på eksterne enheder med SFTP",
"Description[de]": "Browsen im Dateisystem des entfernten Geräts mit SFTP",
"Description[el]": "Περιήγηση του απομακρυσμένου συστήματος αρχείων με χρήση SFTP",
"Description[es]": "Navegar por el sistema de archivos del dispositivo remoto usando SFTP",
@ -47,7 +47,7 @@
"Name[ca@valencia]": "Navegador del sistema de fitxers remot",
"Name[ca]": "Navegador del sistema de fitxers remot",
"Name[cs]": "Vzdálený prohlížeč souborového systému",
"Name[da]": "Browser til eksternt filsystem",
"Name[da]": "Filbrowser til eksternt filsystem",
"Name[de]": "Datei-Browser für entferne Systeme",
"Name[el]": "Περιηγητής απομακρυσμένου συστήματος αρχείων",
"Name[es]": "Navegador de sistema de archivos remoto",
@ -81,4 +81,4 @@
"X-KdeConnect-SupportedPackageType": [
"kdeconnect.sftp"
]
}
}

2
plugins/share/kdeconnect_share.json
View file

@ -80,4 +80,4 @@
"X-KdeConnect-SupportedPackageType": [
"kdeconnect.share.request"
]
}
}

6
plugins/telephony/kdeconnect_telephony.json
View file

@ -11,9 +11,11 @@
"Description": "Show notifications for calls and SMS",
"Description[ca@valencia]": "Mostra les notificacions de les trucades i els SMS",
"Description[ca]": "Mostra les notificacions de les trucades i els SMS",
"Description[da]": "Vis bekendtgørelser for opkald og SMS'er",
"Description[de]": "Benachrichtigungen für Anrufe und SMS anzeigen",
"Description[nl]": "Meldingen tonen van oproepen en SMSjes",
"Description[pt]": "Mostrar notificações para as chamadas e SMS",
"Description[sk]": "Zobraziť oznámenia pre hovory a SMS",
"Description[sv]": "Visa underrättelser om samtal och SMS",
"Description[uk]": "Показ сповіщень щодо дзвінків і SMS",
"Description[x-test]": "xxShow notifications for calls and SMSxx",
@ -27,7 +29,7 @@
"Name[ca@valencia]": "Integració amb la telefonia",
"Name[ca]": "Integració amb la telefonia",
"Name[cs]": "Integrace telefonu",
"Name[da]": "Integration af telefoni",
"Name[da]": "Telefoniintegration",
"Name[de]": "Telefon-Integration",
"Name[el]": "Ενσωμάτωση τηλεφωνίας",
"Name[es]": "Integración con el teléfono",
@ -62,4 +64,4 @@
"X-KdeConnect-SupportedPackageType": [
"kdeconnect.telephony"
]
}
}