From 1456b4a315518be86c72787d81846f9ea8be5cce Mon Sep 17 00:00:00 2001 From: Jan Andrle Date: Tue, 20 Aug 2024 16:53:10 +0200 Subject: [PATCH] :zap: small ui and ux improvements of Geany --- .config/geany/colorschemes/vsdark-mod.conf | 71 ++++++++++---------- .config/geany/filedefs/filetypes.Stylus.conf | 2 +- .config/geany/filetype_extensions.conf | 2 +- .config/geany/geany.conf | 25 +++---- .config/geany/keybindings.conf | 16 ++--- .ctags | 52 +++++++++++++- 6 files changed, 107 insertions(+), 61 deletions(-) diff --git a/.config/geany/colorschemes/vsdark-mod.conf b/.config/geany/colorschemes/vsdark-mod.conf index ec3d197..03a31fb 100644 --- a/.config/geany/colorschemes/vsdark-mod.conf +++ b/.config/geany/colorschemes/vsdark-mod.conf @@ -1,5 +1,5 @@ # -# This library is free software; you can redistribute it and/or +# This library is free software; you can baseRedistribute it and/or # modify it under the terms of the GNU Library General Public # License as published by the Free Software Foundation; either # version 2 of the License, or (at your option) any later version. @@ -27,21 +27,20 @@ base1=#282828 base2=#3f3f3f base3=#808080 base4=#303030 -vsblue=#AA89C0 -aqua=#6FB2EA -bluegrey=#747e9e -orange=#CE9563 -lime=#65ff00 -grey=#94B386 -red=#f00 -redbg=#751212 -green=#859900 -blue=#268bd2 -yellow=#dcdcaa +baseKeyword=#C89FE3 +baseString=#6FB2EA +baseKeyWord2=#747e9e +baseNumber=#F19B78 +baseComment=#94B386 +baseRed=#f00 +baseRedbg=#751212 +baseGreen=#859900 +baseKeyword3=#DCB55F +baseFunction=#dcdcaa [named_styles] default=base0;base1;true;false -error=red +error=baseRed # Editor styles @@ -49,76 +48,76 @@ error=red selection=;#000000;;true current_line=;#212121;true brace_good=base0;base2;true -brace_bad=red;;true +brace_bad=baseRed;;true margin_line_number=base3;base4 margin_folding=base3;#212121 fold_symbol_highlight=base2 indent_guide=base2;;true -caret=aqua;;false +caret=baseString;;false marker_line=#fff;#00f; marker_search=#fff;#d791a8; marker_mark=; call_tips=base0;base1 -white_space=base2;;true +white_space=base3;;true # Programming languages #------------------------------------------------------------------------------- -comment=grey +comment=baseComment comment_doc=comment comment_line=comment comment_line_doc=comment_doc comment_doc_keyword=comment_doc,bold comment_doc_keyword_error=comment_doc,italic -number=orange +number=baseNumber number_1=number number_2=number_1 -type=vsblue;;true -class=aqua -function=yellow +type=baseKeyword;;true +class=baseString +function=baseFunction parameter=function -keyword=vsblue;;true +keyword=baseKeyword;;true keyword_1=keyword -keyword_2=blue;;true -keyword_3=bluegrey +keyword_2=baseKeyword3;;true +keyword_3=baseKeyWord2 keyword_4=keyword_3 identifier=default identifier_1=identifier -identifier_2=identifier_1 -identifier_3=identifier_1 -identifier_4=identifier_1 +identifier_2=baseNumber +identifier_3=identifier_2 +identifier_4=identifier_3 -string=aqua +string=baseString string_1=string string_2=string_1 string_3=default string_4=default -string_eol=red +string_eol=baseRed character=string_1 backticks=string_2 here_doc=string_2 scalar=string_2 label=keyword,bold -preprocessor=aqua +preprocessor=baseString regex=number_1 operator=base0 decorator=string_1,bold -other=aqua +other=baseString # Markup-type languages #------------------------------------------------------------------------------- -tag=vsblue +tag=baseKeyword tag_unknown=tag,bold tag_end=tag,bold -attribute=aqua +attribute=baseString attribute_unknown=attribute,bold value=string_1 entity=default @@ -127,6 +126,6 @@ entity=default # Diff #------------------------------------------------------------------------------- -line_added=green -line_removed=red -line_changed=blue +line_added=baseGreen +line_removed=baseRed +line_changed=baseKeyword3 diff --git a/.config/geany/filedefs/filetypes.Stylus.conf b/.config/geany/filedefs/filetypes.Stylus.conf index 5e2abb9..6dc99d9 100644 --- a/.config/geany/filedefs/filetypes.Stylus.conf +++ b/.config/geany/filedefs/filetypes.Stylus.conf @@ -24,7 +24,7 @@ lexer.cpp.track.preprocessor=1 lexer.cpp.update.preprocessor=1 [settings=CSS] -extension=less +extension=styl lexer_filetype=python tag_parser=CSS diff --git a/.config/geany/filetype_extensions.conf b/.config/geany/filetype_extensions.conf index a8b3533..ee89846 100644 --- a/.config/geany/filetype_extensions.conf +++ b/.config/geany/filetype_extensions.conf @@ -76,7 +76,7 @@ Stylus=*.styl; #Swift=*.swift; #Tcl=*.tcl;*.tk;*.wish;*.exp; #Txt2tags=*.t2t; -TypeScript=*.ts;*.tsx;*.d.ts; +TypeScript=*.ts;*.tsx; SCSS=*.scss SVG=*.svg #Vala=*.vala;*.vapi; diff --git a/.config/geany/geany.conf b/.config/geany/geany.conf index cfe044f..6de093f 100644 --- a/.config/geany/geany.conf +++ b/.config/geany/geany.conf @@ -134,12 +134,12 @@ msgwin_messages_visible=true msgwin_scribble_visible=true warn_on_project_close=true documents_show_paths=true -sidebar_page=4 +sidebar_page=3 pref_main_project_session=true use_native_windows_dialogs=false -treeview_position=245 -msgwindow_position=699 -geometry=0;26;1920;1054;1; +treeview_position=226 +msgwindow_position=755 +geometry=1280;26;1277;1026;0; use_native_dialogs=true [tools] @@ -204,17 +204,17 @@ find_close_dialog=true replace_regexp=false replace_regexp_multiline=false replace_case_sensitive=false -replace_escape_sequences=false +replace_escape_sequences=true replace_match_whole_word=false replace_match_word_start=false replace_search_backwards=false replace_close_dialog=true find_all_expanded=false -replace_all_expanded=false -position_find_x=1257 -position_find_y=459 -position_replace_x=-1 -position_replace_y=-1 +replace_all_expanded=true +position_find_x=2201 +position_find_y=372 +position_replace_x=504 +position_replace_y=397 position_fif_x=-1 position_fif_y=-1 @@ -228,6 +228,7 @@ session_file= project_file_path=/home/jaandrle/Dokumenty/Projekty/geany [files] -recent_files=/home/jaandrle/Vzdálené/GitHub/Facilitator-App-Native/app/(app)/dashboard.tsx;/home/jaandrle/Vzdálené/GitHub/Facilitator-App-Native/components/SessionList/index.ts;/home/jaandrle/bin/asana.mjs;/home/jaandrle/Stažené/goto_matching_brace-function.txt;/home/jaandrle/.config/geany/filedefs/filetypes.SCSS.conf;/home/jaandrle/.config/geany/filedefs/filetypes.Less.conf;/home/jaandrle/.config/geany/filedefs/filetypes.Vue.conf;/home/jaandrle/Vzdálené/GitHub/deka-dom-el/index.js;/home/jaandrle/Vzdálené/GitHub/Facilitator-App-Native/app.config.ts;/home/jaandrle/Vzdálené/GitHub/deka-dom-el/src/dom.js; +recent_files=/home/jaandrle/Stažené/config.xml;/home/jaandrle/Stažené/sentry.php.json;/home/jaandrle/Vzdálené/GitHub/DHLC-Internet-Networking-old/web/api/index.php;/media/jaandrle/WARTY WARTH/geany/filetype_extensions.conf;/media/jaandrle/WARTY WARTH/geany/plugins/geanydoc/geanydoc.conf;/media/jaandrle/WARTY WARTH/geany/plugins/saveactions/saveactions.conf;/media/jaandrle/WARTY WARTH/geany/plugins/vimode/vimode.conf;/media/jaandrle/WARTY WARTH/geany/plugins/filebrowser/filebrowser.conf;/media/jaandrle/WARTY WARTH/geany/plugins/VC/VC.conf;/media/jaandrle/WARTY WARTH/geany/plugins/spellcheck/spellcheck.conf; recent_projects=/home/jaandrle/Dokumenty/Projekty/geany/Facilitator-App-Native.geany;/home/jaandrle/Dokumenty/Projekty/geany/deka-dom-el.geany;/home/jaandrle/Dokumenty/Projekty/geany/Facilitator-App-Native;/home/jaandrle/Dokumenty/Projekty/geany/deka-dom-el;/home/jaandrle/Dokumenty/Projekty/geany/deka-dom-el/deka-dom-el;/home/jaandrle/Dokumenty/Projekty/geany/.babelrc; -current_page=-1 +current_page=0 +FILE_NAME_0=0;XML;0;EUTF-8;1;1;0;%2Fhome%2Fjaandrle%2FStažené%2Fconfig.xml;0;4 diff --git a/.config/geany/keybindings.conf b/.config/geany/keybindings.conf index 262eae1..e798dd5 100644 --- a/.config/geany/keybindings.conf +++ b/.config/geany/keybindings.conf @@ -14,9 +14,9 @@ menu_reloadall= file_openlasttab= menu_quit=q menu_undo=z -menu_redo=y -edit_duplicateline=d -edit_deleteline=k +menu_redo=z +edit_duplicateline= +edit_deleteline= edit_deletelinetoend=Delete edit_deletelinetobegin=BackSpace edit_transposeline= @@ -24,7 +24,7 @@ edit_scrolltoline=l edit_scrolllineup=Up edit_scrolllinedown=Down edit_completesnippet=Tab -move_snippetnextcursor= +move_snippetnextcursor=ISO_Left_Tab edit_suppresssnippetcompletion= popup_contextaction= edit_autocomplete=space @@ -64,7 +64,7 @@ edit_sendtocmd9= edit_sendtovte= format_reflowparagraph=j edit_joinlines= -menu_insert_date=d +menu_insert_date= edit_insertwhitespace= edit_insertlinebefore= edit_insertlineafter= @@ -140,7 +140,7 @@ switch_compiler= switch_messages= switch_scribble=F6 switch_vte=F4 -switch_sidebar= +switch_sidebar=F2 switch_sidebar_symbol_list= switch_sidebar_doc_list= switch_tableft=Page_Up @@ -171,8 +171,8 @@ switch_head_impl=s goto_file=g [commander] -show_panel=semicolon -show_panel_commands= +show_panel= +show_panel_commands=semicolon show_panel_files= [file_browser] diff --git a/.ctags b/.ctags index 74a3670..3e38da4 100644 --- a/.ctags +++ b/.ctags @@ -1,5 +1,51 @@ ---exclude=node_modules ---exclude=gulp +--exclude="*/node_modules/*" +--exclude=*.min.js +--exclude=*.min.css +--exclude=*.map +--exclude=.backup +--exclude=.sass-cache +--exclude=vendors +--exclude=.git + +--langdef=css +--langmap=css:.css +--langmap=css:+.styl +--langmap=css:+.less +--regex-css=/^[ \t]*\.([A-Za-z0-9_-]+)/\1/c,class,classes/ +--regex-css=/^[ \t]*#([A-Za-z0-9_-]+)/\1/i,id,ids/ +--regex-css=/^[ \t]*(([A-Za-z0-9_-]+[ \t\n,]+)+)\{/\1/t,tag,tags/ +--regex-css=/^[ \t]*@media\s+([A-Za-z0-9_-]+)/\1/m,media,medias/ + +--langdef=scss +--langmap=scss:.sass +--langmap=scss:+.scss +--regex-scss=/^[ \t]*@mixin ([A-Za-z0-9_-]+)/\1/m,mixin,mixins/ +--regex-scss=/^[ \t]*@function ([A-Za-z0-9_-]+)/\1/f,function,functions/ +--regex-scss=/^[ \t]*\$([A-Za-z0-9_-]+)/\1/v,variable,variables/ +--regex-scss=/^([A-Za-z0-9_-]*)*\.([A-Za-z0-9_-]+) *[,{]/\2/c,class,classes/ +--regex-scss=/^[ \t]+\.([A-Za-z0-9_-]+) *[,{]/\1/c,class,classes/ +--regex-scss=/^(.*)*\#([A-Za-z0-9_-]+) *[,{]/\2/i,id,ids/ +--regex-scss=/^[ \t]*#([A-Za-z0-9_-]+)/\1/i,id,ids/ +--regex-scss=/(^([A-Za-z0-9_-])*([A-Za-z0-9_-]+)) *[,|\{]/\1/t,tag,tags/ +--regex-scss=/(^([^\/\/])*)[ \t]+([A-Za-z0-9_-]+)) *[,|\{]/\3/t,tag,tags/ +--regex-scss=/(^(.*, *)([A-Za-z0-9_-]+)) *[,|\{]/\3/t,tag,tags/ +--regex-scss=/(^[ \t]+([A-Za-z0-9_-]+)) *[,|\{]/\1/t,tag,tags/ +--regex-scss=/^[ \t]*@media\s+([A-Za-z0-9_-]+)/\1/d,media,media/ + +--langdef=stylus +--langmap=stylus:.styl +--regex-stylus=/^[ \t]*\.([A-Za-z0-9_-]+)/\1/c,class,classes/ +--regex-stylus=/^[ \t]*#([A-Za-z0-9_-]+)/\1/i,id,ids/ +--regex-stylus=/^[ \t]*(([A-Za-z0-9_-]+[ \t\n,]+)+)\{/\1/t,tag,tags/ +--regex-stylus=/^[ \t]*@media\s+([A-Za-z0-9_-]+)/\1/m,media,medias/ + +--langdef=markdown +--langmap=markdown:.md +--regex-markdown=/^# (<.*>)?(.+)/\2/i,h1/ +--regex-markdown=/^## (<.*>)?(.+)/\2/i,h2/ +--regex-markdown=/^### (<.*>)?(.+)/\2/i,h3/ + +--langdef=js --langmap=javascript:.js.es6.es.jsx.mjs --javascript-kinds=-c-f-m-p-v @@ -157,4 +203,4 @@ --regex-typescript=/^[ \t]*(export[ \t]+)?interface[ \t]+([a-zA-Z0-9_$]+)/\2/i,interfaces/ --regex-typescript=/^[ \t]*(export[ \t]+)?type[ \t]+([a-zA-Z0-9_$]+)/\2/t,types/ --regex-typescript=/^[ \t]*(export[ \t]+)?enum[ \t]+([a-zA-Z0-9_$]+)/\2/e,enums/ ---regex-typescript=/^[ \t]*import[ \t]+([a-zA-Z0-9_$]+)/\1/I,imports/ \ No newline at end of file +--regex-typescript=/^[ \t]*import[ \t]+([a-zA-Z0-9_$]+)/\1/I,imports/