コミット: 0c85aca8c1f482820fe3cb0911d9de789061d114 - geany-files (git)

コミットメタ情報

• リビジョン: 0c85aca8c1f482820fe3cb0911d9de789061d114 (tree)
• 日時: 2023-05-08 21:28:43
• 作者: badcoff33 <none@none>
• コミッター: badcoff33

ログメッセージ

update

変更サマリ

• modified: .hgignore
• modified: colorschemes/two_tone.conf
• modified: filedefs/filetypes.common
• add: geany.css
• modified: keybindings.conf
• delete: plugins/saveactions/saveactions.conf
• modified: plugins/spellcheck/en_US.dic
• modified: snippets.conf

差分

--- a/.hgignore
+++ b/.hgignore
@@ -8,6 +8,7 @@ plugins\Geany_Macros
 plugins\spellcheck\*.exc
 plugins\spellcheck\*.dic
 plugins\spellcheck\*.conf
+plugins\updatechecker
 plugins\VC
 plugins\codenav
 plugins\geanygendoc

--- a/colorschemes/two_tone.conf
+++ b/colorschemes/two_tone.conf
@@ -31,9 +31,9 @@ compat=1.38
 black   = #000000
 white   = #FFFFFF
 
-blue    = #2188FF
-blue_bg = #80C0FF
-red     = #FF2382
+blue    = #2198E0
+blue_bg = #A0D0FF
+red     = #E02362
 red_bg  = #FF80C0
 
 silver9 = #F5F5F8
@@ -55,51 +55,55 @@ error=white;red;true;false
 # Editor styles
 #-------------------------------------------------------------------------------
 
-selection=#000;#9ce;true;true
-current_line=#000;silver9;true
-brace_good=#000;#DDD;false;false
+selection=black;silver8;true;true
+
+# set third parameter to disable (false) "current_line"
+current_line=#000;silver9;false
+
+brace_good=#000;#EEE;false;false
 brace_bad=#F00;#FCC;true;false
 margin_line_number=#888;white;bold
 margin_folding=#ddd;white
 fold_symbol_highlight=#ccc
 indent_guide=#bbbebb
 caret=#000;#000;false
-marker_line=#000;#ff0
-marker_search=marker_line
-marker_mark=#000;#6c8ea2
+marker_line=#000;#ddd
+marker_search=#000;#0ff
+marker_mark=#000;#cfc
 call_tips=#bbbebb;#fff;false;false
 white_space=call_tips,bold
+indicator_error=red
 
 # Programming languages
 #-------------------------------------------------------------------------------
 
 comment=silver5
+comment_line=comment,italic
+comment_line_doc=comment,italic
 comment_doc=comment
-comment_line=comment
-comment_line_doc=comment_doc
 comment_doc_keyword=comment_doc,bold
-comment_doc_keyword_error=comment_doc,italic
+comment_doc_keyword_error=comment,bold
 
-number=#646
+number=red
 number_1=number
-number_2=number_1
+number_2=number
 
 type=red
 class=number
-function=default
+function=red
 parameter=function
 
 keyword=blue
-keyword_1=blue
-keyword_2=blue
-keyword_3=keyword_1
-keyword_4=keyword_1
+keyword_1=keyword,bold
+keyword_2=keyword,italic
+keyword_3=keyword
+keyword_4=keyword
 
-identifier=silver1
-identifier_1=silver0
-identifier_2=identifier_1
-identifier_3=identifier_1
-identifier_4=silver2
+identifier=silver2
+identifier_1=identifier
+identifier_2=identifier
+identifier_3=identifier
+identifier_4=identifier
 
 string=red
 string_1=string
@@ -113,7 +117,7 @@ here_doc=string_2
 
 scalar=red
 label=default,bold
-preprocessor=black
+preprocessor=blue,bold
 regex=blue
 operator=default
 decorator=string_1,bold

--- a/filedefs/filetypes.common
+++ b/filedefs/filetypes.common
@@ -3,7 +3,7 @@
 
 # first argument: amount of space to be drawn above the line's baseline
 # second argument: amount of space to be drawn below the line's baseline
-line_height=2;2;false;false;
+line_height=1;1;false;false;
 
 #~# used for filetype All/None
 #~default=default

--- /dev/null
+++ b/geany.css
@@ -0,0 +1,55 @@
+ /* custom GTK3 CSS for Geany */
+
+/* make close button on the editor's tabs smaller */
+#geany-close-tab-button {
+	padding: 0;
+}
+#geany-close-tab-button GtkImage /* GTK < 3.20 */,
+#geany-close-tab-button image /* GTK >= 3.20 */ {
+	padding: 0;
+}
+
+/* use monospaced font in search entries for easier reading of regexp (#1907117) */
+#GeanyDialogSearch GtkEntry /* GTK < 3.20 */,
+#GeanyDialogSearch entry /* GTK >= 3.20 */ {
+	font-family: monospace;
+}
+
+/* set red background for GtkEntries showing unmatched searches */
+#geany-search-entry-no-match {
+	color: #fff;
+	background: #ff6666;
+}
+#geany-search-entry-no-match:selected /* GTK < 3.20 */,
+#geany-search-entry-no-match selection /* GTK >= 3.20 */ {
+	color: #fff;
+	background-color: #771111;
+}
+
+/* document status colors */
+#geany-document-status-changed {
+	color: #ff0000;
+}
+#geany-document-status-disk-changed {
+	color: #ff7f00;
+}
+#geany-document-status-readonly {
+	color: #007f00;
+}
+
+/* compiler message colors */
+#geany-compiler-error {
+    color: #ff0000;
+    background-color: #771111;
+}
+#geany-compiler-context {
+    color: #7f0000;
+}
+#geany-compiler-message {
+    color: #0000D0;
+}
+
+/* red "Terminal" label when terminal dirty */
+#geany-terminal-dirty {
+	color: #ff0000;
+}

--- a/keybindings.conf
+++ b/keybindings.conf
@@ -87,10 +87,10 @@ nav_forward=<Alt>Right
 menu_gotoline=<Primary>l
 edit_gotomatchingbrace=<Primary>b
 edit_togglemarker=<Primary>m
-edit_gotonextmarker=<Primary>period
-edit_gotopreviousmarker=<Primary>comma
-popup_gototagdefinition=F12
-popup_gototagdeclaration=<Shift>F12
+edit_gotonextmarker=<Primary>adiaeresis
+edit_gotopreviousmarker=<Primary>odiaeresis
+popup_gototagdefinition=<Primary>period
+popup_gototagdeclaration=<Primary><Shift>colon
 edit_gotolinestart=Home
 edit_gotolineend=End
 edit_gotolinestartvisual=<Alt>Home
@@ -126,8 +126,8 @@ build_link=
 build_make=F7
 build_makeowntarget=<Shift>F7
 build_makeobject=
-build_nexterror=<Alt>period
-build_previouserror=<Alt>comma
+build_nexterror=<Primary><Shift>n
+build_previouserror=<Primary><Shift>p
 build_run=F5
 build_options=<Primary>F7
 menu_opencolorchooser=
@@ -161,10 +161,10 @@ show_panel_files=<Primary>p
 
 [GeanyCtags]
 generate_tags=
-find_tag=
+find_tag=<Alt>period
 
 [spellcheck]
-spell_check=
+spell_check=<Shift><Alt>s
 spell_toggle_typing=
 
 [ProjectOrganizer]
@@ -248,3 +248,6 @@ Enclose_5=
 Enclose_6=
 Enclose_7=
 Enclose_8=
+
+[htmltable]
+convert_to_table=

--- a/plugins/saveactions/saveactions.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-[saveactions]
-enable_autosave=false
-enable_autosave_losing_focus=true
-enable_instantsave=false
-enable_backupcopy=false
-
-[autosave]
-print_messages=false
-save_all=false
-interval=300
-
-[instantsave]
-default_ft=None
-
-[backupcopy]
-dir_levels=0
-time_fmt=%Y-%m-%d-%H-%M-%S

--- a/plugins/spellcheck/en_US.dic
+++ b/plugins/spellcheck/en_US.dic
@@ -12,3 +12,6 @@ SBC
 GPIO
 TXD
 Autosar
+PWM
+ISR
+MCAL

--- a/snippets.conf
+++ b/snippets.conf
@@ -47,7 +47,7 @@ for=for (i = 0; i < %cursor%; i++)%block_cursor%
 if=if (%cursor%)%block_cursor%
 inc=#include "%cursor%"
 while=while (%cursor%)%block_cursor%
-switch=switch (%cursor%)%brace_open%case %cursor%:\n\t\t%cursor%\n\t\tbreak;\n\tdefault:\n\t\t%cursor%\n%brace_close%
+switch=switch (%cursor%)%brace_open%case %cursor%:\n\t\t%cursor%\n\t\tbreak;\n\tdefault:\n\t\t%cursor%\n\tbreak;\n%brace_close%
 
 [C++]
 blk=%block_cursor%