summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/LoadPatchWindow.cpp3
-rw-r--r--src/gui/LoadRemotePatchWindow.cpp4
-rw-r--r--src/gui/LoadRemotePatchWindow.hpp4
-rw-r--r--src/gui/PatchView.cpp9
-rw-r--r--src/gui/PatchView.hpp1
-rw-r--r--src/gui/PatchWindow.cpp10
-rw-r--r--src/gui/PatchWindow.hpp2
-rw-r--r--src/gui/WindowFactory.cpp2
-rw-r--r--src/gui/ingen_gui.glade24
9 files changed, 1 insertions, 58 deletions
diff --git a/src/gui/LoadPatchWindow.cpp b/src/gui/LoadPatchWindow.cpp
index ebe437f2..86e0d448 100644
--- a/src/gui/LoadPatchWindow.cpp
+++ b/src/gui/LoadPatchWindow.cpp
@@ -136,9 +136,6 @@ LoadPatchWindow::ok_clicked()
if (_poly_from_user_radio->get_active())
_initial_data.insert(make_pair("ingen:polyphony", _poly_spinbutton->get_value_as_int()));
- if (_replace)
- App::instance().engine()->clear_patch(_patch->path());
-
if (!_patch->path().is_root()) {
parent = _patch->path().parent();
symbol = _patch->symbol();
diff --git a/src/gui/LoadRemotePatchWindow.cpp b/src/gui/LoadRemotePatchWindow.cpp
index b992cdd5..0359b34c 100644
--- a/src/gui/LoadRemotePatchWindow.cpp
+++ b/src/gui/LoadRemotePatchWindow.cpp
@@ -37,7 +37,6 @@ namespace GUI {
LoadRemotePatchWindow::LoadRemotePatchWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& xml)
: Dialog(cobject)
- , _replace(true)
{
xml->get_widget("load_remote_patch_treeview", _treeview);
xml->get_widget("load_remote_patch_uri_entry", _uri_entry);
@@ -137,9 +136,6 @@ LoadRemotePatchWindow::open_clicked()
optional<Path> parent;
optional<Symbol> symbol;
- if (_replace)
- App::instance().engine()->clear_patch(_patch->path());
-
if (!_patch->path().is_root())
parent = _patch->path().parent();
diff --git a/src/gui/LoadRemotePatchWindow.hpp b/src/gui/LoadRemotePatchWindow.hpp
index 3043db73..ded08e6b 100644
--- a/src/gui/LoadRemotePatchWindow.hpp
+++ b/src/gui/LoadRemotePatchWindow.hpp
@@ -62,9 +62,6 @@ public:
void set_patch(SharedPtr<PatchModel> patch);
- void set_replace() { _replace = true; }
- void set_merge() { _replace = false; }
-
void present(SharedPtr<PatchModel> patch, GraphObject::Properties data);
private:
@@ -77,7 +74,6 @@ private:
GraphObject::Properties _initial_data;
SharedPtr<PatchModel> _patch;
- bool _replace;
Glib::RefPtr<Gtk::TreeSelection> _selection;
Glib::RefPtr<Gtk::ListStore> _liststore;
diff --git a/src/gui/PatchView.cpp b/src/gui/PatchView.cpp
index 57a4f46c..c59f787c 100644
--- a/src/gui/PatchView.cpp
+++ b/src/gui/PatchView.cpp
@@ -49,7 +49,6 @@ PatchView::PatchView(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::X
xml->get_widget("patch_view_toolbar", _toolbar);
xml->get_widget("patch_view_process_but", _process_but);
xml->get_widget("patch_view_poly_spin", _poly_spin);
- xml->get_widget("patch_view_clear_but", _clear_but);
xml->get_widget("patch_view_refresh_but", _refresh_but);
xml->get_widget("patch_view_save_but", _save_but);
xml->get_widget("patch_view_zoom_full_but", _zoom_full_but);
@@ -94,7 +93,6 @@ PatchView::set_patch(SharedPtr<PatchModel> patch)
// Connect widget signals to do things
_process_but->signal_toggled().connect(sigc::mem_fun(this, &PatchView::process_toggled));
- _clear_but->signal_clicked().connect(sigc::mem_fun(this, &PatchView::clear_clicked));
_refresh_but->signal_clicked().connect(sigc::mem_fun(this, &PatchView::refresh_clicked));
_zoom_normal_but->signal_clicked().connect(sigc::bind(sigc::mem_fun(
@@ -214,13 +212,6 @@ PatchView::poly_changed()
void
-PatchView::clear_clicked()
-{
- App::instance().engine()->clear_patch(_patch->path());
-}
-
-
-void
PatchView::refresh_clicked()
{
App::instance().engine()->get(_patch->path());
diff --git a/src/gui/PatchView.hpp b/src/gui/PatchView.hpp
index 15fcc0e4..82a2a1b0 100644
--- a/src/gui/PatchView.hpp
+++ b/src/gui/PatchView.hpp
@@ -96,7 +96,6 @@ private:
Gtk::Toolbar* _toolbar;
Gtk::ToggleToolButton* _process_but;
Gtk::SpinButton* _poly_spin;
- Gtk::ToolButton* _clear_but;
Gtk::ToolButton* _refresh_but;
Gtk::ToolButton* _save_but;
Gtk::ToolButton* _zoom_normal_but;
diff --git a/src/gui/PatchWindow.cpp b/src/gui/PatchWindow.cpp
index 2638cbbe..8c9d8c42 100644
--- a/src/gui/PatchWindow.cpp
+++ b/src/gui/PatchWindow.cpp
@@ -89,7 +89,6 @@ PatchWindow::PatchWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad
xml->get_widget("patch_show_port_names_menuitem", _menu_show_port_names);
xml->get_widget("patch_status_bar_menuitem", _menu_show_status_bar);
xml->get_widget("patch_arrange_menuitem", _menu_arrange);
- xml->get_widget("patch_clear_menuitem", _menu_clear);
xml->get_widget("patch_view_messages_window_menuitem", _menu_view_messages_window);
xml->get_widget("patch_view_patch_tree_window_menuitem", _menu_view_patch_tree_window);
xml->get_widget("patch_help_about_menuitem", _menu_help_about);
@@ -142,8 +141,6 @@ PatchWindow::PatchWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad
sigc::mem_fun(this, &PatchWindow::event_show_controls));
_menu_view_patch_properties->signal_activate().connect(
sigc::mem_fun(this, &PatchWindow::event_show_properties));
- _menu_clear->signal_activate().connect(
- sigc::mem_fun(this, &PatchWindow::event_clear));
_menu_view_messages_window->signal_activate().connect(
sigc::mem_fun<void>(App::instance().messages_dialog(), &MessagesWindow::present));
_menu_view_patch_tree_window->signal_activate().connect(
@@ -689,13 +686,6 @@ PatchWindow::event_quit()
void
-PatchWindow::event_clear()
-{
- App::instance().engine()->clear_patch(_patch->path());
-}
-
-
-void
PatchWindow::event_arrange()
{
_view->canvas()->arrange(false);
diff --git a/src/gui/PatchWindow.hpp b/src/gui/PatchWindow.hpp
index 82afa7ad..0f10cd84 100644
--- a/src/gui/PatchWindow.hpp
+++ b/src/gui/PatchWindow.hpp
@@ -96,7 +96,6 @@ private:
void event_select_all();
void event_close();
void event_quit();
- void event_clear();
void event_fullscreen_toggled();
void event_status_bar_toggled();
void event_human_names_toggled();
@@ -137,7 +136,6 @@ private:
Gtk::CheckMenuItem* _menu_show_port_names;
Gtk::CheckMenuItem* _menu_show_status_bar;
Gtk::MenuItem* _menu_fullscreen;
- Gtk::MenuItem* _menu_clear;
Gtk::MenuItem* _menu_arrange;
Gtk::MenuItem* _menu_view_engine_window;
Gtk::MenuItem* _menu_view_control_window;
diff --git a/src/gui/WindowFactory.cpp b/src/gui/WindowFactory.cpp
index 91abccaf..83173325 100644
--- a/src/gui/WindowFactory.cpp
+++ b/src/gui/WindowFactory.cpp
@@ -301,8 +301,6 @@ WindowFactory::present_load_remote_patch(SharedPtr<PatchModel> patch, GraphObjec
if (w != _patch_windows.end())
_load_remote_patch_win->set_transient_for(*w->second);
- _load_remote_patch_win->set_merge(); // Import is the only choice
-
_load_remote_patch_win->present(patch, data);
}
diff --git a/src/gui/ingen_gui.glade b/src/gui/ingen_gui.glade
index 3d42a76d..a834af3a 100644
--- a/src/gui/ingen_gui.glade
+++ b/src/gui/ingen_gui.glade
@@ -226,16 +226,6 @@
</widget>
</child>
<child>
- <widget class="GtkImageMenuItem" id="patch_clear_menuitem">
- <property name="label">gtk-clear</property>
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Remove all objects from patch</property>
- <property name="use_underline">True</property>
- <property name="use_stock">True</property>
- <signal name="activate" handler="on_patch_clear_menuitem_activate"/>
- </widget>
- </child>
- <child>
<widget class="GtkSeparatorMenuItem" id="menuitem2">
<property name="visible">True</property>
</widget>
@@ -1512,18 +1502,6 @@
</packing>
</child>
<child>
- <widget class="GtkToolButton" id="patch_view_clear_but">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Clear patch contents</property>
- <property name="use_underline">True</property>
- <property name="stock_id">gtk-clear</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
<widget class="GtkSeparatorToolItem" id="separatortoolitem22">
<property name="visible">True</property>
</widget>
@@ -2178,7 +2156,7 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label95">
+ <widget class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="label" translatable="yes">Label: </property>
</widget>
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-29 19:56:56 +0000