file-roller r2563 - in trunk: . data data/glade data/ui po src
- From: paobac svn gnome org
- To: svn-commits-list gnome org
- Subject: file-roller r2563 - in trunk: . data data/glade data/ui po src
- Date: Sat, 31 Jan 2009 11:31:25 +0000 (UTC)
Author: paobac
Date: Sat Jan 31 11:31:25 2009
New Revision: 2563
URL: http://svn.gnome.org/viewvc/file-roller?rev=2563&view=rev
Log:
2009-01-31 Paolo Bacchilega <paobac svn gnome org>
* configure.ac: removed the libglade dependency; allow to
optionally load the ui from the source tree.
* data/Makefile.am:
* data/glade: removed
* data/ui: added
* src/*.c
Use gtkbuilder instead of libglade.
Added:
trunk/data/ui/
trunk/data/ui/Makefile.am
trunk/data/ui/Makefile.in
trunk/data/ui/add-options.ui
trunk/data/ui/batch-add-files.ui
trunk/data/ui/batch-password.ui
trunk/data/ui/delete.ui
trunk/data/ui/new.ui
trunk/data/ui/open-with.ui
trunk/data/ui/password.ui
trunk/data/ui/properties.ui
trunk/data/ui/update.ui
Removed:
trunk/data/glade/
Modified:
trunk/ChangeLog
trunk/configure.ac
trunk/data/Makefile.am
trunk/po/ChangeLog
trunk/po/POTFILES.in
trunk/src/Makefile.am
trunk/src/dlg-add-files.c
trunk/src/dlg-add-folder.c
trunk/src/dlg-ask-password.c
trunk/src/dlg-batch-add.c
trunk/src/dlg-delete.c
trunk/src/dlg-extract.c
trunk/src/dlg-new.c
trunk/src/dlg-new.h
trunk/src/dlg-open-with.c
trunk/src/dlg-password.c
trunk/src/dlg-prop.c
trunk/src/dlg-update.c
trunk/src/gtk-utils.c
trunk/src/gtk-utils.h
trunk/src/main.c
Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Sat Jan 31 11:31:25 2009
@@ -29,12 +29,10 @@
GTK_2_12_REQUIRED=2.12.0
GTK_2_13_REQUIRED=2.13.0
GCONF_REQUIRED=2.6.0
-LIBGLADE_REQUIRED=2.4.0
NAUTILUS_REQUIRED=2.22.2
AC_SUBST(GLIB_REQUIRED)
AC_SUBST(GIO_REQUIRED)
-AC_SUBST(LIBGLADE_REQUIRED)
AC_SUBST(NAUTILUS_REQUIRED)
dnl ===========================================================================
@@ -45,6 +43,21 @@
dnl ===========================================================================
+DATADIR="${datadir}"
+AC_SUBST(DATADIR)
+
+AC_ARG_ENABLE(run_in_place,
+ AC_HELP_STRING([--enable-run-in-place],[load ui data and extensions from the source tree]),
+ [case "${enableval}" in
+ yes) enable_run_in_place=yes ;;
+ no) enable_run_in_place=no ;;
+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-run-in-place]) ;;
+ esac],
+ [enable_run_in_place=no])
+AM_CONDITIONAL(RUN_IN_PLACE, test "x$enable_run_in_place" != xno)
+
+dnl ===========================================================================
+
if pkg-config --atleast-version=$GTK_2_13_REQUIRED gtk+-2.0; then
GTK_REQUIRED=$GTK_2_13_REQUIRED
AC_DEFINE(GTK_2_13, "1", [Use the Gtk+ 2.13 series])
@@ -58,8 +71,7 @@
gthread-2.0 \
gio-unix-2.0 >= $GIO_REQUIRED \
gtk+-2.0 >= $GTK_REQUIRED \
- gconf-2.0 >= $GCONF_REQUIRED \
- libglade-2.0 >= $LIBGLADE_REQUIRED)
+ gconf-2.0 >= $GCONF_REQUIRED)
AC_SUBST(FR_CFLAGS)
AC_SUBST(FR_LIBS)
@@ -133,7 +145,7 @@
file-roller.spec
data/Makefile
data/file-roller.desktop.in
- data/glade/Makefile
+ data/ui/Makefile
data/icons/Makefile
data/icons/16x16/Makefile
data/icons/16x16/actions/Makefile
@@ -163,4 +175,5 @@
Internal mkdtemp: ${mkdtemp_missing}
Nautilus support: ${build_nautilus_actions}
Gtk+ series: ${GTK_REQUIRED}
+ Run in place ${enable_run_in_place}
"
Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am (original)
+++ trunk/data/Makefile.am Sat Jan 31 11:31:25 2009
@@ -1,6 +1,6 @@
@INTLTOOL_DESKTOP_RULE@
-SUBDIRS = glade icons
+SUBDIRS = ui icons
desktop_in_in_files = file-roller.desktop.in.in
desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
Added: trunk/data/ui/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/data/ui/Makefile.am Sat Jan 31 11:31:25 2009
@@ -0,0 +1,13 @@
+uidir = $(datadir)/file-roller/ui
+ui_DATA = \
+ add-options.ui \
+ batch-add-files.ui \
+ batch-password.ui \
+ delete.ui \
+ new.ui \
+ open-with.ui \
+ password.ui \
+ properties.ui \
+ update.ui
+
+EXTRA_DIST = $(ui_DATA)
Added: trunk/data/ui/Makefile.in
==============================================================================
--- (empty file)
+++ trunk/data/ui/Makefile.in Sat Jan 31 11:31:25 2009
@@ -0,0 +1,431 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = data/ui
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(uidir)"
+uiDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(ui_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIR = @DATADIR@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+FR_CFLAGS = @FR_CFLAGS@
+FR_LIBS = @FR_LIBS@
+GCONFTOOL = @GCONFTOOL@
+GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIO_REQUIRED = @GIO_REQUIRED@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GLIB_REQUIRED = @GLIB_REQUIRED@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+GTK_REQUIRED = @GTK_REQUIRED@
+HELP_DIR = @HELP_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+NAUTILUS_EXTENSION_DIR = @NAUTILUS_EXTENSION_DIR@
+NAUTILUS_LIBS = @NAUTILUS_LIBS@
+NAUTILUS_REQUIRED = @NAUTILUS_REQUIRED@
+NMEDIT = @NMEDIT@
+OBJEXT = @OBJEXT@
+OMF_DIR = @OMF_DIR@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+uidir = $(datadir)/file-roller/ui
+ui_DATA = \
+ add-options.ui \
+ batch-add-files.ui \
+ batch-password.ui \
+ delete.ui \
+ new.ui \
+ open-with.ui \
+ password.ui \
+ properties.ui \
+ update.ui
+
+EXTRA_DIST = $(ui_DATA)
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/ui/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu data/ui/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+install-uiDATA: $(ui_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)"
+ @list='$(ui_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(uiDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(uidir)/$$f'"; \
+ $(uiDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(uidir)/$$f"; \
+ done
+
+uninstall-uiDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(ui_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(uidir)/$$f'"; \
+ rm -f "$(DESTDIR)$(uidir)/$$f"; \
+ done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ else \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+ for dir in "$(DESTDIR)$(uidir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-uiDATA
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-uiDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ install-uiDATA installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ uninstall uninstall-am uninstall-uiDATA
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
Added: trunk/data/ui/add-options.ui
==============================================================================
--- (empty file)
+++ trunk/data/ui/add-options.ui Sat Jan 31 11:31:25 2009
@@ -0,0 +1,125 @@
+<?xml version="1.0"?>
+<interface>
+ <requires lib="gtk+" version="2.14"/>
+ <!-- interface-naming-policy toplevel-contextual -->
+ <object class="GtkDialog" id="add_options_dialog">
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Load Options</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="type_hint">dialog</property>
+ <property name="has_separator">False</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox19">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkTable" id="table4">
+ <property name="visible">True</property>
+ <property name="border_width">5</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">6</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkVBox" id="vbox18">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkButton" id="aod_remove_button">
+ <property name="label">gtk-remove</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow11">
+ <property name="width_request">280</property>
+ <property name="height_request">150</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTreeView" id="aod_treeview">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="headers_visible">False</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area19">
+ <property name="visible">True</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="aod_cancelbutton">
+ <property name="label">gtk-close</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="aod_okbutton">
+ <property name="label">gtk-apply</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-7">aod_cancelbutton</action-widget>
+ <action-widget response="-10">aod_okbutton</action-widget>
+ </action-widgets>
+ </object>
+</interface>
Added: trunk/data/ui/batch-add-files.ui
==============================================================================
--- (empty file)
+++ trunk/data/ui/batch-add-files.ui Sat Jan 31 11:31:25 2009
@@ -0,0 +1,369 @@
+<?xml version="1.0"?>
+<interface>
+ <requires lib="gtk+" version="2.14"/>
+ <!-- interface-naming-policy toplevel-contextual -->
+ <object class="GtkDialog" id="batch_add_files_dialog">
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Create Archive</property>
+ <property name="resizable">False</property>
+ <property name="window_position">center</property>
+ <property name="type_hint">normal</property>
+ <property name="has_separator">False</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox11">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkHBox" id="hbox28">
+ <property name="visible">True</property>
+ <property name="border_width">5</property>
+ <property name="spacing">18</property>
+ <child>
+ <object class="GtkImage" id="a_add_image">
+ <property name="width_request">64</property>
+ <property name="height_request">64</property>
+ <property name="visible">True</property>
+ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox8">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkTable" id="table5">
+ <property name="visible">True</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">12</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="a_archive_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Archive:</property>
+ <property name="use_underline">True</property>
+ <property name="justify">center</property>
+ <property name="mnemonic_widget">a_add_to_entry</property>
+ </object>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="a_location_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Location:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">a_location_filechooserbutton</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFileChooserButton" id="a_location_filechooserbutton">
+ <property name="visible">True</property>
+ <property name="action">select-folder</property>
+ <property name="local_only">False</property>
+ <property name="title" translatable="yes">Location</property>
+ <property name="width_chars">15</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox30">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkEntry" id="a_add_to_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="activates_default">True</property>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="a_archive_type_box">
+ <property name="visible">True</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkExpander" id="a_other_options_expander">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="expanded">True</property>
+ <child>
+ <object class="GtkAlignment" id="alignment2">
+ <property name="visible">True</property>
+ <property name="top_padding">6</property>
+ <child>
+ <object class="GtkTable" id="table6">
+ <property name="visible">True</property>
+ <property name="n_rows">3</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">12</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="a_password_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Password:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">a_password_entry</property>
+ </object>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="a_password_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="visibility">False</property>
+ <property name="invisible_char">●</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="a_encrypt_header_checkbutton">
+ <property name="label" translatable="yes">_Encrypt the file list too</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="a_volume_box">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkCheckButton" id="a_volume_checkbutton">
+ <property name="label" translatable="yes">Split in _volumes of</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="a_volume_spinbutton">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment"></property>
+ <property name="climb_rate">1</property>
+ <property name="digits">1</property>
+ <property name="numeric">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label50">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes" comments="MB means megabytes">MB</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label48">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Other Options</property>
+ <property name="use_underline">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area11">
+ <property name="visible">True</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="a_cancel_button">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="a_add_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">False</property>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <object class="GtkHBox" id="hbox29">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkImage" id="a_create_image">
+ <property name="visible">True</property>
+ <property name="stock">gtk-ok</property>
+ <property name="icon-size">4</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label45">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">C_reate</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="a_help_button">
+ <property name="label">gtk-help</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="0">a_cancel_button</action-widget>
+ <action-widget response="0">a_add_button</action-widget>
+ <action-widget response="-11">a_help_button</action-widget>
+ </action-widgets>
+ </object>
+</interface>
Added: trunk/data/ui/batch-password.ui
==============================================================================
--- (empty file)
+++ trunk/data/ui/batch-password.ui Sat Jan 31 11:31:25 2009
@@ -0,0 +1,164 @@
+<?xml version="1.0"?>
+<interface>
+ <requires lib="gtk+" version="2.14"/>
+ <!-- interface-naming-policy toplevel-contextual -->
+ <object class="GtkDialog" id="password_dialog">
+ <property name="border_width">5</property>
+ <property name="resizable">False</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="type_hint">dialog</property>
+ <property name="has_separator">False</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox15">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkVBox" id="vbox11">
+ <property name="visible">True</property>
+ <property name="border_width">5</property>
+ <property name="spacing">18</property>
+ <child>
+ <object class="GtkHBox" id="hbox29">
+ <property name="visible">True</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkImage" id="image2">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="stock">gtk-dialog-authentication</property>
+ <property name="icon-size">6</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox18">
+ <property name="visible">True</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="label44">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes"><span weight="bold" size="larger">Password required</span></property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="pw_password_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox18">
+ <property name="visible">True</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="label34">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Password:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">pw_password_entry</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="pw_password_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="visibility">False</property>
+ <property name="invisible_char">●</property>
+ <property name="activates_default">True</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area15">
+ <property name="visible">True</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="pw_cancel_button">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="pw_ok_button">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">pw_cancel_button</action-widget>
+ <action-widget response="-5">pw_ok_button</action-widget>
+ </action-widgets>
+ </object>
+</interface>
Added: trunk/data/ui/delete.ui
==============================================================================
--- (empty file)
+++ trunk/data/ui/delete.ui Sat Jan 31 11:31:25 2009
@@ -0,0 +1,141 @@
+<?xml version="1.0"?>
+<interface>
+ <requires lib="gtk+" version="2.14"/>
+ <!-- interface-naming-policy toplevel-contextual -->
+ <object class="GtkDialog" id="delete_dialog">
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Delete</property>
+ <property name="resizable">False</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="type_hint">dialog</property>
+ <property name="has_separator">False</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox14">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkTable" id="table2">
+ <property name="visible">True</property>
+ <property name="border_width">5</property>
+ <property name="n_rows">3</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">12</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkRadioButton" id="d_files_radio">
+ <property name="label" translatable="yes">_Files:</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="d_files_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip_text" translatable="yes">example: *.txt; *.doc</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="d_all_files_radio">
+ <property name="label" translatable="yes">_All files</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">d_files_radio</property>
+ </object>
+ <packing>
+ <property name="right_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="d_selected_files_radio">
+ <property name="label" translatable="yes">_Selected files</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">d_files_radio</property>
+ </object>
+ <packing>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area14">
+ <property name="visible">True</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="d_cancel_button">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="d_ok_button">
+ <property name="label">gtk-delete</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="0">d_cancel_button</action-widget>
+ <action-widget response="0">d_ok_button</action-widget>
+ </action-widgets>
+ </object>
+</interface>
Added: trunk/data/ui/new.ui
==============================================================================
--- (empty file)
+++ trunk/data/ui/new.ui Sat Jan 31 11:31:25 2009
@@ -0,0 +1,273 @@
+<?xml version="1.0"?>
+<interface>
+ <requires lib="gtk+" version="2.14"/>
+ <!-- interface-naming-policy toplevel-contextual -->
+ <object class="GtkFileChooserDialog" id="filechooserdialog">
+ <property name="border_width">5</property>
+ <property name="modal">True</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="type_hint">normal</property>
+ <property name="action">save</property>
+ <property name="do_overwrite_confirmation">True</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox1">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkVBox" id="vbox1">
+ <property name="visible">True</property>
+ <property name="border_width">6</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkHBox" id="hbox1">
+ <property name="visible">True</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="n_archive_type_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Archive _type:</property>
+ <property name="use_markup">True</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="n_archive_type_box">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkExpander" id="n_other_options_expander">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="expanded">True</property>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="top_padding">6</property>
+ <child>
+ <object class="GtkVBox" id="vbox2">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkHBox" id="hbox2">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkTable" id="table1">
+ <property name="visible">True</property>
+ <property name="n_rows">3</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">12</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="n_password_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Password:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">n_password_entry</property>
+ </object>
+ <packing>
+ <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="n_password_entry">
+ <property name="width_request">300</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="visibility">False</property>
+ <property name="invisible_char">●</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="n_encrypt_header_checkbutton">
+ <property name="label" translatable="yes">_Encrypt the file list too</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="n_volume_box">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkCheckButton" id="n_volume_checkbutton">
+ <property name="label" translatable="yes">Split in _volumes of</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="n_volume_spinbutton">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">adjustment1</property>
+ <property name="climb_rate">1</property>
+ <property name="digits">1</property>
+ <property name="numeric">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes" comments="MB means megabytes">MB</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Other Options</property>
+ <property name="use_underline">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area1">
+ <property name="visible">True</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="n_cancel_button">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="n_new_button">
+ <property name="label">gtk-new</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="n_help_button">
+ <property name="label">gtk-help</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">n_cancel_button</action-widget>
+ <action-widget response="-5">n_new_button</action-widget>
+ <action-widget response="-11">n_help_button</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="value">10</property>
+ <property name="lower">0.10000000149</property>
+ <property name="upper">1000</property>
+ <property name="step_increment">0.10000000149</property>
+ <property name="page_increment">10</property>
+ </object>
+</interface>
Added: trunk/data/ui/open-with.ui
==============================================================================
--- (empty file)
+++ trunk/data/ui/open-with.ui Sat Jan 31 11:31:25 2009
@@ -0,0 +1,246 @@
+<?xml version="1.0"?>
+<interface>
+ <requires lib="gtk+" version="2.14"/>
+ <!-- interface-naming-policy toplevel-contextual -->
+ <object class="GtkDialog" id="open_with_dialog">
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Open Files</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="type_hint">dialog</property>
+ <property name="has_separator">False</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox13">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkVBox" id="vbox7">
+ <property name="visible">True</property>
+ <property name="border_width">5</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkVBox" id="vbox16">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label42">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">A_vailable application:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">o_app_list_tree_view</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox25">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow7">
+ <property name="width_request">340</property>
+ <property name="height_request">120</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTreeView" id="o_app_list_tree_view">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="headers_visible">False</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox17">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label44">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">R_ecent applications:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">o_recent_tree_view</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox26">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkVBox" id="vbox9">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow8">
+ <property name="width_request">340</property>
+ <property name="height_request">120</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTreeView" id="o_recent_tree_view">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="headers_visible">False</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox15">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkButton" id="o_del_button">
+ <property name="label">gtk-remove</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox10">
+ <property name="visible">True</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="label24">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Application:</property>
+ <property name="use_underline">True</property>
+ <property name="justify">center</property>
+ <property name="mnemonic_widget">o_app_entry</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="o_app_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="activates_default">True</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area13">
+ <property name="visible">True</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="o_cancel_button">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="o_ok_button">
+ <property name="label">gtk-open</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="0">o_cancel_button</action-widget>
+ <action-widget response="0">o_ok_button</action-widget>
+ </action-widgets>
+ </object>
+</interface>
Added: trunk/data/ui/password.ui
==============================================================================
--- (empty file)
+++ trunk/data/ui/password.ui Sat Jan 31 11:31:25 2009
@@ -0,0 +1,167 @@
+<?xml version="1.0"?>
+<interface>
+ <requires lib="gtk+" version="2.14"/>
+ <!-- interface-naming-policy toplevel-contextual -->
+ <object class="GtkDialog" id="password_dialog">
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Password</property>
+ <property name="resizable">False</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="type_hint">dialog</property>
+ <property name="has_separator">False</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox15">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkVBox" id="vbox11">
+ <property name="visible">True</property>
+ <property name="border_width">5</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkTable" id="table1">
+ <property name="visible">True</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">12</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkCheckButton" id="pw_encrypt_header_checkbutton">
+ <property name="label" translatable="yes">_Encrypt the file list too</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label34">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Password:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">pw_password_entry</property>
+ </object>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="pw_password_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="visibility">False</property>
+ <property name="invisible_char">●</property>
+ <property name="activates_default">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="pw_note_hbox">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkImage" id="image2">
+ <property name="visible">True</property>
+ <property name="stock">gtk-dialog-info</property>
+ <property name="icon-size">6</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label33">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><i><b>Note:</b> the password will be used to encrypt files you add to the current archive, and to decrypt files you extract from the current archive. When the archive is closed the password will be deleted.</i></property>
+ <property name="use_markup">True</property>
+ <property name="wrap">True</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area15">
+ <property name="visible">True</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="pw_cancel_button">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="pw_ok_button">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">pw_cancel_button</action-widget>
+ <action-widget response="-5">pw_ok_button</action-widget>
+ </action-widgets>
+ </object>
+</interface>
Added: trunk/data/ui/properties.ui
==============================================================================
--- (empty file)
+++ trunk/data/ui/properties.ui Sat Jan 31 11:31:25 2009
@@ -0,0 +1,275 @@
+<?xml version="1.0"?>
+<interface>
+ <requires lib="gtk+" version="2.14"/>
+ <!-- interface-naming-policy toplevel-contextual -->
+ <object class="GtkDialog" id="prop_dialog">
+ <property name="width_request">400</property>
+ <property name="border_width">5</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="type_hint">dialog</property>
+ <property name="has_separator">False</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox12">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkTable" id="table3">
+ <property name="visible">True</property>
+ <property name="border_width">5</property>
+ <property name="n_rows">7</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">12</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="p_name_label_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="justify">center</property>
+ </object>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="p_size_label_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="justify">center</property>
+ </object>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="p_size_label">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="p_path_label_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="justify">center</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="p_cratio_label">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="p_cratio_label_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="p_date_label">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="p_date_label_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="justify">center</property>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="p_uncomp_size_label_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="p_uncomp_size_label">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="p_files_label">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="p_files_label_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="justify">center</property>
+ </object>
+ <packing>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="p_path_label">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
+ <property name="selectable">True</property>
+ <property name="ellipsize">start</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="p_name_label">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
+ <property name="selectable">True</property>
+ <property name="ellipsize">end</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area12">
+ <property name="visible">True</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="p_help_button">
+ <property name="label">gtk-help</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="p_ok_button">
+ <property name="label">gtk-close</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-11">p_help_button</action-widget>
+ <action-widget response="-7">p_ok_button</action-widget>
+ </action-widgets>
+ </object>
+</interface>
Added: trunk/data/ui/update.ui
==============================================================================
--- (empty file)
+++ trunk/data/ui/update.ui Sat Jan 31 11:31:25 2009
@@ -0,0 +1,357 @@
+<?xml version="1.0"?>
+<interface>
+ <requires lib="gtk+" version="2.14"/>
+ <!-- interface-naming-policy toplevel-contextual -->
+ <object class="GtkDialog" id="update_file_dialog">
+ <property name="border_width">5</property>
+ <property name="type_hint">dialog</property>
+ <property name="has_separator">False</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox1">
+ <property name="visible">True</property>
+ <property name="spacing">14</property>
+ <child>
+ <object class="GtkHBox" id="hbox2">
+ <property name="visible">True</property>
+ <property name="border_width">5</property>
+ <property name="spacing">18</property>
+ <child>
+ <object class="GtkVBox" id="vbox1">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkImage" id="image2">
+ <property name="visible">True</property>
+ <property name="stock">gtk-dialog-warning</property>
+ <property name="icon-size">6</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox4">
+ <property name="visible">True</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="update_file_primary_text_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="use_markup">True</property>
+ <property name="wrap">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">The file has been modified with an external application. If you don't update the version in the archive, all of your changes will be lost.</property>
+ <property name="wrap">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area1">
+ <property name="visible">True</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="update_file_cancel_button">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="update_file_ok_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <object class="GtkHBox" id="hbox1">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkImage" id="image1">
+ <property name="visible">True</property>
+ <property name="stock">gtk-save</property>
+ <property name="icon-size">4</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Update</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">update_file_cancel_button</action-widget>
+ <action-widget response="-5">update_file_ok_button</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="update_files_dialog">
+ <property name="border_width">5</property>
+ <property name="type_hint">dialog</property>
+ <property name="has_separator">False</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="vbox5">
+ <property name="visible">True</property>
+ <property name="spacing">14</property>
+ <child>
+ <object class="GtkHBox" id="hbox4">
+ <property name="visible">True</property>
+ <property name="border_width">5</property>
+ <property name="spacing">18</property>
+ <child>
+ <object class="GtkVBox" id="vbox6">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkImage" id="image4">
+ <property name="visible">True</property>
+ <property name="stock">gtk-dialog-warning</property>
+ <property name="icon-size">6</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox7">
+ <property name="visible">True</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="update_files_primary_text_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="use_markup">True</property>
+ <property name="wrap">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="update_files_secondary_text_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="wrap">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox8">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label9">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">S_elect the files you want to update:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">update_files_treeview</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow2">
+ <property name="width_request">400</property>
+ <property name="height_request">120</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">never</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTreeView" id="update_files_treeview">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="headers_visible">False</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="hbuttonbox1">
+ <property name="visible">True</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="update_files_cancel_button">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="update_files_ok_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <child>
+ <object class="GtkAlignment" id="alignment2">
+ <property name="visible">True</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <object class="GtkHBox" id="hbox3">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkImage" id="image3">
+ <property name="visible">True</property>
+ <property name="stock">gtk-save</property>
+ <property name="icon-size">4</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Update</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">update_files_cancel_button</action-widget>
+ <action-widget response="-5">update_files_ok_button</action-widget>
+ </action-widgets>
+ </object>
+</interface>
Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in (original)
+++ trunk/po/POTFILES.in Sat Jan 31 11:31:25 2009
@@ -7,15 +7,15 @@
copy-n-paste/eggsmclient.h
copy-n-paste/eggsmclient-private.h
copy-n-paste/eggsmclient-xsmp.c
-data/glade/add-options.glade
-data/glade/batch-add-files.glade
-data/glade/batch-password.glade
-data/glade/delete.glade
-data/glade/new.glade
-data/glade/open-with.glade
-data/glade/password.glade
-data/glade/properties.glade
-data/glade/update.glade
+data/ui/add-options.ui
+data/ui/batch-add-files.ui
+data/ui/batch-password.ui
+data/ui/delete.ui
+data/ui/new.ui
+data/ui/open-with.ui
+data/ui/password.ui
+data/ui/properties.ui
+data/ui/update.ui
data/file-roller.desktop.in.in
nautilus/fileroller-module.c
nautilus/nautilus-fileroller.h
Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am (original)
+++ trunk/src/Makefile.am Sat Jan 31 11:31:25 2009
@@ -14,7 +14,11 @@
DISABLE_DEPRECATED =
endif
-gladedir = $(datadir)/file-roller/glade
+if RUN_IN_PLACE
+uidir = $(top_srcdir)/data/ui
+else
+uidir = $(datadir)/file-roller/ui
+endif
INCLUDES = \
-I$(top_srcdir)/copy-n-paste/ \
@@ -23,6 +27,7 @@
-DFR_PREFIX=\"$(prefix)\" \
-DFR_SYSCONFDIR=\"$(sysconfdir)\" \
-DFR_DATADIR=\"$(datadir)\" \
+ -DUI_DIR=\"$(uidir)\" \
-DFR_LIBDIR=\"$(libdir)\" \
-DPKG_DATA_DIR=\"$(pkgdatadir)\" \
-DPIXMAPSDIR=\""$(datadir)/pixmaps"\" \
Modified: trunk/src/dlg-add-files.c
==============================================================================
--- trunk/src/dlg-add-files.c (original)
+++ trunk/src/dlg-add-files.c Sat Jan 31 11:31:25 2009
@@ -23,10 +23,8 @@
#include <config.h>
#include <string.h>
#include <unistd.h>
-
#include <glib/gi18n.h>
#include <gtk/gtk.h>
-#include <glade/glade.h>
#include "file-utils.h"
#include "fr-stock.h"
#include "fr-window.h"
Modified: trunk/src/dlg-add-folder.c
==============================================================================
--- trunk/src/dlg-add-folder.c (original)
+++ trunk/src/dlg-add-folder.c Sat Jan 31 11:31:25 2009
@@ -26,7 +26,6 @@
#include <glib/gi18n.h>
#include <gtk/gtk.h>
-#include <glade/glade.h>
#include <gio/gio.h>
#include "dlg-add-folder.h"
#include "file-utils.h"
@@ -36,8 +35,6 @@
#include "gtk-utils.h"
#include "preferences.h"
-#define GLADE_FILE "add-options.glade"
-
typedef struct {
FrWindow *window;
GtkWidget *dialog;
@@ -645,7 +642,7 @@
typedef struct {
DialogData *data;
- GladeXML *gui;
+ GtkBuilder *builder;
GtkWidget *dialog;
GtkWidget *aod_treeview;
GtkTreeModel *aod_model;
@@ -656,7 +653,7 @@
aod_destroy_cb (GtkWidget *widget,
LoadOptionsDialogData *aod_data)
{
- g_object_unref (aod_data->gui);
+ g_object_unref (aod_data->builder);
g_free (aod_data);
}
@@ -794,21 +791,20 @@
aod_data = g_new0 (LoadOptionsDialogData, 1);
aod_data->data = data;
- aod_data->gui = glade_xml_new (GLADEDIR "/" GLADE_FILE , NULL, NULL);
- if (! aod_data->gui) {
- g_warning ("Could not find " GLADE_FILE "\n");
+ aod_data->builder = _gtk_builder_new_from_file ("add-options.ui");
+ if (aod_data->builder == NULL) {
g_free (aod_data);
return;
}
/* Get the widgets. */
- aod_data->dialog = glade_xml_get_widget (aod_data->gui, "add_options_dialog");
- aod_data->aod_treeview = glade_xml_get_widget (aod_data->gui, "aod_treeview");
+ aod_data->dialog = _gtk_builder_get_widget (aod_data->builder, "add_options_dialog");
+ aod_data->aod_treeview = _gtk_builder_get_widget (aod_data->builder, "aod_treeview");
- ok_button = glade_xml_get_widget (aod_data->gui, "aod_okbutton");
- cancel_button = glade_xml_get_widget (aod_data->gui, "aod_cancelbutton");
- remove_button = glade_xml_get_widget (aod_data->gui, "aod_remove_button");
+ ok_button = _gtk_builder_get_widget (aod_data->builder, "aod_okbutton");
+ cancel_button = _gtk_builder_get_widget (aod_data->builder, "aod_cancelbutton");
+ remove_button = _gtk_builder_get_widget (aod_data->builder, "aod_remove_button");
/* Set the signals handlers. */
Modified: trunk/src/dlg-ask-password.c
==============================================================================
--- trunk/src/dlg-ask-password.c (original)
+++ trunk/src/dlg-ask-password.c Sat Jan 31 11:31:25 2009
@@ -24,22 +24,19 @@
#include <string.h>
#include <gtk/gtk.h>
-#include <glade/glade.h>
#include "file-utils.h"
#include "glib-utils.h"
#include "gtk-utils.h"
#include "fr-window.h"
-#define PROP_GLADE_FILE "batch-password.glade"
-
typedef enum {
FR_PASSWORD_TYPE_MAIN,
FR_PASSWORD_TYPE_PASTE_FROM
} FrPasswordType;
typedef struct {
- GladeXML *gui;
+ GtkBuilder *builder;
FrWindow *window;
FrPasswordType pwd_type;
GtkWidget *dialog;
@@ -52,7 +49,7 @@
destroy_cb (GtkWidget *widget,
DialogData *data)
{
- g_object_unref (data->gui);
+ g_object_unref (data->builder);
g_free (data);
}
@@ -100,20 +97,22 @@
char *name;
data = g_new0 (DialogData, 1);
- data->window = window;
- data->pwd_type = pwd_type;
- data->gui = glade_xml_new (GLADEDIR "/" PROP_GLADE_FILE , NULL, NULL);
- if (!data->gui) {
- g_warning ("Could not find " PROP_GLADE_FILE "\n");
+
+ data->builder = _gtk_builder_new_from_file ("batch-password.ui");
+ if (data->builder == NULL) {
+ g_free (data);
return;
}
+ data->window = window;
+ data->pwd_type = pwd_type;
+
/* Get the widgets. */
- data->dialog = glade_xml_get_widget (data->gui, "password_dialog");
- data->pw_password_entry = glade_xml_get_widget (data->gui, "pw_password_entry");
+ data->dialog = _gtk_builder_get_widget (data->builder, "password_dialog");
+ data->pw_password_entry = _gtk_builder_get_widget (data->builder, "pw_password_entry");
- label = glade_xml_get_widget (data->gui, "pw_password_label");
+ label = _gtk_builder_get_widget (data->builder, "pw_password_label");
/* Set widgets data. */
Modified: trunk/src/dlg-batch-add.c
==============================================================================
--- trunk/src/dlg-batch-add.c (original)
+++ trunk/src/dlg-batch-add.c Sat Jan 31 11:31:25 2009
@@ -24,11 +24,8 @@
#include <string.h>
#include <math.h>
#include <unistd.h>
-
#include <gio/gio.h>
#include <gtk/gtk.h>
-#include <glade/glade.h>
-
#include "file-utils.h"
#include "fr-stock.h"
#include "gconf-utils.h"
@@ -40,7 +37,6 @@
#include "main.h"
-#define GLADE_FILE "batch-add-files.glade"
#define ARCHIVE_ICON_SIZE (48)
#define DEFAULT_EXTENSION ".tar.gz"
#define BAD_CHARS "/\\*"
@@ -48,7 +44,7 @@
typedef struct {
FrWindow *window;
- GladeXML *gui;
+ GtkBuilder *builder;
int *supported_types;
GtkWidget *dialog;
@@ -96,7 +92,7 @@
fr_window_stop_batch (data->window);
}
- g_object_unref (data->gui);
+ g_object_unref (data->builder);
g_free (data);
}
@@ -487,9 +483,9 @@
data = g_new0 (DialogData, 1);
- data->gui = glade_xml_new (GLADEDIR "/" GLADE_FILE , NULL, NULL);
- if (data->gui == NULL) {
- g_warning ("Could not find " GLADE_FILE "\n");
+ data->builder = _gtk_builder_new_from_file ("batch-add-files.ui");
+ if (data->builder == NULL) {
+ g_free (data);
return;
}
@@ -500,31 +496,31 @@
/* Get the widgets. */
- data->dialog = glade_xml_get_widget (data->gui, "batch_add_files_dialog");
- data->a_add_to_entry = glade_xml_get_widget (data->gui, "a_add_to_entry");
- data->a_location_filechooserbutton = glade_xml_get_widget (data->gui, "a_location_filechooserbutton");
- data->a_password_entry = glade_xml_get_widget (data->gui, "a_password_entry");
- data->a_password_label = glade_xml_get_widget (data->gui, "a_password_label");
- data->a_other_options_expander = glade_xml_get_widget (data->gui, "a_other_options_expander");
- data->a_encrypt_header_checkbutton = glade_xml_get_widget (data->gui, "a_encrypt_header_checkbutton");
-
- data->a_volume_checkbutton = glade_xml_get_widget (data->gui, "a_volume_checkbutton");
- data->a_volume_spinbutton = glade_xml_get_widget (data->gui, "a_volume_spinbutton");
- data->a_volume_box = glade_xml_get_widget (data->gui, "a_volume_box");
-
- add_button = glade_xml_get_widget (data->gui, "a_add_button");
- cancel_button = glade_xml_get_widget (data->gui, "a_cancel_button");
- help_button = glade_xml_get_widget (data->gui, "a_help_button");
- a_archive_type_box = glade_xml_get_widget (data->gui, "a_archive_type_box");
+ data->dialog = _gtk_builder_get_widget (data->builder, "batch_add_files_dialog");
+ data->a_add_to_entry = _gtk_builder_get_widget (data->builder, "a_add_to_entry");
+ data->a_location_filechooserbutton = _gtk_builder_get_widget (data->builder, "a_location_filechooserbutton");
+ data->a_password_entry = _gtk_builder_get_widget (data->builder, "a_password_entry");
+ data->a_password_label = _gtk_builder_get_widget (data->builder, "a_password_label");
+ data->a_other_options_expander = _gtk_builder_get_widget (data->builder, "a_other_options_expander");
+ data->a_encrypt_header_checkbutton = _gtk_builder_get_widget (data->builder, "a_encrypt_header_checkbutton");
+
+ data->a_volume_checkbutton = _gtk_builder_get_widget (data->builder, "a_volume_checkbutton");
+ data->a_volume_spinbutton = _gtk_builder_get_widget (data->builder, "a_volume_spinbutton");
+ data->a_volume_box = _gtk_builder_get_widget (data->builder, "a_volume_box");
+
+ add_button = _gtk_builder_get_widget (data->builder, "a_add_button");
+ cancel_button = _gtk_builder_get_widget (data->builder, "a_cancel_button");
+ help_button = _gtk_builder_get_widget (data->builder, "a_help_button");
+ a_archive_type_box = _gtk_builder_get_widget (data->builder, "a_archive_type_box");
- data->add_image = glade_xml_get_widget (data->gui, "a_add_image");
+ data->add_image = _gtk_builder_get_widget (data->builder, "a_add_image");
/* Set widgets data. */
size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
- gtk_size_group_add_widget (size_group, glade_xml_get_widget (data->gui, "a_archive_label"));
- gtk_size_group_add_widget (size_group, glade_xml_get_widget (data->gui, "a_location_label"));
- gtk_size_group_add_widget (size_group, glade_xml_get_widget (data->gui, "a_password_label"));
+ gtk_size_group_add_widget (size_group, _gtk_builder_get_widget (data->builder, "a_archive_label"));
+ gtk_size_group_add_widget (size_group, _gtk_builder_get_widget (data->builder, "a_location_label"));
+ gtk_size_group_add_widget (size_group, _gtk_builder_get_widget (data->builder, "a_password_label"));
gtk_button_set_use_stock (GTK_BUTTON (add_button), TRUE);
gtk_button_set_label (GTK_BUTTON (add_button), FR_STOCK_CREATE_ARCHIVE);
Modified: trunk/src/dlg-delete.c
==============================================================================
--- trunk/src/dlg-delete.c (original)
+++ trunk/src/dlg-delete.c Sat Jan 31 11:31:25 2009
@@ -22,18 +22,15 @@
#include <config.h>
#include <gtk/gtk.h>
-#include <glade/glade.h>
#include "fr-window.h"
#include "gtk-utils.h"
#include "file-utils.h"
-#define GLADE_FILE "delete.glade"
-
typedef struct {
FrWindow *window;
GList *selected_files;
- GladeXML *gui;
+ GtkBuilder *builder;
GtkWidget *dialog;
GtkWidget *d_all_files_radio;
@@ -49,7 +46,7 @@
DialogData *data)
{
path_list_free (data->selected_files);
- g_object_unref (G_OBJECT (data->gui));
+ g_object_unref (G_OBJECT (data->builder));
g_free (data);
}
@@ -114,26 +111,25 @@
GtkWidget *ok_button;
data = g_new (DialogData, 1);
-
data->window = window;
data->selected_files = selected_files;
- data->gui = glade_xml_new (GLADEDIR "/" GLADE_FILE , NULL, NULL);
- if (!data->gui) {
- g_warning ("Could not find " GLADE_FILE "\n");
+ data->builder = _gtk_builder_new_from_file ("delete.ui");
+ if (data->builder == NULL) {
+ g_free (data);
return;
}
/* Get the widgets. */
- data->dialog = glade_xml_get_widget (data->gui, "delete_dialog");
- data->d_all_files_radio = glade_xml_get_widget (data->gui, "d_all_files_radio");
- data->d_selected_files_radio = glade_xml_get_widget (data->gui, "d_selected_files_radio");
- data->d_files_radio = glade_xml_get_widget (data->gui, "d_files_radio");
- data->d_files_entry = glade_xml_get_widget (data->gui, "d_files_entry");
+ data->dialog = _gtk_builder_get_widget (data->builder, "delete_dialog");
+ data->d_all_files_radio = _gtk_builder_get_widget (data->builder, "d_all_files_radio");
+ data->d_selected_files_radio = _gtk_builder_get_widget (data->builder, "d_selected_files_radio");
+ data->d_files_radio = _gtk_builder_get_widget (data->builder, "d_files_radio");
+ data->d_files_entry = _gtk_builder_get_widget (data->builder, "d_files_entry");
- ok_button = glade_xml_get_widget (data->gui, "d_ok_button");
- cancel_button = glade_xml_get_widget (data->gui, "d_cancel_button");
+ ok_button = _gtk_builder_get_widget (data->builder, "d_ok_button");
+ cancel_button = _gtk_builder_get_widget (data->builder, "d_cancel_button");
/* Set widgets data. */
Modified: trunk/src/dlg-extract.c
==============================================================================
--- trunk/src/dlg-extract.c (original)
+++ trunk/src/dlg-extract.c Sat Jan 31 11:31:25 2009
@@ -23,9 +23,6 @@
#include <config.h>
#include <string.h>
#include <unistd.h>
-
-#include <glade/glade.h>
-
#include "file-utils.h"
#include "fr-stock.h"
#include "main.h"
Modified: trunk/src/dlg-new.c
==============================================================================
--- trunk/src/dlg-new.c (original)
+++ trunk/src/dlg-new.c Sat Jan 31 11:31:25 2009
@@ -24,7 +24,6 @@
#include <string.h>
#include <math.h>
#include <unistd.h>
-
#include <gio/gio.h>
#include "dlg-new.h"
#include "file-utils.h"
@@ -34,7 +33,6 @@
#include "preferences.h"
-#define GLADE_FILE "new.glade"
#define DEFAULT_EXTENSION ".tar.gz"
#define BAD_CHARS "/\\*"
#define MEGABYTE (1024 * 1024)
@@ -45,7 +43,7 @@
destroy_cb (GtkWidget *widget,
DlgNewData *data)
{
- g_object_unref (data->gui);
+ g_object_unref (data->builder);
g_free (data);
}
@@ -200,9 +198,9 @@
data = g_new0 (DlgNewData, 1);
- data->gui = glade_xml_new (GLADEDIR "/" GLADE_FILE , NULL, NULL);
- if (data->gui == NULL) {
- g_warning ("Could not find " GLADE_FILE "\n");
+ data->builder = _gtk_builder_new_from_file ("new.ui");
+ if (data->builder == NULL) {
+ g_free (data);
return NULL;
}
@@ -212,19 +210,19 @@
/* Get the widgets. */
- data->dialog = glade_xml_get_widget (data->gui, "filechooserdialog");
+ data->dialog = _gtk_builder_get_widget (data->builder, "filechooserdialog");
- data->n_password_entry = glade_xml_get_widget (data->gui, "n_password_entry");
- data->n_password_label = glade_xml_get_widget (data->gui, "n_password_label");
- data->n_other_options_expander = glade_xml_get_widget (data->gui, "n_other_options_expander");
- data->n_encrypt_header_checkbutton = glade_xml_get_widget (data->gui, "n_encrypt_header_checkbutton");
-
- data->n_volume_checkbutton = glade_xml_get_widget (data->gui, "n_volume_checkbutton");
- data->n_volume_spinbutton = glade_xml_get_widget (data->gui, "n_volume_spinbutton");
- data->n_volume_box = glade_xml_get_widget (data->gui, "n_volume_box");
+ data->n_password_entry = _gtk_builder_get_widget (data->builder, "n_password_entry");
+ data->n_password_label = _gtk_builder_get_widget (data->builder, "n_password_label");
+ data->n_other_options_expander = _gtk_builder_get_widget (data->builder, "n_other_options_expander");
+ data->n_encrypt_header_checkbutton = _gtk_builder_get_widget (data->builder, "n_encrypt_header_checkbutton");
+
+ data->n_volume_checkbutton = _gtk_builder_get_widget (data->builder, "n_volume_checkbutton");
+ data->n_volume_spinbutton = _gtk_builder_get_widget (data->builder, "n_volume_spinbutton");
+ data->n_volume_box = _gtk_builder_get_widget (data->builder, "n_volume_box");
- n_archive_type_box = glade_xml_get_widget (data->gui, "n_archive_type_box");
- n_new_button = glade_xml_get_widget (data->gui, "n_new_button");
+ n_archive_type_box = _gtk_builder_get_widget (data->builder, "n_archive_type_box");
+ n_new_button = _gtk_builder_get_widget (data->builder, "n_new_button");
/* Set widgets data. */
@@ -257,8 +255,8 @@
/**/
size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
- gtk_size_group_add_widget (size_group, glade_xml_get_widget (data->gui, "n_archive_type_label"));
- gtk_size_group_add_widget (size_group, glade_xml_get_widget (data->gui, "n_password_label"));
+ gtk_size_group_add_widget (size_group, _gtk_builder_get_widget (data->builder, "n_archive_type_label"));
+ gtk_size_group_add_widget (size_group, _gtk_builder_get_widget (data->builder, "n_password_label"));
gtk_button_set_use_stock (GTK_BUTTON (n_new_button), TRUE);
gtk_button_set_label (GTK_BUTTON (n_new_button), FR_STOCK_CREATE_ARCHIVE);
Modified: trunk/src/dlg-new.h
==============================================================================
--- trunk/src/dlg-new.h (original)
+++ trunk/src/dlg-new.h Sat Jan 31 11:31:25 2009
@@ -24,7 +24,6 @@
#define DLG_NEW_H
#include <gtk/gtk.h>
-#include <glade/glade.h>
#include "fr-window.h"
@@ -34,7 +33,7 @@
gboolean can_encrypt;
gboolean can_encrypt_header;
gboolean can_create_volumes;
- GladeXML *gui;
+ GtkBuilder *builder;
GtkWidget *dialog;
GtkWidget *n_archive_type_combo_box;
Modified: trunk/src/dlg-open-with.c
==============================================================================
--- trunk/src/dlg-open-with.c (original)
+++ trunk/src/dlg-open-with.c Sat Jan 31 11:31:25 2009
@@ -24,7 +24,6 @@
#include <string.h>
#include <gtk/gtk.h>
-#include <glade/glade.h>
#include "file-utils.h"
#include "gconf-utils.h"
#include "glib-utils.h"
@@ -33,14 +32,13 @@
#include "fr-window.h"
-#define GLADE_FILE "open-with.glade"
#define TEMP_DOCS "temp_docs"
enum { ICON_COLUMN, TEXT_COLUMN, DATA_COLUMN, N_COLUMNS };
typedef struct {
FrWindow *window;
- GladeXML *gui;
+ GtkBuilder *builder;
GtkWidget *dialog;
GtkWidget *o_app_tree_view;
@@ -64,7 +62,7 @@
open_with__destroy_cb (GtkWidget *widget,
DialogData *data)
{
- g_object_unref (G_OBJECT (data->gui));
+ g_object_unref (G_OBJECT (data->builder));
if (data->app_list != NULL)
g_list_free (data->app_list);
@@ -314,23 +312,24 @@
data = g_new0 (DialogData, 1);
- data->file_list = path_list_dup (file_list);
- data->window = window;
- data->gui = glade_xml_new (GLADEDIR "/" GLADE_FILE , NULL, NULL);
- if (! data->gui) {
- g_warning ("Could not find " GLADE_FILE "\n");
+ data->builder = _gtk_builder_new_from_file ("open-with.ui");
+ if (data->builder == NULL) {
+ g_free (data);
return;
}
+ data->file_list = path_list_dup (file_list);
+ data->window = window;
+
/* Get the widgets. */
- data->dialog = glade_xml_get_widget (data->gui, "open_with_dialog");
- data->o_app_tree_view = glade_xml_get_widget (data->gui, "o_app_list_tree_view");
- data->o_recent_tree_view = glade_xml_get_widget (data->gui, "o_recent_tree_view");
- data->o_app_entry = glade_xml_get_widget (data->gui, "o_app_entry");
- data->o_del_button = glade_xml_get_widget (data->gui, "o_del_button");
- data->ok_button = glade_xml_get_widget (data->gui, "o_ok_button");
- cancel_button = glade_xml_get_widget (data->gui, "o_cancel_button");
+ data->dialog = _gtk_builder_get_widget (data->builder, "open_with_dialog");
+ data->o_app_tree_view = _gtk_builder_get_widget (data->builder, "o_app_list_tree_view");
+ data->o_recent_tree_view = _gtk_builder_get_widget (data->builder, "o_recent_tree_view");
+ data->o_app_entry = _gtk_builder_get_widget (data->builder, "o_app_entry");
+ data->o_del_button = _gtk_builder_get_widget (data->builder, "o_del_button");
+ data->ok_button = _gtk_builder_get_widget (data->builder, "o_ok_button");
+ cancel_button = _gtk_builder_get_widget (data->builder, "o_cancel_button");
gtk_widget_set_sensitive (data->ok_button, FALSE);
Modified: trunk/src/dlg-password.c
==============================================================================
--- trunk/src/dlg-password.c (original)
+++ trunk/src/dlg-password.c Sat Jan 31 11:31:25 2009
@@ -22,21 +22,15 @@
#include <config.h>
#include <string.h>
-
#include <gtk/gtk.h>
-#include <glade/glade.h>
#include "fr-window.h"
#include "gconf-utils.h"
#include "gtk-utils.h"
#include "preferences.h"
-
-#define GLADE_FILE "password.glade"
-
-
typedef struct {
- GladeXML *gui;
+ GtkBuilder *builder;
FrWindow *window;
GtkWidget *dialog;
GtkWidget *pw_password_entry;
@@ -49,7 +43,7 @@
destroy_cb (GtkWidget *widget,
DialogData *data)
{
- g_object_unref (data->gui);
+ g_object_unref (data->builder);
g_free (data);
}
@@ -88,18 +82,20 @@
DialogData *data;
data = g_new0 (DialogData, 1);
- data->window = window;
- data->gui = glade_xml_new (GLADEDIR "/" GLADE_FILE , NULL, NULL);
- if (!data->gui) {
- g_warning ("Could not find " GLADE_FILE "\n");
+
+ data->builder = _gtk_builder_new_from_file ("password.ui");
+ if (data->builder == NULL) {
+ g_free (data);
return;
}
+ data->window = window;
+
/* Get the widgets. */
- data->dialog = glade_xml_get_widget (data->gui, "password_dialog");
- data->pw_password_entry = glade_xml_get_widget (data->gui, "pw_password_entry");
- data->pw_encrypt_header_checkbutton = glade_xml_get_widget (data->gui, "pw_encrypt_header_checkbutton");
+ data->dialog = _gtk_builder_get_widget (data->builder, "password_dialog");
+ data->pw_password_entry = _gtk_builder_get_widget (data->builder, "pw_password_entry");
+ data->pw_encrypt_header_checkbutton = _gtk_builder_get_widget (data->builder, "pw_encrypt_header_checkbutton");
/* Set widgets data. */
Modified: trunk/src/dlg-prop.c
==============================================================================
--- trunk/src/dlg-prop.c (original)
+++ trunk/src/dlg-prop.c Sat Jan 31 11:31:25 2009
@@ -22,19 +22,15 @@
#include <config.h>
#include <string.h>
-
#include <gtk/gtk.h>
-#include <glade/glade.h>
#include "glib-utils.h"
#include "file-utils.h"
#include "gtk-utils.h"
#include "fr-window.h"
-#define GLADE_FILE "properties.glade"
-
typedef struct {
- GladeXML *gui;
+ GtkBuilder *builder;
GtkWidget *dialog;
} DialogData;
@@ -44,7 +40,7 @@
destroy_cb (GtkWidget *widget,
DialogData *data)
{
- g_object_unref (G_OBJECT (data->gui));
+ g_object_unref (G_OBJECT (data->builder));
g_free (data);
}
@@ -92,24 +88,24 @@
data = g_new (DialogData, 1);
- data->gui = glade_xml_new (GLADEDIR "/" GLADE_FILE , NULL, NULL);
- if (!data->gui) {
- g_warning ("Could not find " GLADE_FILE "\n");
+ data->builder = _gtk_builder_new_from_file ("properties.ui");
+ if (data->builder == NULL) {
+ g_free (data);
return;
}
/* Get the widgets. */
- data->dialog = glade_xml_get_widget (data->gui, "prop_dialog");
- ok_button = glade_xml_get_widget (data->gui, "p_ok_button");
- help_button = glade_xml_get_widget (data->gui, "p_help_button");
+ data->dialog = _gtk_builder_get_widget (data->builder, "prop_dialog");
+ ok_button = _gtk_builder_get_widget (data->builder, "p_ok_button");
+ help_button = _gtk_builder_get_widget (data->builder, "p_help_button");
/* Set widgets data. */
- label_label = glade_xml_get_widget (data->gui, "p_path_label_label");
+ label_label = _gtk_builder_get_widget (data->builder, "p_path_label_label");
set_label (label_label, _("Location:"));
- label = glade_xml_get_widget (data->gui, "p_path_label");
+ label = _gtk_builder_get_widget (data->builder, "p_path_label");
s = remove_level_from_path (fr_window_get_archive_uri (window));
utf8_name = g_filename_display_name (s);
gtk_label_set_text (GTK_LABEL (label), utf8_name);
@@ -118,10 +114,10 @@
/**/
- label_label = glade_xml_get_widget (data->gui, "p_name_label_label");
+ label_label = _gtk_builder_get_widget (data->builder, "p_name_label_label");
set_label (label_label, _("Name:"));
- label = glade_xml_get_widget (data->gui, "p_name_label");
+ label = _gtk_builder_get_widget (data->builder, "p_name_label");
utf8_name = g_uri_display_basename (fr_window_get_archive_uri (window));
gtk_label_set_text (GTK_LABEL (label), utf8_name);
@@ -133,20 +129,20 @@
/**/
- label_label = glade_xml_get_widget (data->gui, "p_date_label_label");
+ label_label = _gtk_builder_get_widget (data->builder, "p_date_label_label");
set_label (label_label, _("Modified on:"));
- label = glade_xml_get_widget (data->gui, "p_date_label");
+ label = _gtk_builder_get_widget (data->builder, "p_date_label");
s = get_time_string (get_file_mtime (fr_window_get_archive_uri (window)));
gtk_label_set_text (GTK_LABEL (label), s);
g_free (s);
/**/
- label_label = glade_xml_get_widget (data->gui, "p_size_label_label");
+ label_label = _gtk_builder_get_widget (data->builder, "p_size_label_label");
set_label (label_label, _("Archive size:"));
- label = glade_xml_get_widget (data->gui, "p_size_label");
+ label = _gtk_builder_get_widget (data->builder, "p_size_label");
size = get_file_size (fr_window_get_archive_uri (window));
s = g_format_size_for_display (size);
gtk_label_set_text (GTK_LABEL (label), s);
@@ -154,7 +150,7 @@
/**/
- label_label = glade_xml_get_widget (data->gui, "p_uncomp_size_label_label");
+ label_label = _gtk_builder_get_widget (data->builder, "p_uncomp_size_label_label");
set_label (label_label, _("Content size:"));
uncompressed_size = 0;
@@ -167,17 +163,17 @@
}
}
- label = glade_xml_get_widget (data->gui, "p_uncomp_size_label");
+ label = _gtk_builder_get_widget (data->builder, "p_uncomp_size_label");
s = g_format_size_for_display (uncompressed_size);
gtk_label_set_text (GTK_LABEL (label), s);
g_free (s);
/**/
- label_label = glade_xml_get_widget (data->gui, "p_cratio_label_label");
+ label_label = _gtk_builder_get_widget (data->builder, "p_cratio_label_label");
set_label (label_label, _("Compression ratio:"));
- label = glade_xml_get_widget (data->gui, "p_cratio_label");
+ label = _gtk_builder_get_widget (data->builder, "p_cratio_label");
if (uncompressed_size != 0)
ratio = (double) uncompressed_size / size;
@@ -189,10 +185,10 @@
/**/
- label_label = glade_xml_get_widget (data->gui, "p_files_label_label");
+ label_label = _gtk_builder_get_widget (data->builder, "p_files_label_label");
set_label (label_label, _("Number of files:"));
- label = glade_xml_get_widget (data->gui, "p_files_label");
+ label = _gtk_builder_get_widget (data->builder, "p_files_label");
s = g_strdup_printf ("%d", window->archive->command->n_regular_files);
gtk_label_set_text (GTK_LABEL (label), s);
g_free (s);
Modified: trunk/src/dlg-update.c
==============================================================================
--- trunk/src/dlg-update.c (original)
+++ trunk/src/dlg-update.c Sat Jan 31 11:31:25 2009
@@ -22,9 +22,7 @@
#include <config.h>
#include <string.h>
-
#include <gtk/gtk.h>
-#include <glade/glade.h>
#include "dlg-update.h"
#include "file-utils.h"
#include "gconf-utils.h"
@@ -34,13 +32,16 @@
#include "fr-window.h"
-#define GLADE_FILE "update.glade"
-
-enum { IS_SELECTED_COLUMN, NAME_COLUMN, DATA_COLUMN, N_COLUMNS };
+enum {
+ IS_SELECTED_COLUMN,
+ NAME_COLUMN,
+ DATA_COLUMN,
+ N_COLUMNS
+};
typedef struct {
FrWindow *window;
- GladeXML *gui;
+ GtkBuilder *builder;
GtkWidget *update_file_dialog;
GtkWidget *update_file_primary_text_label;
@@ -62,7 +63,7 @@
DialogData *data)
{
fr_window_update_dialog_closed (data->window);
- g_object_unref (G_OBJECT (data->gui));
+ g_object_unref (G_OBJECT (data->builder));
if (data->file_list != NULL)
g_list_free (data->file_list);
g_free (data);
@@ -261,28 +262,29 @@
GtkTreeViewColumn *column;
data = g_new0 (DialogData, 1);
- data->gui = glade_xml_new (GLADEDIR "/" GLADE_FILE , NULL, NULL);
- if (! data->gui) {
- g_warning ("Could not find " GLADE_FILE "\n");
+
+ data->builder = _gtk_builder_new_from_file ("update.ui");
+ if (data->builder == NULL) {
g_free (data);
return NULL;
}
+
data->file_list = NULL;
data->window = window;
/* Get the widgets. */
- data->update_file_dialog = glade_xml_get_widget (data->gui, "update_file_dialog");
- data->update_file_primary_text_label = glade_xml_get_widget (data->gui, "update_file_primary_text_label");
- update_file_ok_button = glade_xml_get_widget (data->gui, "update_file_ok_button");
- update_file_cancel_button = glade_xml_get_widget (data->gui, "update_file_cancel_button");
-
- data->update_files_dialog = glade_xml_get_widget (data->gui, "update_files_dialog");
- data->update_files_primary_text_label = glade_xml_get_widget (data->gui, "update_files_primary_text_label");
- data->update_files_secondary_text_label = glade_xml_get_widget (data->gui, "update_files_secondary_text_label");
- data->update_files_treeview = glade_xml_get_widget (data->gui, "update_files_treeview");
- data->update_files_ok_button = glade_xml_get_widget (data->gui, "update_files_ok_button");
- update_files_cancel_button = glade_xml_get_widget (data->gui, "update_files_cancel_button");
+ data->update_file_dialog = _gtk_builder_get_widget (data->builder, "update_file_dialog");
+ data->update_file_primary_text_label = _gtk_builder_get_widget (data->builder, "update_file_primary_text_label");
+ update_file_ok_button = _gtk_builder_get_widget (data->builder, "update_file_ok_button");
+ update_file_cancel_button = _gtk_builder_get_widget (data->builder, "update_file_cancel_button");
+
+ data->update_files_dialog = _gtk_builder_get_widget (data->builder, "update_files_dialog");
+ data->update_files_primary_text_label = _gtk_builder_get_widget (data->builder, "update_files_primary_text_label");
+ data->update_files_secondary_text_label = _gtk_builder_get_widget (data->builder, "update_files_secondary_text_label");
+ data->update_files_treeview = _gtk_builder_get_widget (data->builder, "update_files_treeview");
+ data->update_files_ok_button = _gtk_builder_get_widget (data->builder, "update_files_ok_button");
+ update_files_cancel_button = _gtk_builder_get_widget (data->builder, "update_files_cancel_button");
/* Set the signals handlers. */
Modified: trunk/src/gtk-utils.c
==============================================================================
--- trunk/src/gtk-utils.c (original)
+++ trunk/src/gtk-utils.c Sat Jan 31 11:31:25 2009
@@ -799,3 +799,30 @@
}
g_free (uri);
}
+
+
+GtkBuilder *
+_gtk_builder_new_from_file (const char *ui_file)
+{
+ char *filename;
+ GtkBuilder *builder;
+ GError *error = NULL;
+
+ filename = g_build_filename (UI_DIR, ui_file, NULL);
+ builder = gtk_builder_new ();
+ if (! gtk_builder_add_from_file (builder, filename, &error)) {
+ g_warning ("%s\n", error->message);
+ g_clear_error (&error);
+ }
+ g_free (filename);
+
+ return builder;
+}
+
+
+GtkWidget *
+_gtk_builder_get_widget (GtkBuilder *builder,
+ const char *name)
+{
+ return (GtkWidget *) gtk_builder_get_object (builder, name);
+}
Modified: trunk/src/gtk-utils.h
==============================================================================
--- trunk/src/gtk-utils.h (original)
+++ trunk/src/gtk-utils.h Sat Jan 31 11:31:25 2009
@@ -83,5 +83,10 @@
GError **error);
void show_help_dialog (GtkWindow *parent,
const char *section);
-
+GtkBuilder *
+ _gtk_builder_new_from_file (const char *filename);
+GtkWidget *
+ _gtk_builder_get_widget (GtkBuilder *builder,
+ const char *name);
+
#endif
Modified: trunk/src/main.c
==============================================================================
--- trunk/src/main.c (original)
+++ trunk/src/main.c Sat Jan 31 11:31:25 2009
@@ -25,10 +25,7 @@
#include <sys/types.h>
#include <signal.h>
#include <stdlib.h>
-
#include <gio/gio.h>
-#include <glade/glade.h>
-
#include "file-utils.h"
#include "glib-utils.h"
#include "fr-command.h"
@@ -306,7 +303,6 @@
gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
PKG_DATA_DIR G_DIR_SEPARATOR_S "icons");
- glade_init ();
fr_stock_init ();
/* init_session (argv); */
startup_id = g_idle_add (startup_cb, NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
