summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/gui/LoadPluginWindow.cpp9
-rw-r--r--src/gui/LoadPluginWindow.hpp1
-rw-r--r--src/gui/MessagesWindow.cpp9
-rw-r--r--src/gui/MessagesWindow.hpp1
-rw-r--r--src/gui/NodePropertiesWindow.cpp4
-rw-r--r--src/gui/NodePropertiesWindow.hpp1
-rw-r--r--src/gui/WindowFactory.cpp2
-rw-r--r--src/gui/ingen_gui.glade31
8 files changed, 40 insertions, 18 deletions
diff --git a/src/gui/LoadPluginWindow.cpp b/src/gui/LoadPluginWindow.cpp
index f4336b7d..c5b895cc 100644
--- a/src/gui/LoadPluginWindow.cpp
+++ b/src/gui/LoadPluginWindow.cpp
@@ -84,7 +84,7 @@ LoadPluginWindow::LoadPluginWindow(BaseObjectType* cobject, const Glib::RefPtr<G
_add_button->signal_clicked().connect(
sigc::mem_fun(this, &LoadPluginWindow::add_clicked));
_close_button->signal_clicked().connect(
- sigc::mem_fun(this, &LoadPluginWindow::close_clicked));
+ sigc::mem_fun(this, &Window::hide));
_plugins_treeview->signal_row_activated().connect(
sigc::mem_fun(this, &LoadPluginWindow::plugin_activated));
_search_entry->signal_activate().connect(
@@ -365,13 +365,6 @@ LoadPluginWindow::add_clicked()
void
-LoadPluginWindow::close_clicked()
-{
- hide();
-}
-
-
-void
LoadPluginWindow::filter_changed()
{
_rows.clear();
diff --git a/src/gui/LoadPluginWindow.hpp b/src/gui/LoadPluginWindow.hpp
index 7a3bd335..1ec5700c 100644
--- a/src/gui/LoadPluginWindow.hpp
+++ b/src/gui/LoadPluginWindow.hpp
@@ -94,7 +94,6 @@ private:
};
void add_clicked();
- void close_clicked();
void filter_changed();
void clear_clicked();
void name_changed();
diff --git a/src/gui/MessagesWindow.cpp b/src/gui/MessagesWindow.cpp
index 930eaa06..bf815066 100644
--- a/src/gui/MessagesWindow.cpp
+++ b/src/gui/MessagesWindow.cpp
@@ -31,7 +31,7 @@ MessagesWindow::MessagesWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome
glade_xml->get_widget("messages_close_button", _close_button);
_clear_button->signal_clicked().connect(sigc::mem_fun(this, &MessagesWindow::clear_clicked));
- _close_button->signal_clicked().connect(sigc::mem_fun(this, &MessagesWindow::close_clicked));
+ _close_button->signal_clicked().connect(sigc::mem_fun(this, &Window::hide));
}
@@ -48,13 +48,6 @@ MessagesWindow::post(const string& msg)
void
-MessagesWindow::close_clicked()
-{
- hide();
-}
-
-
-void
MessagesWindow::clear_clicked()
{
Glib::RefPtr<Gtk::TextBuffer> text_buf = _textview->get_buffer();
diff --git a/src/gui/MessagesWindow.hpp b/src/gui/MessagesWindow.hpp
index 4c5d3e1e..eac20df3 100644
--- a/src/gui/MessagesWindow.hpp
+++ b/src/gui/MessagesWindow.hpp
@@ -43,7 +43,6 @@ public:
private:
void clear_clicked();
- void close_clicked();
Gtk::TextView* _textview;
Gtk::Button* _clear_button;
diff --git a/src/gui/NodePropertiesWindow.cpp b/src/gui/NodePropertiesWindow.cpp
index 39115bd2..f3058e5d 100644
--- a/src/gui/NodePropertiesWindow.cpp
+++ b/src/gui/NodePropertiesWindow.cpp
@@ -36,6 +36,10 @@ NodePropertiesWindow::NodePropertiesWindow(BaseObjectType* cobject, const Glib::
glade_xml->get_widget("node_properties_plugin_type_label", _plugin_type_label);
glade_xml->get_widget("node_properties_plugin_uri_label", _plugin_uri_label);
glade_xml->get_widget("node_properties_plugin_name_label", _plugin_name_label);
+ glade_xml->get_widget("node_properties_close_button", _close_button);
+
+ _close_button->signal_clicked().connect(
+ sigc::mem_fun(this, &Window::hide));
}
diff --git a/src/gui/NodePropertiesWindow.hpp b/src/gui/NodePropertiesWindow.hpp
index fb540816..adbdb2c4 100644
--- a/src/gui/NodePropertiesWindow.hpp
+++ b/src/gui/NodePropertiesWindow.hpp
@@ -52,6 +52,7 @@ private:
Gtk::Label* _plugin_type_label;
Gtk::Label* _plugin_uri_label;
Gtk::Label* _plugin_name_label;
+ Gtk::Button* _close_button;
};
} // namespace GUI
diff --git a/src/gui/WindowFactory.cpp b/src/gui/WindowFactory.cpp
index 4a948a36..b06ed449 100644
--- a/src/gui/WindowFactory.cpp
+++ b/src/gui/WindowFactory.cpp
@@ -345,6 +345,8 @@ void
WindowFactory::present_rename(SharedPtr<ObjectModel> object)
{
PatchWindowMap::iterator w = _patch_windows.find(object->path());
+ if (w == _patch_windows.end())
+ w = _patch_windows.find(object->path().parent());
if (w != _patch_windows.end())
_rename_win->set_transient_for(*w->second);
diff --git a/src/gui/ingen_gui.glade b/src/gui/ingen_gui.glade
index 3d345bd1..e2ab7354 100644
--- a/src/gui/ingen_gui.glade
+++ b/src/gui/ingen_gui.glade
@@ -2141,6 +2141,7 @@
<property name="width_request">250</property>
<property name="title" translatable="yes">Rename</property>
<property name="window_position">center-on-parent</property>
+ <property name="type_hint">dialog</property>
<child>
<widget class="GtkVBox" id="vbox15">
<property name="visible">True</property>
@@ -2163,6 +2164,8 @@
<widget class="GtkEntry" id="rename_name_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="has_focus">True</property>
+ <property name="is_focus">True</property>
<property name="activates_default">True</property>
</widget>
<packing>
@@ -2271,6 +2274,8 @@
<child>
<widget class="GtkVBox" id="vbox17">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">4</property>
<child>
<widget class="GtkLabel" id="label105">
<property name="visible">True</property>
@@ -2288,6 +2293,7 @@
<widget class="GtkVBox" id="vbox18">
<property name="visible">True</property>
<property name="border_width">12</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<widget class="GtkHBox" id="hbox56">
@@ -2451,6 +2457,31 @@
<property name="position">3</property>
</packing>
</child>
+ <child>
+ <widget class="GtkHButtonBox" id="hbuttonbox1">
+ <property name="visible">True</property>
+ <property name="layout_style">end</property>
+ <child>
+ <widget class="GtkButton" id="node_properties_close_button">
+ <property name="label">gtk-close</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
</widget>
</child>
</widget>