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

Resolved: Catroid IDE-262 Confirm deletion of objects #5015

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Resolved: Catroid IDE-262 Confirm deletion of objects #5015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion catroid/src/main/java/org/catrobat/catroid/ui/recyclerview/fragment/LookListFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ class LookListFragment : RecyclerViewFragment<LookData?>() {
R.id.backpack -> packItems(itemList)
R.id.copy -> copyItems(itemList)
R.id.rename -> showRenameDialog(item)
R.id.delete -> deleteItems(itemList)
R.id.delete -> showDeleteAlert(itemList)
else -> {
}
}
Expand Down
2 changes: 1 addition & 1 deletion catroid/src/main/java/org/catrobat/catroid/ui/recyclerview/fragment/SoundListFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ class SoundListFragment : RecyclerViewFragment<SoundInfo?>() {
R.id.backpack -> packItems(itemList)
R.id.copy -> copyItems(itemList)
R.id.rename -> showRenameDialog(item)
R.id.delete -> deleteItems(itemList)
R.id.delete -> showDeleteAlert(itemList)
else -> {
}
}
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -364,7 +364,7 @@ class SpriteListFragment : RecyclerViewFragment<Sprite?>() {
when (menuItem.itemId) {
R.id.backpack -> packItems(itemList)
R.id.copy -> copyItems(itemList)
R.id.delete -> deleteItems(itemList)
R.id.delete -> showDeleteAlert(itemList)
R.id.rename -> showRenameDialog(item)
R.id.from_library -> addFromLibrary(item)
R.id.from_local -> addFromLocalProject(item)
Expand Down
9 changes: 5 additions & 4 deletions catroid/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,8 @@
<string formatted="false" name="am_rename">Rename</string>
<string formatted="false" name="am_convert">Convert</string>
<string formatted="false" name="am_merge">Merge</string>
<string formatted="false" name="dialog_confirm_delete">You can\'t undo this!</string>
<string formatted="false" name="dialog_confirm_delete">Are you sure that you want to
delete this object? These changes can not be undone.</string>

<string formatted="false" name="list_headline_sprites">Actors and objects</string>

Expand Down Expand Up @@ -430,15 +431,15 @@
<item quantity="other">Delete these scenes?</item>
</plurals>
<plurals name="delete_sprites">
<item quantity="one">Delete this actor or object?</item>
<item quantity="one">Delete actor</item>
<item quantity="other">Delete these actors or objects?</item>
</plurals>
<plurals name="delete_looks">
<item quantity="one">Delete this look?</item>
<item quantity="one">Delete look</item>
<item quantity="other">Delete these looks?</item>
</plurals>
<plurals name="delete_sounds">
<item quantity="one">Delete this sound?</item>
<item quantity="one">Delete sound</item>
<item quantity="other">Delete these sounds?</item>
</plurals>
<plurals name="delete_nfc_tags">
Expand Down