manually merging the INKBOARD_PEDRO branch into trunk

(bzr r1268)

3 files changed, 0 insertions, 101 deletions

diff --git a/src/ui/dialog/Makefile_insert b/src/ui/dialog/Makefile_insert
index 7ab87c7d3..4e40b645d 100644
--- a/src/ui/dialog/Makefile_insert
+++ b/src/ui/dialog/Makefile_insert
@@ -5,18 +5,6 @@ ui/dialog/all: ui/dialog/libuidialog.a
 ui/dialog/clean:
 	rm -f ui/dialog/libuidialog.a $(ui_libuidialog_a_OBJECTS)
 
-if WITH_INKBOARD
-inkboard_dialogs = \
-	ui/dialog/session-player.cpp	\
-	ui/dialog/session-player.h	\
-	ui/dialog/whiteboard-connect.cpp \
-	ui/dialog/whiteboard-connect.h \
-	ui/dialog/whiteboard-sharewithuser.cpp \
-	ui/dialog/whiteboard-sharewithuser.h \
-	ui/dialog/whiteboard-sharewithchat.cpp \
-	ui/dialog/whiteboard-sharewithchat.h
-endif
-
 ui_dialog_libuidialog_a_SOURCES =		\
 	ui/dialog/dialog-manager.cpp		\
 	ui/dialog/dialog-manager.h		\
@@ -54,7 +42,6 @@ ui_dialog_libuidialog_a_SOURCES =		\
 	ui/dialog/transformation.h		\
 	ui/dialog/tree-editor.cpp		\
 	ui/dialog/tree-editor.h			\
-	$(inkboard_dialogs)	\
 	ui/dialog/xml-editor.cpp		\
 	ui/dialog/xml-editor.h			\
 	ui/dialog/aboutbox.cpp		\
diff --git a/src/ui/dialog/dialog-manager.cpp b/src/ui/dialog/dialog-manager.cpp
index 80fae2c92..f4099b050 100644
--- a/src/ui/dialog/dialog-manager.cpp
+++ b/src/ui/dialog/dialog-manager.cpp
@@ -33,13 +33,6 @@
 #include "ui/dialog/tracedialog.h"
 #include "ui/dialog/transformation.h"
 
-#ifdef WITH_INKBOARD
-#include "ui/dialog/whiteboard-sharewithchat.h"
-#include "ui/dialog/whiteboard-sharewithuser.h"
-#include "ui/dialog/whiteboard-connect.h"
-#include "ui/dialog/session-player.h"
-#endif
-
 #include "ui/dialog/xml-editor.h"
 
 #include "dialogs/tiledialog.h"
@@ -92,12 +85,6 @@ DialogManager::DialogManager() {
     registerFactory("TileDialog",          &create<TileDialog>);
     registerFactory("Trace",               &create<TraceDialog>);
     registerFactory("Transformation",      &create<Transformation>);
-#ifdef WITH_INKBOARD
-	registerFactory("SessionPlayer",       &create<SessionPlaybackDialog>);
-    registerFactory("WhiteboardConnect",   &create<WhiteboardConnectDialog>);
-    registerFactory("WhiteboardShareWithUser",   &create<WhiteboardShareWithUserDialog>);
-    registerFactory("WhiteboardShareWithChat",   &create<WhiteboardShareWithChatroomDialog>);
-#endif
     registerFactory("XmlEditor",           &create<XmlEditor>);
 }
 
diff --git a/src/ui/view/edit-widget.cpp b/src/ui/view/edit-widget.cpp
index c42f44749..55f63b443 100644
--- a/src/ui/view/edit-widget.cpp
+++ b/src/ui/view/edit-widget.cpp
@@ -59,12 +59,6 @@
 #include "interface.h"
 #include "extension/db.h"
 
-#ifdef WITH_INKBOARD
-#include "ui/dialog/whiteboard-connect.h"
-#include "ui/dialog/whiteboard-sharewithuser.h"
-#include "ui/dialog/whiteboard-sharewithchat.h"
-#endif
-
 using namespace Inkscape::UI;
 using namespace Inkscape::UI::Widget;
 
@@ -302,45 +296,6 @@ EditWidget::onDialogXmlEditor()
     _dlg_mgr.showDialog("XmlEditor");
 }
 
-#ifdef WITH_INKBOARD
-void
-EditWidget::onDialogWhiteboardConnect()
-{
-	Dialog::WhiteboardConnectDialogImpl* dlg = dynamic_cast< Dialog::WhiteboardConnectDialogImpl* >(_dlg_mgr.getDialog("WhiteboardConnect"));
-	dlg->setSessionManager();
-	_dlg_mgr.showDialog("WhiteboardConnect");
-}
-
-void
-EditWidget::onDialogWhiteboardShareWithUser()
-{
-		Dialog::WhiteboardShareWithUserDialogImpl* dlg = dynamic_cast< Dialog::WhiteboardShareWithUserDialogImpl* >(_dlg_mgr.getDialog("WhiteboardShareWithUser"));
-		dlg->setSessionManager();
-		_dlg_mgr.showDialog("WhiteboardShareWithUser");
-}
-
-void
-EditWidget::onDialogWhiteboardShareWithChat()
-{
-	Dialog::WhiteboardShareWithChatroomDialogImpl* dlg = dynamic_cast< Dialog::WhiteboardShareWithChatroomDialogImpl* >(_dlg_mgr.getDialog("WhiteboardShareWithChat"));
-	dlg->setSessionManager();
-	_dlg_mgr.showDialog("WhiteboardShareWithChat");
-}
-
-void
-EditWidget::onDialogOpenSessionFile()
-{
-	g_log(NULL, G_LOG_LEVEL_DEBUG, "not reimplemented yet");
-}
-
-void
-EditWidget::onDumpXMLTracker()
-{
-	g_log(NULL, G_LOG_LEVEL_DEBUG, "not reimplemented yet");
-}
-
-#endif
-
 void
 EditWidget::onUriChanged()
 {
@@ -361,9 +316,6 @@ EditWidget::initMenuActions()
 //    _act_grp->add(Gtk::Action::create("MenuObject", _("PLACEHOLDER, do not translate")));
 //    _act_grp->add(Gtk::Action::create("MenuPath",   _("PLACEHOLDER, do not translate")));
 //    _act_grp->add(Gtk::Action::create("MenuText",   _("PLACEHOLDER, do not translate")));
-#ifdef WITH_INKBOARD
-//    _act_grp->add(Gtk::Action::create("MenuWhiteboard",   _("PLACEHOLDER, do not translate")));
-#endif
 //    _act_grp->add(Gtk::Action::create("MenuHelp",   _("PLACEHOLDER, do not translate")));
 // temporarily replaced with non-gettext version to have a well-sized menu
 // for testing:
@@ -375,9 +327,6 @@ EditWidget::initMenuActions()
     _act_grp->add(Gtk::Action::create("MenuObject", "Object"));
     _act_grp->add(Gtk::Action::create("MenuPath",   "Path"));
     _act_grp->add(Gtk::Action::create("MenuText",   "Text"));
-#ifdef WITH_INKBOARD
-    _act_grp->add(Gtk::Action::create("MenuWhiteboard",   "Whiteboard"));
-#endif
     _act_grp->add(Gtk::Action::create("MenuHelp",   "Help"));
 
     // File menu
@@ -821,30 +770,6 @@ EditWidget::initMenuActions()
 
 	// Whiteboard menu
 #ifdef WITH_INKBOARD
-    _act_grp->add(Gtk::Action::create("DialogWhiteboardConnect",
-                                      Gtk::Stock::CLEAR, Glib::ustring(),
-                                      _("PLACEHOLDER, do not translate")),
-                  sigc::mem_fun(*this, &EditWidget::onDialogWhiteboardConnect));
-
-    _act_grp->add(Gtk::Action::create("DialogWhiteboardShareWithUser",
-                                      Gtk::Stock::CLEAR, Glib::ustring(),
-                                      _("PLACEHOLDER, do not translate")),
-                  sigc::mem_fun(*this, &EditWidget::onDialogWhiteboardShareWithUser));
-
-    _act_grp->add(Gtk::Action::create("DialogWhiteboardShareWithChat",
-                                      Gtk::Stock::CLEAR, Glib::ustring(),
-                                      _("PLACEHOLDER, do not translate")),
-                  sigc::mem_fun(*this, &EditWidget::onDialogWhiteboardShareWithChat));
-
-    _act_grp->add(Gtk::Action::create("WhiteboardOpenSessionFile",
-                                      Gtk::Stock::CLEAR, Glib::ustring(),
-                                      _("PLACEHOLDER, do not translate")),
-                  sigc::mem_fun(*this, &EditWidget::onDialogOpenSessionFile));
-
-    _act_grp->add(Gtk::Action::create("WhiteboardDumpXMLTracker",
-                                      Gtk::Stock::CLEAR, Glib::ustring(),
-                                      _("PLACEHOLDER, do not translate")),
-                  sigc::mem_fun(*this, &EditWidget::onDumpXMLTracker));
 #endif
 
     // About menu