From 3efacf8a4ac1b0c90b544f41881596ff91f37efa Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 20 Dec 2007 02:15:54 +0000 Subject: Fix about dialog close button. git-svn-id: http://svn.drobilla.net/lad/ingen@990 a436a847-0d15-0410-975c-d299462d15a1 --- src/libs/gui/App.cpp | 9 +++++++++ src/libs/gui/App.hpp | 2 +- src/libs/gui/PatchWindow.cpp | 2 +- src/libs/gui/ingen_gui.glade | 1 - 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/libs/gui/App.cpp b/src/libs/gui/App.cpp index 3ee95540..46737d01 100644 --- a/src/libs/gui/App.cpp +++ b/src/libs/gui/App.cpp @@ -96,6 +96,7 @@ App::App(Ingen::Shared::World* world) glade_xml->get_widget_derived("messages_win", _messages_window); glade_xml->get_widget_derived("patch_tree_win", _patch_tree_window); glade_xml->get_widget("about_win", _about_dialog); + _about_dialog->property_program_name() = "Ingen"; Redland::World& rdf_world = *world->rdf_world; @@ -348,6 +349,14 @@ App::gtk_main_iteration() } +void +App::show_about() +{ + _about_dialog->run(); + _about_dialog->hide(); +} + + void App::quit() { diff --git a/src/libs/gui/App.hpp b/src/libs/gui/App.hpp index 6f2d71fc..bfe58f53 100644 --- a/src/libs/gui/App.hpp +++ b/src/libs/gui/App.hpp @@ -89,12 +89,12 @@ public: void detach(); bool gtk_main_iteration(); + void show_about(); void quit(); void port_activity(Port* port); ConnectWindow* connect_window() const { return _connect_window; } - Gtk::AboutDialog* about_dialog() const { return _about_dialog; } MessagesWindow* messages_dialog() const { return _messages_window; } PatchTreeWindow* patch_tree() const { return _patch_tree_window; } Configuration* configuration() const { return _configuration; } diff --git a/src/libs/gui/PatchWindow.cpp b/src/libs/gui/PatchWindow.cpp index 7d72f9ab..55c1542c 100644 --- a/src/libs/gui/PatchWindow.cpp +++ b/src/libs/gui/PatchWindow.cpp @@ -122,7 +122,7 @@ PatchWindow::PatchWindow(BaseObjectType* cobject, const Glib::RefPtr(App::instance().patch_tree(), &PatchTreeWindow::present)); _menu_help_about->signal_activate().connect(sigc::hide_return( - sigc::mem_fun(App::instance().about_dialog(), &Gtk::AboutDialog::run))); + sigc::mem_fun(App::instance(), &App::show_about))); _breadcrumb_box = new BreadCrumbBox(); _breadcrumb_box->signal_patch_selected.connect(sigc::mem_fun(this, &PatchWindow::set_patch_from_path)); diff --git a/src/libs/gui/ingen_gui.glade b/src/libs/gui/ingen_gui.glade index e3f66321..d604ee76 100644 --- a/src/libs/gui/ingen_gui.glade +++ b/src/libs/gui/ingen_gui.glade @@ -2222,7 +2222,6 @@ Hold <Ctrl> to play controls in either mode. GDK_WINDOW_TYPE_HINT_NORMAL Ingen Copyright (C) 2005-2007 Dave Robillard <http://drobilla.net> - A graphical client for the Ingen audio system http://drobilla.net/software/ingen Licensed under the GNU GPL, Version 2. -- cgit v1.2.1