Further improved the menu and fallback colorscheme

1 files changed, 104 insertions, 31 deletions

diff --git a/vimrc-full b/vimrc-full
index bbfeafa..a21bd25 100644
--- a/vimrc-full
+++ b/vimrc-full
@@ -92,44 +92,44 @@ if has('cscope') " compiled with cscope support?
   endif
 
   if has('menu')
-    menu &:cscope.find.c\ symbol
+   1001menu &Cscope.find.c\ symbol
           \<tab>s
           \ :cscope find s <cword><:cR>
-    menu &:cscope.find.definition
+   1001menu &Cscope.find.definition
           \<tab>g
           \ :cscope find g <cword><:cR>
-    menu &:cscope.find.functions\ called\ by\ this
+   1001menu &Cscope.find.functions\ called\ by\ this
           \<tab>d
           \ :cscope find d <cword><:cR>
-    menu &:cscope.find.functions\ calling\ this
+   1001menu &Cscope.find.functions\ calling\ this
           \<tab>c
           \ :cscope find c <cword><:cR>
-    menu &:cscope.find.text\ string
+   1001menu &Cscope.find.text\ string
           \<tab>t
           \ :cscope find t <cword><:cR>
-    menu &:cscope.find.egrep\ pattern
+   1001menu &Cscope.find.egrep\ pattern
           \<tab>e
           \ :cscope find e <cword><:cR>
-    menu &:cscope.find.this\ file
+   1001menu &Cscope.find.this\ file
           \<tab>f
           \ :cscope find f <cword><:cR>
-    menu &:cscope.find.files\ including\ this\ file
+   1001menu &Cscope.find.files\ including\ this\ file
           \<tab>i
           \ :cscope find i <cword><:cR>
-    menu &:cscope.find.places\ where\ this\ symbol\ is\ assigned\ a\ value
+   1001menu &Cscope.find.places\ where\ this\ symbol\ is\ assigned\ a\ value
           \<tab>a
           \ :cscope find a <cword><:cR>
-    menu &:cscope.-Sep1-
+   1001menu &Cscope.-Sep1-
           \ :
-    menu &:cscope.create\ and\ add\ database
+   1001menu &Cscope.create\ and\ add\ database
           \ :cscope kill -1<CR>:execute '!find -regex ".*\.\(c\\|h\\|cpp\\|cxx\\|hh\\|hpp\\|hxx\)$" <bar> cscope -i- -b -q'<CR>:cscope add .<CR>
-    menu &:cscope.-Sep2-
+   1001menu &Cscope.-Sep2-
           \ :
-    menu &:cscope.add\ \.
+   1001menu &Cscope.add\ \.
           \ :cscope add .<CR>
-    menu &:cscope.show
+   1001menu &Cscope.show
           \ :cscope show<CR>
-    menu &:cscope.reset
+   1001menu &Cscope.reset
           \ :cscope reset<CR>
   endif
 endif
@@ -426,23 +426,76 @@ if has("autocmd")
         set wildmenu
         set cpo-=<
         set wcm=<C-Z>
-        map <F4> :emenu <C-Z>
 
-        menu &Directory.print\ current\ directory
+        01menu &Functions.toggle\ file\ browser
+              \<Tab><leader><leader>
+              \ <leader><leader>
+        01menu &Functions.-Sep0- :
+
+        01menu &Functions.help
+              \<Tab><F1>
+              \ <F1>
+        01menu &Functions.copen\:\ show\ quickfix\ list
+              \<Tab><F2>
+              \ <F2>
+        01menu &Functions.lopen\:\ show\ location\ list
+              \<Tab><F3>
+              \ <F3>
+        01menu &Functions.unef4
+              \<Tab><F4>
+              \ <F4>
+        01menu &Functions.-Sep1- :
+
+        01menu &Functions.make
+              \<Tab><F5>
+              \ <F5>
+        01menu &Functions.clear\ matches,\ update\ viewport
+              \<Tab><F6>
+              \ <F6>
+        01menu &Functions.undef7
+              \<Tab><F7>
+              \ <F7>
+        01menu &Functions.undef8
+              \<Tab><F8>
+              \ <F8>
+        01menu &Functions.-Sep2- :
+
+        01menu &Functions.toggle\ tagbar
+              \<Tab><F9>
+              \ <F9>
+
+        if has("gui_running") == 0
+          " in the gui F10 already triggeres the menu, not in a terminal vim, so upgrade that...
+          map <F10> :emenu <C-Z>
+        endif
+        01menu &Functions.activate\ menu\ (:emenu)
+              \<Tab><F10>
+              \ <F10>
+
+        01menu &Functions.undef11
+              \<Tab><F11>
+              \ <F11>
+        01menu &Functions.undef12
+              \<Tab><F12>
+              \ <F12>
+        01menu &Functions.-Sep2- :
+
+
+        09menu &Directory.print\ current\ directory
               \<Tab>:pwd
               \ :pwd<CR>
 
-        menu &Directory.-Sep- :
+        09menu &Directory.-Sep- :
 
-        menu &Directory.Change\ to\ GIT\ root
+        09menu &Directory.Change\ to\ GIT\ root
               \<Tab>:Gcd
               \ :Gcd<CR>:pwd<CR>
 
-        menu &Directory.Change\ to\ current\ buffers\ directory\ (global)
+        09menu &Directory.Change\ to\ current\ buffers\ directory\ (global)
               \<tab>:cd\ %:p:h
               \ :cd %:h<CR>:pwd<CR>
 
-        menu &Directory.Change\ to\ current\ buffers\ directory\ (local\ window)<tab>:lcd\ %:p:h
+        09menu &Directory.Change\ to\ current\ buffers\ directory\ (local\ window)<tab>:lcd\ %:p:h
               \ :lcd %:p:h<CR>:pwd<CR>
 
         menu &Git.&Display\ last\ changes
@@ -467,11 +520,6 @@ if has("autocmd")
 
         menu &Window.-Sep- :
 
-        menu &Window.Quickfix\ List
-              \ :copen<CR>
-
-        menu &Window.Location\ List
-              \ :lopen<CR>
 
         menu &Window.Scratch
               \ :Scratch<CR>
@@ -512,6 +560,22 @@ if has("autocmd")
               \<Tab>:clearjumps
               \ :clearjumps
 
+       1000menu &Tag.list
+              \<Tab>:tags
+              \ :tags<CR>
+       1000menu &Tag.selection\ list
+              \<Tab>:ts
+              \ :ts<CR>
+
+       1000menu &Tag.-Sep1- :
+
+       1000menu &Tag.stack.jump\ older
+              \<Tab><C-T>
+              \ :po
+       1000menu &Tag.stack.jump\ 
+              \<Tab>:ta
+              \ :ta
+
         menu &UI.&Open\ in\ Serversession
               \ :execute ':!nvr --servername /tmp/nvimsocket --remote % +'.line('.')<CR>:stopinsert<CR>:set readonly<CR>
 
@@ -740,7 +804,7 @@ set statusline+=%*%=
 set statusline+=%l:%c(%p%%)
 
 " Autocompleter: =====================================
-" if has("python")
+if has("python")
 
   " ULTISNIPS: code snippet ============================================================================================
   Plug 'honza/vim-snippets'                      " dependency of ultisnips (see below)
@@ -763,8 +827,8 @@ set statusline+=%l:%c(%p%%)
   " YouCompleteMe: =====================================================================================================
   " Plug 'Valloric/MatchTagAlways'                           " highlights the closing tag/brace/...
   Plug 'Valloric/YouCompleteMe'
-  let g:ycm_error_symbol                             = '✖' " insert this as an error symbol in the gutter bar
-  let g:ycm_warning_symbol                           = '➔' " insert this as a warning symbol in the gutter bar
+  let g:ycm_error_symbol                             = '✖' " insert this as an error symbol in the gutter bar/sign column
+  let g:ycm_warning_symbol                           = '➔' " insert this as a warning symbol in the gutter bar/sign coloumn
   let g:ycm_auto_trigger                             = 1
   let g:ycm_autoclose_preview_window_after_insertion = 1
   " Plug 'vim-scripts/dbext.vim'                       " dependency to allow db related completions
@@ -825,7 +889,8 @@ set statusline+=%l:%c(%p%%)
   " autocmd FileType python jedi.preload_module('os', 'sys', 'math')
   " let g:pymode_options_max_line_length          = 120
   " let g:syntastic_python_flake8_args='--ignore=F821,E302,E501,E241,E301'
-" endif
+
+endif " has("python")
 
 "=======================================================================================================================
 " TESTING:                            | " plugins which I am currently trying...
@@ -942,7 +1007,15 @@ let base16colorspace=256
 if filereadable(expand("~/.vimrc_background"))
   source ~/.vimrc_background
 else
-  colorscheme base16-phd
+  let g:PaperColor_Theme_Options = {
+  \   'theme': {
+  \     'default': {
+  \       'transparent_background': 1
+  \     }
+  \   }
+  \ }
+  set background=dark
+  colorscheme PaperColor
 endif