[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r813 - in gnunet-gtk: . po src
|
From: |
grothoff |
|
Subject: |
[GNUnet-SVN] r813 - in gnunet-gtk: . po src |
|
Date: |
Wed, 25 May 2005 04:45:38 -0700 (PDT) |
Author: grothoff
Date: 2005-05-25 04:45:30 -0700 (Wed, 25 May 2005)
New Revision: 813
Modified:
gnunet-gtk/ChangeLog
gnunet-gtk/Makefile.am
gnunet-gtk/configure.ac
gnunet-gtk/po/ChangeLog
gnunet-gtk/po/POTFILES
gnunet-gtk/po/POTFILES.in
gnunet-gtk/src/Makefile.am
gnunet-gtk/src/main.c
Log:
update
Modified: gnunet-gtk/ChangeLog
===================================================================
--- gnunet-gtk/ChangeLog 2005-05-25 11:44:59 UTC (rev 812)
+++ gnunet-gtk/ChangeLog 2005-05-25 11:45:30 UTC (rev 813)
@@ -1,3 +1,9 @@
Mon May 23 11:06:02 EST 2005
Started serious coding on glade-based gnunet-gtk.
+
+2005/5/24 6:45:33 EST
+ update files from .glade file
+
+2005/5/24 16:35:41 EST
+ update files from .glade file
Modified: gnunet-gtk/Makefile.am
===================================================================
--- gnunet-gtk/Makefile.am 2005-05-25 11:44:59 UTC (rev 812)
+++ gnunet-gtk/Makefile.am 2005-05-25 11:45:30 UTC (rev 813)
@@ -7,22 +7,22 @@
gnunet-gtk.glade
install-data-local:
+ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
+ $(INSTALL_DATA) gnunet-gtk.glade $(DESTDIR)$(pkgdatadir)
@$(NORMAL_INSTALL)
- if test -d $(srcdir)/pixmaps; then \
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/pixmaps; \
- for pixmap in $(srcdir)/pixmaps/*; do \
- if test -f $$pixmap; then \
- $(INSTALL_DATA) $$pixmap $(DESTDIR)$(pkgdatadir)/pixmaps; \
- fi \
- done \
- fi
+ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir); \
+ for pixmap in $(srcdir)/pixmaps/*; do \
+ if test -f $$pixmap; then \
+ $(INSTALL_DATA) $$pixmap $(DESTDIR)$(pkgdatadir); \
+ fi \
+ done
dist-hook:
if test -d pixmaps; then \
mkdir $(distdir)/pixmaps; \
for pixmap in pixmaps/*; do \
if test -f $$pixmap; then \
- cp -p $$pixmap $(distdir)/pixmaps; \
+ cp -p $$pixmap $(distdir); \
fi \
done \
fi
Modified: gnunet-gtk/configure.ac
===================================================================
--- gnunet-gtk/configure.ac 2005-05-25 11:44:59 UTC (rev 812)
+++ gnunet-gtk/configure.ac 2005-05-25 11:45:30 UTC (rev 813)
@@ -176,8 +176,10 @@
AC_CHECK_LIB(gnunetstats_api,requestStatistics,,
AC_MSG_ERROR([gnunet-gtk requires stats]))
+PKG_CHECK_MODULES(GNUNETGTK, libglade-2.0) # libgnomeui-2.0 >= 1.110.0
+AC_SUBST(GNUNETGTK_CFLAGS)
+AC_SUBST(GNUNETGTK_LIBS)
-
# Set PACKAGE_LOCALE_DIR in config.h.
if test "x${prefix}" = "xNONE"; then
AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR,
"${ac_default_prefix}/${DATADIRNAME}/locale", [locale dir])
Modified: gnunet-gtk/po/ChangeLog
===================================================================
--- gnunet-gtk/po/ChangeLog 2005-05-25 11:44:59 UTC (rev 812)
+++ gnunet-gtk/po/ChangeLog 2005-05-25 11:45:30 UTC (rev 813)
@@ -2,3 +2,9 @@
* Makefile.in.in: Upgrade to gettext-0.14.4.
+
+2005/5/24 6:45:33 EST
+ update files from .glade file
+
+2005/5/24 16:35:41 EST
+ update files from .glade file
Modified: gnunet-gtk/po/POTFILES
===================================================================
--- gnunet-gtk/po/POTFILES 2005-05-25 11:44:59 UTC (rev 812)
+++ gnunet-gtk/po/POTFILES 2005-05-25 11:45:30 UTC (rev 813)
@@ -1,4 +1,13 @@
- ../src/main.c \
- ../src/interface.c \
- ../src/callbacks.c \
- ../src/support.c
+ .././src/gnunet-gtk.cc \
+ .././src/mainWindow_glade.cc \
+ .././src/mainWindow.cc \
+ .././src/metaDataDialog_glade.cc \
+ .././src/metaDataDialog.cc \
+ .././src/metaDisplayDialog_glade.cc \
+ .././src/metaDisplayDialog.cc \
+ .././src/searchResultsFrame_glade.cc \
+ .././src/searchResultsFrame.cc \
+ .././src/namespaceContentFrame_glade.cc \
+ .././src/namespaceContentFrame.cc \
+ .././src/chatFrame_glade.cc \
+ .././src/chatFrame.cc
Modified: gnunet-gtk/po/POTFILES.in
===================================================================
--- gnunet-gtk/po/POTFILES.in 2005-05-25 11:44:59 UTC (rev 812)
+++ gnunet-gtk/po/POTFILES.in 2005-05-25 11:45:30 UTC (rev 813)
@@ -1,6 +1,14 @@
# List of source files containing translatable strings.
-
-src/main.c
-src/interface.c
-src/callbacks.c
-src/support.c
+./src/gnunet-gtk.cc
+./src/mainWindow_glade.cc
+./src/mainWindow.cc
+./src/metaDataDialog_glade.cc
+./src/metaDataDialog.cc
+./src/metaDisplayDialog_glade.cc
+./src/metaDisplayDialog.cc
+./src/searchResultsFrame_glade.cc
+./src/searchResultsFrame.cc
+./src/namespaceContentFrame_glade.cc
+./src/namespaceContentFrame.cc
+./src/chatFrame_glade.cc
+./src/chatFrame.cc
Modified: gnunet-gtk/src/Makefile.am
===================================================================
--- gnunet-gtk/src/Makefile.am 2005-05-25 11:44:59 UTC (rev 812)
+++ gnunet-gtk/src/Makefile.am 2005-05-25 11:45:30 UTC (rev 813)
@@ -1,16 +1,20 @@
-## Process this file with automake to produce Makefile.in
-
INCLUDES = \
- -I$(top_srcdir)/intl \
- @GTK_CFLAGS@
+ -I$(top_srcdir)/intl \
+ @GTK_CFLAGS@ \
+ @GNUNETGTK_CFLAGS@
bin_PROGRAMS = gnunet-gtk
+AM_CFLAGS = \
+ -DGLADE_FILE="\"$(DESTDIR)$(pkgdatadir)/gnunet-gtk.glade\""
+
gnunet_gtk_SOURCES = \
- main.c gettext.h \
- support.c support.h \
- interface.c interface.h \
- callbacks.c callbacks.h
+ main.c main.h gettext.h
-gnunet_gtk_LDADD = @GTK_LIBS@ $(INTLLIBS)
+gnunet_gtk_LDADD = \
+ @GTK_LIBS@ \
+ @GNUNETGTK_LIBS@ \
+ $(INTLLIBS)
+gnunet_gtk_LDFLAGS = \
+ -export-dynamic
Modified: gnunet-gtk/src/main.c
===================================================================
--- gnunet-gtk/src/main.c 2005-05-25 11:44:59 UTC (rev 812)
+++ gnunet-gtk/src/main.c 2005-05-25 11:45:30 UTC (rev 813)
@@ -18,28 +18,39 @@
Boston, MA 02111-1307, USA.
*/
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+/**
+ * @file src/main.c
+ * @brief Main function of gnunet-gtk
+ * @author Christian Grothoff
+ */
+#include "config.h"
#include "gettext.h"
#include <gtk/gtk.h>
+#include <glade/glade.h>
#include <GNUnet/gnunet_util.h>
#include <GNUnet/gnunet_ecrs_lib.h>
+#include <GNUnet/gnunet_fsui_lib.h>
-#include "interface.h"
-#include "support.h"
+#include "main.h"
+/**
+ * FSUI event handler.
+ */
+static void eventProcessor(void * cls,
+ const FSUI_Event * event) {
+ printf("FSUI event received!\n");
+}
-
/**
* Prints the usage information for this command if the user errs.
- * Aborts the program.
*/
static void printhelp() {
static Help help[] = {
+ { 'a', "anonymity", "LEVEL",
+ gettext_noop("set the desired LEVEL of receiver-anonymity") },
HELP_CONFIG,
HELP_HELP,
HELP_HOSTNAME,
@@ -82,7 +93,7 @@
printhelp();
return SYSERR;
case 'v':
- printf("GNUnet v%s, gnunet-gtk v%s\n",
+ printf("GNUnet v%s, gnunet-gkt v%s\n",
VERSION,
AFS_VERSION);
return SYSERR;
@@ -97,30 +108,37 @@
return OK;
}
+GladeXML * mainXML;
+struct FSUI_Context * ctx;
-int
-main (int argc, char *argv[])
-{
- GtkWidget * mainWindow;
- GtkWidget * metaDataDialog;
- GtkWidget * metaDisplayDialog;
-
-#ifdef ENABLE_NLS
- bindtextdomain (PACKAGE, PACKAGE_LOCALE_DIR);
- bind_textdomain_codeset (PACKAGE, "UTF-8");
- textdomain (PACKAGE);
-#endif
-
- gtk_set_locale ();
+int main(int argc,
+ char *argv[]) {
+
gtk_init(&argc, &argv);
- if (SYSERR == initUtil(argc, argv, &parseOptions))
- return 0; /* parse error, --help, etc. */
+ if (SYSERR == initUtil(argc,
+ argv,
+ &parseOptions))
+ return 0;
- add_pixmap_directory (PACKAGE_DATA_DIR "/pixmaps");
+ /* load the interface */
+ mainXML = glade_xml_new(GLADE_FILE,
+ "mainWindow",
+ NULL);
+ /* connect the signals in the interface */
+ glade_xml_signal_autoconnect(mainXML);
+
+ /* FSUI initialization here! */
+ ctx = FSUI_start("gnunet-gtk",
+ YES,
+ &eventProcessor,
+ NULL);
- mainWindow = create_mainWindow ();
- gtk_widget_show (mainWindow);
- gtk_main ();
+ /* start the event loop */
+ gtk_main();
+ FSUI_stop(ctx);
+ doneUtil();
+
return 0;
}
+/* ************* end of main.c ************ */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r813 - in gnunet-gtk: . po src,
grothoff <=