gtranslator r3621 - in trunk: . src src/dialogs
- From: icq svn gnome org
- To: svn-commits-list gnome org
- Subject: gtranslator r3621 - in trunk: . src src/dialogs
- Date: Mon, 22 Sep 2008 09:39:26 +0000 (UTC)
Author: icq
Date: Mon Sep 22 09:39:26 2008
New Revision: 3621
URL: http://svn.gnome.org/viewvc/gtranslator?rev=3621&view=rev
Log:
Added create_backup option on preferences and removed some useless ones
Modified:
trunk/ChangeLog
trunk/src/dialogs/preferences-dialog.c
trunk/src/dialogs/preferences-dialog.glade
trunk/src/prefs-manager.c
trunk/src/prefs-manager.h
Modified: trunk/src/dialogs/preferences-dialog.c
==============================================================================
--- trunk/src/dialogs/preferences-dialog.c (original)
+++ trunk/src/dialogs/preferences-dialog.c Mon Sep 22 09:39:26 2008
@@ -37,7 +37,7 @@
#include <glib-object.h>
#include <gio/gio.h>
#include <gtk/gtk.h>
-
+#include <string.h>
#define GTR_PREFERENCES_DIALOG_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ( \
(object), \
@@ -59,9 +59,7 @@
GtkWidget *autosave_checkbutton;
GtkWidget *autosave_interval_spinbutton;
GtkWidget *autosave_hbox;
- GtkWidget *append_suffix_checkbutton;
- GtkWidget *autosave_suffix_entry;
- GtkWidget *autosave_suffix_hbox;
+ GtkWidget *create_backup_checkbutton;
/* Editor->Text display */
GtkWidget *highlight_checkbutton;
@@ -72,7 +70,6 @@
/* Editor->Contents */
GtkWidget *unmark_fuzzy_checkbutton;
- GtkWidget *keep_obsolete_checkbutton;
GtkWidget *spellcheck_checkbutton;
/*Profiles*/
@@ -170,17 +167,16 @@
}
static void
-append_suffix_checkbutton_toggled(GtkToggleButton *button,
- GtranslatorPreferencesDialog *dlg)
+create_backup_checkbutton_toggled (GtkToggleButton *button,
+ GtranslatorPreferencesDialog *dlg)
{
- gboolean append_suffix;
+ gboolean create_backup;
- g_return_if_fail(button == GTK_TOGGLE_BUTTON(dlg->priv->append_suffix_checkbutton));
+ g_return_if_fail (button == GTK_TOGGLE_BUTTON (dlg->priv->create_backup_checkbutton));
- append_suffix = gtk_toggle_button_get_active(button);
+ create_backup = gtk_toggle_button_get_active (button);
- gtk_widget_set_sensitive(dlg->priv->autosave_suffix_hbox, append_suffix);
- gtranslator_prefs_manager_set_append_suffix(append_suffix);
+ gtranslator_prefs_manager_set_create_backup (create_backup);
}
static void
@@ -193,31 +189,18 @@
}
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, suffix;
+ gboolean autosave, backup;
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);
- suffix = gtranslator_prefs_manager_get_append_suffix();
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dlg->priv->append_suffix_checkbutton),
- suffix);
+ backup = gtranslator_prefs_manager_get_create_backup ();
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dlg->priv->create_backup_checkbutton),
+ backup);
autosave_interval = gtranslator_prefs_manager_get_autosave_interval();
@@ -227,32 +210,20 @@
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_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->append_suffix_checkbutton, "toggled",
- G_CALLBACK(append_suffix_checkbutton_toggled),
+ g_signal_connect(dlg->priv->create_backup_checkbutton, "toggled",
+ G_CALLBACK(create_backup_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
@@ -366,15 +337,6 @@
}
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)
{
@@ -389,8 +351,6 @@
/*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());
@@ -398,9 +358,6 @@
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);
@@ -1066,9 +1023,7 @@
"autosave_checkbutton", &dlg->priv->autosave_checkbutton,
"autosave_interval_spinbutton", &dlg->priv->autosave_interval_spinbutton,
"autosave_hbox", &dlg->priv->autosave_hbox,
- "append_suffix_checkbutton", &dlg->priv->append_suffix_checkbutton,
- "autosave_suffix_entry", &dlg->priv->autosave_suffix_entry,
- "autosave_suffix_hbox", &dlg->priv->autosave_suffix_hbox,
+ "create_backup_checkbutton", &dlg->priv->create_backup_checkbutton,
"highlight_checkbutton", &dlg->priv->highlight_checkbutton,
"visible_whitespace_checkbutton", &dlg->priv->visible_whitespace_checkbutton,
@@ -1077,7 +1032,6 @@
"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,
Modified: trunk/src/dialogs/preferences-dialog.glade
==============================================================================
--- trunk/src/dialogs/preferences-dialog.glade (original)
+++ trunk/src/dialogs/preferences-dialog.glade Mon Sep 22 09:39:26 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 Fri Jun 27 12:18:15 2008 -->
+<!--Generated with glade3 3.4.5 on Thu Jul 31 11:13:45 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="append_suffix_checkbutton">
+ <widget class="GtkCheckButton" id="create_backup_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Append a suffix to autosaved _files</property>
+ <property name="label" translatable="yes">Create a _backup copy of files before saving</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
@@ -199,39 +199,6 @@
<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>
@@ -432,21 +399,6 @@
</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>
@@ -456,7 +408,7 @@
<property name="draw_indicator">True</property>
</widget>
<packing>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
</widget>
@@ -688,7 +640,7 @@
</packing>
</child>
<child>
- <widget class="GtkAlignment" id="alignment1">
+ <widget class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
<property name="right_padding">12</property>
<child>
@@ -803,7 +755,7 @@
</packing>
</child>
<child>
- <widget class="GtkAlignment" id="alignment2">
+ <widget class="GtkAlignment" id="alignment3">
<property name="visible">True</property>
<property name="right_padding">12</property>
<child>
@@ -829,28 +781,23 @@
<placeholder/>
</child>
<child>
- <widget class="GtkSpinButton" id="sentence_length_spinbutton">
+ <widget class="GtkCheckButton" id="show_tm_options_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">2 0 100 1 10 10</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>
- <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="label24">
+ <widget class="GtkLabel" id="label23">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Max. difference in sentence length:</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="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
</packing>
</child>
@@ -868,25 +815,30 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label23">
+ <widget class="GtkLabel" id="label24">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Max. # of missing words:</property>
+ <property name="label" translatable="yes">Max. difference in sentence length:</property>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_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="GtkCheckButton" id="show_tm_options_checkbutton">
+ <widget class="GtkSpinButton" id="sentence_length_spinbutton">
<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>
+ <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>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
</child>
</widget>
<packing>
Modified: trunk/src/prefs-manager.c
==============================================================================
--- trunk/src/prefs-manager.c (original)
+++ trunk/src/prefs-manager.c Mon Sep 22 09:39:26 2008
@@ -278,13 +278,9 @@
GPM_AUTOSAVE_INTERVAL,
GPM_DEFAULT_AUTOSAVE_INTERVAL)
-DEFINE_BOOL_PREF(append_suffix,
- GPM_APPEND_SUFFIX,
- GPM_DEFAULT_APPEND_SUFFIX)
-
-DEFINE_STRING_PREF(autosave_suffix,
- GPM_AUTOSAVE_SUFFIX,
- GPM_DEFAULT_AUTOSAVE_SUFFIX)
+DEFINE_BOOL_PREF(create_backup,
+ GPM_CREATE_BACKUP,
+ GPM_DEFAULT_CREATE_BACKUP)
/* Editor */
DEFINE_BOOL_PREF(highlight,
@@ -307,10 +303,6 @@
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)
Modified: trunk/src/prefs-manager.h
==============================================================================
--- trunk/src/prefs-manager.h (original)
+++ trunk/src/prefs-manager.h Mon Sep 22 09:39:26 2008
@@ -39,8 +39,7 @@
#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_APPEND_SUFFIX GPM_AUTOSAVE_DIR "/append_suffix"
-#define GPM_AUTOSAVE_SUFFIX GPM_AUTOSAVE_DIR "/autosave_suffix"
+#define GPM_CREATE_BACKUP GPM_AUTOSAVE_DIR "/create_backup"
/* Editor */
#define GPM_TEXT_DISPLAY_DIR GPM_PREFS_DIR "/editor/text_display"
@@ -91,8 +90,7 @@
#define GPM_DEFAULT_AUTOSAVE 0 /* FALSE */
#define GPM_DEFAULT_AUTOSAVE_INTERVAL 4
-#define GPM_DEFAULT_APPEND_SUFFIX 0 /* FALSE */
-#define GPM_DEFAULT_AUTOSAVE_SUFFIX (const gchar*) "autosave"
+#define GPM_DEFAULT_CREATE_BACKUP 0 /* FALSE */
/* Editor */
#define GPM_DEFAULT_HIGHLIGHT 1 /* TRUE */
@@ -157,13 +155,9 @@
void gtranslator_prefs_manager_set_autosave_interval (gint timeout);
gint gtranslator_prefs_manager_get_autosave_interval (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);
+/*Create backup*/
+void gtranslator_prefs_manager_set_create_backup (gboolean backup);
+gboolean gtranslator_prefs_manager_get_create_backup (void);
/*Highlight*/
void gtranslator_prefs_manager_set_highlight (gboolean highlight);
@@ -185,10 +179,6 @@
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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
