Index: src/plugins/todo/resources/settings.xrc
===================================================================
--- src/plugins/todo/resources/settings.xrc    (revision 4191)
+++ src/plugins/todo/resources/settings.xrc    (working copy)
@@ -1,51 +1,28 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <resource>
-  <object class="wxDialog" name="ToDoSettingsDlg">
-    <title>To-Do list settings</title>
-    <centered>1</centered>
-    <object class="wxBoxSizer">
-      <orient>wxVERTICAL</orient>
-      <object class="sizeritem">
-        <object class="wxCheckBox" name="chkAutoRefresh">
-          <label>Auto-refresh To-Do list</label>
-        </object>
-        <flag>wxALL|wxGROW</flag>
-        <border>8</border>
-      </object>
-      <object class="sizeritem">
-        <object class="wxStaticText">
-          <label>For large projects, it is advised to turn auto-refresh off
-because it will result in sluggish performance of the IDE...</label>
-          <fg>#800000</fg>
-        </object>
-        <flag>wxBOTTOM|wxLEFT|wxRIGHT</flag>
-        <border>8</border>
-      </object>
-      <object class="sizeritem">
-        <object class="wxStaticLine"/>
-        <flag>wxLEFT|wxRIGHT|wxGROW</flag>
-        <border>8</border>
-      </object>
-      <object class="sizeritem">
+    <object class="wxPanel" name="ToDoSettingsDlg">
+        <size>560,127</size>
         <object class="wxBoxSizer">
-          <orient>wxHORIZONTAL</orient>
-          <object class="sizeritem">
-            <object class="wxButton" name="wxID_OK">
-              <label>&amp;OK</label>
-              <default>1</default>
+            <orient>wxVERTICAL</orient>
+            <object class="sizeritem">
+                <object class="wxCheckBox" name="chkAutoRefresh">
+                    <label>Auto-refresh To-Do list (NOT recommended for large projects)</label>
+                </object>
+                <flag>wxALL|wxEXPAND|wxALIGN_LEFT|wxALIGN_TOP</flag>
+                <border>8</border>
             </object>
-          </object>
-          <object class="sizeritem">
-            <object class="wxButton" name="wxID_CANCEL">
-              <label>&amp;Cancel</label>
+            <object class="sizeritem">
+                <object class="wxCheckBox" name="chkMessagesPane">
+                    <label>Include the To-do list in the messages pane (will take place after restart)</label>
+                </object>
+                <flag>wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
+                <border>8</border>
             </object>
-            <flag>wxLEFT</flag>
-            <border>8</border>
-          </object>
+            <object class="sizeritem">
+                <object class="wxStaticLine" name="ID_STATICLINE1" />
+                <flag>wxLEFT|wxRIGHT|wxEXPAND|wxALIGN_LEFT|wxALIGN_TOP</flag>
+                <border>8</border>
+            </object>
         </object>
-        <flag>wxALL|wxALIGN_CENTRE</flag>
-        <border>8</border>
-      </object>
     </object>
-  </object>
-</resource>
\ No newline at end of file
+</resource>
Index: src/plugins/todo/todolist.cpp
===================================================================
--- src/plugins/todo/todolist.cpp    (revision 4191)
+++ src/plugins/todo/todolist.cpp    (working copy)
@@ -60,7 +60,8 @@
 
 ToDoList::ToDoList() :
 m_InitDone(false),
-m_ParsePending(false)
+m_ParsePending(false),
+m_StandAlone(true)
 {
     //ctor
     if(!Manager::LoadResource(_T("todo.zip")))
@@ -86,34 +87,54 @@
     titles.Add(_("Line"));
     titles.Add(_("File"));
 
-//    MessageManager* msgMan = Manager::Get()->GetMessageManager();
     m_pListLog = new ToDoListView(6, widths, titles, m_Types);
-//    m_ListPageIndex = msgMan->AddLog(m_pListLog, m_PluginInfo.title);
+    m_pListLog->SetSize(wxSize(352,94));
+    #if wxCHECK_VERSION(2, 8, 0)
+    m_pListLog->SetInitialSize(wxSize(352,94));
+    #else
+    m_pListLog->SetBestFittingSize(wxSize(352,94));
+    #endif
 
-    CodeBlocksDockEvent evt(cbEVT_ADD_DOCK_WINDOW);
-    evt.name = _T("TodoListPane");
-    evt.title = _("To-Do list");
-    evt.pWindow = m_pListLog;
-    evt.dockSide = CodeBlocksDockEvent::dsFloating;
-    evt.desiredSize.Set(400, 150);
-    evt.floatingSize.Set(400, 150);
-    evt.minimumSize.Set(400, 150);
-    Manager::Get()->GetAppWindow()->ProcessEvent(evt);
+    bool standalone = Manager::Get()->GetConfigManager(_T("todo_list"))->ReadBool(_T("stand_alone"), true);
+    m_StandAlone = standalone;
 
+    if(!standalone)
+    {
+        MessageManager* msgMan = Manager::Get()->GetMessageManager();
+        m_ListPageIndex = msgMan->AddLog(m_pListLog, _("To-Do"));
+    }
+    else
+    {
+        CodeBlocksDockEvent evt(cbEVT_ADD_DOCK_WINDOW);
+        evt.name = _T("TodoListPanev2.0.0");
+        evt.title = _("To-Do list");
+        evt.pWindow = m_pListLog;
+        evt.dockSide = CodeBlocksDockEvent::dsFloating;
+        evt.desiredSize.Set(352, 94);
+
download for full patch...