[passepartout] rewrote the about dialog handling
- From: Sven Herzberg <herzi src gnome org>
- To: svn-commits-list gnome org
- Subject: [passepartout] rewrote the about dialog handling
- Date: Sat, 2 May 2009 09:33:48 -0400 (EDT)
commit 89e5159e8201d39fe845e47bea2667d3a05b66f5
Author: Sven Herzberg <herzi lanedo com>
Date: Sat May 2 10:37:59 2009 +0200
rewrote the about dialog handling
* src/pptout/window.cc,
* src/pptout/window.h,
* src/pptout/windowmenus.cc: now we properly set the transient-for parent and
the modality of the dialog
---
src/pptout/window.cc | 10 ++++++++++
src/pptout/window.h | 2 ++
src/pptout/windowmenus.cc | 3 +--
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/pptout/window.cc b/src/pptout/window.cc
index f002ce5..96ebaee 100644
--- a/src/pptout/window.cc
+++ b/src/pptout/window.cc
@@ -19,6 +19,7 @@
#include "widget/imagefilesel.h"
#include "config.h"
+#include "aboutdialog.h"
#include "filter.h"
#include "pagesel.h"
#include "printdialog.h"
@@ -350,6 +351,15 @@ FrameWindow::save (void)
}
void
+FrameWindow::show_about (void)
+{
+ AboutDialog& about = AboutDialog::instance ();
+ about.set_transient_for (*this);
+ about.set_modal (true);
+ about.run ();
+}
+
+void
FrameWindow::show_preferences ()
{
config.dialog_show (this);
diff --git a/src/pptout/window.h b/src/pptout/window.h
index fbc2fee..3c09630 100644
--- a/src/pptout/window.h
+++ b/src/pptout/window.h
@@ -70,6 +70,8 @@ private:
void save (void);
void save_as (void);
+ void show_about (void);
+
void create_menus (Gtk::RecentFilter& filter);
void show_preferences ();
void close();
diff --git a/src/pptout/windowmenus.cc b/src/pptout/windowmenus.cc
index 47eebf6..c19094a 100644
--- a/src/pptout/windowmenus.cc
+++ b/src/pptout/windowmenus.cc
@@ -9,7 +9,6 @@
#include "widget/usererror.h"
#include "config.h"
#include "printdialog.h"
-#include "aboutdialog.h"
#include "propertiesdialog.h"
#include "streamdialog.h"
#include "inspiration.h"
@@ -345,7 +344,7 @@ FrameWindow::create_menus (Gtk::RecentFilter& f)
ptr_fun(&Programs::open_docs));
main_group->add(Action::create("HelpAbout", Stock::ABOUT, _("_About")),
- mem_fun(::AboutDialog::instance(), &::AboutDialog::show_all));
+ mem_fun(*this, &FrameWindow::show_about));
main_group->add(Action::create("HelpInspiration", _("_Inspiration")),
mem_fun(Inspiration::instance(),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]