summaryrefslogtreecommitdiffstats
path: root/src/gui/WindowFactory.cpp
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2010-02-14 22:34:36 +0000
committerDavid Robillard <d@drobilla.net>2010-02-14 22:34:36 +0000
commitca1ddcc761b6546f9b81d357466071634d573d36 (patch)
treed8beb31c424701b07d7f8cf3a4ed89749d298749 /src/gui/WindowFactory.cpp
parent5ce89c373085b4d8d435e1ab90662840e0f57e42 (diff)
downloadingen-ca1ddcc761b6546f9b81d357466071634d573d36.tar.gz
ingen-ca1ddcc761b6546f9b81d357466071634d573d36.tar.bz2
ingen-ca1ddcc761b6546f9b81d357466071634d573d36.zip
Merge LoadPatchWindow and LoadSubpatchWindow.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2454 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/gui/WindowFactory.cpp')
-rw-r--r--src/gui/WindowFactory.cpp29
1 files changed, 13 insertions, 16 deletions
diff --git a/src/gui/WindowFactory.cpp b/src/gui/WindowFactory.cpp
index d5493339..7b5b6000 100644
--- a/src/gui/WindowFactory.cpp
+++ b/src/gui/WindowFactory.cpp
@@ -23,7 +23,6 @@
#include "LoadPatchWindow.hpp"
#include "LoadPluginWindow.hpp"
#include "LoadRemotePatchWindow.hpp"
-#include "LoadSubpatchWindow.hpp"
#include "NewSubpatchWindow.hpp"
#include "NodeControlWindow.hpp"
#include "PropertiesWindow.hpp"
@@ -47,7 +46,6 @@ WindowFactory::WindowFactory()
, _load_remote_patch_win(NULL)
, _upload_patch_win(NULL)
, _new_subpatch_win(NULL)
- , _load_subpatch_win(NULL)
, _properties_win(NULL)
{
Glib::RefPtr<Gnome::Glade::Xml> xml = GladeFactory::new_glade_reference();
@@ -56,7 +54,6 @@ WindowFactory::WindowFactory()
xml->get_widget_derived("load_patch_win", _load_patch_win);
xml->get_widget_derived("load_remote_patch_win", _load_remote_patch_win);
xml->get_widget_derived("new_subpatch_win", _new_subpatch_win);
- xml->get_widget_derived("load_subpatch_win", _load_subpatch_win);
xml->get_widget_derived("properties_win", _properties_win);
xml->get_widget_derived("rename_win", _rename_win);
@@ -269,7 +266,19 @@ WindowFactory::present_load_patch(SharedPtr<PatchModel> patch, GraphObject::Prop
if (w != _patch_windows.end())
_load_patch_win->set_transient_for(*w->second);
- _load_patch_win->present(patch, data);
+ _load_patch_win->present(patch, true, data);
+}
+
+
+void
+WindowFactory::present_load_subpatch(SharedPtr<PatchModel> patch, GraphObject::Properties data)
+{
+ PatchWindowMap::iterator w = _patch_windows.find(patch->path());
+
+ if (w != _patch_windows.end())
+ _load_patch_win->set_transient_for(*w->second);
+
+ _load_patch_win->present(patch, false, data);
}
@@ -311,18 +320,6 @@ WindowFactory::present_new_subpatch(SharedPtr<PatchModel> patch, GraphObject::Pr
void
-WindowFactory::present_load_subpatch(SharedPtr<PatchModel> patch, GraphObject::Properties data)
-{
- PatchWindowMap::iterator w = _patch_windows.find(patch->path());
-
- if (w != _patch_windows.end())
- _load_subpatch_win->set_transient_for(*w->second);
-
- _load_subpatch_win->present(patch, data);
-}
-
-
-void
WindowFactory::present_rename(SharedPtr<ObjectModel> object)
{
PatchWindowMap::iterator w = _patch_windows.find(object->path());