conflict-1

diff --cc data/themes/editor.cfg
index 2449ce9,323c8b3..0000000
--- a/data/themes/editor.cfg
+++ b/data/themes/editor.cfg
@@@ -65,7 -65,7 +65,11 @@@
              #image=lite_small
              #image=lite
              font_size=9
++<<<<<<< HEAD
 +            items=statustable,unitlist,editor-map-new,editor-map-load,editor-map-revert,editor-map-save,editor-map-save-as,editor-map-save-all,preferences,editor-settings,help,editor-close-map,quit-editor,editor-quit-to-desktop
++=======
+             items=statustable,unitlist,editor-map-new,editor-map-load,editor-map-revert,editor-map-save,editor-map-save-as,preferences,help,editor-close-map,quit-editor,editor-quit-to-desktop
++>>>>>>> Reporposed Editor Settings dialog as a Custom ToD dialog
              ref=top-panel
              rect="=+1,=+1,+100,+20"
              #rect="=+3,=+1,+55,=-4"
@@@ -473,17 -481,9 +477,17 @@@
              xanchor=right
              yanchor=fixed
          [/action]
 +        [panel]
 +            id=top_separator4
 +         #   image=themes/editor/classic/menubar_rightside.png
 +         #   ref=replay-panel
 +            rect="=-11,=,+10,+27"
 +            xanchor=fixed
 +            yanchor=fixed
 +        [/panel]
          [menu]
              id=switch_time
-             items=editor-switch-time, menu-editor-schedule
+             items=custom-tod, editor-switch-time, menu-editor-schedule
              image=button_square/button_square_30
              overlay=icons/action/editor-switch-time_30
            tooltip= _ "Time Schedule Menu"
diff --cc src/gui/dialogs/editor_settings.cpp
index 653dd8a,52cc593..0000000
--- a/src/gui/dialogs/editor_settings.cpp
+++ b/src/gui/dialogs/editor_settings.cpp
@@@ -92,16 -89,13 +89,21 @@@ tcustom_tod::tcustom_tod(editor::editor
                , true
                , &preferences::editor::tod_g
                , &preferences::editor::set_tod_g))
-   , custom_tod_blue_field_(register_integer("custom_tod_blue"
+   , tod_blue_field_(register_integer("tod_blue"
                , true
                , &preferences::editor::tod_b
++<<<<<<< HEAD
 +              , &preferences::editor::set_tod_b))
 +  , display_(display)
 +  , can_update_display_(false)
 +{
 +}
++=======
+                 , &preferences::editor::set_tod_b))
+   , display_(display) {}
++>>>>>>> Reporposed Editor Settings dialog as a Custom ToD dialog

- void teditor_settings::do_next_tod(twindow& window)
+ void tcustom_tod::do_next_tod(twindow& window)
  {
    current_tod_++;
    current_tod_ %= tods_.size();