commit de3db7b0a3f3c8632ea97f30387dd4834ea3e22c
Author: phantomjinx <p.g.richard...@phantomjinx.co.uk>
Date: Mon May 17 22:17:36 2010 +0100
Rejigged help to point to gtkpod help rather than anjuta
* Point help to gtkpod home page and doc directory
* About box redone for gtkpod
TODO | 2 +-
configure.in | 2 ++
data/ui/gtkpod.ui | 3 ---
libgtkpod/Makefile.am | 1 +
src/Makefile.am | 1 +
src/anjuta-about.c | 14 +++++++++-----
src/anjuta-action-callbacks.c | 38 ++++++++------------------------------
src/anjuta-action-callbacks.h | 3 ---
src/anjuta-actions.h | 14 +-------------
src/directories.c | 7 +++++++
src/directories.h | 2 ++
11 files changed, 32 insertions(+), 55 deletions(-)
---
diff --git a/TODO b/TODO
index 734edb0..13cf715 100644
--- a/TODO
+++ b/TODO
@@ -76,6 +76,6 @@ display_coverart.*
display_photo.*
fetchcover.*
# info.* / infodlg.*
-help.*
+# help.*
diff --git a/configure.in b/configure.in
index 1ac97ab..379a984 100644
--- a/configure.in
+++ b/configure.in
@@ -249,11 +249,13 @@ dnl Setup Plugin directories
dnl ------------------------
gtkpod_plugin_dir='$(libdir)/$(PACKAGE)'
gtkpod_data_dir='$(datadir)/$(PACKAGE)/data'
+gtkpod_doc_dir='$(datadir)/$(PACKAGE)/doc'
gtkpod_ui_dir='$(gtkpod_data_dir)/ui'
gtkpod_glade_dir='$(gtkpod_data_dir)/glade'
gtkpod_image_dir='$(gtkpod_data_dir)/icons'
AC_SUBST(gtkpod_plugin_dir)
AC_SUBST(gtkpod_data_dir)
+AC_SUBST(gtkpod_doc_dir)
AC_SUBST(gtkpod_ui_dir)
AC_SUBST(gtkpod_glade_dir)
AC_SUBST(gtkpod_image_dir)
diff --git a/data/ui/gtkpod.ui b/data/ui/gtkpod.ui
index abb739f..05ec2d5 100755
--- a/data/ui/gtkpod.ui
+++ b/data/ui/gtkpod.ui
@@ -36,9 +36,6 @@
<placeholder name="PlaceHolderHelpDevel" >
<separator name="separator1" />
<menuitem name="UserManual"
action="ActionHelpUserManual" />
- <menuitem name="Tutorial"
action="ActionHelpTutorial" />
- <menuitem
name="AdvancedTutorial" action="ActionHelpAdvancedTutorial" />
- <menuitem name="FaqManual"
action="ActionHelpFaqManual" />
</placeholder>
<placeholder name="PlaceHolderHelpWeb" >
<separator name="separator1" />
diff --git a/libgtkpod/Makefile.am b/libgtkpod/Makefile.am
index 9b421cd..89145e8 100644
--- a/libgtkpod/Makefile.am
+++ b/libgtkpod/Makefile.am
@@ -42,6 +42,7 @@ AM_CFLAGS = \
-DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
-DGTKPOD_PLUGIN_DIR=\""$(gtkpod_plugin_dir)"\" \
-DGTKPOD_DATA_DIR=\""$(gtkpod_data_dir)"\" \
+ -DGTKPOD_DOC_DIR=\""$(gtkpod_doc_dir)"\" \
-DGTKPOD_UI_DIR=\""$(gtkpod_ui_dir)"\" \
-DGTKPOD_GLADE_DIR=\""$(gtkpod_glade_dir)"\" \
-DGTKPOD_IMAGE_DIR=\""$(gtkpod_image_dir)"\" \
diff --git a/src/Makefile.am b/src/Makefile.am
index 5f3b725..c9ac2d3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,6 +12,7 @@ AM_CFLAGS = \
-DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
-DGTKPOD_PLUGIN_DIR=\""$(gtkpod_plugin_dir)"\" \
-DGTKPOD_DATA_DIR=\""$(gtkpod_data_dir)"\" \
+ -DGTKPOD_DOC_DIR=\""$(gtkpod_doc_dir)"\" \
-DGTKPOD_UI_DIR=\""$(gtkpod_ui_dir)"\" \
-DGTKPOD_GLADE_DIR=\""$(gtkpod_glade_dir)"\" \
-DGTKPOD_IMAGE_DIR=\""$(gtkpod_image_dir)"\"
diff --git a/src/anjuta-about.c b/src/anjuta-about.c
index 479b09a..af735ef 100644
--- a/src/anjuta-about.c
+++ b/src/anjuta-about.c
@@ -27,6 +27,7 @@
#include <libanjuta/anjuta-plugin-manager.h>
#include "anjuta-about.h"
+#include "directories.h"
#define LICENSE_FILE "/COPYING"
@@ -187,17 +188,19 @@ about_box_new ()
g_error_free (error);
}
- pix = gdk_pixbuf_new_from_file(GTKPOD_DATA_DIR G_DIR_SEPARATOR_S
PACKAGE G_DIR_SEPARATOR_S "data" G_DIR_SEPARATOR_S "gtkpod-logo.png", NULL);
+ gchar *pixpath = g_build_filename(get_icon_dir(), "48x48",
"gtkpod.png", NULL);
+ g_message(pixpath);
+ pix = gdk_pixbuf_new_from_file(pixpath, NULL);
dialog = gtk_about_dialog_new();
- gtk_about_dialog_set_program_name(GTK_ABOUT_DIALOG(dialog), "Anjuta");
+ gtk_about_dialog_set_program_name(GTK_ABOUT_DIALOG(dialog), "gtkpod");
gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(dialog), VERSION);
gtk_about_dialog_set_copyright(GTK_ABOUT_DIALOG(dialog),
- _("Copyright (c) Naba Kumar"));
+ _("Copyright (c) Jorg Schuler et al."));
gtk_about_dialog_set_comments(GTK_ABOUT_DIALOG(dialog),
- _("Integrated Development Environment"));
+ _("iPod Management Platform"));
gtk_about_dialog_set_license(GTK_ABOUT_DIALOG(dialog),
license);
- gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(dialog),
"http://www.anjuta.org";);
+ gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(dialog),
"http://www.gtkpod.org";);
gtk_about_dialog_set_logo(GTK_ABOUT_DIALOG(dialog), pix);
gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(dialog), authors);
@@ -209,6 +212,7 @@ about_box_new ()
about_free_credit();
g_object_unref (pix);
g_free (license);
+ g_free(pixpath);
return dialog;
}
diff --git a/src/anjuta-action-callbacks.c b/src/anjuta-action-callbacks.c
index f31c726..a70013d 100644
--- a/src/anjuta-action-callbacks.c
+++ b/src/anjuta-action-callbacks.c
@@ -36,6 +36,7 @@
#include "anjuta-app.h"
#include "anjuta-about.h"
#include "anjuta-action-callbacks.h"
+#include "directories.h"
void
on_exit1_activate (GtkAction * action, AnjutaApp *app)
@@ -118,52 +119,29 @@ on_set_preferences1_activate (GtkAction * action,
AnjutaApp *app)
gtk_widget_show (preferences_dialog);
}
-static void
-help_activate (GtkWidget *parent, const gchar *doc_id, const gchar *item)
-{
- anjuta_util_help_display (parent, doc_id, item);
-}
-
-void
-on_help_manual_activate (GtkAction *action, gpointer data)
-{
- help_activate (data, "anjuta-manual", "anjuta-manual.xml");
-}
-
-void
-on_help_tutorial_activate (GtkAction *action, gpointer data)
-{
- help_activate (data, "anjuta-tutorial", "anjuta-tutorial.xml");
-}
-
-void
-on_help_advanced_tutorial_activate (GtkAction *action, gpointer data)
-{
- help_activate (data, "anjuta-advanced-tutorial",
"anjuta-advanced-tutorial.xml");
-}
-
void
-on_help_faqs_activate (GtkAction *action, gpointer data)
-{
- help_activate (data, "anjuta-faqs", "anjuta-faqs.xml");
+on_help_manual_activate (GtkAction *action, gpointer data) {
+ gchar *helpurl = g_build_filename("file://", get_doc_dir(), "gtkpod.html",
NULL);
+ anjuta_res_url_show(helpurl);
+ g_free(helpurl);
}
void
on_url_home_activate (GtkAction * action, gpointer user_data)
{
- anjuta_res_url_show("http://www.anjuta.org";);
+ anjuta_res_url_show("http://www.gtkpod.org";);
}
void
on_url_bugs_activate (GtkAction * action, gpointer user_data)
{
- anjuta_res_url_show("http://bugzilla.gnome.org/simple-bug-guide.cgi";);
+
anjuta_res_url_show("http://sourceforge.net/tracker/?group_id=67873&atid=519273";);
}
void
on_url_faqs_activate (GtkAction * action, gpointer user_data)
{
- anjuta_res_url_show("mailto:anjuta-l...@lists.sourceforge.net";);
+ anjuta_res_url_show("mailto:gtkpod-questi...@lists.sourceforge.net";);
}
void
diff --git a/src/anjuta-action-callbacks.h b/src/anjuta-action-callbacks.h
index 6f3fdc3..e10729b 100644
--- a/src/anjuta-action-callbacks.h
+++ b/src/anjuta-action-callbacks.h
@@ -31,9 +31,6 @@ void on_set_preferences1_activate (GtkAction * action,
AnjutaApp *app);
/* Help actions */
void on_help_manual_activate (GtkAction *action, gpointer data);
-void on_help_tutorial_activate (GtkAction *action, gpointer data);
-void on_help_advanced_tutorial_activate (GtkAction *action, gpointer data);
-void on_help_faqs_activate (GtkAction *action, gpointer data);
void on_url_home_activate (GtkAction * action, gpointer user_data);
void on_url_bugs_activate (GtkAction * action, gpointer user_data);
diff --git a/src/anjuta-actions.h b/src/anjuta-actions.h
index 64735c5..ef54780 100644
--- a/src/anjuta-actions.h
+++ b/src/anjuta-actions.h
@@ -102,20 +102,8 @@ static GtkActionEntry menu_entries_help[] = {
N_("_User's Manual"), "F1",
N_("Anjuta user's manual"),
G_CALLBACK (on_help_manual_activate)},
- { "ActionHelpTutorial", NULL,
- N_("Kick start _tutorial"), NULL,
- N_("Anjuta Kick start tutorial"),
- G_CALLBACK (on_help_tutorial_activate)},
- { "ActionHelpAdvancedTutorial", NULL,
- N_("_Advanced tutorial"), NULL,
- N_("Anjuta advanced tutorial"),
- G_CALLBACK (on_help_advanced_tutorial_activate)},
- { "ActionHelpFaqManual", NULL,
- N_("_Frequently Asked Questions"), NULL,
- N_("Anjuta frequently asked questions"),
- G_CALLBACK (on_help_faqs_activate)},
{ "ActionHelpAnjutaHome", GTK_STOCK_HOME,
- N_("Anjuta _Home Page"), NULL,
+ N_("gtkpod _Home Page"), NULL,
N_("Online documentation and resources"),
G_CALLBACK (on_url_home_activate)},
{ "ActionHelpBugReport", NULL,
diff --git a/src/directories.c b/src/directories.c
index 85f2785..5c70b20 100644
--- a/src/directories.c
+++ b/src/directories.c
@@ -38,6 +38,7 @@ static void debug_print_directories();
#endif
static gchar *datadir = NULL;
+static gchar *docdir = NULL;
static gchar *icondir = NULL;
static gchar *plugindir = NULL;
static gchar *uidir = NULL;
@@ -46,6 +47,7 @@ static gchar *gladedir = NULL;
void init_directories(char *argv[]) {
// g_printf("argv[0] = %s\n", argv[0]);
datadir = init_dir(argv, "data", GTKPOD_DATA_DIR);
+ docdir = init_dir(argv, "doc", GTKPOD_DOC_DIR);
icondir = init_dir(argv, "data/icons", GTKPOD_IMAGE_DIR);
uidir = init_dir(argv, "data/ui", GTKPOD_UI_DIR);
gladedir = init_dir(argv, "data/glade", GTKPOD_GLADE_DIR);
@@ -60,6 +62,7 @@ void init_directories(char *argv[]) {
#if LOCALDEBUG
static void debug_print_directories() {
g_printf("data directory: %s\n", get_data_dir());
+ g_printf("doc directory: %s\n", get_doc_dir());
g_printf("ui directory: %s\n", get_ui_dir());
g_printf("glade directory: %s\n", get_glade_dir());
g_printf("icon directory: %s\n", get_icon_dir());
@@ -116,6 +119,10 @@ gchar * get_data_dir() {
return datadir;
}
+gchar * get_doc_dir() {
+ return docdir;
+}
+
gchar * get_glade_dir() {
return gladedir;
}
diff --git a/src/directories.h b/src/directories.h
index ebb0596..9cc3d41 100644
--- a/src/directories.h
+++ b/src/directories.h
@@ -15,6 +15,8 @@ void init_directories(char *argv[]);
gchar * get_data_dir();
+gchar * get_doc_dir();
+
gchar * get_glade_dir();
gchar * get_icon_dir();
------------------------------------------------------------------------------
_______________________________________________
gtkpod-cvs2 mailing list
gtkpod-cvs2@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
