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.

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

Cleaner code for regions, ui adjustments, ff7tkitemmodel use. #33

Merged
merged 6 commits into from
Jun 26, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 12 additions & 0 deletions icons/bc-dark/actions/24/list-add.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions icons/bc-dark/actions/24/list-remove.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions icons/bc-light/actions/24/list-add.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions icons/bc-light/actions/24/list-remove.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion icons/dark/character-export.svg

This file was deleted.

1 change: 0 additions & 1 deletion icons/dark/character-import.svg

This file was deleted.

136 changes: 68 additions & 68 deletions icons/icons.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,73 +5,73 @@
<file>common/map-slide-left.svg</file>
<file>common/world_map.png</file>
<file>common/psxmc.png</file>
<file>./bc-light/actions/24/edit-clear.svg</file>
<file>./bc-light/actions/24/edit-copy.svg</file>
<file>./bc-light/actions/24/edit-cut.svg</file>
<file>./bc-light/actions/24/edit-paste.svg</file>
<file>./bc-light/actions/22/games-highscores.svg</file>
<file>./bc-light/actions/22/globe.svg</file>
<file>./bc-light/actions/32/application-exit.svg</file>
<file>./bc-light/actions/32/character-export.svg</file>
<file>./bc-light/actions/32/character-import.svg</file>
<file>./bc-light/actions/32/configure.svg</file>
<file>./bc-light/actions/32/dialog-cancel.svg</file>
<file>./bc-light/actions/32/dialog-ok-apply.svg</file>
<file>./bc-light/actions/32/dialog-ok.svg</file>
<file>./bc-light/actions/32/document-import.svg</file>
<file>./bc-light/actions/32/document-new-from-template.svg</file>
<file>./bc-light/actions/32/document-new.svg</file>
<file>./bc-light/actions/32/document-open.svg</file>
<file>./bc-light/actions/32/document-save-as.svg</file>
<file>./bc-light/actions/32/document-save.svg</file>
<file>./bc-light/actions/32/folder-sync.svg</file>
<file>./bc-light/actions/32/go-next.svg</file>
<file>./bc-light/actions/32/go-previous.svg</file>
<file>./bc-light/actions/32/go-up.svg</file>
<file>./bc-light/actions/32/help-about.svg</file>
<file>./bc-light/actions/32/view-list-details.svg</file>
<file>./bc-light/actions/32/view-refresh.svg</file>
<file>./bc-light/actions/32/window-close.svg</file>
<file>./bc-light/status/64/dialog-error.svg</file>
<file>./bc-light/status/64/dialog-information.svg</file>
<file>./bc-light/status/64/dialog-question.svg</file>
<file>./bc-light/status/64/dialog-warning.svg</file>
<file>./bc-light/index.theme</file>
<file>./light/character-export.svg</file>
<file>./light/character-import.svg</file>
<file>./bc-dark/actions/24/edit-clear.svg</file>
<file>./bc-dark/actions/24/edit-copy.svg</file>
<file>./bc-dark/actions/24/edit-cut.svg</file>
<file>./bc-dark/actions/24/edit-paste.svg</file>
<file>./bc-dark/actions/22/games-highscores.svg</file>
<file>./bc-dark/actions/22/globe.svg</file>
<file>./bc-dark/actions/32/application-exit.svg</file>
<file>./bc-dark/actions/32/character-export.svg</file>
<file>./bc-dark/actions/32/character-import.svg</file>
<file>./bc-dark/actions/32/configure.svg</file>
<file>./bc-dark/actions/32/dialog-cancel.svg</file>
<file>./bc-dark/actions/32/dialog-ok-apply.svg</file>
<file>./bc-dark/actions/32/dialog-ok.svg</file>
<file>./bc-dark/actions/32/document-import.svg</file>
<file>./bc-dark/actions/32/document-new-from-template.svg</file>
<file>./bc-dark/actions/32/document-new.svg</file>
<file>./bc-dark/actions/32/document-open.svg</file>
<file>./bc-dark/actions/32/document-save-as.svg</file>
<file>./bc-dark/actions/32/document-save.svg</file>
<file>./bc-dark/actions/32/folder-sync.svg</file>
<file>./bc-dark/actions/32/go-next.svg</file>
<file>./bc-dark/actions/32/go-previous.svg</file>
<file>./bc-dark/actions/32/go-up.svg</file>
<file>./bc-dark/actions/32/help-about.svg</file>
<file>./bc-dark/actions/32/view-list-details.svg</file>
<file>./bc-dark/actions/32/view-refresh.svg</file>
<file>./bc-dark/actions/32/window-close.svg</file>
<file>./bc-dark/index.theme</file>
<file>./bc-dark/status/64/dialog-error.svg</file>
<file>./bc-dark/status/64/dialog-information.svg</file>
<file>./bc-dark/status/64/dialog-question.svg</file>
<file>./bc-dark/status/64/dialog-warning.svg</file>
<file>./dark/character-export.svg</file>
<file>./dark/character-import.svg</file>
<file>bc-light/actions/24/list-add.svg</file>
<file>bc-light/actions/24/list-remove.svg</file>
<file>bc-light/actions/24/edit-clear.svg</file>
<file>bc-light/actions/24/edit-copy.svg</file>
<file>bc-light/actions/24/edit-cut.svg</file>
<file>bc-light/actions/24/edit-paste.svg</file>
<file>bc-light/actions/22/games-highscores.svg</file>
<file>bc-light/actions/22/globe.svg</file>
<file>bc-light/actions/32/application-exit.svg</file>
<file>bc-light/actions/32/character-export.svg</file>
<file>bc-light/actions/32/character-import.svg</file>
<file>bc-light/actions/32/configure.svg</file>
<file>bc-light/actions/32/dialog-cancel.svg</file>
<file>bc-light/actions/32/dialog-ok-apply.svg</file>
<file>bc-light/actions/32/dialog-ok.svg</file>
<file>bc-light/actions/32/document-import.svg</file>
<file>bc-light/actions/32/document-new-from-template.svg</file>
<file>bc-light/actions/32/document-new.svg</file>
<file>bc-light/actions/32/document-open.svg</file>
<file>bc-light/actions/32/document-save-as.svg</file>
<file>bc-light/actions/32/document-save.svg</file>
<file>bc-light/actions/32/folder-sync.svg</file>
<file>bc-light/actions/32/go-next.svg</file>
<file>bc-light/actions/32/go-previous.svg</file>
<file>bc-light/actions/32/go-up.svg</file>
<file>bc-light/actions/32/help-about.svg</file>
<file>bc-light/actions/32/view-list-details.svg</file>
<file>bc-light/actions/32/view-refresh.svg</file>
<file>bc-light/actions/32/window-close.svg</file>
<file>bc-light/status/64/dialog-error.svg</file>
<file>bc-light/status/64/dialog-information.svg</file>
<file>bc-light/status/64/dialog-question.svg</file>
<file>bc-light/status/64/dialog-warning.svg</file>
<file>bc-light/index.theme</file>
<file>bc-dark/actions/24/list-add.svg</file>
<file>bc-dark/actions/24/list-remove.svg</file>
<file>bc-dark/actions/24/edit-clear.svg</file>
<file>bc-dark/actions/24/edit-copy.svg</file>
<file>bc-dark/actions/24/edit-cut.svg</file>
<file>bc-dark/actions/24/edit-paste.svg</file>
<file>bc-dark/actions/22/games-highscores.svg</file>
<file>bc-dark/actions/22/globe.svg</file>
<file>bc-dark/actions/32/application-exit.svg</file>
<file>bc-dark/actions/32/character-export.svg</file>
<file>bc-dark/actions/32/character-import.svg</file>
<file>bc-dark/actions/32/configure.svg</file>
<file>bc-dark/actions/32/dialog-cancel.svg</file>
<file>bc-dark/actions/32/dialog-ok-apply.svg</file>
<file>bc-dark/actions/32/dialog-ok.svg</file>
<file>bc-dark/actions/32/document-import.svg</file>
<file>bc-dark/actions/32/document-new-from-template.svg</file>
<file>bc-dark/actions/32/document-new.svg</file>
<file>bc-dark/actions/32/document-open.svg</file>
<file>bc-dark/actions/32/document-save-as.svg</file>
<file>bc-dark/actions/32/document-save.svg</file>
<file>bc-dark/actions/32/folder-sync.svg</file>
<file>bc-dark/actions/32/go-next.svg</file>
<file>bc-dark/actions/32/go-previous.svg</file>
<file>bc-dark/actions/32/go-up.svg</file>
<file>bc-dark/actions/32/help-about.svg</file>
<file>bc-dark/actions/32/view-list-details.svg</file>
<file>bc-dark/actions/32/view-refresh.svg</file>
<file>bc-dark/actions/32/window-close.svg</file>
<file>bc-dark/index.theme</file>
<file>bc-dark/status/64/dialog-error.svg</file>
<file>bc-dark/status/64/dialog-information.svg</file>
<file>bc-dark/status/64/dialog-question.svg</file>
<file>bc-dark/status/64/dialog-warning.svg</file>
</qresource>
</RCC>
1 change: 0 additions & 1 deletion icons/light/character-export.svg

This file was deleted.

1 change: 0 additions & 1 deletion icons/light/character-import.svg

This file was deleted.

94 changes: 25 additions & 69 deletions lang/bchoco_de.ts
Original file line number Diff line number Diff line change
Expand Up @@ -188,11 +188,7 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;https://github.com/sithlord48/blackchocobo/graphs/contributors&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#007af4;&quot;&gt;Alle Mitwirkenden anzeigen&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<source>Contributions By </source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;https://github.com/sithlord48/blackchocobo/graphs/contributors&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#007af4;&quot;&gt;View All Contributors&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<source>Default to PC type, when saving unknown type</source>
<translation type="unfinished"></translation>
</message>
</context>
Expand Down Expand Up @@ -977,70 +973,6 @@ Trigger, Tutorial zeigt</translation>
<source>Save Point Location In North Crater</source>
<translation type="unfinished">Save Point Lage im Nordkrater</translation>
</message>
<message>
<source>Region String</source>
<translation type="unfinished">Region String</translation>
</message>
<message>
<source>S01</source>
<translation type="unfinished">S01</translation>
</message>
<message>
<source>S02</source>
<translation type="unfinished">S02</translation>
</message>
<message>
<source>S03</source>
<translation type="unfinished">S03</translation>
</message>
<message>
<source>S04</source>
<translation type="unfinished">S04</translation>
</message>
<message>
<source>S05</source>
<translation type="unfinished">S05</translation>
</message>
<message>
<source>S06</source>
<translation type="unfinished">S06</translation>
</message>
<message>
<source>S07</source>
<translation type="unfinished">S07</translation>
</message>
<message>
<source>S08</source>
<translation type="unfinished">S08</translation>
</message>
<message>
<source>S09</source>
<translation type="unfinished">S09</translation>
</message>
<message>
<source>S10</source>
<translation type="unfinished">S10</translation>
</message>
<message>
<source>S11</source>
<translation type="unfinished">S11</translation>
</message>
<message>
<source>S12</source>
<translation type="unfinished">S12</translation>
</message>
<message>
<source>S13</source>
<translation type="unfinished">S13</translation>
</message>
<message>
<source>S14</source>
<translation type="unfinished">S14</translation>
</message>
<message>
<source>S15</source>
<translation type="unfinished">S15</translation>
</message>
<message>
<source>Unknown Vars</source>
<translation type="unfinished">unbekannt vars</translation>
Expand Down Expand Up @@ -1426,6 +1358,30 @@ Trigger, Tutorial zeigt</translation>
<source>G-Bike High Score</source>
<translation type="unfinished">G-Bike High Score</translation>
</message>
<message>
<source>Game Region</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>US English (NTSC-U)</source>
<translation type="unfinished">Us Englisch (NTSC-U)</translation>
</message>
<message>
<source>UK English (PAL)</source>
<translation type="unfinished">UK Englisch (PAL)</translation>
</message>
<message>
<source>French (PAL)</source>
<translation type="unfinished">Französisch (PAL)</translation>
</message>
<message>
<source>German (PAL)</source>
<translation type="unfinished">Deutsch (PAL)</translation>
</message>
<message>
<source>Save Slot</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>MainWindow</name>
Expand Down
Loading