gtranslator r3581 - in trunk: . data data/desktop data/mime data/pixmaps doc/reference help help/C m4 plugins plugins/alternate-language plugins/charmap plugins/dictionary plugins/fullscreen plugins/insert-tags plugins/open-tran plugins/source-code-view plugins/subversion po src src/dialogs src/plugin-system src/toolbareditor src/translation-memory
- From: icq svn gnome org
- To: svn-commits-list gnome org
- Subject: gtranslator r3581 - in trunk: . data data/desktop data/mime data/pixmaps doc/reference help help/C m4 plugins plugins/alternate-language plugins/charmap plugins/dictionary plugins/fullscreen plugins/insert-tags plugins/open-tran plugins/source-code-view plugins/subversion po src src/dialogs src/plugin-system src/toolbareditor src/translation-memory
- Date: Tue, 16 Sep 2008 09:52:02 +0000 (UTC)
Author: icq
Date: Tue Sep 16 09:52:02 2008
New Revision: 3581
URL: http://svn.gnome.org/viewvc/gtranslator?rev=3581&view=rev
Log:
Reverted git commit
Added:
trunk/data/gtranslator-plugin.png
- copied unchanged from r3575, /trunk/data/gtranslator-plugin.png
trunk/help/C/Makefile.am
- copied unchanged from r3575, /trunk/help/C/Makefile.am
trunk/help/C/gtranslator-C.omf
- copied unchanged from r3575, /trunk/help/C/gtranslator-C.omf
trunk/install-sh
- copied unchanged from r3575, /trunk/install-sh
trunk/src/comment.c
- copied unchanged from r3575, /trunk/src/comment.c
trunk/src/comment.h
- copied unchanged from r3575, /trunk/src/comment.h
trunk/src/dialogs/bookmarks-dialog.glade
- copied unchanged from r3575, /trunk/src/dialogs/bookmarks-dialog.glade
Removed:
trunk/data/pixmaps/
trunk/help/gtranslator.omf.in
trunk/m4/
trunk/plugins/dictionary/gnome-dictionary.png
trunk/plugins/open-tran/inkscape.png
trunk/plugins/open-tran/suse.png
trunk/plugins/open-tran/xfce.png
trunk/plugins/source-code-view/
trunk/plugins/subversion/
trunk/src/context.c
trunk/src/context.h
trunk/src/debug.h
trunk/src/dialogs/assistant.c
trunk/src/dialogs/assistant.h
trunk/src/dialogs/jump-dialog.c
trunk/src/dialogs/jump-dialog.glade
trunk/src/dialogs/jump-dialog.h
trunk/src/translation-memory/
Modified:
trunk/ChangeLog
trunk/INSTALL
trunk/Makefile.am
trunk/configure.ac
trunk/data/ChangeLog
trunk/data/Makefile.am
trunk/data/desktop/Makefile.am
trunk/data/desktop/gtranslator.desktop.in.in
trunk/data/gtr-toolbar.xml
trunk/data/gtranslator-ui.xml
trunk/data/mime/Makefile.am
trunk/data/po.lang
trunk/doc/reference/Makefile.am
trunk/doc/reference/gtranslator-docs.sgml
trunk/doc/reference/gtranslator.types
trunk/help/C/gtranslator.xml
trunk/help/Makefile.am
trunk/plugins/Makefile.am
trunk/plugins/alternate-language/alternate-language-panel.c
trunk/plugins/alternate-language/alternate-language-plugin.c
trunk/plugins/charmap/Makefile.am
trunk/plugins/charmap/charmap-plugin.c
trunk/plugins/dictionary/Makefile.am
trunk/plugins/dictionary/dict-panel.c
trunk/plugins/dictionary/dict-panel.h
trunk/plugins/dictionary/dict.gtranslator-plugin.desktop.in
trunk/plugins/dictionary/dictionary-plugin.c
trunk/plugins/dictionary/gdict-sidebar.c
trunk/plugins/fullscreen/fullscreen-plugin.c
trunk/plugins/insert-tags/insert-tags-plugin.c
trunk/plugins/open-tran/Makefile.am
trunk/plugins/open-tran/open-tran-dialog.glade
trunk/plugins/open-tran/open-tran-panel.c
trunk/plugins/open-tran/open-tran-plugin.c
trunk/po/ChangeLog
trunk/po/POTFILES.in
trunk/po/POTFILES.skip
trunk/po/de.po
trunk/po/gl.po
trunk/src/ChangeLog
trunk/src/Makefile.am
trunk/src/actions-edit.c
trunk/src/actions-file.c
trunk/src/actions-go.c
trunk/src/actions-help.c
trunk/src/actions-search.c
trunk/src/actions-view.c
trunk/src/actions.h
trunk/src/application.c
trunk/src/application.h
trunk/src/dialogs/Makefile.am
trunk/src/dialogs/close-confirmation-dialog.c
trunk/src/dialogs/comment-dialog.c
trunk/src/dialogs/file-dialogs.c
trunk/src/dialogs/file-dialogs.h
trunk/src/dialogs/header-dialog.c
trunk/src/dialogs/header-dialog.glade
trunk/src/dialogs/preferences-dialog.c
trunk/src/dialogs/preferences-dialog.glade
trunk/src/dialogs/preferences-dialog.h
trunk/src/dialogs/profile-dialog.c
trunk/src/dialogs/profile-dialog.glade
trunk/src/dialogs/profile-dialog.h
trunk/src/dialogs/search-dialog.c
trunk/src/dialogs/search-dialog.glade
trunk/src/draw-spaces.c
trunk/src/header.c
trunk/src/header.h
trunk/src/history-entry.c
trunk/src/main.c
trunk/src/message-area.c
trunk/src/message-area.h
trunk/src/message-table.c
trunk/src/msg.c
trunk/src/msg.h
trunk/src/notebook.c
trunk/src/notebook.h
trunk/src/plugin-system/module.c
trunk/src/plugin-system/module.h
trunk/src/plugin-system/plugin-info-priv.h
trunk/src/plugin-system/plugin-info.c
trunk/src/plugin-system/plugin-info.h
trunk/src/plugin-system/plugin-manager.c
trunk/src/plugin-system/plugin.c
trunk/src/plugin-system/plugin.h
trunk/src/plugin-system/plugins-engine.c
trunk/src/plugin-system/plugins-engine.h
trunk/src/plugin-system/update-from-gedit.sh
trunk/src/po.c
trunk/src/po.h
trunk/src/prefs-manager-app.c
trunk/src/prefs-manager.c
trunk/src/prefs-manager.h
trunk/src/profile.c
trunk/src/profile.h
trunk/src/statusbar.c
trunk/src/statusbar.h
trunk/src/tab.c
trunk/src/tab.h
trunk/src/toolbareditor/egg-editable-toolbar.c
trunk/src/toolbareditor/egg-editable-toolbar.h
trunk/src/toolbareditor/egg-toolbar-editor.c
trunk/src/toolbareditor/egg-toolbar-editor.h
trunk/src/toolbareditor/egg-toolbars-model.c
trunk/src/toolbareditor/egg-toolbars-model.h
trunk/src/toolbareditor/eggtreemultidnd.c
trunk/src/toolbareditor/eggtreemultidnd.h
trunk/src/utils.c
trunk/src/utils.h
trunk/src/view.c
trunk/src/view.h
trunk/src/window.c
trunk/src/window.h
Modified: trunk/INSTALL
==============================================================================
--- trunk/INSTALL (original)
+++ trunk/INSTALL Tue Sep 16 09:52:02 2008
@@ -1,8 +1,8 @@
Installation Instructions
*************************
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006 Free Software Foundation, Inc.
This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
@@ -10,7 +10,10 @@
Basic Installation
==================
-These are generic installation instructions.
+Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package. The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
@@ -23,9 +26,9 @@
It can also use an optional file (typically called `config.cache'
and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring. (Caching is
+the results of its tests to speed up reconfiguring. Caching is
disabled by default to prevent problems with accidental use of stale
-cache files.)
+cache files.
If you need to do unusual things to compile the package, please try
to figure out how `configure' could check whether to do them, and mail
@@ -35,20 +38,17 @@
may remove or edit it.
The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
+`configure' by a program called `autoconf'. You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
The simplest way to compile this package is:
1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system. If you're
- using `csh' on an old version of System V, you might need to type
- `sh ./configure' instead to prevent `csh' from trying to execute
- `configure' itself.
+ `./configure' to configure the package for your system.
- Running `configure' takes awhile. While running, it prints some
- messages telling which features it is checking for.
+ Running `configure' might take a while. While running, it prints
+ some messages telling which features it is checking for.
2. Type `make' to compile the package.
@@ -78,7 +78,7 @@
by setting variables in the command line or in the environment. Here
is an example:
- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
*Note Defining Variables::, for more details.
@@ -87,17 +87,15 @@
You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
-own directory. To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'. `cd' to the
+own directory. To do this, you can use GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
the `configure' script. `configure' automatically checks for the
source code in the directory that `configure' is in and in `..'.
- If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory. After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
+ With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory. After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
Installation Names
==================
@@ -190,12 +188,12 @@
./configure CC=/usr/local2/bin/gcc
causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script). Here is a another example:
+overridden in the site shell script).
- /bin/bash ./configure CONFIG_SHELL=/bin/bash
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug. Until the bug is fixed you can use this workaround:
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
`configure' Invocation
======================
Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am (original)
+++ trunk/Makefile.am Tue Sep 16 09:52:02 2008
@@ -1,17 +1,14 @@
## the main Makefile.am
-SUBDIRS = data help man src doc plugins po
+SUBDIRS = data doc help man src plugins po
EXTRA_DIST= \
DEPENDS \
HACKING \
gtranslator.spec.in \
gtranslator.spec \
+ intltool-extract.in \
+ intltool-merge.in \
+ intltool-update.in \
omf.make \
- xmldocs.make \
- gnome-doc-utils.make
-
-DISTCLEANFILES = \
- gnome-doc-utils.make
-
-DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --enable-gtk-doc
\ No newline at end of file
+ xmldocs.make
Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Tue Sep 16 09:52:02 2008
@@ -8,9 +8,7 @@
http://bugzilla.gnome.org/enter_bug.cgi?product=gtranslator)
AC_CONFIG_SRCDIR(src/main.c)
-AC_CONFIG_MACRO_DIR([m4])
AM_CONFIG_HEADER(config.h)
-AC_CONFIG_MACRO_DIR ([m4])
GTR_API_VERSION=2.0
AC_SUBST(GTR_API_VERSION)
@@ -38,7 +36,6 @@
AC_ISC_POSIX
AM_PROG_LIBTOOL
AC_TYPE_SIGNAL
-GNOME_DOC_INIT
GTK_DOC_CHECK([1.0])
dnl -------------------------------------------------------------------
@@ -81,13 +78,8 @@
SOURCEVIEW_REQUIRED=2.0.0
GDL_REQUIRED=0.6.0
LIBGUCHARMAP_OPTIONAL=1.6.0
-GDICT_OPTIONAL=0.11.0
+GDICT_OPTIONAL=0.10.8
GTKSPELL_OPTIONAL=2.0.2
-SVN_MAJOR=1
-SVN_MINOR=5
-SVN_PATCH=0
-LIBSVN_OPTIONAL=$SVN_MAJOR.$SVN_MINOR.$SVN_PATCH
-LIBSOUP_OPTIONAL=2.4.0
AC_SUBST(GTK_REQUIRED)
AC_SUBST(GLIB_REQUIRED)
@@ -151,17 +143,6 @@
])
dnl -------------------------------------------------------------------
-dnl Check for libdb >= 4.3
-dnl -------------------------------------------------------------------
-AX_BERKELEY_DB(4.3, [
- AC_DEFINE([HAVE_DB_BERKELEY], 1, [A usable libdb library was found])
- AC_DEFINE_UNQUOTED(DB_HEADER, ["$DB_HEADER"])
- LDFLAGS="$LDFLAGS $DB_LIBS"
-],[
- AC_MSG_ERROR([Cannot find Berkeley DB >= 4.3])
-])
-
-dnl -------------------------------------------------------------------
dnl Check for gtkspell >= 2.0 and use it if found
dnl -------------------------------------------------------------------
have_gtkspell=no
@@ -259,187 +240,16 @@
AM_CONDITIONAL(USE_CHARMAP, test x"$have_gucharmap" = "xyes")
-dnl **********************************************************
-dnl check if we have svn libraries to build subversion plugin
-dnl (stolen from kdevelop ;-)
-dnl **********************************************************
-
-AC_MSG_CHECKING(for Subversion svn-config)
-AC_ARG_WITH(subversion-dir,
- AC_HELP_STRING([--with-subversion-dir=DIR],[where Subversion is installed]),
- [
- SVNCONFIG="$withval/bin/svn-config"
- ])
-
-if test -z "$SVNCONFIG"; then
- _SVNCONFIG="`svn-config --prefix 2> /dev/null`"
- if test -n "$_SVNCONFIG"; then
- SVNCONFIG="$_SVNCONFIG/bin/svn-config"
- fi
-fi
-
-AC_SUBST(SVNCONFIG)
-if test -x "$SVNCONFIG"; then
- SVNLD="`$SVNCONFIG --ldflags 2> /dev/null`"
- SVN_LIB="`$SVNCONFIG --libs --cflags 2> /dev/null` -lsvn_client-1 -lsvn_subr-1"
- dnl ugly hack for subversion svn-config problems in 0.14.x, to be removed when svn-config is fixed
- SVN_INCLUDE="`$SVNCONFIG --includes 2> /dev/null` -I$_SVNCONFIG/include/subversion-1/"
- AC_MSG_RESULT(yes)
-else
- AC_MSG_RESULT(not found)
-
- dnl just a fallback to debian's config so that it works for me :)
- AC_ARG_WITH(svn-include,
- AC_HELP_STRING([--with-svn-include=DIR],[Use the given path to the subversion headers.]),
- [
- if test "$withval" != "yes" -a "$withval" != ""; then
- SVN_INCLUDES=$withval
- fi
- ])
- if test -z "$SVN_INCLUDES"; then
- SVN_INCLUDES="/usr/local/include /usr/include"
- fi
- AC_MSG_CHECKING([for Subversion headers])
- SVN_INCLUDE=""
- for VALUE in $SVN_INCLUDES ; do
- if test -f $VALUE/subversion-1/svn_types.h ; then
- SVN_INCLUDE=$VALUE/subversion-1
- break
- fi
- if test -f $VALUE/svn_types.h ; then
- SVN_INCLUDE=$VALUE
- break
- fi
- done
- if test $SVN_INCLUDE ; then
- AC_MSG_RESULT([found])
- else
- AC_MSG_RESULT([not found])
- fi
- SVN_LIBS="/usr/local/lib /usr/lib"
- AC_ARG_WITH(svn-lib,
- AC_HELP_STRING([--with-svn-lib=DIR],[Use the given path to the subversion libraries.]),
- [
- if test "$withval" != "yes" -a "$withval" != ""; then
- SVN_LIBS=$withval
- fi
- ])
- AC_MSG_CHECKING([for Subversion libraries])
- SVN_LIB=""
- for VALUE in $SVN_LIBS ; do
- if ls $VALUE/libsvn_client-1.* 1>/dev/null 2>&1; then
- SVN_LIB=$VALUE
- break
- fi
- done
- if test $SVN_LIB ; then
- AC_MSG_RESULT([found])
- else
- AC_MSG_RESULT([not found])
- fi
-fi
-
-dnl ******************************************************************
-dnl Check for extra libs required by subversion.
-dnl FIXME: This should actually be done by subversion and not by us.
-dnl ******************************************************************
-
-AC_ARG_ENABLE(plugin-subversion,
- AC_HELP_STRING([--disable-plugin-subversion],[Disable subversion support in GTranslator.]),
- [ if test "$enableval" = "no"; then
- user_disabled_subversion=1
- fi ],
- [ user_disabled_subversion=0 ] )
-
-AC_MSG_CHECKING(if subversion support is disabled)
-if test "$user_disabled_subversion" = 1; then
- AC_MSG_RESULT(yes)
- SVN_INCLUDE=""
- SVN_LIB=""
-else
- AC_MSG_RESULT(no)
-fi
-
-if test -n "$SVN_INCLUDE" ; then
- dnl ------------------------------------
- dnl APR. Required by subversion (devel)
- dnl ------------------------------------
- have_atr=no
- PKG_CHECK_MODULES(APR, \
- apr-1, have_apr=yes, have_apr=no)
- if test x"$have_apr" = "xno"; then
- SVN_INCLUDE=""
- fi
-
- dnl -----------------------------------------
- dnl APR util. Required by subversion (devel)
- dnl------------------------------------------
- have_atr_util=no
- PKG_CHECK_MODULES(APR_UTILS, \
- apr-util-1, have_apr_util=yes, have_apr_util=no)
- if test x"$have_apr_util" = "xno"; then
- SVN_INCLUDE=""
- fi
-
- dnl -----------------------------------------
- dnl NEON. Required by subversion (devel)
- dnl------------------------------------------
- have_neon=no
- PKG_CHECK_MODULES(NEON, \
- neon, have_neon=yes, have_neon=no)
- if test x"$have_neon" = "xno"; then
- SVN_INCLUDE=""
- fi
-
- dnl Make sure our SVN version is high enough
- dnl Eww, eww, eww, this is dirty
- AC_MSG_CHECKING([for subversion >= $LIBSVN_OPTIONAL])
- AC_LANG(C)
- dnl Temporarily set CFLAGS so that include dirs are found
- CFLAGS_TMP=$CFLAGS
- CFLAGS="-I$SVN_INCLUDE $APR_CFLAGS"
- AC_COMPILE_IFELSE(
- [AC_LANG_PROGRAM([[#include <svn_version.h>]],
- [[
- #if (SVN_VER_MAJOR < $SVN_MAJOR) || (SVN_VER_MINOR < $SVN_MINOR) || (SVN_VER_PATCH < $SVN_PATCH)
- # error "Version too low"
- #endif
- ]])], AC_MSG_RESULT(yes), have_svn_version=no)
- if test x"$have_svn_version" = "xno"; then
- AC_MSG_RESULT(no)
- SVN_INCLUDE=""
- fi
- CFLAGS=$CFLAGS_TMP
-fi
-
-dnl ------------------------------------------
-dnl Finally prepare subversion build flags
-dnl ------------------------------------------
-
-if test -n "$SVN_INCLUDE" ; then
- SVN_INCLUDE="-I$SVN_INCLUDE"
- if test x != "x$SVN_LIB" ; then
- SVN_LIB="-L$SVN_LIB $APR_LIBS $APR_UTILS_LIBS -lsvn_client-1 -lsvn_subr-1"
- else
- SVN_LIB="$APR_LIBS $APR_UTILS_LIBS -lsvn_client-1 -lsvn_subr-1"
- fi
- SVN_CFLAGS="$APR_CFLAGS $APR_UTILS_CFLAGS"
-fi
-
-AM_CONDITIONAL(BUILD_SVN, [test -n "$SVN_INCLUDE"])
-AC_SUBST(SVN_INCLUDE)
-AC_SUBST(SVN_LIB)
-AC_SUBST(SVN_CFLAGS)
dnl -------------------------------------------------------------------
dnl Enable debug builds.
dnl -------------------------------------------------------------------
AC_ARG_ENABLE(debug,
- AC_HELP_STRING([--enable-debug],[Turn on debugging flags (default=yes)]),
+ [ --enable-debug Turn on debugging flags (default=yes)],
,enable_debug=yes)
AC_MSG_CHECKING([if a debug friendly version should be build])
if test "x$enable_debug" = "xyes" ; then
- CFLAGS="$CFLAGS -ggdb -DDEBUG"
+ CFLAGS="$CFLAGS -ggdb "
else
CFLAGS="`echo $CFLAGS|sed -e s/-g.//g -e s/-ggdb//g`"
fi
@@ -464,13 +274,13 @@
data/desktop/gtranslator.desktop.in
data/mime/Makefile
data/mime/gtranslator.keys_template
-data/pixmaps/Makefile
data/scripts/Makefile
doc/Makefile
doc/reference/Makefile
doc/reference/version.xml
doc/UMTF/Makefile
help/Makefile
+help/C/Makefile
man/Makefile
man/gtranslator.1
po/Makefile.in
@@ -481,14 +291,10 @@
plugins/fullscreen/Makefile
plugins/insert-tags/Makefile
plugins/open-tran/Makefile
-plugins/source-code-view/Makefile
-plugins/subversion/Makefile
src/Makefile
src/dialogs/Makefile
src/toolbareditor/Makefile
src/plugin-system/Makefile
-src/translation-memory/Makefile
-src/translation-memory/berkeley/Makefile
])
dnl ------------------------------------------------------------------
@@ -504,54 +310,13 @@
debug friendly build : ${enable_debug:-no}
build with deprecation : ${enable_deprecated:-no}
compilation flags : ${CFLAGS}
-------------------------------------------------------------------
-"
-if [ test -n "$SVN_INCLUDE" ]; then
- echo "Building subversion plugin: ............................YES"
-else
- echo "Building subversion plugin: ............................NO"
- echo " Requires apr (>= 0.9.4); http://subversion.org";
- echo " Requires apr-util (>= 0.9.4); http://subversion.org";
- echo " Requires neon (>= 0.24.5); http://subversion.org";
- echo " Requires subversion (>= 1.5.0); http://subversion.org";
-
-fi
-
-if [ test x"$have_gucharmap" = "xyes" ]; then
- echo "Building charmap plugin: ...............................YES"
-else
- echo "Building charmap plugin: ...............................NO"
- echo " Requires gucharmap >= $LIBGUCHARMAP_OPTIONAL=1.6.0"
-fi
-
-if [ test x"$have_libsoup" = "xyes" ]; then
- echo "Building open-tran plugin: .............................YES"
-else
- echo "Building open-tran plugin: .............................NO"
- echo " Requires libsoup >= $LIBSOUP_OPTIONAL"
-fi
-
-if [ test x"$have_gdict" = "xyes" ]; then
- echo "Building dictionary plugin: ............................YES"
-else
- echo "Building dictionary plugin: ............................NO"
- echo " Requires gdict-1.0 >= $GDICT_OPTIONAL"
-fi
-
-if [ test x"$have_gtkspell" = "xyes" ]; then
- echo "Building spell support: ................................YES"
-else
- echo "Building spell support: ................................NO"
- echo " Requires gtkspell >= $GTKSPELL_OPTIONAL"
-fi
-echo "
------------------------------------------------------------------
-- For suggestions, problems & bug reports for gtranslator please
use http://bugzilla.gnome.org/enter_bug.cgi?product=gtranslator
-Thanks for your attention and braveness in compiling gtranslator!
+Thanks for your attention and braveness in \"compiling\" gtranslator!
-- The website for gtranslator is http://gtranslator.sourceforge.net
------------------------------------------------------------------
Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am (original)
+++ trunk/data/Makefile.am Tue Sep 16 09:52:02 2008
@@ -3,8 +3,7 @@
SUBDIRS = \
desktop \
mime \
- scripts \
- pixmaps
+ scripts
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = gtranslator- GTR_API_VERSION@.pc
@@ -19,8 +18,12 @@
po.lang \
layout.xml
+icondir = $(datadir)/pixmaps/gtranslator
+icon_DATA = gtranslator-plugin.png
+
EXTRA_DIST = \
$(ui_DATA) \
+ $(icon_DATA)\
gtranslator.pc.in
CLEANFILES = \
Modified: trunk/data/desktop/Makefile.am
==============================================================================
--- trunk/data/desktop/Makefile.am (original)
+++ trunk/data/desktop/Makefile.am Tue Sep 16 09:52:02 2008
@@ -18,5 +18,3 @@
EXTRA_DIST = $(Application_DATA) \
$(Applicationicon_DATA) \
$(Application_predata)
-
-CLEANFILES = $(Application_DATA)
Modified: trunk/data/desktop/gtranslator.desktop.in.in
==============================================================================
--- trunk/data/desktop/gtranslator.desktop.in.in (original)
+++ trunk/data/desktop/gtranslator.desktop.in.in Tue Sep 16 09:52:02 2008
@@ -1,4 +1,5 @@
[Desktop Entry]
+Encoding=UTF-8
_Name=Gtranslator PO Editor
_Comment=Translate and localize applications and libraries
Icon=gtranslator.png
Modified: trunk/data/gtr-toolbar.xml
==============================================================================
--- trunk/data/gtr-toolbar.xml (original)
+++ trunk/data/gtr-toolbar.xml Tue Sep 16 09:52:02 2008
@@ -20,9 +20,6 @@
<toolitem name="GoPreviousFuzzy"/>
<toolitem name="GoNextUntranslated"/>
<toolitem name="GoPreviousUntranslated"/>
- <toolitem name="GoNextFuzzyUntranslated"/>
- <toolitem name="GoPreviousFuzzyUntranslated"/>
- <toolitem name="GoJump"/>
<toolitem name="SearchFind"/>
<toolitem name="SearchReplace"/>
Modified: trunk/data/gtranslator-ui.xml
==============================================================================
--- trunk/data/gtranslator-ui.xml (original)
+++ trunk/data/gtranslator-ui.xml Tue Sep 16 09:52:02 2008
@@ -2,6 +2,7 @@
<menubar name="MainMenu">
<menu name="FileMenu" action="File">
<menuitem name="FileOpenMenu" action="FileOpen"/>
+ <menuitem name="FileOpenCopyMenu" action="FileOpenUri"/>
<menuitem name="FileRecentFilesMenu" action="FileRecentFiles"/>
<separator/>
<menuitem name="FileSaveMenu" action="FileSave"/>
@@ -28,8 +29,6 @@
<separator/>
<menuitem name="EditFuzzyMenu" action="EditFuzzy"/>
<separator/>
- <menuitem name="EditTranslationMemory" action="EditTranslationMemory"/>
- <separator/>
<placeholder name="EditOps_1" />
<separator/>
<menuitem name="EditToolbarMenu" action="EditToolbar"/>
@@ -40,10 +39,7 @@
<separator/>
<placeholder name="ViewOps_1" />
<separator/>
- <menuitem name="ViewContextMenu" action="ViewContext"/>
- <menuitem name="ViewTranslationMemoryMenu" action="ViewTranslationMemory"/>
- <placeholder name="ViewOps_2" />
- <separator/>
+ <menuitem name="ViewSidePaneMenu" action="ViewSidePane"/>
</menu>
<?--<menu name="BookmarksMenu" action="Bookmarks">
@@ -67,30 +63,23 @@
<menuitem name="GoForwardMenu" action="GoForward"/>
<menuitem name="GoLastMenu" action="GoLast"/>
<separator/>
+ <menuitem name="GoJumpToMenu" action="GoJumpTo"/>
+ <separator/>
<menuitem name="GoNextFuzzyMenu" action="GoNextFuzzy"/>
<menuitem name="GoPreviousFuzzyMenu" action="GoPreviousFuzzy"/>
<separator/>
<menuitem name="GoNextUntranslatedMenu" action="GoNextUntranslated"/>
<menuitem name="GoPreviousUntranslatedMenu" action="GoPreviousUntranslated"/>
- <separator/>
- <menuitem name="GoNextFuzzyUntranslatedMenu" action="GoNextFuzzyUntranslated"/>
- <menuitem name="GoPreviousFuzzyUntranslatedMenu" action="GoPreviousFuzzyUntranslated"/>
- <separator/>
- <menuitem name="GoJumpMenu" action="GoJump"/>
</menu>
<menu name="SearchMenu" action="Search">
<menuitem name="SearchFindMenu" action="SearchFind"/>
- <?-- <menuitem name="SearchFindNextMenu" action="SearchFindNext"/>
+ <menuitem name="SearchFindNextMenu" action="SearchFindNext"/>
<menuitem name="SearchFindPreviousMenu" action="SearchFindPrevious"/>
- <separator/>--?>
+ <separator/>
<menuitem name="SearchReplaceMenu" action="SearchReplace"/>
</menu>
- <placeholder name="SubversionPlaceholder" />
-
- <placeholder name="ExtraMenu_1" />
-
<menu name="HelpMenu" action="Help">
<menuitem name="HelpContentsMenu" action="HelpContents"/>
<menuitem name="HelpAboutMenu" action="HelpAbout"/>
Modified: trunk/data/mime/Makefile.am
==============================================================================
--- trunk/data/mime/Makefile.am (original)
+++ trunk/data/mime/Makefile.am Tue Sep 16 09:52:02 2008
@@ -26,4 +26,3 @@
EXTRA_DIST = $(icon_DATA) $(mime_DATA) $(keys_predata)
-CLEANFILES = $(keys_DATA)
Modified: trunk/data/po.lang
==============================================================================
--- trunk/data/po.lang (original)
+++ trunk/data/po.lang Tue Sep 16 09:52:02 2008
@@ -41,13 +41,10 @@
<match>[&_][a-zA-Z]</match>
</context>
<context style-ref="tag">
- <match><[0-9a-zA-Z=.:?\"/\- ]+></match>
+ <match><[0-9a-zA-Z=\"/\- ]+></match>
</context>
<context ref="python:format" style-ref="special-variable"/>
<context ref="c:printf"/>
- <context id="csharp" style-ref="c:printf">
- <match>{[0-9][0-9:\#\%,./cdefgnrxtsuDTFGMY]*}</match>
- </context>
</include>
</context>
</definitions>
Modified: trunk/doc/reference/Makefile.am
==============================================================================
--- trunk/doc/reference/Makefile.am (original)
+++ trunk/doc/reference/Makefile.am Tue Sep 16 09:52:02 2008
@@ -37,13 +37,11 @@
# Used for dependencies. The docs will be rebuilt if any of these change.
HFILE_GLOB= \
$(top_srcdir)/src/*.h \
- $(top_srcdir)/src/plugin-system/*.h \
- $(top_srcdir)/src/translation-memory/*.h
+ $(top_srcdir)/src/plugin-system/*.h
CFILE_GLOB= \
$(top_srcdir)/src/*.c \
- $(top_srcdir)/src/plugin-system/*.c \
- $(top_srcdir)/src/translation-memory/*.c
+ $(top_srcdir)/src/plugin-system/*.c
# Header files to ignore when scanning (These are internal to gedit).
IGNORE_HFILES= \
@@ -63,7 +61,7 @@
# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
# e.g. content_files=running.sgml building.sgml changes-2.0.sgml
-content_files=version.xml
+content_files=
# SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
# These files must be listed here *and* in content_files
@@ -77,14 +75,13 @@
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/plugin-system \
-I$(top_srcdir)/src/toolbareditor \
- -I$(top_srcdir)/src/translation-memory \
-I$(top_builddir)/src \
-I$(top_srcdir) \
-I$(top_builddir) \
$(GTRANSLATOR_CFLAGS)
GTKDOC_LIBS= \
- $(top_builddir)/src/libgtranslator.la \
+ $(top_srcdir)/src/libgtranslator.la \
$(GTRANSLATOR_LIBS)
# This includes the standard gtk-doc make rules, copied by gtkdocize.
@@ -92,4 +89,3 @@
# Other files to distribute
# e.g. EXTRA_DIST += version.xml.in
-EXTRA_DIST += version.xml.in
Modified: trunk/doc/reference/gtranslator-docs.sgml
==============================================================================
--- trunk/doc/reference/gtranslator-docs.sgml (original)
+++ trunk/doc/reference/gtranslator-docs.sgml Tue Sep 16 09:52:02 2008
@@ -12,8 +12,7 @@
<chapter>
<title>API reference</title>
<xi:include href="xml/application.xml"/>
- <xi:include href="xml/context.xml"/>
- <xi:include href="xml/debug.xml"/>
+ <xi:include href="xml/comment.xml"/>
<xi:include href="xml/header.xml"/>
<xi:include href="xml/history-entry.xml"/>
<xi:include href="xml/io-error-message-area.xml"/>
@@ -25,8 +24,6 @@
<xi:include href="xml/po.xml"/>
<xi:include href="xml/statusbar.xml"/>
<xi:include href="xml/tab.xml"/>
- <xi:include href="xml/translation-memory.xml"/>
- <xi:include href="xml/translation-memory-ui.xml"/>
<xi:include href="xml/utils.xml"/>
<xi:include href="xml/view.xml"/>
<xi:include href="xml/window.xml"/>
Modified: trunk/doc/reference/gtranslator.types
==============================================================================
--- trunk/doc/reference/gtranslator.types (original)
+++ trunk/doc/reference/gtranslator.types Tue Sep 16 09:52:02 2008
@@ -1,7 +1,6 @@
#include "application.h"
-#include "context.h"
-#include "debug.h"
+#include "comment.h"
#include "header.h"
#include "history-entry.h"
#include "io-error-message-area.h"
@@ -13,8 +12,6 @@
#include "po.h"
#include "statusbar.h"
#include "tab.h"
-#include "translation-memory.h"
-#include "translation-memory-ui.h"
#include "utils.h"
#include "view.h"
#include "window.h"
Modified: trunk/help/C/gtranslator.xml
==============================================================================
--- trunk/help/C/gtranslator.xml (original)
+++ trunk/help/C/gtranslator.xml Tue Sep 16 09:52:02 2008
@@ -25,7 +25,7 @@
</copyright>
-->
- <publisher role="maintainer">
+ <publisher>
<publishername>GNOME Documentation Project</publishername>
</publisher>
@@ -76,10 +76,6 @@
</revision>
</revhistory>
- <abstract role="description">
- <para>&app; is an enhanced gettext po file editor for the GNOME desktop environment.</para>
- </abstract>
-
</articleinfo>
<!-- ================ Document Body ================= -->
@@ -1360,91 +1356,91 @@
</sect1>
-<!-- <sect1 id="gtranslator-glossary"> -->
-<!-- <title>Glossary</title> -->
-<!-- <para> -->
-<!-- <variablelist> -->
-<!-- <varlistentry> -->
-<!-- <term> -->
-<!-- <command>gettext</command> -->
-<!-- </term> -->
-<!-- <listitem> -->
-<!-- <para></para> -->
-<!-- </listitem> -->
-<!-- </varlistentry> -->
-<!-- <varlistentry> -->
-<!-- <term>po file</term> -->
-<!-- <listitem> -->
-<!-- <para></para> -->
-<!-- </listitem> -->
-<!-- </varlistentry> -->
-<!-- <varlistentry> -->
-<!-- <term>internationalization</term> -->
-<!-- <listitem> -->
-<!-- <para></para> -->
-<!-- </listitem> -->
-<!-- </varlistentry> -->
-<!-- <varlistentry> -->
-<!-- <term>localization</term> -->
-<!-- <listitem> -->
-<!-- <para></para> -->
-<!-- </listitem> -->
-<!-- </varlistentry> -->
-<!-- <varlistentry> -->
-<!-- <term>l10n</term> -->
-<!-- <listitem> -->
-<!-- <para></para> -->
-<!-- </listitem> -->
-<!-- </varlistentry> -->
-<!-- <varlistentry> -->
-<!-- <term>i18n</term> -->
-<!-- <listitem> -->
-<!-- <para></para> -->
-<!-- </listitem> -->
-<!-- </varlistentry> -->
-<!-- <varlistentry> -->
-<!-- <term>translation memory</term> -->
-<!-- <listitem> -->
-<!-- <para></para> -->
-<!-- </listitem> -->
-<!-- </varlistentry> -->
-<!-- <varlistentry> -->
-<!-- <term>ISO 3166 coutry code</term> -->
-<!-- <listitem> -->
-<!-- <para></para> -->
-<!-- </listitem> -->
-<!-- </varlistentry> -->
-<!-- <varlistentry> -->
-<!-- <term>ISO 639-2 language code</term> -->
-<!-- <listitem> -->
-<!-- <para></para> -->
-<!-- </listitem> -->
-<!-- </varlistentry> -->
-<!-- <varlistentry> -->
-<!-- <term>default query domain</term> -->
-<!-- <listitem> -->
-<!-- <para></para> -->
-<!-- </listitem> -->
-<!-- </varlistentry> -->
-<!-- <varlistentry> -->
-<!-- <term>charset</term> -->
-<!-- <listitem> -->
-<!-- <para></para> -->
-<!-- </listitem> -->
-<!-- </varlistentry> -->
-<!-- <varlistentry> -->
-<!-- <term>encoding</term> -->
-<!-- <listitem> -->
-<!-- <para></para> -->
-<!-- </listitem> -->
-<!-- </varlistentry> -->
-<!-- <varlistentry> -->
-<!-- <term>URI</term> -->
-<!-- <listitem> -->
-<!-- <para></para> -->
-<!-- </listitem> -->
-<!-- </varlistentry> -->
-<!-- </variablelist> -->
-<!-- </para> -->
-<!-- </sect1> -->
+ <sect1 id="gtranslator-glossary">
+ <title>Glossary</title>
+ <para>
+ <variablelist>
+ <varlistentry>
+ <term>
+ <command>gettext</command>
+ </term>
+ <listitem>
+ <para></para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>po file</term>
+ <listitem>
+ <para></para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>internationalization</term>
+ <listitem>
+ <para></para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>localization</term>
+ <listitem>
+ <para></para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>l10n</term>
+ <listitem>
+ <para></para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>i18n</term>
+ <listitem>
+ <para></para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>translation memory</term>
+ <listitem>
+ <para></para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>ISO 3166 coutry code</term>
+ <listitem>
+ <para></para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>ISO 639-2 language code</term>
+ <listitem>
+ <para></para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>default query domain</term>
+ <listitem>
+ <para></para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>charset</term>
+ <listitem>
+ <para></para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>encoding</term>
+ <listitem>
+ <para></para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>URI</term>
+ <listitem>
+ <para></para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </para>
+ </sect1>
</article>
Modified: trunk/help/Makefile.am
==============================================================================
--- trunk/help/Makefile.am (original)
+++ trunk/help/Makefile.am Tue Sep 16 09:52:02 2008
@@ -1,10 +1,7 @@
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
+##
+## Add eventually existing other languages docs to here.
+##
-DOC_MODULE = gtranslator
-DOC_ENTITIES = legal.xml
-DOC_INCLUDES =
-DOC_FIGURES = figures/mainwindow.png \
- figures/prefs.png \
- figures/toolbar.png
-DOC_LINGUAS =
+SUBDIRS = C
+# ja
+EXTRA_DIST = ChangeLog
Modified: trunk/plugins/Makefile.am
==============================================================================
--- trunk/plugins/Makefile.am (original)
+++ trunk/plugins/Makefile.am Tue Sep 16 09:52:02 2008
@@ -1,8 +1,7 @@
SUBDIRS = \
alternate-language \
fullscreen \
- insert-tags \
- source-code-view
+ insert-tags
if USE_CHARMAP
SUBDIRS += charmap
@@ -15,7 +14,3 @@
if USE_DICTIONARY
SUBDIRS += dictionary
endif
-
-if BUILD_SVN
-SUBDIRS += subversion
-endif
Modified: trunk/plugins/alternate-language/alternate-language-panel.c
==============================================================================
--- trunk/plugins/alternate-language/alternate-language-panel.c (original)
+++ trunk/plugins/alternate-language/alternate-language-panel.c Tue Sep 16 09:52:02 2008
@@ -33,9 +33,6 @@
#include <glib-object.h>
#include <gtk/gtk.h>
-#define FUZZY_ICON "gtk-dialog-warning"
-#define UNTRANSLATED_ICON "gtk-dialog-error"
-
#define GTR_ALTERNATE_LANG_PANEL_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ( \
(object), \
GTR_TYPE_ALTERNATE_LANG_PANEL, \
@@ -50,11 +47,12 @@
GtkWidget *close_button;
GtkWidget *textview;
- GtkWidget *status;
+ GtkWidget *translated;
+ GtkWidget *untranslated;
+ GtkWidget *fuzzy;
GtranslatorPo *po;
GtranslatorMsg *first;
- GtranslatorTab *tab;
};
static void
@@ -75,19 +73,15 @@
GList *messages;
GList *l;
const gchar *msgid = gtranslator_msg_get_msgid (msg);
- gchar *msgid_collate;
const gchar *string;
- gchar *string_collate;
GtranslatorMsgStatus status;
- msgid_collate = g_utf8_collate_key (msgid, -1);
messages = gtranslator_po_get_messages (panel->priv->po);
l = messages;
do
{
string = gtranslator_msg_get_msgid (l->data);
- string_collate = g_utf8_collate_key (string, -1);
- if (strcmp (string_collate, msgid_collate) == 0)
+ if (g_utf8_collate(string, msgid) == 0)
{
gtranslator_alternate_lang_panel_set_text (panel,
gtranslator_msg_get_msgstr (l->data));
@@ -95,33 +89,28 @@
switch (status)
{
case GTR_MSG_STATUS_TRANSLATED:
- gtk_image_clear (GTK_IMAGE (panel->priv->status));
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (panel->priv->translated),
+ TRUE);
break;
case GTR_MSG_STATUS_FUZZY:
- gtk_image_set_from_stock (GTK_IMAGE (panel->priv->status),
- FUZZY_ICON,
- GTK_ICON_SIZE_SMALL_TOOLBAR);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (panel->priv->fuzzy),
+ TRUE);
break;
default: break;
}
- g_free (string_collate);
- g_free (msgid_collate);
return;
}
- g_free (string_collate);
} while ((l = g_list_next (l)));
- g_free (msgid_collate);
gtranslator_alternate_lang_panel_set_text (panel,
_("Message not found"));
/*
* If we are here the status is untranslated
*/
- gtk_image_set_from_stock (GTK_IMAGE (panel->priv->status),
- UNTRANSLATED_ICON,
- GTK_ICON_SIZE_SMALL_TOOLBAR);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (panel->priv->untranslated),
+ TRUE);
}
static void
@@ -142,16 +131,11 @@
GtranslatorAlternateLangPanel *panel)
{
GError *error = NULL;
- GFile *file;
- gchar *po_file = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
-
- file = g_file_new_for_path (po_file);
- g_free (po_file);
+ gchar *po_file = g_strdup (gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)));
+
panel->priv->po = gtranslator_po_new ();
- gtranslator_po_parse (panel->priv->po, file, &error);
-
- g_object_unref (file);
+ gtranslator_po_parse (panel->priv->po, po_file, &error);
if (error != NULL)
{
@@ -205,9 +189,6 @@
GtranslatorAlternateLangPanel *panel)
{
GtkWidget *dialog = NULL;
- gchar *dir;
- GtranslatorPo *tab_po;
- GFile *location, *parent;
if(dialog != NULL) {
gtk_window_present(GTK_WINDOW(dialog));
@@ -219,19 +200,7 @@
*/
dialog = gtranslator_file_chooser_new (NULL,
FILESEL_OPEN,
- _("Open file for alternate language"),
- NULL);
-
- tab_po = gtranslator_tab_get_po (panel->priv->tab);
- location = gtranslator_po_get_location (tab_po);
- parent = g_file_get_parent (location);
- g_object_unref (location);
-
- dir = g_file_get_path (parent);
- g_object_unref (parent);
-
- gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), dir);
- g_free (dir);
+ _("Open file for alternate language"));
gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(dialog), TRUE);
@@ -301,10 +270,20 @@
/*
* Radio buttons
*/
- panel->priv->status = gtk_image_new ();
- gtk_widget_show (panel->priv->status);
-
- gtk_box_pack_start (GTK_BOX (hbox), panel->priv->status, FALSE, FALSE, 0);
+ panel->priv->translated = gtk_radio_button_new_with_label (NULL,
+ _("Translated"));
+ gtk_widget_show (panel->priv->translated);
+ gtk_box_pack_start (GTK_BOX (hbox), panel->priv->translated, FALSE, TRUE, 0);
+
+ panel->priv->fuzzy = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (panel->priv->translated),
+ _("Fuzzy"));
+ gtk_widget_show (panel->priv->fuzzy);
+ gtk_box_pack_start (GTK_BOX (hbox), panel->priv->fuzzy, FALSE, TRUE, 0);
+
+ panel->priv->untranslated = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (panel->priv->translated),
+ _("Untranslated"));
+ gtk_widget_show (panel->priv->untranslated);
+ gtk_box_pack_start (GTK_BOX (hbox), panel->priv->untranslated, FALSE, TRUE, 0);
/*
* Text view
@@ -321,11 +300,8 @@
gtk_widget_set_sensitive (panel->priv->textview, FALSE);
gtk_widget_show (panel->priv->textview);
- gtk_container_add (GTK_CONTAINER (scroll),
- panel->priv->textview);
-
- gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scroll),
- GTK_SHADOW_IN);
+ gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scroll),
+ panel->priv->textview);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll),
GTK_POLICY_AUTOMATIC,
@@ -369,8 +345,6 @@
GtranslatorAlternateLangPanel *panel;
panel = g_object_new (GTR_TYPE_ALTERNATE_LANG_PANEL, NULL);
- panel->priv->tab = GTR_TAB (tab);
-
g_signal_connect (tab, "showed-message",
G_CALLBACK (showed_message_cb),
panel);
Modified: trunk/plugins/alternate-language/alternate-language-plugin.c
==============================================================================
--- trunk/plugins/alternate-language/alternate-language-plugin.c (original)
+++ trunk/plugins/alternate-language/alternate-language-plugin.c Tue Sep 16 09:52:02 2008
@@ -28,8 +28,6 @@
#include <glib/gi18n-lib.h>
#define WINDOW_DATA_KEY "GtranslatorAlternateLangPluginWindowData"
-#define TAB_DATA_KEY "GtranslatorAlternateLangPluginTabData"
-#define MENU_PATH "/MainMenu/ViewMenu/ViewOps_2"
#define GTR_MESSAGE_TABLE_GET_PRIVATE(object) \
(G_TYPE_INSTANCE_GET_PRIVATE ((object), \
@@ -37,58 +35,9 @@
GtranslatorAlternateLangPluginPrivate))
GTR_PLUGIN_REGISTER_TYPE_WITH_CODE (GtranslatorAlternateLangPlugin, gtranslator_alternate_lang_plugin,
- gtranslator_alternate_lang_panel_register_type (module);
+ gtranslator_alternate_lang_panel_register_type (module);
)
-static void
-on_alternate_lang_activated (GtkAction *action,
- GtranslatorWindow *window)
-{
- GtranslatorTab *tab;
- GtkWidget *alternatelang;
-
- tab = gtranslator_window_get_active_tab (window);
- alternatelang = g_object_get_data (G_OBJECT (tab), TAB_DATA_KEY);
-
- gtranslator_tab_show_lateral_panel_widget (GTR_TAB (tab),
- alternatelang);
-}
-
-static const GtkActionEntry action_entries[] =
-{
- { "AlternateLang", NULL, N_("_Alternate Language"), "<control>L",
- N_("Show the Alternate Language panel"),
- G_CALLBACK (on_alternate_lang_activated)},
-};
-
-typedef struct
-{
- GtkActionGroup *action_group;
- guint ui_id;
-} WindowData;
-
-static void
-free_window_data (WindowData *data)
-{
- g_return_if_fail (data != NULL);
-
- g_free (data);
-}
-
-static void
-update_ui_real (GtranslatorWindow *window,
- WindowData *data)
-{
- GtranslatorTab *tab;
- GtkAction *action;
-
- tab = gtranslator_window_get_active_tab (window);
-
- action = gtk_action_group_get_action (data->action_group,
- "AlternateLang");
- gtk_action_set_sensitive (action,
- (tab != NULL));
-}
static void
gtranslator_alternate_lang_plugin_init (GtranslatorAlternateLangPlugin *message_table)
@@ -110,6 +59,8 @@
{
GtkWidget *alternatelang;
GtranslatorPo *po;
+ GtkWidget *panel;
+ GtkWidget *label;
po = gtranslator_tab_get_po (GTR_TAB (child));
@@ -118,13 +69,17 @@
alternatelang = gtranslator_alternate_lang_panel_new (child);
gtk_widget_show (alternatelang);
- gtranslator_tab_add_widget_to_lateral_panel (GTR_TAB(child),
- alternatelang,
- _("Alternate Language"));
+ panel = gtranslator_tab_get_panel (GTR_TAB(child));
+ label = gtk_label_new (_("Alternate Language"));
+
+ gtk_notebook_append_page (GTK_NOTEBOOK (panel),
+ alternatelang,
+ label);
+
g_object_set_data (G_OBJECT (child),
- TAB_DATA_KEY,
- alternatelang);
+ WINDOW_DATA_KEY,
+ alternatelang);
}
static void
@@ -133,37 +88,6 @@
{
GtranslatorNotebook *notebook;
GList *tabs = NULL;
- GtkUIManager *manager;
- WindowData *data;
-
- data = g_new (WindowData, 1);
-
- manager = gtranslator_window_get_ui_manager (window);
-
- data->action_group = gtk_action_group_new ("GtranslatorAlternateLangPluginActions");
- gtk_action_group_set_translation_domain (data->action_group,
- GETTEXT_PACKAGE);
- gtk_action_group_add_actions (data->action_group,
- action_entries,
- G_N_ELEMENTS (action_entries),
- window);
-
- gtk_ui_manager_insert_action_group (manager, data->action_group, -1);
-
- data->ui_id = gtk_ui_manager_new_merge_id (manager);
-
- g_object_set_data_full (G_OBJECT (window),
- WINDOW_DATA_KEY,
- data,
- (GDestroyNotify) free_window_data);
-
- gtk_ui_manager_add_ui (manager,
- data->ui_id,
- MENU_PATH,
- "AlternateLang",
- "AlternateLang",
- GTK_UI_MANAGER_MENUITEM,
- FALSE);
notebook = gtranslator_window_get_notebook(window);
@@ -180,58 +104,40 @@
tabs->data,
0, window);
}while((tabs = g_list_next(tabs)));
+
}
static void
impl_deactivate(GtranslatorPlugin *plugin,
GtranslatorWindow *window)
{
+ GtkWidget *panel;
GtranslatorNotebook *notebook;
GtkWidget *alternatelang;
GList *tabs;
- GtkUIManager *manager;
- WindowData *data;
+ gint page_num;
- tabs = gtranslator_window_get_all_tabs (window);
- notebook = gtranslator_window_get_notebook (window);
+ tabs = gtranslator_window_get_all_tabs(window);
+ notebook = gtranslator_window_get_notebook(window);
- if (tabs != NULL)
- {
- do{
- alternatelang = g_object_get_data (G_OBJECT (tabs->data), TAB_DATA_KEY);
- gtranslator_tab_remove_widget_from_lateral_panel (GTR_TAB (tabs->data),
- alternatelang);
+ if(tabs == NULL)
+ return;
+ do{
+ alternatelang = g_object_get_data(G_OBJECT(tabs->data), WINDOW_DATA_KEY);
+ panel = gtranslator_tab_get_panel (GTR_TAB(tabs->data));
+
+ page_num = gtk_notebook_page_num (GTK_NOTEBOOK (panel),
+ alternatelang);
+ gtk_notebook_remove_page (GTK_NOTEBOOK (panel),
+ page_num);
- g_object_set_data (G_OBJECT (tabs->data), WINDOW_DATA_KEY, NULL);
- }while ((tabs = g_list_next (tabs)));
- }
-
- g_signal_handlers_disconnect_by_func (notebook,
- create_alternate_lang_plugin_panel,
- window);
-
- /* Remove menuitem */
- manager = gtranslator_window_get_ui_manager (window);
+ g_object_set_data (G_OBJECT (tabs->data), WINDOW_DATA_KEY, NULL);
+
+ }while((tabs = g_list_next(tabs)));
- data = (WindowData *) g_object_get_data (G_OBJECT (window), WINDOW_DATA_KEY);
- g_return_if_fail (data != NULL);
-
- gtk_ui_manager_remove_ui (manager, data->ui_id);
- gtk_ui_manager_remove_action_group (manager, data->action_group);
-
- g_object_set_data (G_OBJECT (window), WINDOW_DATA_KEY, NULL);
-}
-
-static void
-impl_update_ui (GtranslatorPlugin *plugin,
- GtranslatorWindow *window)
-{
- WindowData *data;
-
- data = (WindowData *) g_object_get_data (G_OBJECT (window), WINDOW_DATA_KEY);
- g_return_if_fail (data != NULL);
-
- update_ui_real (window, data);
+ g_signal_handlers_disconnect_by_func(notebook,
+ create_alternate_lang_plugin_panel,
+ window);
}
static void
@@ -244,5 +150,4 @@
plugin_class->activate = impl_activate;
plugin_class->deactivate = impl_deactivate;
- plugin_class->update_ui = impl_update_ui;
}
Modified: trunk/plugins/charmap/Makefile.am
==============================================================================
--- trunk/plugins/charmap/Makefile.am (original)
+++ trunk/plugins/charmap/Makefile.am Tue Sep 16 09:52:02 2008
@@ -37,7 +37,7 @@
plugin_DATA = $(plugin_in_files:.gtranslator-plugin.desktop.in=.gtranslator.plugin)
-EXTRA_DIST = $(pixmaps__DATA) $(plugin_in_files)
+EXTRA_DIST = $(plugin_in_files)
CLEANFILES = $(plugin_DATA)
DISTCLEANFILES = $(plugin_DATA)
Modified: trunk/plugins/charmap/charmap-plugin.c
==============================================================================
--- trunk/plugins/charmap/charmap-plugin.c (original)
+++ trunk/plugins/charmap/charmap-plugin.c Tue Sep 16 09:52:02 2008
@@ -27,7 +27,6 @@
#include <glib/gi18n-lib.h>
#include "application.h"
-#include "statusbar.h"
#include "window.h"
#include <gucharmap/gucharmap-table.h>
#include <gucharmap/gucharmap-unicode-info.h>
@@ -76,18 +75,18 @@
const gchar *message,
GtranslatorWindow *window)
{
- GtranslatorStatusbar *statusbar;
+ GtkStatusbar *statusbar;
WindowData *data;
- statusbar = GTR_STATUSBAR (gtranslator_window_get_statusbar (window));
+ statusbar = GTK_STATUSBAR (gtranslator_window_get_statusbar (window));
data = (WindowData *) g_object_get_data (G_OBJECT (window),
WINDOW_DATA_KEY);
g_return_if_fail (data != NULL);
- gtranslator_statusbar_pop (statusbar, data->context_id);
+ gtk_statusbar_pop (statusbar, data->context_id);
if (message)
- gtranslator_statusbar_push (statusbar, data->context_id, message);
+ gtk_statusbar_push (statusbar, data->context_id, message);
}
static void
@@ -218,13 +217,24 @@
impl_activate (GtranslatorPlugin *plugin,
GtranslatorWindow *window)
{
- GtranslatorStatusbar *statusbar;
+ /*GtkWidget *image;
+ GtkIconTheme *theme;*/
+ GtkStatusbar *statusbar;
WindowData *data;
//gtranslator_debug (DEBUG_PLUGINS);
data = g_new (WindowData, 1);
+ /*theme = gtk_icon_theme_get_default ();
+
+ if (gtk_icon_theme_has_icon (theme, "accessories-character-map"))
+ image = gtk_image_new_from_icon_name ("accessories-character-map",
+ GTK_ICON_SIZE_MENU);
+ else
+ image = gtk_image_new_from_icon_name ("gucharmap",
+ GTK_ICON_SIZE_MENU);*/
+
gtranslator_application_register_icon (GTR_APP, "gucharmap.ico",
"charmap-plugin-icon");
@@ -237,9 +247,11 @@
"charmap-plugin-icon",
GTR_WINDOW_PLACEMENT_LEFT);
- statusbar = GTR_STATUSBAR (gtranslator_window_get_statusbar (window));
- data->context_id = gtranslator_statusbar_get_context_id (statusbar,
- "Character Description");
+ //gtk_object_sink (GTK_OBJECT (image));
+
+ statusbar = GTK_STATUSBAR (gtranslator_window_get_statusbar (window));
+ data->context_id = gtk_statusbar_get_context_id (statusbar,
+ "Character Description");
g_object_set_data_full (G_OBJECT (window),
WINDOW_DATA_KEY,
Modified: trunk/plugins/dictionary/Makefile.am
==============================================================================
--- trunk/plugins/dictionary/Makefile.am (original)
+++ trunk/plugins/dictionary/Makefile.am Tue Sep 16 09:52:02 2008
@@ -28,11 +28,6 @@
$(GTRANSLATOR_LIBS) \
$(DICTIONARY_LIBS)
-pixmaps_dir = $(datadir)/pixmaps/gtranslator
-pixmaps__DATA = \
- gnome-dictionary.png
-
-
# Plugin Info
plugin_in_files = dict.gtranslator-plugin.desktop.in
@@ -41,7 +36,7 @@
plugin_DATA = $(plugin_in_files:.gtranslator-plugin.desktop.in=.gtranslator.plugin)
-EXTRA_DIST = $(pixmaps__DATA) $(plugin_in_files)
+EXTRA_DIST = $(plugin_in_files)
CLEANFILES = $(plugin_DATA)
DISTCLEANFILES = $(plugin_DATA)
Modified: trunk/plugins/dictionary/dict-panel.c
==============================================================================
--- trunk/plugins/dictionary/dict-panel.c (original)
+++ trunk/plugins/dictionary/dict-panel.c Tue Sep 16 09:52:02 2008
@@ -22,9 +22,6 @@
#include "dict-panel.h"
#include "gdict-sidebar.h"
#include "plugin.h"
-#include "window.h"
-#include "statusbar.h"
-#include "utils.h"
#include <glib.h>
#include <glib-object.h>
@@ -39,25 +36,24 @@
GTR_TYPE_DICT_PANEL, \
GtranslatorDictPanelPrivate))
-#define DICTIONARY_GCONF_DIR "/apps/gtranslator/plugins/dictionary"
-#define DICTIONARY_GCONF_DATABASE_KEY DICTIONARY_GCONF_DIR "/database"
-#define DICTIONARY_GCONF_STRATEGY_KEY DICTIONARY_GCONF_DIR "/strategy"
-#define DICTIONARY_DEFAULT_SOURCE_NAME "Default"
-#define DICTIONARY_GCONF_SOURCE_KEY DICTIONARY_GCONF_DIR "/source-name"
-#define DICTIONARY_GCONF_POSITION_KEY DICTIONARY_GCONF_DIR "/panel_position"
+#define GDICT_GCONF_DIR "/apps/gnome-dictionary"
+#define GDICT_GCONF_DATABASE_KEY GDICT_GCONF_DIR "/database"
+#define GDICT_GCONF_STRATEGY_KEY GDICT_GCONF_DIR "/strategy"
+#define GDICT_DEFAULT_SOURCE_NAME "Default"
+#define GDICT_GCONF_SOURCE_KEY GDICT_GCONF_DIR "/source-name"
+
+#define PANEL_KEY "/apps/gtranslator/plugins/dictionary"
/* sidebar pages logical ids */
#define GDICT_SIDEBAR_SPELLER_PAGE "speller"
#define GDICT_SIDEBAR_DATABASES_PAGE "db-chooser"
#define GDICT_SIDEBAR_STRATEGIES_PAGE "strat-chooser"
-#define GDICT_SIDEBAR_SOURCES_PAGE "source-chooser"
GTR_PLUGIN_DEFINE_TYPE(GtranslatorDictPanel, gtranslator_dict_panel, GTK_TYPE_VBOX)
struct _GtranslatorDictPanelPrivate
{
GtkPaned *paned;
- GtranslatorStatusbar *status;
GConfClient *gconf_client;
guint notify_id;
@@ -68,39 +64,33 @@
gchar *word;
GdictContext *context;
+ guint lookup_start_id;
+ guint lookup_end_id;
+ guint error_id;
GdictSourceLoader *loader;
GtkWidget *speller;
GtkWidget *db_chooser;
GtkWidget *strat_chooser;
- GtkWidget *source_chooser;
GtkWidget *entry;
GtkWidget *button;
GtkWidget *defbox;
GtkWidget *sidebar;
};
-static void
-gtranslator_dict_panel_create_warning_dialog (const gchar *primary,
- const gchar *secondary)
+
+static gchar *
+gdict_get_data_dir (void)
{
- GtkWidget *dialog;
+ gchar *retval;
- if (!primary)
- return;
-
- dialog = gtk_message_dialog_new (NULL,
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_WARNING,
- GTK_BUTTONS_CLOSE,
- primary);
-
- if (secondary)
- gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
- secondary);
- gtk_dialog_run (GTK_DIALOG (dialog));
- gtk_widget_destroy (dialog);
+ retval = g_build_filename (g_get_home_dir (),
+ ".gnome2",
+ "gnome-dictionary",
+ NULL);
+
+ return retval;
}
static gchar *
@@ -144,7 +134,7 @@
priv->database = g_strdup (database);
else
priv->database = gdict_gconf_get_string_with_default (priv->gconf_client,
- DICTIONARY_GCONF_DATABASE_KEY,
+ GDICT_GCONF_DATABASE_KEY,
GDICT_DEFAULT_DATABASE);
if (priv->defbox)
gdict_defbox_set_database (GDICT_DEFBOX (priv->defbox),
@@ -163,7 +153,7 @@
priv->strategy = g_strdup (strategy);
else
priv->strategy = gdict_gconf_get_string_with_default (priv->gconf_client,
- DICTIONARY_GCONF_STRATEGY_KEY,
+ GDICT_GCONF_STRATEGY_KEY,
GDICT_DEFAULT_STRATEGY);
}
@@ -175,7 +165,7 @@
GdictContext *retval;
if (!priv->source_name)
- priv->source_name = g_strdup (DICTIONARY_DEFAULT_SOURCE_NAME);
+ priv->source_name = g_strdup (GDICT_DEFAULT_SOURCE_NAME);
source = gdict_source_loader_get_source (priv->loader,
priv->source_name);
@@ -185,9 +175,8 @@
detail = g_strdup_printf (_("No dictionary source available with name '%s'"),
priv->source_name);
-
- gtranslator_dict_panel_create_warning_dialog (_("Unable to find dictionary source"),
- detail);
+
+ g_warning(_("Unable to find dictionary source"));
g_free (detail);
return NULL;
@@ -203,9 +192,11 @@
detail = g_strdup_printf (_("No context available for source '%s'"),
gdict_source_get_description (source));
-
- gtranslator_dict_panel_create_warning_dialog (_("Unable to create a context"),
- detail);
+
+ /*gdict_show_error_dialog (NULL,
+ _("Unable to create a context"),
+ detail);*/
+ g_warning(_("Unable to create a context"));
g_free (detail);
g_object_unref (source);
@@ -225,7 +216,15 @@
GtranslatorDictPanelPrivate *priv = panel->priv;
if (priv->context)
- {
+ {
+ g_signal_handler_disconnect (priv->context, priv->lookup_start_id);
+ g_signal_handler_disconnect (priv->context, priv->lookup_end_id);
+ g_signal_handler_disconnect (priv->context, priv->error_id);
+
+ priv->lookup_start_id = 0;
+ priv->lookup_end_id = 0;
+ priv->error_id = 0;
+
g_object_unref (priv->context);
priv->context = NULL;
}
@@ -233,15 +232,20 @@
if (priv->defbox)
gdict_defbox_set_context (GDICT_DEFBOX (priv->defbox), context);
- if (priv->db_chooser)
- gdict_database_chooser_set_context (GDICT_DATABASE_CHOOSER (priv->db_chooser), context);
-
- if (priv->strat_chooser)
- gdict_strategy_chooser_set_context (GDICT_STRATEGY_CHOOSER (priv->strat_chooser), context);
-
if (!context)
return;
+ /* attach our callbacks */
+ /* priv->lookup_start_id = g_signal_connect (context, "lookup-start",
+ G_CALLBACK (gdict_applet_lookup_start_cb),
+ panel);
+ priv->lookup_end_id = g_signal_connect (context, "lookup-end",
+ G_CALLBACK (gdict_applet_lookup_end_cb),
+ panel);*/
+ /*priv->error_id = g_signal_connect (context, "error",
+ G_CALLBACK (gdict_applet_error_cb),
+ panel);*/
+
priv->context = context;
}
@@ -252,46 +256,17 @@
GtranslatorDictPanelPrivate *priv = panel->priv;
GdictContext *context;
- if (priv->source_name && source_name &&
- strcmp (priv->source_name, source_name) == 0)
- return;
-
g_free (priv->source_name);
if (source_name)
priv->source_name = g_strdup (source_name);
else
priv->source_name = gdict_gconf_get_string_with_default (priv->gconf_client,
- DICTIONARY_GCONF_SOURCE_KEY,
- DICTIONARY_DEFAULT_SOURCE_NAME);
+ GDICT_GCONF_SOURCE_KEY,
+ GDICT_DEFAULT_SOURCE_NAME);
context = get_context_from_loader (panel);
gtranslator_dict_panel_set_context (panel, context);
-
- if (priv->source_chooser)
- gdict_source_chooser_set_current_source (GDICT_SOURCE_CHOOSER (priv->source_chooser),
- priv->source_name);
-}
-
-static void
-source_activated_cb (GdictSourceChooser *chooser,
- const gchar *source_name,
- GdictSource *source,
- GtranslatorDictPanel *panel)
-{
- g_signal_handlers_block_by_func (chooser, source_activated_cb, panel);
- gtranslator_dict_panel_set_source_name (panel, source_name);
- g_signal_handlers_unblock_by_func (chooser, source_activated_cb, panel);
-
- if (panel->priv->status)
- {
- gchar *message;
-
- message = g_strdup_printf (_("Dictionary source '%s' selected"),
- gdict_source_get_description (source));
- gtranslator_statusbar_flash_message (panel->priv->status, 0, message);
- g_free (message);
- }
}
static void
@@ -300,17 +275,17 @@
const gchar *strat_desc,
GtranslatorDictPanel *panel)
{
- GtranslatorDictPanelPrivate *priv = panel->priv;
+/* GtranslatorDictPanelPrivate *priv = panel->priv;
gtranslator_dict_panel_set_strategy (panel, strat_name);
- if (priv->status)
- {
- gchar *message;
-
- message = g_strdup_printf (_("Strategy '%s' selected"), strat_desc);
- gtranslator_statusbar_flash_message (priv->status, 0, message);
- g_free (message);
- }
+ if (window->status)
+ {
+ gchar *message;
+
+ message = g_strdup_printf (_("Strategy `%s' selected"), strat_desc);
+ gtk_statusbar_push (GTK_STATUSBAR (window->status), 0, message);
+ g_free (message);
+ }*/
}
static void
@@ -319,17 +294,17 @@
const gchar *db_desc,
GtranslatorDictPanel *panel)
{
- GtranslatorDictPanelPrivate *priv = panel->priv;
+/* GtranslatorDictPanelPrivate *priv = panel->priv;
gtranslator_dict_panel_set_database (panel, db_name);
-
- if (priv->status)
- {
- gchar *message;
-
- message = g_strdup_printf (_("Database '%s' selected"), db_desc);
- gtranslator_statusbar_flash_message (priv->status, 0, message);
- g_free (message);
- }
+
+ if (window->status)
+ {
+ gchar *message;
+
+ message = g_strdup_printf (_("Database `%s' selected"), db_desc);
+ gtk_statusbar_push (GTK_STATUSBAR (window->status), 0, message);
+ g_free (message);
+ }*/
}
static void
@@ -367,17 +342,19 @@
gtk_entry_set_text (GTK_ENTRY (priv->entry), word);
gtranslator_dict_panel_set_word (panel, word, db_name);
-
- if (priv->status)
- {
- gchar *message;
-
- message = g_strdup_printf (_("Word '%s' selected"), word);
- gtranslator_statusbar_flash_message (priv->status, 0, message);
- g_free (message);
- }
+ /*
+ if (window->status)
+ {
+ gchar *message;
+
+ message = g_strdup_printf (_("Word `%s' selected"), word);
+ gtk_statusbar_push (GTK_STATUSBAR (window->status), 0, message);
+ g_free (message);
+ }*/
}
+
+
static void
sidebar_page_changed_cb (GdictSidebar *sidebar,
GtranslatorDictPanel *panel)
@@ -387,7 +364,7 @@
const gchar *message;
page_id = gdict_sidebar_current_page (sidebar);
-
+
switch (page_id[0])
{
case 's':
@@ -405,10 +382,6 @@
gdict_strategy_chooser_refresh (GDICT_STRATEGY_CHOOSER (priv->strat_chooser));
break;
- case 'o': /* source-chooser */
- message = _("Double-click on the source to use");
- gdict_source_chooser_refresh (GDICT_SOURCE_CHOOSER (priv->source_chooser));
- break;
default:
message = NULL;
}
@@ -424,24 +397,24 @@
break;
}
- if (message && priv->status)
- gtranslator_statusbar_flash_message (priv->status, 0, message);
+ /*if (message && window->status)
+ gtk_statusbar_push (GTK_STATUSBAR (window->status), 0, message);*/
}
static void
-store_position (GObject *gobject,
- GParamSpec *arg1,
- gpointer user_data)
+store_position(GObject *gobject,
+ GParamSpec *arg1,
+ gpointer user_data)
{
- GtkPaned *paned = GTK_PANED (gobject);
+ GtkPaned *paned = GTK_PANED(gobject);
GConfClient *client;
gint position;
- client = gconf_client_get_default ();
- position = gtk_paned_get_position (paned);
- gconf_client_set_int (client, DICTIONARY_GCONF_POSITION_KEY, position, NULL);
+ client = gconf_client_get_default();
+ position = gtk_paned_get_position(paned);
+ gconf_client_set_int(client, PANEL_KEY "/panel_position", position, NULL);
- g_object_unref (client);
+ g_object_unref(client);
}
static void
@@ -465,7 +438,6 @@
{
GtkWidget *vbox;
GtkWidget *hbox;
- gint position;
vbox = gtk_vbox_new (FALSE, 6);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
@@ -513,9 +485,6 @@
gtk_container_add (GTK_CONTAINER (vbox), panel->priv->defbox);
gtk_widget_show (panel->priv->defbox);
- /*
- * Sidebar
- */
panel->priv->sidebar = gdict_sidebar_new ();
g_signal_connect (panel->priv->sidebar, "page-changed",
G_CALLBACK (sidebar_page_changed_cb),
@@ -530,12 +499,8 @@
gtk_paned_pack2 (panel->priv->paned, panel->priv->sidebar, TRUE, TRUE);
gtk_widget_show (GTK_WIDGET(panel->priv->paned));
- position = gconf_client_get_int (panel->priv->gconf_client,
- DICTIONARY_GCONF_POSITION_KEY, NULL);
- gtk_paned_set_position (GTK_PANED (panel->priv->paned), position);
-
- g_signal_connect (panel->priv->paned, "notify::position",
- G_CALLBACK(store_position), NULL);
+ g_signal_connect(panel->priv->paned, "notify::position",
+ G_CALLBACK(store_position), NULL);
/*
@@ -586,19 +551,10 @@
_("Available strategies"),
panel->priv->strat_chooser);
gtk_widget_show (panel->priv->strat_chooser);
+
+ gtk_widget_show (panel->priv->sidebar);
- /* Source chooser */
- panel->priv->source_chooser = gdict_source_chooser_new_with_loader (panel->priv->loader);
- g_signal_connect (panel->priv->source_chooser, "source-activated",
- G_CALLBACK (source_activated_cb),
- panel);
- gdict_sidebar_add_page (GDICT_SIDEBAR (panel->priv->sidebar),
- GDICT_SIDEBAR_SOURCES_PAGE,
- _("Dictionary sources"),
- panel->priv->source_chooser);
- gtk_widget_show (panel->priv->source_chooser);
- gtk_widget_show (panel->priv->sidebar);
}
static void
@@ -609,21 +565,21 @@
{
GtranslatorDictPanel *panel = GTR_DICT_PANEL (user_data);
- if (strcmp (entry->key, DICTIONARY_GCONF_SOURCE_KEY) == 0)
+ if (strcmp (entry->key, GDICT_GCONF_SOURCE_KEY) == 0)
{
if (entry->value && (entry->value->type == GCONF_VALUE_STRING))
gtranslator_dict_panel_set_source_name (panel, gconf_value_get_string (entry->value));
else
- gtranslator_dict_panel_set_source_name (panel, DICTIONARY_DEFAULT_SOURCE_NAME);
+ gtranslator_dict_panel_set_source_name (panel, GDICT_DEFAULT_SOURCE_NAME);
}
- else if (strcmp (entry->key, DICTIONARY_GCONF_DATABASE_KEY) == 0)
+ else if (strcmp (entry->key, GDICT_GCONF_DATABASE_KEY) == 0)
{
if (entry->value && (entry->value->type == GCONF_VALUE_STRING))
gtranslator_dict_panel_set_database (panel, gconf_value_get_string (entry->value));
else
gtranslator_dict_panel_set_database (panel, GDICT_DEFAULT_DATABASE);
}
- else if (strcmp (entry->key, DICTIONARY_GCONF_STRATEGY_KEY) == 0)
+ else if (strcmp (entry->key, GDICT_GCONF_STRATEGY_KEY) == 0)
{
if (entry->value && (entry->value->type == GCONF_VALUE_STRING))
gtranslator_dict_panel_set_strategy (panel, gconf_value_get_string (entry->value));
@@ -642,23 +598,23 @@
panel->priv = GTR_DICT_PANEL_GET_PRIVATE (panel);
priv = panel->priv;
- priv->status = NULL;
-
if (!priv->loader)
panel->priv->loader = gdict_source_loader_new ();
/* add our data dir inside $HOME to the loader's search paths */
- data_dir = gtranslator_utils_get_user_config_dir ();
+ data_dir = gdict_get_data_dir ();
gdict_source_loader_add_search_path (priv->loader, data_dir);
g_free (data_dir);
+
+
/* get the default gconf client */
if (!priv->gconf_client)
priv->gconf_client = gconf_client_get_default ();
gconf_error = NULL;
gconf_client_add_dir (priv->gconf_client,
- DICTIONARY_GCONF_DIR,
+ GDICT_GCONF_DIR,
GCONF_CLIENT_PRELOAD_ONELEVEL,
&gconf_error);
if (gconf_error)
@@ -670,7 +626,7 @@
}
priv->notify_id = gconf_client_notify_add (priv->gconf_client,
- DICTIONARY_GCONF_DIR,
+ GDICT_GCONF_DIR,
gtranslator_dict_panel_gconf_notify_cb,
panel, NULL,
&gconf_error);
@@ -715,12 +671,15 @@
}
GtkWidget *
-gtranslator_dict_panel_new (GtranslatorWindow *window)
+gtranslator_dict_panel_new (void)
{
- GtranslatorDictPanel *panel;
-
- panel = g_object_new (GTR_TYPE_DICT_PANEL, NULL);
- panel->priv->status = GTR_STATUSBAR (gtranslator_window_get_statusbar (window));
-
- return GTK_WIDGET (panel);
-}
\ No newline at end of file
+ return GTK_WIDGET (g_object_new (GTR_TYPE_DICT_PANEL, NULL));
+}
+
+void
+gtranslator_dict_panel_set_position(GtranslatorDictPanel *panel,
+ gint pos)
+{
+ gtk_paned_set_position(panel->priv->paned, pos);
+}
+
Modified: trunk/plugins/dictionary/dict-panel.h
==============================================================================
--- trunk/plugins/dictionary/dict-panel.h (original)
+++ trunk/plugins/dictionary/dict-panel.h Tue Sep 16 09:52:02 2008
@@ -22,8 +22,6 @@
#include <glib-object.h>
#include <gtk/gtk.h>
-#include "window.h"
-
G_BEGIN_DECLS
/*
@@ -69,7 +67,7 @@
GType gtranslator_dict_panel_register_type (GTypeModule * module);
-GtkWidget * gtranslator_dict_panel_new (GtranslatorWindow *window);
+GtkWidget * gtranslator_dict_panel_new (void);
void gtranslator_dict_panel_set_position (GtranslatorDictPanel *panel,
gint pos);
Modified: trunk/plugins/dictionary/dict.gtranslator-plugin.desktop.in
==============================================================================
--- trunk/plugins/dictionary/dict.gtranslator-plugin.desktop.in (original)
+++ trunk/plugins/dictionary/dict.gtranslator-plugin.desktop.in Tue Sep 16 09:52:02 2008
@@ -3,7 +3,7 @@
IAge=2
_Name=Dictionary
_Description=Look up words in a dictionary.
-Icon=gnome-dictionary
+Icon=gdict
Authors=Ignacio Casal <nacho resa gmail com>
Copyright=Copyright @ 2007 Ignacio Casal
Website=http://gtranslator.sf.net
Modified: trunk/plugins/dictionary/dictionary-plugin.c
==============================================================================
--- trunk/plugins/dictionary/dictionary-plugin.c (original)
+++ trunk/plugins/dictionary/dictionary-plugin.c Tue Sep 16 09:52:02 2008
@@ -19,14 +19,16 @@
#include <config.h>
#endif
-#include "application.h"
#include "dictionary-plugin.h"
#include "dict-panel.h"
#include "window.h"
#include <glib/gi18n-lib.h>
+#include <gconf/gconf-client.h>
+//#include <gtranslator/gtranslator-debug.h>
#define WINDOW_DATA_KEY "GtranslatorDictPluginWindowData"
+#define PANEL_KEY "/apps/gtranslator/plugins/dictionary"
#define GTR_DICT_PLUGIN_GET_PRIVATE(object) \
(G_TYPE_INSTANCE_GET_PRIVATE ((object), \
@@ -40,17 +42,20 @@
} WindowData;
GTR_PLUGIN_REGISTER_TYPE_WITH_CODE (GtranslatorDictPlugin, gtranslator_dict_plugin,
- gtranslator_dict_panel_register_type (module);
+ gtranslator_dict_panel_register_type (module);
)
static void
gtranslator_dict_plugin_init (GtranslatorDictPlugin *plugin)
{
+ //gtranslator_debug_message (DEBUG_PLUGINS, "GtranslatorDictPlugin initializing");
}
static void
gtranslator_dict_plugin_finalize (GObject *object)
{
+ //gtranslator_debug_message (DEBUG_PLUGINS, "GtranslatorDictPlugin finalizing");
+
G_OBJECT_CLASS (gtranslator_dict_plugin_parent_class)->finalize (object);
}
@@ -68,33 +73,60 @@
{
GtkWidget *panel;
- panel = gtranslator_dict_panel_new (window);
+ panel = gtranslator_dict_panel_new ();
- gtk_widget_show (panel);
+ gtk_widget_show_all (panel);
return panel;
}
static void
+restore_position(GtranslatorDictPanel *panel)
+{
+ GConfClient *client;
+ gint position;
+
+ client = gconf_client_get_default();
+ position = gconf_client_get_int(client, PANEL_KEY "/panel_position", NULL);
+ gtranslator_dict_panel_set_position(panel, position);
+
+ g_object_unref(client);
+}
+
+static void
impl_activate (GtranslatorPlugin *plugin,
GtranslatorWindow *window)
{
+ /*GtkWidget *image;
+ GtkIconTheme *theme;*/
WindowData *data;
+ //gtranslator_debug (DEBUG_PLUGINS);
+
data = g_new (WindowData, 1);
+
+ /*theme = gtk_icon_theme_get_default ();
+ if (gtk_icon_theme_has_icon (theme, "accessories-dictionary"))
+ image = gtk_image_new_from_icon_name ("accessories-dictionary",
+ GTK_ICON_SIZE_MENU);
+ else
+ image = gtk_image_new_from_icon_name ("gdict",
+ GTK_ICON_SIZE_MENU);*/
+
data->panel = create_dict_panel (window);
- gtranslator_application_register_icon (GTR_APP, "gnome-dictionary.png",
- "dictionary-icon");
+ restore_position(GTR_DICT_PANEL(data->panel));
gtranslator_window_add_widget (window,
data->panel,
"GtranslatorDictionaryPlugin",
_("Dictionary"),
- "dictionary-icon",
+ NULL,
GTR_WINDOW_PLACEMENT_LEFT);
+ //gtk_object_sink (GTK_OBJECT (image));
+
g_object_set_data_full (G_OBJECT (window),
WINDOW_DATA_KEY,
data,
Modified: trunk/plugins/dictionary/gdict-sidebar.c
==============================================================================
--- trunk/plugins/dictionary/gdict-sidebar.c (original)
+++ trunk/plugins/dictionary/gdict-sidebar.c Tue Sep 16 09:52:02 2008
@@ -58,6 +58,7 @@
GtkWidget *hbox;
GtkWidget *notebook;
GtkWidget *menu;
+ GtkWidget *close_button;
GtkWidget *label;
GtkWidget *select_button;
};
@@ -214,6 +215,15 @@
}
static void
+gdict_sidebar_close_clicked_cb (GtkWidget *widget,
+ gpointer user_data)
+{
+ GdictSidebar *sidebar = GDICT_SIDEBAR (user_data);
+
+ g_signal_emit (sidebar, sidebar_signals[CLOSED], 0);
+}
+
+static void
gdict_sidebar_menu_deactivate_cb (GtkWidget *widget,
gpointer user_data)
{
@@ -299,6 +309,7 @@
GtkWidget *hbox;
GtkWidget *select_hbox;
GtkWidget *select_button;
+ GtkWidget *close_button;
GtkWidget *arrow;
sidebar->priv = priv = GDICT_SIDEBAR_GET_PRIVATE (sidebar);
@@ -345,6 +356,18 @@
gtk_box_pack_start (GTK_BOX (hbox), select_button, TRUE, TRUE, 0);
gtk_widget_show (select_button);
+ close_button = gtk_button_new ();
+ gtk_button_set_relief (GTK_BUTTON (close_button), GTK_RELIEF_NONE);
+ gtk_button_set_image (GTK_BUTTON (close_button),
+ gtk_image_new_from_stock (GTK_STOCK_CLOSE,
+ GTK_ICON_SIZE_SMALL_TOOLBAR));
+ g_signal_connect (close_button, "clicked",
+ G_CALLBACK (gdict_sidebar_close_clicked_cb),
+ sidebar);
+ gtk_box_pack_end (GTK_BOX (hbox), close_button, FALSE, FALSE, 0);
+ gtk_widget_show (close_button);
+ priv->close_button = close_button;
+
sidebar->priv->menu = gtk_menu_new ();
g_signal_connect (sidebar->priv->menu, "deactivate",
G_CALLBACK (gdict_sidebar_menu_deactivate_cb),
Modified: trunk/plugins/fullscreen/fullscreen-plugin.c
==============================================================================
--- trunk/plugins/fullscreen/fullscreen-plugin.c (original)
+++ trunk/plugins/fullscreen/fullscreen-plugin.c Tue Sep 16 09:52:02 2008
@@ -102,8 +102,6 @@
if (data->ui_id == 0)
{
g_warning (error->message);
- g_error_free (error);
- g_free (data);
return;
}
Modified: trunk/plugins/insert-tags/insert-tags-plugin.c
==============================================================================
--- trunk/plugins/insert-tags/insert-tags-plugin.c (original)
+++ trunk/plugins/insert-tags/insert-tags-plugin.c Tue Sep 16 09:52:02 2008
@@ -70,7 +70,7 @@
{ "InsertTags", NULL, N_("_Insert Tags") }
};
-static const gchar submenu[] =
+const gchar submenu[] =
"<ui>"
" <menubar name='MainMenu'>"
" <menu name='EditMenu' action='Edit'>"
@@ -126,12 +126,6 @@
static void
gtranslator_insert_tags_plugin_finalize (GObject *object)
{
- if (tags != NULL)
- {
- g_slist_free (tags);
- tags = NULL;
- }
-
G_OBJECT_CLASS (gtranslator_insert_tags_plugin_parent_class)->finalize (object);
}
@@ -199,7 +193,7 @@
(const gchar *)l->data);
gtk_menu_item_set_accel_path (GTK_MENU_ITEM (menuitem), accel_path);
- gtk_accel_map_add_entry (accel_path, i+48, GDK_CONTROL_MASK | GDK_MOD1_MASK);
+ gtk_accel_map_add_entry (accel_path, i+48, GDK_CONTROL_MASK);
g_free (accel_path);
@@ -241,7 +235,7 @@
/*
* Regular expression
*/
- regex = g_regex_new ("<[-0-9a-zA-Z=.:?\"/ ]+>", 0, 0, NULL);
+ regex = g_regex_new ("<[-0-9a-zA-Z=\"/ ]+>", 0, 0, NULL);
g_regex_match (regex, msgid, 0, &match_info);
while (g_match_info_matches (match_info))
{
@@ -296,11 +290,9 @@
submenu,
-1,
&error);
- if (error)
+ if (data->ui_id == 0)
{
g_warning (error->message);
- g_error_free (error);
- g_free (data);
return;
}
@@ -352,12 +344,6 @@
g_signal_handlers_disconnect_by_func(notebook,
page_added_cb,
window);
-
- if (tags != NULL)
- {
- g_slist_free (tags);
- tags = NULL;
- }
}
static void
Modified: trunk/plugins/open-tran/Makefile.am
==============================================================================
--- trunk/plugins/open-tran/Makefile.am (original)
+++ trunk/plugins/open-tran/Makefile.am Tue Sep 16 09:52:02 2008
@@ -38,10 +38,7 @@
kde.ico \
mozilla.png \
debian.png \
- open-tran.png \
- suse.png \
- xfce.png \
- inkscape.png
+ open-tran.png
# Plugin Info
Modified: trunk/plugins/open-tran/open-tran-dialog.glade
==============================================================================
--- trunk/plugins/open-tran/open-tran-dialog.glade (original)
+++ trunk/plugins/open-tran/open-tran-dialog.glade Tue Sep 16 09:52:02 2008
@@ -123,7 +123,7 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="no">gtk-cancel</property>
+ <property name="label" translatable="yes">gtk-cancel</property>
<property name="use_stock">True</property>
<property name="response_id">-6</property>
</widget>
@@ -134,7 +134,7 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="no">gtk-ok</property>
+ <property name="label" translatable="yes">gtk-ok</property>
<property name="use_stock">True</property>
<property name="response_id">-5</property>
</widget>
Modified: trunk/plugins/open-tran/open-tran-panel.c
==============================================================================
--- trunk/plugins/open-tran/open-tran-panel.c (original)
+++ trunk/plugins/open-tran/open-tran-panel.c Tue Sep 16 09:52:02 2008
@@ -43,9 +43,6 @@
#define KDE_ICON PIXMAPSDIR"/kde.ico"
#define MOZILLA_ICON PIXMAPSDIR"/mozilla.png"
#define DEBIAN_ICON PIXMAPSDIR"/debian.png"
-#define SUSE_ICON PIXMAPSDIR"/suse.png"
-#define XFCE_ICON PIXMAPSDIR"/xfce.png"
-#define INKSCAPE_ICON PIXMAPSDIR"/inkscape.png"
GTR_PLUGIN_DEFINE_TYPE(GtranslatorOpenTranPanel, gtranslator_open_tran_panel, GTK_TYPE_VBOX)
@@ -131,21 +128,27 @@
{
str = g_value_get_string (value);
- if (strcmp ("GNOME", str) == 0)
- icon = create_pixbuf (GNOME_ICON);
- else if (strcmp ("KDE", str) == 0)
- icon = create_pixbuf (KDE_ICON);
- else if (strcmp ("MOZILLA", str) == 0)
- icon = create_pixbuf (MOZILLA_ICON);
- else if (strcmp ("DEBIAN", str) == 0)
- icon = create_pixbuf (DEBIAN_ICON);
- else if (strcmp ("SUSE", str) == 0)
- icon = create_pixbuf (SUSE_ICON);
- else if (strcmp ("XFCE", str) == 0)
- icon = create_pixbuf (XFCE_ICON);
- else if (strcmp ("Inkscape", str) == 0)
- icon = create_pixbuf (INKSCAPE_ICON);
- else icon = NULL;
+ /*
+ * We have to parse the first character of str:
+ * G - Gnome
+ * K - KDE
+ * M - Mozilla
+ * D - Debian Installer
+ * F - Frysian dictionary
+ */
+ switch(*str)
+ {
+ case 'G': icon = create_pixbuf(GNOME_ICON);
+ break;
+ case 'K': icon = create_pixbuf(KDE_ICON);
+ break;
+ case 'M': icon = create_pixbuf(MOZILLA_ICON);
+ break;
+ case 'D': icon = create_pixbuf(DEBIAN_ICON);
+ break;
+ default: icon = NULL;
+ break;
+ }
gtk_list_store_append(panel->priv->store, &iter);
gtk_list_store_set(panel->priv->store, &iter,
@@ -154,9 +157,6 @@
-1);
g_free (panel->priv->text);
-
- if (icon)
- g_object_unref (icon);
}
}
Modified: trunk/plugins/open-tran/open-tran-plugin.c
==============================================================================
--- trunk/plugins/open-tran/open-tran-plugin.c (original)
+++ trunk/plugins/open-tran/open-tran-plugin.c Tue Sep 16 09:52:02 2008
@@ -94,13 +94,33 @@
impl_activate (GtranslatorPlugin *plugin,
GtranslatorWindow *window)
{
+ //GtkWidget *image = NULL;
GtkWidget *opentran;
+ /*GdkPixbuf *pixbuf;
+ GtkIconSet *iconset;
+ GError *error = NULL;*/
+
+ /*pixbuf = gdk_pixbuf_new_from_file(OPEN_TRAN_PLUGIN_ICON, &error);
+
+ if (error)
+ {
+ g_warning ("Could not load icon: %s\n", error->message);
+ g_error_free(error);
+ pixbuf = NULL;
+ }
+
+ if(pixbuf)
+ {
+ iconset = gtk_icon_set_new_from_pixbuf(pixbuf);
+
+ image = gtk_image_new_from_icon_set(iconset,
+ GTK_ICON_SIZE_MENU);
+ }*/
gtranslator_application_register_icon (GTR_APP, "open-tran.png",
"open-tran-plugin-icon");
opentran = gtranslator_open_tran_panel_new(window);
- gtk_widget_show (opentran);
gtranslator_window_add_widget (window,
opentran,
@@ -112,6 +132,8 @@
g_object_set_data(G_OBJECT(window),
WINDOW_DATA_KEY,
opentran);
+
+ gtk_widget_show_all(opentran);
}
static void
Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in (original)
+++ trunk/po/POTFILES.in Tue Sep 16 09:52:02 2008
@@ -20,33 +20,16 @@
plugins/open-tran/open-tran-panel.c
plugins/open-tran/open-tran-plugin.c
plugins/open-tran/open-tran.gtranslator-plugin.desktop.in
-plugins/source-code-view/source-code-view-dialog.glade
-plugins/source-code-view/source-code-view-plugin.c
-plugins/source-code-view/source-code-view.gtranslator-plugin.desktop.in
-plugins/source-code-view/viewer.c
-plugins/source-code-view/viewer.glade
-plugins/subversion/checkout-dialog.c
-plugins/subversion/commit-dialog.c
-plugins/subversion/diff-dialog.c
-plugins/subversion/subversion-plugin.c
-plugins/subversion/subversion.glade
-plugins/subversion/subversion.gtranslator-plugin.desktop.in
-plugins/subversion/svn-command.c
-plugins/subversion/svn-update-command.c
-plugins/subversion/update-dialog.c
-plugins/subversion/vcs-status-tree-view.c
src/actions-file.c
src/actions-help.c
-src/context.c
-src/dialogs/assistant.c
+src/comment.c
+src/dialogs/bookmarks-dialog.glade
src/dialogs/close-confirmation-dialog.c
src/dialogs/comment-dialog.c
src/dialogs/comment-dialog.glade
src/dialogs/file-dialogs.c
src/dialogs/header-dialog.c
src/dialogs/header-dialog.glade
-src/dialogs/jump-dialog.c
-src/dialogs/jump-dialog.glade
src/dialogs/preferences-dialog.c
src/dialogs/preferences-dialog.glade
src/dialogs/profile-dialog.c
@@ -63,11 +46,6 @@
src/tab.c
src/toolbareditor/egg-editable-toolbar.c
src/toolbareditor/egg-toolbar-editor.c
-src/translation-memory/berkeley/db-base.c
-src/translation-memory/berkeley/db-orig.c
-src/translation-memory/berkeley/db-trans.c
-src/translation-memory/berkeley/db-words.c
-src/translation-memory/translation-memory-ui.c
src/utils.c
src/view.c
src/window.c
Modified: trunk/po/POTFILES.skip
==============================================================================
--- trunk/po/POTFILES.skip (original)
+++ trunk/po/POTFILES.skip Tue Sep 16 09:52:02 2008
@@ -1 +0,0 @@
-data/desktop/gtranslator.desktop.in
Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am (original)
+++ trunk/src/Makefile.am Tue Sep 16 09:52:02 2008
@@ -4,8 +4,7 @@
SUBDIRS = toolbareditor \
dialogs \
- plugin-system \
- translation-memory
+ plugin-system
noinst_LTLIBRARIES = libgtranslator.la
@@ -15,13 +14,10 @@
-I$(top_srcdir)/src/dialogs \
-I$(top_srcdir)/src/toolbareditor \
-I$(top_srcdir)/src/plugin-system \
- -I$(top_srcdir)/src/translation-memory \
- -I$(top_srcdir)/src/translation-memory/berkeley \
-DGNOMELOCALEDIR=\""$(prefix)/${DATADIRNAME}/locale"\" \
-DPREFIX=\""$(prefix)"\" \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
- -DPKGDATADIR=\""$(pkgdatadir)"\" \
- -DDATADIR=\""$(datadir)"\" \
+ -DDATADIR=\""$(pkgdatadir)"\" \
-DLIBDIR=\""$(libdir)"\" \
$(GTRANSLATOR_CFLAGS) \
$(GTKSPELL_CFLAGS) \
@@ -54,8 +50,7 @@
INST_H_FILES = \
application.h \
- context.h \
- debug.h \
+ comment.h \
header.h \
io-error-message-area.h \
message-area.h \
@@ -108,15 +103,14 @@
actions-search.c \
header.c \
statusbar.c \
- context.c \
+ comment.c \
$(INST_H_FILES)
libgtranslator_la_LIBADD = \
$(GTRANSLATOR_LIBS) \
dialogs/libdialogs.la \
toolbareditor/libtoolbareditor.la \
- plugin-system/libpluginsystem.la \
- translation-memory/libtranslationmemory.la
+ plugin-system/libpluginsystem.la
#gtranslator_auto_learn_SOURCES = \
# auto-learn.c
@@ -140,10 +134,7 @@
gtranslator-marshal.c: gtranslator-marshal.list $(GLIB_GENMARSHAL)
$(GLIB_GENMARSHAL) $< --body --header --prefix=gtranslator_marshal > $@
-EXTRA_DIST = \
- ChangeLog \
- gtranslator-marshal.list \
- gtranslator-enum-types.h.template \
- gtranslator-enum-types.c.template
+EXTRA_DIST = ChangeLog gtranslator-marshal.list
+
CLEANFILES = $(BUILT_SOURCES)
Modified: trunk/src/actions-edit.c
==============================================================================
--- trunk/src/actions-edit.c (original)
+++ trunk/src/actions-edit.c Tue Sep 16 09:52:02 2008
@@ -126,11 +126,15 @@
GList *msg;
gint page_index;
- current = gtranslator_window_get_active_tab (window);
- po = gtranslator_tab_get_po (current);
- msg = gtranslator_po_get_current_message (po);
+ current = gtranslator_window_get_active_tab(window);
+ po = gtranslator_tab_get_po(current);
+ msg = gtranslator_po_get_current_message(po);
- msgid = gtranslator_msg_get_msgid (msg->data);
+ page_index = gtranslator_tab_get_active_text_tab(current);
+
+ if(page_index == 0)
+ msgid = gtranslator_msg_get_msgid(msg->data);
+ else msgid = gtranslator_msg_get_msgid_plural(msg->data);
if(msgid)
{
@@ -149,7 +153,7 @@
if(gtranslator_msg_is_fuzzy(msg->data) && gtranslator_prefs_manager_get_unmark_fuzzy())
gtranslator_msg_set_fuzzy(msg->data, FALSE);
- gtranslator_tab_message_go_to(current, msg, FALSE, GTR_TAB_MOVE_NONE);
+ gtranslator_tab_message_go_to(current, msg);
/*
* Emit that message was changed.
@@ -203,16 +207,3 @@
{
gtranslator_show_comment_dialog(window);
}
-
-void
-gtranslator_actions_edit_clear (GtkAction *action,
- GtranslatorWindow *window)
-{
- GtranslatorTab *tab;
-
- g_return_if_fail (GTR_IS_WINDOW (window));
-
- tab = gtranslator_window_get_active_tab (window);
-
- gtranslator_tab_clear_msgstr_views (tab);
-}
Modified: trunk/src/actions-file.c
==============================================================================
--- trunk/src/actions-file.c (original)
+++ trunk/src/actions-file.c Tue Sep 16 09:52:02 2008
@@ -26,20 +26,15 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
-#include <gio/gio.h>
#include <string.h>
-#include <gio/gio.h>
#include "actions.h"
-#include "application.h"
#include "dialogs/close-confirmation-dialog.h"
#include "file-dialogs.h"
#include "notebook.h"
#include "po.h"
-#include "profile.h"
#include "statusbar.h"
#include "tab.h"
-#include "utils.h"
#include "window.h"
#define GTR_TAB_SAVE_AS "gtranslator-tab-save-as"
@@ -54,9 +49,9 @@
* and if not, opens it in a new tab.
*/
gboolean
-gtranslator_open (GFile *location,
- GtranslatorWindow *window,
- GError **error)
+gtranslator_open(const gchar *filename,
+ GtranslatorWindow *window,
+ GError **error)
{
GtranslatorHeader *header;
GtranslatorPo *po;
@@ -70,8 +65,8 @@
* to handle.
*/
po = gtranslator_po_new();
- gtranslator_po_parse (po, location, error);
-
+ gtranslator_po_parse(po, filename, error);
+
if((*error != NULL) && (((GError *)*error)->code != GTR_PO_ERROR_RECOVERY))
return FALSE;
@@ -81,30 +76,29 @@
/*
* If not a crash/temporary file, add to the history.
*/
- gtranslator_recent_add (window, location, project_id);
+ gtranslator_recent_add(window, filename, project_id);
/*
* Create a page to add to our list of open files
*/
tab = gtranslator_window_create_tab(window, po);
- gtranslator_window_set_active_tab (window, GTK_WIDGET (tab));
-
+
/*
* Show the current message.
*/
current = gtranslator_po_get_current_message(po);
- gtranslator_tab_message_go_to (tab, current, FALSE, GTR_TAB_MOVE_NONE);
-
+ gtranslator_tab_message_go_to(tab, current);
+
/*
* Grab the focus
*/
active_view = gtranslator_tab_get_active_view(tab);
gtk_widget_grab_focus(GTK_WIDGET(active_view));
-
+
gtranslator_statusbar_update_progress_bar (GTR_STATUSBAR (gtranslator_window_get_statusbar (window)),
(gdouble)gtranslator_po_get_translated_count (po),
(gdouble)gtranslator_po_get_messages_count (po));
-
+
return TRUE;
}
@@ -112,43 +106,16 @@
gtranslator_po_parse_files_from_dialog (GtkWidget * dialog,
GtranslatorWindow *window)
{
- GSList *po_files, *l;
- GSList *locations = NULL;
- GFile *file, *parent;
- gchar *uri;
+ GSList *po_files;
po_files = gtk_file_chooser_get_uris (GTK_FILE_CHOOSER (dialog));
- for (l = po_files; l != NULL; l = g_slist_next (l))
- {
- GFile *file;
-
- file = g_file_new_for_uri (l->data);
- locations = g_slist_prepend (locations, file);
- }
-
- /*
- * We store latest directory
- */
- file = g_file_new_for_uri (po_files->data);
- g_slist_foreach (po_files, (GFunc)g_free, NULL);
- g_slist_free (po_files);
-
- parent = g_file_get_parent (file);
- g_object_unref (file);
-
- uri = g_file_get_uri (parent);
- g_object_unref (parent);
- _gtranslator_application_set_last_dir (GTR_APP,
- uri);
-
- g_free (uri);
/*
* Open the file via our centralized opening function.
*/
- load_file_list (window, (const GSList *)locations);
- g_slist_foreach (locations, (GFunc)g_object_unref, NULL);
- g_slist_free (locations);
+ load_file_list (window, (const GSList *)po_files);
+
+ g_slist_free (po_files);
/*
* Destroy the dialog
@@ -199,9 +166,7 @@
}
dialog = gtranslator_file_chooser_new (GTK_WINDOW(window),
FILESEL_OPEN,
- _("Open file for translation"),
- _gtranslator_application_get_last_dir (GTR_APP));
-
+ _("Open file for translation"));
/*
* With the gettext parser/writer API, we can't currently read/write
* to remote files with gnome-vfs. Eventually, we should intercept
@@ -222,8 +187,6 @@
GtranslatorPo *po;
GtranslatorTab *tab;
gchar *filename;
- GFile *location;
- GtranslatorStatusbar *status;
tab = GTR_TAB (g_object_get_data (G_OBJECT (dialog),
GTR_TAB_SAVE_AS));
@@ -241,16 +204,11 @@
filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
g_return_if_fail (filename != NULL);
- location = g_file_new_for_path (filename);
- g_free (filename);
-
gtk_widget_destroy (GTK_WIDGET (dialog));
if (po != NULL)
{
- gtranslator_po_set_location (po, location);
-
- g_object_unref (location);
+ gtranslator_po_set_filename (po, filename);
gtranslator_po_save_file (po, &error);
@@ -265,17 +223,15 @@
gtk_dialog_run(GTK_DIALOG(dialog));
gtk_widget_destroy(dialog);
g_clear_error(&error);
+ g_free (filename);
return;
}
/* We have to change the state of the tab */
- gtranslator_po_set_state(po, GTR_PO_STATE_SAVED);
-
- /* Flash a message */
- status = GTR_STATUSBAR (gtranslator_window_get_statusbar (window));
- gtranslator_statusbar_flash_message (status, 0, _("File saved."));
+ gtranslator_po_set_state(po, GTR_PO_STATE_SAVED);
+
+ g_free (filename);
}
- g_object_unref (location);
}
static GtkFileChooserConfirmation
@@ -309,7 +265,7 @@
GtkWidget *dialog = NULL;
GtranslatorTab *current_page;
GtranslatorPo *po;
- GFile *location;
+ const gchar *filename;
gchar *uri = NULL;
gboolean uri_set = FALSE;
@@ -323,8 +279,7 @@
dialog = gtranslator_file_chooser_new (GTK_WINDOW (window),
FILESEL_SAVE,
- _("Save file as..."),
- _gtranslator_application_get_last_dir (GTR_APP));
+ _("Save file as..."));
gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog),
TRUE);
@@ -336,11 +291,9 @@
gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
/*Set the suggested file */
- location = gtranslator_po_get_location (po);
+ filename = gtranslator_po_get_filename (po);
- uri = g_file_get_uri (location);
-
- g_object_unref (location);
+ uri = g_filename_to_uri (filename, NULL, NULL);
if (uri)
uri_set = gtk_file_chooser_set_uri (GTK_FILE_CHOOSER (dialog),
@@ -374,7 +327,6 @@
GError *error = NULL;
GtranslatorTab *current;
GtranslatorPo *po;
- GtranslatorStatusbar *status;
current = gtranslator_window_get_active_tab (window);
po = gtranslator_tab_get_po (current);
@@ -397,78 +349,83 @@
/* We have to change the state of the tab */
gtranslator_po_set_state(po, GTR_PO_STATE_SAVED);
-
- /* Flash a message */
- status = GTR_STATUSBAR (gtranslator_window_get_statusbar (window));
- gtranslator_statusbar_flash_message (status, 0, _("File saved."));
}
static gboolean
-is_duplicated_location (const GSList *locations,
- GFile *u)
+is_duplicated_uri (const GSList *uris,
+ const gchar *u)
{
- GSList *l;
-
- for (l = (GSList *)locations; l != NULL; l = g_slist_next (l))
+ while (uris != NULL)
{
- if (g_file_equal (u, l->data))
+ if (strcmp (u, (const gchar*)uris->data) == 0)
return TRUE;
+
+ uris = g_slist_next (uris);
}
return FALSE;
}
static void
-load_file_list (GtranslatorWindow *window,
- const GSList *locations)
+load_file_list(GtranslatorWindow *window,
+ const GSList *uris)
{
- GSList *locations_to_load = NULL;
+ GSList *uris_to_load = NULL;
const GSList *l;
GError *error = NULL;
+ gchar *path;
GtkWidget *tab;
-
- g_return_if_fail ((locations != NULL) && (locations->data != NULL));
+
+ g_return_if_fail ((uris != NULL) && (uris->data != NULL));
/* Remove the uris corresponding to documents already open
* in "window" and remove duplicates from "uris" list */
- l = locations;
- while (locations != NULL)
+ l = uris;
+ while (uris != NULL)
{
- if (!is_duplicated_location (locations_to_load, locations->data))
+ if (!is_duplicated_uri (uris_to_load, uris->data))
{
/*We need to now if is already loaded in any tab*/
- tab = gtranslator_window_get_tab_from_location (window,
- (GFile *)locations->data);
+ tab = gtranslator_window_get_tab_from_uri (window,
+ (const gchar *)uris->data);
if (tab != NULL)
{
- if (locations == l)
+ if (uris == l)
+ {
gtranslator_window_set_active_tab (window,
tab);
+ }
+
}
else
- locations_to_load = g_slist_prepend (locations_to_load,
- locations->data);
+ {
+ uris_to_load = g_slist_prepend (uris_to_load,
+ uris->data);
+ }
}
- locations = g_slist_next (locations);
+ uris = g_slist_next (uris);
}
- if (locations_to_load == NULL)
+ if (uris_to_load == NULL)
return;
-
- locations_to_load = g_slist_reverse (locations_to_load);
- l = locations_to_load;
- while (locations_to_load != NULL)
+ uris_to_load = g_slist_reverse (uris_to_load);
+ l = uris_to_load;
+
+ while (uris_to_load != NULL)
{
- g_return_if_fail (locations_to_load->data != NULL);
+ g_return_if_fail (uris_to_load->data != NULL);
- if (!gtranslator_open (locations_to_load->data, window, &error))
+ path = g_filename_from_uri((const gchar *)uris_to_load->data,
+ NULL, NULL);
+ if(!gtranslator_open(path, window, &error))
break;
-
- locations_to_load = g_slist_next (locations_to_load);
+
+ g_free(path);
+ uris_to_load = g_slist_next (uris_to_load);
}
/*
@@ -476,7 +433,9 @@
* and free the path
*/
if(error != NULL)
- {
+ {
+ g_free(path);
+
GtkWidget *dialog;
/*
* We have to show the error in a dialog
@@ -502,13 +461,13 @@
* Ignore non-existing URIs
*/
void
-gtranslator_actions_load_locations (GtranslatorWindow *window,
- const GSList *locations)
+gtranslator_actions_load_uris (GtranslatorWindow *window,
+ const GSList *uris)
{
g_return_if_fail (GTR_IS_WINDOW (window));
- g_return_if_fail ((locations != NULL) && (locations->data != NULL));
+ g_return_if_fail ((uris != NULL) && (uris->data != NULL));
- load_file_list (window, locations);
+ load_file_list (window, uris);
}
static void
@@ -655,10 +614,14 @@
gtk_widget_destroy (GTK_WIDGET (dlg));
}
-void
-gtranslator_close_tab (GtranslatorTab *tab,
- GtranslatorWindow *window)
+void
+gtranslator_file_close (GtkAction * widget,
+ GtranslatorWindow *window)
{
+ GtranslatorTab *tab;
+
+ tab = gtranslator_window_get_active_tab (window);
+
g_object_set_data (G_OBJECT (window),
GTR_IS_CLOSING_ALL,
GINT_TO_POINTER (0));
@@ -682,17 +645,6 @@
_gtranslator_window_close_tab (window, tab);
}
-void
-gtranslator_file_close (GtkAction * widget,
- GtranslatorWindow *window)
-{
- GtranslatorTab *tab;
-
- tab = gtranslator_window_get_active_tab (window);
-
- gtranslator_close_tab (tab, window);
-}
-
void
gtranslator_file_quit (GtkAction *action,
GtranslatorWindow *window)
@@ -702,35 +654,7 @@
GtranslatorPo *po;
gint pages;
GList *list = NULL;
- GList *profiles_list = NULL;
- gchar *config_folder;
- gchar *filename;
- GFile *file;
-
- config_folder = gtranslator_utils_get_user_config_dir ();
- filename = g_build_filename (config_folder,
- "profiles.xml",
- NULL);
-
- file = g_file_new_for_path (filename);
-
- profiles_list = gtranslator_application_get_profiles (GTR_APP);
-
- if (profiles_list != NULL) {
- if (g_file_query_exists (file, NULL)) {
- g_file_delete (file, NULL, NULL);
- gtranslator_profile_save_profiles_in_xml (filename);
- } else {
- g_file_create (file,
- G_FILE_CREATE_NONE,
- NULL,
- NULL);
- gtranslator_profile_save_profiles_in_xml (filename);
- }
- }
- g_free (config_folder);
- g_object_unref (file);
-
+
nb = gtranslator_window_get_notebook (window);
pages = gtk_notebook_get_n_pages (GTK_NOTEBOOK(nb));
Modified: trunk/src/actions-go.c
==============================================================================
--- trunk/src/actions-go.c (original)
+++ trunk/src/actions-go.c Tue Sep 16 09:52:02 2008
@@ -25,7 +25,6 @@
#include <glib/gi18n.h>
#include "actions.h"
-#include "jump-dialog.h"
#include "po.h"
#include "tab.h"
#include "window.h"
@@ -40,7 +39,8 @@
current = gtranslator_window_get_active_tab(window);
po = gtranslator_tab_get_po(current);
- gtranslator_tab_go_to_first (current);
+ gtranslator_tab_message_go_to(current,
+ g_list_first(gtranslator_po_get_current_message(po)));
set_sensitive_according_to_message(window, po);
}
@@ -53,7 +53,8 @@
current = gtranslator_window_get_active_tab(window);
po = gtranslator_tab_get_po(current);
- gtranslator_tab_go_to_prev (current);
+ gtranslator_tab_message_go_to(current,
+ g_list_previous(gtranslator_po_get_current_message(po)));
set_sensitive_according_to_message(window, po);
}
@@ -66,7 +67,8 @@
current = gtranslator_window_get_active_tab(window);
po = gtranslator_tab_get_po(current);
- gtranslator_tab_go_to_next (current);
+ gtranslator_tab_message_go_to(current,
+ g_list_next(gtranslator_po_get_current_message(po)));
set_sensitive_according_to_message(window, po);
}
@@ -79,21 +81,35 @@
current = gtranslator_window_get_active_tab(window);
po = gtranslator_tab_get_po(current);
- gtranslator_tab_go_to_last (current);
+ gtranslator_tab_message_go_to(current,
+ g_list_last(gtranslator_po_get_current_message(po)));
set_sensitive_according_to_message(window, po);
}
+void
+gtranslator_message_go_to_no(GtkAction *action,
+ GtranslatorWindow *window)
+{
+ /*gtranslator_message_go_to(g_list_nth(current_page->po->messages,
+ GPOINTER_TO_UINT(number)));*/
+}
+
void
gtranslator_message_go_to_next_fuzzy(GtkAction *action,
GtranslatorWindow *window)
{
GtranslatorTab *current;
GtranslatorPo *po;
+ GList *msg;
- current = gtranslator_window_get_active_tab (window);
- po = gtranslator_tab_get_po (current);
- if (gtranslator_tab_go_to_next_fuzzy (current))
- set_sensitive_according_to_message (window, po);
+ current = gtranslator_window_get_active_tab(window);
+ po = gtranslator_tab_get_po(current);
+ msg = gtranslator_po_get_next_fuzzy(po);
+ if(msg != NULL)
+ {
+ gtranslator_tab_message_go_to(current, msg);
+ set_sensitive_according_to_message(window, po);
+ }
}
void
@@ -102,11 +118,16 @@
{
GtranslatorTab *current;
GtranslatorPo *po;
+ GList *msg;
current = gtranslator_window_get_active_tab(window);
po = gtranslator_tab_get_po(current);
- if (gtranslator_tab_go_to_prev_fuzzy (current))
- set_sensitive_according_to_message (window, po);
+ msg = gtranslator_po_get_prev_fuzzy(po);
+ if(msg != NULL)
+ {
+ gtranslator_tab_message_go_to(current, msg);
+ set_sensitive_according_to_message(window, po);
+ }
}
void
@@ -119,8 +140,12 @@
current = gtranslator_window_get_active_tab(window);
po = gtranslator_tab_get_po(current);
- if (gtranslator_tab_go_to_next_untrans (current))
- set_sensitive_according_to_message (window, po);
+ msg = gtranslator_po_get_next_untrans(po);
+ if(msg != NULL)
+ {
+ gtranslator_tab_message_go_to(current, msg);
+ set_sensitive_according_to_message(window, po);
+ }
}
void
@@ -133,41 +158,10 @@
current = gtranslator_window_get_active_tab(window);
po = gtranslator_tab_get_po(current);
- if (gtranslator_tab_go_to_prev_untrans (current))
- set_sensitive_according_to_message (window, po);
+ msg = gtranslator_po_get_prev_untrans(po);
+ if(msg != NULL)
+ {
+ gtranslator_tab_message_go_to(current, msg);
+ set_sensitive_according_to_message(window, po);
+ }
}
-
-void
-gtranslator_message_go_to_next_fuzzy_or_untranslated (GtkAction *action,
- GtranslatorWindow *window)
-{
- GtranslatorTab *current;
- GtranslatorPo *po;
- GList *msg;
-
- current = gtranslator_window_get_active_tab (window);
- po = gtranslator_tab_get_po (current);
- if (gtranslator_tab_go_to_next_fuzzy_or_untrans (current))
- set_sensitive_according_to_message (window, po);
-}
-
-void
-gtranslator_message_go_to_prev_fuzzy_or_untranslated (GtkAction *action,
- GtranslatorWindow *window)
-{
- GtranslatorTab *current;
- GtranslatorPo *po;
- GList *msg;
-
- current = gtranslator_window_get_active_tab (window);
- po = gtranslator_tab_get_po (current);
- if (gtranslator_tab_go_to_prev_fuzzy_or_untrans (current))
- set_sensitive_according_to_message (window, po);
-}
-
-void
-gtranslator_message_jump (GtkAction *action,
- GtranslatorWindow *window)
-{
- gtranslator_show_jump_dialog (window);
-}
\ No newline at end of file
Modified: trunk/src/actions-help.c
==============================================================================
--- trunk/src/actions-help.c (original)
+++ trunk/src/actions-help.c Tue Sep 16 09:52:02 2008
@@ -30,31 +30,6 @@
#include <gtk/gtkaboutdialog.h>
-/*
- * Show the user's guide for gtranslator
- */
-void
-gtranslator_cmd_help_contents (GtkAction *action,
- GtranslatorWindow *window)
-{
- GError *error = NULL;
- gboolean ret;
- GtkWidget *dialog;
-
- ret = g_app_info_launch_default_for_uri ("ghelp:gtranslator", NULL, &error);
-
- if (ret == FALSE)
- {
- dialog = gtk_message_dialog_new (GTK_WINDOW (window),
- GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
- _("Unable to open help file for gtranslator"));
-
- gtk_dialog_run (GTK_DIALOG (dialog));
- gtk_widget_destroy (dialog);
- g_error_free (error);
- }
-}
/*
* Creates and shows the about box for gtranslator.
Modified: trunk/src/actions-search.c
==============================================================================
--- trunk/src/actions-search.c (original)
+++ trunk/src/actions-search.c Tue Sep 16 09:52:02 2008
@@ -274,7 +274,7 @@
if(l->next == NULL)
{
if(!wrap_around)
- return FALSE;
+ return;
l = g_list_first(l);
}
else l = l->next;
@@ -283,25 +283,19 @@
if(l->prev == NULL)
{
if(!wrap_around)
- return FALSE;
+ return;
l = g_list_last(l);
}
else l = l->prev;
}
- gtranslator_tab_message_go_to(tab, l, TRUE, GTR_TAB_MOVE_NONE);
+ gtranslator_tab_message_go_to(tab, l);
}
else{
while(viewsaux != NULL)
{
- gboolean aux = found;
-
found = run_search(GTR_VIEW(viewsaux->data), found);
if(found)
- {
- gtranslator_tab_message_go_to (tab, l, FALSE, GTR_TAB_MOVE_NONE);
- run_search (GTR_VIEW (viewsaux->data), aux);
return TRUE;
- }
viewsaux = viewsaux->next;
}
if(!search_backwards)
@@ -309,7 +303,7 @@
if(l->next == NULL)
{
if(!wrap_around)
- return FALSE;
+ return;
l = g_list_first(l);
}
else l = l->next;
@@ -318,16 +312,16 @@
if(l->prev == NULL)
{
if(!wrap_around)
- return FALSE;
+ return;
l = g_list_last(l);
}
else l = l->prev;
}
- gtranslator_tab_message_go_to(tab, l, TRUE, GTR_TAB_MOVE_NONE);
+ gtranslator_tab_message_go_to(tab, l);
viewsaux = views;
}
}while(l != current);
-
+
return FALSE;
}
@@ -544,11 +538,9 @@
if(aux->next == NULL)
aux = g_list_first(aux);
else aux = aux->next;
- gtranslator_tab_message_go_to(tab, aux, TRUE, GTR_TAB_MOVE_NONE);
+ gtranslator_tab_message_go_to(tab, aux);
}while(current_msg != aux);
- gtranslator_tab_message_go_to(tab, aux, FALSE, GTR_TAB_MOVE_NONE);
-
if (count > 0)
{
phrase_found (window, count);
Modified: trunk/src/actions-view.c
==============================================================================
--- trunk/src/actions-view.c (original)
+++ trunk/src/actions-view.c Tue Sep 16 09:52:02 2008
@@ -16,29 +16,3 @@
*/
#include "actions.h"
-
-void
-gtranslator_actions_view_context (GtkAction *action,
- GtranslatorWindow *window)
-{
- GtranslatorTab *tab;
- GtkWidget *context;
-
- tab = gtranslator_window_get_active_tab (window);
- context = GTK_WIDGET (gtranslator_tab_get_context_panel (tab));
-
- gtranslator_tab_show_lateral_panel_widget (tab, context);
-}
-
-void
-gtranslator_actions_view_translation_memory (GtkAction *action,
- GtranslatorWindow *window)
-{
- GtranslatorTab *tab;
- GtkWidget *tm_ui;
-
- tab = gtranslator_window_get_active_tab (window);
- tm_ui = GTK_WIDGET (gtranslator_tab_get_translation_memory_ui (tab));
-
- gtranslator_tab_show_lateral_panel_widget (tab, tm_ui);
-}
\ No newline at end of file
Modified: trunk/src/actions.h
==============================================================================
--- trunk/src/actions.h (original)
+++ trunk/src/actions.h Tue Sep 16 09:52:02 2008
@@ -20,7 +20,6 @@
#define __ACTIONS_H__
#include <gtk/gtkaction.h>
-#include <gio/gio.h>
#include "window.h"
G_BEGIN_DECLS
@@ -35,21 +34,18 @@
void gtranslator_save_file_as_dialog (GtkAction * action,
GtranslatorWindow *window);
-gboolean gtranslator_open (GFile *location,
+gboolean gtranslator_open (const gchar *filename,
GtranslatorWindow *window,
GError **error);
-void gtranslator_close_tab (GtranslatorTab *tab,
- GtranslatorWindow *window);
-
void gtranslator_file_close (GtkAction * widget,
GtranslatorWindow *window);
void gtranslator_file_quit (GtkAction *action,
GtranslatorWindow *window);
-void gtranslator_actions_load_locations (GtranslatorWindow *window,
- const GSList *locations);
+void gtranslator_actions_load_uris (GtranslatorWindow *window,
+ const GSList *uris);
/*Edit*/
void gtranslator_actions_edit_undo (GtkAction *action,
@@ -84,16 +80,7 @@
void gtranslator_actions_edit_preferences (GtkAction *action,
GtranslatorWindow *window);
-void gtranslator_actions_edit_clear (GtkAction *action,
- GtranslatorWindow *window);
-
/* View */
-void gtranslator_actions_view_context (GtkAction *action,
- GtranslatorWindow *window);
-
-void gtranslator_actions_view_translation_memory
- (GtkAction *action,
- GtranslatorWindow *window);
/*Go*/
void gtranslator_message_go_to_first (GtkAction * action,
@@ -122,17 +109,6 @@
(GtkAction *action,
GtranslatorWindow *window);
-void gtranslator_message_go_to_next_fuzzy_or_untranslated
- (GtkAction *action,
- GtranslatorWindow *window);
-
-void gtranslator_message_go_to_prev_fuzzy_or_untranslated
- (GtkAction *action,
- GtranslatorWindow *window);
-
-void gtranslator_message_jump (GtkAction *action,
- GtranslatorWindow *window);
-
/*Search*/
void _gtranslator_actions_search_find (GtkAction *action,
GtranslatorWindow *window);
@@ -144,9 +120,6 @@
void gtranslator_window_show_home_page (GtkAction *action,
gpointer useless);
-void gtranslator_cmd_help_contents (GtkAction *action,
- GtranslatorWindow *window);
-
void gtranslator_about_dialog (GtkAction *action,
GtranslatorWindow *window);
Modified: trunk/src/application.c
==============================================================================
--- trunk/src/application.c (original)
+++ trunk/src/application.c Tue Sep 16 09:52:02 2008
@@ -24,12 +24,6 @@
#include "utils.h"
#include "window.h"
#include "egg-toolbars-model.h"
-#include "dialogs/preferences-dialog.h"
-#include "dialogs/assistant.h"
-#include "./translation-memory/translation-memory.h"
-#include "./translation-memory/berkeley/berkeley.h"
-
-
#include <glib.h>
#include <glib-object.h>
@@ -48,22 +42,11 @@
{
GList *windows;
GtranslatorWindow *active_window;
-
- GList *profiles;
- GtranslatorProfile *active_profile;
- GtranslatorPreferencesDialog *preferences_dialog;
-
gchar *toolbars_file;
EggToolbarsModel *toolbars_model;
GtkIconFactory *icon_factory;
-
- gchar *last_dir;
-
- GtranslatorTranslationMemory *tm;
-
- gboolean first_run;
};
static gchar *
@@ -140,10 +123,7 @@
priv = application->priv;
priv->windows = NULL;
- priv->last_dir = NULL;
- priv->first_run = FALSE;
- priv->profiles = NULL;
-
+
/*
* Creating config folder
*/
@@ -180,7 +160,6 @@
gtranslator_application_shutdown (application);
}
- priv->first_run = TRUE;
g_object_unref (file);
}
@@ -190,7 +169,7 @@
"gtr-toolbar.xml",
NULL);
- filename = g_build_filename (PKGDATADIR,
+ filename = g_build_filename (DATADIR,
"gtr-toolbar.xml",
NULL);
@@ -216,15 +195,6 @@
/* Create Icon factory */
application->priv->icon_factory = gtk_icon_factory_new ();
gtk_icon_factory_add_default (application->priv->icon_factory);
-
- /* Creating translation memory */
- application->priv->tm = GTR_TRANSLATION_MEMORY (gtranslator_berkeley_new ());
- gtranslator_translation_memory_set_max_omits (application->priv->tm,
- gtranslator_prefs_manager_get_missing_words ());
- gtranslator_translation_memory_set_max_delta (application->priv->tm,
- gtranslator_prefs_manager_get_sentence_length ());
- gtranslator_translation_memory_set_max_items (application->priv->tm,
- 10);
}
@@ -235,12 +205,7 @@
if (app->priv->icon_factory)
g_object_unref (app->priv->icon_factory);
-
- g_free (app->priv->last_dir);
- if (app->priv->tm)
- g_object_unref (app->priv->tm);
-
G_OBJECT_CLASS (gtranslator_application_parent_class)->finalize (object);
}
@@ -261,13 +226,6 @@
gtk_main_quit ();
}
-/**
- * gtranslator_application_get_default:
- *
- * Returns the default instance of the application.
- *
- * Returns: the default instance of the application.
- */
GtranslatorApplication *
gtranslator_application_get_default (void)
{
@@ -284,14 +242,6 @@
return instance;
}
-/**
- * gtranslator_application_open_window:
- * @app: a #GtranslatorApplication
- *
- * Creates a new #GtranslatorWindow and shows it.
- *
- * Returns: the #GtranslatorWindow to be opened
- */
GtranslatorWindow *
gtranslator_application_open_window (GtranslatorApplication *app)
{
@@ -317,43 +267,23 @@
}
g_signal_connect(window, "delete-event",
- G_CALLBACK(on_window_delete_event_cb), app);
+ G_CALLBACK(on_window_delete_event_cb), GTR_APP);
g_signal_connect(window, "destroy",
- G_CALLBACK(on_window_destroy_cb), app);
+ G_CALLBACK(on_window_destroy_cb), GTR_APP);
gtk_widget_show(GTK_WIDGET(window));
- /*
- * If it is the first run, the default directory was created in this
- * run, then we show the First run Assistant
- */
- if (app->priv->first_run)
- gtranslator_show_assistant (window);
-
return window;
}
-/**
- * _gtranslator_application_get_toolbars_model:
- * @application: a #GtranslatorApplication
- *
- * Returns the toolbar model.
- *
- * Retuns: the toolbar model.
- */
+
GObject *
_gtranslator_application_get_toolbars_model (GtranslatorApplication *application)
{
return G_OBJECT (application->priv->toolbars_model);
}
-/**
- * _gtranslator_application_save_toolbars_model:
- * @application: a #GtranslatorApplication
- *
- * Saves the toolbar model.
- */
void
_gtranslator_application_save_toolbars_model (GtranslatorApplication *application)
{
@@ -361,12 +291,6 @@
application->priv->toolbars_file, "1.0");
}
-/**
- * gtranslator_application_shutdown:
- * @app: a #GtranslatorApplication
- *
- * Shutdowns the application.
- */
void
gtranslator_application_shutdown(GtranslatorApplication *app)
{
@@ -437,78 +361,6 @@
return app->priv->windows;
}
-/**
- * gtranslator_application_get_active_profile:
- * @app: a #GtranslatorApplication
- *
- * Return value: the active #GtranslatorProfile
- **/
-GtranslatorProfile *
-gtranslator_application_get_active_profile (GtranslatorApplication *app)
-{
- return app->priv->active_profile;
-}
-
-/**
- * gtranslator_application_set_profiles:
- * @app: a #GtranslatorApplication
- * @profiles: a #GList
- *
- **/
-void
-gtranslator_application_set_active_profile (GtranslatorApplication *app,
- GtranslatorProfile *profile) {
- app->priv->active_profile = profile;
-}
-
-/**
- * gtranslator_application_get_profiles:
- * @app: a #GtranslatorApplication
- *
- * Return value: a list of all profiles.
- **/
-GList *
-gtranslator_application_get_profiles (GtranslatorApplication *app)
-{
- g_return_val_if_fail (GTR_IS_APPLICATION (app), NULL);
-
- return app->priv->profiles;
-}
-
-/**
- * gtranslator_application_set_profiles:
- * @app: a #GtranslatorApplication
- * @profiles: a #GList
- *
- **/
-void
-gtranslator_application_set_profiles (GtranslatorApplication *app,
- GList *profiles) {
- app->priv->profiles = profiles;
-}
-
-GtranslatorPreferencesDialog *
-gtranslator_application_get_preferences_dialog (GtranslatorApplication *app)
-{
- return app->priv->preferences_dialog;
-}
-
-void
-gtranslator_application_set_preferences_dialog (GtranslatorApplication *app,
- GtranslatorPreferencesDialog *dlg)
-{
- app->priv->preferences_dialog = dlg;
-}
-
-
-/**
- * gtranslator_application_register_icon:
- * @app: a #GtranslatorApplication
- * @icon: the name of the icon
- * @stock_id: the stock id for the new icon
- *
- * Registers a new @icon with the @stock_id.
- */
void
gtranslator_application_register_icon (GtranslatorApplication *app,
const gchar *icon,
@@ -533,40 +385,3 @@
g_free (path);
gtk_icon_source_free (icon_source);
}
-
-/**
- * gtranslator_application_get_last_dir:
- * @app: a #GtranslatorApplication
- *
- * Return value: the last dir where a file was opened in the GtkFileChooser
- */
-const gchar *
-_gtranslator_application_get_last_dir (GtranslatorApplication *app)
-{
- g_return_val_if_fail (GTR_IS_APPLICATION (app), NULL);
-
- return app->priv->last_dir;
-}
-
-/**
- * gtranslator_application_set_last_dir:
- * @app: a #GtranslatorApplication
- * @last_dir: the path of the last directory where a file was opened in the
- * GtkFileChooser.
- */
-void
-_gtranslator_application_set_last_dir (GtranslatorApplication *app,
- const gchar *last_dir)
-{
- g_return_if_fail (GTR_IS_APPLICATION (app));
-
- app->priv->last_dir = g_strdup (last_dir);
-}
-
-GObject *
-gtranslator_application_get_translation_memory (GtranslatorApplication *app)
-{
- g_return_val_if_fail (GTR_IS_APPLICATION (app), NULL);
-
- return G_OBJECT (app->priv->tm);
-}
Modified: trunk/src/application.h
==============================================================================
--- trunk/src/application.h (original)
+++ trunk/src/application.h Tue Sep 16 09:52:02 2008
@@ -23,9 +23,7 @@
#include <glib-object.h>
#include <gtk/gtk.h>
-#include "profile.h"
#include "window.h"
-#include "dialogs/preferences-dialog.h"
G_BEGIN_DECLS
@@ -83,30 +81,11 @@
GtranslatorWindow *gtranslator_application_get_active_window (GtranslatorApplication * app);
-const GList *gtranslator_application_get_windows (GtranslatorApplication *app);
-
-GtranslatorProfile *gtranslator_application_get_active_profile (GtranslatorApplication *app);
-
-void gtranslator_application_set_active_profile (GtranslatorApplication *app,
- GtranslatorProfile *profile);
-
-GList *gtranslator_application_get_profiles (GtranslatorApplication *app);
-
-void gtranslator_application_set_profiles (GtranslatorApplication *app,
- GList *profiles);
-
-GtranslatorPreferencesDialog *
-gtranslator_application_get_preferences_dialog (GtranslatorApplication *app);
-
-void
-gtranslator_application_set_preferences_dialog (GtranslatorApplication *app,
- GtranslatorPreferencesDialog *dlg);
+const GList *gtranslator_application_get_windows (GtranslatorApplication *app);
void gtranslator_application_register_icon (GtranslatorApplication *app,
const gchar *icon,
const gchar *stock_id);
-
-GObject *gtranslator_application_get_translation_memory (GtranslatorApplication *app);
/* Non exported funcs */
@@ -114,11 +93,6 @@
void _gtranslator_application_save_toolbars_model (GtranslatorApplication *application);
-const gchar * _gtranslator_application_get_last_dir (GtranslatorApplication *app);
-
-void _gtranslator_application_set_last_dir (GtranslatorApplication *app,
- const gchar *last_dir);
-
G_END_DECLS
#endif /* __APPLICATION_H__ */
Modified: trunk/src/dialogs/Makefile.am
==============================================================================
--- trunk/src/dialogs/Makefile.am (original)
+++ trunk/src/dialogs/Makefile.am Tue Sep 16 09:52:02 2008
@@ -4,7 +4,7 @@
-I$(top_srcdir)/src \
-I$(top_builddir)/src \
-I$(top_srcdir)/src/plugin-system \
- -DPKGDATADIR=\""$(pkgdatadir)"\" \
+ -DDATADIR=\""$(pkgdatadir)"\" \
-DPIXMAPSDIR=\""$(datadir)"/pixmaps/gtranslator\" \
$(GTRANSLATOR_CFLAGS) \
$(WARN_CFLAGS) \
@@ -27,11 +27,7 @@
comment-dialog.c \
comment-dialog.h \
profile-dialog.c \
- profile-dialog.h \
- assistant.c \
- assistant.h \
- jump-dialog.c \
- jump-dialog.h
+ profile-dialog.h
gladedir = $(pkgdatadir)
@@ -40,8 +36,7 @@
search-dialog.glade \
header-dialog.glade \
comment-dialog.glade \
- profile-dialog.glade \
- jump-dialog.glade
+ profile-dialog.glade
EXTRA_DIST = \
$(glade_DATA)
Modified: trunk/src/dialogs/close-confirmation-dialog.c
==============================================================================
--- trunk/src/dialogs/close-confirmation-dialog.c (original)
+++ trunk/src/dialogs/close-confirmation-dialog.c Tue Sep 16 09:52:02 2008
@@ -356,8 +356,7 @@
GtkWidget *primary_label;
GtkWidget *image;
GtranslatorPo *doc;
- GFile *location;
- gchar *doc_name;
+ const gchar *doc_name;
gchar *str;
gchar *markup_str;
@@ -376,13 +375,10 @@
gtk_misc_set_alignment (GTK_MISC (primary_label), 0.0, 0.5);
gtk_label_set_selectable (GTK_LABEL (primary_label), TRUE);
- location = gtranslator_po_get_location (doc);
- doc_name = g_file_get_path (location);
- g_object_unref (location);
+ doc_name = gtranslator_po_get_filename (doc);
str = g_markup_printf_escaped (_("Save the changes to document \"%s\" before closing?"),
doc_name);
- g_free (doc_name);
markup_str = g_strconcat ("<span weight=\"bold\" size=\"larger\">", str, "</span>", NULL);
g_free (str);
@@ -419,14 +415,11 @@
while (docs != NULL)
{
GtranslatorPo *po;
- GFile *location;
- gchar *name;
+ const gchar *name;
po = GTR_PO (docs->data);
- location = gtranslator_po_get_location (po);
- name = g_file_get_path (location);
- g_object_unref (location);
+ name = gtranslator_po_get_filename (po);
gtk_list_store_append (GTK_LIST_STORE (store), &iter);
gtk_list_store_set (GTK_LIST_STORE (store), &iter,
@@ -435,7 +428,6 @@
DOC_COLUMN, po,
-1);
- g_free (name);
docs = g_list_next (docs);
}
}
Modified: trunk/src/dialogs/comment-dialog.c
==============================================================================
--- trunk/src/dialogs/comment-dialog.c (original)
+++ trunk/src/dialogs/comment-dialog.c Tue Sep 16 09:52:02 2008
@@ -21,6 +21,7 @@
#endif
#include "comment-dialog.h"
+#include "comment.h"
#include "tab.h"
#include "utils.h"
#include "window.h"
@@ -44,7 +45,7 @@
GtkWidget *main_box;
GtkWidget *comment;
};
-
+
static void
comment_changed_cb (GtkTextBuffer *buffer,
GtranslatorWindow *window)
@@ -52,18 +53,23 @@
gchar *text;
GtkTextIter start, end;
GtranslatorTab *tab;
+ GtranslatorCommentPanel *comment;
GtranslatorPo *po;
GList *msg;
tab = gtranslator_window_get_active_tab(window);
po = gtranslator_tab_get_po(tab);
+ comment = gtranslator_tab_get_comment_panel(tab);
msg = gtranslator_po_get_current_message(po);
gtk_text_buffer_get_bounds(buffer, &start, &end);
text = gtk_text_buffer_get_text(buffer, &start, &end, TRUE);
gtranslator_msg_set_comment(msg->data, text);
+
+ gtranslator_comment_panel_set_comments(comment, text);
}
+
static void
dialog_response_handler (GtkDialog *dlg,
@@ -107,7 +113,7 @@
NULL);
/*Glade*/
- ret = gtranslator_utils_get_glade_widgets(PKGDATADIR "/comment-dialog.glade",
+ ret = gtranslator_utils_get_glade_widgets(DATADIR "/comment-dialog.glade",
"main_box",
&error_widget,
@@ -167,12 +173,11 @@
"destroy",
G_CALLBACK (gtk_widget_destroyed),
&dlg);
- g_signal_connect (buf,
- "changed",
- G_CALLBACK (comment_changed_cb),
- window);
-
- gtk_widget_show (GTK_WIDGET(dlg));
+ g_signal_connect(buf,
+ "changed",
+ G_CALLBACK (comment_changed_cb),
+ window);
+ gtk_widget_show_all(GTK_WIDGET(dlg));
}
gtk_text_buffer_set_text(buf, gtranslator_msg_get_comment(msg->data), -1);
Modified: trunk/src/dialogs/file-dialogs.c
==============================================================================
--- trunk/src/dialogs/file-dialogs.c (original)
+++ trunk/src/dialogs/file-dialogs.c Tue Sep 16 09:52:02 2008
@@ -31,8 +31,7 @@
GtkWidget *
gtranslator_file_chooser_new (GtkWindow *parent,
FileselMode mode,
- const gchar *title,
- const gchar *dir)
+ gchar *title)
{
GtkWidget *dialog;
GtkFileFilter *filter;
@@ -44,11 +43,6 @@
(mode == FILESEL_SAVE) ? GTK_STOCK_SAVE : GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
NULL);
gtk_dialog_set_default_response(GTK_DIALOG(dialog),GTK_RESPONSE_ACCEPT);
-
- if (dir)
- gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (dialog),
- dir);
-
if (mode != FILESEL_SAVE)
{
/* We set a multi selection dialog */
@@ -63,7 +57,7 @@
filter = gtk_file_filter_new();
gtk_file_filter_set_name(filter,_("Gettext translation template"));
- gtk_file_filter_add_pattern(filter,"*.pot");
+ gtk_file_filter_add_mime_type(filter,"text/x-gettext-translation-template");
gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog),filter);
filter = gtk_file_filter_new();
Modified: trunk/src/dialogs/file-dialogs.h
==============================================================================
--- trunk/src/dialogs/file-dialogs.h (original)
+++ trunk/src/dialogs/file-dialogs.h Tue Sep 16 09:52:02 2008
@@ -29,7 +29,6 @@
GtkWidget *gtranslator_file_chooser_new (GtkWindow *parent,
FileselMode mode,
- const gchar *title,
- const gchar *dir);
+ gchar *title);
#endif
Modified: trunk/src/dialogs/header-dialog.c
==============================================================================
--- trunk/src/dialogs/header-dialog.c (original)
+++ trunk/src/dialogs/header-dialog.c Tue Sep 16 09:52:02 2008
@@ -78,7 +78,7 @@
static void
take_my_options_checkbutton_toggled(GtkToggleButton *button,
- GtranslatorHeaderDialog *dlg)
+ GtranslatorHeaderDialog *dlg)
{
g_return_if_fail(button == GTK_TOGGLE_BUTTON(dlg->priv->take_my_options));
@@ -98,8 +98,6 @@
{
const gchar *text;
- gtranslator_header_set_header_changed (header, TRUE);
-
text = gtk_entry_get_text(GTK_ENTRY(gobject));
if (text)
@@ -113,8 +111,6 @@
{
const gchar *text;
- gtranslator_header_set_header_changed (header, TRUE);
-
text = gtk_entry_get_text(GTK_ENTRY(gobject));
if (text)
@@ -128,8 +124,6 @@
{
const gchar *text;
- gtranslator_header_set_header_changed (header, TRUE);
-
text = gtk_entry_get_text(GTK_ENTRY(gobject));
if (text)
@@ -143,8 +137,6 @@
{
const gchar *text;
- gtranslator_header_set_header_changed (header, TRUE);
-
text = gtk_entry_get_text(GTK_ENTRY(gobject));
if (text)
@@ -158,8 +150,6 @@
{
const gchar *text;
- gtranslator_header_set_header_changed (header, TRUE);
-
text = gtk_entry_get_text(GTK_ENTRY(gobject));
if (text)
@@ -173,8 +163,6 @@
{
const gchar *text;
- gtranslator_header_set_header_changed (header, TRUE);
-
text = gtk_entry_get_text(GTK_ENTRY(gobject));
if (text)
@@ -212,12 +200,8 @@
static void save_header(GtranslatorPo *po)
{
- GtranslatorHeader *header;
-
- header = gtranslator_po_get_header (po);
-
- if (gtranslator_header_get_header_changed (header))
- gtranslator_po_set_state (po, GTR_PO_STATE_MODIFIED);
+ gtranslator_po_save_header_in_msg (po);
+ gtranslator_po_set_state (po, GTR_PO_STATE_MODIFIED);
}
static void gtranslator_header_dialog_init (GtranslatorHeaderDialog *dlg)
@@ -247,12 +231,12 @@
G_CALLBACK (gtk_widget_destroy),
NULL);
- ret = gtranslator_utils_get_glade_widgets(PKGDATADIR"/header-dialog.glade",
+ ret = gtranslator_utils_get_glade_widgets(DATADIR"/header-dialog.glade",
"main_box",
&error_widget,
"main_box", &dlg->priv->main_box,
"notebook", &dlg->priv->notebook,
- "lang_vbox", &dlg->priv->lang_vbox,
+ "vbox1", &dlg->priv->lang_vbox,
"prj_id_version", &dlg->priv->prj_id_version,
"rmbt", &dlg->priv->rmbt,
"prj_comment", &dlg->priv->prj_comment,
@@ -288,15 +272,6 @@
gtk_widget_set_sensitive(dlg->priv->po_date, FALSE);
gtk_widget_set_sensitive(dlg->priv->charset, FALSE);
- if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (dlg->priv->take_my_options))) {
-
- gtk_widget_set_sensitive(dlg->priv->translator, !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (dlg->priv->take_my_options)));
- gtk_widget_set_sensitive(dlg->priv->tr_email, !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (dlg->priv->take_my_options)));
- gtk_widget_set_sensitive(dlg->priv->language, !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (dlg->priv->take_my_options)));
- gtk_widget_set_sensitive(dlg->priv->lg_email, !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (dlg->priv->take_my_options)));
- gtk_widget_set_sensitive(dlg->priv->encoding, !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (dlg->priv->take_my_options)));
- }
-
/*Connect signals*/
g_signal_connect(dlg->priv->take_my_options, "toggled",
G_CALLBACK(take_my_options_checkbutton_toggled),
Modified: trunk/src/dialogs/header-dialog.glade
==============================================================================
--- trunk/src/dialogs/header-dialog.glade (original)
+++ trunk/src/dialogs/header-dialog.glade Tue Sep 16 09:52:02 2008
@@ -2,66 +2,342 @@
<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
<!--*- mode: xml -*-->
<glade-interface>
- <widget class="GtkDialog" id="header_dialog">
+ <widget class="GtkDialog" id="e_header">
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="border_width">5</property>
+ <property name="title" translatable="yes">Edit Header</property>
+ <property name="modal">True</property>
<property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+ <property name="destroy_with_parent">True</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox2">
+ <widget class="GtkVBox" id="main_box">
<property name="visible">True</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkVBox" id="main_box">
+ <widget class="GtkNotebook" id="notebook">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<child>
- <widget class="GtkNotebook" id="notebook">
+ <widget class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="border_width">6</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow1">
+ <widget class="GtkTextView" id="prj_comment">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="border_width">6</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
- <child>
- <widget class="GtkTextView" id="prj_comment">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="editable">False</property>
- </widget>
- </child>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="editable">False</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Comment</property>
+ </widget>
+ <packing>
+ <property name="type">tab</property>
+ <property name="position">2</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkTable" id="table1">
+ <property name="visible">True</property>
+ <property name="border_width">6</property>
+ <property name="n_rows">5</property>
+ <property name="n_columns">3</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label15">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ </widget>
+ <packing>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label16">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ </widget>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label17">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ </widget>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label18">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ </widget>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label19">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ </widget>
+ <packing>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label23">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="xpad">12</property>
+ <property name="label" translatable="yes">Project Id _version:</property>
+ <property name="use_underline">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkEntry" id="prj_id_version">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label24">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="xpad">12</property>
+ <property name="label" translatable="yes">Pot _file creation date:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">pot_date</property>
+ </widget>
+ <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>
+ <widget class="GtkEntry" id="pot_date">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">False</property>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label25">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="xpad">12</property>
+ <property name="label" translatable="yes">Po file _revision date:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">po_date</property>
</widget>
+ <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>
- <widget class="GtkLabel" id="label3">
+ <widget class="GtkEntry" id="po_date">
<property name="visible">True</property>
- <property name="label" translatable="yes">Comment</property>
+ <property name="can_focus">True</property>
+ <property name="editable">False</property>
</widget>
<packing>
- <property name="type">tab</property>
- <property name="position">2</property>
- <property name="tab_fill">False</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkTable" id="table1">
+ <widget class="GtkLabel" id="label26">
<property name="visible">True</property>
- <property name="border_width">6</property>
- <property name="n_rows">5</property>
+ <property name="xalign">0</property>
+ <property name="xpad">12</property>
+ <property name="label" translatable="yes">Report message _bugs to:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">rmbt</property>
+ </widget>
+ <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>
+ <widget class="GtkEntry" id="rmbt">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Project</property>
+ </widget>
+ <packing>
+ <property name="type">tab</property>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="vbox1">
+ <property name="visible">True</property>
+ <property name="border_width">6</property>
+ <child>
+ <widget class="GtkCheckButton" id="take_my_options">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Use my options to complete the following entries:</property>
+ <property name="use_underline">True</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="padding">6</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkTable" id="lang_page">
+ <property name="visible">True</property>
+ <property name="n_rows">6</property>
<property name="n_columns">3</property>
<property name="row_spacing">6</property>
<child>
- <placeholder/>
+ <widget class="GtkEntry" id="encoding_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkEntry" id="charset_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="editable">False</property>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="y_options"></property>
+ </packing>
</child>
<child>
- <placeholder/>
+ <widget class="GtkEntry" id="lg_email_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="y_options"></property>
+ </packing>
</child>
<child>
- <widget class="GtkLabel" id="label15">
+ <widget class="GtkEntry" id="language_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label27">
<property name="visible">True</property>
<property name="xalign">0</property>
</widget>
@@ -71,7 +347,7 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label16">
+ <widget class="GtkLabel" id="label28">
<property name="visible">True</property>
<property name="xalign">0</property>
</widget>
@@ -83,7 +359,7 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label17">
+ <widget class="GtkLabel" id="label29">
<property name="visible">True</property>
<property name="xalign">0</property>
</widget>
@@ -95,7 +371,7 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label18">
+ <widget class="GtkLabel" id="label30">
<property name="visible">True</property>
<property name="xalign">0</property>
</widget>
@@ -107,7 +383,7 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label19">
+ <widget class="GtkLabel" id="label31">
<property name="visible">True</property>
<property name="xalign">0</property>
</widget>
@@ -119,39 +395,41 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label23">
+ <widget class="GtkLabel" id="label32">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="xpad">12</property>
- <property name="label" translatable="yes">Project Id _version:</property>
- <property name="use_underline">True</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="x_options"></property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="prj_id_version">
+ <widget class="GtkLabel" id="label33">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="xalign">0</property>
+ <property name="xpad">12</property>
+ <property name="label" translatable="yes">Translator's _name:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">tr_name</property>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label24">
+ <widget class="GtkLabel" id="label34">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="xpad">12</property>
- <property name="label" translatable="yes">Pot _file creation date:</property>
+ <property name="label" translatable="yes">Translator's _email:</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">pot_date</property>
+ <property name="mnemonic_widget">tr_email</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -163,397 +441,117 @@
</packing>
</child>
<child>
- <widget class="GtkEntry" id="pot_date">
+ <widget class="GtkLabel" id="label35">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">False</property>
+ <property name="xalign">0</property>
+ <property name="xpad">12</property>
+ <property name="label" translatable="yes">_Language:</property>
+ <property name="use_underline">True</property>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <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>
- <widget class="GtkLabel" id="label25">
+ <widget class="GtkLabel" id="label36">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="xpad">12</property>
- <property name="label" translatable="yes">Po file _revision date:</property>
+ <property name="label" translatable="yes">Language gro_up email:</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">po_date</property>
</widget>
<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="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>
- <widget class="GtkEntry" id="po_date">
+ <widget class="GtkLabel" id="label37">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">False</property>
+ <property name="xalign">0</property>
+ <property name="xpad">12</property>
+ <property name="label" translatable="yes">Char_set:</property>
+ <property name="use_underline">True</property>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <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>
- <widget class="GtkLabel" id="label26">
+ <widget class="GtkLabel" id="label38">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="xpad">12</property>
- <property name="label" translatable="yes">Report message _bugs to:</property>
+ <property name="label" translatable="yes">Enc_oding:</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">rmbt</property>
</widget>
<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="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>
- <widget class="GtkEntry" id="rmbt">
+ <widget class="GtkEntry" id="tr_name">
<property name="visible">True</property>
<property name="can_focus">True</property>
</widget>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
<property name="y_options"></property>
</packing>
</child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Project</property>
- </widget>
- <packing>
- <property name="type">tab</property>
- <property name="position">1</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="lang_vbox">
- <property name="visible">True</property>
- <property name="border_width">6</property>
<child>
- <widget class="GtkCheckButton" id="take_my_options">
+ <widget class="GtkEntry" id="tr_email">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Use my options to complete the following entries:</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="padding">6</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="y_options"></property>
</packing>
</child>
- <child>
- <widget class="GtkTable" id="lang_page">
- <property name="visible">True</property>
- <property name="n_rows">6</property>
- <property name="n_columns">3</property>
- <property name="row_spacing">6</property>
- <child>
- <widget class="GtkEntry" id="encoding_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkEntry" id="charset_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="editable">False</property>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkEntry" id="lg_email_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkEntry" id="language_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label27">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </widget>
- <packing>
- <property name="x_options"></property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label28">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </widget>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label29">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </widget>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label30">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </widget>
- <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label31">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </widget>
- <packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label32">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </widget>
- <packing>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label33">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xpad">12</property>
- <property name="label" translatable="yes">Translator's _name:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">tr_name</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label34">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xpad">12</property>
- <property name="label" translatable="yes">Translator's _email:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">tr_email</property>
- </widget>
- <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>
- <widget class="GtkLabel" id="label35">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xpad">12</property>
- <property name="label" translatable="yes">_Language:</property>
- <property name="use_underline">True</property>
- </widget>
- <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>
- <widget class="GtkLabel" id="label36">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xpad">12</property>
- <property name="label" translatable="yes">Language gro_up email:</property>
- <property name="use_underline">True</property>
- </widget>
- <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>
- <widget class="GtkLabel" id="label37">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xpad">12</property>
- <property name="label" translatable="yes">Char_set:</property>
- <property name="use_underline">True</property>
- </widget>
- <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>
- <widget class="GtkLabel" id="label38">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xpad">12</property>
- <property name="label" translatable="yes">Enc_oding:</property>
- <property name="use_underline">True</property>
- </widget>
- <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>
- <widget class="GtkEntry" id="tr_name">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkEntry" id="tr_email">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"></property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Translator and Language</property>
- </widget>
- <packing>
- <property name="type">tab</property>
- <property name="position">2</property>
- <property name="tab_fill">False</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
</packing>
</child>
</widget>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Translator and Language</property>
+ </widget>
+ <packing>
+ <property name="type">tab</property>
+ <property name="position">2</property>
+ <property name="tab_fill">False</property>
+ </packing>
</child>
</widget>
<packing>
@@ -561,15 +559,14 @@
</packing>
</child>
<child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area2">
+ <widget class="GtkHButtonBox" id="dialog-action_area1">
<property name="visible">True</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
<widget class="GtkButton" id="button1">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="label" translatable="no">gtk-close</property>
+ <property name="label">gtk-close</property>
<property name="use_stock">True</property>
<property name="response_id">0</property>
</widget>
Modified: trunk/src/dialogs/preferences-dialog.c
==============================================================================
--- trunk/src/dialogs/preferences-dialog.c (original)
+++ trunk/src/dialogs/preferences-dialog.c Tue Sep 16 09:52:02 2008
@@ -1,6 +1,5 @@
/*
* Copyright (C) 2007 Ignacio Casal Quinteiro <nacho resa gmail com>
- * 2008 Pablo Sanxiao <psanxiao gmail com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -21,24 +20,16 @@
#include <config.h>
#endif
-#include "application.h"
#include "preferences-dialog.h"
#include "prefs-manager.h"
-#include "profile.h"
#include "utils.h"
#include "plugin-manager.h"
-#include "profile-dialog.h"
-#include "po.h"
-#include "utils.h"
-#include "../translation-memory/translation-memory.h"
#include <glib.h>
#include <glib/gi18n.h>
#include <glib-object.h>
-#include <gio/gio.h>
#include <gtk/gtk.h>
-#include <string.h>
-#include <gtksourceview/gtksourcestyleschememanager.h>
+
#define GTR_PREFERENCES_DIALOG_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ( \
(object), \
@@ -60,7 +51,9 @@
GtkWidget *autosave_checkbutton;
GtkWidget *autosave_interval_spinbutton;
GtkWidget *autosave_hbox;
- GtkWidget *create_backup_checkbutton;
+ GtkWidget *append_suffix_checkbutton;
+ GtkWidget *autosave_suffix_entry;
+ GtkWidget *autosave_suffix_hbox;
/* Editor->Text display */
GtkWidget *highlight_checkbutton;
@@ -71,6 +64,7 @@
/* Editor->Contents */
GtkWidget *unmark_fuzzy_checkbutton;
+ GtkWidget *keep_obsolete_checkbutton;
GtkWidget *spellcheck_checkbutton;
/*Profiles*/
@@ -78,19 +72,7 @@
GtkWidget *add_button;
GtkWidget *edit_button;
GtkWidget *delete_button;
-
- /*Translation Memory*/
- GtkWidget *directory_entry;
- GtkWidget *search_button;
- GtkWidget *add_database_button;
- GtkWidget *add_database_progressbar;
-
- GtkWidget *use_lang_profile_in_tm;
- GtkWidget *tm_lang_entry;
- GtkWidget *show_tm_options_checkbutton;
- GtkWidget *missing_words_spinbutton;
- GtkWidget *sentence_length_spinbutton;
-
+
/*PO header->Personal information*/
GtkWidget *name_entry;
GtkWidget *email_entry;
@@ -106,19 +88,11 @@
/*Inteface*/
GtkWidget *gdl_combobox;
- GtkWidget *scheme_color_combobox;
/*Plugins*/
GtkWidget *plugins_box;
};
-static void setup_profile_pages (GtranslatorPreferencesDialog *dlg);
-
-GtkWidget *gtranslator_preferences_dialog_get_treeview (GtranslatorPreferencesDialog *dlg)
-{
- return dlg->priv->profile_treeview;
-}
-
/***************Files pages****************/
static void
@@ -167,21 +141,22 @@
autosave = gtk_toggle_button_get_active(button);
- gtk_widget_set_sensitive(dlg->priv->autosave_interval_spinbutton, autosave);
+ gtk_widget_set_sensitive(dlg->priv->autosave_hbox, autosave);
gtranslator_prefs_manager_set_autosave(autosave);
}
static void
-create_backup_checkbutton_toggled (GtkToggleButton *button,
- GtranslatorPreferencesDialog *dlg)
+append_suffix_checkbutton_toggled(GtkToggleButton *button,
+ GtranslatorPreferencesDialog *dlg)
{
- gboolean create_backup;
+ gboolean append_suffix;
- g_return_if_fail (button == GTK_TOGGLE_BUTTON (dlg->priv->create_backup_checkbutton));
+ g_return_if_fail(button == GTK_TOGGLE_BUTTON(dlg->priv->append_suffix_checkbutton));
- create_backup = gtk_toggle_button_get_active (button);
+ append_suffix = gtk_toggle_button_get_active(button);
- gtranslator_prefs_manager_set_create_backup (create_backup);
+ gtk_widget_set_sensitive(dlg->priv->autosave_suffix_hbox, append_suffix);
+ gtranslator_prefs_manager_set_append_suffix(append_suffix);
}
static void
@@ -194,18 +169,31 @@
}
static void
+autosave_suffix_entry_changed(GObject *gobject,
+ GParamSpec *arg1,
+ GtranslatorPreferencesDialog *dlg)
+{
+ const gchar *text;
+
+ text = gtk_entry_get_text(GTK_ENTRY(gobject));
+
+ gtranslator_prefs_manager_set_autosave_suffix(text);
+}
+
+static void
setup_files_autosave_page(GtranslatorPreferencesDialog *dlg)
{
- gboolean autosave, backup;
+ gboolean autosave, suffix;
gint autosave_interval;
+ const gchar *autosave_suffix;
/*Set initial value*/
autosave = gtranslator_prefs_manager_get_autosave();
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dlg->priv->autosave_checkbutton),
autosave);
- backup = gtranslator_prefs_manager_get_create_backup ();
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dlg->priv->create_backup_checkbutton),
- backup);
+ suffix = gtranslator_prefs_manager_get_append_suffix();
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dlg->priv->append_suffix_checkbutton),
+ suffix);
autosave_interval = gtranslator_prefs_manager_get_autosave_interval();
@@ -215,20 +203,32 @@
gtk_spin_button_set_value(GTK_SPIN_BUTTON(dlg->priv->autosave_interval_spinbutton),
autosave_interval);
+ autosave_suffix = gtranslator_prefs_manager_get_autosave_suffix();
+ if(!autosave_suffix)
+ autosave_suffix = GPM_DEFAULT_AUTOSAVE_SUFFIX;
+ gtk_entry_set_text(GTK_ENTRY(dlg->priv->autosave_suffix_entry),
+ autosave_suffix);
+
+
/*Set sensitive*/
- gtk_widget_set_sensitive(dlg->priv->autosave_interval_spinbutton,
+ gtk_widget_set_sensitive(dlg->priv->autosave_hbox,
autosave);
+ gtk_widget_set_sensitive(dlg->priv->autosave_suffix_hbox,
+ suffix);
/*Connect signals*/
g_signal_connect(dlg->priv->autosave_checkbutton, "toggled",
G_CALLBACK(autosave_checkbutton_toggled),
dlg);
- g_signal_connect(dlg->priv->create_backup_checkbutton, "toggled",
- G_CALLBACK(create_backup_checkbutton_toggled),
+ g_signal_connect(dlg->priv->append_suffix_checkbutton, "toggled",
+ G_CALLBACK(append_suffix_checkbutton_toggled),
dlg);
g_signal_connect(dlg->priv->autosave_interval_spinbutton, "value-changed",
G_CALLBACK(autosave_interval_spinbutton_value_changed),
dlg);
+ g_signal_connect(dlg->priv->autosave_suffix_entry, "notify::text",
+ G_CALLBACK(autosave_suffix_entry_changed),
+ dlg);
}
static void
@@ -342,6 +342,15 @@
}
static void
+keep_obsolete_checkbutton_toggled(GtkToggleButton *button,
+ GtranslatorPreferencesDialog *dlg)
+{
+ g_return_if_fail(button == GTK_TOGGLE_BUTTON(dlg->priv->keep_obsolete_checkbutton));
+
+ gtranslator_prefs_manager_set_keep_obsolete(gtk_toggle_button_get_active(button));
+}
+
+static void
spellcheck_checkbutton_toggled(GtkToggleButton *button,
GtranslatorPreferencesDialog *dlg)
{
@@ -356,6 +365,8 @@
/*Set initial values*/
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dlg->priv->unmark_fuzzy_checkbutton),
gtranslator_prefs_manager_get_unmark_fuzzy());
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dlg->priv->keep_obsolete_checkbutton),
+ gtranslator_prefs_manager_get_keep_obsolete());
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dlg->priv->spellcheck_checkbutton),
gtranslator_prefs_manager_get_spellcheck());
@@ -363,6 +374,9 @@
g_signal_connect(dlg->priv->unmark_fuzzy_checkbutton, "toggled",
G_CALLBACK(unmark_fuzzy_checkbutton_toggled),
dlg);
+ g_signal_connect(dlg->priv->keep_obsolete_checkbutton, "toggled",
+ G_CALLBACK(keep_obsolete_checkbutton_toggled),
+ dlg);
g_signal_connect(dlg->priv->spellcheck_checkbutton, "toggled",
G_CALLBACK(spellcheck_checkbutton_toggled),
dlg);
@@ -376,550 +390,112 @@
setup_editor_contents(dlg);
}
-/***************Profile pages****************/
+/***************PO header pages****************/
static void
-active_toggled_cb (GtkCellRendererToggle *cell_renderer,
- gchar *path_str,
+name_entry_changed(GObject *gobject,
+ GParamSpec *arg1,
GtranslatorPreferencesDialog *dlg)
{
- GtkTreeIter iter;
- GtkTreePath *path;
- GtkTreeModel *model;
- gboolean active;
- gchar *profile_row;
- GtranslatorProfile *old_profile_active;
- GList *l = NULL, *profiles_list = NULL;
- gchar *filename;
- gchar *config_folder;
- GFile *file;
-
-
- config_folder = gtranslator_utils_get_user_config_dir ();
- filename = g_build_filename (config_folder,
- "profiles.xml",
- NULL);
- file = g_file_new_for_path (filename);
-
- path = gtk_tree_path_new_from_string (path_str);
-
- model = gtk_tree_view_get_model (GTK_TREE_VIEW (dlg->priv->profile_treeview));
- g_return_if_fail (model != NULL);
-
- gtk_tree_model_get_iter (model, &iter, path);
-
- gtk_tree_model_get (model, &iter, TOGGLE_COL, &active, -1);
-
- if (!active) {
-
- old_profile_active = gtranslator_application_get_active_profile (GTR_APP);
-
- gtk_list_store_set (GTK_LIST_STORE (model),
- &iter,
- TRUE,
- TOGGLE_COL,
- -1);
-
- gtk_tree_model_get (model, &iter, PROFILE_NAME_COL, &profile_row, -1);
- profiles_list = gtranslator_application_get_profiles (GTR_APP);
-
- for (l = profiles_list; l; l = l->next) {
- GtranslatorProfile *profile;
- profile = (GtranslatorProfile *)l->data;
- if (!strcmp (gtranslator_profile_get_name (profile), profile_row)) {
- gtranslator_application_set_active_profile (GTR_APP, profile);
- }
- }
- }
- gtk_list_store_clear (GTK_LIST_STORE(model));
- gtranslator_preferences_fill_profile_treeview (dlg, model);
- gtk_tree_path_free (path);
-}
-
-void gtranslator_preferences_fill_profile_treeview (GtranslatorPreferencesDialog *dlg,
- GtkTreeModel *model)
-{
- GtkTreeIter iter;
- GtranslatorProfile *active_profile;
- GList *l = NULL, *profiles_list = NULL;
-
- gtk_list_store_clear (GTK_LIST_STORE (model));
-
- profiles_list = gtranslator_application_get_profiles (GTR_APP);
-
-
- active_profile = gtranslator_application_get_active_profile (GTR_APP);
-
- for (l = profiles_list; l; l = l->next) {
-
- GtranslatorProfile *profile;
- gchar *profile_name;
-
- profile = (GtranslatorProfile *)l->data;
-
- profile_name = gtranslator_profile_get_name (profile);
- gtk_list_store_append (GTK_LIST_STORE (model), &iter);
-
- if (!strcmp (gtranslator_profile_get_name (active_profile), profile_name)) {
- gtk_list_store_set (GTK_LIST_STORE (model),
- &iter,
- PROFILE_NAME_COL,
- profile_name,
- TOGGLE_COL,
- TRUE,
- -1);
- } else {
- gtk_list_store_set (GTK_LIST_STORE (model),
- &iter,
- PROFILE_NAME_COL,
- profile_name,
- -1);
- }
- }
-}
-
-static void
-setup_profile_pages (GtranslatorPreferencesDialog *dlg)
-{
-
- GtkTreeViewColumn *name_column, *toggle_column;
- GtkCellRenderer *text_renderer, *toggle_renderer;
- GtkListStore *model;
-
- model = gtk_list_store_new (N_COLUMNS_PROFILES, G_TYPE_STRING, G_TYPE_BOOLEAN);
-
- gtk_tree_view_set_model (GTK_TREE_VIEW (dlg->priv->profile_treeview),
- GTK_TREE_MODEL (model));
-
- g_object_unref (model);
-
- text_renderer = gtk_cell_renderer_text_new ();
- toggle_renderer = gtk_cell_renderer_toggle_new ();
-
- g_signal_connect (toggle_renderer,
- "toggled",
- G_CALLBACK (active_toggled_cb),
- dlg);
-
- g_object_set (toggle_renderer,
- "mode",
- GTK_CELL_RENDERER_MODE_ACTIVATABLE,
- NULL);
+ const gchar *text;
+
+ g_return_if_fail(GTK_ENTRY(gobject) == GTK_ENTRY(dlg->priv->name_entry));
- name_column = gtk_tree_view_column_new_with_attributes ("Profile",
- text_renderer,
- "text",
- PROFILE_NAME_COL,
- NULL);
-
- toggle_column = gtk_tree_view_column_new_with_attributes ("Active",
- toggle_renderer,
- "active",
- TOGGLE_COL,
- NULL);
-
- gtk_tree_view_column_set_resizable (toggle_column, TRUE);
- gtk_tree_view_column_set_resizable (name_column, TRUE);
- gtk_tree_view_append_column (GTK_TREE_VIEW (dlg->priv->profile_treeview), name_column);
- gtk_tree_view_append_column (GTK_TREE_VIEW (dlg->priv->profile_treeview), toggle_column);
-
- g_object_set (name_column,
- "expand",
- TRUE,
- NULL);
+ text = gtk_entry_get_text(GTK_ENTRY(gobject));
- gtranslator_preferences_fill_profile_treeview (dlg,GTK_TREE_MODEL(model));
+ if(text)
+ gtranslator_prefs_manager_set_name(text);
}
-/***************Interface pages****************/
static void
-style_changed_cb (GtkComboBox *combobox,
- GtranslatorPreferencesDialog *dlg)
+email_entry_changed(GObject *gobject,
+ GParamSpec *arg1,
+ GtranslatorPreferencesDialog *dlg)
{
- g_return_if_fail(combobox == GTK_COMBO_BOX(dlg->priv->gdl_combobox));
+ const gchar *text;
- gtranslator_prefs_manager_set_gdl_style (gtk_combo_box_get_active (combobox));
-}
+ g_return_if_fail(GTK_ENTRY(gobject) == GTK_ENTRY(dlg->priv->email_entry));
-static void
-scheme_color_changed_cb (GtkComboBox *combobox,
- GtranslatorPreferencesDialog *dlg)
-{
- g_return_if_fail (combobox == GTK_COMBO_BOX (dlg->priv->scheme_color_combobox));
+ text = gtk_entry_get_text(GTK_ENTRY(gobject));
- gtranslator_prefs_manager_set_scheme_color (gtk_combo_box_get_active_text (combobox));
+ if(text)
+ gtranslator_prefs_manager_set_email(text);
}
static void
-setup_interface_pages(GtranslatorPreferencesDialog *dlg)
+setup_po_header_personal_information_page(GtranslatorPreferencesDialog *dlg)
{
- gint gdl_style;
- GtkSourceStyleSchemeManager *manager;
- const gchar * const *scheme_ids;
- const gchar * scheme_active;
- gint i = 0;
+ const gchar *value;
/*Set initial value*/
- gdl_style = gtranslator_prefs_manager_get_gdl_style ();
- if (gdl_style)
- gtk_combo_box_set_active (GTK_COMBO_BOX (dlg->priv->gdl_combobox),
- gdl_style);
+ value = gtranslator_prefs_manager_get_name();
+ if(value)
+ gtk_entry_set_text(GTK_ENTRY(dlg->priv->name_entry),
+ value);
+ value = gtranslator_prefs_manager_get_email();
+ if(value)
+ gtk_entry_set_text(GTK_ENTRY(dlg->priv->email_entry),
+ value);
- /*
- * Scheme color
- */
- manager = gtk_source_style_scheme_manager_get_default ();
- scheme_ids = gtk_source_style_scheme_manager_get_scheme_ids (manager);
- scheme_active = gtranslator_prefs_manager_get_scheme_color ();
- while (scheme_ids [i] != NULL)
- {
- gtk_combo_box_append_text (GTK_COMBO_BOX (dlg->priv->scheme_color_combobox),
- scheme_ids[i]);
- if (strcmp (scheme_ids[i], scheme_active) == 0)
- gtk_combo_box_set_active (GTK_COMBO_BOX (dlg->priv->scheme_color_combobox),
- i);
- i++;
- }
-
/*Connect signals*/
- g_signal_connect (dlg->priv->gdl_combobox, "changed",
- G_CALLBACK (style_changed_cb),
- dlg);
- g_signal_connect (dlg->priv->scheme_color_combobox, "changed",
- G_CALLBACK (scheme_color_changed_cb),
- dlg);
-}
-
-/***************Translation Memory pages****************/
-static void
-response_filechooser_cb (GtkDialog *dialog,
- gint response_id,
- gpointer user_data)
-{
- GtranslatorPreferencesDialog *dlg;
-
- dlg = (GtranslatorPreferencesDialog *)user_data;
-
-
- if (response_id == GTK_RESPONSE_YES) {
- gtk_entry_set_text (GTK_ENTRY (dlg->priv->directory_entry),
- gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)));
- gtranslator_prefs_manager_set_tm_dir (gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)));
- gtk_widget_destroy (GTK_WIDGET (dialog));
- } else {
- gtk_widget_destroy (GTK_WIDGET (dialog));
- }
-}
-
-static void
-on_search_button_pulsed (GtkButton *button,
- gpointer data)
-{
- GtkWidget *filechooser;
- GtranslatorPreferencesDialog *dlg;
-
- dlg = (GtranslatorPreferencesDialog *)data;
-
- filechooser = gtk_file_chooser_dialog_new ("Select PO directory",
- GTK_WINDOW (dlg),
- GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
- GTK_STOCK_CANCEL,
- GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK,
- GTK_RESPONSE_YES,
- NULL);
-
- g_signal_connect (GTK_DIALOG (filechooser), "response",
- G_CALLBACK (response_filechooser_cb),
- dlg);
-
- gtk_dialog_run (GTK_DIALOG (filechooser));
-}
-
-typedef struct _IdleData
-{
- GSList *list;
- GtkProgressBar *progress;
- GtranslatorTranslationMemory *tm;
- GtkWindow *parent;
-}IdleData;
-
-static gboolean
-add_to_database (gpointer data_pointer)
-{
- IdleData *data = (IdleData *)data_pointer;
- static GSList *l = NULL;
- gdouble percentage;
-
- if (l == NULL)
- l = data->list;
- else
- l = g_slist_next (l);
-
- if (l)
- {
- GList *msg_list = NULL;
- GList *l2 = NULL;
- GFile *location;
- GError *error = NULL;
- GtranslatorPo *po;
-
- po = gtranslator_po_new ();
- location = (GFile *)l->data;
-
- gtranslator_po_parse (po, location, &error);
- if (error)
- return TRUE;
-
- msg_list = gtranslator_po_get_messages (po);
-
- for (l2 = msg_list; l2; l2 = l2->next) {
- GtranslatorMsg *msg;
- msg = GTR_MSG (l2->data);
- if (gtranslator_msg_is_translated (msg))
- gtranslator_translation_memory_store (data->tm,
- gtranslator_msg_get_msgid (msg),
- gtranslator_msg_get_msgstr (msg));
- }
-
- g_object_unref (po);
- }
- else
- {
- GtkWidget *dialog;
-
- gtk_progress_bar_set_fraction (data->progress,
- 1.0);
-
- dialog = gtk_message_dialog_new (data->parent,
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_INFO,
- GTK_BUTTONS_CLOSE,
- NULL);
-
- gtk_message_dialog_set_markup (GTK_MESSAGE_DIALOG (dialog),
- _("<span weight=\"bold\" size=\"large\">Strings added to database</span>"));
-
- gtk_dialog_run (GTK_DIALOG (dialog));
- gtk_widget_destroy (dialog);
-
- return FALSE;
- }
-
- percentage = (gdouble)g_slist_position (data->list, l) / (gdouble) g_slist_length (data->list);
-
- /*
- * Set the progress only if the values are reasonable.
- */
- if(percentage > 0.0 || percentage < 1.0)
- {
- /*
- * Set the progressbar status.
- */
- gtk_progress_bar_set_fraction (data->progress,
- percentage);
- }
-
- return TRUE;
+ g_signal_connect(dlg->priv->name_entry, "notify::text",
+ G_CALLBACK(name_entry_changed),
+ dlg);
+ g_signal_connect(dlg->priv->email_entry, "notify::text",
+ G_CALLBACK(email_entry_changed),
+ dlg);
}
static void
-destroy_idle_data (gpointer data)
+setup_po_header_language_settings_page(GtranslatorPreferencesDialog *dlg)
{
- IdleData *d = (IdleData *)data;
-
- gtk_widget_hide (GTK_WIDGET (d->progress));
- g_slist_foreach (d->list, (GFunc)g_object_unref, NULL);
- g_slist_free (d->list);
-
- g_free (d);
}
static void
-on_add_database_button_pulsed (GtkButton *button,
- GtranslatorPreferencesDialog *dlg)
+setup_po_header_pages(GtranslatorPreferencesDialog *dlg)
{
- GFile *dir;
- const gchar *dir_name;
- IdleData *data;
-
- data = g_new0 (IdleData, 1);
- data->list = NULL;
-
- dir_name = gtranslator_prefs_manager_get_tm_dir ();
-
- dir = g_file_new_for_path (dir_name);
-
- if (gtranslator_prefs_manager_get_use_lang_profile ())
- gtranslator_utils_scan_dir (dir, &data->list, gtranslator_prefs_manager_get_tm_lang_entry());
- else
- gtranslator_utils_scan_dir (dir, &data->list, NULL);
-
- data->tm = GTR_TRANSLATION_MEMORY (gtranslator_application_get_translation_memory (GTR_APP));
- data->progress = GTK_PROGRESS_BAR (dlg->priv->add_database_progressbar);
- data->parent = GTK_WINDOW (dlg);
-
- gtk_widget_show (dlg->priv->add_database_progressbar);
- g_idle_add_full (G_PRIORITY_HIGH_IDLE + 30,
- (GSourceFunc)add_to_database,
- data,
- (GDestroyNotify)destroy_idle_data);
-
- g_object_unref (dir);
-}
-
-static void
-on_use_lang_profile_checkbutton_changed (GtkToggleButton *button,
- gpointer user_data)
-{
- gtranslator_prefs_manager_set_use_lang_profile (gtk_toggle_button_get_active(button));
+ /*Children*/
+ setup_po_header_personal_information_page(dlg);
+ setup_po_header_language_settings_page(dlg);
}
+/***************Interface pages****************/
static void
-on_show_tm_options_checkbutton_changed (GtkToggleButton *button,
- gpointer user_data)
-{
- gtranslator_prefs_manager_set_show_tm_options (gtk_toggle_button_get_active(button));
-}
-
-static void
-tm_lang_entry_changed (GObject *gobject,
- GParamSpec *arg1,
- GtranslatorPreferencesDialog *dlg)
+style_changed_cb (GtkComboBox *combobox,
+ GtranslatorPreferencesDialog *dlg)
{
- const gchar *text;
-
- g_return_if_fail(GTK_ENTRY(gobject) == GTK_ENTRY(dlg->priv->tm_lang_entry));
-
- text = gtk_entry_get_text(GTK_ENTRY(gobject));
+ g_return_if_fail(combobox == GTK_COMBO_BOX(dlg->priv->gdl_combobox));
- if(text)
- gtranslator_prefs_manager_set_tm_lang_entry (text);
-}
-
-
-static void
-on_missing_words_spinbutton_changed (GtkSpinButton *spinbutton,
- gpointer data)
-{
- gint value;
-
- value = gtk_spin_button_get_value_as_int (spinbutton);
-
- gtranslator_prefs_manager_set_missing_words (value);
-}
-
-static void
-on_sentence_length_spinbutton_changed (GtkSpinButton *spinbutton,
- gpointer data)
-{
- gint value;
-
- value = gtk_spin_button_get_value_as_int (spinbutton);
-
- gtranslator_prefs_manager_set_sentence_length (value);
+ gtranslator_prefs_manager_set_gdl_style (gtk_combo_box_get_active (combobox));
}
static void
-directory_entry_changed(GObject *gobject,
- GParamSpec *arg1,
- GtranslatorPreferencesDialog *dlg)
+setup_interface_pages(GtranslatorPreferencesDialog *dlg)
{
- const gchar *text;
-
- g_return_if_fail(GTK_ENTRY(gobject) == GTK_ENTRY(dlg->priv->directory_entry));
-
- text = gtk_entry_get_text(GTK_ENTRY(gobject));
+ gint gdl_style;
- if(text)
- gtranslator_prefs_manager_set_tm_dir (text);
-}
-
-
-static void
-setup_tm_pages(GtranslatorPreferencesDialog *dlg)
-{
- GtranslatorProfile *profile;
- gchar *language_code;
- const gchar *filename = NULL;
-
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dlg->priv->show_tm_options_checkbutton),
- gtranslator_prefs_manager_get_show_tm_options ());
-
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dlg->priv->use_lang_profile_in_tm),
- gtranslator_prefs_manager_get_use_lang_profile ());
-
- profile = gtranslator_application_get_active_profile (GTR_APP);
-
- if (profile != NULL) {
- language_code = gtranslator_profile_get_language_code (profile);
- filename = (const gchar*)g_strconcat (language_code, ".po", NULL);
-
- gtk_entry_set_text (GTK_ENTRY (dlg->priv->tm_lang_entry),
- filename);
- }
-
- if (filename != NULL)
- gtranslator_prefs_manager_set_tm_lang_entry (filename);
-
- gtk_spin_button_set_value (GTK_SPIN_BUTTON (dlg->priv->missing_words_spinbutton),
- (gdouble) gtranslator_prefs_manager_get_missing_words ());
-
- gtk_spin_button_set_value (GTK_SPIN_BUTTON (dlg->priv->sentence_length_spinbutton),
- (gdouble) gtranslator_prefs_manager_get_sentence_length ());
-
- g_signal_connect (GTK_BUTTON (dlg->priv->search_button), "clicked",
- G_CALLBACK (on_search_button_pulsed),
- dlg);
-
- g_signal_connect(dlg->priv->directory_entry, "notify::text",
- G_CALLBACK(directory_entry_changed),
- dlg);
-
- g_signal_connect(dlg->priv->tm_lang_entry, "notify::text",
- G_CALLBACK(tm_lang_entry_changed),
+ /*Set initial value*/
+ gdl_style = gtranslator_prefs_manager_get_gdl_style ();
+ if (gdl_style)
+ gtk_combo_box_set_active (GTK_COMBO_BOX (dlg->priv->gdl_combobox),
+ gdl_style);
+
+ /*Connect signals*/
+ g_signal_connect(dlg->priv->gdl_combobox, "changed",
+ G_CALLBACK (style_changed_cb),
dlg);
-
- g_signal_connect (GTK_BUTTON (dlg->priv->add_database_button), "clicked",
- G_CALLBACK (on_add_database_button_pulsed),
- dlg);
-
- g_signal_connect (GTK_TOGGLE_BUTTON (dlg->priv->show_tm_options_checkbutton), "toggled",
- G_CALLBACK (on_show_tm_options_checkbutton_changed),
- dlg);
-
- g_signal_connect (GTK_TOGGLE_BUTTON (dlg->priv->use_lang_profile_in_tm), "toggled",
- G_CALLBACK (on_use_lang_profile_checkbutton_changed),
- dlg);
-
- g_signal_connect (GTK_SPIN_BUTTON (dlg->priv->missing_words_spinbutton), "value-changed",
- G_CALLBACK (on_missing_words_spinbutton_changed),
- dlg);
-
- g_signal_connect (GTK_SPIN_BUTTON (dlg->priv->sentence_length_spinbutton), "value-changed",
- G_CALLBACK (on_sentence_length_spinbutton_changed),
- dlg);
-
- g_free ((gpointer)filename);
}
-/***************Plugins pages****************/
static void
setup_plugin_pages(GtranslatorPreferencesDialog *dlg)
{
- GtkWidget *alignment;
GtkWidget *page_content;
- alignment = gtk_alignment_new (0., 0., 1., 1.);
- gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 12, 12, 12, 12);
-
page_content = gtranslator_plugin_manager_new ();
g_return_if_fail (page_content != NULL);
- gtk_container_add (GTK_CONTAINER (alignment), page_content);
-
gtk_box_pack_start (GTK_BOX (dlg->priv->plugins_box),
- alignment,
+ page_content,
TRUE,
TRUE,
0);
@@ -940,153 +516,9 @@
}
static void
-add_button_pulsed (GtkWidget *button,
- GtranslatorPreferencesDialog *dlg)
+add_button_pulsed (GtkWidget *button, GtranslatorPreferencesDialog *dlg)
{
- GtranslatorProfile *profile;
- profile = gtranslator_profile_new ();
- gtranslator_show_profile_dialog(dlg, profile, NEW_PROFILE);
-}
-
-static void
-edit_button_pulsed (GtkWidget *button,
- GtranslatorPreferencesDialog *dlg)
-{
- GtkTreeIter iter;
- GtkTreeModel *model;
- GtkTreeSelection *selection;
- gchar *profile_row, *old_profile_name;
- GtranslatorProfile *edited_profile;
- GtranslatorProfile *active_profile;
- GList *profiles_list = NULL, *l = NULL;
-
- model = gtk_tree_view_get_model (GTK_TREE_VIEW (dlg->priv->profile_treeview));
- g_return_if_fail (model != NULL);
-
- selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dlg->priv->profile_treeview));
-
- if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
-
- gtk_tree_model_get (model, &iter, PROFILE_NAME_COL, &profile_row, -1);
-
- profiles_list = gtranslator_application_get_profiles (GTR_APP);
- active_profile = gtranslator_application_get_active_profile (GTR_APP);
-
- for (l = profiles_list; l; l = l->next) {
- GtranslatorProfile *profile;
- profile = (GtranslatorProfile *)l->data;
- if (!strcmp (gtranslator_profile_get_name (profile), profile_row)) {
- old_profile_name = gtranslator_profile_get_name (profile);
- edited_profile = profile;
- }
- }
- gtranslator_show_profile_dialog (dlg, edited_profile, EDIT_PROFILE);
- }
-}
-
-static void
-delete_confirm_dialog_cb (GtkWidget *dialog,
- gint response_id,
- GtranslatorPreferencesDialog *dlg)
-{
- GtkTreeIter iter;
- GtkTreeModel *model;
- GtkTreeSelection *selection;
- gchar *profile_row;
- GList *profiles_list = NULL, *l = NULL;
- GList *new_list = NULL;
-
- if (response_id == GTK_RESPONSE_YES) {
- model = gtk_tree_view_get_model (GTK_TREE_VIEW (dlg->priv->profile_treeview));
- g_return_if_fail (model != NULL);
-
- selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dlg->priv->profile_treeview));
-
- if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
-
- gtk_tree_model_get (model, &iter, PROFILE_NAME_COL, &profile_row, -1);
-
- profiles_list = gtranslator_application_get_profiles (GTR_APP);
-
- for (l = profiles_list; l; l = l->next) {
- GtranslatorProfile *profile;
- profile = (GtranslatorProfile *)l->data;
- if (!strcmp (gtranslator_profile_get_name (profile), profile_row)) {
- new_list = g_list_remove (profiles_list, profile);
- gtranslator_application_set_profiles (GTR_APP, new_list);
- }
- }
- gtranslator_preferences_fill_profile_treeview (dlg, model);
- }
- gtk_widget_destroy (dialog);
- } else {
- gtk_widget_destroy (dialog);
- }
-}
-
-static void
-delete_button_pulsed (GtkWidget *button,
- GtranslatorPreferencesDialog *dlg)
-{
- GtkTreeIter iter;
- GtkTreeModel *model;
- GtkTreeSelection *selection;
- gchar *profile_row;
- GtranslatorProfile *active_profile;
- GtkWidget *dialog;
-
- model = gtk_tree_view_get_model (GTK_TREE_VIEW (dlg->priv->profile_treeview));
- g_return_if_fail (model != NULL);
-
- selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dlg->priv->profile_treeview));
-
- if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
-
- gtk_tree_model_get (model, &iter, PROFILE_NAME_COL, &profile_row, -1);
-
- active_profile = gtranslator_application_get_active_profile (GTR_APP);
-
- if (!strcmp (gtranslator_profile_get_name (active_profile), profile_row)) {
-
- dialog = gtk_message_dialog_new (GTK_WINDOW (dlg),
- GTK_DIALOG_MODAL,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_CLOSE,
- NULL);
-
- gtk_message_dialog_set_markup (GTK_MESSAGE_DIALOG (dialog),
- _("<span weight=\"bold\" size=\"large\">Impossible to remove the active profile</span>"));
-
- gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
- _("Another profile should be selected as active before"));
-
- gtk_dialog_run (GTK_DIALOG (dialog));
- gtk_widget_destroy (dialog);
- } else {
- dialog = gtk_message_dialog_new (GTK_WINDOW (dlg),
- GTK_DIALOG_MODAL,
- GTK_MESSAGE_QUESTION,
- GTK_BUTTONS_NONE,
- NULL);
-
- gtk_message_dialog_set_markup (GTK_MESSAGE_DIALOG (dialog),
- _("<span weight=\"bold\" size=\"large\">Are you sure you want to delete this profile?</span>"));
-
- gtk_dialog_add_button (GTK_DIALOG (dialog),
- GTK_STOCK_CANCEL,
- GTK_RESPONSE_CANCEL);
-
- gtk_dialog_add_button (GTK_DIALOG (dialog),
- GTK_STOCK_DELETE,
- GTK_RESPONSE_YES);
-
- gtk_dialog_run (GTK_DIALOG (dialog));
-
- g_signal_connect (GTK_DIALOG (dialog), "response",
- G_CALLBACK (delete_confirm_dialog_cb),
- dlg);
- }
- }
+ gtranslator_show_profile_dialog(dlg);
}
static void
@@ -1122,7 +554,7 @@
/*Glade*/
- ret = gtranslator_utils_get_glade_widgets(PKGDATADIR "/preferences-dialog.glade",
+ ret = gtranslator_utils_get_glade_widgets(DATADIR "/preferences-dialog.glade",
"notebook",
&error_widget,
@@ -1134,7 +566,9 @@
"autosave_checkbutton", &dlg->priv->autosave_checkbutton,
"autosave_interval_spinbutton", &dlg->priv->autosave_interval_spinbutton,
"autosave_hbox", &dlg->priv->autosave_hbox,
- "create_backup_checkbutton", &dlg->priv->create_backup_checkbutton,
+ "append_suffix_checkbutton", &dlg->priv->append_suffix_checkbutton,
+ "autosave_suffix_entry", &dlg->priv->autosave_suffix_entry,
+ "autosave_suffix_hbox", &dlg->priv->autosave_suffix_hbox,
"highlight_checkbutton", &dlg->priv->highlight_checkbutton,
"visible_whitespace_checkbutton", &dlg->priv->visible_whitespace_checkbutton,
@@ -1143,6 +577,7 @@
"editor_font_hbox", &dlg->priv->editor_font_hbox,
"unmark_fuzzy_checkbutton", &dlg->priv->unmark_fuzzy_checkbutton,
+ "keep_obsolete_checkbutton", &dlg->priv->keep_obsolete_checkbutton,
"spellcheck_checkbutton", &dlg->priv->spellcheck_checkbutton,
"profile_treeview", &dlg->priv->profile_treeview,
@@ -1150,19 +585,18 @@
"edit_button", &dlg->priv->edit_button,
"delete_button", &dlg->priv->delete_button,
- "directory_entry", &dlg->priv->directory_entry,
- "search_button", &dlg->priv->search_button,
- "add_database_button", &dlg->priv->add_database_button,
- "add_database_progressbar", &dlg->priv->add_database_progressbar,
-
- "use_lang_profile_in_tm", &dlg->priv->use_lang_profile_in_tm,
- "tm_lang_entry", &dlg->priv->tm_lang_entry,
- "show_tm_options_checkbutton", &dlg->priv->show_tm_options_checkbutton,
- "missing_words_spinbutton", &dlg->priv->missing_words_spinbutton,
- "sentence_length_spinbutton", &dlg->priv->sentence_length_spinbutton,
-
+ /*"name_entry", &dlg->priv->name_entry,
+ "email_entry", &dlg->priv->email_entry,
+
+ "language_comboentry", &dlg->priv->language_comboentry,
+ "langcode_comboentry", &dlg->priv->langcode_comboentry,
+ "charset_comboentry", &dlg->priv->charset_comboentry,
+ "encoding_comboentry", &dlg->priv->encoding_comboentry,
+ "team_email_comboentry", &dlg->priv->team_email_comboentry,
+ "number_plurals_spinbutton", &dlg->priv->number_plurals_spinbutton,
+ "plurals_entry", &dlg->priv->plurals_entry,
+ */
"gdl_combobox", &dlg->priv->gdl_combobox,
- "scheme_color_combobox", &dlg->priv->scheme_color_combobox,
"plugins_box", &dlg->priv->plugins_box,
NULL);
@@ -1184,25 +618,14 @@
gtk_container_set_border_width (GTK_CONTAINER (dlg->priv->notebook), 5);
g_signal_connect (dlg->priv->add_button,
- "clicked",
- G_CALLBACK (add_button_pulsed),
- dlg);
-
- g_signal_connect (dlg->priv->delete_button,
- "clicked",
- G_CALLBACK (delete_button_pulsed),
- dlg);
-
- g_signal_connect (dlg->priv->edit_button,
- "clicked",
- G_CALLBACK (edit_button_pulsed),
- dlg);
+ "clicked",
+ G_CALLBACK (add_button_pulsed),
+ dlg);
setup_files_pages(dlg);
setup_editor_pages(dlg);
- setup_profile_pages(dlg);
+ setup_po_header_pages(dlg);
setup_interface_pages(dlg);
- setup_tm_pages (dlg);
setup_plugin_pages(dlg);
}
@@ -1245,7 +668,5 @@
GTK_WINDOW (window));
}
- gtranslator_application_set_preferences_dialog (GTR_APP, GTR_PREFERENCES_DIALOG(dlg));
-
gtk_window_present (GTK_WINDOW (dlg));
}
Modified: trunk/src/dialogs/preferences-dialog.glade
==============================================================================
--- trunk/src/dialogs/preferences-dialog.glade (original)
+++ trunk/src/dialogs/preferences-dialog.glade Tue Sep 16 09:52:02 2008
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Mon Aug 11 10:18:25 2008 -->
+<!--Generated with glade3 3.4.1 on Sun Mar 9 23:45:30 2008 -->
<glade-interface>
<widget class="GtkDialog" id="preferences_dialog">
<property name="border_width">5</property>
@@ -185,10 +185,10 @@
</widget>
</child>
<child>
- <widget class="GtkCheckButton" id="create_backup_checkbutton">
+ <widget class="GtkCheckButton" id="append_suffix_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Create a _backup copy of files before saving</property>
+ <property name="label" translatable="yes">Append a suffix to autosaved _files</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
@@ -199,6 +199,39 @@
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <widget class="GtkHBox" id="autosave_suffix_hbox">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkLabel" id="autosave_suffix_label">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Suffix to append:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">autosave_suffix_entry</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkEntry" id="autosave_suffix_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="text" translatable="yes">autosave</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="position">1</property>
@@ -399,6 +432,21 @@
</widget>
</child>
<child>
+ <widget class="GtkCheckButton" id="keep_obsolete_checkbutton">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">_Keep obsolete messages</property>
+ <property name="use_underline">True</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkCheckButton" id="spellcheck_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -408,7 +456,7 @@
<property name="draw_indicator">True</property>
</widget>
<packing>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</widget>
@@ -445,496 +493,192 @@
</packing>
</child>
<child>
- <widget class="GtkAlignment" id="alignment1">
+ <widget class="GtkVBox" id="vbox8">
<property name="visible">True</property>
- <property name="top_padding">12</property>
- <property name="bottom_padding">12</property>
- <property name="left_padding">12</property>
- <property name="right_padding">12</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<child>
- <widget class="GtkVBox" id="vbox8">
+ <widget class="GtkHBox" id="hbox5">
<property name="visible">True</property>
- <property name="spacing">6</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow1">
+ <widget class="GtkLabel" id="label15">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <child>
- <widget class="GtkViewport" id="viewport1">
- <property name="visible">True</property>
- <property name="resize_mode">GTK_RESIZE_QUEUE</property>
- <child>
- <widget class="GtkTreeView" id="profile_treeview">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="headers_clickable">True</property>
- </widget>
- </child>
- </widget>
- </child>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="padding">6</property>
+ </packing>
</child>
<child>
- <widget class="GtkHButtonBox" id="hbuttonbox1">
+ <widget class="GtkLabel" id="label13">
<property name="visible">True</property>
- <property name="spacing">6</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
- <child>
- <widget class="GtkButton" id="add_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="label" translatable="no">gtk-add</property>
- <property name="use_stock">True</property>
- <property name="response_id">0</property>
- </widget>
- </child>
- <child>
- <widget class="GtkButton" id="edit_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="label" translatable="no">gtk-edit</property>
- <property name="use_stock">True</property>
- <property name="response_id">0</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="delete_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="label" translatable="no">gtk-delete</property>
- <property name="use_stock">True</property>
- <property name="response_id">0</property>
- </widget>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="xalign">0</property>
+ <property name="ypad">4</property>
+ <property name="label" translatable="yes"><b>Name</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Profiles</property>
- </widget>
- <packing>
- <property name="type">tab</property>
- <property name="position">2</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox4">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="border_width">12</property>
- <property name="spacing">18</property>
- <child>
- <widget class="GtkVBox" id="vbox5">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label10">
+ <widget class="GtkVSeparator" id="vseparator1">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Anchor style:</b></property>
- <property name="use_markup">True</property>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">2</property>
+ </packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox4">
+ <widget class="GtkLabel" id="label14">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <child>
- <widget class="GtkLabel" id="label11">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes"> </property>
- </widget>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkComboBox" id="gdl_combobox">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="items" translatable="yes">Text
-Icons
-Text + Icons
-Gnome toolbar setting
-Tabs</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="xpad">12</property>
+ <property name="label" translatable="yes"><b>Active</b></property>
+ <property name="use_markup">True</property>
+ <property name="justify">GTK_JUSTIFY_RIGHT</property>
</widget>
<packing>
- <property name="position">1</property>
+ <property name="expand">False</property>
+ <property name="position">3</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox12">
+ <widget class="GtkTreeView" id="profile_treeview">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="headers_clickable">True</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox6">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label13">
+ <widget class="GtkButton" id="add_button">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Scheme color:</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">gtk-add</property>
+ <property name="use_stock">True</property>
+ <property name="response_id">0</property>
</widget>
</child>
<child>
- <widget class="GtkHBox" id="hbox5">
+ <widget class="GtkButton" id="edit_button">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <child>
- <widget class="GtkLabel" id="label14">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes"> </property>
- </widget>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkComboBox" id="scheme_color_combobox">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="items" translatable="yes"></property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="label" translatable="yes">gtk-edit</property>
+ <property name="use_stock">True</property>
+ <property name="response_id">0</property>
</widget>
<packing>
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <widget class="GtkButton" id="delete_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">gtk-delete</property>
+ <property name="use_stock">True</property>
+ <property name="response_id">0</property>
+ </widget>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</widget>
<packing>
- <property name="position">3</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label7">
+ <widget class="GtkLabel" id="label3">
<property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Interface</property>
+ <property name="label" translatable="yes">Profiles</property>
</widget>
<packing>
<property name="type">tab</property>
- <property name="position">3</property>
+ <property name="position">2</property>
<property name="tab_fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="memories_vbox">
+ <widget class="GtkVBox" id="vbox4">
<property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="border_width">12</property>
<property name="spacing">18</property>
<child>
- <widget class="GtkVBox" id="vbox9">
+ <widget class="GtkVBox" id="vbox5">
<property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label20">
+ <widget class="GtkLabel" id="label10">
<property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Database:</b></property>
+ <property name="label" translatable="yes"><b>Anchor style:</b></property>
<property name="use_markup">True</property>
</widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
</child>
<child>
- <widget class="GtkAlignment" id="alignment2">
+ <widget class="GtkHBox" id="hbox4">
<property name="visible">True</property>
- <property name="right_padding">12</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<child>
- <widget class="GtkHBox" id="hbox8">
+ <widget class="GtkLabel" id="label11">
<property name="visible">True</property>
- <property name="spacing">18</property>
- <child>
- <widget class="GtkLabel" id="label25">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox11">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkLabel" id="label26">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Select directory contains PO files:</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox9">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkEntry" id="directory_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="xalign">0.0099999997764825821</property>
- </widget>
- </child>
- <child>
- <widget class="GtkButton" id="search_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="label" translatable="no">gtk-find</property>
- <property name="use_stock">True</property>
- <property name="response_id">0</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="add_database_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="label" translatable="yes">Add to Database</property>
- <property name="response_id">0</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkProgressBar" id="add_database_progressbar">
- <property name="no_show_all">True</property>
- <property name="text" translatable="yes"></property>
- </widget>
- <packing>
- <property name="position">3</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes"> </property>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
</child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox10">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkLabel" id="label21">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Configuration:</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkAlignment" id="alignment3">
- <property name="visible">True</property>
- <property name="right_padding">12</property>
<child>
- <widget class="GtkHBox" id="hbox7">
+ <widget class="GtkComboBox" id="gdl_combobox">
<property name="visible">True</property>
- <property name="spacing">18</property>
- <child>
- <widget class="GtkLabel" id="label22">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkTable" id="table1">
- <property name="visible">True</property>
- <property name="n_rows">4</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">12</property>
- <child>
- <placeholder/>
- </child>
- <child>
- <widget class="GtkEntry" id="tm_lang_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- </widget>
- <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>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="use_lang_profile_in_tm">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Use only files with this name:</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="show_tm_options_checkbutton">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Show options in translated messages</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- </widget>
- </child>
- <child>
- <widget class="GtkSpinButton" id="missing_words_spinbutton">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">2 0 100 1 10 10</property>
- </widget>
- <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>
- <widget class="GtkLabel" id="label23">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Max. # of missing words:</property>
- </widget>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkSpinButton" id="sentence_length_spinbutton">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">2 0 100 1 10 10</property>
- </widget>
- <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>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label24">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Max. difference in sentence length:</property>
- </widget>
- <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="items" translatable="yes">Text
+Icons
+Text + Icons
+Gnome toolbar setting
+Tabs</property>
</widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
</child>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
@@ -942,22 +686,22 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
</packing>
</child>
</widget>
<packing>
- <property name="position">4</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="memory_page_label">
+ <widget class="GtkLabel" id="label7">
<property name="visible">True</property>
- <property name="label" translatable="yes">Translation Memory</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Interface</property>
</widget>
<packing>
<property name="type">tab</property>
- <property name="position">4</property>
+ <property name="position">3</property>
<property name="tab_fill">False</property>
</packing>
</child>
@@ -970,7 +714,7 @@
</child>
</widget>
<packing>
- <property name="position">5</property>
+ <property name="position">4</property>
</packing>
</child>
<child>
@@ -980,7 +724,7 @@
</widget>
<packing>
<property name="type">tab</property>
- <property name="position">5</property>
+ <property name="position">4</property>
<property name="tab_fill">False</property>
</packing>
</child>
Modified: trunk/src/dialogs/preferences-dialog.h
==============================================================================
--- trunk/src/dialogs/preferences-dialog.h (original)
+++ trunk/src/dialogs/preferences-dialog.h Tue Sep 16 09:52:02 2008
@@ -19,18 +19,11 @@
#ifndef __PREFERENCES_DIALOG_H__
#define __PREFERENCES_DIALOG_H__
-#include "application.h"
#include <glib.h>
#include <glib-object.h>
#include <gtk/gtk.h>
#include "window.h"
-enum {
- PROFILE_NAME_COL,
- TOGGLE_COL,
- N_COLUMNS_PROFILES
- };
-
G_BEGIN_DECLS
/*
@@ -78,11 +71,6 @@
void gtranslator_show_preferences_dialog (GtranslatorWindow *window);
-GtkWidget *gtranslator_preferences_dialog_get_treeview (GtranslatorPreferencesDialog *dlg);
-
-void gtranslator_preferences_fill_profile_treeview (GtranslatorPreferencesDialog *dlg,
- GtkTreeModel *model);
-
G_END_DECLS
#endif /* __PREFERENCES_DIALOG_H__ */
Modified: trunk/src/dialogs/profile-dialog.c
==============================================================================
--- trunk/src/dialogs/profile-dialog.c (original)
+++ trunk/src/dialogs/profile-dialog.c Tue Sep 16 09:52:02 2008
@@ -20,18 +20,14 @@
#include <config.h>
#endif
-#include "application.h"
#include "profile-dialog.h"
#include "preferences-dialog.h"
-#include "profile.h"
#include "utils.h"
-#include <string.h>
#include <glib.h>
#include <glib/gi18n.h>
#include <glib-object.h>
#include <gtk/gtk.h>
-#include <libxml/tree.h>
#define GTR_PROFILE_DIALOG_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ( \
@@ -59,11 +55,6 @@
GtkWidget *plurals_forms_entry;
};
-struct data {
- GtranslatorProfile *old_profile;
- GtranslatorProfile *new_profile;
-};
-
static void gtranslator_profile_dialog_finalize (GObject *object)
{
G_OBJECT_CLASS (gtranslator_profile_dialog_parent_class)->finalize (object);
@@ -78,248 +69,25 @@
object_class->finalize = gtranslator_profile_dialog_finalize;
}
-/***************PROFILES****************/
-static void
-profile_name_entry_changed (GObject *gobject,
- GParamSpec *arg1,
- GtranslatorProfile *profile)
-{
- const gchar *text;
-
- /*g_return_if_fail (GTK_ENTRY (gobject) == GTK_ENTRY (dlg->priv->profile_name_entry));*/
-
- text = gtk_entry_get_text (GTK_ENTRY (gobject));
-
- if (text)
- gtranslator_profile_set_name (profile, (gchar *)text);
-}
-
-static void
-author_name_entry_changed (GObject *gobject,
- GParamSpec *arg1,
- GtranslatorProfile *profile)
-{
- const gchar *text;
-
- /*g_return_if_fail (GTK_ENTRY (gobject) == GTK_ENTRY (dlg->priv->author_name_entry));*/
-
- text = gtk_entry_get_text (GTK_ENTRY (gobject));
-
- if (text)
- gtranslator_profile_set_author_name (profile, (gchar *)text);
-}
-
-static void
-author_email_entry_changed (GObject *gobject,
- GParamSpec *arg1,
- GtranslatorProfile *profile)
-{
- const gchar *text;
-
- /*g_return_if_fail (GTK_ENTRY (gobject) == GTK_ENTRY (dlg->priv->author_email_entry));*/
-
- text = gtk_entry_get_text (GTK_ENTRY (gobject));
-
- if (text)
- gtranslator_profile_set_author_email (profile, (gchar *)text);
-}
-
-static void
-language_name_entry_changed (GObject *gobject,
- GParamSpec *arg1,
- GtranslatorProfile *profile)
-{
- const gchar *text;
-
- /*g_return_if_fail (GTK_ENTRY (gobject) == GTK_ENTRY (dlg->priv->profile_name_entry));*/
-
- text = gtk_entry_get_text (GTK_ENTRY (gobject));
-
- if (text)
- gtranslator_profile_set_language_name (profile, (gchar *)text);
-}
-
-static void
-language_code_entry_changed (GObject *gobject,
- GParamSpec *arg1,
- GtranslatorProfile *profile)
-{
- const gchar *text;
-
- /*g_return_if_fail (GTK_ENTRY (gobject) == GTK_ENTRY (dlg->priv->profile_name_entry));*/
-
- text = gtk_entry_get_text (GTK_ENTRY (gobject));
-
- if (text)
- gtranslator_profile_set_language_code (profile, (gchar *)text);
-}
-
-static void
-charset_entry_changed (GObject *gobject,
- GParamSpec *arg1,
- GtranslatorProfile *profile)
-{
- const gchar *text;
-
- /*g_return_if_fail (GTK_ENTRY (gobject) == GTK_ENTRY (dlg->priv->profile_name_entry));*/
-
- text = gtk_entry_get_text (GTK_ENTRY (gobject));
-
- if (text)
- gtranslator_profile_set_charset (profile, (gchar *)text);
-}
-
-static void
-encoding_entry_changed (GObject *gobject,
- GParamSpec *arg1,
- GtranslatorProfile *profile)
-{
- const gchar *text;
-
- /*g_return_if_fail (GTK_ENTRY (gobject) == GTK_ENTRY (dlg->priv->profile_name_entry));*/
-
- text = gtk_entry_get_text (GTK_ENTRY (gobject));
-
- if (text)
- gtranslator_profile_set_encoding (profile, (gchar *)text);
-}
-
-static void
-group_email_entry_changed (GObject *gobject,
- GParamSpec *arg1,
- GtranslatorProfile *profile)
-{
- const gchar *text;
-
- /*g_return_if_fail (GTK_ENTRY (gobject) == GTK_ENTRY (dlg->priv->profile_name_entry));*/
-
- text = gtk_entry_get_text (GTK_ENTRY (gobject));
-
- if (text)
- gtranslator_profile_set_group_email (profile, (gchar *)text);
-}
-
-static void
-plurals_entry_changed (GObject *gobject,
- GParamSpec *arg1,
- GtranslatorProfile *profile)
-{
- const gchar *text;
-
- /*g_return_if_fail (GTK_ENTRY (gobject) == GTK_ENTRY (dlg->priv->profile_name_entry));*/
-
- text = gtk_entry_get_text (GTK_ENTRY (gobject));
-
- if (text)
- gtranslator_profile_set_plurals (profile, (gchar *)text);
-}
-
-static void save_new_profile (GtkWidget *widget, GtranslatorProfile *profile)
-{
- GList *profiles_list = NULL, *l = NULL;
- GtranslatorPreferencesDialog *dlg;
- gboolean profile_exists;
- GtkWidget *treeview;
- GtkTreeModel *model;
- profile_exists = FALSE;
-
- profiles_list = gtranslator_application_get_profiles (GTR_APP);
-
- for (l = profiles_list; l; l = l->next) {
- GtranslatorProfile *profile_in_list;
- profile_in_list = (GtranslatorProfile *)l->data;
- if (!strcmp (gtranslator_profile_get_name (profile_in_list),
- gtranslator_profile_get_name (profile)))
- profile_exists = TRUE;
- }
-
- if (profile_exists) {
- GtkWidget *dialog;
- dialog = gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_ancestor (widget, GTK_TYPE_DIALOG)),
- GTK_DIALOG_MODAL,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_CLOSE,
- NULL);
-
- gtk_message_dialog_set_markup (GTK_MESSAGE_DIALOG (dialog),
- _("<span weight=\"bold\" size=\"large\">The profile name already exists</span>"));
-
- gtk_dialog_run (GTK_DIALOG (dialog));
- gtk_widget_destroy (dialog);
- } else {
- /*
- * Add new profile to profiles list in memory
- */
- if (profiles_list == NULL) {
- GList *initial_list = NULL;
- initial_list = g_list_append (profiles_list, profile);
- gtranslator_application_set_active_profile (GTR_APP, profile);
- gtranslator_application_set_profiles (GTR_APP, initial_list);
- } else {
- g_list_append (profiles_list, profile);
- }
- }
-
- /*
- *Reload the preferences dialog
- */
- dlg = gtranslator_application_get_preferences_dialog (GTR_APP);
-
- treeview = gtranslator_preferences_dialog_get_treeview (dlg);
-
- model = gtk_tree_view_get_model (GTK_TREE_VIEW (treeview));
- g_return_if_fail (GTK_IS_LIST_STORE (model));
-
- gtk_widget_destroy (gtk_widget_get_ancestor (widget, GTK_TYPE_DIALOG));
-
- gtranslator_preferences_fill_profile_treeview (dlg, model);
-}
-
-static void save_modified_profile (GtkWidget *widget,
- GtranslatorProfile *profile)
-{
- GtkWidget *treeview;
- GtkTreeModel *model;
- GtranslatorPreferencesDialog *dlg;
-
- dlg = gtranslator_application_get_preferences_dialog (GTR_APP);
-
- treeview = gtranslator_preferences_dialog_get_treeview (dlg);
-
- model = gtk_tree_view_get_model (GTK_TREE_VIEW (treeview));
- g_return_if_fail (GTK_IS_LIST_STORE (model));
-
- gtk_widget_destroy (gtk_widget_get_ancestor (widget, GTK_TYPE_DIALOG));
-
- gtranslator_preferences_fill_profile_treeview (dlg, model);
-}
-
-static void destroy_without_changes (GtkWidget *widget,
- gpointer data)
-{
- struct data* sdata;
-
- sdata = (struct data*) data;
-
- gtranslator_profile_set_name (sdata->new_profile, gtranslator_profile_get_name (sdata->old_profile));
- gtranslator_profile_set_author_name (sdata->new_profile, gtranslator_profile_get_author_name (sdata->old_profile));
- gtranslator_profile_set_author_email (sdata->new_profile, gtranslator_profile_get_author_email (sdata->old_profile));
- gtranslator_profile_set_language_name (sdata->new_profile, gtranslator_profile_get_language_name (sdata->old_profile));
- gtranslator_profile_set_language_code (sdata->new_profile, gtranslator_profile_get_language_code (sdata->old_profile));
- gtranslator_profile_set_charset (sdata->new_profile, gtranslator_profile_get_charset (sdata->old_profile));
- gtranslator_profile_set_encoding (sdata->new_profile, gtranslator_profile_get_encoding (sdata->old_profile));
- gtranslator_profile_set_group_email (sdata->new_profile, gtranslator_profile_get_group_email (sdata->old_profile));
- gtranslator_profile_set_plurals (sdata->new_profile, gtranslator_profile_get_plurals (sdata->old_profile));
-
- gtk_widget_destroy (gtk_widget_get_ancestor (widget, GTK_TYPE_DIALOG));
-}
-
static void gtranslator_profile_dialog_init (GtranslatorProfileDialog *dlg)
{
gboolean ret;
GtkWidget *error_widget;
+ GtkTooltips *tips;
+
+ tips = g_object_new(GTK_TYPE_TOOLTIPS, NULL);
dlg->priv = GTR_PROFILE_DIALOG_GET_PRIVATE (dlg);
+
+ gtk_dialog_add_buttons (GTK_DIALOG (dlg),
+ GTK_STOCK_OK,
+ GTK_RESPONSE_OK,
+ NULL);
+
+ gtk_dialog_add_buttons (GTK_DIALOG (dlg),
+ GTK_STOCK_CANCEL,
+ GTK_RESPONSE_CANCEL,
+ NULL);
gtk_window_set_title (GTK_WINDOW (dlg), _("gtranslator Profile"));
gtk_window_set_resizable (GTK_WINDOW (dlg), FALSE);
@@ -329,7 +97,12 @@
gtk_container_set_border_width (GTK_CONTAINER (dlg), 5);
gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dlg)->vbox), 2);
- ret = gtranslator_utils_get_glade_widgets(PKGDATADIR"/profile-dialog.glade",
+ g_signal_connect (dlg,
+ "response",
+ G_CALLBACK (gtk_widget_destroy),
+ NULL);
+
+ ret = gtranslator_utils_get_glade_widgets(DATADIR"/profile-dialog.glade",
"profiles_dialog",
&error_widget,
"profiles_dialog", &dlg->priv->main_box,
@@ -353,45 +126,29 @@
return;
}
- gtk_widget_set_tooltip_text (dlg->priv->plurals_forms_entry,
- _("Example: nplurals=2; plural=(n != 1);"));
+ gtk_tooltips_set_tip(tips, GTK_WIDGET(dlg->priv->plurals_forms_entry),
+ "Example: nplurals=2; plural=(n != 1);", "");
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox),
dlg->priv->main_box, FALSE, FALSE, 0);
gtk_window_set_modal (GTK_WINDOW (dlg), TRUE);
-
}
-void gtranslator_show_profile_dialog (GtranslatorPreferencesDialog *dialog,
- GtranslatorProfile *profile,
- gint action)
+void gtranslator_show_profile_dialog (GtranslatorPreferencesDialog *dialog)
{
- struct data *data;
- data = (struct data *) malloc(sizeof(struct data));
-
- static GtkWidget *dlg = NULL;
- GtkButton *ok_button, *cancel_button;
- GtranslatorProfile *old_profile;
-
- old_profile = gtranslator_profile_new ();
- cancel_button = GTK_BUTTON (gtk_button_new_from_stock (GTK_STOCK_CANCEL));
- ok_button = GTK_BUTTON (gtk_button_new_from_stock (GTK_STOCK_OK));
+ static GtkWidget *dlg = NULL;
g_return_if_fail(GTR_IS_PREFERENCES_DIALOG(dialog));
if(dlg == NULL)
{
- dlg = GTK_WIDGET (g_object_new (GTR_TYPE_PROFILE_DIALOG, NULL));
- g_signal_connect (dlg,
- "destroy",
- G_CALLBACK (gtk_widget_destroyed),
- &dlg);
- gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dlg)->action_area), GTK_WIDGET (cancel_button));
-
- gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dlg)->action_area), GTK_WIDGET (ok_button));
-
- gtk_widget_show_all(dlg);
+ dlg = GTK_WIDGET (g_object_new (GTR_TYPE_PROFILE_DIALOG, NULL));
+ g_signal_connect (dlg,
+ "destroy",
+ G_CALLBACK (gtk_widget_destroyed),
+ &dlg);
+ gtk_widget_show_all(dlg);
}
if (GTK_WINDOW (dialog) != gtk_window_get_transient_for (GTK_WINDOW (dlg)))
@@ -399,115 +156,7 @@
gtk_window_set_transient_for (GTK_WINDOW (dlg),
GTK_WINDOW (dialog));
}
-
- if (gtranslator_profile_get_name (profile) != NULL) {
- gtk_entry_set_text (GTK_ENTRY (GTR_PROFILE_DIALOG (dlg)->priv->profile_name_entry),
- gtranslator_profile_get_name (profile));
- gtranslator_profile_set_name (old_profile, gtranslator_profile_get_name (profile));
- }
- if (gtranslator_profile_get_author_name (profile) != NULL) {
- gtk_entry_set_text (GTK_ENTRY (GTR_PROFILE_DIALOG (dlg)->priv->author_name_entry),
- gtranslator_profile_get_author_name (profile));
- gtranslator_profile_set_author_name (old_profile, gtranslator_profile_get_author_name (profile));
- }
-
- if (gtranslator_profile_get_author_email (profile) != NULL) {
- gtk_entry_set_text (GTK_ENTRY (GTR_PROFILE_DIALOG (dlg)->priv->author_email_entry),
- gtranslator_profile_get_author_email (profile));
- gtranslator_profile_set_author_email (old_profile, gtranslator_profile_get_author_email (profile));
- }
-
- if (gtranslator_profile_get_language_name (profile) != NULL) {
- gtk_entry_set_text (GTK_ENTRY (GTR_PROFILE_DIALOG (dlg)->priv->language_name_entry),
- gtranslator_profile_get_language_name (profile));
- gtranslator_profile_set_language_name (old_profile, gtranslator_profile_get_language_name (profile));
- }
-
- if (gtranslator_profile_get_language_code (profile) != NULL) {
- gtk_entry_set_text (GTK_ENTRY (GTR_PROFILE_DIALOG (dlg)->priv->language_code_entry),
- gtranslator_profile_get_language_code (profile));
- gtranslator_profile_set_language_code (old_profile, gtranslator_profile_get_language_code (profile));
- }
-
- if (gtranslator_profile_get_charset (profile) != NULL) {
- gtk_entry_set_text (GTK_ENTRY (GTR_PROFILE_DIALOG (dlg)->priv->charset_entry),
- gtranslator_profile_get_charset (profile));
- gtranslator_profile_set_charset (old_profile, gtranslator_profile_get_charset (profile));
- }
-
- if (gtranslator_profile_get_encoding (profile) != NULL) {
- gtk_entry_set_text (GTK_ENTRY (GTR_PROFILE_DIALOG (dlg)->priv->encoding_entry),
- gtranslator_profile_get_encoding (profile));
- gtranslator_profile_set_encoding (old_profile, gtranslator_profile_get_encoding (profile));
- }
-
- if (gtranslator_profile_get_group_email (profile) != NULL) {
- gtk_entry_set_text (GTK_ENTRY (GTR_PROFILE_DIALOG (dlg)->priv->language_email_entry),
- gtranslator_profile_get_group_email (profile));
- gtranslator_profile_set_group_email (old_profile, gtranslator_profile_get_group_email (profile));
- }
-
- if (gtranslator_profile_get_plurals (profile) != NULL) {
- gtk_entry_set_text (GTK_ENTRY (GTR_PROFILE_DIALOG (dlg)->priv->plurals_forms_entry),
- gtranslator_profile_get_plurals (profile));
- gtranslator_profile_set_plurals (old_profile, gtranslator_profile_get_plurals (profile));
-}
-
- data->old_profile = old_profile;
- data->new_profile = profile;
-
- /* Connect entry signals */
- g_signal_connect (GTR_PROFILE_DIALOG (dlg)->priv->profile_name_entry, "notify::text",
- G_CALLBACK (profile_name_entry_changed),
- profile);
- g_signal_connect (GTR_PROFILE_DIALOG (dlg)->priv->author_name_entry, "notify::text",
- G_CALLBACK (author_name_entry_changed),
- profile);
- g_signal_connect (GTR_PROFILE_DIALOG (dlg)->priv->author_email_entry, "notify::text",
- G_CALLBACK (author_email_entry_changed),
- profile);
- g_signal_connect (GTR_PROFILE_DIALOG (dlg)->priv->language_name_entry, "notify::text",
- G_CALLBACK (language_name_entry_changed),
- profile);
- g_signal_connect (GTR_PROFILE_DIALOG (dlg)->priv->language_code_entry, "notify::text",
- G_CALLBACK (language_code_entry_changed),
- profile);
- g_signal_connect (GTR_PROFILE_DIALOG (dlg)->priv->charset_entry, "notify::text",
- G_CALLBACK (charset_entry_changed),
- profile);
- g_signal_connect (GTR_PROFILE_DIALOG (dlg)->priv->encoding_entry, "notify::text",
- G_CALLBACK (encoding_entry_changed),
- profile);
- g_signal_connect (GTR_PROFILE_DIALOG (dlg)->priv->language_email_entry, "notify::text",
- G_CALLBACK (group_email_entry_changed),
- profile);
- g_signal_connect (GTR_PROFILE_DIALOG (dlg)->priv->plurals_forms_entry, "notify::text",
- G_CALLBACK (plurals_entry_changed),
- profile);
-
- /*
- * Connect signals to dialog buttons.
- */
-
- g_signal_connect (cancel_button,
- "clicked",
- G_CALLBACK (destroy_without_changes),
- data);
-
- if (action == NEW_PROFILE) {
- g_signal_connect (ok_button,
- "clicked",
- G_CALLBACK (save_new_profile),
- profile);
- } else {
- if (action == EDIT_PROFILE) {
- g_signal_connect (ok_button,
- "clicked",
- G_CALLBACK (save_modified_profile),
- profile);
- }
- }
-
+ gtk_window_present (GTK_WINDOW (dlg));
}
Modified: trunk/src/dialogs/profile-dialog.glade
==============================================================================
--- trunk/src/dialogs/profile-dialog.glade (original)
+++ trunk/src/dialogs/profile-dialog.glade Tue Sep 16 09:52:02 2008
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Wed Aug 6 11:28:41 2008 -->
+<!--Generated with glade3 3.4.0 on Mon Mar 17 17:20:26 2008 -->
<glade-interface>
<widget class="GtkDialog" id="dialog1">
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -9,12 +9,12 @@
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="vbox1">
+ <widget class="GtkVBox" id="profiles_dialog">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkVBox" id="profiles_dialog">
+ <widget class="GtkVBox" id="vbox1">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="spacing">18</property>
@@ -60,27 +60,27 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkEntry" id="profile_entry">
+ <widget class="GtkLabel" id="label3">
<property name="visible">True</property>
- <property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Name:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">profile_entry</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label3">
+ <widget class="GtkEntry" id="profile_entry">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Name:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">profile_entry</property>
</widget>
<packing>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
</packing>
</child>
</widget>
@@ -141,7 +141,7 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkEntry" id="email_entry">
+ <widget class="GtkEntry" id="name_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -149,40 +149,38 @@
<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>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label7">
+ <widget class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Email:</property>
+ <property name="label" translatable="yes">N_ame:</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">email_entry</property>
+ <property name="mnemonic_widget">name_entry</property>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label6">
+ <widget class="GtkLabel" id="label7">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">N_ame:</property>
+ <property name="label" translatable="yes">_Email:</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">name_entry</property>
+ <property name="mnemonic_widget">email_entry</property>
</widget>
<packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="name_entry">
+ <widget class="GtkEntry" id="email_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -190,6 +188,8 @@
<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>
</packing>
</child>
</widget>
@@ -256,66 +256,57 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkEntry" id="team_email_entry">
+ <widget class="GtkLabel" id="label11">
<property name="visible">True</property>
- <property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Language:</property>
+ <property name="use_underline">True</property>
</widget>
<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>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="encoding_entry">
+ <widget class="GtkLabel" id="label12">
<property name="visible">True</property>
- <property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Language _code:</property>
+ <property name="use_underline">True</property>
</widget>
<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="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="charset_entry">
+ <widget class="GtkLabel" id="label13">
<property name="visible">True</property>
- <property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Character _set</property>
+ <property name="use_underline">True</property>
</widget>
<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>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="langcode_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- </widget>
- <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>
- </packing>
- </child>
- <child>
- <widget class="GtkEntry" id="language_entry">
+ <widget class="GtkLabel" id="label14">
<property name="visible">True</property>
- <property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Transfer en_coding:</property>
+ <property name="use_underline">True</property>
</widget>
<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>
</packing>
</child>
<child>
@@ -333,57 +324,66 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label14">
+ <widget class="GtkEntry" id="language_entry">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Transfer en_coding:</property>
- <property name="use_underline">True</property>
</widget>
<packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label13">
+ <widget class="GtkEntry" id="langcode_entry">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Character _set</property>
- <property name="use_underline">True</property>
</widget>
<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>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkEntry" id="charset_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ </widget>
+ <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>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label12">
+ <widget class="GtkEntry" id="encoding_entry">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Language _code:</property>
- <property name="use_underline">True</property>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label11">
+ <widget class="GtkEntry" id="team_email_entry">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Language:</property>
- <property name="use_underline">True</property>
</widget>
<packing>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
</packing>
</child>
</widget>
Modified: trunk/src/dialogs/profile-dialog.h
==============================================================================
--- trunk/src/dialogs/profile-dialog.h (original)
+++ trunk/src/dialogs/profile-dialog.h Tue Sep 16 09:52:02 2008
@@ -23,15 +23,9 @@
#include <glib-object.h>
#include <gtk/gtk.h>
-#include "profile.h"
#include "window.h"
#include "preferences-dialog.h"
-enum {
- NEW_PROFILE,
- EDIT_PROFILE
- };
-
/*
* Type checking and casting macros
*/
@@ -75,8 +69,6 @@
GType gtranslator_profile_dialog_register_type (GTypeModule * module);
-void gtranslator_show_profile_dialog (GtranslatorPreferencesDialog *dialog,
- GtranslatorProfile *profile,
- gint action);
+void gtranslator_show_profile_dialog (GtranslatorPreferencesDialog *dialog);
#endif
Modified: trunk/src/dialogs/search-dialog.c
==============================================================================
--- trunk/src/dialogs/search-dialog.c (original)
+++ trunk/src/dialogs/search-dialog.c Tue Sep 16 09:52:02 2008
@@ -369,7 +369,7 @@
gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dlg)->action_area), 5);
gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dlg)->action_area), 6);
- ret = gtranslator_utils_get_glade_widgets (PKGDATADIR"/search-dialog.glade",
+ ret = gtranslator_utils_get_glade_widgets (DATADIR"/search-dialog.glade",
"search_dialog_content",
&error_widget,
"search_dialog_content", &content,
Modified: trunk/src/dialogs/search-dialog.glade
==============================================================================
--- trunk/src/dialogs/search-dialog.glade (original)
+++ trunk/src/dialogs/search-dialog.glade Tue Sep 16 09:52:02 2008
@@ -30,27 +30,27 @@
<placeholder/>
</child>
<child>
- <widget class="GtkLabel" id="replace_with_label">
+ <widget class="GtkLabel" id="search_label">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Replace _with: </property>
+ <property name="label" translatable="yes">_Search for: </property>
<property name="use_underline">True</property>
</widget>
<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>
- <widget class="GtkLabel" id="search_label">
+ <widget class="GtkLabel" id="replace_with_label">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Search for: </property>
+ <property name="label" translatable="yes">Replace _with: </property>
<property name="use_underline">True</property>
</widget>
<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>
@@ -88,6 +88,19 @@
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <widget class="GtkCheckButton" id="fuzzy_checkbutton">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Fuzzy</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -106,20 +119,6 @@
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="fuzzy_checkbutton">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Include fuzzy strings</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
<widget class="GtkCheckButton" id="match_case_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -131,7 +130,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">3</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -146,7 +145,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">4</property>
+ <property name="position">3</property>
</packing>
</child>
</widget>
Modified: trunk/src/draw-spaces.c
==============================================================================
--- trunk/src/draw-spaces.c (original)
+++ trunk/src/draw-spaces.c Tue Sep 16 09:52:02 2008
@@ -87,30 +87,15 @@
gtk_text_view_get_iter_location(view, iter, &rect);
gtk_text_view_buffer_to_window_coords(view, GTK_TEXT_WINDOW_TEXT,
rect.x,
- rect.y + rect.height / 2, &x, &y);
-
-
+ rect.y + rect.height / 2, &x, &y);
cairo_save(cr);
-
- if (gtk_widget_get_default_direction () == GTK_TEXT_DIR_LTR)
- {
- cairo_move_to(cr, x+2, y-2);
- cairo_rel_line_to(cr, +7, 0);
- cairo_rel_line_to(cr, 0, 4);
- cairo_rel_move_to(cr, -3, 0);
- cairo_rel_line_to(cr, 6, 0);
- cairo_rel_line_to(cr, -3, 4);
- cairo_rel_line_to(cr, -3, -4);
- }else
- {
- cairo_move_to (cr, x-2, y-2);
- cairo_rel_line_to(cr, -7, 0);
- cairo_rel_line_to(cr, 0, 4);
- cairo_rel_move_to(cr, 3, 0);
- cairo_rel_line_to(cr, -6, 0);
- cairo_rel_line_to(cr, 3, 4);
- cairo_rel_line_to(cr, 3, -4);
- }
+ cairo_move_to(cr, x+2, y-2);
+ cairo_rel_line_to(cr, +7, 0);
+ cairo_rel_line_to(cr, 0, 4);
+ cairo_rel_move_to(cr, -3, 0);
+ cairo_rel_line_to(cr, 5, 0);
+ cairo_rel_line_to(cr, -2.5, 4);
+ cairo_rel_line_to(cr, -2.5, -4);
cairo_restore(cr);
cairo_fill(cr);
@@ -163,6 +148,4 @@
if(!gtk_text_iter_forward_char(&iter))
break;
}
-
- cairo_destroy (cr);
}
Modified: trunk/src/header.c
==============================================================================
--- trunk/src/header.c (original)
+++ trunk/src/header.c Tue Sep 16 09:52:02 2008
@@ -96,11 +96,6 @@
*/
gchar *plural_forms;
gint nplurals;
-
- /*
- * Check if header has changed
- */
- gboolean header_changed;
};
/*
@@ -373,35 +368,6 @@
}
/**
- * gtranslator_header_get_header_changed:
- * @header: a #GtranslatorHeader.
- *
- * Return value: TRUE if the header has changed, FALSE if not.
- */
-
-gboolean
-gtranslator_header_get_header_changed (GtranslatorHeader *header)
-{
- g_return_val_if_fail (GTR_IS_HEADER (header), NULL);
-
- return header->priv->header_changed;
-}
-
-/**
- * gtranslator_header_set_header_changed:
- * @header: a #GtranslatorHeader
- * @gboolean: Indicate if the header has changed or not.
- *
- * Sets the state of the header, TRUE if has changed, FALSE if not.
- */
-
-void
-gtranslator_header_set_header_changed (GtranslatorHeader *header, gboolean change)
-{
- header->priv->header_changed = change;
-}
-
-/**
* gtranslator_header_get_plural:
* @header: a #GtranslatorHeader
*
Modified: trunk/src/header.h
==============================================================================
--- trunk/src/header.h (original)
+++ trunk/src/header.h Tue Sep 16 09:52:02 2008
@@ -110,10 +110,6 @@
const gchar *gtranslator_header_get_plural_forms (GtranslatorHeader *header);
void gtranslator_header_set_plural_forms (GtranslatorHeader *header,
const gchar *plural_forms);
-
-gboolean gtranslator_header_get_header_changed (GtranslatorHeader *header);
-void gtranslator_header_set_header_changed (GtranslatorHeader *header,
- gboolean change);
gint gtranslator_header_get_nplurals (GtranslatorHeader *header);
Modified: trunk/src/history-entry.c
==============================================================================
--- trunk/src/history-entry.c (original)
+++ trunk/src/history-entry.c Tue Sep 16 09:52:02 2008
@@ -25,7 +25,7 @@
* list of people on the gtranslator Team.
* See the ChangeLog files for a list of changes.
*
- * $Id: history-entry.c 6377 2008-08-10 14:45:44Z pborelli $
+ * $Id: history-entry.c 5931 2007-09-25 20:05:40Z pborelli $
*/
#ifdef HAVE_CONFIG_H
@@ -158,8 +158,7 @@
"History ID",
"History ID",
NULL,
- G_PARAM_READWRITE |
- G_PARAM_STATIC_STRINGS));
+ G_PARAM_READWRITE));
g_object_class_install_property (object_class,
PROP_HISTORY_LENGTH,
@@ -169,8 +168,7 @@
0,
G_MAXUINT,
GTR_HISTORY_ENTRY_HISTORY_LENGTH_DEFAULT,
- G_PARAM_READWRITE |
- G_PARAM_STATIC_STRINGS));
+ G_PARAM_READWRITE));
/* TODO: Add enable-completion property */
@@ -260,7 +258,6 @@
gconf_items,
NULL);
- g_slist_foreach (gconf_items, (GFunc) g_free, NULL);
g_slist_free (gconf_items);
g_free (key);
}
@@ -290,12 +287,9 @@
strcmp (item_text, text) == 0)
{
gtk_list_store_remove (store, &iter);
- g_free (item_text);
return TRUE;
}
- g_free (item_text);
-
} while (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter));
return FALSE;
@@ -412,9 +406,8 @@
-1);
}
- g_slist_foreach (gconf_items, (GFunc) g_free, NULL);
- g_slist_free (gconf_items);
g_free (key);
+ g_slist_free (gconf_items);
}
void
Modified: trunk/src/main.c
==============================================================================
--- trunk/src/main.c (original)
+++ trunk/src/main.c Tue Sep 16 09:52:02 2008
@@ -60,12 +60,16 @@
for (i = 0; file_arguments[i]; i++)
{
GFile *file;
+ gchar *uri;
file = g_file_new_for_commandline_arg (file_arguments[i]);
+ uri = g_file_get_uri (file);
+ g_object_unref (file);
+
- if (file != NULL){
+ if (uri != NULL){
file_list = g_slist_prepend (file_list,
- file);
+ uri);
}
else
@@ -83,19 +87,15 @@
* The ubiquitous main function...
*/
gint
-main (gint argc,
- gchar *argv[])
+main(gint argc,
+ gchar *argv[])
{
GError *error = NULL;
GtranslatorPluginsEngine *engine;
GtranslatorWindow *window;
GSList *file_list = NULL;
GOptionContext *context;
- gchar *filename;
- gchar *config_folder;
- GList *profiles_list = NULL;
- GFile *file;
-
+
/*
* Initialize gettext.
*/
@@ -125,7 +125,6 @@
g_clear_error(&error);
}
- if (!g_thread_supported()) g_thread_init(NULL);
gtk_init(&argc, &argv);
g_option_context_parse(context, &argc, &argv, NULL);
@@ -158,23 +157,7 @@
engine = gtranslator_plugins_engine_get_default ();
gtk_about_dialog_set_url_hook (gtranslator_utils_activate_url, NULL, NULL);
- gtk_about_dialog_set_email_hook (gtranslator_utils_activate_email, NULL, NULL);
- /*
- * Load profiles list
- */
- config_folder = gtranslator_utils_get_user_config_dir ();
- filename = g_build_filename (config_folder,
- "profiles.xml",
- NULL);
- file = g_file_new_for_path (filename);
-
- if (g_file_query_exists (file, NULL)) {
- profiles_list = gtranslator_profile_get_profiles_from_xml_file (filename);
- }
-
- gtranslator_application_set_profiles (GTR_APP, profiles_list);
-
/*
* Create the main app-window.
*/
@@ -186,13 +169,11 @@
file_list = get_command_line_data ();
if (file_list)
{
- gtranslator_actions_load_locations (window, (const GSList *)file_list);
- g_slist_foreach (file_list, (GFunc) g_object_unref, NULL);
+ gtranslator_actions_load_uris (window, (const GSList *)file_list);
+ g_slist_foreach (file_list, (GFunc) g_free, NULL);
g_slist_free (file_list);
}
- g_option_context_free (context);
-
/*
* Enter main GTK loop
*/
Modified: trunk/src/message-area.c
==============================================================================
--- trunk/src/message-area.c (original)
+++ trunk/src/message-area.c Tue Sep 16 09:52:02 2008
@@ -25,7 +25,7 @@
* list of people on the gtranslator Team.
* See the ChangeLog files for a list of changes.
*
- * $Id: message-area.c 6468 2008-08-28 08:23:00Z icq $
+ * $Id: message-area.c 5887 2007-09-07 07:20:19Z pborelli $
*/
/* TODO: Style properties */
@@ -335,13 +335,6 @@
0);
}
-/**
- * gtranslator_message_area_set_contents:
- * @message_area: a #GtranslatorMessageArea
- * @contents: widget you want to add to the contents area
- *
- * Adds the @contents widget to the contents area of #GtranslatorMessageArea.
- */
void
gtranslator_message_area_set_contents (GtranslatorMessageArea *message_area,
GtkWidget *contents)
@@ -357,19 +350,6 @@
0);
}
-/**
- * gtranslator_message_area_add_button:
- * @message_area: a #GtranslatorMessageArea
- * @button_text: text of button, or stock ID
- * @response_id: response ID for the button
- *
- * Adds a button with the given text (or a stock button, if button_text is a stock ID)
- * and sets things up so that clicking the button will emit the "response" signal
- * with the given response_id. The button is appended to the end of the message area's
- * action area. The button widget is returned, but usually you don't need it.
- *
- * Returns: the button widget that was added
- */
GtkWidget*
gtranslator_message_area_add_button (GtranslatorMessageArea *message_area,
const gchar *button_text,
@@ -423,16 +403,6 @@
}
}
-/**
- * gtranslator_message_area_add_buttons:
- * @message_area: a #GtranslatorMessageArea
- * @first_button_text: button text or stock ID
- * @...: response ID for first button, then more text-response_id pairs
- *
- * Adds more buttons, same as calling gtranslator_message_area_add_button() repeatedly.
- * The variable argument list should be NULL-terminated as with
- * gtranslator_message_area_new_with_buttons(). Each button must have both text and response ID.
- */
void
gtranslator_message_area_add_buttons (GtranslatorMessageArea *message_area,
const gchar *first_button_text,
@@ -449,33 +419,12 @@
va_end (args);
}
-/**
- * gtranslator_message_area_new:
- *
- * Creates a new #GtranslatorMessageArea object.
- *
- * Returns: a new #GtranslatorMessageArea object
- */
GtkWidget *
gtranslator_message_area_new (void)
{
return g_object_new (GTR_TYPE_MESSAGE_AREA, NULL);
}
-/**
- * gtranslator_message_area_new_with_buttons:
- * @first_button_text: stock ID or text to go in first button, or NULL
- * @...: response ID for first button, then additional buttons, ending with NULL
- *
- * Creates a new #GtranslatorMessageArea with buttons. Button text/response ID pairs
- * should be listed, with a NULL pointer ending the list. Button text can be either
- * a stock ID such as GTK_STOCK_OK, or some arbitrary text. A response ID can be any
- * positive number, or one of the values in the GtkResponseType enumeration. If
- * the user clicks one of these dialog buttons, GtranslatorMessageArea will emit the "response"
- * signal with the corresponding response ID.
- *
- * Returns: a new #GtranslatorMessageArea
- */
GtkWidget *
gtranslator_message_area_new_with_buttons (const gchar *first_button_text,
...)
@@ -496,16 +445,6 @@
return GTK_WIDGET (message_area);
}
-/**
- * gtranslator_message_area_set_response_sensitive:
- * @message_area: a #GtranslatorMessageArea
- * @response_id: a response ID
- * @setting: TRUE for sensitive
- *
- * Calls gtk_widget_set_sensitive (widget, setting) for each widget in the dialog's
- * action area with the given response_id. A convenient way to sensitize/desensitize
- * dialog buttons.
- */
void
gtranslator_message_area_set_response_sensitive (GtranslatorMessageArea *message_area,
gint response_id,
@@ -533,15 +472,6 @@
g_list_free (children);
}
-/**
- * gtranslator_message_area_set_default_response:
- * @message_area: a #GtranslatorMessageArea
- * @response_id: a response ID
- *
- * Sets the last widget in the message area's action area with the given response_id
- * as the default widget for the dialog. Pressing "Enter" normally activates the
- * default widget.
- */
void
gtranslator_message_area_set_default_response (GtranslatorMessageArea *message_area,
gint response_id)
@@ -568,13 +498,6 @@
g_list_free (children);
}
-/**
- * gtranslator_message_area_set_default_response:
- * @message_area: a #GtranslatorMessageArea
- * @response_id: a response ID
- *
- * Emits the 'response' signal with the given @response_id.
- */
void
gtranslator_message_area_response (GtranslatorMessageArea *message_area,
gint response_id)
@@ -587,15 +510,6 @@
response_id);
}
-/**
- * gtranslator_message_area_add_stock_button_with_text:
- * @message_area: a #GtranslatorMessageArea
- * @text: the text to visualize in the button
- * @stock_id: the stock ID of the button
- * @response_id: a response ID
- *
- * Same as gtranslator_message_area_add_button() but with a specific text.
- */
GtkWidget *
gtranslator_message_area_add_stock_button_with_text (GtranslatorMessageArea *message_area,
const gchar *text,
Modified: trunk/src/message-area.h
==============================================================================
--- trunk/src/message-area.h (original)
+++ trunk/src/message-area.h Tue Sep 16 09:52:02 2008
@@ -25,7 +25,7 @@
* list of people on the gtranslator Team.
* See the ChangeLog files for a list of changes.
*
- * $Id: message-area.h 6138 2008-02-01 14:32:22Z icq $
+ * $Id: message-area.h 5666 2007-06-29 19:52:25Z sfre $
*/
#ifndef __GTR_MESSAGE_AREA_H__
Modified: trunk/src/message-table.c
==============================================================================
--- trunk/src/message-table.c (original)
+++ trunk/src/message-table.c Tue Sep 16 09:52:02 2008
@@ -76,8 +76,7 @@
if (msg != NULL && g_utf8_collate (gtranslator_msg_get_msgid (msg->data),
gtranslator_msg_get_msgid (current_msg->data)))
{
- gtranslator_tab_message_go_to (table->priv->tab, msg,
- FALSE, GTR_TAB_MOVE_NONE);
+ gtranslator_tab_message_go_to (table->priv->tab, msg);
}
}
}
@@ -246,8 +245,7 @@
gtranslator_po_set_messages (po, messages);
gtranslator_tab_message_go_to (table->priv->tab,
- g_list_first (messages),
- FALSE, GTR_TAB_MOVE_NONE);
+ g_list_first (messages));
}
static void
@@ -385,14 +383,6 @@
object_class->finalize = gtranslator_message_table_finalize;
}
-/**
- * gtranslator_message_table_new:
- * @tab: a #GtranslatorTab
- *
- * Creates a new #GtranslatorMessageTable object.
- *
- * Returns: the newly created #GtranslatorMessageTable
- */
GtkWidget *
gtranslator_message_table_new (GtkWidget *tab)
{
@@ -410,14 +400,6 @@
return GTK_WIDGET(obj);
}
-/**
- * gtranslator_message_table_populate:
- * @table: a #GtranslatorMessageTable
- * @messages: a list of #GtranslatorMsg
- *
- * Populates the #GtranslatorMessageTable with the list of #GtranslatorMsg and
- * sort them.
- */
void
gtranslator_message_table_populate(GtranslatorMessageTable *table,
GList *messages)
Modified: trunk/src/msg.c
==============================================================================
--- trunk/src/msg.c (original)
+++ trunk/src/msg.c Tue Sep 16 09:52:02 2008
@@ -49,64 +49,9 @@
gint po_position;
};
-enum
-{
- PROP_0,
- PROP_GETTEXT_ITER,
- PROP_GETTEXT_MSG
-};
-
static gchar *message_error = NULL;
static void
-gtranslator_msg_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
-{
- GtranslatorMsg *msg = GTR_MSG (object);
-
- switch (prop_id)
- {
- case PROP_GETTEXT_ITER:
- gtranslator_msg_set_iterator (msg,
- g_value_get_pointer (value));
- break;
- case PROP_GETTEXT_MSG:
- gtranslator_msg_set_message (msg,
- g_value_get_pointer (value));
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
-
-static void
-gtranslator_msg_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec)
-{
- GtranslatorMsg *msg = GTR_MSG (object);
-
- switch (prop_id)
- {
- case PROP_GETTEXT_ITER:
- g_value_set_pointer (value,
- gtranslator_msg_get_iterator (msg));
- break;
- case PROP_GETTEXT_MSG:
- g_value_set_pointer (value,
- gtranslator_msg_get_message (msg));
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
-
-static void
gtranslator_msg_init (GtranslatorMsg *msg)
{
msg->priv = GTR_MSG_GET_PRIVATE (msg);
@@ -114,7 +59,8 @@
static void
gtranslator_msg_finalize (GObject *object)
-{
+{
+ g_free(message_error);
G_OBJECT_CLASS (gtranslator_msg_parent_class)->finalize (object);
}
@@ -126,22 +72,6 @@
g_type_class_add_private (klass, sizeof (GtranslatorMsgPrivate));
object_class->finalize = gtranslator_msg_finalize;
- object_class->set_property = gtranslator_msg_set_property;
- object_class->get_property = gtranslator_msg_get_property;
-
- g_object_class_install_property (object_class,
- PROP_GETTEXT_MSG,
- g_param_spec_pointer ("gettext-iter",
- "Gettext iterator",
- "The po_message_iterator_t pointer",
- G_PARAM_READWRITE));
-
- g_object_class_install_property (object_class,
- PROP_GETTEXT_MSG,
- g_param_spec_pointer ("gettext-msg",
- "Gettext msg",
- "The po_message_t pointer",
- G_PARAM_READWRITE));
}
/***************************** Public funcs ***********************************/
@@ -149,61 +79,17 @@
/**
* gtranslator_msg_new:
*
- * Creates a new #GtranslatorMsg.
- *
* Return value: a new #GtranslatorMsg object
**/
GtranslatorMsg *
-gtranslator_msg_new (po_message_iterator_t iter,
- po_message_t message)
+gtranslator_msg_new(po_message_iterator_t iter)
{
GtranslatorMsg *msg;
msg = g_object_new (GTR_TYPE_MSG, NULL);
-
- gtranslator_msg_set_iterator (msg, iter);
- gtranslator_msg_set_message (msg, message);
-
- /* Set the status */
- if (gtranslator_msg_is_fuzzy (msg))
- gtranslator_msg_set_status (msg, GTR_MSG_STATUS_FUZZY);
- else if (gtranslator_msg_is_translated (msg))
- gtranslator_msg_set_status (msg, GTR_MSG_STATUS_TRANSLATED);
- else gtranslator_msg_set_status (msg, GTR_MSG_STATUS_UNTRANSLATED);
-
- return msg;
-}
-
-/**
- * gtranslator_msg_get_iterator:
- * @msg: a #GtranslatorMsg
- *
- * Return value: the message iterator in gettext format
- **/
-po_message_iterator_t
-gtranslator_msg_get_iterator (GtranslatorMsg *msg)
-{
- g_return_val_if_fail (GTR_IS_MSG (msg), NULL);
-
- return msg->priv->iterator;
-}
-
-/**
- * gtranslator_msg_set_iterator:
- * @msg: a #GtranslatorMsg
- * @message: the po_message_iterator_t to set into the @msg
- *
- * Sets the iterator into the #GtranslatorMsg class.
- **/
-void
-gtranslator_msg_set_iterator (GtranslatorMsg *msg,
- po_message_iterator_t iter)
-{
- g_return_if_fail (GTR_IS_MSG (msg));
-
msg->priv->iterator = iter;
- g_object_notify (G_OBJECT (msg), "gettext-iter");
+ return msg;
}
/**
@@ -213,10 +99,8 @@
* Return value: the message in gettext format
**/
po_message_t
-gtranslator_msg_get_message (GtranslatorMsg *msg)
+gtranslator_msg_get_message(GtranslatorMsg *msg)
{
- g_return_val_if_fail (GTR_IS_MSG (msg), NULL);
-
return msg->priv->message;
}
@@ -232,17 +116,14 @@
po_message_t message)
{
msg->priv->message = message;
-
- g_object_notify (G_OBJECT (msg), "gettext-msg");
}
/**
* gtranslator_msg_get_row_reference:
* @msg: a #GtranslatorMsg
*
- * Returns: the #GtkTreeRowReference corresponding to the message's place
- * in the message table
- */
+ * Return value: the GtkTreeRowReference corresponding to the message's place in the message table
+ **/
GtkTreeRowReference *
gtranslator_msg_get_row_reference(GtranslatorMsg *msg)
{
@@ -603,9 +484,7 @@
const gchar *filename, size_t lineno, size_t column,
gint multiline_p, const gchar *message_text)
{
- if (message_text)
- message_error = g_strdup (message_text);
- else message_error = NULL;
+ message_error = g_strdup(message_text);
}
static void
@@ -625,35 +504,31 @@
* gtranslator_msg_check:
* @msg: a #GtranslatorMsg
*
- * Return value: the message error or NULL if there is not any error. Must be
- * freed with g_free.
+ * Return value: the message error or NULL if there is not any error.
*
* Test whether the message translation is a valid format string if the message
* is marked as being a format string.
**/
-gchar *
+const gchar *
gtranslator_msg_check(GtranslatorMsg *msg)
{
struct po_xerror_handler handler;
g_return_val_if_fail(msg != NULL, NULL);
-
- /* We are not freeing the message_error so at start should be NULL
- * always for us
- */
- message_error = NULL;
handler.xerror = &on_gettext_po_xerror;
handler.xerror2 = &on_gettext_po_xerror2;
+ if(message_error != NULL)
+ {
+ g_free(message_error);
+ message_error = NULL;
+ }
+
po_message_check_all(msg->priv->message, msg->priv->iterator, &handler);
if(gtranslator_msg_is_fuzzy(msg) || !gtranslator_msg_is_translated(msg))
- {
- if (message_error)
- g_free (message_error);
message_error = NULL;
- }
/*Are there any other way to do this?*/
return message_error;
Modified: trunk/src/msg.h
==============================================================================
--- trunk/src/msg.h (original)
+++ trunk/src/msg.h Tue Sep 16 09:52:02 2008
@@ -76,14 +76,7 @@
GType gtranslator_msg_register_type (GTypeModule * module);
-GtranslatorMsg *gtranslator_msg_new (po_message_iterator_t iter,
- po_message_t message);
-
-po_message_iterator_t
- gtranslator_msg_get_iterator (GtranslatorMsg *msg);
-
-void gtranslator_msg_set_iterator (GtranslatorMsg *msg,
- po_message_iterator_t iter);
+GtranslatorMsg *gtranslator_msg_new (po_message_iterator_t iter);
po_message_t gtranslator_msg_get_message (GtranslatorMsg *msg);
@@ -146,7 +139,7 @@
const gchar *gtranslator_msg_get_format (GtranslatorMsg *msg);
-gchar *gtranslator_msg_check (GtranslatorMsg *msg);
+const gchar *gtranslator_msg_check (GtranslatorMsg *msg);
G_END_DECLS
Modified: trunk/src/notebook.c
==============================================================================
--- trunk/src/notebook.c (original)
+++ trunk/src/notebook.c Tue Sep 16 09:52:02 2008
@@ -75,8 +75,6 @@
GtkWidget *ebox;
gchar *tooltip;
GtranslatorTab *tab;
- GFile *location;
- gchar *path;
label = GTK_WIDGET (g_object_get_data (G_OBJECT (hbox), "label"));
ebox = GTK_WIDGET (g_object_get_data (G_OBJECT (hbox), "label-ebox"));
@@ -86,17 +84,11 @@
g_return_if_fail (str != NULL);
gtk_label_set_text (GTK_LABEL (label), str);
-
- location = gtranslator_po_get_location (po);
- path = g_file_get_path (location);
- g_object_unref (location);
-
- tooltip = g_strdup_printf (_("<b>Path:</b> %s"),
- path);
+ tooltip = g_strdup_printf (_("<b>Path:</b> %s"),
+ gtranslator_po_get_filename (po));
gtk_widget_set_tooltip_markup (ebox, tooltip);
- g_free (path);
g_free (tooltip);
g_free (str);
}
@@ -203,11 +195,6 @@
static void
gtranslator_notebook_finalize (GObject *object)
{
- GtranslatorNotebook *notebook = GTR_NOTEBOOK (object);
-
- if (notebook->priv->pages)
- g_list_free (notebook->priv->pages);
-
G_OBJECT_CLASS (gtranslator_notebook_parent_class)->finalize (object);
}
@@ -234,26 +221,12 @@
/***************************** Public funcs ***********************************/
-/**
- * gtranslator_notebook_new:
- *
- * Creates a new #GtranslatorNotebook.
- *
- * Returns: a new #GtranslatorNotebook object
- */
GtkWidget *
gtranslator_notebook_new()
{
return GTK_WIDGET(g_object_new(GTR_TYPE_NOTEBOOK, NULL));
}
-/**
- * gtranslator_notebook_add_page:
- * @notebook: a #GtranslatorNotebook
- * @tab: a #GtranslatorTab
- *
- * Adds a new #GtranslatorTab to @notebook.
- */
void
gtranslator_notebook_add_page (GtranslatorNotebook *notebook,
GtranslatorTab *tab)
@@ -266,7 +239,7 @@
g_return_if_fail (GTR_IS_TAB (tab));
po = gtranslator_tab_get_po (tab);
-
+
label = build_tab_label (notebook, tab);
sync_name (po, NULL, label);
@@ -280,48 +253,8 @@
gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
GTK_WIDGET (tab), label);
priv->pages = g_list_append (priv->pages, tab);
-
- if (g_list_length (notebook->priv->pages) == 1)
- gtk_notebook_set_show_tabs (GTK_NOTEBOOK (notebook), FALSE);
- else
- gtk_notebook_set_show_tabs (GTK_NOTEBOOK (notebook), TRUE);
}
-/**
- * gtranslator_notebook_remove_page:
- * @notebook: a #GtranslatorNotebook
- * @page_num: the index of a notebook page, starting from 0.
- *
- * Removes a page from the notebook given its index in the notebook.
- */
-void
-gtranslator_notebook_remove_page (GtranslatorNotebook *notebook,
- gint page_num)
-{
- GtkWidget *tab;
-
- g_return_if_fail (GTR_IS_NOTEBOOK (notebook));
-
- tab = gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), page_num);
-
- if (page_num != -1)
- gtk_notebook_remove_page (GTK_NOTEBOOK (notebook), page_num);
-
- notebook->priv->pages = g_list_remove (notebook->priv->pages,
- tab);
-
- if (g_list_length (notebook->priv->pages) == 1)
- gtk_notebook_set_show_tabs (GTK_NOTEBOOK (notebook), FALSE);
-}
-
-/**
- * gtranslator_notebook_get_page:
- * @notebook: a #GtranslatorNotebook
- *
- * Gets the selected page in the #GtranslatorNotebook.
- *
- * Returns: the selected page in the @notebook
- */
GtranslatorTab *
gtranslator_notebook_get_page(GtranslatorNotebook *notebook)
{
@@ -331,3 +264,5 @@
return GTR_TAB(gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook), num));
}
+
+
Modified: trunk/src/notebook.h
==============================================================================
--- trunk/src/notebook.h (original)
+++ trunk/src/notebook.h Tue Sep 16 09:52:02 2008
@@ -79,9 +79,6 @@
void gtranslator_notebook_add_page (GtranslatorNotebook *notebook,
GtranslatorTab *pax);
-void gtranslator_notebook_remove_page (GtranslatorNotebook *notebook,
- gint i);
-
GtranslatorTab *gtranslator_notebook_get_page (GtranslatorNotebook *notebook);
G_END_DECLS
Modified: trunk/src/plugin-system/module.c
==============================================================================
--- trunk/src/plugin-system/module.c (original)
+++ trunk/src/plugin-system/module.c Tue Sep 16 09:52:02 2008
@@ -33,40 +33,77 @@
* list of people on the gtranslator Team.
* See the ChangeLog files for a list of changes.
*
- * $Id: module.c 6314 2008-06-05 12:57:53Z pborelli $
+ * $Id: module.c 5367 2006-12-17 14:29:49Z pborelli $
*/
#include "config.h"
#include "module.h"
-#include "debug.h"
+//#include "gtranslator-debug.h"
-typedef GType (*GtranslatorModuleRegisterFunc) (GTypeModule *);
+#include <gmodule.h>
+
+typedef struct _GtranslatorModuleClass GtranslatorModuleClass;
+
+struct _GtranslatorModuleClass
+{
+ GTypeModuleClass parent_class;
+};
-enum {
- PROP_0,
- PROP_MODULE_NAME,
- PROP_PATH
+struct _GtranslatorModule
+{
+ GTypeModule parent_instance;
+
+ GModule *library;
+
+ gchar *path;
+ GType type;
};
-G_DEFINE_TYPE (GtranslatorModule, gtranslator_module, G_TYPE_TYPE_MODULE);
+typedef GType (*GtranslatorModuleRegisterFunc) (GTypeModule *);
+
+static void gtranslator_module_init (GtranslatorModule *action);
+static void gtranslator_module_class_init (GtranslatorModuleClass *class);
+
+static GObjectClass *parent_class = NULL;
+
+GType
+gtranslator_module_get_type (void)
+{
+ static GType type = 0;
+
+ if (G_UNLIKELY (type == 0))
+ {
+ static const GTypeInfo type_info =
+ {
+ sizeof (GtranslatorModuleClass),
+ (GBaseInitFunc) NULL,
+ (GBaseFinalizeFunc) NULL,
+ (GClassInitFunc) gtranslator_module_class_init,
+ (GClassFinalizeFunc) NULL,
+ NULL,
+ sizeof (GtranslatorModule),
+ 0, /* n_preallocs */
+ (GInstanceInitFunc) gtranslator_module_init,
+ };
+
+ type = g_type_register_static (G_TYPE_TYPE_MODULE,
+ "GtranslatorModule",
+ &type_info, 0);
+ }
+
+ return type;
+}
static gboolean
gtranslator_module_load (GTypeModule *gmodule)
{
GtranslatorModule *module = GTR_MODULE (gmodule);
GtranslatorModuleRegisterFunc register_func;
- gchar *path;
-
- DEBUG_PRINT ( "Loading %s module from %s",
- module->module_name, module->path);
- path = g_module_build_path (module->path, module->module_name);
- g_return_val_if_fail (path != NULL, FALSE);
- DEBUG_PRINT ( "Module filename: %s", path);
+ g_message( "Loading %s", module->path);
- module->library = g_module_open (path, 0);
- g_free (path);
+ module->library = g_module_open (module->path, 0);
if (module->library == NULL)
{
@@ -99,7 +136,7 @@
if (module->type == 0)
{
- g_warning ("Invalid gtranslator plugin contained by module %s", module->module_name);
+ g_warning ("Invalid gtranslator plugin contained by module %s", module->path);
return FALSE;
}
@@ -111,7 +148,7 @@
{
GtranslatorModule *module = GTR_MODULE (gmodule);
- DEBUG_PRINT ( "Unloading %s", module->path);
+ g_message( "Unloading %s", module->path);
g_module_close (module->library);
@@ -119,140 +156,73 @@
module->type = 0;
}
-static void
-gtranslator_module_class_real_garbage_collect (void)
+const gchar *
+gtranslator_module_get_path (GtranslatorModule *module)
{
- /* Do nothing */
-}
+ g_return_val_if_fail (GTR_IS_MODULE (module), NULL);
-static void
-gtranslator_module_init (GtranslatorModule *module)
-{
- DEBUG_PRINT ( "GtranslatorModule %p initialising", module);
+ return module->path;
}
-static void
-gtranslator_module_finalize (GObject *object)
+GObject *
+gtranslator_module_new_object (GtranslatorModule *module)
{
- GtranslatorModule *module = GTR_MODULE (object);
-
- DEBUG_PRINT ( "GtranslatorModule %p finalising", module);
+ g_message( "Creating object of type %s", g_type_name (module->type));
- g_free (module->path);
- g_free (module->module_name);
+ if (module->type == 0)
+ {
+ return NULL;
+ }
- G_OBJECT_CLASS (gtranslator_module_parent_class)->finalize (object);
+ return g_object_new (module->type, NULL);
}
static void
-gtranslator_module_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec)
+gtranslator_module_init (GtranslatorModule *module)
{
- GtranslatorModule *module = GTR_MODULE (object);
-
- switch (prop_id)
- {
- case PROP_MODULE_NAME:
- g_value_set_string (value, module->module_name);
- break;
- case PROP_PATH:
- g_value_set_string (value, module->path);
- break;
- default:
- g_return_if_reached ();
- }
+ g_message( "GtranslatorModule %p initialising", module);
}
static void
-gtranslator_module_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
+gtranslator_module_finalize (GObject *object)
{
GtranslatorModule *module = GTR_MODULE (object);
- switch (prop_id)
- {
- case PROP_MODULE_NAME:
- module->module_name = g_value_dup_string (value);
- g_type_module_set_name (G_TYPE_MODULE (object),
- module->module_name);
- break;
- case PROP_PATH:
- module->path = g_value_dup_string (value);
- break;
- default:
- g_return_if_reached ();
- }
+ g_message( "GtranslatorModule %p finalising", module);
+
+ g_free (module->path);
+
+ G_OBJECT_CLASS (parent_class)->finalize (object);
}
static void
-gtranslator_module_class_init (GtranslatorModuleClass *klass)
+gtranslator_module_class_init (GtranslatorModuleClass *class)
{
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
- GTypeModuleClass *module_class = G_TYPE_MODULE_CLASS (klass);
+ GObjectClass *object_class = G_OBJECT_CLASS (class);
+ GTypeModuleClass *module_class = G_TYPE_MODULE_CLASS (class);
+
+ parent_class = (GObjectClass *) g_type_class_peek_parent (class);
- object_class->set_property = gtranslator_module_set_property;
- object_class->get_property = gtranslator_module_get_property;
object_class->finalize = gtranslator_module_finalize;
module_class->load = gtranslator_module_load;
module_class->unload = gtranslator_module_unload;
-
- klass->garbage_collect = gtranslator_module_class_real_garbage_collect;
-
- g_object_class_install_property (object_class,
- PROP_MODULE_NAME,
- g_param_spec_string ("module-name",
- "Module Name",
- "The module to load for this plugin",
- NULL,
- G_PARAM_READWRITE |
- G_PARAM_CONSTRUCT_ONLY));
-
- g_object_class_install_property (object_class,
- PROP_PATH,
- g_param_spec_string ("path",
- "Path",
- "The path to use when loading this module",
- NULL,
- G_PARAM_READWRITE |
- G_PARAM_CONSTRUCT_ONLY));
-}
-
-void
-gtranslator_module_class_garbage_collect (GtranslatorModuleClass *klass)
-{
- g_return_if_fail (GTR_IS_MODULE_CLASS (klass));
-
- GTR_MODULE_CLASS (klass)->garbage_collect ();
}
-GObject *
-gtranslator_module_new_object (GtranslatorModule *module)
+GtranslatorModule *
+gtranslator_module_new (const gchar *path)
{
- g_return_val_if_fail (module->type != 0, NULL);
-
- DEBUG_PRINT ( "Creating object of type %s",
- g_type_name (module->type));
+ GtranslatorModule *result;
- return g_object_new (module->type, NULL);
-}
-
-const gchar *
-gtranslator_module_get_path (GtranslatorModule *module)
-{
- g_return_val_if_fail (GTR_IS_MODULE (module), NULL);
+ if (path == NULL || path[0] == '\0')
+ {
+ return NULL;
+ }
- return module->path;
-}
+ result = g_object_new (GTR_TYPE_MODULE, NULL);
-const gchar *
-gtranslator_module_get_module_name (GtranslatorModule *module)
-{
- g_return_val_if_fail (GTR_IS_MODULE (module), NULL);
+ g_type_module_set_name (G_TYPE_MODULE (result), path);
+ result->path = g_strdup (path);
- return module->module_name;
+ return result;
}
Modified: trunk/src/plugin-system/module.h
==============================================================================
--- trunk/src/plugin-system/module.h (original)
+++ trunk/src/plugin-system/module.h Tue Sep 16 09:52:02 2008
@@ -33,14 +33,13 @@
* list of people on the gtranslator Team.
* See the ChangeLog files for a list of changes.
*
- * $Id: module.h 6263 2008-05-05 10:52:10Z sfre $
+ * $Id: module.h 5263 2006-10-08 14:26:02Z pborelli $
*/
-#ifndef __GTR_MODULE_H__
-#define __GTR_MODULE_H__
+#ifndef GTR_MODULE_H
+#define GTR_MODULE_H
#include <glib-object.h>
-#include <gmodule.h>
G_BEGIN_DECLS
@@ -48,43 +47,19 @@
#define GTR_MODULE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTR_TYPE_MODULE, GtranslatorModule))
#define GTR_MODULE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTR_TYPE_MODULE, GtranslatorModuleClass))
#define GTR_IS_MODULE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTR_TYPE_MODULE))
-#define GTR_IS_MODULE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTR_TYPE_MODULE))
+#define GTR_IS_MODULE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), GTR_TYPE_MODULE))
#define GTR_MODULE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GTR_TYPE_MODULE, GtranslatorModuleClass))
-typedef struct _GtranslatorModule GtranslatorModule;
-
-struct _GtranslatorModule
-{
- GTypeModule parent;
-
- GModule *library;
-
- gchar *path;
- gchar *module_name;
- GType type;
-};
-
-typedef struct _GtranslatorModuleClass GtranslatorModuleClass;
-
-struct _GtranslatorModuleClass
-{
- GTypeModuleClass parent_class;
-
- /* Virtual class methods */
- void (* garbage_collect) ();
-};
+typedef struct _GtranslatorModule GtranslatorModule;
GType gtranslator_module_get_type (void) G_GNUC_CONST;
-const gchar *gtranslator_module_get_path (GtranslatorModule *module);
+GtranslatorModule *gtranslator_module_new (const gchar *path);
-const gchar *gtranslator_module_get_module_name (GtranslatorModule *module);
+const gchar *gtranslator_module_get_path (GtranslatorModule *module);
GObject *gtranslator_module_new_object (GtranslatorModule *module);
-void gtranslator_module_class_garbage_collect
- (GtranslatorModuleClass *klass);
-
G_END_DECLS
#endif
Modified: trunk/src/plugin-system/plugin-info-priv.h
==============================================================================
--- trunk/src/plugin-system/plugin-info-priv.h (original)
+++ trunk/src/plugin-system/plugin-info-priv.h Tue Sep 16 09:52:02 2008
@@ -35,6 +35,12 @@
#include "plugin-info.h"
#include "plugin.h"
+typedef enum
+{
+ GTR_PLUGIN_LOADER_C,
+ GTR_PLUGIN_LOADER_PY,
+} GtranslatorPluginLoader;
+
struct _GtranslatorPluginInfo
{
gint refcount;
@@ -42,8 +48,8 @@
gchar *file;
gchar *module_name;
- GType module_type;
- GtranslatorModule *module;
+ GtranslatorPluginLoader loader;
+ GTypeModule *module;
gchar **dependencies;
gchar *name;
Modified: trunk/src/plugin-system/plugin-info.c
==============================================================================
--- trunk/src/plugin-system/plugin-info.c (original)
+++ trunk/src/plugin-system/plugin-info.c Tue Sep 16 09:52:02 2008
@@ -39,13 +39,9 @@
#include "plugin-info.h"
#include "plugin-info-priv.h"
-#include "debug.h"
+//#include "gtranslator-debug.h"
#include "plugin.h"
-#ifdef ENABLE_PYTHON
-#include "gtranslator-python-module.h"
-#endif
-
void
_gtranslator_plugin_info_ref (GtranslatorPluginInfo *info)
{
@@ -67,7 +63,7 @@
if (info->plugin != NULL)
{
- DEBUG_PRINT ( "Unref plugin %s", info->name);
+ g_message( "Unref plugin %s", info->name);
g_object_unref (info->plugin);
@@ -127,7 +123,7 @@
g_return_val_if_fail (file != NULL, NULL);
- DEBUG_PRINT ( "Loading plugin: %s", file);
+ g_message( "Loading plugin: %s", file);
info = g_new0 (GtranslatorPluginInfo, 1);
info->refcount = 1;
@@ -145,7 +141,7 @@
"IAge",
NULL))
{
- DEBUG_PRINT (
+ g_message(
"IAge key does not exist in file: %s", file);
goto error;
}
@@ -156,7 +152,7 @@
"IAge",
NULL) != 2)
{
- DEBUG_PRINT (
+ g_message(
"Wrong IAge in file: %s", file);
goto error;
}
@@ -185,7 +181,7 @@
NULL);
if (info->dependencies == NULL)
{
- DEBUG_PRINT ( "Could not find 'Depends' in %s", file);
+ g_message( "Could not find 'Depends' in %s", file);
info->dependencies = g_new0 (gchar *, 1);
}
@@ -196,17 +192,16 @@
NULL);
if (str && strcmp(str, "python") == 0)
{
+ info->loader = GTR_PLUGIN_LOADER_PY;
#ifndef ENABLE_PYTHON
g_warning ("Cannot load Python plugin '%s' since gtranslator was not "
"compiled with Python support.", file);
goto error;
-#else
- info->module_type = GTR_TYPE_PYTHON_MODULE;
#endif
}
else
{
- info->module_type = GTR_TYPE_MODULE;
+ info->loader = GTR_PLUGIN_LOADER_C;
}
g_free (str);
@@ -231,7 +226,7 @@
if (str)
info->desc = str;
else
- DEBUG_PRINT ( "Could not find 'Description' in %s", file);
+ g_message( "Could not find 'Description' in %s", file);
/* Get Icon */
str = g_key_file_get_locale_string (plugin_file,
@@ -241,7 +236,7 @@
if (str)
info->icon_name = str;
else
- DEBUG_PRINT ( "Could not find 'Icon' in %s, using 'plugin'", file);
+ g_message( "Could not find 'Icon' in %s, using 'plugin'", file);
/* Get Authors */
@@ -251,7 +246,7 @@
NULL,
NULL);
if (info->authors == NULL)
- DEBUG_PRINT ( "Could not find 'Authors' in %s", file);
+ g_message( "Could not find 'Authors' in %s", file);
/* Get Copyright */
@@ -262,7 +257,7 @@
if (str)
info->copyright = str;
else
- DEBUG_PRINT ( "Could not find 'Copyright' in %s", file);
+ g_message( "Could not find 'Copyright' in %s", file);
/* Get Website */
str = g_key_file_get_string (plugin_file,
@@ -272,7 +267,7 @@
if (str)
info->website = str;
else
- DEBUG_PRINT ( "Could not find 'Website' in %s", file);
+ g_message( "Could not find 'Website' in %s", file);
g_key_file_free (plugin_file);
@@ -311,7 +306,7 @@
gboolean
gtranslator_plugin_info_is_configurable (GtranslatorPluginInfo *info)
{
- DEBUG_PRINT ( "Is '%s' configurable?", info->name);
+ g_message( "Is '%s' configurable?", info->name);
g_return_val_if_fail (info != NULL, FALSE);
Modified: trunk/src/plugin-system/plugin-info.h
==============================================================================
--- trunk/src/plugin-system/plugin-info.h (original)
+++ trunk/src/plugin-system/plugin-info.h Tue Sep 16 09:52:02 2008
@@ -33,7 +33,6 @@
#define __GTR_PLUGIN_INFO_H__
#include <glib-object.h>
-#include "module.h"
G_BEGIN_DECLS
Modified: trunk/src/plugin-system/plugin-manager.c
==============================================================================
--- trunk/src/plugin-system/plugin-manager.c (original)
+++ trunk/src/plugin-system/plugin-manager.c Tue Sep 16 09:52:02 2008
@@ -26,7 +26,7 @@
* list of people on the gtranslator Team.
* See the ChangeLog files for a list of changes.
*
- * $Id: plugin-manager.c 6406 2008-08-13 20:04:04Z pborelli $
+ * $Id: plugin-manager.c 6079 2008-01-12 20:18:55Z sdeburca $
*/
#ifdef HAVE_CONFIG_H
@@ -36,12 +36,13 @@
#include <string.h>
#include <glib/gi18n.h>
+#include <glade/glade-xml.h>
#include "plugin-manager.h"
#include "utils.h"
#include "plugins-engine.h"
#include "plugin.h"
-#include "debug.h"
+//#include "gtranslator-debug.h"
enum
{
@@ -103,7 +104,7 @@
gtk_widget_destroy (pm->priv->about);
pm->priv->about = g_object_new (GTK_TYPE_ABOUT_DIALOG,
- "program-name", gtranslator_plugin_info_get_name (info),
+ "name", gtranslator_plugin_info_get_name (info),
"copyright", gtranslator_plugin_info_get_copyright (info),
"authors", gtranslator_plugin_info_get_authors (info),
"comments", gtranslator_plugin_info_get_description (info),
@@ -141,7 +142,7 @@
g_return_if_fail (info != NULL);
- DEBUG_PRINT ( "Configuring: %s\n",
+ g_message( "Configuring: %s\n",
gtranslator_plugin_info_get_name (info));
toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET(pm)));
@@ -149,7 +150,7 @@
gtranslator_plugins_engine_configure_plugin (pm->priv->engine,
info, toplevel);
- DEBUG_PRINT ( "Done");
+ g_message( "Done");
}
static void
@@ -335,7 +336,7 @@
{
/* activate the plugin */
if (!gtranslator_plugins_engine_activate_plugin (pm->priv->engine, info)) {
- DEBUG_PRINT ( "Could not activate %s.\n",
+ g_message( "Could not activate %s.\n",
gtranslator_plugin_info_get_name (info));
res = FALSE;
@@ -345,7 +346,7 @@
{
/* deactivate the plugin */
if (!gtranslator_plugins_engine_deactivate_plugin (pm->priv->engine, info)) {
- DEBUG_PRINT ( "Could not deactivate %s.\n",
+ g_message( "Could not deactivate %s.\n",
gtranslator_plugin_info_get_name (info));
res = FALSE;
Modified: trunk/src/plugin-system/plugin.c
==============================================================================
--- trunk/src/plugin-system/plugin.c (original)
+++ trunk/src/plugin-system/plugin.c Tue Sep 16 09:52:02 2008
@@ -25,7 +25,7 @@
* list of people on the gtranslator Team.
* See the ChangeLog files for a list of changes.
*
- * $Id: plugin.c 6448 2008-08-25 10:28:33Z icq $
+ * $Id: plugin.c 4509 2006-01-06 16:45:20Z pborelli $
*/
#ifdef HAVE_CONFIG_H
@@ -72,13 +72,6 @@
/* Empty */
}
-/**
- * gtranslator_plugin_activate:
- * @plugin: a #GtranslatorPlugin
- * @window: a #GtranslatorWindow
- *
- * Activates the plugin.
- */
void
gtranslator_plugin_activate (GtranslatorPlugin *plugin,
GtranslatorWindow *window)
@@ -89,13 +82,6 @@
GTR_PLUGIN_GET_CLASS (plugin)->activate (plugin, window);
}
-/**
- * gtranslator_plugin_deactivate:
- * @plugin: a #GtranslatorPlugin
- * @window: a #GtranslatorWindow
- *
- * Deactivates the plugin.
- */
void
gtranslator_plugin_deactivate (GtranslatorPlugin *plugin,
GtranslatorWindow *window)
@@ -105,15 +91,7 @@
GTR_PLUGIN_GET_CLASS (plugin)->deactivate (plugin, window);
}
-
-/**
- * gtranslator_plugin_update_ui:
- * @plugin: a #GtranslatorPlugin
- * @window: a #GtranslatorWindow
- *
- * Triggers an update of the user interface to take into account state changes
- * caused by the plugin.
- */
+
void
gtranslator_plugin_update_ui (GtranslatorPlugin *plugin,
GtranslatorWindow *window)
@@ -124,14 +102,6 @@
GTR_PLUGIN_GET_CLASS (plugin)->update_ui (plugin, window);
}
-/**
- * gtranslator_plugin_is_configurable:
- * @plugin: a #GtranslatorPlugin
- *
- * Whether the plugin is configurable.
- *
- * Returns: TRUE if the plugin is configurable:
- */
gboolean
gtranslator_plugin_is_configurable (GtranslatorPlugin *plugin)
{
@@ -140,14 +110,6 @@
return GTR_PLUGIN_GET_CLASS (plugin)->is_configurable (plugin);
}
-/**
- * gtranslator_plugin_create_configure_dialog:
- * @plugin: a #GtranslatorPlugin
- *
- * Creates the configure dialog widget for the plugin.
- *
- * Returns: the configure dialog widget for the plugin.
- */
GtkWidget *
gtranslator_plugin_create_configure_dialog (GtranslatorPlugin *plugin)
{
Modified: trunk/src/plugin-system/plugin.h
==============================================================================
--- trunk/src/plugin-system/plugin.h (original)
+++ trunk/src/plugin-system/plugin.h Tue Sep 16 09:52:02 2008
@@ -25,7 +25,7 @@
* list of people on the gtranslator Team.
* See the ChangeLog files for a list of changes.
*
- * $Id: plugin.h 6448 2008-08-25 10:28:33Z icq $
+ * $Id: plugin.h 5666 2007-06-29 19:52:25Z sfre $
*/
#ifndef __GTR_PLUGIN_H__
@@ -34,7 +34,7 @@
#include <glib-object.h>
#include "window.h"
-#include "debug.h"
+//#include <gtranslator/gtranslator-debug.h>
/* TODO: add a .h file that includes all the .h files normally needed to
* develop a plugin */
@@ -112,10 +112,10 @@
GtkWidget *gtranslator_plugin_create_configure_dialog
(GtranslatorPlugin *plugin);
-/**
- * GTR_PLUGIN_REGISTER_TYPE_WITH_CODE(PluginName, plugin_name, CODE):
+/*
+ * Utility macro used to register plugins
*
- * Utility macro used to register plugins with additional code.
+ * use: GTR_PLUGIN_REGISTER_TYPE_WITH_CODE(PluginName, plugin_name, CODE)
*/
#define GTR_PLUGIN_REGISTER_TYPE_WITH_CODE(PluginName, plugin_name, CODE) \
\
@@ -152,7 +152,7 @@
(GInstanceInitFunc) plugin_name##_init \
}; \
\
- DEBUG_PRINT ( "Registering " #PluginName); \
+ g_message( "Registering " #PluginName); \
\
/* Initialise the i18n stuff */ \
bindtextdomain (GETTEXT_PACKAGE, GTR_LOCALEDIR); \
@@ -169,18 +169,18 @@
return plugin_name##_type; \
}
-/**
- * GTR_PLUGIN_REGISTER_TYPE(PluginName, plugin_name):
- *
- * Utility macro used to register plugins.
+/*
+ * Utility macro used to register plugins
+ *
+ * use: GTR_PLUGIN_REGISTER_TYPE(PluginName, plugin_name)
*/
#define GTR_PLUGIN_REGISTER_TYPE(PluginName, plugin_name) \
GTR_PLUGIN_REGISTER_TYPE_WITH_CODE(PluginName, plugin_name, ;)
-/**
- * GTR_PLUGIN_DEFINE_TYPE_WITH_CODE(ObjectName, object_name, PARENT_TYPE, CODE):
+/*
+ * Utility macro used to register gobject types in plugins with additional code
*
- * Utility macro used to register gobject types in plugins with additional code.
+ * use: GTR_PLUGIN_DEFINE_TYPE_WITH_CODE(ObjectName, object_name, PARENT_TYPE, CODE)
*/
#define GTR_PLUGIN_DEFINE_TYPE_WITH_CODE(ObjectName, object_name, PARENT_TYPE, CODE) \
\
@@ -217,7 +217,7 @@
(GInstanceInitFunc) object_name##_init \
}; \
\
- DEBUG_PRINT ( "Registering " #ObjectName); \
+ g_message( "Registering " #ObjectName); \
\
g_define_type_id = g_type_module_register_type (module, \
PARENT_TYPE, \
@@ -230,10 +230,10 @@
return g_define_type_id; \
}
-/**
- * GTR_PLUGIN_DEFINE_TYPE(ObjectName, object_name, PARENT_TYPE):
+/*
+ * Utility macro used to register gobject types in plugins
*
- * Utility macro used to register gobject types in plugins.
+ * use: GTR_PLUGIN_DEFINE_TYPE(ObjectName, object_name, PARENT_TYPE)
*/
#define GTR_PLUGIN_DEFINE_TYPE(ObjectName, object_name, PARENT_TYPE) \
GTR_PLUGIN_DEFINE_TYPE_WITH_CODE(ObjectName, object_name, PARENT_TYPE, ;)
Modified: trunk/src/plugin-system/plugins-engine.c
==============================================================================
--- trunk/src/plugin-system/plugins-engine.c (original)
+++ trunk/src/plugin-system/plugins-engine.c Tue Sep 16 09:52:02 2008
@@ -25,7 +25,7 @@
* list of people on the gtranslator Team.
* See the ChangeLog files for a list of changes.
*
- * $Id: plugins-engine.c 6376 2008-08-10 14:01:38Z pborelli $
+ * $Id: plugins-engine.c 6052 2008-01-04 17:32:52Z sfre $
*/
#ifdef HAVE_CONFIG_H
@@ -40,7 +40,7 @@
#include "plugins-engine.h"
#include "plugin-info-priv.h"
#include "plugin.h"
-#include "debug.h"
+//#include "gtranslator-debug.h"
#include "application.h"
#include "module.h"
@@ -84,6 +84,13 @@
static void gtranslator_plugins_engine_deactivate_plugin_real (GtranslatorPluginsEngine *engine,
GtranslatorPluginInfo *info);
+static gint
+compare_plugin_info (GtranslatorPluginInfo *info1,
+ GtranslatorPluginInfo *info2)
+{
+ return strcmp (info1->module_name, info2->module_name);
+}
+
static void
gtranslator_plugins_engine_load_dir (GtranslatorPluginsEngine *engine,
const gchar *dir,
@@ -96,7 +103,7 @@
g_return_if_fail (engine->priv->gconf_client != NULL);
g_return_if_fail (dir != NULL);
- DEBUG_PRINT ( "DIR: %s", dir);
+ g_message( "DIR: %s", dir);
d = g_dir_open (dir, 0, &error);
if (!d)
@@ -122,7 +129,9 @@
/* If a plugin with this name has already been loaded
* drop this one (user plugins override system plugins) */
- if (gtranslator_plugins_engine_get_plugin_info (engine, info->module_name) != NULL)
+ if (g_list_find_custom (engine->priv->plugin_list,
+ info,
+ (GCompareFunc)compare_plugin_info) != NULL)
{
g_warning ("Two or more plugins named '%s'. "
"Only the first will be considered.\n",
@@ -141,7 +150,7 @@
engine->priv->plugin_list = g_list_prepend (engine->priv->plugin_list, info);
- DEBUG_PRINT ( "Plugin %s loaded", info->name);
+ g_message( "Plugin %s loaded", info->name);
}
}
@@ -151,7 +160,7 @@
static void
gtranslator_plugins_engine_load_all (GtranslatorPluginsEngine *engine)
{
- GSList *active_plugins = NULL;
+ GSList *active_plugins;
const gchar *home;
const gchar *pdirs_env;
gchar **pdirs;
@@ -187,15 +196,13 @@
if (pdirs_env == NULL)
pdirs_env = GTR_PLUGINDIR;
- DEBUG_PRINT ( "GTR_PLUGINS_PATH=%s", pdirs_env);
+ g_message( "GTR_PLUGINS_PATH=%s", pdirs_env);
pdirs = g_strsplit (pdirs_env, G_SEARCHPATH_SEPARATOR_S, 0);
for (i = 0; pdirs[i] != NULL; i++)
gtranslator_plugins_engine_load_dir (engine, pdirs[i], active_plugins);
g_strfreev (pdirs);
- g_slist_foreach (active_plugins, (GFunc) g_free, NULL);
- g_slist_free (active_plugins);
}
static void
@@ -232,15 +239,9 @@
void
gtranslator_plugins_engine_garbage_collect (GtranslatorPluginsEngine *engine)
{
- GType *module_types = g_type_children (GTR_TYPE_MODULE, NULL);
- unsigned i;
- for (i = 0; module_types[i] != 0; i++)
- {
- gpointer klass = g_type_class_peek (module_types[i]);
- if (klass != NULL)
- gtranslator_module_class_garbage_collect (klass);
- }
- g_free (module_types);
+#ifdef ENABLE_PYTHON
+ gtranslator_python_garbage_collect ();
+#endif
}
static void
@@ -324,26 +325,10 @@
return engine->priv->plugin_list;
}
-static gint
-compare_plugin_info_and_name (GtranslatorPluginInfo *info,
- const gchar *module_name)
-{
- return strcmp (info->module_name, module_name);
-}
-
-GtranslatorPluginInfo *
-gtranslator_plugins_engine_get_plugin_info (GtranslatorPluginsEngine *engine,
- const gchar *name)
-{
- GList *l = g_list_find_custom (engine->priv->plugin_list,
- name,
- (GCompareFunc) compare_plugin_info_and_name);
- return l == NULL ? NULL : (GtranslatorPluginInfo *) l->data;
-}
-
static gboolean
load_plugin_module (GtranslatorPluginInfo *info)
{
+ gchar *path;
gchar *dirname;
//gtranslator_debug (DEBUG_PLUGINS);
@@ -353,52 +338,107 @@
g_return_val_if_fail (info->module_name != NULL, FALSE);
g_return_val_if_fail (info->plugin == NULL, FALSE);
g_return_val_if_fail (info->available, FALSE);
-
- dirname = g_path_get_dirname (info->file);
- g_return_val_if_fail (dirname != NULL, FALSE);
+
+ switch (info->loader)
+ {
+ case GTR_PLUGIN_LOADER_C:
+ dirname = g_path_get_dirname (info->file);
+ g_return_val_if_fail (dirname != NULL, FALSE);
+
+ path = g_module_build_path (dirname, info->module_name);
+ g_free (dirname);
+ g_return_val_if_fail (path != NULL, FALSE);
+
+ info->module = G_TYPE_MODULE (gtranslator_module_new (path));
+ g_free (path);
+
+ break;
#ifdef ENABLE_PYTHON
- if (info->module_type == GTR_TYPE_PYTHON_MODULE)
- {
- if (!gtranslator_python_init ())
+ case GTR_PLUGIN_LOADER_PY:
{
- /* Mark plugin as unavailable and fail */
- info->available = FALSE;
- g_warning ("Cannot load Python plugin '%s' since gtranslator "
- "was not able to initialize the Python interpreter.",
- info->name);
+ gchar *dir;
+
+ if (!gtranslator_python_init ())
+ {
+ /* Mark plugin as unavailable and fails */
+ info->available = FALSE;
+
+ g_warning ("Cannot load Python plugin '%s' since gtranslator "
+ "was not able to initialize the Python interpreter.",
+ info->name);
+
+ return FALSE;
+ }
+
+ dir = g_path_get_dirname (info->file);
+
+ g_return_val_if_fail ((info->module_name != NULL) &&
+ (info->module_name[0] != '\0'),
+ FALSE);
+
+ info->module = G_TYPE_MODULE (
+ gtranslator_python_module_new (dir, info->module_name));
+
+ g_free (dir);
+ break;
}
- }
#endif
+ default:
+ g_return_val_if_reached (FALSE);
+ }
- info->module = GTR_MODULE (g_object_new (info->module_type,
- "path", dirname,
- "module-name", info->module_name,
- NULL));
-
- g_free (dirname);
-
- if (!g_type_module_use (G_TYPE_MODULE (info->module)))
- {
- g_warning ("Cannot load plugin '%s' since file '%s' cannot be read.",
- gtranslator_module_get_module_name (info->module),
- gtranslator_module_get_path (info->module));
+ if (!g_type_module_use (info->module))
+ {
+ switch (info->loader)
+ {
+ case GTR_PLUGIN_LOADER_C:
+ g_warning ("Cannot load plugin '%s' since file '%s' cannot be read.",
+ info->name,
+ gtranslator_module_get_path (GTR_MODULE (info->module)));
+ break;
+
+ case GTR_PLUGIN_LOADER_PY:
+ g_warning ("Cannot load Python plugin '%s' since file '%s' cannot be read.",
+ info->name,
+ info->module_name);
+ break;
+ default:
+ g_return_val_if_reached (FALSE);
+ }
+
g_object_unref (G_OBJECT (info->module));
info->module = NULL;
- /* Mark plugin as unavailable and fail. */
+ /* Mark plugin as unavailable and fails */
info->available = FALSE;
return FALSE;
}
+
+ switch (info->loader)
+ {
+ case GTR_PLUGIN_LOADER_C:
+ info->plugin =
+ GTR_PLUGIN (gtranslator_module_new_object (GTR_MODULE (info->module)));
+ break;
- info->plugin = GTR_PLUGIN (gtranslator_module_new_object (info->module));
-
- g_type_module_unuse (G_TYPE_MODULE (info->module));
+#ifdef ENABLE_PYTHON
+ case GTR_PLUGIN_LOADER_PY:
+ info->plugin =
+ GTR_PLUGIN (gtranslator_python_module_new_object (GTR_PYTHON_MODULE (info->module)));
+ break;
+#endif
- DEBUG_PRINT ( "End");
+ default:
+ g_return_val_if_reached (FALSE);
+ }
+
+ g_type_module_unuse (info->module);
+ g_message( "End");
+
return TRUE;
}
@@ -536,7 +576,7 @@
}
}
- DEBUG_PRINT ( "End");
+ g_message( "End");
}
void
@@ -561,7 +601,7 @@
if (!info->available || !info->active)
continue;
- DEBUG_PRINT ( "Updating UI of %s", info->name);
+ g_message( "Updating UI of %s", info->name);
gtranslator_plugin_update_ui (info->plugin, window);
}
Modified: trunk/src/plugin-system/plugins-engine.h
==============================================================================
--- trunk/src/plugin-system/plugins-engine.h (original)
+++ trunk/src/plugin-system/plugins-engine.h Tue Sep 16 09:52:02 2008
@@ -25,7 +25,7 @@
* list of people on the gtranslator Team.
* See the ChangeLog files for a list of changes.
*
- * $Id: plugins-engine.h 6264 2008-05-05 11:00:38Z sfre $
+ * $Id: plugins-engine.h 6045 2007-12-28 20:45:22Z sfre $
*/
#ifndef __GTR_PLUGINS_ENGINE_H__
@@ -75,9 +75,6 @@
const GList *gtranslator_plugins_engine_get_plugin_list (GtranslatorPluginsEngine *engine);
-GtranslatorPluginInfo *gtranslator_plugins_engine_get_plugin_info (GtranslatorPluginsEngine *engine,
- const gchar *name);
-
gboolean gtranslator_plugins_engine_activate_plugin (GtranslatorPluginsEngine *engine,
GtranslatorPluginInfo *info);
gboolean gtranslator_plugins_engine_deactivate_plugin (GtranslatorPluginsEngine *engine,
Modified: trunk/src/plugin-system/update-from-gedit.sh
==============================================================================
--- trunk/src/plugin-system/update-from-gedit.sh (original)
+++ trunk/src/plugin-system/update-from-gedit.sh Tue Sep 16 09:52:02 2008
@@ -25,13 +25,12 @@
-e 's/gedit-plugin-info/plugin-info/g' \
-e 's/gedit-plugin/plugin/g' \
-e 's/gedit-panel.h/panel.h/g' \
- -e 's/#include <gedit\/gedit-window.h>/#include "window.h"/g' \
-e 's/gedit-window.h/window.h/g' \
-e 's/gedit-utils.h/utils.h/g' \
- -e 's/#include <gedit\/gedit-debug.h>/#include "debug.h"/g' \
- -e 's/#include "gedit-debug.h"/#include "debug.h"/g' \
+ -e 's/#include <gedit\/gedit-debug.h>/\/\/#include <gedit\/gedit-debug.h>/g' \
+ -e 's/#include "gedit-debug.h"/\/\/#include "gedit-debug.h"/g' \
-e 's/#include "gedit-app.h"/#include "application.h"/g' \
- -e 's/gedit_debug_message (DEBUG_PLUGINS,/DEBUG_PRINT (/g' \
+ -e 's/gedit_debug_message (DEBUG_PLUGINS,/g_warning(/g' \
-e 's/gedit_debug/\/\/gedit_debug/g' \
-e 's/gedit_app/gtranslator_application/g' \
-e 's/.gnome2\/gedit\/plugins\//.gtranslator\/plugins\//g' \
Modified: trunk/src/po.c
==============================================================================
--- trunk/src/po.c (original)
+++ trunk/src/po.c Tue Sep 16 09:52:02 2008
@@ -24,15 +24,10 @@
#include <config.h>
#endif
-#include "application.h"
-#include "debug.h"
#include "file-dialogs.h"
#include "po.h"
#include "msg.h"
#include "gtranslator-enum-types.h"
-#include "prefs-manager.h"
-#include "profile.h"
-#include "utils.h"
#include <string.h>
#include <errno.h>
@@ -42,7 +37,6 @@
#include <glib/gi18n.h>
#include <gtk/gtk.h>
#include <gettext-po.h>
-#include <gio/gio.h>
#define GTR_PO_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ( \
(object), \
@@ -54,7 +48,10 @@
struct _GtranslatorPoPrivate
{
- GFile *location;
+ /*
+ * Absolute file name
+ */
+ gchar *filename;
/*
* Gettext's file handle
@@ -178,9 +175,6 @@
gtranslator_po_init (GtranslatorPo *po)
{
po->priv = GTR_PO_GET_PRIVATE (po);
-
- po->priv->location = NULL;
- po->priv->gettext_po_file = NULL;
}
static void
@@ -198,8 +192,7 @@
g_list_free (po->priv->domains);
}
- if (po->priv->location)
- g_object_unref (po->priv->location);
+ g_free (po->priv->filename);
g_free (po->priv->obsolete);
if (po->priv->gettext_po_file)
@@ -261,32 +254,12 @@
message_error = g_strdup_printf("%s.\n %s",message_text1, message_text2);
}
-static gboolean
-po_file_is_empty (po_file_t file)
-{
- const gchar * const * domains = po_file_domains (file);
-
- for (; *domains != NULL; domains++)
- {
- po_message_iterator_t iter = po_message_iterator (file, *domains);
- if (po_next_message (iter) != NULL)
- {
- po_message_iterator_free (iter);
- return FALSE;
- }
- po_message_iterator_free (iter);
- }
- return TRUE;
-}
-
/***************************** Public funcs ***********************************/
/**
* gtranslator_po_new:
*
- * Creates a new #GtranslatorPo.
- *
- * Returns: a new #GtranslatorPo object
+ * Return value: a new #GtranslatorPo object
**/
GtranslatorPo *
gtranslator_po_new(void)
@@ -301,19 +274,17 @@
/**
* gtranslator_po_parse:
* @po: a #GtranslatorPo
- * @location: the file to open
+ * @filename: the filename path to open
* @error: a variable to store the errors
*
- * Parses all things related to the #GtranslatorPo and initilizes all neccessary
- * variables.
+ *
**/
void
-gtranslator_po_parse (GtranslatorPo *po,
- GFile *location,
- GError **error)
+gtranslator_po_parse(GtranslatorPo *po,
+ const gchar *filename,
+ GError **error)
{
GtranslatorPoPrivate *priv = po->priv;
- gchar *filename;
GtranslatorMsg *msg;
struct po_xerror_handler handler;
po_message_t message;
@@ -324,8 +295,12 @@
gint i = 0;
gint pos = 1;
- g_return_if_fail (GTR_IS_PO (po));
- g_return_if_fail (location != NULL);
+ g_return_if_fail(filename!=NULL);
+ g_return_if_fail(GTR_IS_PO(po));
+
+ base=g_path_get_basename(filename);
+ g_return_if_fail(base[0]!='\0');
+ g_free(base);
/*
* Initialice the handler error.
@@ -340,28 +315,25 @@
}
/*
- * Get filename path.
+ * Get absolute filename.
*/
- po->priv->location = g_file_dup (location);
- filename = g_file_get_path (location);
-
- if (po->priv->gettext_po_file)
- po_file_free (po->priv->gettext_po_file);
-
- priv->gettext_po_file = po_file_read (filename,
- &handler);
- if (priv->gettext_po_file == NULL)
+ if (!g_path_is_absolute(filename))
+ priv->filename = g_build_filename(filename);
+ else
+ priv->filename = g_strdup(filename);
+
+ priv->gettext_po_file = po_file_read(priv->filename,
+ &handler);
+ if(priv->gettext_po_file == NULL)
{
- g_set_error (error,
- GTR_PO_ERROR,
- GTR_PO_ERROR_FILENAME,
- _("Failed opening file '%s': %s"),
- filename, g_strerror (errno));
+ g_set_error(error,
+ GTR_PO_ERROR,
+ GTR_PO_ERROR_FILENAME,
+ _("Failed opening file '%s': %s"),
+ priv->filename, g_strerror(errno));
g_object_unref(po);
- g_free (filename);
return;
}
- g_free (filename);
/*
* No need to return; this can be corrected by the user
@@ -370,17 +342,7 @@
g_set_error(error,
GTR_PO_ERROR,
GTR_PO_ERROR_RECOVERY,
- "%s", message_error);
- }
-
- if (po_file_is_empty (priv->gettext_po_file))
- {
- g_set_error (error,
- GTR_PO_ERROR,
- GTR_PO_ERROR_FILE_EMPTY,
- _("The file is empty"));
- g_object_unref(po);
- return;
+ message_error);
}
/*
@@ -520,7 +482,15 @@
if (!po_message_is_obsolete (message))
{
/* Unpack into a GtrMsg */
- msg = gtranslator_msg_new (iter, message);
+ msg = gtranslator_msg_new (iter);
+ gtranslator_msg_set_message (msg, message);
+
+ /* Set the status */
+ if (gtranslator_msg_is_fuzzy (msg))
+ gtranslator_msg_set_status (msg, GTR_MSG_STATUS_FUZZY);
+ else if (gtranslator_msg_is_translated (msg))
+ gtranslator_msg_set_status (msg, GTR_MSG_STATUS_TRANSLATED);
+ else gtranslator_msg_set_status (msg, GTR_MSG_STATUS_UNTRANSLATED);
/* Set position in PO file */
gtranslator_msg_set_po_position (msg, pos++);
@@ -570,30 +540,11 @@
*header_comment;
const char *prev_translator;
- gchar *current_date;
- gchar *current_time;
- gchar *year;
- gchar *new_date;
+ time_t now;
+ struct tm *now_here;
+ char t[22];
+ gchar *year=g_malloc(5);
gchar *aux;
- gchar *aux2;
- const gchar *comments;
- gchar **comments_lines;
- gchar **comments_translator_values;
-
- gboolean take_my_options;
-
- gint i = 0;
- gint j;
- gint k = 0;
- gint l;
-
- gchar *new_comments = "";
- gchar *old_line;
- gchar *line = "";
- gchar *comp_year;
- gchar *line_without_dot;
-
- take_my_options = gtranslator_prefs_manager_get_take_my_options ();
/*
* Get header's fields
@@ -617,102 +568,35 @@
msgstr = po_message_msgstr(message);
/*
- * If button take_my_options is pulsed, then header's values
- * should be taking from default profile
- */
-
- if (take_my_options) {
-
- GtranslatorProfile *active_profile;
-
- active_profile = gtranslator_application_get_active_profile (GTR_APP);
-
- gtranslator_header_set_translator (header, gtranslator_profile_get_author_name (active_profile));
- gtranslator_header_set_tr_email (header, gtranslator_profile_get_author_email (active_profile));
- gtranslator_header_set_language (header, gtranslator_profile_get_language_name (active_profile));
- gtranslator_header_set_charset (header, gtranslator_profile_get_charset (active_profile));
- gtranslator_header_set_encoding (header, gtranslator_profile_get_encoding (active_profile));
- gtranslator_header_set_lg_email (header, gtranslator_profile_get_group_email (active_profile));
- gtranslator_header_set_plural_forms (header, gtranslator_profile_get_plurals (active_profile));
- }
-
- /*
* Update the po date
*/
- current_date = gtranslator_utils_get_current_date ();
- current_time = gtranslator_utils_get_current_time ();
- year = gtranslator_utils_get_current_year ();
-
- new_date = g_strconcat (current_date, " ", current_time, NULL);
-
- gtranslator_header_set_po_date (header, new_date);
-
- g_free (new_date);
-
+ now = time(NULL);
+ now_here = localtime(&now);
+ strftime(t, 22, "%Y-%m-%d %H:%M%z", now_here);
+ strftime(year, 5, "%Y", now_here);
+
+ aux = g_strdup (t);
+ gtranslator_header_set_po_date (header, aux);
+ g_free (aux);
+
/*
* Update the header's comment
*/
- comments = po_message_comments (message);
- comments_lines = g_strsplit (comments, "\n", -1);
-
- /*
- * Searching if the current translator is in comments.
- */
- while (comments_lines[i] != NULL) {
- if (g_str_has_prefix (comments_lines[i], prev_translator)) {
- comments_translator_values = g_strsplit (comments_lines[i], ",", -1);
- j = i;
- }
- i++;
- }
- aux = g_strconcat(gtranslator_header_get_translator(header), " ", "<",
+ aux = g_strconcat(gtranslator_header_get_translator(header), " ", "<",
gtranslator_header_get_tr_email(header), ">", NULL);
-
- comp_year = g_strconcat (" ", year, ".", NULL);
-
- /*
- * Current translator is already in comments but its last year < current year.
- */
- if ((g_utf8_collate (prev_translator, aux) == 0) &&
- (g_utf8_collate (comments_translator_values[g_strv_length (comments_translator_values)-1], comp_year) != 0)) {
-
- if (g_str_has_suffix (comments_lines[j], ".")) {
- line_without_dot = g_strndup (comments_lines[j], g_utf8_strlen(comments_lines[j], -1) -1);
- line = g_strconcat (line_without_dot, ", ", year, ".", NULL);
- g_free (line_without_dot);
- }else {
- line = g_strconcat (comments_lines[j], ", ", year, ".", NULL);
- }
-
- for (l=j; l<(g_strv_length (comments_lines)); l++) {
- comments_lines[l] = comments_lines[l+1];
- }
-
- comments_lines[g_strv_length (comments_lines)-1] = line;
- while (comments_lines[k] != NULL) {
- new_comments = g_strconcat (new_comments, comments_lines[k], "\n", NULL);
- k++;
- }
- po_message_set_comments (message, new_comments);
-
- g_free (line);
- g_free (new_comments);
- }
-
- /*
- * Current translator is not in the comments.
- */
- if (g_utf8_collate (prev_translator, aux) != 0) {
-
- header_comment = po_message_comments (message);
- aux2 = g_strconcat(header_comment, gtranslator_header_get_translator(header), " ", "<",
- gtranslator_header_get_tr_email(header), ">", ",", " ", year, ".", NULL);
-
- po_message_set_comments (message, aux2);
- g_free (aux2);
+ if (strcmp(prev_translator, aux))
+ {
+ gchar *aux2;
+
+ header_comment = po_message_comments (message);
+ aux2 = g_strconcat(header_comment, gtranslator_header_get_translator(header), " ", "<",
+ gtranslator_header_get_tr_email(header), ">", ",", " ", year, NULL);
+
+ po_message_set_comments (message, aux2);
+ g_free (aux2);
}
g_free (aux);
-
+
/*
* Write the header's fields
*/
@@ -731,7 +615,7 @@
msgstr = po_header_set_field (msgstr, "Language-Team", aux);
g_free (aux);
- aux = g_strconcat("text/plain;", " charset=",
+ aux = g_strconcat(" text/plain;", " charset=",
gtranslator_header_get_charset(header),NULL);
msgstr = po_header_set_field (msgstr, "Content-Type", aux);
g_free (aux);
@@ -754,8 +638,6 @@
GError **error)
{
struct po_xerror_handler handler;
- gchar *msg_error;
- gchar *filename;
/*
* Initialice the handler error.
@@ -763,9 +645,7 @@
handler.xerror = &on_gettext_po_xerror;
handler.xerror2 = &on_gettext_po_xerror2;
- filename = g_file_get_path (po->priv->location);
-
- if (g_str_has_suffix (filename, ".pot"))
+ if (g_str_has_suffix(po->priv->filename, ".pot"))
{
g_set_error (error,
GTR_PO_ERROR,
@@ -773,47 +653,25 @@
_("You are saving a file with a .pot extension.\n"
"Pot files are generated by the compilation process.\n"
"Your file should likely be named '%s.po'."),
- filename);
- g_free (filename);
+ po->priv->filename);
return;
}
/*
- * Check if the file is right
- */
- /*msg_error = gtranslator_po_check_po_file (po);
- if (msg_error != NULL)
- {
- g_set_error (error,
- GTR_PO_ERROR,
- GTR_PO_ERROR_GETTEXT,
- _("There is an error in the PO file: %s"),
- msg_error);
- g_free (msg_error);
- }*/
-
-
- /*
* Save header fields into msg
*/
gtranslator_po_save_header_in_msg (po);
if (!po_file_write (gtranslator_po_get_po_file (po),
- filename, &handler))
+ po->priv->filename, &handler))
{
g_set_error (error,
GTR_PO_ERROR,
GTR_PO_ERROR_FILENAME,
_("There was an error writing the PO file: %s"),
message_error);
- g_free (message_error);
- g_free (filename);
return;
}
- g_free (filename);
-
- /* If we are here everything is ok and we can set the state as saved */
- gtranslator_po_set_state (po, GTR_PO_STATE_SAVED);
/*
* If the warn if fuzzy option is enabled we have to show an error
@@ -834,36 +692,31 @@
* gtranslator_po_get_filename:
* @po: a #GtranslatorPo
*
- * Gets the GFile of the po file.
- *
- * Returns: the GFile associated with the @po. The returned location must be freed
- * with g_object_unref.
+ * Return value: the file name string
**/
-GFile *
-gtranslator_po_get_location (GtranslatorPo *po)
+const gchar *
+gtranslator_po_get_filename(GtranslatorPo *po)
{
- g_return_val_if_fail (GTR_IS_PO (po), NULL);
-
- return g_file_dup (po->priv->location);
+ return po->priv->filename;
}
/**
- * gtranslator_po_set_location:
+ * gtranslator_po_set_filename:
* @po: a #GtranslatorPo
- * @location: The GFile to set to the #GtranslatorPo
+ * @data: The file name text you want to set
*
- * Sets the GFile location within the #GtranslatorPo object.
+ * Sets the text path within the #GtranslatorPo object. It overwrites any text
+ * that was there before.
**/
void
-gtranslator_po_set_location (GtranslatorPo *po,
- GFile *location)
+gtranslator_po_set_filename(GtranslatorPo *po,
+ gchar *data)
{
g_return_if_fail(GTR_IS_PO(po));
- if (po->priv->location)
- g_object_unref (po->priv->location);
-
- po->priv->location = g_file_dup (location);
+ if(po->priv->filename)
+ g_free(po->priv->filename);
+ po->priv->filename = g_strdup(data);
}
/**
@@ -1072,68 +925,6 @@
}
/**
- * gtranslator_po_get_next_fuzzy_or_untrans:
- * @po: a #GtranslatorPo
- *
- * Return value: a pointer to the next fuzzy or untranslated message
- * or NULL if there is not next fuzzy or untranslated message.
- **/
-GList *
-gtranslator_po_get_next_fuzzy_or_untrans (GtranslatorPo *po)
-{
- GList *msg;
-
- msg = po->priv->current;
- while (msg = g_list_next (msg))
- {
- if (gtranslator_msg_is_fuzzy (msg->data) ||
- !gtranslator_msg_is_translated (msg->data))
- return msg;
- }
-
- return NULL;
-}
-
-/**
- * gtranslator_po_get_prev_fuzzy_or_untrans:
- * @po: a #GtranslatorPo
- *
- * Return value: a pointer to the previously fuzzy or untranslated message
- * or NULL if there is not previously fuzzy or untranslated message.
- **/
-GList *
-gtranslator_po_get_prev_fuzzy_or_untrans (GtranslatorPo *po)
-{
- GList *msg;
-
- msg = po->priv->current;
- while (msg = g_list_previous (msg))
- {
- if (gtranslator_msg_is_fuzzy (msg->data) ||
- !gtranslator_msg_is_translated (msg->data))
- return msg;
- }
-
- return NULL;
-}
-
-/**
- * gtranslator_po_get_msg_from_number:
- * @po: a #GtranslatorPo
- * @number: the message to jump
- *
- * Gets the message at the given position.
- */
-GList *
-gtranslator_po_get_msg_from_number (GtranslatorPo *po,
- gint number)
-{
- g_return_val_if_fail (GTR_IS_PO (po), NULL);
-
- return g_list_nth (po->priv->messages, number);
-}
-
-/**
* gtranslator_po_get_header:
* @po: a #GtranslatorPo
*
@@ -1218,9 +1009,6 @@
{
g_return_val_if_fail (GTR_IS_PO (po), -1);
- /*DEBUG_PRINT ("length: %d | translated: %d | fuzzy: %d | untranslated: %d", g_list_length (po->priv->messages),
- po->priv->translated, po->priv->fuzzy, (g_list_length (po->priv->messages) - po->priv->translated - po->priv->fuzzy));*/
-
return (g_list_length (po->priv->messages) - po->priv->translated - po->priv->fuzzy);
}
@@ -1257,10 +1045,9 @@
* @po: a #GtranslatorPo
*
* Test whether an entire PO file is valid, like msgfmt does it.
- * Returns: If it is invalid, returns the error. The return value must be freed
- * with g_free.
+ * Return value: If it is invalid, returns the error.
**/
-gchar *
+const gchar *
gtranslator_po_check_po_file (GtranslatorPo *po)
{
struct po_xerror_handler handler;
@@ -1269,7 +1056,12 @@
handler.xerror = &on_gettext_po_xerror;
handler.xerror2 = &on_gettext_po_xerror2;
- message_error = NULL;
+
+ if (message_error != NULL)
+ {
+ g_free (message_error);
+ message_error = NULL;
+ }
po_file_check_all (po->priv->gettext_po_file, &handler);
Modified: trunk/src/po.h
==============================================================================
--- trunk/src/po.h (original)
+++ trunk/src/po.h Tue Sep 16 09:52:02 2008
@@ -23,7 +23,6 @@
#include <glib-object.h>
#include <gtk/gtk.h>
#include <gettext-po.h>
-#include <gio/gio.h>
#include "header.h"
@@ -72,7 +71,6 @@
GTR_PO_ERROR_GETTEXT,
GTR_PO_ERROR_FILENAME,
GTR_PO_ERROR_RECOVERY,
- GTR_PO_ERROR_FILE_EMPTY,
GTR_PO_ERROR_OTHER,
};
@@ -94,8 +92,8 @@
GtranslatorPo *gtranslator_po_new (void);
void gtranslator_po_parse (GtranslatorPo *po,
- GFile *filename,
- GError **error);
+ const gchar *filename,
+ GError **error);
void gtranslator_po_save_header_in_msg (GtranslatorPo *po);
@@ -107,10 +105,10 @@
void gtranslator_po_set_state (GtranslatorPo *po,
GtranslatorPoState state);
-GFile *gtranslator_po_get_location (GtranslatorPo *po);
+const gchar *gtranslator_po_get_filename (GtranslatorPo *po);
-void gtranslator_po_set_location (GtranslatorPo *po,
- GFile *location);
+void gtranslator_po_set_filename (GtranslatorPo *po,
+ gchar *data);
gboolean gtranslator_po_get_write_perms (GtranslatorPo *po);
@@ -133,13 +131,6 @@
GList *gtranslator_po_get_prev_untrans (GtranslatorPo *po);
-GList *gtranslator_po_get_next_fuzzy_or_untrans (GtranslatorPo *po);
-
-GList *gtranslator_po_get_prev_fuzzy_or_untrans (GtranslatorPo *po);
-
-GList *gtranslator_po_get_msg_from_number (GtranslatorPo *po,
- gint number);
-
GtranslatorHeader
*gtranslator_po_get_header (GtranslatorPo *po);
@@ -153,7 +144,7 @@
gint gtranslator_po_get_message_position (GtranslatorPo *po);
-gchar *gtranslator_po_check_po_file (GtranslatorPo *po);
+const gchar *gtranslator_po_check_po_file (GtranslatorPo *po);
/* Unexported funcs */
void _gtranslator_po_increase_decrease_translated
Modified: trunk/src/prefs-manager-app.c
==============================================================================
--- trunk/src/prefs-manager-app.c (original)
+++ trunk/src/prefs-manager-app.c Tue Sep 16 09:52:02 2008
@@ -63,15 +63,6 @@
GConfEntry *entry,
gpointer user_data);
-static void gtranslator_prefs_manager_autosave_changed (GConfClient *client,
- guint cnxn_id,
- GConfEntry *entry,
- gpointer user_data);
-
-static void gtranslator_prefs_manager_scheme_color_changed (GConfClient *client,
- guint cnxn_id,
- GConfEntry *entry,
- gpointer user_data);
/* GUI state is serialized to a .desktop file, not in gconf */
@@ -444,16 +435,7 @@
GPM_GDL_STYLE,
gtranslator_prefs_manager_gdl_style_changed,
NULL, NULL, NULL);
-
- gconf_client_notify_add (gtranslator_prefs_manager->gconf_client,
- GPM_AUTOSAVE,
- gtranslator_prefs_manager_autosave_changed,
- NULL, NULL, NULL);
- gconf_client_notify_add (gtranslator_prefs_manager->gconf_client,
- GPM_SCHEME_COLOR,
- gtranslator_prefs_manager_scheme_color_changed,
- NULL, NULL, NULL);
}
return gtranslator_prefs_manager != NULL;
@@ -640,80 +622,3 @@
"switcher-style", style, NULL);
}
-static void
-gtranslator_prefs_manager_autosave_changed (GConfClient *client,
- guint cnxn_id,
- GConfEntry *entry,
- gpointer user_data)
-{
- GList *tabs;
- GList *l;
- GtranslatorWindow *window;
-
- g_return_if_fail (entry->key != NULL);
- g_return_if_fail (entry->value != NULL);
-
- window = gtranslator_application_get_active_window (GTR_APP);
-
- if (strcmp (entry->key, GPM_AUTOSAVE) == 0)
- {
- gboolean autosave;
-
- if (entry->value->type == GCONF_VALUE_BOOL)
- autosave = gconf_value_get_bool (entry->value);
- else
- autosave = GPM_DEFAULT_AUTOSAVE;
-
- tabs = gtranslator_window_get_all_tabs (window);
-
- for (l = tabs; l != NULL; l = g_list_next (l))
- {
- GtranslatorTab *tab = GTR_TAB (l->data);
-
- gtranslator_tab_set_autosave_enabled (tab, autosave);
- }
-
- g_list_free (tabs);
- }
- else if (strcmp (entry->key, GPM_AUTOSAVE_INTERVAL) == 0)
- {
- gint autosave_interval;
-
- if (entry->value->type == GCONF_VALUE_INT)
- {
- autosave_interval = gconf_value_get_int (entry->value);
-
- if (autosave_interval <= 0)
- autosave_interval = GPM_DEFAULT_AUTOSAVE_INTERVAL;
- }
- else
- autosave_interval = GPM_DEFAULT_AUTOSAVE_INTERVAL;
-
- tabs = gtranslator_window_get_all_tabs (window);
-
- for (l = tabs; l != NULL; l = g_list_next (l))
- {
- GtranslatorTab *tab = GTR_TAB (l->data);
-
- gtranslator_tab_set_autosave_interval (tab, autosave_interval);
- }
-
- g_list_free (tabs);
- }
-}
-
-static void
-gtranslator_prefs_manager_scheme_color_changed (GConfClient *client,
- guint cnxn_id,
- GConfEntry *entry,
- gpointer user_data)
-{
- GList *views, *l;
-
- views = gtranslator_application_get_views (GTR_APP, TRUE, TRUE);
-
- for (l = views; l != NULL; l = g_list_next (l))
- {
- gtranslator_view_reload_scheme_color (GTR_VIEW (l->data));
- }
-}
Modified: trunk/src/prefs-manager.c
==============================================================================
--- trunk/src/prefs-manager.c (original)
+++ trunk/src/prefs-manager.c Tue Sep 16 09:52:02 2008
@@ -278,9 +278,13 @@
GPM_AUTOSAVE_INTERVAL,
GPM_DEFAULT_AUTOSAVE_INTERVAL)
-DEFINE_BOOL_PREF(create_backup,
- GPM_CREATE_BACKUP,
- GPM_DEFAULT_CREATE_BACKUP)
+DEFINE_BOOL_PREF(append_suffix,
+ GPM_APPEND_SUFFIX,
+ GPM_DEFAULT_APPEND_SUFFIX)
+
+DEFINE_STRING_PREF(autosave_suffix,
+ GPM_AUTOSAVE_SUFFIX,
+ GPM_DEFAULT_AUTOSAVE_SUFFIX)
/* Editor */
DEFINE_BOOL_PREF(highlight,
@@ -303,6 +307,10 @@
GPM_UNMARK_FUZZY,
GPM_DEFAULT_UNMARK_FUZZY)
+DEFINE_BOOL_PREF(keep_obsolete,
+ GPM_KEEP_OBSOLETE,
+ GPM_DEFAULT_KEEP_OBSOLETE)
+
DEFINE_BOOL_PREF(spellcheck,
GPM_SPELLCHECK,
GPM_DEFAULT_SPELLCHECK)
@@ -325,35 +333,6 @@
GPM_GDL_STYLE,
GPM_DEFAULT_GDL_STYLE)
-DEFINE_STRING_PREF (scheme_color,
- GPM_SCHEME_COLOR,
- GPM_DEFAULT_SCHEME_COLOR)
-
-/* Translation Memory */
-DEFINE_STRING_PREF (tm_dir,
- GPM_TM_DIR,
- GPM_DEFAULT_TM_DIR)
-
-DEFINE_INT_PREF (use_lang_profile,
- GPM_TM_USE_LANG_PROFILE,
- GPM_DEFAULT_TM_USE_LANG_PROFILE)
-
-DEFINE_STRING_PREF (tm_lang_entry,
- GPM_TM_LANG_ENTRY,
- GPM_DEFAULT_TM_LANG_ENTRY)
-
-DEFINE_INT_PREF (show_tm_options,
- GPM_TM_SHOW_TM_OPTIONS,
- GPM_DEFAULT_TM_SHOW_TM_OPTIONS)
-
-DEFINE_INT_PREF (missing_words,
- GPM_TM_MISSING_WORDS,
- GPM_DEFAULT_TM_MISSING_WORDS)
-
-DEFINE_INT_PREF (sentence_length,
- GPM_TM_SENTENCE_LENGTH,
- GPM_DEFAULT_TM_SENTENCE_LENGTH)
-
/* The following functions are taken from gconf-client.c
* and partially modified.
* The licensing terms on these is:
Modified: trunk/src/prefs-manager.h
==============================================================================
--- trunk/src/prefs-manager.h (original)
+++ trunk/src/prefs-manager.h Tue Sep 16 09:52:02 2008
@@ -31,8 +31,6 @@
#define GPM_PREFS_DIR GTR_BASE_KEY "/preferences"
-#define GPM_HEADER GTR_BASE_KEY "/header"
-
/* Files */
#define GPM_GENERAL_DIR GPM_PREFS_DIR "/files/general"
#define GPM_WARN_IF_FUZZY GPM_GENERAL_DIR "/warn_if_fuzzy"
@@ -41,7 +39,8 @@
#define GPM_AUTOSAVE_DIR GPM_PREFS_DIR "/files/autosave"
#define GPM_AUTOSAVE GPM_AUTOSAVE_DIR "/autosave"
#define GPM_AUTOSAVE_INTERVAL GPM_AUTOSAVE_DIR "/autosave_interval"
-#define GPM_CREATE_BACKUP GPM_AUTOSAVE_DIR "/create_backup"
+#define GPM_APPEND_SUFFIX GPM_AUTOSAVE_DIR "/append_suffix"
+#define GPM_AUTOSAVE_SUFFIX GPM_AUTOSAVE_DIR "/autosave_suffix"
/* Editor */
#define GPM_TEXT_DISPLAY_DIR GPM_PREFS_DIR "/editor/text_display"
@@ -57,7 +56,7 @@
#define GPM_SPELLCHECK GPM_CONTENTS_DIR "/spellcheck"
/* Edit Header */
-#define GPM_TAKE_MY_OPTIONS GPM_HEADER "/take_my_options"
+#define GPM_TAKE_MY_OPTIONS GPM_PREFS_DIR "/take_my_options"
/* PO header */
#define GPM_PERSONAL_INFORMATION_DIR GPM_PREFS_DIR "/po_header/personal_information"
@@ -71,21 +70,12 @@
#define GPM_TRANSFER_ENCODING GPM_LANGUAGE_SETTINGS_DIR "/transfer_encoding"
#define GPM_TEAM_EMAIL GPM_LANGUAGE_SETTINGS_DIR "/team_email"
-/* Translation Memory */
-#define GPM_TM_DIR GPM_PREFS_DIR "/tm/dir_entry"
-#define GPM_TM_USE_LANG_PROFILE GPM_PREFS_DIR "/tm/use_lang_profile"
-#define GPM_TM_LANG_ENTRY GPM_PREFS_DIR "/tm/tm_lang_profile"
-#define GPM_TM_SHOW_TM_OPTIONS GPM_PREFS_DIR "/tm/show_tm_options"
-#define GPM_TM_MISSING_WORDS GPM_PREFS_DIR "/tm/missing_words"
-#define GPM_TM_SENTENCE_LENGTH GPM_PREFS_DIR "/tm/sentence_lenght"
-
/*FIXME: With profiles i think that this has to change*/
#define GPM_PLURAL_FORM GPM_LANGUAGE_SETTINGS_DIR "/plural_form"
/* Interface */
#define GPM_INTERFACE_DIR GPM_PREFS_DIR "/interface"
#define GPM_GDL_STYLE GPM_INTERFACE_DIR "/gdl_style"
-#define GPM_SCHEME_COLOR GPM_INTERFACE_DIR "/scheme_color"
/* Fallback default values. Keep in sync with gtranslator.schemas */
@@ -95,7 +85,8 @@
#define GPM_DEFAULT_AUTOSAVE 0 /* FALSE */
#define GPM_DEFAULT_AUTOSAVE_INTERVAL 4
-#define GPM_DEFAULT_CREATE_BACKUP 0 /* FALSE */
+#define GPM_DEFAULT_APPEND_SUFFIX 0 /* FALSE */
+#define GPM_DEFAULT_AUTOSAVE_SUFFIX (const gchar*) "autosave"
/* Editor */
#define GPM_DEFAULT_HIGHLIGHT 1 /* TRUE */
@@ -123,15 +114,6 @@
/* Interface */
#define GPM_DEFAULT_GDL_STYLE 2 //Both icons and text
-#define GPM_DEFAULT_SCHEME_COLOR "classic"
-
-/* Translation Memory */
-#define GPM_DEFAULT_TM_DIR (const gchar*) ""
-#define GPM_DEFAULT_TM_USE_LANG_PROFILE 0 /*FALSE*/
-#define GPM_DEFAULT_TM_LANG_ENTRY (const gchar*) ""
-#define GPM_DEFAULT_TM_SHOW_TM_OPTIONS 0 /*FALSE*/
-#define GPM_DEFAULT_TM_MISSING_WORDS 2
-#define GPM_DEFAULT_TM_SENTENCE_LENGTH 2
/** LIFE CYCLE MANAGEMENT FUNCTIONS **/
@@ -163,9 +145,13 @@
void gtranslator_prefs_manager_set_autosave_interval (gint timeout);
gint gtranslator_prefs_manager_get_autosave_interval (void);
-/*Create backup*/
-void gtranslator_prefs_manager_set_create_backup (gboolean backup);
-gboolean gtranslator_prefs_manager_get_create_backup (void);
+/*Append suffix*/
+void gtranslator_prefs_manager_set_append_suffix (gboolean aws);
+gboolean gtranslator_prefs_manager_get_append_suffix (void);
+
+/*Autosave suffix*/
+void gtranslator_prefs_manager_set_autosave_suffix (const gchar *suffix);
+const gchar * gtranslator_prefs_manager_get_autosave_suffix (void);
/*Highlight*/
void gtranslator_prefs_manager_set_highlight (gboolean highlight);
@@ -187,6 +173,10 @@
void gtranslator_prefs_manager_set_unmark_fuzzy (gboolean unmark);
gboolean gtranslator_prefs_manager_get_unmark_fuzzy (void);
+/*keep obsolete*/
+void gtranslator_prefs_manager_set_keep_obsolete (gboolean keep_obsolete);
+gboolean gtranslator_prefs_manager_get_keep_obsolete (void);
+
/*Spellcheck*/
void gtranslator_prefs_manager_set_spellcheck (gboolean spell_checking);
gboolean gtranslator_prefs_manager_get_spellcheck (void);
@@ -207,27 +197,4 @@
void gtranslator_prefs_manager_set_gdl_style (gint style);
gint gtranslator_prefs_manager_get_gdl_style (void);
-/*Scheme color*/
-void gtranslator_prefs_manager_set_scheme_color (const gchar *scheme);
-const gchar * gtranslator_prefs_manager_get_scheme_color (void);
-
-/*Translation Memory*/
-void gtranslator_prefs_manager_set_tm_dir (const gchar *dir);
-const gchar * gtranslator_prefs_manager_get_tm_dir (void);
-
-void gtranslator_prefs_manager_set_show_tm_options (gboolean show_tm_options);
-gboolean gtranslator_prefs_manager_get_show_tm_options (void);
-
-void gtranslator_prefs_manager_set_tm_lang_entry (const gchar *dir);
-const gchar * gtranslator_prefs_manager_get_tm_lang_entry (void);
-
-void gtranslator_prefs_manager_set_use_lang_profile (gboolean use_lang_profile);
-gboolean gtranslator_prefs_manager_get_use_lang_profile (void);
-
-void gtranslator_prefs_manager_set_missing_words (gint timeout);
-gint gtranslator_prefs_manager_get_missing_words (void);
-
-void gtranslator_prefs_manager_set_sentence_length (gint timeout);
-gint gtranslator_prefs_manager_get_sentence_length (void);
-
#endif /* __GTR_PREFS_MANAGER_H__ */
Modified: trunk/src/profile.c
==============================================================================
--- trunk/src/profile.c (original)
+++ trunk/src/profile.c Tue Sep 16 09:52:02 2008
@@ -15,8 +15,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-#include "application.h"
+
#include "profile.h"
#include "preferences-dialog.h"
#include "utils.h"
@@ -242,15 +241,15 @@
root = xmlDocGetRootElement (doc);
profile_node = xmlNewChild (root, NULL, "profile", NULL);
- xmlNewTextChild (profile_node, NULL, "profile_name", profile->priv->name);
- xmlNewTextChild (profile_node, NULL, "author_name", profile->priv->author_name);
- xmlNewTextChild (profile_node, NULL, "author_email", profile->priv->author_email);
- xmlNewTextChild (profile_node, NULL, "language_name", profile->priv->language_name);
- xmlNewTextChild (profile_node, NULL, "language_code", profile->priv->language_code);
- xmlNewTextChild (profile_node, NULL, "charset", profile->priv->charset);
- xmlNewTextChild (profile_node, NULL, "encoding", profile->priv->encoding);
- xmlNewTextChild (profile_node, NULL, "group_email", profile->priv->group_email);
- xmlNewTextChild (profile_node, NULL, "plurals", profile->priv->plurals);
+ xmlNewChild (profile_node, NULL, "profile_name", profile->priv->name);
+ xmlNewChild (profile_node, NULL, "author_name", profile->priv->author_name);
+ xmlNewChild (profile_node, NULL, "autor_email", profile->priv->author_email);
+ xmlNewChild (profile_node, NULL, "language_name", profile->priv->language_name);
+ xmlNewChild (profile_node, NULL, "language_code", profile->priv->language_code);
+ xmlNewChild (profile_node, NULL, "charset", profile->priv->charset);
+ xmlNewChild (profile_node, NULL, "encoding", profile->priv->encoding);
+ xmlNewChild (profile_node, NULL, "group_email", profile->priv->group_email);
+ xmlNewChild (profile_node, NULL, "plurals", profile->priv->plurals);
}
/**
@@ -305,19 +304,13 @@
{
GList *profiles_list = NULL;
GtranslatorProfile *profile;
- xmlNodePtr root, child, active;
+ xmlNodePtr root, child;
xmlDocPtr doc;
- gchar *active_profile;
- GList *l;
doc = gtranslator_xml_open_file (filename);
root = xmlDocGetRootElement (doc);
child = root->xmlChildrenNode;
- active = child->xmlChildrenNode;
-
- active_profile = xmlNodeGetContent (active);
- child = child->next;
while (child != NULL) {
profile = gtranslator_profile_xml_get_entry (child);
@@ -325,39 +318,5 @@
child = child->next;
}
- for (l = profiles_list; l; l = l->next) {
- GtranslatorProfile *profile;
- profile = (GtranslatorProfile *)l->data;
- if (!strcmp(gtranslator_profile_get_name (profile), active_profile))
- gtranslator_application_set_active_profile (GTR_APP, profile);
- }
-
return profiles_list;
}
-
-void gtranslator_profile_save_profiles_in_xml (gchar *filename) {
-
- xmlNodePtr root, child, active;
- xmlDocPtr doc;
- GList *profiles_list, *l;
- GtranslatorProfile *active_profile;
-
- doc = gtranslator_xml_new_doc ("list_of_profiles");
-
- profiles_list = gtranslator_application_get_profiles (GTR_APP);
- active_profile = gtranslator_application_get_active_profile (GTR_APP);
-
- root = xmlDocGetRootElement (doc);
- child = root->xmlChildrenNode;
- active = child->xmlChildrenNode;
-
- xmlNewChild (root, NULL, "active", gtranslator_profile_get_name (active_profile));
-
- for (l = profiles_list; l; l = l->next) {
- GtranslatorProfile *profile;
- profile = (GtranslatorProfile *)l->data;
- gtranslator_profile_xml_new_entry (doc, profile);
- }
-
- xmlSaveFile (filename, doc);
-}
Modified: trunk/src/profile.h
==============================================================================
--- trunk/src/profile.h (original)
+++ trunk/src/profile.h Tue Sep 16 09:52:02 2008
@@ -102,6 +102,4 @@
GList *gtranslator_profile_get_profiles_from_xml_file (gchar *filename);
-void gtranslator_profile_save_profiles_in_xml (gchar *filename);
-
#endif /* __PROFILE_H__ */
Modified: trunk/src/statusbar.c
==============================================================================
--- trunk/src/statusbar.c (original)
+++ trunk/src/statusbar.c Tue Sep 16 09:52:02 2008
@@ -39,9 +39,6 @@
GtkWidget *overwrite_mode_label;
- /* default context data */
- guint default_context_id;
-
/* tmp flash timeout data */
guint flash_timeout;
guint flash_context_id;
@@ -86,8 +83,6 @@
gtk_widget_show (statusbar->priv->statusbar);
gtk_box_pack_end (GTK_BOX (statusbar), statusbar->priv->statusbar,
TRUE, TRUE, 0);
- statusbar->priv->default_context_id = gtk_statusbar_get_context_id (GTK_STATUSBAR (statusbar->priv->statusbar),
- "default-context-id");
/*
* Progress bar
@@ -134,48 +129,6 @@
return GTK_WIDGET (g_object_new (GTR_TYPE_STATUSBAR, NULL));
}
-/**
- * gtranslator_statusbar_push_default:
- * @statusbar: a #GtranslatorStatusbar
- * @text: the text to push in the statusbar
- *
- * Pushes a text onto the statusbar in the default context id.
- */
-void
-gtranslator_statusbar_push_default (GtranslatorStatusbar *statusbar,
- const gchar *text)
-{
- g_return_if_fail (GTR_IS_STATUSBAR (statusbar));
-
- gtk_statusbar_push (GTK_STATUSBAR (statusbar->priv->statusbar),
- statusbar->priv->default_context_id, text);
-}
-
-/**
- * gtranslator_statusbar_pop_default:
- * @statusbar: a #GtranslatorStatusbar
- *
- * Pops the text in the statusbar of the default context id.
- */
-void
-gtranslator_statusbar_pop_default (GtranslatorStatusbar *statusbar)
-{
- g_return_if_fail (GTR_IS_STATUSBAR (statusbar));
-
- gtk_statusbar_pop (GTK_STATUSBAR (statusbar->priv->statusbar),
- statusbar->priv->default_context_id);
-}
-
-/**
- * gtranslator_statusbar_push:
- * @statusbar: a #GtranslatorStatusbar
- * @context_id: the message's context id, as returned by gtk_statusbar_get_context_id()
- * @text: the text to push in the statusbar
- *
- * Pushes a new message onto a statusbar's stack.
- *
- * Returns: a message id that can be used with gtk_statusbar_remove()
- */
guint
gtranslator_statusbar_push (GtranslatorStatusbar *statusbar,
guint context_id,
@@ -187,13 +140,6 @@
context_id, text);
}
-/**
- * gtranslator_statusbar_pop:
- * @statusbar: a #GtranslatorStatusbar
- * @context_id: a context identifier
- *
- * Removes the first message in the GtkStatusBar's stack with the given context id.
- */
void
gtranslator_statusbar_pop (GtranslatorStatusbar *statusbar,
guint context_id)
@@ -205,24 +151,6 @@
}
/**
- * gtranslator_statusbar_get_context_id:
- * @statusbar: a #GtranslatorStatusbar
- * @context_description: textual description of what context the new message is being used in
- *
- * Returns a new context identifier, given a description of the actual context.
- * Note that the description is not shown in the UI.
- *
- * Returns: an integer id
- */
-guint
-gtranslator_statusbar_get_context_id (GtranslatorStatusbar *statusbar,
- const gchar *context_description)
-{
- return gtk_statusbar_get_context_id (GTK_STATUSBAR (statusbar->priv->statusbar),
- context_description);
-}
-
-/**
* gtranslator_statusbar_set_overwrite:
* @statusbar: a #GtranslatorStatusbar
* @overwrite: if the overwrite mode is set
@@ -240,12 +168,6 @@
else gtk_label_set_text(GTK_LABEL(statusbar->priv->overwrite_mode_label), _("INS"));
}
-/**
- * gtranslator_statusbar_clear_overwrite:
- * @statusbar: a #GtranslatorStatusbar
- *
- * Clears the statusbar overwrite label.
- */
void
gtranslator_statusbar_clear_overwrite (GtranslatorStatusbar *statusbar)
{
@@ -296,7 +218,7 @@
g_source_remove (statusbar->priv->flash_timeout);
statusbar->priv->flash_timeout = 0;
- gtk_statusbar_remove (GTK_STATUSBAR (statusbar->priv->statusbar),
+ gtk_statusbar_remove (GTK_STATUSBAR (statusbar),
statusbar->priv->flash_context_id,
statusbar->priv->flash_message_id);
}
@@ -313,13 +235,8 @@
g_free (msg);
}
-/**
- * gtranslator_statusbar_update_progress_bar:
- * @statusbar: a #GtranslatorStatusbar
- * @translated_count: the number of translated messages
- * @messages_count: the number of messages
- *
- * Updates the state of the progress bar with the given values.
+/*
+ * Update the progress bar
*/
void
gtranslator_statusbar_update_progress_bar (GtranslatorStatusbar *statusbar,
Modified: trunk/src/statusbar.h
==============================================================================
--- trunk/src/statusbar.h (original)
+++ trunk/src/statusbar.h Tue Sep 16 09:52:02 2008
@@ -53,20 +53,12 @@
GtkWidget *gtranslator_statusbar_new (void);
-void gtranslator_statusbar_push_default (GtranslatorStatusbar *statusbar,
- const gchar *text);
-
-void gtranslator_statusbar_pop_default (GtranslatorStatusbar *statusbar);
-
guint gtranslator_statusbar_push (GtranslatorStatusbar *statusbar,
guint context_id,
const gchar *text);
void gtranslator_statusbar_pop (GtranslatorStatusbar *statusbar,
guint context_id);
-
-guint gtranslator_statusbar_get_context_id (GtranslatorStatusbar *statusbar,
- const gchar *context_description);
void gtranslator_statusbar_set_overwrite (GtranslatorStatusbar *statusbar,
gboolean overwrite);
Modified: trunk/src/tab.c
==============================================================================
--- trunk/src/tab.c (original)
+++ trunk/src/tab.c Tue Sep 16 09:52:02 2008
@@ -24,8 +24,7 @@
#include <config.h>
#endif
-#include "application.h"
-#include "context.h"
+#include "comment.h"
#include "io-error-message-area.h"
#include "message-area.h"
#include "message-table.h"
@@ -34,9 +33,6 @@
#include "po.h"
#include "prefs-manager.h"
#include "view.h"
-#include "translation-memory.h"
-#include "translation-memory-ui.h"
-#include "window.h"
#include <glib.h>
#include <glib-object.h>
@@ -62,27 +58,19 @@
GtkWidget *content_pane;
GtkWidget *panel;
GtkWidget *message_table;
- GtkWidget *lateral_panel; //TM, Context, etc.
GtkWidget *comment_pane;
- GtkWidget *context;
- GtkWidget *translation_memory;
-
- /*Comment button*/
- GtkWidget *comment_button;
+ GtkWidget *comment;
/*Message area*/
GtkWidget *message_area;
/*Original text*/
- GtkWidget *msgid_hbox;
- GtkWidget *text_vbox;
+ GtkWidget *text_notebook;
GtkWidget *text_msgid;
- GtkWidget *text_plural_scroll;
GtkWidget *text_msgid_plural;
/*Translated text*/
- GtkWidget *msgstr_hbox;
GtkWidget *trans_notebook;
GtkWidget *trans_msgstr[MAX_PLURALS];
@@ -90,140 +78,17 @@
GtkWidget *translated;
GtkWidget *fuzzy;
GtkWidget *untranslated;
-
- /* Autosave */
- GTimer *timer;
- gint autosave_interval;
- guint autosave_timeout;
- gint autosave : 1;
-
- /*Blocking movement*/
- gboolean blocking;
};
enum
{
SHOWED_MESSAGE,
MESSAGE_CHANGED,
- MESSAGE_EDITION_FINISHED,
LAST_SIGNAL
};
-enum
-{
- PROP_0,
- PROP_AUTOSAVE,
- PROP_AUTOSAVE_INTERVAL
-};
-
static guint signals[LAST_SIGNAL];
-static gboolean gtranslator_tab_autosave (GtranslatorTab *tab);
-
-static void
-install_autosave_timeout (GtranslatorTab *tab)
-{
- gint timeout;
-
- g_return_if_fail (tab->priv->autosave_timeout <= 0);
- g_return_if_fail (tab->priv->autosave);
- g_return_if_fail (tab->priv->autosave_interval > 0);
-
- /* Add a new timeout */
- timeout = g_timeout_add (tab->priv->autosave_interval * 1000 * 60,
- (GSourceFunc) gtranslator_tab_autosave,
- tab);
-
- tab->priv->autosave_timeout = timeout;
-}
-
-static gboolean
-install_autosave_timeout_if_needed (GtranslatorTab *tab)
-{
- g_return_val_if_fail (tab->priv->autosave_timeout <= 0, FALSE);
-
- if (tab->priv->autosave)
- {
- install_autosave_timeout (tab);
-
- return TRUE;
- }
-
- return FALSE;
-}
-
-static gboolean
-gtranslator_tab_autosave (GtranslatorTab *tab)
-{
- GError *error = NULL;
-
- if (!gtranslator_po_get_state (tab->priv->po) == GTR_PO_STATE_MODIFIED)
- return TRUE;
-
- gtranslator_po_save_file (tab->priv->po, &error);
- if (error)
- {
- g_warning (error->message);
- g_error_free (error);
- }
-
- return TRUE;
-}
-
-static void
-remove_autosave_timeout (GtranslatorTab *tab)
-{
- g_return_if_fail (tab->priv->autosave_timeout > 0);
-
- g_source_remove (tab->priv->autosave_timeout);
- tab->priv->autosave_timeout = 0;
-}
-
-static void
-gtranslator_tab_showed_message (GtranslatorTab *tab,
- GtranslatorMsg *msg)
-{
- if (strcmp (gtranslator_msg_get_comment (msg), "") != 0)
- gtk_widget_show (tab->priv->comment_button);
- else gtk_widget_hide (tab->priv->comment_button);
-}
-
-static void
-gtranslator_tab_edition_finished (GtranslatorTab *tab,
- GtranslatorMsg *msg)
-{
- GtranslatorTranslationMemory *tm;
- gchar *message_error;
- GtkWidget *message_area;
-
- tm = GTR_TRANSLATION_MEMORY (gtranslator_application_get_translation_memory (GTR_APP));
-
- if (gtranslator_msg_is_translated (msg) && !gtranslator_msg_is_fuzzy (msg))
- gtranslator_translation_memory_store (tm,
- gtranslator_msg_get_msgid (msg),
- gtranslator_msg_get_msgstr (msg));
-
- /*
- * Checking message
- */
- message_error = gtranslator_msg_check (msg);
-
- if (message_error != NULL)
- {
- gtranslator_tab_block_movement (tab);
-
- message_area = create_error_message_area (_("There is an error in the message:"),
- message_error);
- gtranslator_tab_set_message_area (tab, message_area);
- g_free (message_error);
- }
- else
- {
- gtranslator_tab_unblock_movement (tab);
- gtranslator_tab_set_message_area (tab, NULL);
- }
-}
-
/*
* Write the change back to the gettext PO instance in memory and
* mark the page dirty
@@ -305,9 +170,9 @@
static GtkWidget *
-gtranslator_tab_append_msgstr_page (const gchar *tab_label,
- GtkWidget *box,
- gboolean spellcheck)
+gtranslator_tab_append_page(const gchar *tab_label,
+ GtkWidget *notebook,
+ gboolean spellcheck)
{
GtkWidget *scroll;
GtkWidget *label;
@@ -325,18 +190,14 @@
gtranslator_view_enable_spellcheck(GTR_VIEW(widget),
spellcheck);
- gtk_container_add (GTK_CONTAINER (scroll),
- widget);
-
- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll),
- GTK_POLICY_AUTOMATIC,
- GTK_POLICY_AUTOMATIC);
+ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scroll),
+ widget);
- gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scroll),
- GTK_SHADOW_IN);
-
- gtk_notebook_append_page (GTK_NOTEBOOK (box), scroll, label);
-
+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll),
+ GTK_POLICY_AUTOMATIC,
+ GTK_POLICY_AUTOMATIC);
+
+ gtk_notebook_append_page(GTK_NOTEBOOK(notebook), scroll, label);
return widget;
}
@@ -367,38 +228,6 @@
}
}
-static GtkWidget *
-gtranslator_tab_create_comment_button ()
-{
- GtkWidget *button;
- GtkWidget *image;
-
- /* setup close button */
- button = gtk_button_new ();
- gtk_button_set_relief (GTK_BUTTON (button),
- GTK_RELIEF_NONE);
- /* don't allow focus on the close button */
- gtk_button_set_focus_on_click (GTK_BUTTON (button), FALSE);
-
- image = gtk_image_new_from_stock (GTK_STOCK_INDEX,
- GTK_ICON_SIZE_MENU);
- gtk_widget_show (image);
- gtk_container_add (GTK_CONTAINER (button), image);
-
- gtk_widget_set_tooltip_text (button, _("Open comment dialog"));
-
- return button;
-}
-
-static void
-on_comment_button_clicked (GtkButton *button,
- gpointer useless)
-{
- GtranslatorWindow *window = gtranslator_application_get_active_window (GTR_APP);
-
- gtranslator_show_comment_dialog (window);
-}
-
/*
* gtranslator_tab_show_message:
* @tab: a #GtranslationTab
@@ -434,9 +263,10 @@
{
msgstr = gtranslator_msg_get_msgstr(msg);
/*
- * Disable notebook tabs and hide widgets
+ * Disable notebook tabs
*/
- gtk_widget_hide (priv->text_plural_scroll);
+ gtk_notebook_set_show_tabs(GTK_NOTEBOOK(priv->text_notebook), FALSE);
+ gtk_notebook_set_current_page(GTK_NOTEBOOK(priv->text_notebook), 0);
gtk_notebook_set_show_tabs(GTK_NOTEBOOK(priv->trans_notebook), FALSE);
gtk_notebook_set_current_page(GTK_NOTEBOOK(priv->trans_notebook), 0);
if(msgstr)
@@ -448,7 +278,7 @@
}
}
else {
- gtk_widget_show (priv->text_plural_scroll);
+ gtk_notebook_set_show_tabs(GTK_NOTEBOOK(tab->priv->text_notebook), TRUE);
gtk_notebook_set_show_tabs(GTK_NOTEBOOK(tab->priv->trans_notebook), TRUE);
buf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(tab->priv->text_msgid_plural));
gtk_text_buffer_set_text(buf, (gchar*)msgid_plural, -1);
@@ -474,40 +304,37 @@
{
GtranslatorMsgStatus status;
GtranslatorPoState po_state;
- gboolean fuzzy, translated;
status = gtranslator_msg_get_status (msg);
po_state = gtranslator_po_get_state (tab->priv->po);
-
- fuzzy = gtranslator_msg_is_fuzzy (msg);
- translated = gtranslator_msg_is_translated (msg);
- if ((status == GTR_MSG_STATUS_FUZZY) && !fuzzy)
+ if((status == GTR_MSG_STATUS_FUZZY) && !gtranslator_msg_is_fuzzy(msg))
{
_gtranslator_po_increase_decrease_fuzzy(tab->priv->po, FALSE);
- if (translated)
+ if(gtranslator_msg_is_translated(msg))
{
status = GTR_MSG_STATUS_TRANSLATED;
_gtranslator_po_increase_decrease_translated(tab->priv->po, TRUE);
}
else {
status = GTR_MSG_STATUS_UNTRANSLATED;
+ _gtranslator_po_increase_decrease_translated(tab->priv->po, FALSE);
}
}
- else if ((status == GTR_MSG_STATUS_TRANSLATED) && !translated)
+ else if((status == GTR_MSG_STATUS_TRANSLATED) && !gtranslator_msg_is_translated(msg))
{
status = GTR_MSG_STATUS_UNTRANSLATED;
_gtranslator_po_increase_decrease_translated(tab->priv->po, FALSE);
}
- else if ((status == GTR_MSG_STATUS_TRANSLATED) && fuzzy)
+ else if((status == GTR_MSG_STATUS_TRANSLATED) && gtranslator_msg_is_fuzzy(msg))
{
status = GTR_MSG_STATUS_FUZZY;
_gtranslator_po_increase_decrease_translated(tab->priv->po, FALSE);
_gtranslator_po_increase_decrease_fuzzy(tab->priv->po, TRUE);
}
- else if ((status == GTR_MSG_STATUS_UNTRANSLATED) && translated)
+ else if((status == GTR_MSG_STATUS_UNTRANSLATED) && gtranslator_msg_is_translated(msg))
{
- if (fuzzy)
+ if(gtranslator_msg_is_fuzzy(msg))
{
status = GTR_MSG_STATUS_FUZZY;
_gtranslator_po_increase_decrease_fuzzy(tab->priv->po, TRUE);
@@ -526,6 +353,31 @@
}
static void
+set_message_area (GtranslatorTab *tab,
+ GtkWidget *message_area)
+{
+ if (tab->priv->message_area == message_area)
+ return;
+
+ if (tab->priv->message_area != NULL)
+ gtk_widget_destroy (tab->priv->message_area);
+
+ tab->priv->message_area = message_area;
+
+ if (message_area == NULL)
+ return;
+
+ gtk_box_pack_start (GTK_BOX (tab),
+ tab->priv->message_area,
+ FALSE,
+ FALSE,
+ 0);
+
+ g_object_add_weak_pointer (G_OBJECT (tab->priv->message_area),
+ (gpointer *)&tab->priv->message_area);
+}
+
+static void
comment_pane_position_changed (GObject *tab_gobject,
GParamSpec *arg1,
GtranslatorTab *tab)
@@ -557,9 +409,9 @@
do{
label = g_strdup_printf (_("Plural %d"), i+1);
- priv->trans_msgstr[i] = gtranslator_tab_append_msgstr_page (label,
- priv->trans_notebook,
- TRUE);
+ priv->trans_msgstr[i] = gtranslator_tab_append_page (label,
+ priv->trans_notebook,
+ TRUE);
buf = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->trans_msgstr[i]));
g_signal_connect (buf, "end-user-action",
G_CALLBACK (gtranslator_message_translation_update),
@@ -576,16 +428,10 @@
static void
gtranslator_tab_draw (GtranslatorTab *tab)
{
- gint current_page_num;
GtkWidget *image;
GtkWidget *vertical_box;
GtkWidget *label_widget;
- GtkWidget *msgid_label;
- GtkWidget *msgstr_label;
- GtkWidget *current_page;
- GtkWidget *notebook, *tm_layout, *tm, *comments_label, *tm_label, *scroll;
- GtkWidget *hbox;
- GtkWidget *label;
+
GtranslatorTabPrivate *priv = tab->priv;
/*
@@ -607,9 +453,6 @@
gtk_notebook_append_page (GTK_NOTEBOOK (priv->panel),
priv->message_table,
label_widget);
-
- gtk_notebook_set_show_tabs(GTK_NOTEBOOK (priv->panel),
- FALSE);
/*
* Comment pane
@@ -621,31 +464,13 @@
G_CALLBACK (comment_pane_position_changed),
tab);
gtk_widget_show (priv->comment_pane);
-
- /*
- * Lateral panel
- */
- tab->priv->lateral_panel = gtk_notebook_new ();
- gtk_widget_show (tab->priv->lateral_panel);
-
- gtk_paned_pack2(GTK_PANED(priv->comment_pane), tab->priv->lateral_panel,
- TRUE, TRUE);
-
- /*
- * Context
- */
- priv->context = gtranslator_context_panel_new (GTK_WIDGET (tab));
- gtk_widget_show (priv->context);
- gtranslator_tab_add_widget_to_lateral_panel (tab, priv->context,
- _("Context"));
/*
- * TM
+ * Comment
*/
- priv->translation_memory = gtranslator_translation_memory_ui_new (GTK_WIDGET (tab));
- gtk_widget_show (priv->translation_memory);
- gtranslator_tab_add_widget_to_lateral_panel (tab, priv->translation_memory,
- _("Translation Memory"));
+ priv->comment = gtranslator_comment_panel_new(GTK_WIDGET(tab));
+ gtk_paned_pack2(GTK_PANED(priv->comment_pane), priv->comment, TRUE, TRUE);
+ gtk_widget_show (priv->comment);
/*
* Content pane; this is where the message table and message area go
@@ -670,90 +495,27 @@
/*
* Orignal text widgets
*/
- priv->msgid_hbox = gtk_hbox_new (FALSE, 0);
- gtk_widget_show (priv->msgid_hbox);
-
- msgid_label = gtk_label_new (NULL);
- gtk_label_set_markup (GTK_LABEL (msgid_label),
- "<b>Original Text:</b>");
- gtk_misc_set_padding (GTK_MISC (msgid_label), 0, 5);
- gtk_widget_show (msgid_label);
-
- gtk_box_pack_start(GTK_BOX(priv->msgid_hbox), msgid_label, FALSE, FALSE, 0);
-
- priv->text_vbox = gtk_vbox_new (FALSE, 0);
- gtk_widget_show (priv->text_vbox);
-
- /* Singular */
- scroll = gtk_scrolled_window_new (NULL, NULL);
- gtk_widget_show (scroll);
-
- priv->text_msgid = gtranslator_view_new ();
- gtk_text_view_set_editable (GTK_TEXT_VIEW (priv->text_msgid), FALSE);
- gtk_widget_show (priv->text_msgid);
-
- gtk_container_add (GTK_CONTAINER (scroll),
- priv->text_msgid);
-
- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll),
- GTK_POLICY_AUTOMATIC,
- GTK_POLICY_AUTOMATIC);
- gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scroll),
- GTK_SHADOW_IN);
-
- gtk_box_pack_start (GTK_BOX (priv->text_vbox), scroll, TRUE, TRUE, 0);
-
- /* Plural */
- priv->text_plural_scroll = gtk_scrolled_window_new (NULL, NULL);
- gtk_widget_show (priv->text_plural_scroll);
-
- priv->text_msgid_plural = gtranslator_view_new ();
- gtk_text_view_set_editable (GTK_TEXT_VIEW (priv->text_msgid_plural),
- FALSE);
- gtk_widget_show (priv->text_msgid_plural);
-
- gtk_container_add (GTK_CONTAINER (priv->text_plural_scroll),
- priv->text_msgid_plural);
-
- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->text_plural_scroll),
- GTK_POLICY_AUTOMATIC,
- GTK_POLICY_AUTOMATIC);
- gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (priv->text_plural_scroll),
- GTK_SHADOW_IN);
-
- gtk_box_pack_start (GTK_BOX (priv->text_vbox), priv->text_plural_scroll,
- TRUE, TRUE, 0);
-
- gtk_box_pack_start (GTK_BOX (vertical_box), priv->msgid_hbox, FALSE, FALSE, 0);
- gtk_box_pack_start(GTK_BOX(vertical_box), priv->text_vbox, TRUE, TRUE, 0);
+ priv->text_notebook = gtk_notebook_new();
+ gtk_notebook_set_show_border(GTK_NOTEBOOK(priv->text_notebook), FALSE);
+ gtk_widget_show (priv->text_notebook);
+ priv->text_msgid = gtranslator_tab_append_page(_("Singular"),
+ priv->text_notebook,
+ FALSE);
+ gtk_text_view_set_editable(GTK_TEXT_VIEW(priv->text_msgid), FALSE);
+ priv->text_msgid_plural = gtranslator_tab_append_page(_("Plural"),
+ priv->text_notebook,
+ FALSE);
+ gtk_text_view_set_editable(GTK_TEXT_VIEW(priv->text_msgid_plural), FALSE);
+ gtk_box_pack_start(GTK_BOX(vertical_box), priv->text_notebook, TRUE, TRUE, 0);
/*
* Translation widgets
*/
- priv->msgstr_hbox = gtk_hbox_new (FALSE, 0);
- gtk_widget_show (priv->msgstr_hbox);
-
- msgstr_label = gtk_label_new (NULL);
- gtk_label_set_markup_with_mnemonic (GTK_LABEL (msgstr_label),
- "<b>Tran_slated Text:</b>");
- gtk_misc_set_padding (GTK_MISC (msgstr_label), 0, 5);
- gtk_misc_set_alignment (GTK_MISC (msgstr_label), 0, 0.5);
- gtk_widget_show (msgstr_label);
-
- gtk_box_pack_start(GTK_BOX(priv->msgstr_hbox), msgstr_label, TRUE, TRUE, 0);
-
- priv->comment_button = gtranslator_tab_create_comment_button ();
- gtk_box_pack_start (GTK_BOX (priv->msgstr_hbox), priv->comment_button,
- FALSE, FALSE, 0);
- g_signal_connect (priv->comment_button, "clicked",
- G_CALLBACK (on_comment_button_clicked), NULL);
-
priv->trans_notebook = gtk_notebook_new();
gtk_notebook_set_show_border(GTK_NOTEBOOK(priv->trans_notebook), FALSE);
gtk_widget_show (priv->trans_notebook);
- gtk_box_pack_start(GTK_BOX(vertical_box), priv->msgstr_hbox, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(vertical_box), priv->trans_notebook, TRUE, TRUE, 0);
gtk_paned_pack1(GTK_PANED(priv->comment_pane), vertical_box, FALSE, FALSE);
@@ -764,88 +526,29 @@
static void
gtranslator_tab_init (GtranslatorTab *tab)
{
+ GtkWidget *image;
+
tab->priv = GTR_TAB_GET_PRIVATE (tab);
g_signal_connect(tab, "message-changed",
G_CALLBACK(update_status), NULL);
gtranslator_tab_draw(tab);
-
- /* Manage auto save data */
- tab->priv->autosave = gtranslator_prefs_manager_get_autosave ();
- tab->priv->autosave = (tab->priv->autosave != FALSE);
-
- tab->priv->autosave_interval = gtranslator_prefs_manager_get_autosave_interval ();
- if (tab->priv->autosave_interval <= 0)
- tab->priv->autosave_interval = GPM_DEFAULT_AUTOSAVE_INTERVAL;
}
static void
gtranslator_tab_finalize (GObject *object)
{
- GtranslatorTab *tab = GTR_TAB (object);
-
- if (tab->priv->po)
- g_object_unref (tab->priv->po);
-
- if (tab->priv->timer != NULL)
- g_timer_destroy (tab->priv->timer);
+ GtranslatorTab *tab = GTR_TAB(object);
+ gint i;
- if (tab->priv->autosave_timeout > 0)
- remove_autosave_timeout (tab);
+ if(tab->priv->po)
+ g_object_unref(tab->priv->po);
G_OBJECT_CLASS (gtranslator_tab_parent_class)->finalize (object);
}
static void
-gtranslator_tab_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec)
-{
- GtranslatorTab *tab = GTR_TAB (object);
-
- switch (prop_id)
- {
- case PROP_AUTOSAVE:
- g_value_set_boolean (value,
- gtranslator_tab_get_autosave_enabled (tab));
- break;
- case PROP_AUTOSAVE_INTERVAL:
- g_value_set_int (value,
- gtranslator_tab_get_autosave_interval (tab));
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
-
-static void
-gtranslator_tab_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
-{
- GtranslatorTab *tab = GTR_TAB (object);
-
- switch (prop_id)
- {
- case PROP_AUTOSAVE:
- gtranslator_tab_set_autosave_enabled (tab,
- g_value_get_boolean (value));
- break;
- case PROP_AUTOSAVE_INTERVAL:
- gtranslator_tab_set_autosave_interval (tab,
- g_value_get_int (value));
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
-
-static void
gtranslator_tab_class_init (GtranslatorTabClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
@@ -853,12 +556,7 @@
g_type_class_add_private (klass, sizeof (GtranslatorTabPrivate));
object_class->finalize = gtranslator_tab_finalize;
- object_class->set_property = gtranslator_tab_set_property;
- object_class->get_property = gtranslator_tab_get_property;
- klass->showed_message = gtranslator_tab_showed_message;
- klass->message_edition_finished = gtranslator_tab_edition_finished;
-
- /* Signals */
+
signals[SHOWED_MESSAGE] =
g_signal_new("showed-message",
G_OBJECT_CLASS_TYPE (klass),
@@ -878,37 +576,6 @@
g_cclosure_marshal_VOID__POINTER,
G_TYPE_NONE, 1,
G_TYPE_POINTER);
-
- signals[MESSAGE_EDITION_FINISHED] =
- g_signal_new("message-edition-finished",
- G_OBJECT_CLASS_TYPE (klass),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GtranslatorTabClass, message_edition_finished),
- NULL, NULL,
- g_cclosure_marshal_VOID__POINTER,
- G_TYPE_NONE, 1,
- G_TYPE_POINTER);
-
- /* Properties */
- g_object_class_install_property (object_class,
- PROP_AUTOSAVE,
- g_param_spec_boolean ("autosave",
- "Autosave",
- "Autosave feature",
- TRUE,
- G_PARAM_READWRITE |
- G_PARAM_STATIC_STRINGS));
-
- g_object_class_install_property (object_class,
- PROP_AUTOSAVE_INTERVAL,
- g_param_spec_int ("autosave-interval",
- "AutosaveInterval",
- "Time between two autosaves",
- 0,
- G_MAXINT,
- 0,
- G_PARAM_READWRITE |
- G_PARAM_STATIC_STRINGS));
}
/***************************** Public funcs ***********************************/
@@ -917,8 +584,6 @@
* gtranslator_tab_new:
* @po: a #GtranslatorPo
*
- * Creates a new #GtranslatorTab.
- *
* Return value: a new #GtranslatorTab object
**/
GtranslatorTab *
@@ -932,7 +597,6 @@
tab->priv->po = po;
g_object_set_data (G_OBJECT (po), GTR_TAB_KEY, tab);
- install_autosave_timeout_if_needed (tab);
/*
* Now we have to initialize the number of msgstr tabs
@@ -973,41 +637,39 @@
}
/**
- * gtranslator_tab_get_active_trans_tab:
+ * gtranslator_tab_get_active_text_tab:
* @tab: a #GtranslationTab
*
- * Return value: the number of the active translation notebook.
+ * Return value: the number of the active original text notebook.
**/
gint
-gtranslator_tab_get_active_trans_tab(GtranslatorTab *tab)
+gtranslator_tab_get_active_text_tab(GtranslatorTab *tab)
{
- return gtk_notebook_get_current_page(GTK_NOTEBOOK(tab->priv->trans_notebook));
+ return gtk_notebook_get_current_page(GTK_NOTEBOOK(tab->priv->text_notebook));
}
/**
- * gtranslator_tab_get_context_panel:
- * @tab: a #GtranslatorTab
- *
- * Return value: the #GtranslaorContextPanel
- */
-GtranslatorContextPanel *
-gtranslator_tab_get_context_panel(GtranslatorTab *tab)
+ * gtranslator_tab_get_active_trans_tab:
+ * @tab: a #GtranslationTab
+ *
+ * Return value: the number of the active translation notebook.
+ **/
+gint
+gtranslator_tab_get_active_trans_tab(GtranslatorTab *tab)
{
- return GTR_CONTEXT_PANEL(tab->priv->context);
+ return gtk_notebook_get_current_page(GTK_NOTEBOOK(tab->priv->trans_notebook));
}
/**
- * gtranslator_tab_get_translation_memory_ui:
+ * gtranslator_tab_get_comment_panel:
* @tab: a #GtranslatorTab
*
- * Returns: the #GtranslatorTranslationMemoryUi panel.
+ * Return value: the #GtranslaorCommentPanel
*/
-GtkWidget *
-gtranslator_tab_get_translation_memory_ui (GtranslatorTab *tab)
+GtranslatorCommentPanel *
+gtranslator_tab_get_comment_panel(GtranslatorTab *tab)
{
- g_return_val_if_fail (GTR_IS_TAB (tab), NULL);
-
- return tab->priv->translation_memory;
+ return GTR_COMMENT_PANEL(tab->priv->comment);
}
/**
@@ -1097,20 +759,19 @@
* gtranslator_tab_message_go_to:
* @tab: a #GtranslatorTab
* @to_go: the #GtranslatorMsg you want to jump
- * @searching: TRUE if we are searching in the message list
*
* Jumps to the specific @to_go pointer message and show the message
* in the #GtranslatorView.
**/
void
-gtranslator_tab_message_go_to (GtranslatorTab *tab,
- GList * to_go,
- gboolean searching,
- GtranslatorTabMove move)
+gtranslator_tab_message_go_to(GtranslatorTab *tab,
+ GList * to_go)
{
GtranslatorPo *po;
+ static gint pos = 0;
GList *current_msg;
- static gboolean first_msg = TRUE;
+ const gchar *message_error;
+ GtkWidget *message_area;
g_return_if_fail (tab != NULL);
g_return_if_fail (to_go != NULL);
@@ -1118,96 +779,34 @@
po = tab->priv->po;
- current_msg = gtranslator_po_get_current_message (po);
-
- /*
- * Emitting message-edition-finished signal
- */
- if (!searching && !first_msg)
- g_signal_emit (G_OBJECT (tab), signals[MESSAGE_EDITION_FINISHED],
- 0, GTR_MSG (current_msg->data));
-
- if (!tab->priv->blocking || first_msg)
+ current_msg = gtranslator_po_get_current_message(po);
+ message_error = gtranslator_msg_check(current_msg->data);
+ if(message_error == NULL)
{
- gboolean plurals;
- gint current_page, n_pages;
- /*
- * If the current message is plural and we press next/prev
- * we have to change to the next/prev plural tab in case is not
- * the last
- * To implement that:
- * if the tabs are showed then we check if we want prev or
- * next and then if we need to change the tab we change it
- * in other case we show the message
- *
- * I don't like too much this implementation so if anybody can
- * rewrite this is a better way would be great.
- */
- plurals = gtk_notebook_get_show_tabs (GTK_NOTEBOOK (tab->priv->trans_notebook));
- current_page = gtk_notebook_get_current_page (GTK_NOTEBOOK (tab->priv->trans_notebook));
- n_pages = gtk_notebook_get_n_pages (GTK_NOTEBOOK (tab->priv->trans_notebook));
- if ((plurals == TRUE) && (move != GTR_TAB_MOVE_NONE))
- {
- if ((n_pages - 1) == current_page && move == GTR_TAB_MOVE_NEXT)
- {
- gtk_notebook_set_current_page (GTK_NOTEBOOK (tab->priv->trans_notebook),
- 0);
- gtranslator_tab_show_message (tab, to_go->data);
- }
- else if (current_page == 0 && move == GTR_TAB_MOVE_PREV)
- {
- gtk_notebook_set_current_page (GTK_NOTEBOOK (tab->priv->trans_notebook),
- n_pages - 1);
- gtranslator_tab_show_message (tab, to_go->data);
- }
- else
- {
- if (move == GTR_TAB_MOVE_NEXT)
- gtk_notebook_set_current_page (GTK_NOTEBOOK (tab->priv->trans_notebook),
- current_page + 1);
- else
- gtk_notebook_set_current_page (GTK_NOTEBOOK (tab->priv->trans_notebook),
- current_page - 1);
- return;
- }
- }
- else
- gtranslator_tab_show_message (tab, to_go->data);
- first_msg = FALSE;
+ gtranslator_tab_show_message(tab, to_go->data);
+ set_message_area(tab, NULL);
}
else
+ {
+ message_area = create_error_message_area(_("There is an error in the message:"),
+ message_error);
+ set_message_area(tab, message_area);
return;
+ }
/*
* Emitting showed-message signal
*/
- if (!searching)
- g_signal_emit (G_OBJECT (tab), signals[SHOWED_MESSAGE], 0,
- GTR_MSG (to_go->data));
+ g_signal_emit(G_OBJECT(tab), signals[SHOWED_MESSAGE], 0, GTR_MSG(to_go->data));
+
}
-/**
- * _gtranslator_tab_can_close:
- * @tab: a #GtranslatorTab
- *
- * Whether a #GtranslatorTab can be closed.
- *
- * Returns: TRUE if the #GtranslatorPo of the @tab is already saved
- */
gboolean
_gtranslator_tab_can_close (GtranslatorTab *tab)
{
return gtranslator_po_get_state (tab->priv->po) == GTR_PO_STATE_SAVED;
}
-/**
- * gtranslator_tab_get_from_document:
- * @po: a #GtranslatorPo
- *
- * Returns the #GtranslatorTab for a specific #GtranslatorPo.
- *
- * Returns: the #GtranslatorTab for a specific #GtranslatorPo
- */
GtranslatorTab *
gtranslator_tab_get_from_document (GtranslatorPo *po)
{
@@ -1219,522 +818,3 @@
return (res != NULL) ? GTR_TAB (res) : NULL;
}
-
-/**
- * gtranslator_tab_get_autosave_enabled:
- * @tab: a #GtranslatorTab
- *
- * Gets the current state for the autosave feature
- *
- * Return value: TRUE if the autosave is enabled, else FALSE
- **/
-gboolean
-gtranslator_tab_get_autosave_enabled (GtranslatorTab *tab)
-{
- g_return_val_if_fail (GTR_IS_TAB (tab), FALSE);
-
- return tab->priv->autosave;
-}
-
-/**
- * gtranslator_tab_set_autosave_enabled:
- * @tab: a #GtranslatorTab
- * @enable: enable (TRUE) or disable (FALSE) auto save
- *
- * Enables or disables the autosave feature. It does not install an
- * autosave timeout if the document is new or is read-only
- **/
-void
-gtranslator_tab_set_autosave_enabled (GtranslatorTab *tab,
- gboolean enable)
-{
- g_return_if_fail (GTR_IS_TAB (tab));
-
- if (tab->priv->autosave == enable)
- return;
-
- tab->priv->autosave = enable;
-
- if (enable &&
- (tab->priv->autosave_timeout <= 0))
- {
- install_autosave_timeout (tab);
-
- return;
- }
-
- if (!enable && (tab->priv->autosave_timeout > 0))
- {
- remove_autosave_timeout (tab);
-
- return;
- }
-
- g_return_if_fail (!enable && (tab->priv->autosave_timeout <= 0));
-}
-
-/**
- * gtranslator_tab_get_autosave_interval:
- * @tab: a #GtranslatorTab
- *
- * Gets the current interval for the autosaves
- *
- * Return value: the value of the autosave
- **/
-gint
-gtranslator_tab_get_autosave_interval (GtranslatorTab *tab)
-{
- g_return_val_if_fail (GTR_IS_TAB (tab), 0);
-
- return tab->priv->autosave_interval;
-}
-
-/**
- * gtranslator_tab_set_autosave_interval:
- * @tab: a #GtranslatorTab
- * @interval: the new interval
- *
- * Sets the interval for the autosave feature. It does nothing if the
- * interval is the same as the one already present. It removes the old
- * interval timeout and adds a new one with the autosave passed as
- * argument.
- **/
-void
-gtranslator_tab_set_autosave_interval (GtranslatorTab *tab,
- gint interval)
-{
- g_return_if_fail (GTR_IS_TAB (tab));
- g_return_if_fail (interval > 0);
-
- if (tab->priv->autosave_interval == interval)
- return;
-
- tab->priv->autosave_interval = interval;
-
- if (!tab->priv->autosave)
- return;
-
- if (tab->priv->autosave_timeout > 0)
- {
- remove_autosave_timeout (tab);
-
- install_autosave_timeout (tab);
- }
-}
-
-/**
- * gtranslator_tab_add_widget_to_lateral_panel:
- * @tab: a #GtranslatorTab
- * @widget: a #GtkWidget
- * @tab_name: the tab name in the notebook
- *
- * Adds a new widget to the laberal panel notebook.
- */
-void
-gtranslator_tab_add_widget_to_lateral_panel (GtranslatorTab *tab,
- GtkWidget *widget,
- const gchar *tab_name)
-{
- GtkWidget *label;
-
- g_return_if_fail (GTR_IS_TAB (tab));
- g_return_if_fail (GTK_IS_WIDGET (widget));
-
- label = gtk_label_new (tab_name);
-
- gtk_notebook_append_page (GTK_NOTEBOOK (tab->priv->lateral_panel),
- widget, label);
-}
-
-/**
- * gtranslator_tab_remove_widget_from_lateral_panel:
- * @tab: a #GtranslatorTab
- * @widget: a #GtkWidget
- *
- * Removes the @widget from the lateral panel notebook of @tab.
- */
-void
-gtranslator_tab_remove_widget_from_lateral_panel (GtranslatorTab *tab,
- GtkWidget *widget)
-{
- gint page;
-
- g_return_if_fail (GTR_IS_TAB (tab));
- g_return_if_fail (GTK_IS_WIDGET (widget));
-
- page = gtk_notebook_page_num (GTK_NOTEBOOK (tab->priv->lateral_panel),
- widget);
-
- gtk_notebook_remove_page (GTK_NOTEBOOK (tab->priv->lateral_panel),
- page);
-}
-
-/**
- * gtranslator_tab_show_lateral_panel_widget:
- * @tab: a #GtranslatorTab
- * @widget: the widget to be shown.
- *
- * Shows the notebook page of the @widget.
- */
-void
-gtranslator_tab_show_lateral_panel_widget (GtranslatorTab *tab,
- GtkWidget *widget)
-{
- gint page;
-
- page = gtk_notebook_page_num (GTK_NOTEBOOK (tab->priv->lateral_panel),
- widget);
- gtk_notebook_set_current_page (GTK_NOTEBOOK (tab->priv->lateral_panel),
- page);
-}
-
-/**
- * gtranslator_tab_clear_msgstr_views:
- * @tab: a #GtranslatorTab
- *
- * Clears all text from msgstr text views.
- */
-void
-gtranslator_tab_clear_msgstr_views (GtranslatorTab *tab)
-{
- gint i = 0;
- GtranslatorHeader *header;
- GtkTextBuffer *buf;
-
- g_return_if_fail (GTR_IS_TAB (tab));
-
- header = gtranslator_po_get_header (tab->priv->po);
-
- do {
- buf = gtk_text_view_get_buffer (GTK_TEXT_VIEW (tab->priv->trans_msgstr[i]));
- gtk_text_buffer_begin_user_action (buf);
- gtk_text_buffer_set_text (buf, "", -1);
- gtk_text_buffer_end_user_action (buf);
- i++;
- }while (i < gtranslator_header_get_nplurals (header));
-}
-
-/**
- * gtranslator_tab_block_movement:
- * @tab: a #GtranslatorTab
- *
- * Blocks the movement to the next/prev message.
- */
-void
-gtranslator_tab_block_movement (GtranslatorTab *tab)
-{
- g_return_if_fail (GTR_IS_TAB (tab));
-
- tab->priv->blocking = TRUE;
-}
-
-/**
- * gtranslator_tab_unblock_movement:
- * @tab: a #GtranslatorTab
- *
- * Unblocks the movement to the next/prev message.
- */
-void
-gtranslator_tab_unblock_movement (GtranslatorTab *tab)
-{
- g_return_if_fail (GTR_IS_TAB (tab));
-
- tab->priv->blocking = FALSE;
-}
-
-/**
- * gtranslator_tab_go_to_next:
- * @tab: a #GtranslatorTab
- *
- * Moves to the next message or plural tab in case the message has plurals.
- */
-void
-gtranslator_tab_go_to_next (GtranslatorTab *tab)
-{
- GtranslatorPo *po;
-
- po = gtranslator_tab_get_po (tab);
-
- gtranslator_tab_message_go_to (tab,
- g_list_next (gtranslator_po_get_current_message (po)),
- FALSE,
- GTR_TAB_MOVE_NEXT);
-}
-
-/**
- * gtranslator_tab_go_to_prev:
- * @tab: a #GtranslatorTab
- *
- * Moves to the previous message or plural tab in case the message has plurals.
- */
-void
-gtranslator_tab_go_to_prev (GtranslatorTab *tab)
-{
- GtranslatorPo *po;
-
- po = gtranslator_tab_get_po (tab);
-
- gtranslator_tab_message_go_to (tab,
- g_list_previous (gtranslator_po_get_current_message (po)),
- FALSE,
- GTR_TAB_MOVE_PREV);
-}
-
-/**
- * gtranslator_tab_go_to_first:
- * @tab: a #GtranslatorTab
- *
- * Jumps to the first message.
- */
-void
-gtranslator_tab_go_to_first (GtranslatorTab *tab)
-{
- GtranslatorPo *po;
-
- po = gtranslator_tab_get_po (tab);
-
- gtranslator_tab_message_go_to (tab,
- g_list_first (gtranslator_po_get_current_message (po)),
- FALSE,
- GTR_TAB_MOVE_NONE);
-}
-
-/**
- * gtranslator_tab_go_to_last:
- * @tab: a #GtranslatorTab
- *
- * Jumps to the last message.
- */
-void
-gtranslator_tab_go_to_last (GtranslatorTab *tab)
-{
- GtranslatorPo *po;
-
- po = gtranslator_tab_get_po (tab);
-
- gtranslator_tab_message_go_to (tab,
- g_list_last (gtranslator_po_get_current_message (po)),
- FALSE,
- GTR_TAB_MOVE_NONE);
-}
-
-/**
- * gtranslator_tab_go_to_next_fuzzy:
- * @tab: a #GtranslatorTab
- *
- * If there is a next fuzzy message it jumps to it.
- *
- * Returns: TRUE if there is a next fuzzy message.
- */
-gboolean
-gtranslator_tab_go_to_next_fuzzy (GtranslatorTab *tab)
-{
- GtranslatorPo *po;
- GList *msg;
-
- po = gtranslator_tab_get_po (tab);
-
- msg = gtranslator_po_get_next_fuzzy (po);
- if(msg != NULL)
- {
- gtranslator_tab_message_go_to (tab, msg, FALSE,
- GTR_TAB_MOVE_NONE);
- return TRUE;
- }
-
- return FALSE;
-}
-
-/**
- * gtranslator_tab_go_to_prev_fuzzy:
- * @tab: a #GtranslatorTab
- *
- * If there is a prev fuzzy message it jumps to it.
- *
- * Returns: TRUE if there is a prev fuzzy message.
- */
-gboolean
-gtranslator_tab_go_to_prev_fuzzy (GtranslatorTab *tab)
-{
- GtranslatorPo *po;
- GList *msg;
-
- po = gtranslator_tab_get_po (tab);
-
- msg = gtranslator_po_get_prev_fuzzy (po);
- if(msg != NULL)
- {
- gtranslator_tab_message_go_to (tab, msg, FALSE,
- GTR_TAB_MOVE_NONE);
- return TRUE;
- }
-
- return FALSE;
-}
-
-/**
- * gtranslator_tab_go_to_next_untrans:
- * @tab: a #GtranslatorTab
- *
- * If there is a next untranslated message it jumps to it.
- *
- * Returns: TRUE if there is a next untranslated message.
- */
-gboolean
-gtranslator_tab_go_to_next_untrans (GtranslatorTab *tab)
-{
- GtranslatorPo *po;
- GList *msg;
-
- po = gtranslator_tab_get_po (tab);
-
- msg = gtranslator_po_get_next_untrans (po);
- if(msg != NULL)
- {
- gtranslator_tab_message_go_to (tab, msg, FALSE,
- GTR_TAB_MOVE_NONE);
- return TRUE;
- }
-
- return FALSE;
-}
-
-/**
- * gtranslator_tab_go_to_prev_untrans:
- * @tab: a #GtranslatorTab
- *
- * If there is a prev untranslated message it jumps to it.
- *
- * Returns: TRUE if there is a prev untranslated message.
- */
-gboolean
-gtranslator_tab_go_to_prev_untrans (GtranslatorTab *tab)
-{
- GtranslatorPo *po;
- GList *msg;
-
- po = gtranslator_tab_get_po (tab);
-
- msg = gtranslator_po_get_prev_untrans (po);
- if(msg != NULL)
- {
- gtranslator_tab_message_go_to (tab, msg, FALSE,
- GTR_TAB_MOVE_NONE);
- return TRUE;
- }
-
- return FALSE;
-}
-
-/**
- * gtranslator_tab_go_to_next_fuzzy_or_untrans:
- * @tab: a #GtranslatorTab
- *
- * If there is a next fuzzy or untranslated message it jumps to it.
- *
- * Returns: TRUE if there is a next fuzzy or untranslated message.
- */
-gboolean
-gtranslator_tab_go_to_next_fuzzy_or_untrans (GtranslatorTab *tab)
-{
- GtranslatorPo *po;
- GList *msg;
-
- po = gtranslator_tab_get_po (tab);
-
- msg = gtranslator_po_get_next_fuzzy_or_untrans (po);
- if(msg != NULL)
- {
- gtranslator_tab_message_go_to (tab, msg, FALSE,
- GTR_TAB_MOVE_NONE);
- return TRUE;
- }
-
- return FALSE;
-}
-
-/**
- * gtranslator_tab_go_to_prev_fuzzy_or_untrans:
- * @tab: a #GtranslatorTab
- *
- * If there is a prev fuzzy or untranslated message it jumps to it.
- *
- * Returns: TRUE if there is a prev fuzzy or untranslated message.
- */
-gboolean
-gtranslator_tab_go_to_prev_fuzzy_or_untrans (GtranslatorTab *tab)
-{
- GtranslatorPo *po;
- GList *msg;
-
- po = gtranslator_tab_get_po (tab);
-
- msg = gtranslator_po_get_prev_fuzzy_or_untrans (po);
- if(msg != NULL)
- {
- gtranslator_tab_message_go_to (tab, msg, FALSE,
- GTR_TAB_MOVE_NONE);
- return TRUE;
- }
-
- return FALSE;
-}
-
-/**
- * gtranslator_tab_go_to_number:
- * @tab: a #GtranslatorTab
- * @number: the message number you want to jump
- *
- * Jumps to the message with the @number in the list, if the message does not
- * exists it does not jump.
- */
-void
-gtranslator_tab_go_to_number (GtranslatorTab *tab,
- gint number)
-{
- GtranslatorPo *po;
- GList *msg;
-
- po = gtranslator_tab_get_po (tab);
-
- msg = gtranslator_po_get_msg_from_number (po, number);
- if(msg != NULL)
- {
- gtranslator_tab_message_go_to (tab, msg, FALSE,
- GTR_TAB_MOVE_NONE);
- }
-}
-
-/**
- * gtranslator_tab_set_message_area:
- * @tab: a #GtranslatorTab
- * @message_area: a #GtranslatorMessageArea
- *
- * Sets the @message_area to be shown in the @tab.
- */
-void
-gtranslator_tab_set_message_area (GtranslatorTab *tab,
- GtkWidget *message_area)
-{
- g_return_if_fail (GTR_IS_TAB (tab));
-
- if (tab->priv->message_area == message_area)
- return;
-
- if (tab->priv->message_area != NULL)
- gtk_widget_destroy (tab->priv->message_area);
-
- tab->priv->message_area = message_area;
-
- if (message_area == NULL)
- return;
-
- gtk_box_pack_start (GTK_BOX (tab),
- tab->priv->message_area,
- FALSE,
- FALSE,
- 0);
-
- g_object_add_weak_pointer (G_OBJECT (tab->priv->message_area),
- (gpointer *)&tab->priv->message_area);
-}
\ No newline at end of file
Modified: trunk/src/tab.h
==============================================================================
--- trunk/src/tab.h (original)
+++ trunk/src/tab.h Tue Sep 16 09:52:02 2008
@@ -23,7 +23,7 @@
#include <glib-object.h>
#include <gtk/gtk.h>
-#include "context.h"
+#include "comment.h"
#include "msg.h"
#include "po.h"
#include "view.h"
@@ -69,17 +69,8 @@
GtranslatorMsg *msg);
void (* message_changed) (GtranslatorTab *tab,
GtranslatorMsg *msg);
- void (* message_edition_finished) (GtranslatorTab *tab,
- GtranslatorMsg *msg);
};
-typedef enum
-{
- GTR_TAB_MOVE_NONE,
- GTR_TAB_MOVE_NEXT,
- GTR_TAB_MOVE_PREV
-}GtranslatorTabMove;
-
/*
* Public methods
*/
@@ -93,11 +84,11 @@
GtkWidget *gtranslator_tab_get_panel (GtranslatorTab *tab);
-gint gtranslator_tab_get_active_trans_tab(GtranslatorTab *tab);
+gint gtranslator_tab_get_active_text_tab (GtranslatorTab *tab);
-GtranslatorContextPanel *gtranslator_tab_get_context_panel (GtranslatorTab *tab);
+gint gtranslator_tab_get_active_trans_tab(GtranslatorTab *tab);
-GtkWidget *gtranslator_tab_get_translation_memory_ui (GtranslatorTab *tab);
+GtranslatorCommentPanel *gtranslator_tab_get_comment_panel (GtranslatorTab *tab);
GtranslatorView *gtranslator_tab_get_active_view (GtranslatorTab *tab);
@@ -108,63 +99,9 @@
gchar *gtranslator_tab_get_name (GtranslatorTab *tab);
void gtranslator_tab_message_go_to (GtranslatorTab *tab,
- GList * to_go,
- gboolean searching,
- GtranslatorTabMove move);
+ GList * to_go);
GtranslatorTab *gtranslator_tab_get_from_document (GtranslatorPo *po);
-
-gboolean gtranslator_tab_get_autosave_enabled (GtranslatorTab *tab);
-
-void gtranslator_tab_set_autosave_enabled (GtranslatorTab *tab,
- gboolean enable);
-
-gint gtranslator_tab_get_autosave_interval (GtranslatorTab *tab);
-
-void gtranslator_tab_set_autosave_interval (GtranslatorTab *tab,
- gint interval);
-
-void gtranslator_tab_add_widget_to_lateral_panel (GtranslatorTab *tab,
- GtkWidget *widget,
- const gchar *tab_name);
-
-void gtranslator_tab_remove_widget_from_lateral_panel (GtranslatorTab *tab,
- GtkWidget *widget);
-
-void gtranslator_tab_show_lateral_panel_widget (GtranslatorTab *tab,
- GtkWidget *widget);
-
-void gtranslator_tab_clear_msgstr_views (GtranslatorTab *tab);
-
-void gtranslator_tab_block_movement (GtranslatorTab *tab);
-
-void gtranslator_tab_unblock_movement (GtranslatorTab *tab);
-
-void gtranslator_tab_go_to_next (GtranslatorTab *tab);
-
-void gtranslator_tab_go_to_prev (GtranslatorTab *tab);
-
-void gtranslator_tab_go_to_first (GtranslatorTab *tab);
-
-void gtranslator_tab_go_to_last (GtranslatorTab *tab);
-
-gboolean gtranslator_tab_go_to_next_fuzzy (GtranslatorTab *tab);
-
-gboolean gtranslator_tab_go_to_prev_fuzzy (GtranslatorTab *tab);
-
-gboolean gtranslator_tab_go_to_next_untrans (GtranslatorTab *tab);
-
-gboolean gtranslator_tab_go_to_prev_untrans (GtranslatorTab *tab);
-
-gboolean gtranslator_tab_go_to_next_fuzzy_or_untrans (GtranslatorTab *tab);
-
-gboolean gtranslator_tab_go_to_prev_fuzzy_or_untrans (GtranslatorTab *tab);
-
-void gtranslator_tab_go_to_number (GtranslatorTab *tab,
- gint number);
-
-void gtranslator_tab_set_message_area (GtranslatorTab *tab,
- GtkWidget *message_area);
gboolean _gtranslator_tab_can_close (GtranslatorTab *tab);
Modified: trunk/src/toolbareditor/egg-editable-toolbar.c
==============================================================================
--- trunk/src/toolbareditor/egg-editable-toolbar.c (original)
+++ trunk/src/toolbareditor/egg-editable-toolbar.c Tue Sep 16 09:52:02 2008
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
- * $Id: egg-editable-toolbar.c 891 2008-08-08 21:14:52Z friemann $
+ * $Id: egg-editable-toolbar.c 826 2007-08-16 08:05:50Z carlosgc $
*/
#include "config.h"
@@ -25,7 +25,26 @@
#include "egg-toolbars-model.h"
#include "egg-toolbar-editor.h"
-#include <gtk/gtk.h>
+#include <gtk/gtkvseparator.h>
+#include <gtk/gtkiconfactory.h>
+#include <gtk/gtkwindow.h>
+#include <gtk/gtkmain.h>
+#include <gtk/gtkdnd.h>
+#include <gtk/gtkhbox.h>
+#include <gtk/gtkimage.h>
+#include <gtk/gtktoggleaction.h>
+#include <gtk/gtkcheckmenuitem.h>
+#include <gtk/gtkimagemenuitem.h>
+#include <gtk/gtkseparatormenuitem.h>
+#include <gtk/gtkmenu.h>
+#include <gtk/gtkstock.h>
+#include <gtk/gtklabel.h>
+#include <gtk/gtkbutton.h>
+#include <gtk/gtktoolbar.h>
+#include <gtk/gtktoolitem.h>
+#include <gtk/gtktoolbutton.h>
+#include <gtk/gtkseparatortoolitem.h>
+#include <gtk/gtkicontheme.h>
#include <glib/gi18n.h>
#include <string.h>
@@ -916,7 +935,7 @@
* produce duplicates, but don't worry about it. If your language
* normally has a mnemonic at the start, please use the _. If not,
* please remove. */
- action_label = g_strdup_printf (_("Show â_%sâ"), tmp);
+ action_label = g_strdup_printf (_("Show \"_%s\""), tmp);
g_free (tmp);
sprintf(action_name, "ToolbarToggle%d", i);
@@ -1808,7 +1827,7 @@
}
static GdkPixbuf *
-new_separator_pixbuf (void)
+new_separator_pixbuf ()
{
GtkWidget *separator;
GdkPixbuf *pixbuf;
Modified: trunk/src/toolbareditor/egg-editable-toolbar.h
==============================================================================
--- trunk/src/toolbareditor/egg-editable-toolbar.h (original)
+++ trunk/src/toolbareditor/egg-editable-toolbar.h Tue Sep 16 09:52:02 2008
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
- * $Id: egg-editable-toolbar.h 891 2008-08-08 21:14:52Z friemann $
+ * $Id: egg-editable-toolbar.h 813 2007-07-01 12:58:48Z jhaitsma $
*/
#ifndef EGG_EDITABLE_TOOLBAR_H
@@ -24,7 +24,12 @@
#include "egg-toolbars-model.h"
-#include <gtk/gtk.h>
+#include <gtk/gtkuimanager.h>
+#include <gtk/gtkselection.h>
+#include <gtk/gtkvbox.h>
+#include <gtk/gtktoolitem.h>
+#include <gtk/gtktoolbar.h>
+#include <gtk/gtkmenu.h>
G_BEGIN_DECLS
Modified: trunk/src/toolbareditor/egg-toolbar-editor.c
==============================================================================
--- trunk/src/toolbareditor/egg-toolbar-editor.c (original)
+++ trunk/src/toolbareditor/egg-toolbar-editor.c Tue Sep 16 09:52:02 2008
@@ -15,7 +15,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
- * $Id: egg-toolbar-editor.c 891 2008-08-08 21:14:52Z friemann $
+ * $Id: egg-toolbar-editor.c 832 2007-11-03 22:14:56Z friemann $
*/
#include "config.h"
@@ -25,6 +25,14 @@
#include <string.h>
#include <libxml/tree.h>
+#include <gtk/gtkimage.h>
+#include <gtk/gtkeventbox.h>
+#include <gtk/gtkdnd.h>
+#include <gtk/gtkscrolledwindow.h>
+#include <gtk/gtklabel.h>
+#include <gtk/gtktable.h>
+#include <gtk/gtkstock.h>
+#include <gtk/gtkhbox.h>
#include <gtk/gtk.h>
#include <glib/gi18n.h>
@@ -166,12 +174,10 @@
egg_toolbar_editor_set_model (EggToolbarEditor *t,
EggToolbarsModel *model)
{
- EggToolbarEditorPrivate *priv;
-
g_return_if_fail (EGG_IS_TOOLBAR_EDITOR (t));
g_return_if_fail (model != NULL);
- priv = t->priv;
+ EggToolbarEditorPrivate *priv = t->priv;
if (priv->model)
{
Modified: trunk/src/toolbareditor/egg-toolbar-editor.h
==============================================================================
--- trunk/src/toolbareditor/egg-toolbar-editor.h (original)
+++ trunk/src/toolbareditor/egg-toolbar-editor.h Tue Sep 16 09:52:02 2008
@@ -19,7 +19,8 @@
#ifndef EGG_TOOLBAR_EDITOR_H
#define EGG_TOOLBAR_EDITOR_H
-#include <gtk/gtk.h>
+#include <gtk/gtkvbox.h>
+#include <gtk/gtkuimanager.h>
#include "egg-toolbars-model.h"
Modified: trunk/src/toolbareditor/egg-toolbars-model.c
==============================================================================
--- trunk/src/toolbareditor/egg-toolbars-model.c (original)
+++ trunk/src/toolbareditor/egg-toolbars-model.c Tue Sep 16 09:52:02 2008
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
- * $Id: egg-toolbars-model.c 891 2008-08-08 21:14:52Z friemann $
+ * $Id: egg-toolbars-model.c 815 2007-07-02 15:02:15Z friemann $
*/
#include "config.h"
@@ -28,7 +28,7 @@
#include <unistd.h>
#include <string.h>
#include <libxml/tree.h>
-#include <gdk/gdk.h>
+#include <gdk/gdkproperty.h>
static void egg_toolbars_model_finalize (GObject *object);
Modified: trunk/src/toolbareditor/egg-toolbars-model.h
==============================================================================
--- trunk/src/toolbareditor/egg-toolbars-model.h (original)
+++ trunk/src/toolbareditor/egg-toolbars-model.h Tue Sep 16 09:52:02 2008
@@ -15,7 +15,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
- * $Id: egg-toolbars-model.h 891 2008-08-08 21:14:52Z friemann $
+ * $Id: egg-toolbars-model.h 813 2007-07-01 12:58:48Z jhaitsma $
*/
#ifndef EGG_TOOLBARS_MODEL_H
@@ -23,7 +23,7 @@
#include <glib.h>
#include <glib-object.h>
-#include <gdk/gdk.h>
+#include <gdk/gdktypes.h>
G_BEGIN_DECLS
Modified: trunk/src/toolbareditor/eggtreemultidnd.c
==============================================================================
--- trunk/src/toolbareditor/eggtreemultidnd.c (original)
+++ trunk/src/toolbareditor/eggtreemultidnd.c Tue Sep 16 09:52:02 2008
@@ -18,7 +18,10 @@
*/
#include <string.h>
-#include <gtk/gtk.h>
+#include <gtk/gtktreeselection.h>
+#include <gtk/gtksignal.h>
+#include <gtk/gtkwidget.h>
+#include <gtk/gtkmain.h>
#include "eggtreemultidnd.h"
#define EGG_TREE_MULTI_DND_STRING "EggTreeMultiDndString"
Modified: trunk/src/toolbareditor/eggtreemultidnd.h
==============================================================================
--- trunk/src/toolbareditor/eggtreemultidnd.h (original)
+++ trunk/src/toolbareditor/eggtreemultidnd.h Tue Sep 16 09:52:02 2008
@@ -20,7 +20,9 @@
#ifndef __EGG_TREE_MULTI_DND_H__
#define __EGG_TREE_MULTI_DND_H__
-#include <gtk/gtk.h>
+#include <gtk/gtktreemodel.h>
+#include <gtk/gtktreeview.h>
+#include <gtk/gtkdnd.h>
G_BEGIN_DECLS
Modified: trunk/src/utils.c
==============================================================================
--- trunk/src/utils.c (original)
+++ trunk/src/utils.c Tue Sep 16 09:52:02 2008
@@ -30,128 +30,6 @@
#include <glade/glade.h>
#include <gtk/gtk.h>
-static const gchar * badwords[]=
-{
- "a",
- //"all",
- "an",
- //"are",
- //"can",
- //"for",
- //"from",
- "have",
- //"it",
- //"may",
- //"not",
- "of",
- //"that",
- "the",
- //"this",
- //"was",
- "will",
- //"with",
- //"you",
- //"your",
- NULL
-};
-
-static gboolean
-check_good_word (const gchar *word, gchar **badwords)
-{
- gboolean check = TRUE;
- gchar *lower = g_utf8_strdown (word, -1);
- gint i = 0;
-
- while (badwords[i] != NULL)
- {
- gchar *lower_collate = g_utf8_collate_key (lower, -1);
-
- if (strcmp (lower_collate, badwords[i]) == 0)
- {
- check = FALSE;
- g_free (lower_collate);
- break;
- }
- i++;
- g_free (lower_collate);
- }
- return check;
-}
-
-/**
- * gtranslator_utils_split_string_in_words:
- * @string: the text to process
- *
- * Process a text and split it in words using pango.
- *
- * Returns: an array of words of the processed text
- */
-gchar **
-gtranslator_utils_split_string_in_words (const gchar *string)
-{
- PangoLanguage *lang = pango_language_from_string ("en");
- PangoLogAttr *attrs;
- GPtrArray *array;
- gint char_len;
- gint i = 0;
- gchar *s;
- static gchar **badwords_collate = NULL;
-
- if (badwords_collate == NULL)
- {
- gint words_size = g_strv_length ((gchar **)badwords);
- gint x = 0;
-
- badwords_collate = g_new0 (gchar *, words_size + 1);
-
- while (badwords[x] != NULL)
- {
- badwords_collate[x] = g_utf8_collate_key (badwords[x], -1);
- x++;
- }
- badwords_collate[x] = NULL;
- }
-
- char_len = g_utf8_strlen (string, -1);
- attrs = g_new (PangoLogAttr, char_len + 1);
-
- pango_get_log_attrs (string,
- strlen (string),
- -1,
- lang,
- attrs,
- char_len + 1);
-
- array = g_ptr_array_new ();
-
- s = (gchar *)string;
- while (i <= char_len)
- {
- gchar *start, *end;
-
- if (attrs[i].is_word_start)
- start = s;
- if (attrs[i].is_word_end)
- {
- gchar *word;
-
- end = s;
- word = g_strndup (start, end - start);
-
- if (check_good_word (word, badwords_collate))
- g_ptr_array_add (array, word);
- }
-
- i++;
- s = g_utf8_next_char (s);
- }
-
- g_free (attrs);
- g_ptr_array_add (array, NULL);
-
- return (gchar **)g_ptr_array_free (array, FALSE);
-}
-
xmlDocPtr
gtranslator_xml_new_doc (const gchar *name)
{
@@ -172,15 +50,6 @@
return doc;
}
-/**
- * gtranslator_gtk_button_new_with_stock_icon:
- * @label: the label of the button
- * @stock_id: the id of the stock image
- *
- * Convenience function to create a #GtkButton with a stock image.
- *
- * Returns: a new #GtkButton
- */
GtkWidget *
gtranslator_gtk_button_new_with_stock_icon (const gchar *label,
const gchar *stock_id)
@@ -195,22 +64,12 @@
return button;
}
-/**
- * gtranslator_utils_menu_position_under_widget:
- * @menu: a #GtkMenu
- * @x: the x position of the widget
- * @y: the y position of the widget
- * @push_in:
- * @user_data: the widget to get the position
- *
- * It returns the position to popup a menu in a specific widget.
- */
void
gtranslator_utils_menu_position_under_widget (GtkMenu *menu,
- gint *x,
- gint *y,
- gboolean *push_in,
- gpointer user_data)
+ gint *x,
+ gint *y,
+ gboolean *push_in,
+ gpointer user_data)
{
GtkWidget *w = GTK_WIDGET (user_data);
GtkRequisition requisition;
@@ -232,22 +91,12 @@
*push_in = TRUE;
}
-/**
- * gtranslator_utils_menu_position_under_widget:
- * @menu: a #GtkMenu
- * @x: the x position of the widget
- * @y: the y position of the widget
- * @push_in:
- * @user_data: the widget to get the position
- *
- * It returns the position to popup a menu in a TreeView.
- */
void
gtranslator_utils_menu_position_under_tree_view (GtkMenu *menu,
- gint *x,
- gint *y,
- gboolean *push_in,
- gpointer user_data)
+ gint *x,
+ gint *y,
+ gboolean *push_in,
+ gpointer user_data)
{
GtkTreeView *tree = GTK_TREE_VIEW (user_data);
GtkTreeModel *model;
@@ -306,7 +155,7 @@
* of error it returns FALSE and sets error_widget to a GtkLabel containing
* the error message to display.
*
- * Returns: FALSE if an error occurs, TRUE on success.
+ * Returns FALSE if an error occurs, TRUE on success.
*/
gboolean
gtranslator_utils_get_glade_widgets (const gchar *filename,
@@ -460,6 +309,7 @@
/**
* gtranslator_utils_drop_get_uris:
* @selection_data: the #GtkSelectionData from drag_data_received
+ * @info: the info from drag_data_received
*
* Create a list of valid uri's from a uri-list drop.
*
@@ -467,27 +317,31 @@
* were no valid uris. g_strfreev should be used when the
* string array is no longer used
*/
-GSList *
-gtranslator_utils_drop_get_locations (GtkSelectionData *selection_data)
+gchar **
+gtranslator_utils_drop_get_uris (GtkSelectionData *selection_data)
{
gchar **uris;
gint i;
- GSList *locations = NULL;
+ gint p = 0;
+ gchar **uri_list;
uris = g_uri_list_extract_uris ((gchar *) selection_data->data);
+ uri_list = g_new0(gchar *, g_strv_length (uris) + 1);
for (i = 0; uris[i] != NULL; i++)
{
- GFile *file;
/* Silently ignore malformed URI/filename */
if (gtranslator_utils_is_valid_uri (uris[i]))
- {
- file = g_file_new_for_uri (uris[i]);
- locations = g_slist_prepend (locations, file);
- }
+ uri_list[p++] = g_strdup (uris[i]);
}
- return locations;
+ if (*uri_list == NULL)
+ {
+ g_free(uri_list);
+ return NULL;
+ }
+
+ return uri_list;
}
gchar *
@@ -662,20 +516,11 @@
return ret;
}
-/**
- * gtranslator_utils_activate_url:
- * @dialog: a #GtkAboutDialog
- * @url: the url to show
- * @data: useless data variable
- *
- * Shows the corresponding @url in the default browser.
- */
void
gtranslator_utils_activate_url (GtkAboutDialog *dialog,
const gchar *url,
gpointer data)
{
- //FIXME: gtk_url_show deprecates this func.
gchar *open[3];
if (g_find_program_in_path ("xdg-open"))
@@ -696,48 +541,6 @@
NULL, NULL, NULL);
}
-/**
- * gtranslator_utils_activate_email:
- * @dialog: a #GtkAboutDialog
- * @email: the email to show
- * @data: useless data variable
- *
- * Shows the corresponding @email in the default mailer.
- */
-void
-gtranslator_utils_activate_email (GtkAboutDialog *dialog,
- const gchar *email,
- gpointer data)
-{
- //FIXME: gtk_url_show deprecates this func.
- gchar *open[3];
-
- if (g_find_program_in_path ("xdg-email"))
- {
- open[0] = "xdg-email";
- }
- else return;
-
- open[1] = (gchar *)email;
- open[2] = NULL;
-
- gdk_spawn_on_screen (gdk_screen_get_default (),
- NULL,
- open,
- NULL,
- G_SPAWN_SEARCH_PATH,
- NULL,
- NULL, NULL, NULL);
-}
-
-/**
- * gtranslator_utils_help_display:
- * @parent: a #GtkWindow
- * @doc_id: the name of the type of doc
- * @file_name: the name of the doc
- *
- * Shows the help for an specific document in the default help browser.
- */
void
gtranslator_utils_help_display (GtkWindow *parent,
const gchar *doc_id,
@@ -803,13 +606,6 @@
g_free (command);
}
-/**
- * gtranslator_utils_get_user_config_dir:
- *
- * Returns the default config dir for gtranslator.
- *
- * Returns: the config dir for gtranslator.
- */
gchar *
gtranslator_utils_get_user_config_dir (void)
{
@@ -817,107 +613,3 @@
"gtranslator",
NULL);
}
-
-gchar *gtranslator_utils_get_current_date (void)
-{
- time_t now;
- struct tm *now_here;
- gchar *date = g_malloc (11);
-
- now = time(NULL);
- now_here = localtime(&now);
- strftime(date, 11, "%Y-%m-%d", now_here);
-
- return date;
-}
-
-gchar *gtranslator_utils_get_current_time (void)
-{
- time_t now;
- struct tm *now_here;
- gchar *t = g_malloc (11);
-
- now = time(NULL);
- now_here = localtime(&now);
- strftime(t, 11, "%H:%M%z", now_here);
-
- return t;
-}
-
-gchar *gtranslator_utils_get_current_year (void)
-{
- time_t now;
- struct tm *now_here;
- gchar *year=g_malloc (5);
-
- now = time(NULL);
- now_here = localtime(&now);
- strftime(year, 5, "%Y", now_here);
-
- return year;
-}
-
-/**
- * gtranslator_utils_scan_dir:
- * @dir: the dir to parse
- * @list: the list where to store the GFiles
- * @po_name: the name of the specific po file to search or NULL.
- *
- * Scans the directory and subdirectories of @dir looking for filenames remained
- * with .po or files that matches @po_name. The contents of @list must be freed with
- * g_slist_foreach (list, (GFunc)g_object_unref, NULL).
- */
-void
-gtranslator_utils_scan_dir (GFile *dir,
- GSList **list,
- const gchar *po_name)
-{
- GFileInfo *info;
- GError *error;
- GFile *file;
- GFileEnumerator *enumerator;
-
- error = NULL;
- enumerator = g_file_enumerate_children (dir,
- G_FILE_ATTRIBUTE_STANDARD_NAME,
- G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
- NULL,
- &error);
- if (enumerator)
- {
- error = NULL;
-
- while ((info = g_file_enumerator_next_file (enumerator, NULL, &error)) != NULL)
- {
- const gchar *name;
- gchar *filename;
-
- name = g_file_info_get_name (info);
- file = g_file_get_child (dir, name);
-
- if (po_name != NULL)
- {
- if (g_str_has_suffix (po_name, ".po"))
- filename = g_strdup (po_name);
- else
- filename = g_strconcat (po_name, ".po", NULL);
- }
- else
- filename = g_strdup (".po");
-
- if (g_str_has_suffix (name, filename))
- *list = g_slist_prepend (*list, file);
- g_free (filename);
-
- gtranslator_utils_scan_dir (file, list, po_name);
- g_object_unref (info);
- }
- g_file_enumerator_close (enumerator, NULL, NULL);
- g_object_unref (enumerator);
-
- if (error)
- {
- g_warning (error->message);
- }
- }
-}
\ No newline at end of file
Modified: trunk/src/utils.h
==============================================================================
--- trunk/src/utils.h (original)
+++ trunk/src/utils.h Tue Sep 16 09:52:02 2008
@@ -25,9 +25,6 @@
#include <gtk/gtkaboutdialog.h>
#include <gtk/gtkwindow.h>
#include <libxml/tree.h>
-#include <gio/gio.h>
-
-gchar ** gtranslator_utils_split_string_in_words (const gchar *string);
xmlDocPtr gtranslator_xml_new_doc (const gchar *name);
@@ -54,7 +51,7 @@
const gchar *widget_name,
...)G_GNUC_NULL_TERMINATED;
-GSList *gtranslator_utils_drop_get_locations (GtkSelectionData *selection_data);
+gchar **gtranslator_utils_drop_get_uris (GtkSelectionData *selection_data);
gchar *gtranslator_utils_escape_search_text (const gchar* text);
@@ -68,10 +65,6 @@
void gtranslator_utils_activate_url (GtkAboutDialog *dialog,
const gchar *url,
gpointer data);
-
-void gtranslator_utils_activate_email (GtkAboutDialog *dialog,
- const gchar *email,
- gpointer data);
void gtranslator_utils_help_display (GtkWindow *parent,
const gchar *doc_id,
@@ -79,14 +72,4 @@
gchar *gtranslator_utils_get_user_config_dir (void);
-gchar *gtranslator_utils_get_current_date (void);
-
-gchar *gtranslator_utils_get_current_time (void);
-
-gchar *gtranslator_utils_get_current_year (void);
-
-void gtranslator_utils_scan_dir (GFile *dir,
- GSList **list,
- const gchar *po_name);
-
#endif
Modified: trunk/src/view.c
==============================================================================
--- trunk/src/view.c (original)
+++ trunk/src/view.c Tue Sep 16 09:52:02 2008
@@ -40,12 +40,19 @@
#include <gtksourceview/gtksourcelanguagemanager.h>
#include <gtksourceview/gtksourceiter.h>
#include <gtksourceview/gtksourcebuffer.h>
-#include <gtksourceview/gtksourcestyleschememanager.h>
+//#undef HAVE_GTKSPELL
#ifdef HAVE_GTKSPELL
#include <gtkspell/gtkspell.h>
#endif
+#undef HAVE_SPELL_CHECK
+#ifdef HAVE_SPELL_CHECK
+#include <gtkspellcheck/client.h>
+#include <gtkspellcheck/manager.h>
+#include <gtkspellcheck/textviewclient.h>
+#endif
+
#define GTR_VIEW_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ( \
(object), \
GTR_TYPE_VIEW, \
@@ -63,6 +70,11 @@
#ifdef HAVE_GTKSPELL
GtkSpell *spell;
#endif
+
+#ifdef HAVE_SPELL_CHECK
+ GtkSpellCheckClient *client;
+ GtkSpellCheckManager *manager;
+#endif
};
@@ -89,6 +101,19 @@
}
}
#endif
+
+#ifdef HAVE_SPELL_CHECK
+static void
+gtranslator_attach_spellcheck(GtranslatorView *view)
+{
+ view->priv->client = GTK_SPELL_CHECK_CLIENT(gtk_spell_check_text_view_client_new(GTK_TEXT_VIEW(view)));
+ view->priv->manager = gtk_spell_check_manager_new(NULL, TRUE);
+
+ gtk_spell_check_manager_attach(view->priv->manager,
+ view->priv->client);
+}
+#endif
+
static void
gtranslator_view_init (GtranslatorView *view)
@@ -112,7 +137,7 @@
++temp)
g_ptr_array_add(dirs, g_strdup(*temp));
- g_ptr_array_add(dirs, g_strdup(PKGDATADIR));
+ g_ptr_array_add(dirs, g_strdup(DATADIR));
g_ptr_array_add(dirs, NULL);
langs = (gchar **)g_ptr_array_free(dirs, FALSE);
@@ -151,11 +176,6 @@
{
gtranslator_view_set_font (view, TRUE, NULL);
}
-
- /*
- * Set scheme color according to preferences
- */
- gtranslator_view_reload_scheme_color (view);
}
static void
@@ -174,32 +194,17 @@
object_class->finalize = gtranslator_view_finalize;
}
-/**
- * gtranslator_view_new:
- *
- * Creates a new #GtranslatorView. An empty default buffer will be created for you.
- *
- * Returns: a new #GtranslatorView
- */
GtkWidget *
gtranslator_view_new (void)
{
GtkWidget *view;
view = GTK_WIDGET (g_object_new (GTR_TYPE_VIEW, NULL));
+ gtk_widget_show_all(view);
return view;
}
-/**
- * gtranslator_view_get_selected_text:
- * @view: a #GtranslatorView
- * @selected_text: it stores the text selected in the #GtranslatorView
- * @len: it stores the length of the @selected_text
- *
- * Gets the selected text region of the #GtranslatorView
- *
- * Returns: TRUE if the @selected_text was got correctly.
- */
+
gboolean
gtranslator_view_get_selected_text (GtranslatorView *view,
gchar **selected_text,
@@ -246,6 +251,13 @@
#ifdef HAVE_GTKSPELL
gtranslator_attach_gtkspell(view);
#endif
+#ifdef HAVE_SPELL_CHECK
+ if(!view->priv->manager)
+ gtranslator_attach_spellcheck(view);
+ else
+ gtk_spell_check_manager_set_active(view->priv->manager,
+ TRUE);
+#endif
}
else
{
@@ -254,6 +266,12 @@
return;
gtkspell_detach(view->priv->spell);
#endif
+#ifdef HAVE_SPELL_CHECK
+ if(!view->priv->manager)
+ return;
+ gtk_spell_check_manager_set_active(view->priv->manager,
+ FALSE);
+#endif
}
}
@@ -282,13 +300,6 @@
gtk_widget_queue_draw (GTK_WIDGET (view));
}
-/**
- * gtranslator_view_cut_clipboard:
- * @view: a #GtranslatorView
- *
- * Copies the currently-selected text to a clipboard,
- * then deletes said text if it's editable.
- */
void
gtranslator_view_cut_clipboard (GtranslatorView *view)
{
@@ -317,12 +328,6 @@
0.0);
}
-/**
- * gtranslator_view_copy_clipboard:
- * @view: a #GtranslatorView
- *
- * Copies the currently-selected text to a clipboard.
- */
void
gtranslator_view_copy_clipboard (GtranslatorView *view)
{
@@ -342,13 +347,6 @@
/* on copy do not scroll, we are already on screen */
}
-/**
- * gtranslator_view_cut_clipboard:
- * @view: a #GtranslatorView
- *
- * Pastes the contents of a clipboard at the insertion point,
- * or at override_location.
- */
void
gtranslator_view_paste_clipboard (GtranslatorView *view)
{
@@ -409,13 +407,8 @@
}
-/**
- * gtranslator_view_set_search_text:
- * @view: a #GtranslatorView
- * @text: the text to set for searching
- * @flags: a #GtranslatorSearchFlags
- *
- * Stores the text to search for in the @view with some specific @flags.
+/*
+ * Search funcs
*/
void
gtranslator_view_set_search_text (GtranslatorView *view,
@@ -476,21 +469,14 @@
&begin,
&end);
}*/
+
+ if (notify)
+ g_object_notify (G_OBJECT (doc), "can-search-again");
}
-/**
- * gtranslator_view_get_search_text:
- * @view: a #GtranslatorView
- * @flags: the #GtranslatorSearchFlags of the stored text.
- *
- * Returns the text to search for it and the #GtranslatorSearchFlags of that
- * text.
- *
- * Returns: the text to search for it.
- */
gchar *
gtranslator_view_get_search_text (GtranslatorView *view,
- guint *flags)
+ guint *flags)
{
g_return_val_if_fail (GTR_IS_VIEW (view), NULL);
@@ -500,12 +486,6 @@
return gtranslator_utils_escape_search_text (view->priv->search_text);
}
-/**
- * gtranslator_view_get_can_search_again:
- * @view: a #GtranslatorView
- *
- * Returns: TRUE if it can search again
- */
gboolean
gtranslator_view_get_can_search_again (GtranslatorView *view)
{
@@ -515,24 +495,8 @@
(*view->priv->search_text != '\0'));
}
-/**
- * gtranslator_view_search_forward:
- * @view: a #GtranslatorView
- * @start: start of search
- * @end: bound for the search, or %NULL for the end of the buffer
- * @match_start: return location for start of match, or %NULL
- * @match_end: return location for end of match, or %NULL
- *
- * Searches forward for str. Any match is returned by setting match_start to the
- * first character of the match and match_end to the first character after the match.
- * The search will not continue past limit.
- * Note that a search is a linear or O(n) operation, so you may wish to use limit
- * to avoid locking up your UI on large buffers.
- *
- * Returns: whether a match was found
- */
gboolean
-gtranslator_view_search_forward (GtranslatorView *view,
+gtranslator_view_search_forward (GtranslatorView *view,
const GtkTextIter *start,
const GtkTextIter *end,
GtkTextIter *match_start,
@@ -603,25 +567,9 @@
return found;
}
-
-/**
- * gtranslator_view_search_backward:
- * @view: a #GtranslatorView
- * @start: start of search
- * @end: bound for the search, or %NULL for the end of the buffer
- * @match_start: return location for start of match, or %NULL
- * @match_end: return location for end of match, or %NULL
- *
- * Searches backward for str. Any match is returned by setting match_start to the
- * first character of the match and match_end to the first character after the match.
- * The search will not continue past limit.
- * Note that a search is a linear or O(n) operation, so you may wish to use limit
- * to avoid locking up your UI on large buffers.
- *
- * Returns: whether a match was found
- */
+
gboolean
-gtranslator_view_search_backward (GtranslatorView *view,
+gtranslator_view_search_backward (GtranslatorView *view,
const GtkTextIter *start,
const GtkTextIter *end,
GtkTextIter *match_start,
@@ -693,18 +641,6 @@
return found;
}
-/**
- * gtranslator_view_replace_all:
- * @view: a #GtranslatorView
- * @find: the text to find
- * @replace: the text to replace @find
- * @flags: a #GtranslatorSearchFlags
- *
- * Replaces all matches of @find with @replace and returns the number of
- * replacements.
- *
- * Returns: the number of replacements made it.
- */
gint
gtranslator_view_replace_all (GtranslatorView *view,
const gchar *find,
@@ -808,27 +744,3 @@
return cont;
}
-
-/**
- * gtranslator_view_reload_scheme_color:
- * @view: a #GtranslatorView
- *
- * Reloads the gtksourceview scheme color. Neccessary when the scheme color
- * changes.
- */
-void
-gtranslator_view_reload_scheme_color (GtranslatorView *view)
-{
- GtkSourceBuffer *buf;
- GtkSourceStyleScheme *scheme;
- GtkSourceStyleSchemeManager *manager;
- const gchar *scheme_id;
-
- buf = GTK_SOURCE_BUFFER (gtk_text_view_get_buffer (GTK_TEXT_VIEW (view)));
- manager = gtk_source_style_scheme_manager_get_default ();
-
- scheme_id = gtranslator_prefs_manager_get_scheme_color ();
- scheme = gtk_source_style_scheme_manager_get_scheme (manager, scheme_id);
-
- gtk_source_buffer_set_style_scheme (buf, scheme);
-}
\ No newline at end of file
Modified: trunk/src/view.h
==============================================================================
--- trunk/src/view.h (original)
+++ trunk/src/view.h Tue Sep 16 09:52:02 2008
@@ -108,8 +108,6 @@
gchar *gtranslator_view_get_search_text (GtranslatorView *view,
guint *flags);
-void gtranslator_view_reload_scheme_color (GtranslatorView *view);
-
/* Search macros */
#define GTR_SEARCH_IS_DONT_SET_FLAGS(sflags) ((sflags & GTR_SEARCH_DONT_SET_FLAGS) != 0)
Modified: trunk/src/window.c
==============================================================================
--- trunk/src/window.c (original)
+++ trunk/src/window.c Tue Sep 16 09:52:02 2008
@@ -46,11 +46,6 @@
#include <glib/gi18n.h>
#include <gtk/gtk.h>
-#define GTR_STOCK_FUZZY_NEXT "gtranslator-fuzzy-next"
-#define GTR_STOCK_FUZZY_PREV "gtranslator-fuzzy-prev"
-#define GTR_STOCK_UNTRANS_NEXT "gtranslator-untranslated-next"
-#define GTR_STOCK_UNTRANS_PREV "gtranslator-untranslated-prev"
-
#define GTR_WINDOW_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ( \
(object), \
GTR_TYPE_WINDOW, \
@@ -79,12 +74,12 @@
GHashTable *widgets;
GtkWidget *statusbar;
+ guint generic_message_cid;
+ guint tip_message_cid;
GtkUIManager *ui_manager;
GtkRecentManager *recent_manager;
GtkWidget *recent_menu;
-
- GtkWidget *tm_menu;
gint width;
gint height;
@@ -113,6 +108,9 @@
{ "FileOpen", GTK_STOCK_OPEN, NULL, "<control>O",
N_("Open a PO file"),
G_CALLBACK (gtranslator_open_file_dialog) },
+ { "FileOpenUri", NULL, N_("Open _Location..."), NULL,
+ N_("Open a PO file from a given URI"), NULL},
+ // G_CALLBACK (gtranslator_open_uri_dialog) },
{ "FileRecentFiles", NULL, N_("_Recent Files"), NULL,
NULL, NULL },
{ "FileQuitWindow", GTK_STOCK_QUIT, NULL, "<control>Q",
@@ -130,7 +128,7 @@
/* Help menu */
{ "HelpContents", GTK_STOCK_HELP, N_("_Contents"), "F1", NULL,
- G_CALLBACK (gtranslator_cmd_help_contents) },
+ NULL },
{ "HelpAbout", GTK_STOCK_ABOUT, NULL, NULL, NULL,
G_CALLBACK (gtranslator_about_dialog) },
};
@@ -170,8 +168,8 @@
N_("Paste the contents of the clipboard"),
G_CALLBACK (gtranslator_actions_edit_paste) },
{ "EditClear", GTK_STOCK_CLEAR, NULL, NULL,
- N_("Clear the selected translation"),
- G_CALLBACK (gtranslator_actions_edit_clear) },
+ N_("Clear the selected translation"), NULL},
+ // G_CALLBACK (gtranslator_selection_clear) },
{ "EditHeader", GTK_STOCK_PROPERTIES, N_("_Header..."), NULL, NULL,
G_CALLBACK (gtranslator_actions_edit_header) },
{ "EditComment", GTK_STOCK_INDEX, N_("C_omment..."), NULL,
@@ -183,19 +181,11 @@
{ "EditFuzzy", NULL, N_("Toggle _Fuzzy Status"), "<control>U",
N_("Toggle fuzzy status of a message"),
G_CALLBACK (gtranslator_message_status_toggle_fuzzy) },
- { "EditTranslationMemory", NULL, N_("_Translation Memory"), NULL, NULL, NULL},
-
-
+
/* View menu */
- { "ViewContext", NULL, N_("_Context"), "<control>J",
- N_("Show the Context panel"),
- G_CALLBACK (gtranslator_actions_view_context) },
- { "ViewTranslationMemory", NULL, N_("_Translation Memory"), "<control>K",
- N_("Show the Translation Memory panel"),
- G_CALLBACK (gtranslator_actions_view_translation_memory) },
- /*{ "ViewSidePane", NULL, N_("Side _Pane"), "F9",
+ { "ViewSidePane", NULL, N_("Side _Pane"), "F9",
N_("Show or hide the side pane in the current window"),
- NULL },*/
+ NULL },
/* Bookmarks menu */
/*{ "BookmarksAdd", GTK_STOCK_ADD, N_("_Add Bookmark"), "<control>D",
@@ -229,38 +219,32 @@
{ "GoLast", GTK_STOCK_GOTO_LAST, NULL, NULL,
N_("Go to the last message"),
G_CALLBACK (gtranslator_message_go_to_last) },
- { "GoNextFuzzy", GTR_STOCK_FUZZY_NEXT, N_("Next Fuz_zy"),
+ { "GoJumpTo", GTK_STOCK_JUMP_TO, NULL, NULL,
+ N_("Go to specified message number"), NULL},
+ //G_CALLBACK (gtranslator_go_to_dialog) },
+ { "GoNextFuzzy", GTK_STOCK_GO_FORWARD, N_("Next Fuz_zy"),
"<control>Page_Down", N_("Go to the next fuzzy message"),
G_CALLBACK (gtranslator_message_go_to_next_fuzzy) },
- { "GoPreviousFuzzy", GTR_STOCK_FUZZY_PREV, N_("Previous Fuzz_y"),
+ { "GoPreviousFuzzy", GTK_STOCK_GO_BACK, N_("Previous Fuzz_y"),
"<control>Page_Up", N_("Go to the previous fuzzy message"),
G_CALLBACK (gtranslator_message_go_to_prev_fuzzy) },
- { "GoNextUntranslated", GTR_STOCK_UNTRANS_NEXT, N_("Next _Untranslated"),
+ { "GoNextUntranslated", GTK_STOCK_GO_FORWARD, N_("Next _Untranslated"),
"<alt>Page_Down", N_("Go to the next untranslated message"),
G_CALLBACK (gtranslator_message_go_to_next_untranslated) },
- { "GoPreviousUntranslated", GTR_STOCK_UNTRANS_PREV, N_("Previ_ous Untranslated"),
+ { "GoPreviousUntranslated", GTK_STOCK_GO_BACK, N_("Previ_ous Untranslated"),
"<alt>Page_Up", N_("Go to the previous untranslated message"),
G_CALLBACK (gtranslator_message_go_to_prev_untranslated) },
- { "GoNextFuzzyUntranslated", GTK_STOCK_GO_FORWARD, N_("Next Fu_zzy or Untranslated"),
- "<control><shift>Page_Down", N_("Go to the next fuzzy or untranslated message"),
- G_CALLBACK (gtranslator_message_go_to_next_fuzzy_or_untranslated) },
- { "GoPreviousFuzzyUntranslated", GTK_STOCK_GO_BACK, N_("Pre_vious Fuzzy or Untranslated"),
- "<control><shift>Page_Up", N_("Go to the previous fuzzy or untranslated message"),
- G_CALLBACK (gtranslator_message_go_to_prev_fuzzy_or_untranslated) },
- { "GoJump", GTK_STOCK_JUMP_TO, NULL,
- "<control>G", N_("Jumps to a specific message"),
- G_CALLBACK (gtranslator_message_jump) },
/* Search menu*/
{ "SearchFind", GTK_STOCK_FIND, NULL, "<control>F",
N_("Search for text"),
G_CALLBACK(_gtranslator_actions_search_find) },
- /*{ "SearchFindNext", NULL, N_("Find Ne_xt"), NULL,
+ { "SearchFindNext", NULL, N_("Find Ne_xt"), NULL,
N_("Search forward for the same text"), NULL},
// G_CALLBACK (gtranslator_find) },
{ "SearchFindPrevious", NULL, N_("Find _Previous"), NULL,
N_("Search backward for the same text"), NULL},
- // G_CALLBACK (gtranslator_find) },*/
+ // G_CALLBACK (gtranslator_find) },
{ "SearchReplace", GTK_STOCK_FIND_AND_REPLACE, NULL, "<control>H",
N_("Search for and replace text"),
G_CALLBACK (_gtranslator_actions_search_replace) },
@@ -350,7 +334,7 @@
{
gchar *filename;
- filename = g_build_filename (PKGDATADIR"/layout.xml", NULL);
+ filename = g_build_filename (DATADIR"/layout.xml", NULL);
//DEBUG_PRINT ("Layout = %s", filename);
if (!gdl_dock_layout_load_from_file (window->priv->layout_manager,
filename))
@@ -615,16 +599,6 @@
"GoPreviousUntranslated");
gtk_action_set_sensitive (action,
gtranslator_po_get_prev_untrans(po) != NULL);
-
- action = gtk_action_group_get_action(window->priv->action_group,
- "GoNextFuzzyUntranslated");
- gtk_action_set_sensitive (action,
- gtranslator_po_get_next_fuzzy_or_untrans (po) != NULL);
-
- action = gtk_action_group_get_action(window->priv->action_group,
- "GoPreviousFuzzyUntranslated");
- gtk_action_set_sensitive (action,
- gtranslator_po_get_prev_fuzzy_or_untrans (po) != NULL);
}
static void
@@ -772,6 +746,28 @@
return GTR_WINDOW (target_window);
}
+static void
+load_uris_from_drop (GtranslatorWindow *window,
+ gchar **uri_list)
+{
+ GSList *uris = NULL;
+ gint i;
+
+ if (uri_list == NULL)
+ return;
+
+ for (i = 0; uri_list[i] != NULL; ++i)
+ {
+ uris = g_slist_prepend (uris, uri_list[i]);
+ }
+
+ uris = g_slist_reverse (uris);
+ gtranslator_actions_load_uris (window,
+ uris);
+
+ g_slist_free (uris);
+}
+
/* Handle drops on the GtranslatorWindow */
static void
drag_data_received_cb (GtkWidget *widget,
@@ -784,7 +780,7 @@
gpointer data)
{
GtranslatorWindow *window;
- GSList *locations;
+ gchar **uri_list;
window = get_drop_window (widget);
@@ -793,11 +789,9 @@
if (info == TARGET_URI_LIST)
{
- locations = gtranslator_utils_drop_get_locations (selection_data);
- gtranslator_actions_load_locations (window, locations);
-
- g_slist_foreach (locations, (GFunc)g_object_unref, NULL);
- g_slist_free (locations);
+ uri_list = gtranslator_utils_drop_get_uris(selection_data);
+ load_uris_from_drop (window, uri_list);
+ g_strfreev (uri_list);
}
}
@@ -818,42 +812,6 @@
}
static void
-set_window_title (GtranslatorWindow *window,
- gboolean with_path)
-{
- GtranslatorPo *po;
- GtranslatorPoState state;
- GtranslatorTab *active_tab;
- GFile *file;
- gchar *title;
-
- if (with_path)
- {
- po = gtranslator_tab_get_po (GTR_TAB (gtranslator_window_get_active_tab (window)));
- active_tab = gtranslator_window_get_active_tab (window);
- state = gtranslator_po_get_state (gtranslator_tab_get_po(active_tab));
- po = gtranslator_tab_get_po (active_tab);
- file = gtranslator_po_get_location (po);
-
- /*
- * Translators: The title of the window when there is only one tab
- */
- title = g_strdup_printf (_("gtranslator - %s"), g_file_get_path (file));
- if (state == GTR_PO_STATE_MODIFIED)
- title = g_strdup_printf (_("gtranslator - *%s"), g_file_get_path (file));
- else
- title = g_strdup_printf (_("gtranslator - %s"), g_file_get_path (file));
-
- g_object_unref (file);
- }
- else
- title = g_strdup (_("gtranslator"));
-
- gtk_window_set_title (GTK_WINDOW (window), title);
- g_free (title);
-}
-
-static void
notebook_switch_page(GtkNotebook *nb,
GtkNotebookPage *page,
gint page_num,
@@ -863,21 +821,11 @@
GList *msg;
GtranslatorView *view;
GtranslatorPo *po;
- gint n_pages;
tab = GTR_TAB (gtk_notebook_get_nth_page (nb, page_num));
if (tab == window->priv->active_tab)
return;
- /*
- * Set the window title
- */
- n_pages = gtk_notebook_get_n_pages (nb);
- if (n_pages == 1)
- set_window_title (window, TRUE);
- else
- set_window_title (window, FALSE);
-
window->priv->active_tab = tab;
view = gtranslator_tab_get_active_view (tab);
@@ -897,31 +845,13 @@
}
static void
-notebook_page_removed (GtkNotebook *notebook,
- GtkWidget *child,
- guint page_num,
- GtranslatorWindow *window)
-{
- gint n_pages;
-
- /*
- * Set the window title
- */
- n_pages = gtk_notebook_get_n_pages (notebook);
- if (n_pages == 1)
- set_window_title (window, TRUE);
- else
- set_window_title (window, FALSE);
-}
-
-static void
notebook_tab_close_request (GtranslatorNotebook *notebook,
GtranslatorTab *tab,
GtranslatorWindow *window)
{
/* Note: we are destroying the tab before the default handler
* seems to be ok, but we need to keep an eye on this. */
- gtranslator_close_tab (tab, window);
+ gtranslator_file_close (NULL, window);
gtranslator_plugins_engine_update_plugins_ui (gtranslator_plugins_engine_get_default (),
window, FALSE);
@@ -977,27 +907,9 @@
sync_state (GtranslatorPo *po,
GParamSpec *pspec,
GtranslatorWindow *window)
-{
- int n_pages = 0;
-
- set_sensitive_according_to_tab (window,
- gtranslator_tab_get_from_document (po));
- n_pages = gtk_notebook_get_n_pages (GTK_NOTEBOOK(window->priv->notebook));
-
- if (n_pages == 1)
- set_window_title (window, TRUE);
-}
-
-static void
-showed_message_cb (GtranslatorTab *tab,
- GtranslatorMsg *msg,
- GtranslatorWindow *window)
-{
- g_return_if_fail (GTR_IS_TAB (tab));
-
- gtranslator_window_update_statusbar_message_count (tab, msg, window);
-
- set_sensitive_according_to_message (window, gtranslator_tab_get_po (tab));
+{
+ set_sensitive_according_to_tab (window,
+ gtranslator_tab_get_from_document (po));
}
static void
@@ -1009,19 +921,9 @@
GList *views;
GtranslatorTab *tab = GTR_TAB(child);
GtkTextBuffer *buffer;
- gint n_pages;
g_return_if_fail(GTR_IS_TAB(tab));
- /*
- * Set the window title
- */
- n_pages = gtk_notebook_get_n_pages (notebook);
- if (n_pages == 1)
- set_window_title (window, TRUE);
- else
- set_window_title (window, FALSE);
-
views = gtranslator_tab_get_all_views(tab, FALSE, TRUE);
while(views)
@@ -1053,7 +955,7 @@
window);
g_signal_connect_after (child,
"showed_message",
- G_CALLBACK(showed_message_cb),
+ G_CALLBACK(gtranslator_window_update_statusbar_message_count),
window);
g_signal_connect (gtranslator_tab_get_po (tab),
@@ -1067,14 +969,21 @@
void
gtranslator_recent_add (GtranslatorWindow *window,
- GFile *location,
+ const gchar *path,
gchar *project_id)
{
GtkRecentData *recent_data;
gchar *uri;
GError *error = NULL;
- uri = g_file_get_uri (location);
+ uri = g_filename_to_uri (path, NULL, &error);
+ if (error)
+ {
+ g_warning ("Could not convert uri \"%s\" to a local path: %s",
+ uri, error->message);
+ g_error_free (error);
+ return;
+ }
recent_data = g_slice_new (GtkRecentData);
@@ -1096,6 +1005,7 @@
g_free (uri);
g_free (recent_data->app_exec);
g_slice_free (GtkRecentData, recent_data);
+
}
void
@@ -1129,21 +1039,45 @@
gtranslator_recent_chooser_item_activated_cb (GtkRecentChooser *chooser,
GtranslatorWindow *window)
{
- gchar *uri;
+ gchar *uri, *path;
GError *error = NULL;
GtkWidget *dialog;
- GSList *list = NULL;
- GFile *location;
uri = gtk_recent_chooser_get_current_uri (chooser);
- location = g_file_new_for_uri (uri);
- g_free (uri);
-
- list = g_slist_prepend (list, location);
+
+ path = g_filename_from_uri (uri, NULL, NULL);
+ if (error)
+ {
+ g_warning ("Could not convert uri \"%s\" to a local path: %s",
+ uri, error->message);
+ g_error_free (error);
+ return;
+ }
- gtranslator_actions_load_locations (window, list);
- g_slist_foreach (list, (GFunc)g_object_unref, NULL);
- g_slist_free (list);
+ /*
+ * FIXME: We have to detect if the file is already opened
+ * If it is we should display a warning dialog.
+ */
+ gtranslator_open (path, window, &error);
+ if(error)
+ {
+ /*
+ * We have to show the error in a dialog
+ */
+ dialog = gtk_message_dialog_new(GTK_WINDOW(window),
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_CLOSE,
+ error->message);
+ gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
+
+ if(error->code == GTR_PO_ERROR_FILENAME)
+ gtranslator_recent_remove (window, path);
+ }
+
+ g_free (uri);
+ g_free (path);
}
static GtkWidget *
@@ -1225,63 +1159,6 @@
}
static void
-menu_item_select_cb (GtkMenuItem *proxy,
- GtranslatorWindow *window)
-{
- GtkAction *action;
- char *message;
-
- action = g_object_get_data (G_OBJECT (proxy), "gtk-action");
- g_return_if_fail (action != NULL);
-
- g_object_get (G_OBJECT (action), "tooltip", &message, NULL);
- if (message)
- {
- gtranslator_statusbar_push_default (GTR_STATUSBAR (window->priv->statusbar),
- message);
- g_free (message);
- }
-}
-
-static void
-menu_item_deselect_cb (GtkMenuItem *proxy,
- GtranslatorWindow *window)
-{
- gtranslator_statusbar_pop_default (GTR_STATUSBAR (window->priv->statusbar));
-}
-
-static void
-connect_proxy_cb (GtkUIManager *manager,
- GtkAction *action,
- GtkWidget *proxy,
- GtranslatorWindow *window)
-{
- if (GTK_IS_MENU_ITEM (proxy))
- {
- g_signal_connect (proxy, "select",
- G_CALLBACK (menu_item_select_cb), window);
- g_signal_connect (proxy, "deselect",
- G_CALLBACK (menu_item_deselect_cb), window);
- }
-}
-
-static void
-disconnect_proxy_cb (GtkUIManager *manager,
- GtkAction *action,
- GtkWidget *proxy,
- GtranslatorWindow *window)
-{
- if (GTK_IS_MENU_ITEM (proxy))
- {
- g_signal_handlers_disconnect_by_func
- (proxy, G_CALLBACK (menu_item_select_cb), window);
- g_signal_handlers_disconnect_by_func
- (proxy, G_CALLBACK (menu_item_deselect_cb), window);
- }
-}
-
-
-static void
side_pane_visibility_changed (GtkWidget *side_pane,
GtranslatorWindow *window)
{
@@ -1307,8 +1184,7 @@
GError *error = NULL;
GtkWidget *dockbar;
GtkWidget *hbox_dock;
- GtkWidget *tm_widget;
-
+
GtranslatorWindowPrivate *priv = window->priv;
/*
@@ -1346,22 +1222,12 @@
if (!gtk_ui_manager_add_ui_from_file (priv->ui_manager,
- PKGDATADIR"/gtranslator-ui.xml",
+ DATADIR"/gtranslator-ui.xml",
&error)) {
g_warning ("building menus failed: %s", error->message);
g_error_free (error);
}
- /* show tooltips in the statusbar */
- g_signal_connect (priv->ui_manager,
- "connect_proxy",
- G_CALLBACK (connect_proxy_cb),
- window);
- g_signal_connect (priv->ui_manager,
- "disconnect_proxy",
- G_CALLBACK (disconnect_proxy_cb),
- window);
-
priv->menubar = gtk_ui_manager_get_widget (priv->ui_manager,
"/MainMenu");
gtk_box_pack_start (GTK_BOX (priv->main_box),
@@ -1384,11 +1250,6 @@
"/MainMenu/FileMenu/FileRecentFilesMenu");
gtk_menu_item_set_submenu (GTK_MENU_ITEM (widget), priv->recent_menu);
- /*
- * Translation Memory
- */
- priv->tm_menu= gtk_ui_manager_get_widget (priv->ui_manager,
- "/MainMenu/EditMenu/EditTranslationMemory");
/*
* Toolbar
@@ -1441,8 +1302,6 @@
G_CALLBACK(notebook_switch_page), window);
g_signal_connect(priv->notebook, "page-added",
G_CALLBACK(notebook_tab_added), window);
- g_signal_connect (priv->notebook, "page-removed",
- G_CALLBACK (notebook_page_removed), window);
g_signal_connect (priv->notebook,
"tab_close_request",
G_CALLBACK (notebook_tab_close_request),
@@ -1459,6 +1318,11 @@
*/
window->priv->statusbar = gtranslator_statusbar_new ();
+ window->priv->generic_message_cid = gtk_statusbar_get_context_id
+ (GTK_STATUSBAR (window->priv->statusbar), "generic_message");
+ window->priv->tip_message_cid = gtk_statusbar_get_context_id
+ (GTK_STATUSBAR (window->priv->statusbar), "tip_message");
+
gtk_box_pack_end (GTK_BOX (hbox),
window->priv->statusbar,
TRUE,
@@ -1652,53 +1516,26 @@
/***************************** Public funcs ***********************************/
-/**
- * gtranslator_window_create_tab:
- * @window: a #GtranslatorWindow
- * @po: a #GtranslatorPo
- *
- * Adds a new #GtranslatorTab to the #GtranslatorNotebook and returns the
- * #GtranslatorTab.
- *
- * Returns: a new #GtranslatorTab object
- */
GtranslatorTab *
gtranslator_window_create_tab(GtranslatorWindow *window,
GtranslatorPo *po)
{
GtranslatorTab *tab;
-
+
tab = gtranslator_tab_new(po);
gtk_widget_show(GTK_WIDGET(tab));
-
+
gtranslator_notebook_add_page(GTR_NOTEBOOK(window->priv->notebook),
tab);
-
return tab;
}
-/**
- * gtranslator_window_get_active_tab:
- * @window: a #GtranslatorWindow
- *
- * Gets the active #GtranslatorTab of the @window.
- *
- * Returns: the active #GtranslatorTab of the @window.
- */
GtranslatorTab *
gtranslator_window_get_active_tab(GtranslatorWindow *window)
{
return gtranslator_notebook_get_page(GTR_NOTEBOOK(window->priv->notebook));
}
-/**
- * gtranslator_window_get_all_tabs:
- * @window: a #GtranslatorWindow
- *
- * Gets a list of all tabs in the @window or NULL if there is no tab opened.
- *
- * Returns: a list of all tabs in the @window or NULL if there is no tab opened.
- */
GList *
gtranslator_window_get_all_tabs(GtranslatorWindow *window)
{
@@ -1718,16 +1555,6 @@
return toret;
}
-/**
- * gtranslator_window_get_header_from_active_tab:
- * @window: a #GtranslatorWindow
- *
- * Gets the #GtranslatorHeader of the #GtranslatorPo of in the active
- * #GtranslatorTab.
- *
- * Returns: the #GtranslatorHeader of the #GtranslatorPo of in the active
- * #GtranslatorTab
- */
GtranslatorHeader *
gtranslator_window_get_header_from_active_tab(GtranslatorWindow *window)
{
@@ -1747,42 +1574,18 @@
return header;
}
-/**
- * gtranslator_window_get_notebook:
- * @window: a #GtranslatorWindow
- *
- * Gets the main #GtranslatorNotebook of the @window.
- *
- * Returns: the #GtranslatorNotebook of the @window
- */
GtranslatorNotebook *
gtranslator_window_get_notebook(GtranslatorWindow *window)
{
return GTR_NOTEBOOK(window->priv->notebook);
}
-/**
- * gtranslator_window_get_statusbar:
- * @window: a #GtranslatorWindow
- *
- * Gets the statusbar widget of the window.
- *
- * Returns: the statusbar widget of the window
- */
GtkWidget *
gtranslator_window_get_statusbar(GtranslatorWindow *window)
{
return window->priv->statusbar;
}
-/**
- * gtranslator_window_get_ui_manager:
- * @window: a #GtranslatorWindow
- *
- * Gets the #GtkUIManager of the window.
- *
- * Returns: the #GtkUIManager of the @window
- */
GtkUIManager *
gtranslator_window_get_ui_manager(GtranslatorWindow *window)
{
@@ -1793,10 +1596,7 @@
* gtranslator_window_get_active_view:
* @window: a #GtranslationWindow
*
- * Gets the active translation view in the #GtranslationWindow or
- * NULL if there is not tab opened.
- *
- * Returns: the active translation view in the #GtranslationWindow or
+ * Return value: the active translation view in the #GtranslationWindow or
* NULL if there is not tab opened.
**/
GtranslatorView *
@@ -1849,18 +1649,6 @@
return views;
}
-/**
- * gtranslator_window_add_widget:
- * @window: a #GtranslatorWindow
- * @widget: the widget to add in the window
- * @name: the name of the widged
- * @title: the title
- * @stock_id: the stock id for the icon
- * @placement: a #GtranslatorWindowPlacement
- *
- * Adds a new widget to the @window in the placement you prefer with and
- * specific name, title and icon you want.
- */
void
gtranslator_window_add_widget (GtranslatorWindow *window,
GtkWidget *widget,
@@ -1875,13 +1663,6 @@
placement, FALSE, NULL);
}
-/**
- * gtranslator_window_remove_widget:
- * @window: a #GtranslatorWindow
- * @widget: the widget to remove
- *
- * Removes from the @window the @widget if it exists.
- */
void
gtranslator_window_remove_widget (GtranslatorWindow *window,
GtkWidget *widget)
@@ -1890,14 +1671,6 @@
remove_widget (window, widget, NULL);
}
-/**
- * _gtranslator_window_get_layout_manager:
- * @window: a #GtranslatorWindow
- *
- * Gets the GDL layout manager of the window.
- *
- * Returns: the GDL layout manager of the window.
- */
GObject *
_gtranslator_window_get_layout_manager (GtranslatorWindow *window)
{
@@ -1906,53 +1679,39 @@
return G_OBJECT (window->priv->layout_manager);
}
-/**
- * gtranslator_window_get_tab_from_uri:
- * @window: a #GtranslatorWindow
- * @location: the GFile of the po file of the #GtranslatorTab
- *
- * Gets the #GtranslatorTab of the #GtranslatorWindows that matches with the
- * @location.
- *
- * Returns: the #GtranslatorTab which @location matches with its po file.
- */
GtkWidget *
-gtranslator_window_get_tab_from_location (GtranslatorWindow *window,
- GFile *location)
+gtranslator_window_get_tab_from_uri (GtranslatorWindow *window,
+ const gchar *uri)
{
- GList *tabs, *l;
+ GList *tabs;
GtranslatorPo *po;
- GFile *po_location;
+ const gchar *po_uri;
g_return_if_fail (GTR_IS_WINDOW (window));
+
+ gchar *good_uri = g_filename_from_uri (uri, NULL, NULL);
tabs = gtranslator_window_get_all_tabs (window);
- for (l = tabs; l != NULL; l = g_list_next (l))
+ while (tabs != NULL)
{
- po = gtranslator_tab_get_po (GTR_TAB (l->data));
+ po = gtranslator_tab_get_po (GTR_TAB (tabs->data));
- po_location = gtranslator_po_get_location (po);
-
- if (g_file_equal (location, po_location) == TRUE)
+ po_uri = gtranslator_po_get_filename (po);
+
+ if (g_utf8_collate (good_uri, po_uri) == 0)
{
- g_object_unref (po_location);
-
- return l->data;
+ g_free (good_uri);
+ return tabs->data;
}
- g_object_unref (po_location);
+
+ tabs = tabs->next;
}
+ g_free (good_uri);
return NULL;
}
-/**
- * gtranslator_window_set_active_tab:
- * @window: a #GtranslatorWindow
- * @tab: a #GtranslatorTab
- *
- * Sets the active tab for the @window.
- */
void
gtranslator_window_set_active_tab (GtranslatorWindow *window,
GtkWidget *tab)
@@ -1966,14 +1725,6 @@
page);
}
-/**
- * _gtranslator_window_close_tab:
- * @window: a #GtranslatorWindow
- * @tab: a #GtranslatorTab
- *
- * Closes the opened @tab of the @window and sets the right sensitivity of the
- * widgets.
- */
void
_gtranslator_window_close_tab (GtranslatorWindow *window,
GtranslatorTab *tab)
@@ -1985,13 +1736,7 @@
i = gtk_notebook_page_num (GTK_NOTEBOOK (window->priv->notebook),
GTK_WIDGET (tab));
if (i != -1)
- gtranslator_notebook_remove_page (GTR_NOTEBOOK (window->priv->notebook), i);
+ gtk_notebook_remove_page (GTK_NOTEBOOK (window->priv->notebook), i);
set_sensitive_according_to_window (window);
}
-
-GtkWidget
-*gtranslator_window_get_tm_menu (GtranslatorWindow *window)
-{
- return window->priv->tm_menu;
-}
Modified: trunk/src/window.h
==============================================================================
--- trunk/src/window.h (original)
+++ trunk/src/window.h Tue Sep 16 09:52:02 2008
@@ -122,9 +122,8 @@
GObject * _gtranslator_window_get_layout_manager
(GtranslatorWindow *window);
-GtkWidget *gtranslator_window_get_tab_from_location
- (GtranslatorWindow *window,
- GFile *location);
+GtkWidget *gtranslator_window_get_tab_from_uri (GtranslatorWindow *window,
+ const gchar *uri);
void gtranslator_window_set_active_tab (GtranslatorWindow *window,
GtkWidget *tab);
@@ -132,8 +131,6 @@
void _gtranslator_window_close_tab (GtranslatorWindow *window,
GtranslatorTab *tab);
-GtkWidget *gtranslator_window_get_tm_menu (GtranslatorWindow *window);
-
G_END_DECLS
#endif /* __WINDOW_H__ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
