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

Jump to bottom

Teamday fixes #5031

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Teamday fixes #5031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7e2f3f6
Fix German strings, add new german string
Frajhamster Sep 11, 2024
1e53112
Remove 'Add from local' option from the actors and objects popup menu
Frajhamster Sep 11, 2024
34ceac8
Fix crash when trying to paste empty clipboard
Frajhamster Sep 11, 2024
f2b115f
Fix checkstyle
Frajhamster Sep 11, 2024
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
4 changes: 4 additions & 0 deletions catroid/src/main/java/org/catrobat/catroid/formulaeditor/InternFormula.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -730,6 +730,10 @@ private CursorTokenPropertiesAfterModification insertRightToCurrentToken(List<In
}

private CursorTokenPropertiesAfterModification setCursorPositionAndSelectionAfterInput(int insertedInternTokenIndex) {
if (internTokenFormulaList.isEmpty()) {
return CursorTokenPropertiesAfterModification.RIGHT;
}

InternToken insertedInternToken = internTokenFormulaList.get(insertedInternTokenIndex);

if (insertedInternToken.getInternTokenType() == InternTokenType.FUNCTION_NAME) {
Expand Down
1 change: 1 addition & 0 deletions catroid/src/main/java/org/catrobat/catroid/ui/recyclerview/fragment/SpriteListFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,7 @@ class SpriteListFragment : RecyclerViewFragment<Sprite?>() {
}
if (item !is GroupSprite) {
popupMenu.menu.findItem(R.id.backpack).setTitle(R.string.pack)
popupMenu.menu.removeItem(R.id.from_local)
}
popupMenu.show()
}
Expand Down
9 changes: 5 additions & 4 deletions catroid/src/main/res/values-de/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@
<string formatted="false" name="am_merge_error">Es wird keine Zusammenlegung durchgeführt. Es müssen genau 2 Projekte ausgewählt werden, welche zusammengeführt werden sollen.</string>
<string formatted="false" name="am_backpack">Einpacken</string>
<string formatted="false" name="am_unpack">Auspacken</string>
<string formatted="false" name="am_copy">Kopiert</string>
<string formatted="false" name="am_copy">Kopieren</string>
<string formatted="false" name="am_delete">Löschen</string>
<string formatted="false" name="am_rename">Umbenennen</string>
<string formatted="false" name="am_convert">Konvertieren</string>
Expand All @@ -334,7 +334,7 @@
<string formatted="false" name="list_headline_sprites">Figuren und Objekte</string>
<!-- Options Menu Options -->
<string formatted="false" name="backpack">Rucksack</string>
<string formatted="false" name="copy">Kopiert</string>
<string formatted="false" name="copy">Kopieren</string>
<string formatted="false" name="delete">Löschen</string>
<string formatted="false" name="rename">Umbenennen</string>
<string formatted="false" name="merge">Zusammenführen</string>
Expand Down Expand Up @@ -614,6 +614,7 @@
<string formatted="false" name="add_look_choose_image">Bild auswählen</string>
<string formatted="false" name="add_look_media_library">Medienbibliothek</string>
<string formatted="false" name="add_look_from_local_project">Lokale Projekte</string>
<string formatted="false" name="add_look_actors_and_object">Lokale Figuren und Objekte</string>
<!-- -->
<!-- NewSoundDialog -->
<string formatted="false" name="new_sound_dialog_title">Klang hinzufügen</string>
Expand Down Expand Up @@ -683,8 +684,8 @@
<string formatted="false" name="brick_context_dialog_move_script">Skript bewegen</string>
<string formatted="false" name="brick_context_dialog_move_definition">Verschiebe diese Definition</string>
<string formatted="false" name="brick_context_dialog_delete_brick">Baustein löschen</string>
<string formatted="false" name="brick_context_dialog_copy_brick">Baustein kopiert</string>
<string formatted="false" name="brick_context_dialog_copy_script">Skript kopiert</string>
<string formatted="false" name="brick_context_dialog_copy_brick">Baustein kopieren</string>
<string formatted="false" name="brick_context_dialog_copy_script">Skript kopieren</string>
<string formatted="false" name="brick_context_dialog_formula_edit_brick">Formel bearbeiten</string>
<string formatted="false" name="brick_context_dialog_delete_script">Skript löschen</string>
<string formatted="false" name="brick_context_dialog_delete_definition">Lösche diese Definition</string>
Expand Down