[passepartout] added a signal handler to show the inspiration window
- From: Sven Herzberg <herzi src gnome org>
- To: svn-commits-list gnome org
- Subject: [passepartout] added a signal handler to show the inspiration window
- Date: Sat, 2 May 2009 09:34:03 -0400 (EDT)
commit baacc3acbee135d7ea3d190d44876f6c99d9ed0e
Author: Sven Herzberg <herzi lanedo com>
Date: Sat May 2 12:28:22 2009 +0200
added a signal handler to show the inspiration window
* src/pptout/window.cc,
* src/pptout/window.h,
* src/pptout/windowmenus.cc: added a signal handler to not initialize the
inspiration window when the window gets initialized
---
src/pptout/window.cc | 11 +++++++++++
src/pptout/window.h | 1 +
src/pptout/windowmenus.cc | 7 +++----
3 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/pptout/window.cc b/src/pptout/window.cc
index cbd1ad7..37e763b 100644
--- a/src/pptout/window.cc
+++ b/src/pptout/window.cc
@@ -21,6 +21,7 @@
#include "config.h"
#include "aboutdialog.h"
#include "filter.h"
+#include "inspiration.h"
#include "pagesel.h"
#include "printdialog.h"
#include "propertiesdialog.h"
@@ -360,6 +361,16 @@ FrameWindow::show_about (void)
}
void
+FrameWindow::show_inspiration (void)
+{
+ Inspiration& dialog = Inspiration::instance ();
+ dialog.set_transient_for (*this);
+ dialog.set_modal (true);
+ dialog.show_all ();
+ dialog.run ();
+}
+
+void
FrameWindow::show_preferences ()
{
config.dialog_show (this);
diff --git a/src/pptout/window.h b/src/pptout/window.h
index 86904c6..ae7429d 100644
--- a/src/pptout/window.h
+++ b/src/pptout/window.h
@@ -71,6 +71,7 @@ private:
void save_as (void);
void show_about (void);
+ void show_inspiration (void);
void show_properties (void);
void show_streams (void);
diff --git a/src/pptout/windowmenus.cc b/src/pptout/windowmenus.cc
index 67a77c1..83269f6 100644
--- a/src/pptout/windowmenus.cc
+++ b/src/pptout/windowmenus.cc
@@ -11,7 +11,6 @@
#include "printdialog.h"
#include "propertiesdialog.h"
#include "streamdialog.h"
-#include "inspiration.h"
#include "util/warning.h"
#include "util/tempfile.h"
#include "docpropsdialog.h"
@@ -151,7 +150,8 @@ FrameWindow::create_menus (Gtk::RecentFilter& f)
_("Create a new window "
"for the current document")),
bind(sigc::ptr_fun(&duplicate_view), this));
-
+
+ // FIXME: turn all mem_fun()'s into sigc::ptr_fun()'s
main_group->add(Action::create("FileOpen", Stock::OPEN, _("_Open ..."),
_("Open a document")),
mem_fun(*this, &FrameWindow::open_file));
@@ -345,8 +345,7 @@ FrameWindow::create_menus (Gtk::RecentFilter& f)
mem_fun(*this, &FrameWindow::show_about));
main_group->add(Action::create("HelpInspiration", _("_Inspiration")),
- mem_fun(Inspiration::instance(),
- &Inspiration::show_all));
+ mem_fun(*this, &FrameWindow::show_inspiration));
// Layout the actions in a menubar and toolbar:
try {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]