Enlightenment CVS committal
Author : andreas99
Project : e16
Module : tools
Dir : e16/tools/e16menuedit2/src
Modified Files:
callbacks.c callbacks.h e16menuedit2.c e16menuedit2.h
Log Message:
now generic help without "yelp" works
===================================================================
RCS file: /cvsroot/enlightenment/e16/tools/e16menuedit2/src/callbacks.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- callbacks.c 28 Aug 2004 15:01:08 -0000 1.15
+++ callbacks.c 6 Oct 2004 18:19:13 -0000 1.16
@@ -34,6 +34,8 @@
#include "e16menu.h"
#include "treeview.h"
+extern char *browser;
+
void bind_toolbar_callbacks (GtkWidget *treeview_menu)
{
GtkWidget *toolbar1;
@@ -289,11 +291,12 @@
{
int help_error;
- help_error = run_help ("yelp", YELP_HELP_DIR, PACKAGE".xml");
+ help_error = run_help ("elp", YELP_HELP_DIR, PACKAGE".xml");
if (help_error)
{
- help_error = run_help ("mozilla", PACKAGE_DOC_DIR, PACKAGE".html");
+ g_print ("running browser: %s\n", browser);
+ help_error = run_help (browser, PACKAGE_DOC_DIR, PACKAGE".html");
if (help_error)
{
@@ -309,6 +312,11 @@
GtkWidget *properties_window;
GladeXML *properties_xml;
GtkWidget *comboboxentry1;
+ FILE *fz_properties;
+ gchar *filename_properties;
+ char key[KEY_LENGTH];
+ char value[VALUE_LENGTH];
+ GtkTreeModel* treemodel;
properties_xml = glade_xml_new (PACKAGE_DATA_DIR"/glade/e16menuedit2.glade",
"properties_window", NULL);
@@ -322,13 +330,70 @@
gtk_combo_box_set_active (GTK_COMBO_BOX (comboboxentry1), 0);
gtk_window_set_icon_from_file (GTK_WINDOW (properties_window),
- SYSTEM_PIXMAPS_DIR"/e16menuedit2-icon.png",
NULL);
-}
+ SYSTEM_PIXMAPS_DIR"/e16menuedit2-icon.png", NULL);
+
+ filename_properties = g_strdup_printf ("%s/%s/properties",
+ homedir (getuid ()), APP_HOME);
+
+ fz_properties = fopen (filename_properties, "r");
+ if (fz_properties != NULL)
+ {
+ fscanf (fz_properties, "%s = %s", key, value);
+
+ treemodel = gtk_combo_box_get_model (GTK_COMBO_BOX (comboboxentry1));
+
+ gtk_tree_model_foreach (GTK_TREE_MODEL(treemodel), browser_func,
+ (gpointer) value);
+ fclose (fz_properties);
+ }
+
+ g_free (filename_properties);
+}
void
-on_properties_ok_clicked (GtkButton *button,
+on_properties_close_clicked (GtkButton *button,
gpointer user_data)
{
+ FILE *fz_properties;
+ gchar *filename_properties;
+ G_CONST_RETURN gchar *value;
+ GtkWidget *comboboxentry1;
+ GtkTreeIter iter;
+ gboolean valid;
+ GtkTreeModel* treemodel;
+ GtkWidget *properties_window;
+
+ filename_properties = g_strdup_printf ("%s/%s/properties",
+ homedir (getuid ()), APP_HOME);
+
+ fz_properties = fopen (filename_properties, "w");
+ if (fz_properties != NULL)
+ {
+ comboboxentry1 = lookup_libglade_widget ("properties_window", "comboboxentry1");
+
+ valid = gtk_combo_box_get_active_iter (GTK_COMBO_BOX (comboboxentry1), &iter);
+
+ if (valid)
+ {
+ treemodel = gtk_combo_box_get_model (GTK_COMBO_BOX (comboboxentry1));
+
+ gtk_tree_model_get (treemodel, &iter,
+ 0, &value,
+ -1);
+
+ g_free (browser);
+ browser = g_malloc (strlen (value)+1);
+ strncpy (browser, value, strlen (value)+1);
+
+ fprintf (fz_properties, "%s = %s\n", "browser", value);
+ }
+ fclose (fz_properties);
+ }
+
+ properties_window = lookup_libglade_widget ("properties_window",
"properties_window");
+
+ gtk_widget_destroy (GTK_WIDGET (properties_window));
+ g_free (filename_properties);
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/tools/e16menuedit2/src/callbacks.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- callbacks.h 28 Aug 2004 14:50:59 -0000 1.8
+++ callbacks.h 6 Oct 2004 18:19:13 -0000 1.9
@@ -52,6 +52,10 @@
#define ICON_SIZE6 22
#define ICON_SIZE7 16
+/* defines for parser */
+#define KEY_LENGTH 50
+#define VALUE_LENGTH 100
+
void bind_toolbar_callbacks (GtkWidget *treeview_menu);
void bind_menubar_callbacks (GtkWidget *treeview_menu);
void on_menu_save_activate (GtkMenuItem *menuitem,
@@ -103,7 +107,7 @@
gpointer user_data);
void
-on_properties_ok_clicked (GtkButton *button,
+on_properties_close_clicked (GtkButton *button,
gpointer user_data);
#endif /* _CALLBACKS_H */
===================================================================
RCS file: /cvsroot/enlightenment/e16/tools/e16menuedit2/src/e16menuedit2.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- e16menuedit2.c 15 Aug 2004 15:45:24 -0000 1.11
+++ e16menuedit2.c 6 Oct 2004 18:19:13 -0000 1.12
@@ -35,6 +35,7 @@
#include "treeview.h"
int librsvg_cmp;
+char *browser;
int main (int argc, char *argv[])
{
@@ -46,7 +47,12 @@
char package[] = "librsvg-2.0";
char good_version[] = "2.7.1";
char *version;
- int i;
+ int i;
+
+ FILE *fz_properties;
+ gchar *filename_properties;
+ char key[KEY_LENGTH];
+ char value[VALUE_LENGTH];
#ifdef ENABLE_NLS
bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
@@ -95,6 +101,25 @@
print_statusbar (_("Menu successfully loaded!"));
+ /* read some properties */
+ filename_properties = g_strdup_printf ("%s/%s/properties",
+ homedir (getuid ()), APP_HOME);
+
+ fz_properties = fopen (filename_properties, "r");
+ if (fz_properties != NULL)
+ {
+ fscanf (fz_properties, "%s = %s", key, value);
+
+ g_free (browser);
+ browser = g_malloc (strlen (value)+1);
+ strncpy (browser, value, strlen (value)+1);
+
+ fclose (fz_properties);
+ }
+
+ g_free (filename_properties);
+
+
gtk_main ();
return 0;
}
@@ -116,3 +141,34 @@
0,
str);
}
+
+gboolean browser_func (GtkTreeModel *model, GtkTreePath *path,
+ GtkTreeIter *iter, gpointer user_data)
+{
+ gchar *value;
+ gchar *tree_path_str;
+ GtkWidget *comboboxentry1;
+
+ comboboxentry1 = lookup_libglade_widget ("properties_window", "comboboxentry1");
+
+ gtk_tree_model_get (model, iter, 0, &value, -1);
+
+ tree_path_str = gtk_tree_path_to_string(path);
+
+ if (!strcmp (value, (char*) user_data))
+ {
+ gtk_combo_box_set_active (GTK_COMBO_BOX (comboboxentry1),
+ atoi (tree_path_str));
+
+ g_free (browser);
+ browser = g_malloc (strlen (value)+1);
+ strncpy (browser, value, strlen (value)+1);
+
+ g_free(tree_path_str);
+ return TRUE;
+ }
+
+ g_free(tree_path_str);
+
+ return FALSE;
+}
===================================================================
RCS file: /cvsroot/enlightenment/e16/tools/e16menuedit2/src/e16menuedit2.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e16menuedit2.h 7 Aug 2004 17:08:31 -0000 1.5
+++ e16menuedit2.h 6 Oct 2004 18:19:13 -0000 1.6
@@ -42,5 +42,7 @@
#define ICON_DIR "icons"
void print_statusbar (const gchar *format, ...);
-
+gboolean browser_func (GtkTreeModel *model, GtkTreePath *path,
+ GtkTreeIter *iter, gpointer user_data);
+
#endif /* _E16MENUEDIT_H */
-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs