[gnumeric] Hide Prefer CLIPBOARD preference under MS Windows. [#649675]
- From: Andreas J. Guelzow <guelzow src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] Hide Prefer CLIPBOARD preference under MS Windows. [#649675]
- Date: Mon, 23 May 2011 13:56:50 +0000 (UTC)
commit dd3ece989acba1d33c037e69c3fb5a3cf5094f35
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date: Mon May 23 07:55:40 2011 -0600
Hide Prefer CLIPBOARD preference under MS Windows. [#649675]
2011-05-23 Andreas J. Guelzow <aguelzow pyrshep ca>
* dialog-preferences.c (pref_copypaste_page_initializer): hide under
G_OS_WIN32
(page_info): move N_("Copy and Paste") and hide under G_OS_WIN32
NEWS | 1 +
src/dialogs/ChangeLog | 6 ++++++
src/dialogs/dialog-preferences.c | 18 ++++++++++++------
3 files changed, 19 insertions(+), 6 deletions(-)
---
diff --git a/NEWS b/NEWS
index 5d82341..63dbf38 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@ Gnumeric 1.10.16
Andreas
* Store some print range information in gnumeric files. [#649714]
+ * Hide Prefer CLIPBOARD preference under MS Windows. [#649675]
Morten:
* Fix leaks in SHEET. [#650761]
diff --git a/src/dialogs/ChangeLog b/src/dialogs/ChangeLog
index f4da4be..ed6edcc 100644
--- a/src/dialogs/ChangeLog
+++ b/src/dialogs/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-23 Andreas J. Guelzow <aguelzow pyrshep ca>
+
+ * dialog-preferences.c (pref_copypaste_page_initializer): hide under
+ G_OS_WIN32
+ (page_info): move N_("Copy and Paste") and hide under G_OS_WIN32
+
2011-05-22 Andreas J. Guelzow <aguelzow pyrshep ca>
* dialog-analysis-tools.c (dialog_tool_init_buttons): make static
diff --git a/src/dialogs/dialog-preferences.c b/src/dialogs/dialog-preferences.c
index 73a7ca0..5d047d7 100644
--- a/src/dialogs/dialog-preferences.c
+++ b/src/dialogs/dialog-preferences.c
@@ -1059,6 +1059,8 @@ pref_tool_page_initializer (PrefState *state,
/* Copy/Paste Preferences Page */
/*******************************************************************************************/
+#ifndef G_OS_WIN32
+
static GtkWidget *
pref_copypaste_page_initializer (PrefState *state,
G_GNUC_UNUSED gpointer data,
@@ -1078,6 +1080,8 @@ pref_copypaste_page_initializer (PrefState *state,
return page;
}
+#endif
+
/*******************************************************************************************/
/* AutoCorrect Preferences Page (General) */
/*******************************************************************************************/
@@ -1171,18 +1175,20 @@ typedef struct {
/* Note that the first two items must remain here in that order */
static page_info_t const page_info[] = {
- {N_("Copy and Paste"),GTK_STOCK_PASTE, NULL, &pref_copypaste_page_initializer},
{N_("Auto Correct"), GTK_STOCK_DIALOG_ERROR, NULL, &pref_autocorrect_general_page_initializer},
{N_("Font"), GTK_STOCK_ITALIC, NULL, &pref_font_initializer },
{N_("Files"), GTK_STOCK_FLOPPY, NULL, &pref_file_page_initializer },
{N_("Tools"), GTK_STOCK_EXECUTE, NULL, &pref_tool_page_initializer },
{N_("Undo"), GTK_STOCK_UNDO, NULL, &pref_undo_page_initializer },
{N_("Windows"), "Gnumeric_ObjectCombo", NULL, &pref_window_page_initializer },
- {N_("Header/Footer"), GTK_STOCK_ITALIC, "2", &pref_font_hf_initializer },
- {N_("Sorting"), GTK_STOCK_SORT_ASCENDING, "4", &pref_sort_page_initializer },
- {N_("Screen"), GTK_STOCK_PREFERENCES, "6", &pref_screen_page_initializer },
- {N_("INitial CApitals"), NULL, "1", &pref_autocorrect_initialcaps_page_initializer },
- {N_("First Letter"), NULL, "1", &pref_autocorrect_firstletter_page_initializer },
+ {N_("Header/Footer"), GTK_STOCK_ITALIC, "1", &pref_font_hf_initializer },
+#ifndef G_OS_WIN32
+ {N_("Copy and Paste"),GTK_STOCK_PASTE, "3", &pref_copypaste_page_initializer},
+#endif
+ {N_("Sorting"), GTK_STOCK_SORT_ASCENDING, "3", &pref_sort_page_initializer },
+ {N_("Screen"), GTK_STOCK_PREFERENCES, "5", &pref_screen_page_initializer },
+ {N_("INitial CApitals"), NULL, "0", &pref_autocorrect_initialcaps_page_initializer },
+ {N_("First Letter"), NULL, "0", &pref_autocorrect_firstletter_page_initializer },
{NULL, NULL, NULL, NULL },
};
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]