[gtranslator] Port source code view plugin to gsettings.
- From: Ignacio Casal Quinteiro <icq src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtranslator] Port source code view plugin to gsettings.
- Date: Tue, 7 Sep 2010 22:51:41 +0000 (UTC)
commit 8d24bbd6550050f9f79895bf72a6e5925485fdc8
Author: Ignacio Casal Quinteiro <icq gnome org>
Date: Tue Sep 7 21:11:36 2010 +0200
Port source code view plugin to gsettings.
INSTALL | 243 +++++++++++++++-----
configure.ac | 1 +
plugins/source-code-view/Makefile.am | 6 +
.../gtr-source-code-view-dialog.ui | 27 +--
.../source-code-view/gtr-source-code-view-plugin.c | 139 +++---------
...ator.plugins.source-code-view.gschema.xml.in.in | 19 ++
6 files changed, 251 insertions(+), 184 deletions(-)
---
diff --git a/INSTALL b/INSTALL
index 23e5f25..7d1c323 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,16 +1,25 @@
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, 2007, 2008, 2009 Free Software Foundation, Inc.
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
+ Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved. This file is offered as-is,
+without warranty of any kind.
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. Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below. The lack of an optional feature in a given package is not
+necessarily a bug. More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
@@ -23,9 +32,9 @@ debugging `configure').
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,30 +44,37 @@ some point `config.cache' contains results you don't want to keep, you
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:
+ 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.
3. Optionally, type `make check' to run any self-tests that come with
- the package.
+ the package, generally using the just-built uninstalled binaries.
4. Type `make install' to install the programs and any data files and
- documentation.
-
- 5. You can remove the program binaries and object files from the
+ documentation. When installing into a prefix owned by root, it is
+ recommended that the package be configured and built as a regular
+ user, and only the `make install' phase executed with root
+ privileges.
+
+ 5. Optionally, type `make installcheck' to repeat any self-tests, but
+ this time using the binaries in their final installed location.
+ This target does not install anything. Running this target as a
+ regular user, particularly if the prior `make install' required
+ root privileges, verifies that the installation completed
+ correctly.
+
+ 6. You can remove the program binaries and object files from the
source code directory by typing `make clean'. To also remove the
files that `configure' created (so you can compile the package for
a different kind of computer), type `make distclean'. There is
@@ -67,45 +83,69 @@ The simplest way to compile this package is:
all sorts of other programs in order to regenerate files that came
with the distribution.
+ 7. Often, you can also type `make uninstall' to remove the installed
+ files again. In practice, not all packages have tested that
+ uninstallation works correctly, even though it is required by the
+ GNU Coding Standards.
+
+ 8. Some packages, particularly those that use Automake, provide `make
+ distcheck', which can by used by developers to test that all other
+ targets like `make install' and `make uninstall' work correctly.
+ This target is generally not run by end users.
+
Compilers and Options
=====================
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about. Run `./configure --help' for
-details on some of the pertinent environment variables.
+ Some systems require unusual options for compilation or linking that
+the `configure' script does not know about. Run `./configure --help'
+for details on some of the pertinent environment variables.
You can give `configure' initial values for configuration parameters
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.
Compiling For Multiple Architectures
====================================
-You can compile the package for more than one kind of computer at the
+ 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 `..'.
+source code in the directory that `configure' is in and in `..'. This
+is known as a "VPATH" build.
+
+ 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.
- 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.
+ On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor. Like
+this:
+
+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CPP="gcc -E" CXXCPP="g++ -E"
+
+ This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
Installation Names
==================
-By default, `make install' installs the package's commands under
+ By default, `make install' installs the package's commands under
`/usr/local/bin', include files under `/usr/local/include', etc. You
can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
+absolute file name.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
@@ -116,16 +156,47 @@ Documentation and other data files still use the regular prefix.
In addition, if you use an unusual directory layout you can give
options like `--bindir=DIR' to specify different values for particular
kinds of files. Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
+you can set and what kinds of files go in them. In general, the
+default for these options is expressed in terms of `${prefix}', so that
+specifying just `--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+ The most portable way to affect installation locations is to pass the
+correct locations to `configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+`make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+ The first method involves providing an override variable for each
+affected directory. For example, `make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'. Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated. The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
+
+ The second method involves providing the `DESTDIR' variable. For
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names. The approach of
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters. On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of `${prefix}'
+at `configure' time.
+
+Optional Features
+=================
If the package supports it, you can cause programs to be installed
with an extra prefix or suffix on their names by giving `configure' the
option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-Optional Features
-=================
-
-Some packages pay attention to `--enable-FEATURE' options to
+ Some packages pay attention to `--enable-FEATURE' options to
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
is something like `gnu-as' or `x' (for the X Window System). The
@@ -137,14 +208,53 @@ find the X include and library files automatically, but if it doesn't,
you can use the `configure' options `--x-includes=DIR' and
`--x-libraries=DIR' to specify their locations.
+ Some packages offer the ability to configure how verbose the
+execution of `make' will be. For these packages, running `./configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with `make V=1'; while running `./configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with `make V=0'.
+
+Particular systems
+==================
+
+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+ ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file. The option `-nodtk' can be used as
+a workaround. If GNU CC is not installed, it is therefore recommended
+to try
+
+ ./configure CC="cc"
+
+and if that doesn't work, try
+
+ ./configure CC="cc -nodtk"
+
+ On Solaris, don't put `/usr/ucb' early in your `PATH'. This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+ On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'. It is recommended to use the following options:
+
+ ./configure --prefix=/boot/common
+
Specifying the System Type
==========================
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
+ There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on. Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
`--build=TYPE' option. TYPE can either be a short name for the system
type, such as `sun4', or a canonical name which has the form:
@@ -152,7 +262,8 @@ type, such as `sun4', or a canonical name which has the form:
where SYSTEM can have one of these forms:
- OS KERNEL-OS
+ OS
+ KERNEL-OS
See the file `config.sub' for the possible values of each field. If
`config.sub' isn't included in this package, then this package doesn't
@@ -170,9 +281,9 @@ eventually be run) with `--host=TYPE'.
Sharing Defaults
================
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
+ If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
`configure' looks for `PREFIX/share/config.site' if it exists, then
`PREFIX/etc/config.site' if it exists. Or, you can set the
`CONFIG_SITE' environment variable to the location of the site script.
@@ -181,7 +292,7 @@ A warning: not all `configure' scripts look for a site script.
Defining Variables
==================
-Variables not defined in a site shell script can be set in the
+ Variables not defined in a site shell script can be set in the
environment passed to `configure'. However, some packages may run
configure again during the build, and the customized values of these
variables may be lost. In order to avoid this problem, you should set
@@ -190,21 +301,29 @@ them in the `configure' command line, using `VAR=value'. For example:
./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
======================
-`configure' recognizes the following options to control how it operates.
+ `configure' recognizes the following options to control how it
+operates.
`--help'
`-h'
- Print a summary of the options to `configure', and exit.
+ Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+ Print a summary of the options unique to this package's
+ `configure', and exit. The `short' variant lists options used
+ only in the top level, while the `recursive' variant lists options
+ also present in any nested packages.
`--version'
`-V'
@@ -231,6 +350,16 @@ configuration-related scripts to be executed by `/bin/bash'.
Look for the package's source code in directory DIR. Usually
`configure' can determine that directory automatically.
+`--prefix=DIR'
+ Use DIR as the installation prefix. *note Installation Names::
+ for more details, including other options available for fine-tuning
+ the installation locations.
+
+`--no-create'
+`-n'
+ Run the configure checks, but stop before creating any output
+ files.
+
`configure' also accepts some other, not widely useful, options. Run
`configure --help' for more details.
diff --git a/configure.ac b/configure.ac
index ec6a915..ae99399 100644
--- a/configure.ac
+++ b/configure.ac
@@ -280,6 +280,7 @@ plugins/insert-params/Makefile
plugins/insert-tags/Makefile
plugins/open-tran/Makefile
plugins/source-code-view/Makefile
+plugins/source-code-view/org.gnome.gtranslator.plugins.source-code-view.gschema.xml.in
src/Makefile
src/dialogs/Makefile
src/toolbareditor/Makefile
diff --git a/plugins/source-code-view/Makefile.am b/plugins/source-code-view/Makefile.am
index 7e39c4e..35bbeba 100644
--- a/plugins/source-code-view/Makefile.am
+++ b/plugins/source-code-view/Makefile.am
@@ -38,6 +38,12 @@ plugin_in_files = gtr-source-code-view.gtranslator-plugin.desktop.in
plugin_DATA = $(plugin_in_files:.gtranslator-plugin.desktop.in=.gtranslator.plugin)
+gsettings_SCHEMAS = org.gnome.gtranslator.plugins.source-code-view.gschema.xml
+
+ INTLTOOL_XML_NOMERGE_RULE@
+
+ GSETTINGS_RULES@
+
EXTRA_DIST = \
$(plugin_in_files) \
$(ui_DATA)
diff --git a/plugins/source-code-view/gtr-source-code-view-dialog.ui b/plugins/source-code-view/gtr-source-code-view-dialog.ui
index 19e394f..2f00101 100644
--- a/plugins/source-code-view/gtr-source-code-view-dialog.ui
+++ b/plugins/source-code-view/gtr-source-code-view-dialog.ui
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="2.16"/>
<!-- interface-naming-policy toplevel-contextual -->
@@ -13,14 +13,12 @@
<object class="GtkVBox" id="dialog-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="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkVBox" id="main_box">
<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="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="use_editor">
@@ -37,7 +35,6 @@
<child>
<object class="GtkVBox" id="program_box">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label1">
@@ -64,7 +61,7 @@
<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="invisible_char">●</property>
+ <property name="invisible_char">â??</property>
</object>
</child>
</object>
@@ -96,7 +93,7 @@
<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="invisible_char">●</property>
+ <property name="invisible_char">â??</property>
</object>
</child>
</object>
@@ -122,7 +119,7 @@
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="cancel_button">
- <property name="label">gtk-cancel</property>
+ <property name="label">gtk-close</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -135,21 +132,6 @@
<property name="position">0</property>
</packing>
</child>
- <child>
- <object class="GtkButton" id="ok_button">
- <property name="label">gtk-ok</property>
- <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="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
</object>
<packing>
<property name="expand">False</property>
@@ -161,7 +143,6 @@
</child>
<action-widgets>
<action-widget response="-6">cancel_button</action-widget>
- <action-widget response="-5">ok_button</action-widget>
</action-widgets>
</object>
</interface>
diff --git a/plugins/source-code-view/gtr-source-code-view-plugin.c b/plugins/source-code-view/gtr-source-code-view-plugin.c
index 9ed4ed0..b6df29e 100644
--- a/plugins/source-code-view/gtr-source-code-view-plugin.c
+++ b/plugins/source-code-view/gtr-source-code-view-plugin.c
@@ -31,14 +31,11 @@
#include <gtk/gtk.h>
#include <string.h>
#include <gio/gio.h>
-#include <gconf/gconf-client.h>
#include <ctype.h>
-/* Gconf keys */
-#define SOURCE_CODE_VIEW_BASE_KEY "/apps/gtranslator/plugins/source-view"
-#define USE_EDITOR_KEY SOURCE_CODE_VIEW_BASE_KEY "/use_editor"
-#define PROGRAM_CMD_KEY SOURCE_CODE_VIEW_BASE_KEY "/program_cmd"
-#define LINE_CMD_KEY SOURCE_CODE_VIEW_BASE_KEY "/line_cmd"
+#define GTR_SETTINGS_USE_EDITOR "use-editor"
+#define GTR_SETTINGS_PROGRAM_CMD "program-cmd"
+#define GTR_SETTINGS_LINE_CMD "line-cmd"
#define GTR_SOURCE_CODE_VIEW_PLUGIN_GET_PRIVATE(object) \
(G_TYPE_INSTANCE_GET_PRIVATE ((object), \
@@ -47,7 +44,7 @@
struct _GtrSourceCodeViewPluginPrivate
{
- GConfClient *gconf_client;
+ GSettings *settings;
/* Dialog stuff */
GtkWidget *dialog;
@@ -133,8 +130,8 @@ show_source (GtrSourceCodeViewPlugin * plugin, const gchar * path, gint line)
{
gboolean use_editor;
- use_editor = gconf_client_get_bool (plugin->priv->gconf_client,
- USE_EDITOR_KEY, NULL);
+ use_editor = g_settings_get_boolean (plugin->priv->settings,
+ GTR_SETTINGS_USE_EDITOR);
if (use_editor)
{
@@ -142,12 +139,12 @@ show_source (GtrSourceCodeViewPlugin * plugin, const gchar * path, gint line)
gchar *line_cmd;
/* Program cmd */
- program_cmd = gconf_client_get_string (plugin->priv->gconf_client,
- PROGRAM_CMD_KEY, NULL);
+ program_cmd = g_settings_get_string (plugin->priv->settings,
+ GTR_SETTINGS_PROGRAM_CMD);
/* Line cmd */
- line_cmd = gconf_client_get_string (plugin->priv->gconf_client,
- LINE_CMD_KEY, NULL);
+ line_cmd = g_settings_get_string (plugin->priv->settings,
+ GTR_SETTINGS_LINE_CMD);
show_in_editor (program_cmd, line_cmd, path, line);
@@ -396,25 +393,22 @@ gtr_source_code_view_plugin_init (GtrSourceCodeViewPlugin * plugin)
{
plugin->priv = GTR_SOURCE_CODE_VIEW_PLUGIN_GET_PRIVATE (plugin);
- plugin->priv->gconf_client = gconf_client_get_default ();
-
- gconf_client_add_dir (plugin->priv->gconf_client,
- SOURCE_CODE_VIEW_BASE_KEY,
- GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
-
+ plugin->priv->settings = g_settings_new ("org.gnome.gtranslator.plugins.source-code-view");
plugin->priv->tags = NULL;
}
static void
-gtr_source_code_view_plugin_finalize (GObject * object)
+gtr_source_code_view_plugin_dispose (GObject * object)
{
GtrSourceCodeViewPlugin *plugin = GTR_SOURCE_CODE_VIEW_PLUGIN (object);
- gconf_client_suggest_sync (plugin->priv->gconf_client, NULL);
-
- g_object_unref (G_OBJECT (plugin->priv->gconf_client));
+ if (plugin->priv->settings != NULL)
+ {
+ g_object_unref (plugin->priv->settings);
+ plugin->priv->settings = NULL;
+ }
- G_OBJECT_CLASS (gtr_source_code_view_plugin_parent_class)->finalize (object);
+ G_OBJECT_CLASS (gtr_source_code_view_plugin_parent_class)->dispose (object);
}
static void
@@ -573,8 +567,6 @@ get_configuration_dialog (GtrSourceCodeViewPlugin * plugin)
gboolean ret;
GtkWidget *error_widget;
- gchar *value;
- gboolean use_editor;
gchar *path;
gchar *root_objects[] = {
"dialog",
@@ -602,37 +594,27 @@ get_configuration_dialog (GtrSourceCodeViewPlugin * plugin)
//FIXME: We have to show a dialog
}
- /* Set default values */
-
//Use editor
- use_editor = gconf_client_get_bool (plugin->priv->gconf_client,
- USE_EDITOR_KEY, NULL);
-
g_signal_connect (plugin->priv->use_editor_checkbutton, "toggled",
G_CALLBACK (use_editor_toggled), plugin);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON
- (plugin->priv->use_editor_checkbutton),
- use_editor);
+ g_settings_bind (plugin->priv->settings,
+ GTR_SETTINGS_USE_EDITOR,
+ plugin->priv->use_editor_checkbutton,
+ "active",
+ G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
- use_editor_toggled (GTK_TOGGLE_BUTTON
- (plugin->priv->use_editor_checkbutton), plugin);
+ g_settings_bind (plugin->priv->settings,
+ GTR_SETTINGS_PROGRAM_CMD,
+ plugin->priv->program_cmd_entry,
+ "text",
+ G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
- //Program cmd
- value = gconf_client_get_string (plugin->priv->gconf_client,
- PROGRAM_CMD_KEY, NULL);
-
- gtk_entry_set_text (GTK_ENTRY (plugin->priv->program_cmd_entry), value);
-
- g_free (value);
-
- //Line cmd
- value = gconf_client_get_string (plugin->priv->gconf_client,
- LINE_CMD_KEY, NULL);
-
- gtk_entry_set_text (GTK_ENTRY (plugin->priv->line_cmd_entry), value);
-
- g_free (value);
+ g_settings_bind (plugin->priv->settings,
+ GTR_SETTINGS_LINE_CMD,
+ plugin->priv->line_cmd_entry,
+ "text",
+ G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
return plugin->priv->dialog;
}
@@ -709,61 +691,10 @@ impl_deactivate (GtrPlugin * plugin, GtrWindow * window)
}
static void
-ok_button_pressed (GtrSourceCodeViewPlugin * plugin)
-{
- const gchar *program_cmd;
- const gchar *line_cmd;
- gboolean use_editor;
-
- /* We have to get the text from the entries */
- use_editor =
- gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
- (plugin->priv->use_editor_checkbutton));
- program_cmd =
- gtk_entry_get_text (GTK_ENTRY (plugin->priv->program_cmd_entry));
- line_cmd = gtk_entry_get_text (GTK_ENTRY (plugin->priv->line_cmd_entry));
-
- /* Now we store the data in gconf */
- if (!gconf_client_key_is_writable (plugin->priv->gconf_client,
- USE_EDITOR_KEY, NULL))
- return;
-
- gconf_client_set_bool (plugin->priv->gconf_client,
- USE_EDITOR_KEY, use_editor, NULL);
-
- if (!gconf_client_key_is_writable (plugin->priv->gconf_client,
- PROGRAM_CMD_KEY, NULL))
- return;
-
- gconf_client_set_string (plugin->priv->gconf_client,
- PROGRAM_CMD_KEY, program_cmd, NULL);
-
- if (!gconf_client_key_is_writable (plugin->priv->gconf_client,
- LINE_CMD_KEY, NULL))
- return;
-
- gconf_client_set_string (plugin->priv->gconf_client,
- LINE_CMD_KEY, line_cmd, NULL);
-}
-
-static void
configure_dialog_response_cb (GtkWidget * widget,
gint response, GtrSourceCodeViewPlugin * plugin)
{
- switch (response)
- {
- case GTK_RESPONSE_OK:
- {
- ok_button_pressed (plugin);
-
- gtk_widget_destroy (plugin->priv->dialog);
- break;
- }
- case GTK_RESPONSE_CANCEL:
- {
- gtk_widget_destroy (plugin->priv->dialog);
- }
- }
+ gtk_widget_destroy (plugin->priv->dialog);
}
static GtkWidget *
@@ -789,7 +720,7 @@ gtr_source_code_view_plugin_class_init (GtrSourceCodeViewPluginClass * klass)
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GtrPluginClass *plugin_class = GTR_PLUGIN_CLASS (klass);
- object_class->finalize = gtr_source_code_view_plugin_finalize;
+ object_class->dispose = gtr_source_code_view_plugin_dispose;
plugin_class->activate = impl_activate;
plugin_class->deactivate = impl_deactivate;
diff --git a/plugins/source-code-view/org.gnome.gtranslator.plugins.source-code-view.gschema.xml.in.in b/plugins/source-code-view/org.gnome.gtranslator.plugins.source-code-view.gschema.xml.in.in
new file mode 100644
index 0000000..cb7cc32
--- /dev/null
+++ b/plugins/source-code-view/org.gnome.gtranslator.plugins.source-code-view.gschema.xml.in.in
@@ -0,0 +1,19 @@
+<schemalist>
+ <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.gtranslator.plugins.source-code-view" path="/apps/gtranslator/plugins/source-code-view/">
+ <key name="use-editor" type="b">
+ <default>true</default>
+ <_summary>Use the System Editor</_summary>
+ <_description>Whether use the system editor to show the source code</_description>
+ </key>
+ <key name="program-cmd" type="s">
+ <default>gedit</default>
+ <_summary>The Editor to Launch</_summary>
+ <_description>The command to launch the editor you want to use</_description>
+ </key>
+ <key name="line-cmd" type="s">
+ <default>+</default>
+ <_summary>Arguments for the Command</_summary>
+ <_description>Arguments to pass to the program command and select the line</_description>
+ </key>
+ </schema>
+</schemalist>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
