Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add new features to remote control pc #24

Open
wants to merge 82 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
c1f1e92
add linux commands windows 10 compatibility to shutdown pc (PowerOff.…
Dec 11, 2017
5d78e8b
ADD : new display with a red button
Dec 13, 2017
e0266a5
Optimization redbutton layout
Dec 15, 2017
987482e
socket training : send and receive an integer
Dec 19, 2017
b490ce3
socket training : send string from client to server
Dec 21, 2017
255e579
Socket training : several clients on a serversocket
Dec 26, 2017
b7661a0
ADD gantt
Dec 26, 2017
2d12418
Move something on the screen with the accelerometer
Jan 10, 2018
f3ecd24
Bug : NetworkOnMainThreadException
Jan 11, 2018
34348d7
Bug : NteworkOnMainThreadException2
Jan 11, 2018
93b3c41
Gantt update
Jan 11, 2018
7d1c349
Bug fix : NetworkOnMainThreadException
Jan 11, 2018
247e544
Manage the mouse from the computer
Feb 7, 2018
8c30682
Send accelerometer values to the computer
Feb 7, 2018
b3f6690
adjust the velocity of the pointer
Feb 7, 2018
fddc75f
add click remote
Feb 8, 2018
64897bb
gantt v4
Feb 8, 2018
8f14101
Rename file
Feb 9, 2018
5db10d6
ADD : change sound level via cmd linux, receive sound level data
Feb 11, 2018
1b91169
Add mouse_remote in strings.xml and Add reset when the button is pressed
Feb 11, 2018
f7010d3
lock screen rotation on MouseRemoteFragment
Feb 11, 2018
44d9290
Add VolumeFragment
Feb 14, 2018
c4c2240
gantt v5
Feb 15, 2018
cd16db3
Update gantt v5
Feb 15, 2018
26b49ca
Clean VolumeControl.java
Feb 16, 2018
0ea4342
Revert "Clean VolumeControl.java"
Feb 16, 2018
bb2d112
Clean VolumeControl.java
Feb 16, 2018
0d3f7de
Merge branch 'mousecontrol'
Feb 16, 2018
098dd43
Make VolumeFragment look better and add small modif
Feb 19, 2018
119bcb9
Change layout type
Feb 19, 2018
afbec4b
Merge branch 'volumeControl'
Feb 25, 2018
f813301
Create brightness branch and Add brightness fragment
Feb 25, 2018
362043f
Create LevelControl class for volume and brightness
Feb 27, 2018
2dcc732
ADD cmd windows levelcontrol
Feb 28, 2018
52be82a
Merge branch 'brightnessControl' of github.com:dabaldassi/Remote-Cont…
Feb 28, 2018
cf1f841
ADD nircmd.exe
Sharkalash Feb 28, 2018
857b685
correct bug brightness windows
Feb 28, 2018
d5cba44
Merge branch 'brightnessControl' of github.com:dabaldassi/Remote-Cont…
Feb 28, 2018
f5c3c20
Add gantt v6
Mar 1, 2018
96e2cf9
add brightness control on linux
Mar 1, 2018
5a70789
Add ShortcutFragment.java and fragment_shorcut.xml
Mar 12, 2018
6ac1c35
ADD shorcut class with execShortcut
Mar 14, 2018
c863bdb
Add firefox shortcut
Mar 14, 2018
49a6a38
FIX : rename order SHORTCUT to LAUNCH in Server.java
Mar 14, 2018
a9bb8d7
Add gimp, terminal, chromium and studio
Mar 14, 2018
b3b5d1d
Fix terminal shortcut
Mar 15, 2018
bed1fee
Ask PC for app list
Mar 15, 2018
f208c09
Add gantt v7
Mar 16, 2018
98e6325
Add Brightness
Mar 16, 2018
205d320
Add menu icon
Mar 16, 2018
f4f9220
send list f software to android
Mar 16, 2018
5c5d234
send list shortcut
Mar 20, 2018
975a87b
Fix software reception and change linear layout with grid layout
Mar 20, 2018
8a24bae
clean server.java
Mar 21, 2018
b69ed8b
maj jar file
Mar 21, 2018
55fd873
delete javadoc
Mar 21, 2018
62f6c79
Add icon to shortcut
Mar 21, 2018
a8a4dbf
mouse remote smooth
Mar 22, 2018
d4a9e4f
Add icon to fragment and fix a bug when there is no connection
Mar 22, 2018
67145c6
Add emacs icon
Mar 22, 2018
75d74b7
Add shortcut name on layout
Mar 22, 2018
6745a6e
Add gantt v8
Mar 23, 2018
983f561
Add unknown icon
Apr 5, 2018
6b903cc
Update .gitignore
Apr 5, 2018
ceb262d
Add Shortcut
Apr 5, 2018
43f1dd0
delete socket and accelerometer folder
Apr 5, 2018
95fdc43
Add microphone layout
Apr 5, 2018
c66400a
Record sound and play it on phone
Apr 7, 2018
542b71f
send record to pc and play it on the pc
Sharkalash Apr 21, 2018
3f8dab2
Add ic_microphone and clean MicrophoneFragment
Apr 22, 2018
17928e0
fix shortcut in Server.java (were not displaied)
Apr 23, 2018
6786117
Add mic request and fix bugs
Apr 23, 2018
79bf971
Improve requestPermission mainainability
Apr 28, 2018
1aaa558
Improve general maintainability
Apr 28, 2018
a3f880e
gantt v8
Apr 29, 2018
b36edbf
Add audio streaming
May 1, 2018
96d6064
fix multiple recording + clean microphone.java
Sharkalash May 1, 2018
8baa553
Clean MicrophoneFragment
May 3, 2018
f55595d
Update AudioStreaming
May 7, 2018
951eb13
add gantt v9
May 23, 2018
1bd3b08
Add Microphone
May 27, 2018
0b36726
Merge remote-tracking branch 'origin/master'
May 28, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
/RemoteControlPC-Desktop/build/
/RemoteControlPC-Studio/app/build/
/RemoteControlPC-JavaFXML/build/
RemoteControlPC-JavaFXML/src/out/
RemoteControlPC-JavaFXML/dist/javadoc/

*~

Expand All @@ -13,3 +15,11 @@
/RemoteControlPC-Studio/.idea/workspace.xml

/RemoteControlPC-Studio/.gradle/

RemoteControlPC-JavaFXML/compil\.sh

RemoteControlPC-JavaFXML/run\.sh

RemoteControlPC-Studio/.idea/*

*.html
Binary file added GPATH
Binary file not shown.
Binary file added GRTAGS
Binary file not shown.
Binary file added GTAGS
Binary file not shown.
Binary file added RemoteControlPC-JavaFXML/NirCmd.chm
Binary file not shown.
1 change: 1 addition & 0 deletions RemoteControlPC-JavaFXML/brightness
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3520.8428
3 changes: 3 additions & 0 deletions RemoteControlPC-JavaFXML/brightness.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/bash

dbus-send --session --type=method_call --dest="org.gnome.SettingsDaemon.Power" /org/gnome/SettingsDaemon/Power org.freedesktop.DBus.Properties.Set string:"org.gnome.SettingsDaemon.Power.Screen" string:"Brightness" variant:int32:$1
5 changes: 5 additions & 0 deletions RemoteControlPC-JavaFXML/compil.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/bash



JAVA_HOME=/usr/local/jdk1.8.0_151/ ant -f build.xml
Binary file added RemoteControlPC-JavaFXML/dist/NirCmd.chm
Binary file not shown.
20 changes: 18 additions & 2 deletions RemoteControlPC-JavaFXML/dist/RemoteControlPC.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,15 @@
function launchApplication(jnlpfile) {
dtjava.launch( {
url : 'RemoteControlPC.jnlp',
jnlp_content : 'PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPGpubHAgc3BlYz0iMS4wIiB4bWxuczpqZng9Imh0dHA6Ly9qYXZhZnguY29tIiBocmVmPSJSZW1vdGVDb250cm9sUEMuam5scCI+CiAgPGluZm9ybWF0aW9uPgogICAgPHRpdGxlPlJlbW90ZUNvbnRyb2xQQzwvdGl0bGU+CiAgICA8dmVuZG9yPnZhcnVuPC92ZW5kb3I+CiAgICA8ZGVzY3JpcHRpb24+bnVsbDwvZGVzY3JpcHRpb24+CiAgICA8b2ZmbGluZS1hbGxvd2VkLz4KICA8L2luZm9ybWF0aW9uPgogIDxyZXNvdXJjZXM+CiAgICA8ajJzZSB2ZXJzaW9uPSIxLjYrIiBocmVmPSJodHRwOi8vamF2YS5zdW4uY29tL3Byb2R1Y3RzL2F1dG9kbC9qMnNlIi8+CiAgICA8amFyIGhyZWY9IlJlbW90ZUNvbnRyb2xQQy5qYXIiIHNpemU9IjczOTI1IiBkb3dubG9hZD0iZWFnZXIiIC8+CiAgICA8amFyIGhyZWY9ImxpYi9SZW1vdGVDb250cm9sUEMtTGlicmFyaWVzLmphciIgc2l6ZT0iMTY1OCIgZG93bmxvYWQ9ImVhZ2VyIiAvPgogIDwvcmVzb3VyY2VzPgogIDxhcHBsZXQtZGVzYyAgd2lkdGg9IjgwMCIgaGVpZ2h0PSI2MDAiIG1haW4tY2xhc3M9ImNvbS5qYXZhZngubWFpbi5Ob0phdmFGWEZhbGxiYWNrIiAgbmFtZT0iUmVtb3RlQ29udHJvbFBDIiA+CiAgICA8cGFyYW0gbmFtZT0icmVxdWlyZWRGWFZlcnNpb24iIHZhbHVlPSI4LjArIi8+CiAgPC9hcHBsZXQtZGVzYz4KICA8amZ4OmphdmFmeC1kZXNjICB3aWR0aD0iODAwIiBoZWlnaHQ9IjYwMCIgbWFpbi1jbGFzcz0icmVtb3RlY29udHJvbHBjLlJlbW90ZUNvbnRyb2xQQyIgIG5hbWU9IlJlbW90ZUNvbnRyb2xQQyIgLz4KICA8dXBkYXRlIGNoZWNrPSJhbHdheXMiLz4KPC9qbmxwPgo='
<<<<<<< Updated upstream
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merge conflict?

<<<<<<< HEAD
jnlp_content : 'PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPGpubHAgc3BlYz0iMS4wIiB4bWxuczpqZng9Imh0dHA6Ly9qYXZhZnguY29tIiBocmVmPSJSZW1vdGVDb250cm9sUEMuam5scCI+CiAgPGluZm9ybWF0aW9uPgogICAgPHRpdGxlPlJlbW90ZUNvbnRyb2xQQzwvdGl0bGU+CiAgICA8dmVuZG9yPnZhcnVuPC92ZW5kb3I+CiAgICA8ZGVzY3JpcHRpb24+bnVsbDwvZGVzY3JpcHRpb24+CiAgICA8b2ZmbGluZS1hbGxvd2VkLz4KICA8L2luZm9ybWF0aW9uPgogIDxyZXNvdXJjZXM+CiAgICA8ajJzZSB2ZXJzaW9uPSIxLjYrIiBocmVmPSJodHRwOi8vamF2YS5zdW4uY29tL3Byb2R1Y3RzL2F1dG9kbC9qMnNlIi8+CiAgICA8amFyIGhyZWY9IlJlbW90ZUNvbnRyb2xQQy5qYXIiIHNpemU9Ijc3MjE4IiBkb3dubG9hZD0iZWFnZXIiIC8+CiAgICA8amFyIGhyZWY9ImxpYi9SZW1vdGVDb250cm9sUEMtTGlicmFyaWVzLmphciIgc2l6ZT0iMTY1OCIgZG93bmxvYWQ9ImVhZ2VyIiAvPgogIDwvcmVzb3VyY2VzPgogIDxhcHBsZXQtZGVzYyAgd2lkdGg9IjgwMCIgaGVpZ2h0PSI2MDAiIG1haW4tY2xhc3M9ImNvbS5qYXZhZngubWFpbi5Ob0phdmFGWEZhbGxiYWNrIiAgbmFtZT0iUmVtb3RlQ29udHJvbFBDIiA+CiAgICA8cGFyYW0gbmFtZT0icmVxdWlyZWRGWFZlcnNpb24iIHZhbHVlPSI4LjArIi8+CiAgPC9hcHBsZXQtZGVzYz4KICA8amZ4OmphdmFmeC1kZXNjICB3aWR0aD0iODAwIiBoZWlnaHQ9IjYwMCIgbWFpbi1jbGFzcz0icmVtb3RlY29udHJvbHBjLlJlbW90ZUNvbnRyb2xQQyIgIG5hbWU9IlJlbW90ZUNvbnRyb2xQQyIgLz4KICA8dXBkYXRlIGNoZWNrPSJhbHdheXMiLz4KPC9qbmxwPgo='
=======
jnlp_content : 'PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPGpubHAgc3BlYz0iMS4wIiB4bWxuczpqZng9Imh0dHA6Ly9qYXZhZnguY29tIiBocmVmPSJSZW1vdGVDb250cm9sUEMuam5scCI+CiAgPGluZm9ybWF0aW9uPgogICAgPHRpdGxlPlJlbW90ZUNvbnRyb2xQQzwvdGl0bGU+CiAgICA8dmVuZG9yPnZhcnVuPC92ZW5kb3I+CiAgICA8ZGVzY3JpcHRpb24+bnVsbDwvZGVzY3JpcHRpb24+CiAgICA8b2ZmbGluZS1hbGxvd2VkLz4KICA8L2luZm9ybWF0aW9uPgogIDxyZXNvdXJjZXM+CiAgICA8ajJzZSB2ZXJzaW9uPSIxLjYrIiBocmVmPSJodHRwOi8vamF2YS5zdW4uY29tL3Byb2R1Y3RzL2F1dG9kbC9qMnNlIi8+CiAgICA8amFyIGhyZWY9IlJlbW90ZUNvbnRyb2xQQy5qYXIiIHNpemU9IjE3Mjk1OCIgZG93bmxvYWQ9ImVhZ2VyIiAvPgogICAgPGphciBocmVmPSJsaWIvUmVtb3RlQ29udHJvbFBDLUxpYnJhcmllcy5qYXIiIHNpemU9IjE2NTgiIGRvd25sb2FkPSJlYWdlciIgLz4KICA8L3Jlc291cmNlcz4KICA8YXBwbGV0LWRlc2MgIHdpZHRoPSI4MDAiIGhlaWdodD0iNjAwIiBtYWluLWNsYXNzPSJjb20uamF2YWZ4Lm1haW4uTm9KYXZhRlhGYWxsYmFjayIgIG5hbWU9IlJlbW90ZUNvbnRyb2xQQyIgPgogICAgPHBhcmFtIG5hbWU9InJlcXVpcmVkRlhWZXJzaW9uIiB2YWx1ZT0iOC4wKyIvPgogIDwvYXBwbGV0LWRlc2M+CiAgPGpmeDpqYXZhZngtZGVzYyAgd2lkdGg9IjgwMCIgaGVpZ2h0PSI2MDAiIG1haW4tY2xhc3M9InJlbW90ZWNvbnRyb2xwYy5SZW1vdGVDb250cm9sUEMiICBuYW1lPSJSZW1vdGVDb250cm9sUEMiIC8+CiAgPHVwZGF0ZSBjaGVjaz0iYWx3YXlzIi8+Cjwvam5scD4K'
>>>>>>> shortcut
=======
jnlp_content : 'PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPGpubHAgc3BlYz0iMS4wIiB4bWxuczpqZng9Imh0dHA6Ly9qYXZhZnguY29tIiBocmVmPSJSZW1vdGVDb250cm9sUEMuam5scCI+CiAgPGluZm9ybWF0aW9uPgogICAgPHRpdGxlPlJlbW90ZUNvbnRyb2xQQzwvdGl0bGU+CiAgICA8dmVuZG9yPnZhcnVuPC92ZW5kb3I+CiAgICA8ZGVzY3JpcHRpb24+bnVsbDwvZGVzY3JpcHRpb24+CiAgICA8b2ZmbGluZS1hbGxvd2VkLz4KICA8L2luZm9ybWF0aW9uPgogIDxyZXNvdXJjZXM+CiAgICA8ajJzZSB2ZXJzaW9uPSIxLjYrIiBocmVmPSJodHRwOi8vamF2YS5zdW4uY29tL3Byb2R1Y3RzL2F1dG9kbC9qMnNlIi8+CiAgICA8amFyIGhyZWY9IlJlbW90ZUNvbnRyb2xQQy5qYXIiIHNpemU9Ijc3NTU1IiBkb3dubG9hZD0iZWFnZXIiIC8+CiAgICA8amFyIGhyZWY9ImxpYi9SZW1vdGVDb250cm9sUEMtTGlicmFyaWVzLmphciIgc2l6ZT0iMTY1OCIgZG93bmxvYWQ9ImVhZ2VyIiAvPgogIDwvcmVzb3VyY2VzPgogIDxhcHBsZXQtZGVzYyAgd2lkdGg9IjgwMCIgaGVpZ2h0PSI2MDAiIG1haW4tY2xhc3M9ImNvbS5qYXZhZngubWFpbi5Ob0phdmFGWEZhbGxiYWNrIiAgbmFtZT0iUmVtb3RlQ29udHJvbFBDIiA+CiAgICA8cGFyYW0gbmFtZT0icmVxdWlyZWRGWFZlcnNpb24iIHZhbHVlPSI4LjArIi8+CiAgPC9hcHBsZXQtZGVzYz4KICA8amZ4OmphdmFmeC1kZXNjICB3aWR0aD0iODAwIiBoZWlnaHQ9IjYwMCIgbWFpbi1jbGFzcz0icmVtb3RlY29udHJvbHBjLlJlbW90ZUNvbnRyb2xQQyIgIG5hbWU9IlJlbW90ZUNvbnRyb2xQQyIgLz4KICA8dXBkYXRlIGNoZWNrPSJhbHdheXMiLz4KPC9qbmxwPgo='
>>>>>>> Stashed changes
},
{
javafx : '8.0+'
Expand All @@ -24,7 +32,15 @@
placeholder : 'javafx-app-placeholder',
width : '800',
height : '600',
jnlp_content : 'PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPGpubHAgc3BlYz0iMS4wIiB4bWxuczpqZng9Imh0dHA6Ly9qYXZhZnguY29tIiBocmVmPSJSZW1vdGVDb250cm9sUEMuam5scCI+CiAgPGluZm9ybWF0aW9uPgogICAgPHRpdGxlPlJlbW90ZUNvbnRyb2xQQzwvdGl0bGU+CiAgICA8dmVuZG9yPnZhcnVuPC92ZW5kb3I+CiAgICA8ZGVzY3JpcHRpb24+bnVsbDwvZGVzY3JpcHRpb24+CiAgICA8b2ZmbGluZS1hbGxvd2VkLz4KICA8L2luZm9ybWF0aW9uPgogIDxyZXNvdXJjZXM+CiAgICA8ajJzZSB2ZXJzaW9uPSIxLjYrIiBocmVmPSJodHRwOi8vamF2YS5zdW4uY29tL3Byb2R1Y3RzL2F1dG9kbC9qMnNlIi8+CiAgICA8amFyIGhyZWY9IlJlbW90ZUNvbnRyb2xQQy5qYXIiIHNpemU9IjczOTI1IiBkb3dubG9hZD0iZWFnZXIiIC8+CiAgICA8amFyIGhyZWY9ImxpYi9SZW1vdGVDb250cm9sUEMtTGlicmFyaWVzLmphciIgc2l6ZT0iMTY1OCIgZG93bmxvYWQ9ImVhZ2VyIiAvPgogIDwvcmVzb3VyY2VzPgogIDxhcHBsZXQtZGVzYyAgd2lkdGg9IjgwMCIgaGVpZ2h0PSI2MDAiIG1haW4tY2xhc3M9ImNvbS5qYXZhZngubWFpbi5Ob0phdmFGWEZhbGxiYWNrIiAgbmFtZT0iUmVtb3RlQ29udHJvbFBDIiA+CiAgICA8cGFyYW0gbmFtZT0icmVxdWlyZWRGWFZlcnNpb24iIHZhbHVlPSI4LjArIi8+CiAgPC9hcHBsZXQtZGVzYz4KICA8amZ4OmphdmFmeC1kZXNjICB3aWR0aD0iODAwIiBoZWlnaHQ9IjYwMCIgbWFpbi1jbGFzcz0icmVtb3RlY29udHJvbHBjLlJlbW90ZUNvbnRyb2xQQyIgIG5hbWU9IlJlbW90ZUNvbnRyb2xQQyIgLz4KICA8dXBkYXRlIGNoZWNrPSJhbHdheXMiLz4KPC9qbmxwPgo='
<<<<<<< Updated upstream
<<<<<<< HEAD
jnlp_content : 'PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPGpubHAgc3BlYz0iMS4wIiB4bWxuczpqZng9Imh0dHA6Ly9qYXZhZnguY29tIiBocmVmPSJSZW1vdGVDb250cm9sUEMuam5scCI+CiAgPGluZm9ybWF0aW9uPgogICAgPHRpdGxlPlJlbW90ZUNvbnRyb2xQQzwvdGl0bGU+CiAgICA8dmVuZG9yPnZhcnVuPC92ZW5kb3I+CiAgICA8ZGVzY3JpcHRpb24+bnVsbDwvZGVzY3JpcHRpb24+CiAgICA8b2ZmbGluZS1hbGxvd2VkLz4KICA8L2luZm9ybWF0aW9uPgogIDxyZXNvdXJjZXM+CiAgICA8ajJzZSB2ZXJzaW9uPSIxLjYrIiBocmVmPSJodHRwOi8vamF2YS5zdW4uY29tL3Byb2R1Y3RzL2F1dG9kbC9qMnNlIi8+CiAgICA8amFyIGhyZWY9IlJlbW90ZUNvbnRyb2xQQy5qYXIiIHNpemU9Ijc3MjE4IiBkb3dubG9hZD0iZWFnZXIiIC8+CiAgICA8amFyIGhyZWY9ImxpYi9SZW1vdGVDb250cm9sUEMtTGlicmFyaWVzLmphciIgc2l6ZT0iMTY1OCIgZG93bmxvYWQ9ImVhZ2VyIiAvPgogIDwvcmVzb3VyY2VzPgogIDxhcHBsZXQtZGVzYyAgd2lkdGg9IjgwMCIgaGVpZ2h0PSI2MDAiIG1haW4tY2xhc3M9ImNvbS5qYXZhZngubWFpbi5Ob0phdmFGWEZhbGxiYWNrIiAgbmFtZT0iUmVtb3RlQ29udHJvbFBDIiA+CiAgICA8cGFyYW0gbmFtZT0icmVxdWlyZWRGWFZlcnNpb24iIHZhbHVlPSI4LjArIi8+CiAgPC9hcHBsZXQtZGVzYz4KICA8amZ4OmphdmFmeC1kZXNjICB3aWR0aD0iODAwIiBoZWlnaHQ9IjYwMCIgbWFpbi1jbGFzcz0icmVtb3RlY29udHJvbHBjLlJlbW90ZUNvbnRyb2xQQyIgIG5hbWU9IlJlbW90ZUNvbnRyb2xQQyIgLz4KICA8dXBkYXRlIGNoZWNrPSJhbHdheXMiLz4KPC9qbmxwPgo='
=======
jnlp_content : 'PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPGpubHAgc3BlYz0iMS4wIiB4bWxuczpqZng9Imh0dHA6Ly9qYXZhZnguY29tIiBocmVmPSJSZW1vdGVDb250cm9sUEMuam5scCI+CiAgPGluZm9ybWF0aW9uPgogICAgPHRpdGxlPlJlbW90ZUNvbnRyb2xQQzwvdGl0bGU+CiAgICA8dmVuZG9yPnZhcnVuPC92ZW5kb3I+CiAgICA8ZGVzY3JpcHRpb24+bnVsbDwvZGVzY3JpcHRpb24+CiAgICA8b2ZmbGluZS1hbGxvd2VkLz4KICA8L2luZm9ybWF0aW9uPgogIDxyZXNvdXJjZXM+CiAgICA8ajJzZSB2ZXJzaW9uPSIxLjYrIiBocmVmPSJodHRwOi8vamF2YS5zdW4uY29tL3Byb2R1Y3RzL2F1dG9kbC9qMnNlIi8+CiAgICA8amFyIGhyZWY9IlJlbW90ZUNvbnRyb2xQQy5qYXIiIHNpemU9IjE3Mjk1OCIgZG93bmxvYWQ9ImVhZ2VyIiAvPgogICAgPGphciBocmVmPSJsaWIvUmVtb3RlQ29udHJvbFBDLUxpYnJhcmllcy5qYXIiIHNpemU9IjE2NTgiIGRvd25sb2FkPSJlYWdlciIgLz4KICA8L3Jlc291cmNlcz4KICA8YXBwbGV0LWRlc2MgIHdpZHRoPSI4MDAiIGhlaWdodD0iNjAwIiBtYWluLWNsYXNzPSJjb20uamF2YWZ4Lm1haW4uTm9KYXZhRlhGYWxsYmFjayIgIG5hbWU9IlJlbW90ZUNvbnRyb2xQQyIgPgogICAgPHBhcmFtIG5hbWU9InJlcXVpcmVkRlhWZXJzaW9uIiB2YWx1ZT0iOC4wKyIvPgogIDwvYXBwbGV0LWRlc2M+CiAgPGpmeDpqYXZhZngtZGVzYyAgd2lkdGg9IjgwMCIgaGVpZ2h0PSI2MDAiIG1haW4tY2xhc3M9InJlbW90ZWNvbnRyb2xwYy5SZW1vdGVDb250cm9sUEMiICBuYW1lPSJSZW1vdGVDb250cm9sUEMiIC8+CiAgPHVwZGF0ZSBjaGVjaz0iYWx3YXlzIi8+Cjwvam5scD4K'
>>>>>>> shortcut
=======
jnlp_content : 'PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPGpubHAgc3BlYz0iMS4wIiB4bWxuczpqZng9Imh0dHA6Ly9qYXZhZnguY29tIiBocmVmPSJSZW1vdGVDb250cm9sUEMuam5scCI+CiAgPGluZm9ybWF0aW9uPgogICAgPHRpdGxlPlJlbW90ZUNvbnRyb2xQQzwvdGl0bGU+CiAgICA8dmVuZG9yPnZhcnVuPC92ZW5kb3I+CiAgICA8ZGVzY3JpcHRpb24+bnVsbDwvZGVzY3JpcHRpb24+CiAgICA8b2ZmbGluZS1hbGxvd2VkLz4KICA8L2luZm9ybWF0aW9uPgogIDxyZXNvdXJjZXM+CiAgICA8ajJzZSB2ZXJzaW9uPSIxLjYrIiBocmVmPSJodHRwOi8vamF2YS5zdW4uY29tL3Byb2R1Y3RzL2F1dG9kbC9qMnNlIi8+CiAgICA8amFyIGhyZWY9IlJlbW90ZUNvbnRyb2xQQy5qYXIiIHNpemU9Ijc3NTU1IiBkb3dubG9hZD0iZWFnZXIiIC8+CiAgICA8amFyIGhyZWY9ImxpYi9SZW1vdGVDb250cm9sUEMtTGlicmFyaWVzLmphciIgc2l6ZT0iMTY1OCIgZG93bmxvYWQ9ImVhZ2VyIiAvPgogIDwvcmVzb3VyY2VzPgogIDxhcHBsZXQtZGVzYyAgd2lkdGg9IjgwMCIgaGVpZ2h0PSI2MDAiIG1haW4tY2xhc3M9ImNvbS5qYXZhZngubWFpbi5Ob0phdmFGWEZhbGxiYWNrIiAgbmFtZT0iUmVtb3RlQ29udHJvbFBDIiA+CiAgICA8cGFyYW0gbmFtZT0icmVxdWlyZWRGWFZlcnNpb24iIHZhbHVlPSI4LjArIi8+CiAgPC9hcHBsZXQtZGVzYz4KICA8amZ4OmphdmFmeC1kZXNjICB3aWR0aD0iODAwIiBoZWlnaHQ9IjYwMCIgbWFpbi1jbGFzcz0icmVtb3RlY29udHJvbHBjLlJlbW90ZUNvbnRyb2xQQyIgIG5hbWU9IlJlbW90ZUNvbnRyb2xQQyIgLz4KICA8dXBkYXRlIGNoZWNrPSJhbHdheXMiLz4KPC9qbmxwPgo='
>>>>>>> Stashed changes
},
{
javafx : '8.0+'
Expand Down
Binary file modified RemoteControlPC-JavaFXML/dist/RemoteControlPC.jar
Binary file not shown.
10 changes: 9 additions & 1 deletion RemoteControlPC-JavaFXML/dist/RemoteControlPC.jnlp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,15 @@
</information>
<resources>
<j2se version="1.6+" href="http://java.sun.com/products/autodl/j2se"/>
<jar href="RemoteControlPC.jar" size="73925" download="eager" />
<<<<<<< Updated upstream
<<<<<<< HEAD
<jar href="RemoteControlPC.jar" size="77218" download="eager" />
=======
<jar href="RemoteControlPC.jar" size="172958" download="eager" />
>>>>>>> shortcut
=======
<jar href="RemoteControlPC.jar" size="77555" download="eager" />
>>>>>>> Stashed changes
<jar href="lib/RemoteControlPC-Libraries.jar" size="1658" download="eager" />
</resources>
<applet-desc width="800" height="600" main-class="com.javafx.main.NoJavaFXFallback" name="RemoteControlPC" >
Expand Down
1 change: 1 addition & 0 deletions RemoteControlPC-JavaFXML/dist/brightness
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3520.8428
Binary file added RemoteControlPC-JavaFXML/dist/nircmd.exe
Binary file not shown.
Binary file added RemoteControlPC-JavaFXML/dist/nircmdc.exe
Binary file not shown.
22 changes: 11 additions & 11 deletions RemoteControlPC-JavaFXML/dist/web-files/dtjava.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
* ORACLE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
*/

Expand Down Expand Up @@ -171,16 +171,16 @@ var dtjava = function() {
var edge = false;
var noActiveX = false;
edge = (navigator.userAgent.match(/Edge/i) != null);

// If IE and Windows 8 or Windows 8.1 then check for Metro mode
if(ie && navigator.userAgent.match(/Windows NT 6\.[23]/i) != null) {
try {
// try to create a known ActiveX object
new ActiveXObject("htmlfile");
} catch(e) {
// ActiveX is disabled or not supported.
// ActiveX is disabled or not supported.
noActiveX = true;
}
}
}

if(edge || noActiveX) {
Expand Down Expand Up @@ -208,7 +208,7 @@ var dtjava = function() {
// trim() is not supported by IE10 and before
if(typeof String.prototype.trim !== 'function') {
String.prototype.trim = function() {
return this.replace(/^\s+|\s+$/g, '');
return this.replace(/^\s+|\s+$/g, '');
}
}

Expand Down Expand Up @@ -247,7 +247,7 @@ var dtjava = function() {
if (m.indexOf("application/x-java-applet;version") != -1 && m.indexOf('=') != -1) {
var v = m.substring(m.indexOf('=') + 1);
// Use the existing version comparison mechanism to ensure that
// the latest JRE is selected ( "versionA"<="VersionB" equals to
// the latest JRE is selected ( "versionA"<="VersionB" equals to
// versionCheck("versionA+","versionB") returns "true")
if(jre == null || versionCheck(jre + "+", v)){
jre = v;
Expand All @@ -263,7 +263,7 @@ var dtjava = function() {
}
}
}

return {haveDom:dom, wk:webkit, ie:ie, win:windows,
linux:linux, mac:mac, op: opera, chrome:chrome, edge:edge,
jre:jre, deploy:deploy, fx:fx, noPluginWebBrowser:noPluginWebBrowser,
Expand All @@ -282,7 +282,7 @@ var dtjava = function() {
divTag.id = "messagebox";
divTag.setAttribute('style', mbStyle);
divTag.innerHTML = messageBox;
document.body.appendChild(divTag);
document.body.appendChild(divTag);

}
//partially derived from swfobject.js
Expand Down Expand Up @@ -390,7 +390,7 @@ var dtjava = function() {
installNativePlugin();
}
}

function getAbsoluteUrl(jnlp){
var absoluteUrl;
if(isAbsoluteUrl(jnlp)) {
Expand All @@ -407,7 +407,7 @@ var dtjava = function() {
function launchWithJnlpProtocol(jnlp) {
document.location="jnlp:"+ getAbsoluteUrl(jnlp);
}


function isAbsoluteUrl(url){
var protocols = ["http://", "https://", "file://"];
Expand Down Expand Up @@ -2743,7 +2743,7 @@ var dtjava = function() {
}
}
if (notNull(platform.jvmargs)) {
sparams["java_arguments"] = platform.jvmargs;
sparams["java_arguments"] = listToString(platform.jvmargs);
}

//prepare parameters first
Expand Down
23 changes: 23 additions & 0 deletions RemoteControlPC-JavaFXML/nbproject/UPDATED.TXT
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
============================================
Project RemoteControlPC build script updated
============================================

Project build script file jfx-impl.xml in nbproject sub-directory has not been recognized
as compliant with this version of NetBeans JavaFX support module. To ensure correct
and complete functionality within this NetBeans installation the script file has been
backed up to jfx-impl_backup.xml and then updated to the currently supported state.

FX Project build script auto-update may be triggered on project open either after
NetBeans installation update or by manual changes in jfx-impl.xml. Please note that
changing jfx-impl.xml manually is not recommended. Any build customization code should
be placed only in build.xml in project root directory.

Remark: The auto-update mechanism can be disabled by setting property
javafx.disable.autoupdate=true
Automatic opening of this notification when project files are updated can be disabled by setting property
javafx.disable.autoupdate.notification=true
(in build.properties, private.properties or project.properties).

Remark: Files nbproject/jfx-impl_backup*.xml and this file nbproject/UPDATED.TXT
are not used when building the project and can be freely deleted.

Loading