gucharmap r1693 - trunk/gucharmap
- From: chpe svn gnome org
- To: svn-commits-list gnome org
- Subject: gucharmap r1693 - trunk/gucharmap
- Date: Fri, 21 Mar 2008 10:57:25 +0000 (GMT)
Author: chpe
Date: Fri Mar 21 10:57:25 2008
New Revision: 1693
URL: http://svn.gnome.org/viewvc/gucharmap?rev=1693&view=rev
Log:
Remove unused API from GucharmapWindow.
Modified:
trunk/gucharmap/gucharmap-window.c
trunk/gucharmap/gucharmap-window.h
trunk/gucharmap/main.c
Modified: trunk/gucharmap/gucharmap-window.c
==============================================================================
--- trunk/gucharmap/gucharmap-window.c (original)
+++ trunk/gucharmap/gucharmap-window.c Fri Mar 21 10:57:25 2008
@@ -632,7 +632,6 @@
action = gtk_action_group_get_action (guw->action_group, "SnapColumns");
gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
gucharmap_settings_get_snap_pow2 ());
- gucharmap_window_set_file_menu_visible (guw, TRUE);
gtk_ui_manager_insert_action_group (guw->uimanager, guw->action_group, 0);
g_object_unref (guw->action_group);
@@ -661,7 +660,7 @@
GucharmapWindow *guw)
{
gchar ubuf[7];
- gint pos;
+ gint pos = -1;
gunichar wc;
wc = gucharmap_chartable_get_active_character (chartable);
@@ -669,10 +668,6 @@
if (!gucharmap_unichar_validate (wc))
return;
- /* don't do anything if text_to_copy is not active */
- if (!guw->text_to_copy_visible)
- return;
-
ubuf[g_unichar_to_utf8 (wc, ubuf)] = '\0';
gtk_editable_delete_selection (GTK_EDITABLE (guw->text_to_copy_entry));
pos = gtk_editable_get_position (GTK_EDITABLE (guw->text_to_copy_entry));
@@ -799,6 +794,8 @@
guw->text_to_copy_container = make_text_to_copy (guw);
gtk_container_set_border_width (GTK_CONTAINER (guw->text_to_copy_container), 6);
gtk_box_pack_start (GTK_BOX (big_vbox), guw->text_to_copy_container, FALSE, FALSE, 0);
+ gtk_widget_show (guw->text_to_copy_container);
+
/* FIXMEchpe!! */
chartable =gucharmap_charmap_get_chartable (guw->charmap);
g_signal_connect (chartable, "activate", G_CALLBACK (insert_character_in_text_to_copy), guw);
@@ -838,9 +835,6 @@
{
gtk_window_set_title (GTK_WINDOW (guw), _("Character Map"));
- guw->font_selection_visible = FALSE;
- guw->text_to_copy_visible = FALSE;
- guw->file_menu_visible = FALSE;
guw->chapters_mode = gucharmap_settings_get_chapters_mode ();
guw->search_dialog = NULL;
@@ -877,38 +871,6 @@
return GTK_WIDGET (g_object_new (gucharmap_window_get_type (), NULL));
}
-void
-gucharmap_window_set_font_selection_visible (GucharmapWindow *guw,
- gboolean visible)
-{
- guw->font_selection_visible = visible != FALSE;
-
- g_object_set (guw->fontsel, "visible", visible, NULL);
-}
-
-void
-gucharmap_window_set_text_to_copy_visible (GucharmapWindow *guw,
- gboolean visible)
-{
- guw->text_to_copy_visible = visible != FALSE;
-
- g_object_set (guw->text_to_copy_container, "visible", visible, NULL);
-}
-
-void
-gucharmap_window_set_file_menu_visible (GucharmapWindow *guw,
- gboolean visible)
-{
- GtkAction *action;
-
- guw->file_menu_visible = visible != FALSE;
-
- action = gtk_action_group_get_action (guw->action_group, "File");
- gtk_action_set_visible (action, visible);
- action = gtk_action_group_get_action (guw->action_group, "Close");
- gtk_action_set_sensitive (action, visible);
-}
-
GucharmapMiniFontSelection *
gucharmap_window_get_mini_font_selection (GucharmapWindow *guw)
{
Modified: trunk/gucharmap/gucharmap-window.h
==============================================================================
--- trunk/gucharmap/gucharmap-window.h (original)
+++ trunk/gucharmap/gucharmap-window.h Fri Mar 21 10:57:25 2008
@@ -56,10 +56,6 @@
guint save_last_char_idle_id;
- guint font_selection_visible : 1;
- guint text_to_copy_visible : 1;
- guint file_menu_visible : 1;
-
GucharmapChaptersMode chapters_mode;
};
@@ -72,12 +68,6 @@
GType gucharmap_window_get_type (void);
GtkWidget * gucharmap_window_new (void);
-void gucharmap_window_set_font_selection_visible (GucharmapWindow *guw,
- gboolean visible);
-void gucharmap_window_set_text_to_copy_visible (GucharmapWindow *guw,
- gboolean visible);
-void gucharmap_window_set_file_menu_visible (GucharmapWindow *guw,
- gboolean visible);
GucharmapMiniFontSelection * gucharmap_window_get_mini_font_selection (GucharmapWindow *guw);
GdkCursor * _gucharmap_window_progress_cursor (void);
Modified: trunk/gucharmap/main.c
==============================================================================
--- trunk/gucharmap/main.c (original)
+++ trunk/gucharmap/main.c Fri Mar 21 10:57:25 2008
@@ -35,10 +35,10 @@
gint monitor;
GdkRectangle rect;
GError *error = NULL;
- gchar *new_font = NULL;
+ gchar *font = NULL;
GOptionEntry goptions[] =
{
- { "font", 0, 0, G_OPTION_ARG_STRING, &new_font,
+ { "font", 0, 0, G_OPTION_ARG_STRING, &font,
N_("Font to start with; ex: 'Serif 27'"), N_("FONT") },
{ NULL }
};
@@ -62,9 +62,6 @@
gtk_window_set_default_icon_name (GUCHARMAP_ICON_NAME);
window = gucharmap_window_new ();
- gucharmap_window_set_text_to_copy_visible (GUCHARMAP_WINDOW (window), TRUE);
- gucharmap_window_set_font_selection_visible (GUCHARMAP_WINDOW (window), TRUE);
- gucharmap_window_set_file_menu_visible (GUCHARMAP_WINDOW (window), TRUE);
screen = gtk_window_get_screen (GTK_WINDOW (window));
monitor = gdk_screen_get_monitor_at_point (screen, 0, 0);
@@ -74,25 +71,25 @@
gucharmap_settings_add_window (GTK_WINDOW (window));
/* make the starting font 50% bigger than the default font */
- if (new_font == NULL) /* new_font could be set by command line option */
+ if (font == NULL) /* font could be set by command line option */
{
GucharmapMiniFontSelection *fontsel = gucharmap_window_get_mini_font_selection (GUCHARMAP_WINDOW (window));
gint default_size = PANGO_PIXELS (2.0 * pango_font_description_get_size (window->style->font_desc));
gucharmap_mini_font_selection_set_default_font_size (fontsel, default_size);
- new_font = gucharmap_settings_get_font ();
- if (new_font)
+ font = gucharmap_settings_get_font ();
+ if (font)
{
- PangoFontDescription *fd = pango_font_description_from_string (new_font);
+ PangoFontDescription *fd = pango_font_description_from_string (font);
/* revert to default font size */
if (0 == pango_font_description_get_size (fd))
gucharmap_mini_font_selection_reset_font_size (fontsel);
else
- gucharmap_mini_font_selection_set_font_name (fontsel, new_font);
+ gucharmap_mini_font_selection_set_font_name (fontsel, font);
pango_font_description_free (fd);
- g_free (new_font);
+ g_free (font);
}
else
gucharmap_mini_font_selection_reset_font_size (fontsel);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]