Commit Graph
100 Commits
Author SHA1 Message Date
Veronica K. B. Olsen 2bd2c81eae Drop the hidden column in the project tree that holds the item handle, and use the data setting instead 2020-06-02 09:23:23 +02:00
Veronica K. Berglyd Olsen afdd07b6e9 Merge pull request #277 from vkbo/less_files
Merge a bunch of source files and folders
2020-06-01 23:57:25 +02:00
Veronica K. B. Olsen 49141ac8de Moved all gui files to the root gui folder 2020-06-01 23:47:37 +02:00
Veronica K. B. Olsen 3f069ac794 Merged all document bars into one file 2020-06-01 23:39:04 +02:00
Veronica K. B. Olsen bd3f6d39e7 Moved dochighlight up one level 2020-06-01 23:30:58 +02:00
Veronica K. B. Olsen 98360b2edd Moved optionstate class into project file 2020-06-01 23:28:38 +02:00
Veronica K. B. Olsen a76562e025 Moved WordCounter class into doceditor file 2020-06-01 23:23:11 +02:00
Veronica K. B. Olsen 61831d9c0e Moved the custom widgets classes to the root gui folder 2020-06-01 23:13:08 +02:00
Veronica K. B. Olsen 6f7d66cb31 Merged the custom widgets and layouts into one file 2020-06-01 23:08:40 +02:00
Veronica K. B. Olsen d08843afc7 Merged icons and themes files 2020-06-01 22:59:44 +02:00
Veronica K. Berglyd Olsen d5d7abd4c3 Merge pull request #276 from vkbo/no_format_export
Export w/o Styling
2020-06-01 22:51:15 +02:00
Veronica K. B. Olsen ae84a4def6 Added the noStyles option to the Build Novel Project tool 2020-06-01 22:37:46 +02:00
Veronica K. B. Olsen 322a114ce5 Added a cssStyles flag that is needed to add styles at all to generated HTML 2020-06-01 22:37:10 +02:00
Veronica K. B. Olsen 87a4b26a62 Cleanup 2020-06-01 13:06:08 +02:00
Veronica K. B. Olsen 88222e69cf Fixed some typos 2020-06-01 13:04:35 +02:00
Veronica K. Berglyd Olsen 54b3966423 Merge pull request #266 from vkbo/release_0.7
Release 0.7
2020-06-01 12:54:29 +02:00
Veronica K. B. Olsen 7f963ac817 Added a mention of the JSON export option in the docs. 2020-06-01 12:49:10 +02:00
Veronica K. B. Olsen cc300956e4 Updated changelog with the latest changes 2020-06-01 12:44:03 +02:00
Veronica K. B. Olsen 3fa25aa9e6 Merge branch 'master' into release_0.7 2020-06-01 12:36:53 +02:00
Veronica K. Berglyd Olsen 73e383b7f7 Merge pull request #275 from vkbo/font_sizes
Font Sizes – Continued
2020-06-01 12:36:06 +02:00
Veronica K. B. Olsen 16d1357c73 Also scale '...' buttons 2020-06-01 12:28:31 +02:00
Veronica K. B. Olsen b50125172b Also scale the icons 2020-06-01 12:23:41 +02:00
Veronica K. B. Olsen d59a164d25 Missed a spot ... 2020-06-01 12:19:18 +02:00
Veronica K. B. Olsen ca5a6ad8aa All trewwidgets needs font set ... 2020-06-01 12:17:07 +02:00
Veronica K. B. Olsen 4464171cb4 ... and the same for outline tree 2020-06-01 12:10:07 +02:00
Veronica K. Berglyd Olsen 292329a25f Merge pull request #274 from vkbo/font_sizes
GUI Font Size Issue
2020-06-01 12:01:49 +02:00
Veronica K. B. Olsen b26ee7ae15 Fix project tree text font and size on some systems 2020-06-01 11:56:45 +02:00
Veronica K. B. Olsen 91acfb569f Updated changelog 2020-05-31 17:35:17 +02:00
Veronica K. B. Olsen a270973fa3 Merge branch 'master' into release_0.7 2020-05-31 17:04:07 +02:00
Veronica K. Berglyd Olsen 8e3d236e13 Merge pull request #272 from vkbo/gui_tweaks
Minor Improvements, Changes and Additions
2020-05-31 16:01:18 +02:00
Veronica K. B. Olsen 9cd4df1d88 Added some comments 2020-05-31 14:41:49 +02:00
Veronica K. B. Olsen 72ed6dec6e Fixed a bug caused by a hardcoded project tree index (just added a column) 2020-05-31 14:40:10 +02:00
Veronica K. B. Olsen 6fc1d09a06 Remember to set correct font in build tool before loading previous content 2020-05-31 14:14:09 +02:00
Veronica K. B. Olsen ce19de31f5 Added build files to JSON with HTML or markdown formatting 2020-05-31 14:11:35 +02:00
Veronica K. B. Olsen 199ecc28e3 The build dialog should show the result from last build when opening 2020-05-31 13:38:16 +02:00
Veronica K. B. Olsen e9fd3f6fa4 Merge branch 'master' into gui_tweaks 2020-05-31 13:09:49 +02:00
Veronica K. Berglyd Olsen b1ac6734d1 Merge pull request #271 from vkbo/no_monospace
Remove monospace fonts from main GUI
2020-05-31 13:07:48 +02:00
Veronica K. B. Olsen e49678eaa5 Some improvements to the word count update 2020-05-31 13:07:28 +02:00
Veronica K. B. Olsen c11682dcf9 Use minimum width, not fixed with for status bar clock 2020-05-31 12:21:16 +02:00
Veronica K. B. Olsen 685af710a6 Remove monospace fonts from main GUI 2020-05-31 12:17:34 +02:00
Veronica K. Berglyd Olsen e74b8ec6ce Merge pull request #270 from vkbo/embed_font
Font Options
2020-05-31 11:23:14 +02:00
Veronica K. B. Olsen e5b6d3828e Fixed some issues, and added font dialog to build tool as well 2020-05-31 11:17:23 +02:00
Veronica K. B. Olsen 1cd7986bfb Using QFontDialog instead of QFontComboBox, and GUI font is no selectable 2020-05-31 10:52:25 +02:00
Veronica K. B. Olsen 688c0e853a Added cantarell font family and a function to add them to the qApp 2020-05-30 22:43:48 +02:00
Veronica K. Berglyd Olsen c95fa4c332 Merge pull request #269 from vkbo/gui_font_size
GUI Font Size Settings
2020-05-30 22:09:39 +02:00
Veronica K. B. Olsen 521ab956d9 Fixed tests 2020-05-30 22:05:21 +02:00
Veronica K. B. Olsen be89dd6238 Added the option to change GUI font size 2020-05-30 22:01:55 +02:00
Veronica K. Berglyd Olsen 1696fa5e13 Merge pull request #268 from vkbo/export_column
Export Icon Column
2020-05-30 21:31:33 +02:00
Veronica K. B. Olsen 31b742aff4 Fixed a mistake ... 2020-05-30 21:27:44 +02:00
Veronica K. B. Olsen 0af58aabad Fixed some float to int warnings 2020-05-30 21:20:12 +02:00
Veronica K. B. Olsen 99d361ad9a Some further text, icon and column size tweaks. 2020-05-30 21:12:51 +02:00
Veronica K. B. Olsen 59bdc375a6 Split the include in build flag into its own column in the project tree, and updated etails pane accordingly 2020-05-30 20:55:53 +02:00
Veronica K. B. Olsen 98757bc241 Replaced the scaling variables on document titlebar 2020-05-30 20:55:13 +02:00
Veronica K. B. Olsen 97ad9aba9e Replaced fixed icon size values on the status bar. 2020-05-30 20:52:48 +02:00
Veronica K. B. Olsen 586535de92 Added variables for font metrics to theme class 2020-05-30 20:52:19 +02:00
Veronica K. B. Olsen 3487817065 Added check and cross icons to icon themes 2020-05-30 20:40:17 +02:00
Veronica K. Berglyd Olsen 9f7d9415ab Merge pull request #267 from vkbo/bugfixes
Bugfixes
2020-05-30 15:43:47 +02:00
Veronica K. B. Olsen 724e597d9c Added some extra checks for deleting files when the file is brand new, and updated the test to check it works 2020-05-30 15:34:28 +02:00
Veronica K. B. Olsen f3f61c43f0 Ensure that all folders exist when a new project has been created, but also check that the project folder was empty 2020-05-30 14:56:47 +02:00
Veronica K. B. Olsen 25aedc398b Add a couple of checks that handles are valid 2020-05-30 14:56:06 +02:00
Veronica K. B. Olsen f825e10146 Set release date to 2020-06-01 2020-05-30 14:21:41 +02:00
Veronica K. B. Olsen c82a3efcbf Bumped version to 0.7 2020-05-30 14:21:18 +02:00
Veronica K. B. Olsen c9083675ad Updated changelog 2020-05-30 14:19:40 +02:00
Veronica K. Berglyd Olsen 7084367919 Merge pull request #265 from vkbo/typicons_colour_light
Icon Theme: Typicons Colour Light
2020-05-30 14:14:43 +02:00
Veronica K. B. Olsen e130e4cecc Adapted the icon colours to light background 2020-05-30 14:08:29 +02:00
Veronica K. B. Olsen 668a3f1f51 Copied the dark colour icon theme to make light theme 2020-05-30 13:45:07 +02:00
Veronica K. Berglyd Olsen 54b9b376e9 Merge pull request #264 from vkbo/dialog_tests
More Tests of GUI Dialogs
2020-05-30 13:28:43 +02:00
Veronica K. B. Olsen ee5cdc1d41 Consitent end of file line endings for merge and split tools 2020-05-30 13:17:21 +02:00
Veronica K. B. Olsen bee82dd735 added split document test 2020-05-30 13:16:57 +02:00
Veronica K. B. Olsen 6856e30b8c Added folder merge test 2020-05-30 12:46:54 +02:00
Veronica K. B. Olsen 6bb8428ef1 Added test for the about box 2020-05-30 12:45:32 +02:00
Veronica K. Berglyd Olsen f49e773782 Merge pull request #263 from vkbo/build_test
Test for Build Novel Project
2020-05-30 12:19:27 +02:00
Veronica K. B. Olsen 67b369b532 Chache dir is not commited, so doesn't exist when running CI 2020-05-30 12:16:45 +02:00
Veronica K. B. Olsen ec0dc54e55 Cleare meta data when running test on lipsum project, and add the correct reference files 2020-05-30 12:08:56 +02:00
Veronica K. B. Olsen c7533c165f Fixed a bug in the tokenizer for root folder headings 2020-05-30 11:43:08 +02:00
Veronica K. B. Olsen 7451ac4585 Added a couple of flags to allow the build tool to be run without user interaction 2020-05-30 11:42:49 +02:00
Veronica K. B. Olsen 5861892b2d Added a test for the Build Novel Project tool 2020-05-30 11:42:09 +02:00
Veronica K. B. Olsen 017797667c Added a Lorem Ipsum test project for the pytests 2020-05-30 11:41:23 +02:00
Veronica K. Berglyd Olsen 576e1c37a4 Merge pull request #262 from vkbo/bugfix
Bugfix for merging error
2020-05-30 00:48:58 +02:00
Veronica K. B. Olsen 6413211558 Fixed remnant from conflicting versions of the code that caused a crash 2020-05-30 00:45:45 +02:00
Veronica K. B. Olsen 867ea7bfed Droped the entry for 0.6.4 in te changelog since there won't be such a release 2020-05-30 00:33:34 +02:00
Veronica K. Berglyd Olsen 670b1ec114 Merge pull request #257 from vkbo/dev
Dev to Master for Release 0.7
2020-05-30 00:31:51 +02:00
Veronica K. B. Olsen d2ab6a4934 Updated changelog 2020-05-30 00:28:39 +02:00
Veronica K. Berglyd Olsen 1c320dd202 Merge pull request #261 from vkbo/project_updates
Project Class Updates
2020-05-30 00:23:13 +02:00
Veronica K. B. Olsen f3cc6359c4 Add an empty line at the end of the ToC.txt file 2020-05-30 00:20:14 +02:00
Veronica K. B. Olsen a7bca8486f Added the ToC files as well to the repo 2020-05-30 00:16:53 +02:00
Veronica K. B. Olsen d27e2dc60f Added code to write contents txt and json files on project close 2020-05-30 00:15:07 +02:00
Veronica K. B. Olsen 7b8a852101 Corrected default title formats, and added editTime meta data 2020-05-29 23:46:13 +02:00
Veronica K. B. Olsen 5d2f6d33b5 Also updated the documen class with new project variables 2020-05-29 23:31:38 +02:00
Veronica K. B. Olsen 421c40c288 Fixed tests 2020-05-29 23:08:27 +02:00
Veronica K. B. Olsen cae9705e4f Files don't need the expanded flag saved to XML 2020-05-29 23:03:04 +02:00
Veronica K. B. Olsen 36ca2ee309 Cleane dup project open and handling of legacy project content 2020-05-29 23:01:25 +02:00
Veronica K. B. Olsen 2b36ed3617 Merge branch 'master' into dev 2020-05-29 21:11:13 +02:00
Veronica K. B. Olsen 5fe521d2e9 Updated changelog 2020-05-29 21:10:13 +02:00
Veronica K. Berglyd Olsen 63c3ca1535 Merge pull request #260 from vkbo/fixes
Fixes
2020-05-29 21:07:55 +02:00
Veronica K. B. Olsen 4de02698d9 Preferences doc size limit unit is kB, not kb 2020-05-29 20:40:29 +02:00
Veronica K. B. Olsen dd14a38889 An update to how text is extracted from the text editor, conforms to the description in the Qt docs. 2020-05-29 20:38:46 +02:00
Veronica K. B. Olsen 055ffdaac9 Split document section headers should be SCENE files not PAGE 2020-05-28 23:19:12 +02:00
Veronica K. Berglyd Olsen 397ecfeb13 Merge pull request #256 from vkbo/gui_tweaks
Minor GUI Tweaks
2020-05-28 23:11:27 +02:00
Veronica K. B. Olsen 834ed1f0b6 Updated changelog 2020-05-28 23:11:13 +02:00