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.

Sign up for GitHub

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

adds to install.sh #9908

Closed
wants to merge 5 commits into from
Closed

adds to install.sh #9908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
67ac48c
adds to install.sh
shawayush Mar 23, 2020
2d58c19
Adds i18n
shawayush Mar 28, 2020
715b3eb
Adds i18n
shawayush Mar 28, 2020
18e06d2
reverting back
shawayush Mar 28, 2020
6191fe3
revert changes
shawayush Mar 28, 2020
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
15 changes: 15 additions & 0 deletions app/src/processing/app/Editor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,6 +507,10 @@ public void applyPreferences() {


private void buildMenuBar() {
<<<<<<< HEAD
fileMenu.setMnemonic(trm("File"));
=======
>>>>>>> 715b3eb641bd102dde3ffee8db27564e1e8f5bf3
JMenuBar menubar = new JMenuBar();
final JMenu fileMenu = buildFileMenu();
fileMenu.addMenuListener(new StubMenuListener() {
Expand Down Expand Up @@ -566,6 +570,17 @@ public void menuSelected(MenuEvent e) {

menubar.add(buildHelpMenu());
setJMenuBar(menubar);
fileMenu.setMnemonic(trm("File"));
public static int trm(String s) {
try {
if (i18n == null)
return s.charAt(0);
else
return i18n.getString(s).charAt(0);
} catch (MissingResourceException e) {
return s.charAt(0);
}
}
}


Expand Down
8 changes: 8 additions & 0 deletions build/linux/dist/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,14 @@ simple_uninstall_f() {
# Update desktop file and mime databases (if possible)
updatedbs_f() {

if [ -f ${HOME}/.local/.config/mimeapps.list ]
then
continue
else
touch mimeapps.list
chmod +x mimeapps.list
fi

if [ -d "${HOME}/.local/share/applications" ]; then
if command -v update-desktop-database > /dev/null; then
update-desktop-database "${HOME}/.local/share/applications"
Expand Down