Skip to content

Commit

Permalink
Add project notes support (#39)
Browse files Browse the repository at this point in the history 
* Rename StoryItem to Item and generalise also for notes
* Generalise StoryModel class
* Rename StoryModel to ItemModel
* Generalise ItemModel handling in project
* Rearrange icons and add icons to item models
  • Loading branch information
@vkbo
vkbo authored Feb 14, 2022
1 parent b3f5970 commit 7106910
Show file tree
Hide file tree
Showing 23 changed files with 1,058 additions and 764 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,9 @@ list(APPEND SRC_FILES
src/gui/storytreedelegate
src/gui/treetoolbar
src/project/document
src/project/item
src/project/itemmodel
src/project/project
src/project/storyitem
src/project/storymodel
src/guimain
src/main
src/settings
Expand Down
147 changes: 91 additions & 56 deletions i18n/collett_en_US.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,69 +178,69 @@
<context>
<name>Collett::GuiStoryTree</name>
<message>
<location filename="../src/gui/storytree.cpp" line="134"/>
<location filename="../src/gui/storytree.cpp" line="148"/>
<source>Add Scene</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gui/storytree.cpp" line="136"/>
<location filename="../src/gui/storytree.cpp" line="151"/>
<location filename="../src/gui/storytree.cpp" line="166"/>
<location filename="../src/gui/storytree.cpp" line="181"/>
<location filename="../src/gui/storytree.cpp" line="196"/>
<location filename="../src/gui/storytree.cpp" line="150"/>
<location filename="../src/gui/storytree.cpp" line="165"/>
<location filename="../src/gui/storytree.cpp" line="180"/>
<location filename="../src/gui/storytree.cpp" line="195"/>
<location filename="../src/gui/storytree.cpp" line="210"/>
<source>Inside</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gui/storytree.cpp" line="140"/>
<location filename="../src/gui/storytree.cpp" line="155"/>
<location filename="../src/gui/storytree.cpp" line="170"/>
<location filename="../src/gui/storytree.cpp" line="185"/>
<location filename="../src/gui/storytree.cpp" line="200"/>
<location filename="../src/gui/storytree.cpp" line="154"/>
<location filename="../src/gui/storytree.cpp" line="169"/>
<location filename="../src/gui/storytree.cpp" line="184"/>
<location filename="../src/gui/storytree.cpp" line="199"/>
<location filename="../src/gui/storytree.cpp" line="214"/>
<source>Before</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gui/storytree.cpp" line="142"/>
<location filename="../src/gui/storytree.cpp" line="157"/>
<location filename="../src/gui/storytree.cpp" line="172"/>
<location filename="../src/gui/storytree.cpp" line="187"/>
<location filename="../src/gui/storytree.cpp" line="202"/>
<location filename="../src/gui/storytree.cpp" line="156"/>
<location filename="../src/gui/storytree.cpp" line="171"/>
<location filename="../src/gui/storytree.cpp" line="186"/>
<location filename="../src/gui/storytree.cpp" line="201"/>
<location filename="../src/gui/storytree.cpp" line="216"/>
<source>After</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gui/storytree.cpp" line="149"/>
<location filename="../src/gui/storytree.cpp" line="163"/>
<source>Add Chapter</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gui/storytree.cpp" line="164"/>
<location filename="../src/gui/storytree.cpp" line="178"/>
<source>Add Partition</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gui/storytree.cpp" line="179"/>
<location filename="../src/gui/storytree.cpp" line="193"/>
<source>Add Book</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gui/storytree.cpp" line="181"/>
<location filename="../src/gui/storytree.cpp" line="195"/>
<source>Here</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gui/storytree.cpp" line="194"/>
<location filename="../src/gui/storytree.cpp" line="208"/>
<source>Add Page</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gui/storytree.cpp" line="231"/>
<location filename="../src/gui/storytree.cpp" line="245"/>
<source>Rename Story Item</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gui/storytree.cpp" line="231"/>
<location filename="../src/gui/storytree.cpp" line="245"/>
<source>New Name:</source>
<translation type="unfinished"></translation>
</message>
Expand All @@ -259,80 +259,115 @@
</message>
</context>
<context>
<name>Collett::Project</name>
<name>Collett::Item</name>
<message>
<location filename="../src/project/project.cpp" line="189"/>
<source>Unnamed Project</source>
<location filename="../src/project/item.cpp" line="143"/>
<source>Unnamed</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Collett::Storage</name>
<message>
<location filename="../src/core/storage.cpp" line="56"/>
<source>Could not find or create project storage folder: %1</source>
<location filename="../src/project/item.cpp" line="378"/>
<source>Folder</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/core/storage.cpp" line="236"/>
<location filename="../src/core/storage.cpp" line="266"/>
<source>Could not open file: %1</source>
<location filename="../src/project/item.cpp" line="379"/>
<source>Book</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/core/storage.cpp" line="244"/>
<source>Could not parse file: %1</source>
<location filename="../src/project/item.cpp" line="380"/>
<source>Partition</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/core/storage.cpp" line="251"/>
<source>Unexpected content of file: %1</source>
<location filename="../src/project/item.cpp" line="381"/>
<source>Chapter</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/core/storage.cpp" line="302"/>
<source>Could not create folder: %1</source>
<location filename="../src/project/item.cpp" line="382"/>
<source>Scene</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/project/item.cpp" line="383"/>
<source>Page</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/project/item.cpp" line="384"/>
<source>Note</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Collett::StoryItem</name>
<name>Collett::ItemModel</name>
<message>
<location filename="../src/project/storyitem.cpp" line="137"/>
<source>Unnamed</source>
<location filename="../src/project/itemmodel.cpp" line="177"/>
<source>New %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/project/storyitem.cpp" line="319"/>
<source>Book</source>
<location filename="../src/project/itemmodel.cpp" line="253"/>
<source>Story</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/project/storyitem.cpp" line="320"/>
<source>Partition</source>
<location filename="../src/project/itemmodel.cpp" line="254"/>
<source>Plot</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/project/storyitem.cpp" line="321"/>
<source>Chapter</source>
<location filename="../src/project/itemmodel.cpp" line="255"/>
<source>Characters</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/project/storyitem.cpp" line="322"/>
<source>Scene</source>
<location filename="../src/project/itemmodel.cpp" line="256"/>
<source>Locations</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/project/storyitem.cpp" line="323"/>
<source>Page</source>
<location filename="../src/project/itemmodel.cpp" line="296"/>
<source>No Name</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Collett::StoryModel</name>
<name>Collett::Project</name>
<message>
<location filename="../src/project/storymodel.cpp" line="155"/>
<source>New %1</source>
<location filename="../src/project/project.cpp" line="224"/>
<source>Unnamed Project</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Collett::Storage</name>
<message>
<location filename="../src/core/storage.cpp" line="56"/>
<source>Could not find or create project storage folder: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/core/storage.cpp" line="236"/>
<location filename="../src/core/storage.cpp" line="266"/>
<source>Could not open file: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/core/storage.cpp" line="244"/>
<source>Could not parse file: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/core/storage.cpp" line="251"/>
<source>Unexpected content of file: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/core/storage.cpp" line="302"/>
<source>Could not create folder: %1</source>
<translation type="unfinished"></translation>
</message>
</context>
Expand Down
Loading

0 comments on commit 7106910

Please sign in to comment.