diff --git a/forms/tileseteditor.ui b/forms/tileseteditor.ui index 0e8777df..6fcfaf27 100644 --- a/forms/tileseteditor.ui +++ b/forms/tileseteditor.ui @@ -6,7 +6,7 @@ 0 0 - 700 + 727 700 @@ -271,7 +271,7 @@ - + @@ -315,9 +315,16 @@ + + <html><head/><body><p>Copies the full metatile label to the clipboard.</p></body></html> + ... + + + :/icons/clipboard.ico:/icons/clipboard.ico + @@ -434,8 +441,8 @@ 0 0 - 384 - 262 + 411 + 247 @@ -527,7 +534,7 @@ 0 0 - 700 + 727 22 @@ -660,10 +667,12 @@ NoScrollComboBox - QWidget + QComboBox
noscrollcombobox.h
- + + + diff --git a/resources/icons/clipboard.ico b/resources/icons/clipboard.ico new file mode 100644 index 00000000..646e8017 Binary files /dev/null and b/resources/icons/clipboard.ico differ diff --git a/resources/images.qrc b/resources/images.qrc index 6961e734..eacb478a 100644 --- a/resources/images.qrc +++ b/resources/images.qrc @@ -1,54 +1,55 @@ - - icons/add.ico - icons/collapse_all.ico - icons/cursor.ico - icons/delete.ico - icons/expand_all.ico - icons/fill_color_cursor.ico - icons/fill_color.ico - icons/folder_closed_map.ico - icons/folder_closed.ico - icons/folder_map_edited.ico - icons/folder_map_opened.ico - icons/folder_map.ico - icons/folder.ico - icons/map_edited.ico - icons/map_opened.ico - icons/map.ico - icons/move.ico - icons/pencil_cursor.ico - icons/pencil.ico - icons/pipette_cursor.ico - icons/pipette.ico - icons/porymap-icon-1.ico - icons/porymap-icon-2.ico - icons/porymap.icns - icons/shift_cursor.ico - icons/shift.ico - icons/sort_alphabet.ico - icons/sort_map.ico - icons/sort_number.ico - icons/tall_grass.ico - icons/viewsprites.ico - icons/ui/dark_checkbox_checked_disabled.png - icons/ui/dark_checkbox_checked_disabled@2x.png - icons/ui/dark_checkbox_checked.png - icons/ui/dark_checkbox_checked@2x.png - icons/ui/dark_checkbox_unchecked_disabled.png - icons/ui/dark_checkbox_unchecked_disabled@2x.png - icons/ui/dark_checkbox_unchecked.png - icons/ui/dark_checkbox_unchecked@2x.png - icons/ui/midnight_checkbox_checked_disabled.png - icons/ui/midnight_checkbox_checked_disabled@2x.png - icons/ui/midnight_checkbox_checked.png - icons/ui/midnight_checkbox_checked@2x.png - icons/ui/midnight_checkbox_unchecked_disabled.png - icons/ui/midnight_checkbox_unchecked_disabled@2x.png - icons/ui/midnight_checkbox_unchecked.png - icons/ui/midnight_checkbox_unchecked@2x.png - images/blank_tileset.png - images/collisions.png - images/Entities_16x16.png - + + icons/add.ico + icons/collapse_all.ico + icons/cursor.ico + icons/delete.ico + icons/expand_all.ico + icons/fill_color_cursor.ico + icons/fill_color.ico + icons/folder_closed_map.ico + icons/folder_closed.ico + icons/folder_map_edited.ico + icons/folder_map_opened.ico + icons/folder_map.ico + icons/folder.ico + icons/map_edited.ico + icons/map_opened.ico + icons/map.ico + icons/move.ico + icons/pencil_cursor.ico + icons/pencil.ico + icons/pipette_cursor.ico + icons/pipette.ico + icons/porymap-icon-1.ico + icons/porymap-icon-2.ico + icons/porymap.icns + icons/shift_cursor.ico + icons/shift.ico + icons/sort_alphabet.ico + icons/sort_map.ico + icons/sort_number.ico + icons/tall_grass.ico + icons/viewsprites.ico + icons/ui/dark_checkbox_checked_disabled.png + icons/ui/dark_checkbox_checked_disabled@2x.png + icons/ui/dark_checkbox_checked.png + icons/ui/dark_checkbox_checked@2x.png + icons/ui/dark_checkbox_unchecked_disabled.png + icons/ui/dark_checkbox_unchecked_disabled@2x.png + icons/ui/dark_checkbox_unchecked.png + icons/ui/dark_checkbox_unchecked@2x.png + icons/ui/midnight_checkbox_checked_disabled.png + icons/ui/midnight_checkbox_checked_disabled@2x.png + icons/ui/midnight_checkbox_checked.png + icons/ui/midnight_checkbox_checked@2x.png + icons/ui/midnight_checkbox_unchecked_disabled.png + icons/ui/midnight_checkbox_unchecked_disabled@2x.png + icons/ui/midnight_checkbox_unchecked.png + icons/ui/midnight_checkbox_unchecked@2x.png + images/blank_tileset.png + images/collisions.png + images/Entities_16x16.png + icons/clipboard.ico +