Menu
▾
▴
openvrml-commit — Changes to OpenVRML's source revision repository
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(128) |
Dec
(65) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(48) |
Feb
(132) |
Mar
(95) |
Apr
(47) |
May
(54) |
Jun
(2) |
Jul
(57) |
Aug
(109) |
Sep
(131) |
Oct
(186) |
Nov
(105) |
Dec
(78) |
| 2007 |
Jan
(125) |
Feb
(105) |
Mar
(52) |
Apr
(104) |
May
(63) |
Jun
(116) |
Jul
(76) |
Aug
|
Sep
(18) |
Oct
(93) |
Nov
(110) |
Dec
(169) |
| 2008 |
Jan
(90) |
Feb
(64) |
Mar
(41) |
Apr
(23) |
May
(6) |
Jun
(18) |
Jul
(10) |
Aug
(61) |
Sep
(139) |
Oct
(50) |
Nov
(55) |
Dec
(2) |
| 2009 |
Jan
|
Feb
(1) |
Mar
(62) |
Apr
(22) |
May
(17) |
Jun
(19) |
Jul
(40) |
Aug
(21) |
Sep
|
Oct
(40) |
Nov
(23) |
Dec
|
| 2010 |
Jan
(14) |
Feb
(40) |
Mar
(9) |
Apr
(11) |
May
(19) |
Jun
(4) |
Jul
(10) |
Aug
(22) |
Sep
(15) |
Oct
|
Nov
(2) |
Dec
|
| 2011 |
Jan
(13) |
Feb
(10) |
Mar
|
Apr
(13) |
May
|
Jun
|
Jul
(2) |
Aug
(4) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
(33) |
May
(20) |
Jun
|
Jul
(8) |
Aug
(7) |
Sep
(2) |
Oct
|
Nov
|
Dec
|
|
From: Braden M. <br...@us...> - 2007-02-09 22:37:46
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv24191 Modified Files: Tag: OpenVRML-0_16-BRANCH ChangeLog Log Message: Added comments; applied G_GNUC_INTERNAL to 'extern "C"' functions that libglade doesn't need to be visible. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1310.2.122 retrieving revision 1.1310.2.123 diff -C2 -d -r1.1310.2.122 -r1.1310.2.123 *** ChangeLog 9 Feb 2007 08:24:30 -0000 1.1310.2.122 --- ChangeLog 9 Feb 2007 22:37:44 -0000 1.1310.2.123 *************** *** 1,4 **** --- 1,10 ---- 2007-02-09 Braden McDaniel <br...@en...> + * src/openvrml-player/player.cpp: Added comments; applied + G_GNUC_INTERNAL to 'extern "C"' functions that libglade doesn't + need to be visible. + + 2007-02-09 Braden McDaniel <br...@en...> + Use Glade XML to manage the OpenvrmlPlayerFileChooserDialog. |
|
From: Braden M. <br...@us...> - 2007-02-09 08:24:42
|
Update of /cvsroot/openvrml/openvrml/src/openvrml-player In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv2912/src/openvrml-player Modified Files: openvrml-player.glade player.cpp Log Message: Use Glade XML to manage the OpenvrmlPlayerFileChooserDialog. Index: player.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-player/player.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** player.cpp 9 Feb 2007 05:20:28 -0000 1.9 --- player.cpp 9 Feb 2007 08:24:41 -0000 1.10 *************** *** 32,35 **** --- 32,36 ---- # include <libgnomeui/libgnomeui.h> # include <glade/glade.h> + # include <glade/glade-build.h> # include "filechooserdialog.h" *************** *** 42,46 **** extern "C" { - void openvrml_player_watch_child(GPid pid, gint status, gpointer data); gboolean openvrml_player_request_data_available(GIOChannel * source, GIOCondition condition, --- 43,46 ---- *************** *** 56,62 **** void * stream); void openvrml_player_on_about_activated(GtkWindow * window); ! void openvrml_player_on_file_open_activated(GtkWindow * window); void openvrml_player_on_locationentry_activated(GtkEntry * entry); void openvrml_player_quit(); } --- 56,72 ---- void * stream); void openvrml_player_on_about_activated(GtkWindow * window); ! void openvrml_player_on_file_open_activated( ! OpenvrmlPlayerFileChooserDialog * dialog); void openvrml_player_on_locationentry_activated(GtkEntry * entry); void openvrml_player_quit(); + + G_GNUC_INTERNAL void openvrml_player_watch_child(GPid pid, + gint status, + gpointer data); + G_GNUC_INTERNAL + GtkWidget * + openvrml_player_build_file_chooser_dialog(GladeXML * xml, + GType widget_type, + GladeWidgetInfo * info); } *************** *** 149,155 **** --- 159,177 ---- GNOME_PARAM_NONE); + glade_init(); + glade_register_widget(OPENVRML_PLAYER_TYPE_FILE_CHOOSER_DIALOG, + openvrml_player_build_file_chooser_dialog, + 0, + 0); + GladeXML * const xml = xml_new(*program); glade_xml_signal_autoconnect(xml); + GtkWidget * const app_window = glade_xml_get_widget(xml, "window"); + GtkWidget * const file_chooser_dialog = + glade_xml_get_widget(xml, "filechooserdialog"); + gtk_window_set_transient_for(GTK_WINDOW(file_chooser_dialog), + GTK_WINDOW(app_window)); + // // The OPENVRML_XEMBED environment variable overrides the default *************** *** 757,773 **** } ! void openvrml_player_on_file_open_activated(GtkWindow * const parent) { ! static GtkWidget * file_chooser_dialog = 0; ! ! if (!file_chooser_dialog) { ! file_chooser_dialog = ! openvrml_player_file_chooser_dialog_new(parent); ! } ! ! const gint response = gtk_dialog_run(GTK_DIALOG(file_chooser_dialog)); if (response == GTK_RESPONSE_ACCEPT) { gchar * uri = 0; ! uri = gtk_file_chooser_get_uri(GTK_FILE_CHOOSER(file_chooser_dialog)); g_return_if_fail(uri); scope_guard uri_guard = make_guard(g_free, uri); --- 779,790 ---- } ! void ! openvrml_player_on_file_open_activated( ! OpenvrmlPlayerFileChooserDialog * const dialog) { ! const gint response = gtk_dialog_run(GTK_DIALOG(dialog)); if (response == GTK_RESPONSE_ACCEPT) { gchar * uri = 0; ! uri = gtk_file_chooser_get_uri(GTK_FILE_CHOOSER(dialog)); g_return_if_fail(uri); scope_guard uri_guard = make_guard(g_free, uri); *************** *** 776,780 **** } ! gtk_widget_hide(file_chooser_dialog); } --- 793,797 ---- } ! gtk_widget_hide(GTK_WIDGET(dialog)); } *************** *** 820,823 **** --- 837,849 ---- } + GtkWidget * + openvrml_player_build_file_chooser_dialog(GladeXML * /* xml */, + GType /* widget_type */, + GladeWidgetInfo * /* info */) + { + GtkWidget * widget = openvrml_player_file_chooser_dialog_new(0); + return widget; + } + namespace { Index: openvrml-player.glade =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-player/openvrml-player.glade,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** openvrml-player.glade 8 Feb 2007 05:53:37 -0000 1.4 --- openvrml-player.glade 9 Feb 2007 08:24:41 -0000 1.5 *************** *** 26,30 **** <property name="use_underline">True</property> <property name="use_stock">True</property> ! <signal name="activate" handler="openvrml_player_on_file_open_activated" object="window"/> </widget> </child> --- 26,30 ---- <property name="use_underline">True</property> <property name="use_stock">True</property> ! <signal name="activate" handler="openvrml_player_on_file_open_activated" object="filechooserdialog"/> </widget> </child> *************** *** 107,109 **** --- 107,111 ---- </child> </widget> + <widget class="OpenvrmlPlayerFileChooserDialog" id="filechooserdialog"> + </widget> </glade-interface> |
|
From: Braden M. <br...@us...> - 2007-02-09 08:24:42
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv2912 Modified Files: ChangeLog Log Message: Use Glade XML to manage the OpenvrmlPlayerFileChooserDialog. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1446 retrieving revision 1.1447 diff -C2 -d -r1.1446 -r1.1447 *** ChangeLog 9 Feb 2007 05:20:28 -0000 1.1446 --- ChangeLog 9 Feb 2007 08:24:41 -0000 1.1447 *************** *** 1,4 **** --- 1,22 ---- 2007-02-09 Braden McDaniel <br...@en...> + Use Glade XML to manage the OpenvrmlPlayerFileChooserDialog. + + * src/openvrml-player/openvrml-player.glade + (imagemenuitemopen): openvrml_player_file_open_activated now takes + the dialog as its argument. + (filechooserdialog): Added OpenvrmlPlayerFileChooserDialog. + * src/openvrml-player/player.cpp + (main(int, char *[])): Register OpenvrmlPlayerFileChooserDialog + with libglade; set the file chooser dialog's parent window. + (openvrml_player_on_file_open_activated(OpenvrmlPlayerFileChooserDialog*)): + Now takes the dialog as its argument; just run the dialog (rather + than creating it). + (openvrml_player_build_file_chooser_dialog(GladeXML *, GType, + GladeWidgetInfo *)): Added function; function to create an + OpenvrmlPlayerFileChooserDialog for libglade. + + 2007-02-09 Braden McDaniel <br...@en...> + Moved file chooser dialog into its own widget implementation. |
|
From: Braden M. <br...@us...> - 2007-02-09 08:24:32
|
Update of /cvsroot/openvrml/openvrml/src/openvrml-player In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv2884/src/openvrml-player Modified Files: Tag: OpenVRML-0_16-BRANCH openvrml-player.glade player.cpp Log Message: Use Glade XML to manage the OpenvrmlPlayerFileChooserDialog. Index: player.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-player/player.cpp,v retrieving revision 1.1.2.8 retrieving revision 1.1.2.9 diff -C2 -d -r1.1.2.8 -r1.1.2.9 *** player.cpp 9 Feb 2007 05:18:36 -0000 1.1.2.8 --- player.cpp 9 Feb 2007 08:24:31 -0000 1.1.2.9 *************** *** 32,35 **** --- 32,36 ---- # include <libgnomeui/libgnomeui.h> # include <glade/glade.h> + # include <glade/glade-build.h> # include "filechooserdialog.h" *************** *** 42,46 **** extern "C" { - void openvrml_player_watch_child(GPid pid, gint status, gpointer data); gboolean openvrml_player_request_data_available(GIOChannel * source, GIOCondition condition, --- 43,46 ---- *************** *** 56,62 **** void * stream); void openvrml_player_on_about_activated(GtkWindow * window); ! void openvrml_player_on_file_open_activated(GtkWindow * window); void openvrml_player_on_locationentry_activated(GtkEntry * entry); void openvrml_player_quit(); } --- 56,72 ---- void * stream); void openvrml_player_on_about_activated(GtkWindow * window); ! void openvrml_player_on_file_open_activated( ! OpenvrmlPlayerFileChooserDialog * dialog); void openvrml_player_on_locationentry_activated(GtkEntry * entry); void openvrml_player_quit(); + + G_GNUC_INTERNAL void openvrml_player_watch_child(GPid pid, + gint status, + gpointer data); + G_GNUC_INTERNAL + GtkWidget * + openvrml_player_build_file_chooser_dialog(GladeXML * xml, + GType widget_type, + GladeWidgetInfo * info); } *************** *** 149,155 **** --- 159,177 ---- GNOME_PARAM_NONE); + glade_init(); + glade_register_widget(OPENVRML_PLAYER_TYPE_FILE_CHOOSER_DIALOG, + openvrml_player_build_file_chooser_dialog, + 0, + 0); + GladeXML * const xml = xml_new(*program); glade_xml_signal_autoconnect(xml); + GtkWidget * const app_window = glade_xml_get_widget(xml, "window"); + GtkWidget * const file_chooser_dialog = + glade_xml_get_widget(xml, "filechooserdialog"); + gtk_window_set_transient_for(GTK_WINDOW(file_chooser_dialog), + GTK_WINDOW(app_window)); + // // The OPENVRML_XEMBED environment variable overrides the default *************** *** 757,773 **** } ! void openvrml_player_on_file_open_activated(GtkWindow * const parent) { ! static GtkWidget * file_chooser_dialog = 0; ! ! if (!file_chooser_dialog) { ! file_chooser_dialog = ! openvrml_player_file_chooser_dialog_new(parent); ! } ! ! const gint response = gtk_dialog_run(GTK_DIALOG(file_chooser_dialog)); if (response == GTK_RESPONSE_ACCEPT) { gchar * uri = 0; ! uri = gtk_file_chooser_get_uri(GTK_FILE_CHOOSER(file_chooser_dialog)); g_return_if_fail(uri); scope_guard uri_guard = make_guard(g_free, uri); --- 779,790 ---- } ! void ! openvrml_player_on_file_open_activated( ! OpenvrmlPlayerFileChooserDialog * const dialog) { ! const gint response = gtk_dialog_run(GTK_DIALOG(dialog)); if (response == GTK_RESPONSE_ACCEPT) { gchar * uri = 0; ! uri = gtk_file_chooser_get_uri(GTK_FILE_CHOOSER(dialog)); g_return_if_fail(uri); scope_guard uri_guard = make_guard(g_free, uri); *************** *** 776,780 **** } ! gtk_widget_hide(file_chooser_dialog); } --- 793,797 ---- } ! gtk_widget_hide(GTK_WIDGET(dialog)); } *************** *** 820,823 **** --- 837,849 ---- } + GtkWidget * + openvrml_player_build_file_chooser_dialog(GladeXML * /* xml */, + GType /* widget_type */, + GladeWidgetInfo * /* info */) + { + GtkWidget * widget = openvrml_player_file_chooser_dialog_new(0); + return widget; + } + namespace { Index: openvrml-player.glade =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-player/openvrml-player.glade,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** openvrml-player.glade 8 Feb 2007 05:53:19 -0000 1.1.2.3 --- openvrml-player.glade 9 Feb 2007 08:24:31 -0000 1.1.2.4 *************** *** 26,30 **** <property name="use_underline">True</property> <property name="use_stock">True</property> ! <signal name="activate" handler="openvrml_player_on_file_open_activated" object="window"/> </widget> </child> --- 26,30 ---- <property name="use_underline">True</property> <property name="use_stock">True</property> ! <signal name="activate" handler="openvrml_player_on_file_open_activated" object="filechooserdialog"/> </widget> </child> *************** *** 107,109 **** --- 107,111 ---- </child> </widget> + <widget class="OpenvrmlPlayerFileChooserDialog" id="filechooserdialog"> + </widget> </glade-interface> |
|
From: Braden M. <br...@us...> - 2007-02-09 08:24:32
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv2884 Modified Files: Tag: OpenVRML-0_16-BRANCH ChangeLog Log Message: Use Glade XML to manage the OpenvrmlPlayerFileChooserDialog. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1310.2.121 retrieving revision 1.1310.2.122 diff -C2 -d -r1.1310.2.121 -r1.1310.2.122 *** ChangeLog 9 Feb 2007 05:18:31 -0000 1.1310.2.121 --- ChangeLog 9 Feb 2007 08:24:30 -0000 1.1310.2.122 *************** *** 1,4 **** --- 1,22 ---- 2007-02-09 Braden McDaniel <br...@en...> + Use Glade XML to manage the OpenvrmlPlayerFileChooserDialog. + + * src/openvrml-player/openvrml-player.glade + (imagemenuitemopen): openvrml_player_file_open_activated now takes + the dialog as its argument. + (filechooserdialog): Added OpenvrmlPlayerFileChooserDialog. + * src/openvrml-player/player.cpp + (main(int, char *[])): Register OpenvrmlPlayerFileChooserDialog + with libglade; set the file chooser dialog's parent window. + (openvrml_player_on_file_open_activated(OpenvrmlPlayerFileChooserDialog*)): + Now takes the dialog as its argument; just run the dialog (rather + than creating it). + (openvrml_player_build_file_chooser_dialog(GladeXML *, GType, + GladeWidgetInfo *)): Added function; function to create an + OpenvrmlPlayerFileChooserDialog for libglade. + + 2007-02-09 Braden McDaniel <br...@en...> + Moved file chooser dialog into its own widget implementation. |
|
From: Braden M. <br...@us...> - 2007-02-09 05:20:33
|
Update of /cvsroot/openvrml/openvrml/src/openvrml-player In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28330/src/openvrml-player Modified Files: Makefile.am player.cpp Added Files: filechooserdialog.cpp filechooserdialog.h Log Message: Moved file chooser dialog into its own widget implementation. Index: player.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-player/player.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** player.cpp 8 Feb 2007 05:53:38 -0000 1.8 --- player.cpp 9 Feb 2007 05:20:28 -0000 1.9 *************** *** 33,36 **** --- 33,38 ---- # include <glade/glade.h> + # include "filechooserdialog.h" + # ifdef HAVE_CONFIG_H # include <config.h> *************** *** 761,791 **** if (!file_chooser_dialog) { file_chooser_dialog = ! gtk_file_chooser_dialog_new("Open File", ! parent, ! GTK_FILE_CHOOSER_ACTION_OPEN, ! GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, ! GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, ! NULL); ! ! gtk_dialog_set_default_response(GTK_DIALOG(file_chooser_dialog), ! GTK_RESPONSE_ACCEPT); ! ! GtkFileFilter * const world_filter = gtk_file_filter_new(); ! g_return_if_fail(world_filter); ! gtk_file_filter_set_name(world_filter, "VRML/X3D worlds"); ! gtk_file_filter_add_mime_type(world_filter, "x-world/x-vrml"); ! gtk_file_filter_add_mime_type(world_filter, "model/vrml"); ! gtk_file_filter_add_mime_type(world_filter, "model/x3d+vrml"); ! ! gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(file_chooser_dialog), ! world_filter); ! ! GtkFileFilter * const all_filter = gtk_file_filter_new(); ! g_return_if_fail(all_filter); ! gtk_file_filter_set_name(all_filter, "All files"); ! gtk_file_filter_add_pattern(all_filter, "*"); ! ! gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(file_chooser_dialog), ! all_filter); } --- 763,767 ---- if (!file_chooser_dialog) { file_chooser_dialog = ! openvrml_player_file_chooser_dialog_new(parent); } --- NEW FILE: filechooserdialog.cpp --- // -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 78 -*- // // Copyright 2007 Braden McDaniel // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation; either version 2 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // # include <gtk/gtk.h> # include <boost/concept_check.hpp> # include <boost/multi_index/detail/scope_guard.hpp> # include "filechooserdialog.h" using namespace boost::multi_index::detail; // for scope_guard namespace { G_GNUC_INTERNAL void class_init(gpointer g_class, gpointer class_data); G_GNUC_INTERNAL void init(GTypeInstance * instance, gpointer g_class); } GtkType openvrml_player_file_chooser_dialog_get_type() { static GtkType type = 0; if (G_UNLIKELY(!type)) { type = g_type_register_static_simple( GTK_TYPE_FILE_CHOOSER_DIALOG, "OpenvrmlPlayerFileChooserDialog", sizeof (OpenvrmlPlayerFileChooserDialogClass), class_init, sizeof (OpenvrmlPlayerFileChooserDialog), init, GTypeFlags(0)); } return type; } GtkWidget * openvrml_player_file_chooser_dialog_new(GtkWindow * parent) { GtkWidget * const dialog = static_cast<GtkWidget *>( g_object_new(OPENVRML_PLAYER_TYPE_FILE_CHOOSER_DIALOG, "title", "Open", "action", GTK_FILE_CHOOSER_ACTION_OPEN, NULL)); scope_guard dialog_guard = make_guard(g_object_unref, dialog); boost::ignore_unused_variable_warning(dialog_guard); if (parent) { gtk_window_set_transient_for(GTK_WINDOW(dialog), parent); } gtk_dialog_add_buttons(GTK_DIALOG(dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL); gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT); GtkFileFilter * const world_filter = gtk_file_filter_new(); g_return_val_if_fail(world_filter, 0); scope_guard world_filter_guard = make_guard(g_object_unref, world_filter); boost::ignore_unused_variable_warning(world_filter_guard); gtk_file_filter_set_name(world_filter, "VRML/X3D worlds"); gtk_file_filter_add_mime_type(world_filter, "x-world/x-vrml"); gtk_file_filter_add_mime_type(world_filter, "model/vrml"); gtk_file_filter_add_mime_type(world_filter, "model/x3d+vrml"); gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), world_filter); world_filter_guard.dismiss(); GtkFileFilter * const all_filter = gtk_file_filter_new(); g_return_val_if_fail(all_filter, 0); scope_guard all_filter_guard = make_guard(g_object_unref, all_filter); boost::ignore_unused_variable_warning(all_filter_guard); gtk_file_filter_set_name(all_filter, "All files"); gtk_file_filter_add_pattern(all_filter, "*"); gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), all_filter); all_filter_guard.dismiss(); dialog_guard.dismiss(); return dialog; } namespace { G_GNUC_INTERNAL GtkWidgetClass * parent_class; void class_init(const gpointer g_class, gpointer /* class_data */) { ::parent_class = static_cast<GtkWidgetClass *>( g_type_class_peek_parent(G_OBJECT_CLASS(g_class))); } void init(GTypeInstance * const instance, gpointer /* g_class */) {} } Index: Makefile.am =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-player/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.am 24 Jan 2007 00:06:46 -0000 1.3 --- Makefile.am 9 Feb 2007 05:20:28 -0000 1.4 *************** *** 15,19 **** endif ! openvrml_player_SOURCES = player.cpp EXTRA_DIST = \ --- 15,21 ---- endif ! openvrml_player_SOURCES = filechooserdialog.cpp player.cpp ! ! noinst_HEADERS = filechooserdialog.h EXTRA_DIST = \ --- NEW FILE: filechooserdialog.h --- // -*- mode: C; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 78 -*- // // Copyright 2007 Braden McDaniel // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation; either version 2 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // # ifndef OPENVRML_PLAYER_FILE_CHOOSER_DIALOG_H # define OPENVRML_PLAYER_FILE_CHOOSER_DIALOG_H # include <gtk/gtkfilechooserdialog.h> G_BEGIN_DECLS # define OPENVRML_PLAYER_TYPE_FILE_CHOOSER_DIALOG (openvrml_player_file_chooser_dialog_get_type()) # define OPENVRML_PLAYER_FILE_CHOOSER_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), OPENVRML_PLAYER_TYPE_FILE_CHOOSER_DIALOG, OpenvrmlPlayerFileChooserDialog)) # define OPENVRML_PLAYER_FILE_CHOOSER_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), OPENVRML_PLAYER_TYPE_FILE_CHOOSER_DIALOG, OpenvrmlPlayerFileChooserDialogClass)) # define OPENVRML_PLAYER_IS_FILE_CHOOSER_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), OPENVRML_PLAYER_TYPE_FILE_CHOOSER_DIALOG)) # define OPENVRML_PLAYER_IS_FILE_CHOOSER_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), OPENVRML_PLAYER_TYPE_FILE_CHOOSER_DIALOG)) # define OPENVRML_PLAYER_FILE_CHOOSER_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), OPENVRML_PLAYER_TYPE_FILE_CHOOSER_DIALOG, OpenvrmlPlayerFileChooserDialogClass)) typedef struct OpenvrmlPlayerFileChooserDialog_ OpenvrmlPlayerFileChooserDialog; typedef struct OpenvrmlPlayerFileChooserDialogClass_ OpenvrmlPlayerFileChooserDialogClass; struct OpenvrmlPlayerFileChooserDialogClass_ { GtkFileChooserDialogClass parent_class; }; struct OpenvrmlPlayerFileChooserDialog_ { GtkFileChooserDialog parent_instance; }; GType openvrml_player_file_chooser_dialog_get_type() G_GNUC_CONST; GtkWidget * openvrml_player_file_chooser_dialog_new(GtkWindow * parent); G_END_DECLS # endif // ifndef OPENVRML_PLAYER_FILE_CHOOSER_DIALOG_H |
|
From: Braden M. <br...@us...> - 2007-02-09 05:20:32
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28330 Modified Files: ChangeLog Log Message: Moved file chooser dialog into its own widget implementation. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1445 retrieving revision 1.1446 diff -C2 -d -r1.1445 -r1.1446 *** ChangeLog 8 Feb 2007 05:53:37 -0000 1.1445 --- ChangeLog 9 Feb 2007 05:20:28 -0000 1.1446 *************** *** 1,2 **** --- 1,17 ---- + 2007-02-09 Braden McDaniel <br...@en...> + + Moved file chooser dialog into its own widget implementation. + + * src/openvrml-player/Makefile.am + (openvrml_player_SOURCES): Added filechooserdialog.cpp. + (noinst_HEADERS): Added filechooserdialog.h. + * src/openvrml-player/filechooserdialog.cpp: File chooser dialog + implementation. + * src/openvrml-player/filechooserdialog.h: File chooser dialog + interface. + * src/openvrml-player/player.cpp + (openvrml_player_on_file_open_activated(GtkWindow *)): Use + OpenvrmlPlayerFileChooserDialog instead of GtkFileChooserDialog. + 2007-02-08 Braden McDaniel <br...@en...> |
|
From: Braden M. <br...@us...> - 2007-02-09 05:19:05
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv27483 Modified Files: Tag: OpenVRML-0_16-BRANCH ChangeLog Log Message: Moved file chooser dialog into its own widget implementation. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1310.2.120 retrieving revision 1.1310.2.121 diff -C2 -d -r1.1310.2.120 -r1.1310.2.121 *** ChangeLog 8 Feb 2007 05:53:18 -0000 1.1310.2.120 --- ChangeLog 9 Feb 2007 05:18:31 -0000 1.1310.2.121 *************** *** 1,2 **** --- 1,17 ---- + 2007-02-09 Braden McDaniel <br...@en...> + + Moved file chooser dialog into its own widget implementation. + + * src/openvrml-player/Makefile.am + (openvrml_player_SOURCES): Added filechooserdialog.cpp. + (noinst_HEADERS): Added filechooserdialog.h. + * src/openvrml-player/filechooserdialog.cpp: File chooser dialog + implementation. + * src/openvrml-player/filechooserdialog.h: File chooser dialog + interface. + * src/openvrml-player/player.cpp + (openvrml_player_on_file_open_activated(GtkWindow *)): Use + OpenvrmlPlayerFileChooserDialog instead of GtkFileChooserDialog. + 2007-02-08 Braden McDaniel <br...@en...> |
|
From: Braden M. <br...@us...> - 2007-02-09 05:18:37
|
Update of /cvsroot/openvrml/openvrml/src/openvrml-player In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv27483/src/openvrml-player Modified Files: Tag: OpenVRML-0_16-BRANCH Makefile.am player.cpp Added Files: Tag: OpenVRML-0_16-BRANCH filechooserdialog.cpp filechooserdialog.h Log Message: Moved file chooser dialog into its own widget implementation. Index: player.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-player/player.cpp,v retrieving revision 1.1.2.7 retrieving revision 1.1.2.8 diff -C2 -d -r1.1.2.7 -r1.1.2.8 *** player.cpp 8 Feb 2007 05:53:19 -0000 1.1.2.7 --- player.cpp 9 Feb 2007 05:18:36 -0000 1.1.2.8 *************** *** 33,36 **** --- 33,38 ---- # include <glade/glade.h> + # include "filechooserdialog.h" + # ifdef HAVE_CONFIG_H # include <config.h> *************** *** 761,791 **** if (!file_chooser_dialog) { file_chooser_dialog = ! gtk_file_chooser_dialog_new("Open File", ! parent, ! GTK_FILE_CHOOSER_ACTION_OPEN, ! GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, ! GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, ! NULL); ! ! gtk_dialog_set_default_response(GTK_DIALOG(file_chooser_dialog), ! GTK_RESPONSE_ACCEPT); ! ! GtkFileFilter * const world_filter = gtk_file_filter_new(); ! g_return_if_fail(world_filter); ! gtk_file_filter_set_name(world_filter, "VRML/X3D worlds"); ! gtk_file_filter_add_mime_type(world_filter, "x-world/x-vrml"); ! gtk_file_filter_add_mime_type(world_filter, "model/vrml"); ! gtk_file_filter_add_mime_type(world_filter, "model/x3d+vrml"); ! ! gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(file_chooser_dialog), ! world_filter); ! ! GtkFileFilter * const all_filter = gtk_file_filter_new(); ! g_return_if_fail(all_filter); ! gtk_file_filter_set_name(all_filter, "All files"); ! gtk_file_filter_add_pattern(all_filter, "*"); ! ! gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(file_chooser_dialog), ! all_filter); } --- 763,767 ---- if (!file_chooser_dialog) { file_chooser_dialog = ! openvrml_player_file_chooser_dialog_new(parent); } --- NEW FILE: filechooserdialog.cpp --- // -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 78 -*- // // Copyright 2007 Braden McDaniel // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation; either version 2 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // # include <gtk/gtk.h> # include <boost/concept_check.hpp> # include <boost/multi_index/detail/scope_guard.hpp> # include "filechooserdialog.h" using namespace boost::multi_index::detail; // for scope_guard namespace { G_GNUC_INTERNAL void class_init(gpointer g_class, gpointer class_data); G_GNUC_INTERNAL void init(GTypeInstance * instance, gpointer g_class); } GtkType openvrml_player_file_chooser_dialog_get_type() { static GtkType type = 0; if (G_UNLIKELY(!type)) { type = g_type_register_static_simple( GTK_TYPE_FILE_CHOOSER_DIALOG, "OpenvrmlPlayerFileChooserDialog", sizeof (OpenvrmlPlayerFileChooserDialogClass), class_init, sizeof (OpenvrmlPlayerFileChooserDialog), init, GTypeFlags(0)); } return type; } GtkWidget * openvrml_player_file_chooser_dialog_new(GtkWindow * parent) { GtkWidget * const dialog = static_cast<GtkWidget *>( g_object_new(OPENVRML_PLAYER_TYPE_FILE_CHOOSER_DIALOG, "title", "Open", "action", GTK_FILE_CHOOSER_ACTION_OPEN, NULL)); scope_guard dialog_guard = make_guard(g_object_unref, dialog); boost::ignore_unused_variable_warning(dialog_guard); if (parent) { gtk_window_set_transient_for(GTK_WINDOW(dialog), parent); } gtk_dialog_add_buttons(GTK_DIALOG(dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL); gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT); GtkFileFilter * const world_filter = gtk_file_filter_new(); g_return_val_if_fail(world_filter, 0); scope_guard world_filter_guard = make_guard(g_object_unref, world_filter); boost::ignore_unused_variable_warning(world_filter_guard); gtk_file_filter_set_name(world_filter, "VRML/X3D worlds"); gtk_file_filter_add_mime_type(world_filter, "x-world/x-vrml"); gtk_file_filter_add_mime_type(world_filter, "model/vrml"); gtk_file_filter_add_mime_type(world_filter, "model/x3d+vrml"); gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), world_filter); world_filter_guard.dismiss(); GtkFileFilter * const all_filter = gtk_file_filter_new(); g_return_val_if_fail(all_filter, 0); scope_guard all_filter_guard = make_guard(g_object_unref, all_filter); boost::ignore_unused_variable_warning(all_filter_guard); gtk_file_filter_set_name(all_filter, "All files"); gtk_file_filter_add_pattern(all_filter, "*"); gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), all_filter); all_filter_guard.dismiss(); dialog_guard.dismiss(); return dialog; } namespace { G_GNUC_INTERNAL GtkWidgetClass * parent_class; void class_init(const gpointer g_class, gpointer /* class_data */) { ::parent_class = static_cast<GtkWidgetClass *>( g_type_class_peek_parent(G_OBJECT_CLASS(g_class))); } void init(GTypeInstance * const instance, gpointer /* g_class */) {} } Index: Makefile.am =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-player/Makefile.am,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** Makefile.am 24 Jan 2007 00:06:34 -0000 1.1.2.2 --- Makefile.am 9 Feb 2007 05:18:32 -0000 1.1.2.3 *************** *** 15,19 **** endif ! openvrml_player_SOURCES = player.cpp EXTRA_DIST = \ --- 15,21 ---- endif ! openvrml_player_SOURCES = filechooserdialog.cpp player.cpp ! ! noinst_HEADERS = filechooserdialog.h EXTRA_DIST = \ --- NEW FILE: filechooserdialog.h --- // -*- mode: C; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 78 -*- // // Copyright 2007 Braden McDaniel // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation; either version 2 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // # ifndef OPENVRML_PLAYER_FILE_CHOOSER_DIALOG_H # define OPENVRML_PLAYER_FILE_CHOOSER_DIALOG_H # include <gtk/gtkfilechooserdialog.h> G_BEGIN_DECLS # define OPENVRML_PLAYER_TYPE_FILE_CHOOSER_DIALOG (openvrml_player_file_chooser_dialog_get_type()) # define OPENVRML_PLAYER_FILE_CHOOSER_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), OPENVRML_PLAYER_TYPE_FILE_CHOOSER_DIALOG, OpenvrmlPlayerFileChooserDialog)) # define OPENVRML_PLAYER_FILE_CHOOSER_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), OPENVRML_PLAYER_TYPE_FILE_CHOOSER_DIALOG, OpenvrmlPlayerFileChooserDialogClass)) # define OPENVRML_PLAYER_IS_FILE_CHOOSER_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), OPENVRML_PLAYER_TYPE_FILE_CHOOSER_DIALOG)) # define OPENVRML_PLAYER_IS_FILE_CHOOSER_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), OPENVRML_PLAYER_TYPE_FILE_CHOOSER_DIALOG)) # define OPENVRML_PLAYER_FILE_CHOOSER_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), OPENVRML_PLAYER_TYPE_FILE_CHOOSER_DIALOG, OpenvrmlPlayerFileChooserDialogClass)) typedef struct OpenvrmlPlayerFileChooserDialog_ OpenvrmlPlayerFileChooserDialog; typedef struct OpenvrmlPlayerFileChooserDialogClass_ OpenvrmlPlayerFileChooserDialogClass; struct OpenvrmlPlayerFileChooserDialogClass_ { GtkFileChooserDialogClass parent_class; }; struct OpenvrmlPlayerFileChooserDialog_ { GtkFileChooserDialog parent_instance; }; GType openvrml_player_file_chooser_dialog_get_type() G_GNUC_CONST; GtkWidget * openvrml_player_file_chooser_dialog_new(GtkWindow * parent); G_END_DECLS # endif // ifndef OPENVRML_PLAYER_FILE_CHOOSER_DIALOG_H |
|
From: Braden M. <br...@us...> - 2007-02-08 05:53:40
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv21277 Modified Files: ChangeLog Log Message: Don't bother with Glade XML for creating the GtkFileChooserDialog; doing this entirely in C++ is less code and easier to get right. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1444 retrieving revision 1.1445 diff -C2 -d -r1.1444 -r1.1445 *** ChangeLog 6 Feb 2007 08:22:58 -0000 1.1444 --- ChangeLog 8 Feb 2007 05:53:37 -0000 1.1445 *************** *** 1,2 **** --- 1,17 ---- + 2007-02-08 Braden McDaniel <br...@en...> + + Don't bother with Glade XML for creating the GtkFileChooserDialog; + doing this entirely in C++ is less code and easier to get right. + + * src/openvrml-player/openvrml-player.glade + (filechooserdialog): Removed. + * src/openvrml-player/player.cpp + (load_url(const gchar *)): Added helper function to send a + load-url command. + (openvrml_player_on_file_open_activated(GtkWindow *)): Added + callback to open a file chooser dialog. + (openvrml_player_on_locationentry_activated(GtkEntry *)): Delegate + to load_url. + 2007-02-06 Braden McDaniel <br...@en...> |
|
From: Braden M. <br...@us...> - 2007-02-08 05:53:40
|
Update of /cvsroot/openvrml/openvrml/src/openvrml-player In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv21277/src/openvrml-player Modified Files: openvrml-player.glade player.cpp Log Message: Don't bother with Glade XML for creating the GtkFileChooserDialog; doing this entirely in C++ is less code and easier to get right. Index: player.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-player/player.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** player.cpp 6 Feb 2007 08:22:58 -0000 1.7 --- player.cpp 8 Feb 2007 05:53:38 -0000 1.8 *************** *** 54,61 **** void * stream); void openvrml_player_on_about_activated(GtkWindow * window); void openvrml_player_on_locationentry_activated(GtkEntry * entry); - void openvrml_player_on_filechooserdialog_file_activated( - GtkFileChooser * chooser, - gpointer user_data); void openvrml_player_quit(); } --- 54,59 ---- void * stream); void openvrml_player_on_about_activated(GtkWindow * window); + void openvrml_player_on_file_open_activated(GtkWindow * window); void openvrml_player_on_locationentry_activated(GtkEntry * entry); void openvrml_player_quit(); } *************** *** 72,75 **** --- 70,74 ---- G_GNUC_INTERNAL GSource * curl_source_new(CURLM * multi_handle); G_GNUC_INTERNAL GladeXML * xml_new(GnomeProgram & program); + G_GNUC_INTERNAL void load_url(const gchar * url); *************** *** 320,323 **** --- 319,329 ---- } + G_GNUC_INTERNAL void load_url(const gchar * url) + { + std::ostringstream command; + command << "load-url " << url << std::endl; + ::write_command(command.str()); + } + typedef std::list<GPollFD> poll_fds_t; *************** *** 749,771 **** } ! void openvrml_player_on_locationentry_activated(GtkEntry * const entry) { ! const gchar * const uri = gtk_entry_get_text(entry); ! std::ostringstream command; ! command << "load-url " << uri << std::endl; ! ::write_command(command.str()); } ! void ! openvrml_player_on_filechooserdialog_file_activated( ! GtkFileChooser * const chooser, ! gpointer) { ! gtk_widget_hide(GTK_WIDGET(chooser)); ! ! const gchar * const uri = gtk_file_chooser_get_uri(chooser); ! std::ostringstream command; ! command << "load-url " << uri << std::endl; ! ::write_command(command.str()); } --- 755,810 ---- } ! void openvrml_player_on_file_open_activated(GtkWindow * const parent) { ! static GtkWidget * file_chooser_dialog = 0; ! ! if (!file_chooser_dialog) { ! file_chooser_dialog = ! gtk_file_chooser_dialog_new("Open File", ! parent, ! GTK_FILE_CHOOSER_ACTION_OPEN, ! GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, ! GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, ! NULL); ! ! gtk_dialog_set_default_response(GTK_DIALOG(file_chooser_dialog), ! GTK_RESPONSE_ACCEPT); ! ! GtkFileFilter * const world_filter = gtk_file_filter_new(); ! g_return_if_fail(world_filter); ! gtk_file_filter_set_name(world_filter, "VRML/X3D worlds"); ! gtk_file_filter_add_mime_type(world_filter, "x-world/x-vrml"); ! gtk_file_filter_add_mime_type(world_filter, "model/vrml"); ! gtk_file_filter_add_mime_type(world_filter, "model/x3d+vrml"); ! ! gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(file_chooser_dialog), ! world_filter); ! ! GtkFileFilter * const all_filter = gtk_file_filter_new(); ! g_return_if_fail(all_filter); ! gtk_file_filter_set_name(all_filter, "All files"); ! gtk_file_filter_add_pattern(all_filter, "*"); ! ! gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(file_chooser_dialog), ! all_filter); ! } ! ! const gint response = gtk_dialog_run(GTK_DIALOG(file_chooser_dialog)); ! if (response == GTK_RESPONSE_ACCEPT) { ! gchar * uri = 0; ! uri = gtk_file_chooser_get_uri(GTK_FILE_CHOOSER(file_chooser_dialog)); ! g_return_if_fail(uri); ! scope_guard uri_guard = make_guard(g_free, uri); ! boost::ignore_unused_variable_warning(uri_guard); ! ::load_url(uri); ! } ! ! gtk_widget_hide(file_chooser_dialog); } ! void openvrml_player_on_locationentry_activated(GtkEntry * const entry) { ! const gchar * const uri = gtk_entry_get_text(entry); ! ::load_url(uri); } Index: openvrml-player.glade =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-player/openvrml-player.glade,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** openvrml-player.glade 6 Feb 2007 08:22:58 -0000 1.3 --- openvrml-player.glade 8 Feb 2007 05:53:37 -0000 1.4 *************** *** 21,30 **** <property name="visible">True</property> <child> ! <widget class="GtkImageMenuItem" id="imagemenuitem2"> <property name="visible">True</property> <property name="label" translatable="yes">gtk-open</property> <property name="use_underline">True</property> <property name="use_stock">True</property> ! <signal name="activate" handler="gtk_widget_show" object="filechooserdialog"/> </widget> </child> --- 21,30 ---- <property name="visible">True</property> <child> ! <widget class="GtkImageMenuItem" id="imagemenuitemopen"> <property name="visible">True</property> <property name="label" translatable="yes">gtk-open</property> <property name="use_underline">True</property> <property name="use_stock">True</property> ! <signal name="activate" handler="openvrml_player_on_file_open_activated" object="window"/> </widget> </child> *************** *** 107,142 **** </child> </widget> - <widget class="GtkFileChooserDialog" id="filechooserdialog"> - <property name="border_width">5</property> - <property name="has_separator">False</property> - <signal name="delete-event" handler="gtk_widget_hide_on_delete"/> - <signal name="file-activated" handler="openvrml_player_on_filechooserdialog_file_activated"/> - <child internal-child="vbox"> - <widget class="GtkVBox" id="dialog-vbox2"> - <property name="visible">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK</property> - <property name="spacing">2</property> - <child> - <placeholder/> - </child> - <child internal-child="action_area"> - <widget class="GtkHButtonBox" id="dialog-action_area2"> - <property name="visible">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="pack_type">GTK_PACK_END</property> - </packing> - </child> - </widget> - </child> - </widget> </glade-interface> --- 107,109 ---- |
|
From: Braden M. <br...@us...> - 2007-02-08 05:53:21
|
Update of /cvsroot/openvrml/openvrml/src/openvrml-player In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv21247/src/openvrml-player Modified Files: Tag: OpenVRML-0_16-BRANCH openvrml-player.glade player.cpp Log Message: Don't bother with Glade XML for creating the GtkFileChooserDialog; doing this entirely in C++ is less code and easier to get right. Index: player.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-player/player.cpp,v retrieving revision 1.1.2.6 retrieving revision 1.1.2.7 diff -C2 -d -r1.1.2.6 -r1.1.2.7 *** player.cpp 6 Feb 2007 08:22:42 -0000 1.1.2.6 --- player.cpp 8 Feb 2007 05:53:19 -0000 1.1.2.7 *************** *** 54,61 **** void * stream); void openvrml_player_on_about_activated(GtkWindow * window); void openvrml_player_on_locationentry_activated(GtkEntry * entry); - void openvrml_player_on_filechooserdialog_file_activated( - GtkFileChooser * chooser, - gpointer user_data); void openvrml_player_quit(); } --- 54,59 ---- void * stream); void openvrml_player_on_about_activated(GtkWindow * window); + void openvrml_player_on_file_open_activated(GtkWindow * window); void openvrml_player_on_locationentry_activated(GtkEntry * entry); void openvrml_player_quit(); } *************** *** 72,75 **** --- 70,74 ---- G_GNUC_INTERNAL GSource * curl_source_new(CURLM * multi_handle); G_GNUC_INTERNAL GladeXML * xml_new(GnomeProgram & program); + G_GNUC_INTERNAL void load_url(const gchar * url); *************** *** 320,323 **** --- 319,329 ---- } + G_GNUC_INTERNAL void load_url(const gchar * url) + { + std::ostringstream command; + command << "load-url " << url << std::endl; + ::write_command(command.str()); + } + typedef std::list<GPollFD> poll_fds_t; *************** *** 749,771 **** } ! void openvrml_player_on_locationentry_activated(GtkEntry * const entry) { ! const gchar * const uri = gtk_entry_get_text(entry); ! std::ostringstream command; ! command << "load-url " << uri << std::endl; ! ::write_command(command.str()); } ! void ! openvrml_player_on_filechooserdialog_file_activated( ! GtkFileChooser * const chooser, ! gpointer) { ! gtk_widget_hide(GTK_WIDGET(chooser)); ! ! const gchar * const uri = gtk_file_chooser_get_uri(chooser); ! std::ostringstream command; ! command << "load-url " << uri << std::endl; ! ::write_command(command.str()); } --- 755,810 ---- } ! void openvrml_player_on_file_open_activated(GtkWindow * const parent) { ! static GtkWidget * file_chooser_dialog = 0; ! ! if (!file_chooser_dialog) { ! file_chooser_dialog = ! gtk_file_chooser_dialog_new("Open File", ! parent, ! GTK_FILE_CHOOSER_ACTION_OPEN, ! GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, ! GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, ! NULL); ! ! gtk_dialog_set_default_response(GTK_DIALOG(file_chooser_dialog), ! GTK_RESPONSE_ACCEPT); ! ! GtkFileFilter * const world_filter = gtk_file_filter_new(); ! g_return_if_fail(world_filter); ! gtk_file_filter_set_name(world_filter, "VRML/X3D worlds"); ! gtk_file_filter_add_mime_type(world_filter, "x-world/x-vrml"); ! gtk_file_filter_add_mime_type(world_filter, "model/vrml"); ! gtk_file_filter_add_mime_type(world_filter, "model/x3d+vrml"); ! ! gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(file_chooser_dialog), ! world_filter); ! ! GtkFileFilter * const all_filter = gtk_file_filter_new(); ! g_return_if_fail(all_filter); ! gtk_file_filter_set_name(all_filter, "All files"); ! gtk_file_filter_add_pattern(all_filter, "*"); ! ! gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(file_chooser_dialog), ! all_filter); ! } ! ! const gint response = gtk_dialog_run(GTK_DIALOG(file_chooser_dialog)); ! if (response == GTK_RESPONSE_ACCEPT) { ! gchar * uri = 0; ! uri = gtk_file_chooser_get_uri(GTK_FILE_CHOOSER(file_chooser_dialog)); ! g_return_if_fail(uri); ! scope_guard uri_guard = make_guard(g_free, uri); ! boost::ignore_unused_variable_warning(uri_guard); ! ::load_url(uri); ! } ! ! gtk_widget_hide(file_chooser_dialog); } ! void openvrml_player_on_locationentry_activated(GtkEntry * const entry) { ! const gchar * const uri = gtk_entry_get_text(entry); ! ::load_url(uri); } Index: openvrml-player.glade =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-player/openvrml-player.glade,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** openvrml-player.glade 6 Feb 2007 08:22:42 -0000 1.1.2.2 --- openvrml-player.glade 8 Feb 2007 05:53:19 -0000 1.1.2.3 *************** *** 21,30 **** <property name="visible">True</property> <child> ! <widget class="GtkImageMenuItem" id="imagemenuitem2"> <property name="visible">True</property> <property name="label" translatable="yes">gtk-open</property> <property name="use_underline">True</property> <property name="use_stock">True</property> ! <signal name="activate" handler="gtk_widget_show" object="filechooserdialog"/> </widget> </child> --- 21,30 ---- <property name="visible">True</property> <child> ! <widget class="GtkImageMenuItem" id="imagemenuitemopen"> <property name="visible">True</property> <property name="label" translatable="yes">gtk-open</property> <property name="use_underline">True</property> <property name="use_stock">True</property> ! <signal name="activate" handler="openvrml_player_on_file_open_activated" object="window"/> </widget> </child> *************** *** 107,142 **** </child> </widget> - <widget class="GtkFileChooserDialog" id="filechooserdialog"> - <property name="border_width">5</property> - <property name="has_separator">False</property> - <signal name="delete-event" handler="gtk_widget_hide_on_delete"/> - <signal name="file-activated" handler="openvrml_player_on_filechooserdialog_file_activated"/> - <child internal-child="vbox"> - <widget class="GtkVBox" id="dialog-vbox2"> - <property name="visible">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK</property> - <property name="spacing">2</property> - <child> - <placeholder/> - </child> - <child internal-child="action_area"> - <widget class="GtkHButtonBox" id="dialog-action_area2"> - <property name="visible">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="pack_type">GTK_PACK_END</property> - </packing> - </child> - </widget> - </child> - </widget> </glade-interface> --- 107,109 ---- |
|
From: Braden M. <br...@us...> - 2007-02-08 05:53:21
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv21247 Modified Files: Tag: OpenVRML-0_16-BRANCH ChangeLog Log Message: Don't bother with Glade XML for creating the GtkFileChooserDialog; doing this entirely in C++ is less code and easier to get right. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1310.2.119 retrieving revision 1.1310.2.120 diff -C2 -d -r1.1310.2.119 -r1.1310.2.120 *** ChangeLog 6 Feb 2007 08:22:42 -0000 1.1310.2.119 --- ChangeLog 8 Feb 2007 05:53:18 -0000 1.1310.2.120 *************** *** 1,2 **** --- 1,17 ---- + 2007-02-08 Braden McDaniel <br...@en...> + + Don't bother with Glade XML for creating the GtkFileChooserDialog; + doing this entirely in C++ is less code and easier to get right. + + * src/openvrml-player/openvrml-player.glade + (filechooserdialog): Removed. + * src/openvrml-player/player.cpp + (load_url(const gchar *)): Added helper function to send a + load-url command. + (openvrml_player_on_file_open_activated(GtkWindow *)): Added + callback to open a file chooser dialog. + (openvrml_player_on_locationentry_activated(GtkEntry *)): Delegate + to load_url. + 2007-02-06 Braden McDaniel <br...@en...> |
|
From: Braden M. <br...@us...> - 2007-02-06 08:24:47
|
Update of /cvsroot/openvrml/openvrml/src/openvrml-xembed In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5509 Modified Files: bounded_buffer.h Log Message: Reverted premature checkin. Index: bounded_buffer.h =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-xembed/bounded_buffer.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** bounded_buffer.h 6 Feb 2007 08:22:58 -0000 1.3 --- bounded_buffer.h 6 Feb 2007 08:24:46 -0000 1.4 *************** *** 44,50 **** bounded_buffer(); void put(const char_type & c); - size_t write(const char_type * buf, size_t size); int_type get(); - size_t read(char_type * buf, size_t size); size_t buffered() const; void set_eof(); --- 44,48 ---- *************** *** 74,117 **** template <typename CharT, size_t BufferSize> - size_t - bounded_buffer<CharT, BufferSize>::write(const char_type * const buf, - const size_t size) - { - boost::mutex::scoped_lock lock(this->mutex_); - - using std::copy; - - while (this->buffered_ == BufferSize) { - this->buffer_not_full_.wait(lock); - } - const size_t space_at_back = BufferSize - this->end_; - size_t num_written; - if (size < space_at_back) { - copy(buf, buf + size, &this->buf_[this->end_]); - num_written = size; - } else { - using std::min; - copy(buf, buf + space_at_back, &this->buf_[this->end_]); - const size_t space_at_front = this->begin_; - const size_t remaining_to_write = min(space_at_front, - size - space_at_back); - copy(buf + space_at_back, buf + space_at_back + remaining_to_write, - this->buf_); - num_written = space_at_back + remaining_to_write; - } - this->end_ = (this->end_ + num_written) % BufferSize; - this->buffered_ += num_written; - this->buffer_not_empty_or_eof_.notify_one(); - return num_written; - } - - template <typename CharT, size_t BufferSize> - size_t - bounded_buffer<CharT, BufferSize>::read(char_type * const buf, - const size_t size) - { - } - - template <typename CharT, size_t BufferSize> typename bounded_buffer<CharT, BufferSize>::int_type bounded_buffer<CharT, BufferSize>::get() --- 72,75 ---- |
|
From: Braden M. <br...@us...> - 2007-02-06 08:23:00
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv4677 Modified Files: ChangeLog Log Message: Load worlds from the location bar. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1443 retrieving revision 1.1444 diff -C2 -d -r1.1443 -r1.1444 *** ChangeLog 6 Feb 2007 04:47:47 -0000 1.1443 --- ChangeLog 6 Feb 2007 08:22:58 -0000 1.1444 *************** *** 1,2 **** --- 1,14 ---- + 2007-02-06 Braden McDaniel <br...@en...> + + Load worlds from the location bar. + + * src/openvrml-player/openvrml-player.glade + (locationentry): Added "activate" signal handler + openvrml_player_on_locationentry_activate. + (socket): Set "can-focus" and "has-focus" properties to "True". + * src/openvrml-player/player.cpp + (openvrml_player_on_locationentry_activated(GtkEntry *)): Added + function; send "load-url" with the given text. + 2007-02-05 Braden McDaniel <br...@en...> |
|
From: Braden M. <br...@us...> - 2007-02-06 08:23:00
|
Update of /cvsroot/openvrml/openvrml/src/openvrml-player In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv4677/src/openvrml-player Modified Files: openvrml-player.glade player.cpp Log Message: Load worlds from the location bar. Index: player.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-player/player.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** player.cpp 6 Feb 2007 04:47:47 -0000 1.6 --- player.cpp 6 Feb 2007 08:22:58 -0000 1.7 *************** *** 1,5 **** // -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 78 -*- // ! // Copyright 2006 Braden McDaniel // // This program is free software; you can redistribute it and/or modify --- 1,5 ---- // -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 78 -*- // ! // Copyright 2006, 2007 Braden McDaniel // // This program is free software; you can redistribute it and/or modify *************** *** 54,57 **** --- 54,58 ---- void * stream); void openvrml_player_on_about_activated(GtkWindow * window); + void openvrml_player_on_locationentry_activated(GtkEntry * entry); void openvrml_player_on_filechooserdialog_file_activated( GtkFileChooser * chooser, *************** *** 108,117 **** if (!gnome_vfs_init()) { ! g_printerr("GnomeVFS initialization failed"); return EXIT_FAILURE; } if (curl_global_init(CURL_GLOBAL_ALL) != 0) { ! g_printerr("libcurl initialization failed"); return EXIT_FAILURE; } --- 109,118 ---- if (!gnome_vfs_init()) { ! g_critical("GnomeVFS initialization failed"); return EXIT_FAILURE; } if (curl_global_init(CURL_GLOBAL_ALL) != 0) { ! g_critical("libcurl initialization failed"); return EXIT_FAILURE; } *************** *** 748,751 **** --- 749,760 ---- } + void openvrml_player_on_locationentry_activated(GtkEntry * const entry) + { + const gchar * const uri = gtk_entry_get_text(entry); + std::ostringstream command; + command << "load-url " << uri << std::endl; + ::write_command(command.str()); + } + void openvrml_player_on_filechooserdialog_file_activated( *************** *** 771,775 **** if (status != G_IO_STATUS_NORMAL) { if (error) { ! g_printerr(error->message); g_error_free(error); } --- 780,784 ---- if (status != G_IO_STATUS_NORMAL) { if (error) { ! g_critical(error->message); g_error_free(error); } *************** *** 781,785 **** if (status != G_IO_STATUS_NORMAL) { if (error) { ! g_printerr(error->message); g_error_free(error); } --- 790,794 ---- if (status != G_IO_STATUS_NORMAL) { if (error) { ! g_critical(error->message); g_error_free(error); } *************** *** 811,815 **** if (status != G_IO_STATUS_NORMAL) { if (error) { ! g_printerr(error->message); g_error_free(error); } --- 820,824 ---- if (status != G_IO_STATUS_NORMAL) { if (error) { ! g_critical(error->message); g_error_free(error); } *************** *** 823,827 **** if (status != G_IO_STATUS_NORMAL) { if (error) { ! g_printerr(error->message); g_error_free(error); } --- 832,836 ---- if (status != G_IO_STATUS_NORMAL) { if (error) { ! g_critical(error->message); g_error_free(error); } Index: openvrml-player.glade =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-player/openvrml-player.glade,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** openvrml-player.glade 23 Jan 2007 10:06:19 -0000 1.2 --- openvrml-player.glade 6 Feb 2007 08:22:58 -0000 1.3 *************** *** 77,82 **** <property name="visible">True</property> <child> ! <widget class="GtkEntry" id="entry1"> <property name="visible">True</property> </widget> </child> --- 77,83 ---- <property name="visible">True</property> <child> ! <widget class="GtkEntry" id="locationentry"> <property name="visible">True</property> + <signal name="activate" handler="openvrml_player_on_locationentry_activated"/> </widget> </child> *************** *** 90,93 **** --- 91,96 ---- <widget class="GtkSocket" id="socket"> <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="has-focus">True</property> </widget> </child> |
|
From: Braden M. <br...@us...> - 2007-02-06 08:23:00
|
Update of /cvsroot/openvrml/openvrml/src/openvrml-xembed In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv4677/src/openvrml-xembed Modified Files: bounded_buffer.h Log Message: Load worlds from the location bar. Index: bounded_buffer.h =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-xembed/bounded_buffer.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** bounded_buffer.h 5 Feb 2007 05:36:12 -0000 1.2 --- bounded_buffer.h 6 Feb 2007 08:22:58 -0000 1.3 *************** *** 44,48 **** --- 44,50 ---- bounded_buffer(); void put(const char_type & c); + size_t write(const char_type * buf, size_t size); int_type get(); + size_t read(char_type * buf, size_t size); size_t buffered() const; void set_eof(); *************** *** 72,75 **** --- 74,117 ---- template <typename CharT, size_t BufferSize> + size_t + bounded_buffer<CharT, BufferSize>::write(const char_type * const buf, + const size_t size) + { + boost::mutex::scoped_lock lock(this->mutex_); + + using std::copy; + + while (this->buffered_ == BufferSize) { + this->buffer_not_full_.wait(lock); + } + const size_t space_at_back = BufferSize - this->end_; + size_t num_written; + if (size < space_at_back) { + copy(buf, buf + size, &this->buf_[this->end_]); + num_written = size; + } else { + using std::min; + copy(buf, buf + space_at_back, &this->buf_[this->end_]); + const size_t space_at_front = this->begin_; + const size_t remaining_to_write = min(space_at_front, + size - space_at_back); + copy(buf + space_at_back, buf + space_at_back + remaining_to_write, + this->buf_); + num_written = space_at_back + remaining_to_write; + } + this->end_ = (this->end_ + num_written) % BufferSize; + this->buffered_ += num_written; + this->buffer_not_empty_or_eof_.notify_one(); + return num_written; + } + + template <typename CharT, size_t BufferSize> + size_t + bounded_buffer<CharT, BufferSize>::read(char_type * const buf, + const size_t size) + { + } + + template <typename CharT, size_t BufferSize> typename bounded_buffer<CharT, BufferSize>::int_type bounded_buffer<CharT, BufferSize>::get() |
|
From: Braden M. <br...@us...> - 2007-02-06 08:22:44
|
Update of /cvsroot/openvrml/openvrml/src/openvrml-player In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv4638/src/openvrml-player Modified Files: Tag: OpenVRML-0_16-BRANCH openvrml-player.glade player.cpp Log Message: Load worlds from the location bar. Index: player.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-player/player.cpp,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -C2 -d -r1.1.2.5 -r1.1.2.6 *** player.cpp 6 Feb 2007 04:47:37 -0000 1.1.2.5 --- player.cpp 6 Feb 2007 08:22:42 -0000 1.1.2.6 *************** *** 1,5 **** // -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 78 -*- // ! // Copyright 2006 Braden McDaniel // // This program is free software; you can redistribute it and/or modify --- 1,5 ---- // -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 78 -*- // ! // Copyright 2006, 2007 Braden McDaniel // // This program is free software; you can redistribute it and/or modify *************** *** 54,57 **** --- 54,58 ---- void * stream); void openvrml_player_on_about_activated(GtkWindow * window); + void openvrml_player_on_locationentry_activated(GtkEntry * entry); void openvrml_player_on_filechooserdialog_file_activated( GtkFileChooser * chooser, *************** *** 108,117 **** if (!gnome_vfs_init()) { ! g_printerr("GnomeVFS initialization failed"); return EXIT_FAILURE; } if (curl_global_init(CURL_GLOBAL_ALL) != 0) { ! g_printerr("libcurl initialization failed"); return EXIT_FAILURE; } --- 109,118 ---- if (!gnome_vfs_init()) { ! g_critical("GnomeVFS initialization failed"); return EXIT_FAILURE; } if (curl_global_init(CURL_GLOBAL_ALL) != 0) { ! g_critical("libcurl initialization failed"); return EXIT_FAILURE; } *************** *** 748,751 **** --- 749,760 ---- } + void openvrml_player_on_locationentry_activated(GtkEntry * const entry) + { + const gchar * const uri = gtk_entry_get_text(entry); + std::ostringstream command; + command << "load-url " << uri << std::endl; + ::write_command(command.str()); + } + void openvrml_player_on_filechooserdialog_file_activated( *************** *** 771,775 **** if (status != G_IO_STATUS_NORMAL) { if (error) { ! g_printerr(error->message); g_error_free(error); } --- 780,784 ---- if (status != G_IO_STATUS_NORMAL) { if (error) { ! g_critical(error->message); g_error_free(error); } *************** *** 781,785 **** if (status != G_IO_STATUS_NORMAL) { if (error) { ! g_printerr(error->message); g_error_free(error); } --- 790,794 ---- if (status != G_IO_STATUS_NORMAL) { if (error) { ! g_critical(error->message); g_error_free(error); } *************** *** 811,815 **** if (status != G_IO_STATUS_NORMAL) { if (error) { ! g_printerr(error->message); g_error_free(error); } --- 820,824 ---- if (status != G_IO_STATUS_NORMAL) { if (error) { ! g_critical(error->message); g_error_free(error); } *************** *** 823,827 **** if (status != G_IO_STATUS_NORMAL) { if (error) { ! g_printerr(error->message); g_error_free(error); } --- 832,836 ---- if (status != G_IO_STATUS_NORMAL) { if (error) { ! g_critical(error->message); g_error_free(error); } Index: openvrml-player.glade =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-player/openvrml-player.glade,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** openvrml-player.glade 23 Jan 2007 09:54:57 -0000 1.1.2.1 --- openvrml-player.glade 6 Feb 2007 08:22:42 -0000 1.1.2.2 *************** *** 77,82 **** <property name="visible">True</property> <child> ! <widget class="GtkEntry" id="entry1"> <property name="visible">True</property> </widget> </child> --- 77,83 ---- <property name="visible">True</property> <child> ! <widget class="GtkEntry" id="locationentry"> <property name="visible">True</property> + <signal name="activate" handler="openvrml_player_on_locationentry_activated"/> </widget> </child> *************** *** 90,93 **** --- 91,96 ---- <widget class="GtkSocket" id="socket"> <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="has-focus">True</property> </widget> </child> |
|
From: Braden M. <br...@us...> - 2007-02-06 08:22:44
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv4638 Modified Files: Tag: OpenVRML-0_16-BRANCH ChangeLog Log Message: Load worlds from the location bar. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1310.2.118 retrieving revision 1.1310.2.119 diff -C2 -d -r1.1310.2.118 -r1.1310.2.119 *** ChangeLog 6 Feb 2007 04:47:36 -0000 1.1310.2.118 --- ChangeLog 6 Feb 2007 08:22:42 -0000 1.1310.2.119 *************** *** 1,2 **** --- 1,14 ---- + 2007-02-06 Braden McDaniel <br...@en...> + + Load worlds from the location bar. + + * src/openvrml-player/openvrml-player.glade + (locationentry): Added "activate" signal handler + openvrml_player_on_locationentry_activate. + (socket): Set "can-focus" and "has-focus" properties to "True". + * src/openvrml-player/player.cpp + (openvrml_player_on_locationentry_activated(GtkEntry *)): Added + function; send "load-url" with the given text. + 2007-02-05 Braden McDaniel <br...@en...> |
|
From: Braden M. <br...@us...> - 2007-02-06 04:47:48
|
Update of /cvsroot/openvrml/openvrml/src/openvrml-player In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18293/src/openvrml-player Modified Files: player.cpp Log Message: Don't bail early if curl_multi_fdset returns -1; we need to call g_source_remove_poll on outstanding file descriptors in this case. Index: player.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-player/player.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** player.cpp 5 Feb 2007 05:36:12 -0000 1.5 --- player.cpp 6 Feb 2007 04:47:47 -0000 1.6 *************** *** 375,393 **** } ! if (curl_source.max_fd < 0) { return; } ! ! // ! // Resize the list of fds to be polled; initialize any new entries. ! // ! const poll_fds_t::size_type prev_size = curl_source.poll_fds->size(); ! curl_source.poll_fds->resize(curl_source.max_fd + 1); ! if (curl_source.poll_fds->size() > prev_size) { ! poll_fds_t::iterator pos = curl_source.poll_fds->begin(); ! std::advance(pos, prev_size); ! for (gint fd = prev_size; pos != curl_source.poll_fds->end(); ! ++pos, ++fd) { ! pos->fd = fd; ! pos->events = 0; ! pos->revents = 0; } } --- 375,395 ---- } ! if (curl_source.max_fd >= 0) { ! // ! // Resize the list of fds to be polled; initialize any new ! // entries. ! // ! const poll_fds_t::size_type prev_size = ! curl_source.poll_fds->size(); ! curl_source.poll_fds->resize(curl_source.max_fd + 1); ! if (curl_source.poll_fds->size() > prev_size) { ! poll_fds_t::iterator pos = curl_source.poll_fds->begin(); ! std::advance(pos, prev_size); ! for (gint fd = prev_size; pos != curl_source.poll_fds->end(); ! ++pos, ++fd) { ! pos->fd = fd; ! pos->events = 0; ! pos->revents = 0; ! } } } |
|
From: Braden M. <br...@us...> - 2007-02-06 04:47:48
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18293 Modified Files: ChangeLog Log Message: Don't bail early if curl_multi_fdset returns -1; we need to call g_source_remove_poll on outstanding file descriptors in this case. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1442 retrieving revision 1.1443 diff -C2 -d -r1.1442 -r1.1443 *** ChangeLog 5 Feb 2007 09:00:04 -0000 1.1442 --- ChangeLog 6 Feb 2007 04:47:47 -0000 1.1443 *************** *** 1,4 **** --- 1,11 ---- 2007-02-05 Braden McDaniel <br...@en...> + * src/openvrml-player/player.cpp + (reset_fds(CURLSource &)): Don't bail early if curl_multi_fdset + returns -1; we need to call g_source_remove_poll on outstanding + file descriptors in this case. + + 2007-02-05 Braden McDaniel <br...@en...> + * src/openvrml-xembed/main.cpp (main(int, char *[])): Moved global variables used for option |
|
From: Braden M. <br...@us...> - 2007-02-06 04:47:46
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18261 Modified Files: Tag: OpenVRML-0_16-BRANCH ChangeLog Log Message: Don't bail early if curl_multi_fdset returns -1; we need to call g_source_remove_poll on outstanding file descriptors in this case. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1310.2.117 retrieving revision 1.1310.2.118 diff -C2 -d -r1.1310.2.117 -r1.1310.2.118 *** ChangeLog 5 Feb 2007 08:59:50 -0000 1.1310.2.117 --- ChangeLog 6 Feb 2007 04:47:36 -0000 1.1310.2.118 *************** *** 1,4 **** --- 1,11 ---- 2007-02-05 Braden McDaniel <br...@en...> + * src/openvrml-player/player.cpp + (reset_fds(CURLSource &)): Don't bail early if curl_multi_fdset + returns -1; we need to call g_source_remove_poll on outstanding + file descriptors in this case. + + 2007-02-05 Braden McDaniel <br...@en...> + * src/openvrml-xembed/main.cpp (main(int, char *[])): Moved global variables used for option |
|
From: Braden M. <br...@us...> - 2007-02-06 04:47:46
|
Update of /cvsroot/openvrml/openvrml/src/openvrml-player In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18261/src/openvrml-player Modified Files: Tag: OpenVRML-0_16-BRANCH player.cpp Log Message: Don't bail early if curl_multi_fdset returns -1; we need to call g_source_remove_poll on outstanding file descriptors in this case. Index: player.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-player/player.cpp,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -C2 -d -r1.1.2.4 -r1.1.2.5 *** player.cpp 5 Feb 2007 04:41:53 -0000 1.1.2.4 --- player.cpp 6 Feb 2007 04:47:37 -0000 1.1.2.5 *************** *** 375,393 **** } ! if (curl_source.max_fd < 0) { return; } ! ! // ! // Resize the list of fds to be polled; initialize any new entries. ! // ! const poll_fds_t::size_type prev_size = curl_source.poll_fds->size(); ! curl_source.poll_fds->resize(curl_source.max_fd + 1); ! if (curl_source.poll_fds->size() > prev_size) { ! poll_fds_t::iterator pos = curl_source.poll_fds->begin(); ! std::advance(pos, prev_size); ! for (gint fd = prev_size; pos != curl_source.poll_fds->end(); ! ++pos, ++fd) { ! pos->fd = fd; ! pos->events = 0; ! pos->revents = 0; } } --- 375,395 ---- } ! if (curl_source.max_fd >= 0) { ! // ! // Resize the list of fds to be polled; initialize any new ! // entries. ! // ! const poll_fds_t::size_type prev_size = ! curl_source.poll_fds->size(); ! curl_source.poll_fds->resize(curl_source.max_fd + 1); ! if (curl_source.poll_fds->size() > prev_size) { ! poll_fds_t::iterator pos = curl_source.poll_fds->begin(); ! std::advance(pos, prev_size); ! for (gint fd = prev_size; pos != curl_source.poll_fds->end(); ! ++pos, ++fd) { ! pos->fd = fd; ! pos->events = 0; ! pos->revents = 0; ! } } } |
|
From: Braden M. <br...@us...> - 2007-02-05 09:01:27
|
Update of /cvsroot/openvrml/openvrml/src/openvrml-xembed In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv27749/src/openvrml-xembed Modified Files: Tag: OpenVRML-0_16-BRANCH main.cpp Log Message: Moved global variables used for option parsing inside main. Index: main.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-xembed/main.cpp,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** main.cpp 5 Feb 2007 07:08:29 -0000 1.1.2.2 --- main.cpp 5 Feb 2007 08:59:50 -0000 1.1.2.3 *************** *** 176,213 **** namespace { - gboolean version, initial_stream; - gchar ** args; - - GOptionEntry options[] = { - { - "version", - 'v', - 0, - G_OPTION_ARG_NONE, - &version, - "Print the version information and exit", - 0 - }, - { - "initial-stream", - 'i', - 0, - G_OPTION_ARG_NONE, - &initial_stream, - "Expect an initial stream", - 0 - }, - { - G_OPTION_REMAINING, - '\0', - 0, - G_OPTION_ARG_STRING_ARRAY, - &args, - "the embedder's window ID", - "XID" - }, - { 0, '\0', 0, G_OPTION_ARG_NONE, 0, 0, 0 } - }; - struct initial_stream_reader { initial_stream_reader( --- 176,179 ---- *************** *** 355,358 **** --- 321,357 ---- gtk_gl_init(&argc, &argv); + gboolean version = false, initial_stream = false; + gchar ** args = 0; + GOptionEntry options[] = { + { + "version", + 'v', + 0, + G_OPTION_ARG_NONE, + &version, + "Print the version information and exit", + 0 + }, + { + "initial-stream", + 'i', + 0, + G_OPTION_ARG_NONE, + &initial_stream, + "Expect an initial stream", + 0 + }, + { + G_OPTION_REMAINING, + '\0', + 0, + G_OPTION_ARG_STRING_ARRAY, + &args, + "the embedder's window ID", + "XID" + }, + { 0, '\0', 0, G_OPTION_ARG_NONE, 0, 0, 0 } + }; + GError * error = 0; scope_guard error_guard = make_guard(g_error_free, ref(error)); *************** *** 375,379 **** } ! if (!::args) { cerr << argv[0] << ": missing required XID argument" << endl; error_guard.dismiss(); --- 374,378 ---- } ! if (!args) { cerr << argv[0] << ": missing required XID argument" << endl; error_guard.dismiss(); *************** *** 383,387 **** GdkNativeWindow socket_id; try { ! socket_id = boost::lexical_cast<GdkNativeWindow>(::args[0]); } catch (const boost::bad_lexical_cast & ex) { cerr << argv[0] << ": expected integer value for XID argument" << endl; --- 382,386 ---- GdkNativeWindow socket_id; try { ! socket_id = boost::lexical_cast<GdkNativeWindow>(args[0]); } catch (const boost::bad_lexical_cast & ex) { cerr << argv[0] << ": expected integer value for XID argument" << endl; *************** *** 437,441 **** threads.create_thread(command_channel_loop_func); ! if (::initial_stream) { const shared_ptr<plugin_streambuf> initial_stream( new plugin_streambuf(::initial_stream_uri)); --- 436,440 ---- threads.create_thread(command_channel_loop_func); ! if (initial_stream) { const shared_ptr<plugin_streambuf> initial_stream( new plugin_streambuf(::initial_stream_uri)); |
|
From: Braden M. <br...@us...> - 2007-02-05 09:01:27
|
Update of /cvsroot/openvrml/openvrml/src/openvrml-xembed In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv27775/src/openvrml-xembed Modified Files: main.cpp Log Message: Moved global variables used for option parsing inside main. Index: main.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-xembed/main.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** main.cpp 5 Feb 2007 07:08:43 -0000 1.3 --- main.cpp 5 Feb 2007 09:00:04 -0000 1.4 *************** *** 176,213 **** namespace { - gboolean version, initial_stream; - gchar ** args; - - GOptionEntry options[] = { - { - "version", - 'v', - 0, - G_OPTION_ARG_NONE, - &version, - "Print the version information and exit", - 0 - }, - { - "initial-stream", - 'i', - 0, - G_OPTION_ARG_NONE, - &initial_stream, - "Expect an initial stream", - 0 - }, - { - G_OPTION_REMAINING, - '\0', - 0, - G_OPTION_ARG_STRING_ARRAY, - &args, - "the embedder's window ID", - "XID" - }, - { 0, '\0', 0, G_OPTION_ARG_NONE, 0, 0, 0 } - }; - struct initial_stream_reader { initial_stream_reader( --- 176,179 ---- *************** *** 355,358 **** --- 321,357 ---- gtk_gl_init(&argc, &argv); + gboolean version = false, initial_stream = false; + gchar ** args = 0; + GOptionEntry options[] = { + { + "version", + 'v', + 0, + G_OPTION_ARG_NONE, + &version, + "Print the version information and exit", + 0 + }, + { + "initial-stream", + 'i', + 0, + G_OPTION_ARG_NONE, + &initial_stream, + "Expect an initial stream", + 0 + }, + { + G_OPTION_REMAINING, + '\0', + 0, + G_OPTION_ARG_STRING_ARRAY, + &args, + "the embedder's window ID", + "XID" + }, + { 0, '\0', 0, G_OPTION_ARG_NONE, 0, 0, 0 } + }; + GError * error = 0; scope_guard error_guard = make_guard(g_error_free, ref(error)); *************** *** 375,379 **** } ! if (!::args) { cerr << argv[0] << ": missing required XID argument" << endl; error_guard.dismiss(); --- 374,378 ---- } ! if (!args) { cerr << argv[0] << ": missing required XID argument" << endl; error_guard.dismiss(); *************** *** 383,387 **** GdkNativeWindow socket_id; try { ! socket_id = boost::lexical_cast<GdkNativeWindow>(::args[0]); } catch (const boost::bad_lexical_cast & ex) { cerr << argv[0] << ": expected integer value for XID argument" << endl; --- 382,386 ---- GdkNativeWindow socket_id; try { ! socket_id = boost::lexical_cast<GdkNativeWindow>(args[0]); } catch (const boost::bad_lexical_cast & ex) { cerr << argv[0] << ": expected integer value for XID argument" << endl; *************** *** 437,441 **** threads.create_thread(command_channel_loop_func); ! if (::initial_stream) { const shared_ptr<plugin_streambuf> initial_stream( new plugin_streambuf(::initial_stream_uri)); --- 436,440 ---- threads.create_thread(command_channel_loop_func); ! if (initial_stream) { const shared_ptr<plugin_streambuf> initial_stream( new plugin_streambuf(::initial_stream_uri)); |
