Minor notebook cleanup

src/notebook.cc

@@ -215,8 +215,8 @@ void Notebook::open(const boost::filesystem::path &file_path, size_t notebook_in
     current_view_pre_focused=nullptr;
     if(source_view!=current_view_focused) {
       current_view_focused=source_view;
-      if(on_focus)
+      if(on_change_page)
-        on_focus(source_view);
+        on_change_page(source_view);
     }
     else
       current_view_focused=source_view;
@@ -342,8 +342,8 @@ bool Notebook::close(size_t index) {
     source_maps.erase(source_maps.begin()+index);
 #endif
 
-    if(on_close)
+    if(on_close_page)
-      on_close(view);
+      on_close_page(view);
     
     if(auto clang_view=dynamic_cast<Source::ClangView*>(view))
       clang_view->async_delete();

src/notebook.h

@@ -47,8 +47,8 @@ public:
   Gtk::Label info;
   Gtk::Label status;
   
-  std::function<void(Source::View*)> on_focus;
+  std::function<void(Source::View*)> on_change_page;
-  std::function<void(Source::View*)> on_close;
+  std::function<void(Source::View*)> on_close_page;
 private:
   size_t get_index(Source::View *view);
   Source::View *get_view(size_t notebook_index, int page);

src/window.cc

@@ -103,7 +103,7 @@ Window::Window() {
       view->grab_focus();
   });
 
-  Notebook::get().on_focus=[this](Source::View *view) {
+  Notebook::get().on_change_page=[this](Source::View *view) {
     if(search_entry_shown && EntryBox::get().labels.size()>0) {
       view->update_search_occurrences=[this](int number){
         EntryBox::get().labels.begin()->update(0, std::to_string(number));
@@ -130,7 +130,7 @@ Window::Window() {
       Project::debug_update_stop();
 #endif
   };
-  Notebook::get().on_close=[](Source::View *view) {
+  Notebook::get().on_close_page=[](Source::View *view) {
 #ifdef JUCI_ENABLE_DEBUG
     if(Project::current && Project::debugging) {
       auto iter=view->get_buffer()->begin();