summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTavmjong Bah <tavmjong@free.fr>2017-02-28 12:31:18 +0000
committertavmjong-free <tavmjong@free.fr>2017-02-28 12:31:18 +0000
commit50ccd526dbb34f9954f5a71de18847b258e19f9b (patch)
tree9a50ef40f9ad606696eb6e4aad56f4b199680fc3 /src
parentThis patch adds the copy-paste formated text functionality to the text tool. (diff)
downloadinkscape-50ccd526dbb34f9954f5a71de18847b258e19f9b.tar.gz
inkscape-50ccd526dbb34f9954f5a71de18847b258e19f9b.zip
Add some comment. Comment out unused signals.
(bzr r15554)
Diffstat (limited to 'src')
-rw-r--r--src/ui/dialog/dialog-manager.h10
-rw-r--r--src/ui/dialog/prototype.cpp5
-rw-r--r--src/ui/widget/panel.h1
3 files changed, 11 insertions, 5 deletions
diff --git a/src/ui/dialog/dialog-manager.h b/src/ui/dialog/dialog-manager.h
index 15573f760..36e9a12be 100644
--- a/src/ui/dialog/dialog-manager.h
+++ b/src/ui/dialog/dialog-manager.h
@@ -30,11 +30,11 @@ public:
static DialogManager &getInstance();
- sigc::signal<void> show_dialogs;
- sigc::signal<void> show_f12;
- sigc::signal<void> hide_dialogs;
- sigc::signal<void> hide_f12;
- sigc::signal<void> transientize;
+ // sigc::signal<void> show_dialogs;
+ // sigc::signal<void> show_f12;
+ // sigc::signal<void> hide_dialogs;
+ // sigc::signal<void> hide_f12;
+ // sigc::signal<void> transientize;
/* generic dialog management start */
typedef std::map<GQuark, DialogFactory> FactoryMap;
diff --git a/src/ui/dialog/prototype.cpp b/src/ui/dialog/prototype.cpp
index c28f37c6a..b3bf60aab 100644
--- a/src/ui/dialog/prototype.cpp
+++ b/src/ui/dialog/prototype.cpp
@@ -46,9 +46,14 @@ Prototype::Prototype() :
sigc::mem_fun(*this, &Prototype::handleDesktopChanged) );
desktopTracker.connect(GTK_WIDGET(gobj()));
+ // This results in calling handleDocumentReplaced twice. Fix me!
connectionDocumentReplaced = getDesktop()->connectDocumentReplaced(
sigc::mem_fun(this, &Prototype::handleDocumentReplaced));
+ // Alternative mechanism but results in calling handleDocumentReplaced four times.
+ // signalDocumentReplaced().connect(
+ // sigc::mem_fun(this, &Prototype::handleDocumentReplaced));
+
connectionSelectionChanged = getDesktop()->getSelection()->connectChanged(
sigc::hide(sigc::mem_fun(this, &Prototype::handleSelectionChanged)));
diff --git a/src/ui/widget/panel.h b/src/ui/widget/panel.h
index 9cbf39de9..b5498498d 100644
--- a/src/ui/widget/panel.h
+++ b/src/ui/widget/panel.h
@@ -104,6 +104,7 @@ public:
void setDefaultResponse(int response_id);
void setResponseSensitive(int response_id, bool setting);
+ /* Return signals. Signals emited by PanelDialog. */
virtual sigc::signal<void, SPDesktop *, SPDocument *> &signalDocumentReplaced();
virtual sigc::signal<void, SPDesktop *> &signalActivateDesktop();
virtual sigc::signal<void, SPDesktop *> &signalDeactiveDesktop();