[sabayon: 14/19] Changes to core files to handle new manual.
- From: Scott Balneaves <sbalneav src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [sabayon: 14/19] Changes to core files to handle new manual.
- Date: Fri, 4 Dec 2009 20:58:07 +0000 (UTC)
commit 3f7887da85ff2fa1511b19239f85a8f35d82eebc
Author: Scott Balneaves <sbalneav ltsp org>
Date: Sat Nov 14 19:52:50 2009 -0600
Changes to core files to handle new manual.
Makefile.am | 6 +++++-
admin-tool/profilesdialog.py | 12 +++++++++++-
autogen.sh | 2 +-
configure.ac | 3 ++-
4 files changed, 19 insertions(+), 4 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index a559187..a1cd5f6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,14 +2,18 @@ SUBDIRS = \
lib \
admin-tool \
data \
- doc \
+ help \
po
EXTRA_DIST = \
pycheckrc \
sabayon.schema \
+ gnome-doc-utils.make \
ISSUES
+DISTCHECK_CONFIGURE_FLAGS = \
+ --disable-scrollkeeper
+
pycheck:
(cd lib; make pycheck)
(cd admin-tool; make pycheck)
diff --git a/admin-tool/profilesdialog.py b/admin-tool/profilesdialog.py
index adf5ab4..9bc81f1 100755
--- a/admin-tool/profilesdialog.py
+++ b/admin-tool/profilesdialog.py
@@ -360,7 +360,7 @@ class ProfilesDialog:
self.groups_button.connect ("clicked", self.__groups_button_clicked)
self.help_button = self.xml.get_widget ("help_button")
- self.help_button.hide ()
+ self.help_button.connect ("clicked", self.__help_button_clicked)
self.dialog.connect ("response", self.__dialog_response)
@@ -399,6 +399,16 @@ class ProfilesDialog:
dialog.destroy ()
@errors.checked_callback (debuglog.DEBUG_LOG_DOMAIN_USER)
+ def __help_button_clicked (self, button):
+ uri = "ghelp:sabayon"
+
+ try:
+ gtk.show_uri (None, uri, gtk.get_current_event_time())
+ except gobject.GError, e:
+ pass
+ return
+
+ @errors.checked_callback (debuglog.DEBUG_LOG_DOMAIN_USER)
def __add_button_clicked (self, button):
(profile_name, base_profile) = AddProfileDialog (self.profiles_model).run (self.dialog)
if profile_name:
diff --git a/autogen.sh b/autogen.sh
index 6018690..b2f3ff7 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -19,4 +19,4 @@ which gnome-autogen.sh || {
echo "You need to install gnome-common from the GNOME CVS"
exit 1
}
-USE_GNOME2_MACROS=1 . gnome-autogen.sh
+USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh
diff --git a/configure.ac b/configure.ac
index 8904126..e0c8161 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,6 +21,7 @@ AC_HEADER_STDC
AM_PROG_LIBTOOL
AM_PATH_PYTHON
IT_PROG_INTLTOOL([0.40.0])
+GNOME_DOC_INIT([0.17.3])
AC_PROG_LN_S
GNOME_COMPILE_WARNINGS(yes)
@@ -278,7 +279,7 @@ data/icons/22x22/Makefile
data/icons/32x32/Makefile
data/icons/48x48/Makefile
data/icons/scalable/Makefile
-doc/Makefile
+help/Makefile
admin-tool/Makefile
admin-tool/sabayon.console
admin-tool/sabayon.desktop.in
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]