Skip to content

Commit 340fa20

Browse files
committed
Removed unnecessary Project View Sprite Images
1 parent 5422c49 commit 340fa20

File tree

4,706 files changed

+1993497
-2564
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

4,706 files changed

+1993497
-2564
lines changed

app/src/processing/app/EditorProject.java

Lines changed: 0 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -36,35 +36,6 @@ public EditorProject(String path, Base base, Editor editor){
3636
this.editor = editor;
3737
fileExplorerPanel = new ProjectExplorer(fileRoot, editor);
3838
projectToolbar = new ProjectToolbar(editor, this);
39-
/*buttons_popup = new Label("Toggle Project View");
40-
buttons_popup.setForeground(new Color(23, 161, 165));
41-
buttons_popup.setBackground(new Color(23, 161, 165));
42-
settingsbox = new JPanel();
43-
settingsbox.setLayout(new BoxLayout(settingsbox, BoxLayout.LINE_AXIS));
44-
settingsbox.setOpaque(true);
45-
settingsbox.setBackground(new Color(23, 161, 165));
46-
this.path = path;
47-
Icon img = new ImageIcon(new ImageIcon("folder1.jpg").getImage().getScaledInstance(35, 30, Image.SCALE_DEFAULT));
48-
settings = new JButton(img);
49-
50-
settings.setPreferredSize(new Dimension(25, 5));
51-
settings.addActionListener(this);
52-
settings.addMouseListener(this);
53-
toggle = new JButton("T");
54-
toggle.addActionListener(this);
55-
toggle.addMouseListener(this);
56-
//this.add(settings);
57-
//settingsbox.add(new Label("Project View"));
58-
JPanel buttons_panel = new JPanel();
59-
buttons_panel.setLayout(new FlowLayout());
60-
buttons_panel.setOpaque(false);
61-
//settingsbox.setBackground(Color.WHITE);
62-
settingsbox.add(settings);
63-
settingsbox.add(toggle);
64-
settingsbox.add(buttons_popup);
65-
//settingsbox.add(Box.createHorizontalGlue());
66-
//settingsbox.add(buttons_panel);
67-
this.add(settingsbox, BorderLayout.NORTH);*/
6839
this.add(projectToolbar, BorderLayout.NORTH);
6940
this.add(fileExplorerPanel);
7041

@@ -76,52 +47,11 @@ public void resetProject(File file){
7647
path = file.getPath();
7748
fileExplorerPanel.replaceWorkingDirectory(fileRoot);
7849

79-
// Resetting the sketchbook path
80-
//PreferencesData.set("sketchbook.path", path);
81-
82-
8350
editor.statusNotice(tr("Navigated to :")+path);
8451
}
8552

8653

8754
public void handleNavigate(){
88-
/*chooser = new JFileChooser();
89-
chooser.setCurrentDirectory(fileRoot);
90-
chooser.setDialogTitle("Choose project directory : ");
91-
chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
92-
chooser.setAcceptAllFileFilterUsed(false);
93-
if (chooser.showOpenDialog(this) == JFileChooser.APPROVE_OPTION) {
94-
resetProject(chooser.getSelectedFile());
95-
}
96-
/*JDialog jDialog = new JDialog();
97-
JTextField pathfield = new JTextField();
98-
jDialog.setPreferredSize(new Dimension(400,400));
99-
jDialog.setTitle("Choose the directory to navigate to :");
100-
JPanel panel = new JPanel(new BorderLayout());
101-
panel.add(pathfield, BorderLayout.NORTH);
102-
JExplorerPanel navigator = new JExplorerPanel(new File("/home/sami"), editor);
103-
panel.add(navigator, BorderLayout.CENTER);
104-
JPanel buttonPanel = new JPanel();
105-
JButton open = new JButton("Open");
106-
buttonPanel.add(open);
107-
open.addActionListener(new ActionListener() {
108-
@Override
109-
public void actionPerformed(ActionEvent e) {
110-
}
111-
});
112-
JButton cancel = new JButton("Cancel");
113-
buttonPanel.add(cancel);
114-
open.addActionListener(new ActionListener() {
115-
@Override
116-
public void actionPerformed(ActionEvent e) {
117-
jDialog.dispose();
118-
}
119-
});
120-
panel.add(buttonPanel, BorderLayout.SOUTH);
121-
jDialog.add(panel);
122-
jDialog.pack();
123-
jDialog.setLocationRelativeTo(null);
124-
jDialog.setVisible(true);*/
12555
if(!navigating) {
12656
navigateDialog = new NavigateDialog(new File(System.getProperty("user.home")), fileRoot, this);
12757
navigating = true;

app/src/processing/app/ProjectToolbar.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ public void run() {
181181
}
182182

183183
private void loadButtons() {
184-
Image allButtons = Theme.getThemeImage("projectButtons", this,
184+
Image allButtons = Theme.getThemeImage("projectbuttons", this,
185185
BUTTON_IMAGE_SIZE * BUTTON_COUNT,
186186
BUTTON_IMAGE_SIZE * 3);
187187
buttonImages = new Image[BUTTON_COUNT][3];
@@ -201,7 +201,7 @@ private void loadButtons() {
201201
}
202202

203203
private void loadTouchBarImages() {
204-
Image allButtonsRetina = Theme.getThemeImage("projectButtons", this,
204+
Image allButtonsRetina = Theme.getThemeImage("projectbuttons", this,
205205
BUTTON_IMAGE_SIZE * BUTTON_COUNT * 2,
206206
BUTTON_IMAGE_SIZE * 3 * 2);
207207
touchBarImages = new com.thizzer.jtouchbar.common.Image[BUTTON_COUNT][3];

build/linux/arduino-1.8.14/arduino

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
#!/usr/bin/env bash
2+
3+
APPDIR="$(dirname -- "$(readlink -f -- "${0}")" )"
4+
5+
for LIB in \
6+
"$APPDIR"/java/lib/rt.jar \
7+
"$APPDIR"/java/lib/tools.jar \
8+
"$APPDIR"/lib/*.jar \
9+
;
10+
do
11+
CLASSPATH="${CLASSPATH}:${LIB}"
12+
done
13+
export CLASSPATH
14+
15+
LD_LIBRARY_PATH=$APPDIR/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
16+
export LD_LIBRARY_PATH
17+
18+
export PATH="${APPDIR}/java/bin:${PATH}"
19+
20+
export JAVA_TOOL_OPTIONS=`echo $JAVA_TOOL_OPTIONS | sed 's|-javaagent:/usr/share/java/jayatanaag.jar||g'`
21+
22+
JAVA=java
23+
if [ -x "$APPDIR/java/bin/java" ]; then
24+
JAVA=$APPDIR/java/bin/java
25+
fi
26+
27+
# Collect options to java in an array, to properly handle whitespace in options
28+
JAVA_OPTIONS=("-DAPP_DIR=$APPDIR")
29+
30+
# Only show the splash screen when no options are present
31+
if [[ "$@" != *"--"* ]] ; then
32+
JAVA_OPTIONS+=("-splash:$APPDIR/lib/splash.png")
33+
fi
34+
35+
"$JAVA" "${JAVA_OPTIONS[@]}" processing.app.Base "$@"
36+
19.8 MB
Binary file not shown.
Lines changed: 249 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,249 @@
1+
#!/bin/bash
2+
# arduino-linux-setup.sh : A simple Arduino setup script for Linux systems
3+
# Copyright (C) 2015 Arduino Srl
4+
#
5+
# Author : Arturo Rinaldi
6+
# E-mail : arty.net2@gmail.com
7+
# Project URL : https://github.com/artynet/arduino-linux-setup
8+
#
9+
# This program is free software: you can redistribute it and/or modify
10+
# it under the terms of the GNU General Public License as published by
11+
# the Free Software Foundation, either version 3 of the License, or
12+
# (at your option) any later version.
13+
#
14+
# This program is distributed in the hope that it will be useful,
15+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
16+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17+
# GNU General Public License for more details.
18+
#
19+
# You should have received a copy of the GNU General Public License
20+
# along with this program. If not, see <http://www.gnu.org/licenses/>.
21+
#
22+
# Release v10 changelog :
23+
#
24+
# + Adding support for Slackware
25+
# + Changed distribution not supported message
26+
# + Changed distribution check sort order (thanks to thenktor @github.com)
27+
# + Small fix for ArchLinux
28+
#
29+
# Release v9 changelog :
30+
#
31+
# + Adding support for ArchLinux
32+
# + Adding support for systemd
33+
# + Fixing a couple of wrong kernel entries
34+
#
35+
# Release v8 changelog :
36+
#
37+
# + rules are now created in /tmp folder
38+
#
39+
# Release v7 changelog :
40+
#
41+
# + Adding project URL
42+
# + minor bugfixing
43+
#
44+
# Release v6 changelog :
45+
#
46+
# + removing sudocheck function and control
47+
#
48+
# Release v5 changelog :
49+
#
50+
# + adding UDEV rule for stm32 DFU mode
51+
#
52+
# Release v4 changelog :
53+
#
54+
# + The rules are generated in a temporary folder
55+
#
56+
# + the user should run it without sudo while having its permissions
57+
#
58+
# Release v3 changelog :
59+
#
60+
# + The most common linux distros are now fully supported
61+
#
62+
# + now the script checks for SUDO permissions
63+
#
64+
65+
# if [[ $EUID != 0 ]] ; then
66+
# echo This must be run as root!
67+
# exit 1
68+
# fi
69+
70+
refreshudev () {
71+
72+
echo ""
73+
echo "Restarting udev"
74+
echo ""
75+
76+
sudo udevadm control --reload-rules
77+
sudo udevadm trigger
78+
79+
if [ -d /lib/systemd/ ]
80+
then
81+
sudo systemctl restart systemd-udevd
82+
else
83+
sudo service udev restart
84+
fi
85+
86+
}
87+
88+
groupsfunc () {
89+
90+
echo ""
91+
echo "******* Add User to dialout,tty, uucp, plugdev groups *******"
92+
echo ""
93+
94+
sudo groupadd plugdev
95+
sudo groupadd dialout
96+
sudo usermod -a -G tty $1
97+
sudo usermod -a -G dialout $1
98+
sudo usermod -a -G uucp $1
99+
sudo usermod -a -G plugdev $1
100+
101+
}
102+
103+
acmrules () {
104+
105+
echo ""
106+
echo "# Setting serial port rules"
107+
echo ""
108+
109+
cat <<EOF
110+
KERNEL=="ttyUSB[0-9]*", TAG+="udev-acl", TAG+="uaccess", OWNER="$1"
111+
KERNEL=="ttyACM[0-9]*", TAG+="udev-acl", TAG+="uaccess", OWNER="$1"
112+
EOF
113+
114+
}
115+
116+
openocdrules () {
117+
118+
echo ""
119+
echo "# Adding Arduino M0/M0 Pro, Primo UDEV Rules for CMSIS-DAP port"
120+
echo ""
121+
122+
cat <<EOF
123+
ACTION!="add|change", GOTO="openocd_rules_end"
124+
SUBSYSTEM!="usb|tty|hidraw", GOTO="openocd_rules_end"
125+
126+
#Please keep this list sorted by VID:PID
127+
128+
#CMSIS-DAP compatible adapters
129+
ATTRS{product}=="*CMSIS-DAP*", MODE="664", GROUP="plugdev"
130+
131+
LABEL="openocd_rules_end"
132+
EOF
133+
134+
}
135+
136+
avrisprules () {
137+
138+
echo ""
139+
echo "# Adding AVRisp UDEV rules"
140+
echo ""
141+
142+
cat <<EOF
143+
SUBSYSTEM!="usb_device", ACTION!="add", GOTO="avrisp_end"
144+
# Atmel Corp. JTAG ICE mkII
145+
ATTR{idVendor}=="03eb", ATTRS{idProduct}=="2103", MODE="660", GROUP="dialout"
146+
# Atmel Corp. AVRISP mkII
147+
ATTR{idVendor}=="03eb", ATTRS{idProduct}=="2104", MODE="660", GROUP="dialout"
148+
# Atmel Corp. Dragon
149+
ATTR{idVendor}=="03eb", ATTRS{idProduct}=="2107", MODE="660", GROUP="dialout"
150+
151+
LABEL="avrisp_end"
152+
EOF
153+
154+
}
155+
156+
dfustm32rules () {
157+
158+
echo ""
159+
echo "# Adding STM32 bootloader mode UDEV rules"
160+
echo ""
161+
162+
cat <<EOF
163+
# Example udev rules (usually placed in /etc/udev/rules.d)
164+
# Makes STM32 DfuSe device writeable for the "plugdev" group
165+
166+
ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="df11", MODE="664", GROUP="plugdev", TAG+="uaccess"
167+
EOF
168+
169+
}
170+
171+
dfuarduino101rules (){
172+
173+
echo ""
174+
echo "# Arduino 101 in DFU Mode"
175+
echo ""
176+
177+
cat <<EOF
178+
SUBSYSTEM=="tty", ENV{ID_REVISION}=="8087", ENV{ID_MODEL_ID}=="0ab6", MODE="0666", ENV{ID_MM_DEVICE_IGNORE}="1", ENV{ID_MM_CANDIDATE}="0"
179+
SUBSYSTEM=="usb", ATTR{idVendor}=="8087", ATTR{idProduct}=="0aba", MODE="0666", ENV{ID_MM_DEVICE_IGNORE}="1"
180+
EOF
181+
182+
}
183+
184+
removemm () {
185+
186+
echo ""
187+
echo "******* Removing modem manager *******"
188+
echo ""
189+
190+
if [ -f /etc/SuSE-release ]
191+
then
192+
#Only for Suse
193+
sudo zypper remove modemmanager
194+
elif [ -f /etc/fedora-release ] || [ -f /etc/redhat-release ]
195+
then
196+
#Only for Red Hat/Fedora/CentOS
197+
sudo yum remove modemmanager
198+
elif [ -f /etc/arch-release ]
199+
then
200+
#Only for ArchLinux
201+
sudo pacman -Rdd modemmanager
202+
elif [ -f /etc/slackware-version ]
203+
then
204+
#Only for Slackware
205+
sudo removepkg ModemManager
206+
elif [ -f /etc/lsb-release ] || [ -f /etc/debian_version ] || [ -f /etc/linuxmint/info ]
207+
then
208+
#Only for Ubuntu/Mint/Debian
209+
sudo apt-get -y remove modemmanager
210+
else
211+
echo ""
212+
echo "Your system is not supported, please remove the ModemManager package with your package manager!"
213+
echo ""
214+
fi
215+
216+
}
217+
218+
219+
if [ "$1" = "" ]
220+
then
221+
echo ""
222+
echo "Run the script with command ./arduino-linux-setup.sh \$USER"
223+
echo ""
224+
else
225+
226+
[ `whoami` != $1 ] && echo "" && echo "The user name is not the right one, please double-check it !" && echo "" && exit 1
227+
228+
groupsfunc $1
229+
230+
removemm
231+
232+
acmrules $1 > /tmp/90-extraacl.rules
233+
234+
openocdrules > /tmp/98-openocd.rules
235+
236+
avrisprules > /tmp/avrisp.rules
237+
238+
dfustm32rules > /tmp/40-dfuse.rules
239+
240+
dfuarduino101rules > /tmp/99-arduino-101.rules
241+
242+
sudo mv /tmp/*.rules /etc/udev/rules.d/
243+
244+
refreshudev
245+
246+
echo ""
247+
echo "*********** Please Reboot your system ************"
248+
echo ""
249+
fi

0 commit comments

Comments
 (0)