forks
/
dlangide
mirror of https://github.com/buggins/dlangide.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixes for console mode

This commit is contained in:
Vadim Lopatin 2016-09-13 10:34:46 +03:00
parent d8145233c1
commit 5b7de27d92
4 changed files with 40 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dub.json
View File

@ -12,7 +12,7 @@
"stringImportPaths": ["views", "views/res", "views/res/i18n", "views/res/mdpi", "views/res/hdpi"], "stringImportPaths": ["views", "views/res", "views/res/i18n", "views/res/mdpi", "views/res/hdpi"],
"dependencies": { "dependencies": {
"dlangui": "==0.9.2", "dlangui": "==0.9.3",
"dcd": "~>0.8.0" "dcd": "~>0.8.0"
}, },

8
src/dlangide/ui/dsourceedit.d
View File

@ -38,8 +38,10 @@ interface BookmarkListChangeListener {
class DSourceEdit : SourceEdit, EditableContentMarksChangeListener { class DSourceEdit : SourceEdit, EditableContentMarksChangeListener {
this(string ID) { this(string ID) {
super(ID); super(ID);
styleId = null; static if (BACKEND_GUI) {
backgroundColor = style.customColor("edit_background"); styleId = null;
backgroundColor = style.customColor("edit_background");
}
onThemeChanged(); onThemeChanged();
//setTokenHightlightColor(TokenCategory.Identifier, 0x206000); // no colors //setTokenHightlightColor(TokenCategory.Identifier, 0x206000); // no colors
MenuItem editPopupItem = new MenuItem(null); MenuItem editPopupItem = new MenuItem(null);
@ -63,7 +65,7 @@ class DSourceEdit : SourceEdit, EditableContentMarksChangeListener {
/// handle theme change: e.g. reload some themed resources /// handle theme change: e.g. reload some themed resources
override void onThemeChanged() { override void onThemeChanged() {
backgroundColor = style.customColor("edit_background"); static if (BACKEND_GUI) backgroundColor = style.customColor("edit_background");
setTokenHightlightColor(TokenCategory.Comment, style.customColor("syntax_highlight_comment")); // green setTokenHightlightColor(TokenCategory.Comment, style.customColor("syntax_highlight_comment")); // green
setTokenHightlightColor(TokenCategory.Keyword, style.customColor("syntax_highlight_keyword")); // blue setTokenHightlightColor(TokenCategory.Keyword, style.customColor("syntax_highlight_keyword")); // blue
setTokenHightlightColor(TokenCategory.String, style.customColor("syntax_highlight_string")); // brown setTokenHightlightColor(TokenCategory.String, style.customColor("syntax_highlight_string")); // brown

22
views/res/console_ide_theme_dark.xml
View File

@ -1,22 +1,20 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<theme id="ide_theme_dark" parent="theme_dark" <theme id="ide_theme_dark" parent="theme_default"
fontFace="Verdana,Arial,DejaVu Sans" fontFace="Verdana,Arial,DejaVu Sans"
fontFamily="SansSerif" fontFamily="SansSerif"
textColor="#E0E0E0" textColor="#E0E0E0"
> >
<color id="edit_background" value="#070808"/> <color id="edit_background" value="#070808"/>
<color id="link_color" value="#2020FF"/> <color id="link_color" value="#2020FF"/>
<color id="syntax_highlight_comment" value="#10C010"/> <color id="syntax_highlight_comment" value="#808000"/>
<color id="syntax_highlight_keyword" value="#4080FF"/> <color id="syntax_highlight_keyword" value="#00FF00"/>
<color id="syntax_highlight_string" value="#C37525"/> <color id="syntax_highlight_string" value="#FF00FF"/>
<color id="syntax_highlight_character" value="#C37525"/> <color id="syntax_highlight_character" value="#FFFF00"/>
<color id="syntax_highlight_error" value="#FF0000"/> <color id="syntax_highlight_error" value="#FF0000"/>
<color id="syntax_highlight_comment_documentation" value="#50a000"/> <color id="syntax_highlight_comment_documentation" value="#FFFF00"/>
<color id="build_log_filename_color" value="#3030FF"/> <color id="build_log_filename_color" value="#0000FF"/>
<color id="build_log_error_color" value="#FF4040"/> <color id="build_log_error_color" value="#FF0000"/>
<color id="build_log_warning_color" value="#E0E000"/> <color id="build_log_warning_color" value="#FFFF00"/>
<color id="build_log_deprecation_color" value="#F05080"/> <color id="build_log_deprecation_color" value="#FF00FF"/>
<drawable id="btn_check" value="btn_check_dark"/>
</theme> </theme>

31
views/res/console_ide_theme_default.xml
View File

@ -5,22 +5,39 @@
> >
<color id="edit_background" value="#000080"/> <color id="edit_background" value="#000080"/>
<color id="link_color" value="#2020FF"/> <color id="link_color" value="#2020FF"/>
<color id="syntax_highlight_comment" value="#008000"/> <color id="syntax_highlight_comment" value="#808000"/>
<color id="syntax_highlight_keyword" value="#0000FF"/> <color id="syntax_highlight_keyword" value="#00FF00"/>
<color id="syntax_highlight_string" value="#a31515"/> <color id="syntax_highlight_string" value="#FF00FF"/>
<color id="syntax_highlight_character" value="#a31515"/> <color id="syntax_highlight_character" value="#FFFF00"/>
<color id="syntax_highlight_error" value="#FF0000"/> <color id="syntax_highlight_error" value="#FF0000"/>
<color id="syntax_highlight_comment_documentation" value="#206000"/> <color id="syntax_highlight_comment_documentation" value="#FFFF00"/>
<color id="build_log_filename_color" value="#0000C0"/> <color id="build_log_filename_color" value="#0000C0"/>
<color id="build_log_error_color" value="#FF0000"/> <color id="build_log_error_color" value="#FF0000"/>
<color id="build_log_warning_color" value="#606000"/> <color id="build_log_warning_color" value="#606000"/>
<color id="build_log_deprecation_color" value="#802040"/> <color id="build_log_deprecation_color" value="#802040"/>
<drawable id="btn_check" value="btn_check"/>
<style id="TERMINAL" parent="EDIT_BOX_NO_FRAME" <style id="TERMINAL" parent="EDIT_BOX_NO_FRAME"
/> />
<drawable id="document-open" value="{'Opn' #00FF00}"/>
<drawable id="document-save" value="{'Sav' #FFFF00}"/>
<drawable id="debug-run" value="{'►' #00FF00}"/>
<drawable id="run-build" value="{'B' #FFFF00}"/>
<drawable id="run-rdmd" value="{'rdm' #FFFF00}"/>
<drawable id="edit-copy" value="{'cp' #008000}"/>
<drawable id="edit-paste" value="{'pt' #808000}"/>
<drawable id="edit-cut" value="{'ct' #800000}"/>
<drawable id="edit-undo" value="{'un' #808000}"/>
<drawable id="edit-redo" value="{'re' #008000}"/>
<drawable id="edit-indent" value="{'>>' #808000}"/>
<drawable id="edit-unindent" value="{'<<' #808000}"/>
<drawable id="debug-stop" value="{'◘' #00FF00}"/>
<drawable id="debug-pause" value="{'║' #808000}"/>
<drawable id="debug-restart" value="{'○' #800000}"/>
<drawable id="debug-step-into" value="{'→' #0000FF}"/>
<drawable id="debug-step-over" value="{'↓' #0000FF}"/>
<drawable id="debug-step-out" value="{'↑' #0000FF}"/>
</theme> </theme>