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

[WIP] Support for custom styles #190

Open
wants to merge 38 commits into
base: develop
Choose a base branch
from
Open

[WIP] Support for custom styles #190

wants to merge 38 commits into from

Conversation

cloose
Copy link
Owner

@cloose cloose commented Nov 14, 2014

No description provided.

@cloose cloose added this to the v0.11.0 milestone Nov 14, 2014
@cloose cloose self-assigned this Nov 14, 2014
@cloose cloose mentioned this pull request Nov 22, 2014
Open
cloose and others added 18 commits November 25, 2014 16:54
@cloose
First rough version of UI for changing styles via options dialog (no …
b30d4cd 
…logic yet)
@cloose
Merge branch 'wip/custom-styles' of https://github.com/cloose/CuteMarkEd
e3e7b67 
 into wip/custom-styles
@cloose
Moved Style struct to own header
2cbf273
@cloose
Merge branch 'wip/custom-styles' of https://github.com/cloose/CuteMarkEd
e05670f 
 into wip/custom-styles
@cloose
Fix compile with changed Style struct
4c66dbe
@cloose
Add new StyleCollection class
0b3ab3b
@cloose
Add unit test for StyleCollection class
eb67ede
@cloose
Add contains() method to StyleCollection (inkl. unit test)
f0d6232
@cloose
Add base classes for collections and JSON translators
bc17043 
Add new template base class Collection (StyleCollection,
SnippetCollection) and JsonTranslator (JsonSnippetTranslator).
@cloose
Generalize reading and saving JSON files
9e24907 
Generalize the JsonSnippetFile into a JsonFile class that reads or saves
a JSON file and uses JsonTranslatorFactory to retrieve a JsonTranslator
class that can handle the specified item type stored in the file.
@cloose
Add JSON translator for style structure
4264fee
@cloose
Add missing virtual destructor to JsonTranslator
d833792
@cloose
Fix memory leak in JsonFile
0771f39
@cloose
Add factory for JsonStyleTranslator and unit test for JsonTranslatorF…
4e28b9d 
…actory
@cloose
Add JsonStyleFileTest and complete JsonStyleTranslator implementation
a41cfcf
@cloose
Add missing include for QTextStream header
464295e
@cloose
Load builtin HTML preview styles from JSON file
94eb852
@cloose
Load builtin styles from JSON files
447acae
@cloose
Add all existing styles to JSON files
87c657e
@cloose
Starting to rework styles tab on OptionsDialog
5bdc574
@cloose
Some more progress on style dialog
6077e91
@cloose
Add update() and remove() method to Collection<T> interface and Style…
c3a1992 
…Collection
@cloose
It's now possible to add/edit/remove HTML preview styles via the opti…
bb3cb26 
…ons dialog
@cloose
Move all JSON handling classes to a subfolder
b176ce1
@cloose
Renamed Collection<T> to JsonCollection<T> and also moved to subfolder
dc68716
@cloose
Add name() method to JsonCollection implementations and use it in the…
ce9663d 
… JSON translators
@cloose
Also use name() in private isValid() methods
d3d89c0
@cloose
Merge branch 'develop' into wip/custom-styles
04615d6 
Conflicts:
	app-static/json/jsontranslatorfactory.h
	app/mainwindow.cpp
	test/unit/jsontranslatorfactorytest.cpp
	test/unit/jsontranslatorfactorytest.h
	test/unit/main.cpp
@cloose
Fix compile after merge
2dd7a3b
@cloose
Remove duplicate headers from qmake project
df3b017
@cloose
Merge branch 'develop' into wip/custom-styles
d6cd569
@cloose
Simplify JsonStyleTranslator based on the JsonTranslator changes
e38b22d
@cloose cloose modified the milestones: v0.12.0, v0.11.0 Mar 17, 2015
@cloose cloose mentioned this pull request Dec 9, 2015
Merged
@cloose cloose removed this from the v0.12.0 milestone Feb 1, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@cloose cloose

Labels
enhancement in progress
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@cloose