[Xfce4-commits] r22751 - in xarchiver/branches/xarchiver-psybsd: . po src
Stephan Arts
stephan at xfce.org
Sun Aug 13 22:27:06 UTC 2006
Author: stephan
Date: 2006-08-13 22:27:05 +0000 (Sun, 13 Aug 2006)
New Revision: 22751
Added:
xarchiver/branches/xarchiver-psybsd/configure.in.in
xarchiver/branches/xarchiver-psybsd/po/LINGUAS
xarchiver/branches/xarchiver-psybsd/src/main_window.c
xarchiver/branches/xarchiver-psybsd/src/main_window.h
Removed:
xarchiver/branches/xarchiver-psybsd/configure.ac
Modified:
xarchiver/branches/xarchiver-psybsd/autogen.sh
xarchiver/branches/xarchiver-psybsd/src/Makefile.am
xarchiver/branches/xarchiver-psybsd/src/main.c
xarchiver/branches/xarchiver-psybsd/src/new_dialog.c
Log:
Changed configure stuff
added dummy main_window
Modified: xarchiver/branches/xarchiver-psybsd/autogen.sh
===================================================================
--- xarchiver/branches/xarchiver-psybsd/autogen.sh 2006-08-13 18:15:44 UTC (rev 22750)
+++ xarchiver/branches/xarchiver-psybsd/autogen.sh 2006-08-13 22:27:05 UTC (rev 22751)
@@ -1,8 +1,8 @@
#!/bin/sh
#
-# $Id: autogen.sh 8094 2005-01-27 07:52:08Z kelnos $
+# $Id: autogen.sh 22391 2006-07-10 12:54:50Z benny $
#
-# Copyright (c) 2002-2005
+# Copyright (c) 2002-2006
# The Xfce development team. All rights reserved.
#
# Written for Xfce by Benedikt Meurer <benny at xfce.org>.
@@ -18,6 +18,22 @@
exit 1
}
+# verify that po/LINGUAS is present
+(test -f po/LINGUAS) >/dev/null 2>&1 || {
+ cat >&2 <<EOF
+autogen.sh: The file po/LINGUAS could not be found. Please check your snapshot
+ or try to checkout again.
+EOF
+ exit 1
+}
+
+# substitute revision and linguas
+linguas=`sed -e '/^#/d' po/LINGUAS`
+revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%05d\n", $2}'`
+sed -e "s/@LINGUAS@/${linguas}/g" \
+ -e "s/@REVISION@/${revision}/g" \
+ < "configure.in.in" > "configure.in"
+
exec xdt-autogen $@
# vi:set ts=2 sw=2 et ai:
Deleted: xarchiver/branches/xarchiver-psybsd/configure.ac
Copied: xarchiver/branches/xarchiver-psybsd/configure.in.in (from rev 22733, xarchiver/branches/xarchiver-psybsd/configure.ac)
===================================================================
--- xarchiver/branches/xarchiver-psybsd/configure.in.in (rev 0)
+++ xarchiver/branches/xarchiver-psybsd/configure.in.in 2006-08-13 22:27:05 UTC (rev 22751)
@@ -0,0 +1,71 @@
+dnl
+dnl Copyright (c) 2006
+dnl The Xfce development team. All rights reserved.
+dnl
+dnl Originally written for Xfce by Benedikt Meurer <benny at xfce.org>
+dnl Modified by Stephan Arts <psybsd at gmail.com>
+dnl
+
+dnl ***************************
+dnl *** Version information ***
+dnl ***************************
+m4_define([xarchiver_version_branch], [psybsd])
+m4_define([xarchiver_version_major], [0])
+m4_define([xarchiver_version_minor], [3])
+m4_define([xarchiver_version_micro], [9])
+m4_define([xarchiver_version_nano], []) # Leave empty for no nano version
+m4_define([xarchiver_version_build], [r at REVISION@])
+m4_define([xarchiver_version_tag], [svn]) # Leave empty for releases
+m4_define([xarchiver_version], [ifelse(xarchiver_version_branch(), [], [xarchiver_version_major().xarchiver_version_minor().xarchiver_version_micro()ifelse(xarchiver_version_nano(), [], [], [.xarchiver_version_nano()])], [xarchiver_version_branch()])-ifelse(xarchiver_version_tag(), [svn], [xarchiver_version_tag()-xarchiver_version_build()], [xarchiver_version_tag()])])
+
+AC_INIT([Xarchiver], [xarchiver_version], [])
+AC_PREREQ([2.50])
+
+
+XARCHIVER_VERSION=xarchiver_version
+AM_INIT_AUTOMAKE([Xarchiver], [$XARCHIVER_VERSION])
+AM_CONFIG_HEADER([config.h])
+AM_MAINTAINER_MODE
+
+dnl check for UNIX variants
+AC_AIX
+AC_ISC_POSIX
+AC_MINIX
+AM_CONDITIONAL([HAVE_CYGWIN], [test "`uname | grep \"CYGWIN\"`" != ""])
+
+
+dnl check for standard header files
+AC_PROG_CC
+AC_PROG_RANLIB
+AC_PROG_INTLTOOL([0.31], [no-xml])
+
+AC_HEADER_STDC
+AC_SYS_LARGEFILE
+CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES"
+
+dnl Check for i18n support
+XDT_I18N([@LINGUAS@])
+
+
+XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.2.0])
+XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.2.0])
+XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [2.2.0])
+XDT_CHECK_PACKAGE([THUNARVFS], [thunar-vfs-1], [0.3.3])
+
+dnl check for debugging support
+XDT_FEATURE_DEBUG
+
+AC_OUTPUT([
+Makefile
+po/Makefile.in
+src/Makefile
+tests/Makefile
+libxarchiver/Makefile
+])
+
+echo "----------------------------------------"
+echo "$PACKAGE $VERSION"
+echo ""
+echo "The binary will be installed in $prefix/bin"
+echo ""
+echo "Configure finished, type 'make' to build."
Added: xarchiver/branches/xarchiver-psybsd/po/LINGUAS
===================================================================
--- xarchiver/branches/xarchiver-psybsd/po/LINGUAS (rev 0)
+++ xarchiver/branches/xarchiver-psybsd/po/LINGUAS 2006-08-13 22:27:05 UTC (rev 22751)
@@ -0,0 +1 @@
+nl
Modified: xarchiver/branches/xarchiver-psybsd/src/Makefile.am
===================================================================
--- xarchiver/branches/xarchiver-psybsd/src/Makefile.am 2006-08-13 18:15:44 UTC (rev 22750)
+++ xarchiver/branches/xarchiver-psybsd/src/Makefile.am 2006-08-13 22:27:05 UTC (rev 22751)
@@ -2,7 +2,8 @@
xarchiver_SOURCES = \
main.c main.h \
- new_dialog.c new_dialog.h \
+ main_window.c main_window.h \
+ new_dialog.c new_dialog.h \
extract_dialog.c extract_dialog.h
xarchiver_CFLAGS = \
Modified: xarchiver/branches/xarchiver-psybsd/src/main.c
===================================================================
--- xarchiver/branches/xarchiver-psybsd/src/main.c 2006-08-13 18:15:44 UTC (rev 22750)
+++ xarchiver/branches/xarchiver-psybsd/src/main.c 2006-08-13 22:27:05 UTC (rev 22751)
@@ -88,6 +88,7 @@
{
gint result = 0;
GtkWidget *dialog = NULL;
+ GtkWidget *main_window = NULL;
LXAArchive *lpArchive;
LXAArchiveSupport *lpSupport;
GError *cli_error = NULL;
@@ -185,6 +186,14 @@
lxa_archive_support_add(lpSupport, lpArchive, files);
}
+ if(!new_archive && !add_archive_path && !extract_archive && !extract_archive_path)
+ {
+ /* Show main window */
+ main_window = xa_main_window_new();
+ gtk_widget_show_all(main_window);
+ g_signal_connect(G_OBJECT(main_window), "destroy", gtk_main_quit, NULL);
+ }
+
gtk_main();
return 0;
Added: xarchiver/branches/xarchiver-psybsd/src/main_window.c
===================================================================
--- xarchiver/branches/xarchiver-psybsd/src/main_window.c (rev 0)
+++ xarchiver/branches/xarchiver-psybsd/src/main_window.c 2006-08-13 22:27:05 UTC (rev 22751)
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2006 Stephan Arts <psybsd at gmail.com>
+ *
+ * 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 Library 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 <config.h>
+#include <glib.h>
+#include <gtk/gtk.h>
+#include <libxarchiver/libxarchiver.h>
+#include "main_window.h"
+
+static void
+xa_main_window_class_init(XAMainWindowClass *archive_class);
+
+static void
+xa_main_window_init(XAMainWindow *archive);
+
+GType
+xa_main_window_get_type ()
+{
+ static GType xa_main_window_type = 0;
+
+ if (!xa_main_window_type)
+ {
+ static const GTypeInfo xa_main_window_info =
+ {
+ sizeof (XAMainWindowClass),
+ (GBaseInitFunc) NULL,
+ (GBaseFinalizeFunc) NULL,
+ (GClassInitFunc) xa_main_window_class_init,
+ (GClassFinalizeFunc) NULL,
+ NULL,
+ sizeof (XAMainWindow),
+ 0,
+ (GInstanceInitFunc) xa_main_window_init,
+ NULL
+ };
+
+ xa_main_window_type = g_type_register_static (GTK_TYPE_WINDOW, "XAMainWindow", &xa_main_window_info, 0);
+ }
+ return xa_main_window_type;
+}
+
+static void
+xa_main_window_class_init(XAMainWindowClass *dialog_class)
+{
+}
+
+static void
+xa_main_window_init(XAMainWindow *dialog)
+{
+}
+
+GtkWidget *
+xa_main_window_new()
+{
+ GtkWidget *window;
+
+ window = g_object_new(xa_main_window_get_type(),
+ "title", PACKAGE_STRING,
+ NULL);
+
+ return window;
+}
Added: xarchiver/branches/xarchiver-psybsd/src/main_window.h
===================================================================
--- xarchiver/branches/xarchiver-psybsd/src/main_window.h (rev 0)
+++ xarchiver/branches/xarchiver-psybsd/src/main_window.h 2006-08-13 22:27:05 UTC (rev 22751)
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2006 Stephan Arts <psybsd at gmail.com>
+ *
+ * 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 Library 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 __XARCHIVER_MAIN_WINDOW_H__
+#define __XARCHIVER_MAIN_WINDOW_H__
+G_BEGIN_DECLS
+
+#define XA_MAIN_WINDOW(obj) ( \
+ G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+ xa_main_window_get_type(), \
+ XAMainWindow))
+
+#define XA_IS_MAIN_WINDOW(obj) ( \
+ G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+ xa_main_window_get_type()))
+
+#define XA_MAIN_WINDOW_CLASS(class) ( \
+ G_TYPE_CHECK_CLASS_CAST ((class), \
+ xa_main_window_get_type(), \
+ XAMainWindowClass))
+
+#define XA_IS_MAIN_WINDOW_CLASS(class) ( \
+ G_TYPE_CHECK_CLASS_TYPE ((class), \
+ xa_main_window_get_type()))
+
+typedef struct _XAMainWindow XAMainWindow;
+
+struct _XAMainWindow
+{
+ GtkWindow parent;
+};
+
+typedef struct _XAMainWindowClass XAMainWindowClass;
+
+struct _XAMainWindowClass
+{
+ GtkWindowClass parent;
+};
+
+GtkWidget *xa_main_window_new();
+
+G_END_DECLS
+#endif /* __XARCHIVER_MAIN_WINDOW_H__ */
Modified: xarchiver/branches/xarchiver-psybsd/src/new_dialog.c
===================================================================
--- xarchiver/branches/xarchiver-psybsd/src/new_dialog.c 2006-08-13 18:15:44 UTC (rev 22750)
+++ xarchiver/branches/xarchiver-psybsd/src/new_dialog.c 2006-08-13 22:27:05 UTC (rev 22751)
@@ -73,6 +73,7 @@
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_NEW, GTK_RESPONSE_OK,
NULL);
+ gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);
}
GtkWidget *
More information about the Xfce4-commits
mailing list