gnome-terminal r2661 - trunk/src
- From: chpe svn gnome org
- To: svn-commits-list gnome org
- Subject: gnome-terminal r2661 - trunk/src
- Date: Thu, 29 May 2008 19:42:58 +0000 (UTC)
Author: chpe
Date: Thu May 29 19:42:58 2008
New Revision: 2661
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=2661&view=rev
Log:
Remove profile icon. Bug #126081.
Modified:
trunk/src/profile-editor.c
trunk/src/profile-preferences.glade
trunk/src/profile-preferences.ui
trunk/src/terminal-profile.c
trunk/src/terminal-profile.h
Modified: trunk/src/profile-editor.c
==============================================================================
--- trunk/src/profile-editor.c (original)
+++ trunk/src/profile-editor.c Thu May 29 19:42:58 2008
@@ -30,7 +30,6 @@
#include "profile-editor.h"
#include "terminal-util.h"
-#include <libgnomeui/gnome-file-entry.h>
#include <libgnomeui/gnome-icon-entry.h>
#include <libgnomeui/gnome-thumbnail.h>
@@ -220,9 +219,6 @@
set_insensitive (editor, "profile-name-entry",
terminal_profile_property_locked (profile, TERMINAL_PROFILE_VISIBLE_NAME));
- set_insensitive (editor, "profile-icon-entry",
- terminal_profile_property_locked (profile, TERMINAL_PROFILE_ICON_FILE));
-
set_insensitive (editor, "show-menubar-checkbutton",
terminal_profile_property_locked (profile, TERMINAL_PROFILE_DEFAULT_SHOW_MENUBAR));
@@ -572,22 +568,6 @@
return change;
}
-#if 0
-static void
-icon_changed (GtkWidget *icon_entry,
- TerminalProfile *profile)
-{
- char *filename;
-
- filename = gnome_icon_entry_get_filename (GNOME_ICON_ENTRY (icon_entry));
-
- /* NULL filename happens here to unset */
- terminal_profile_set_icon_file (profile, filename);
-
- g_free (filename);
-}
-#endif
-
static void
color_scheme_combo_changed_cb (GtkWidget *combo,
GParamSpec *pspec,
@@ -1098,14 +1078,6 @@
w);
-
-#if 0
- g_signal_connect (gtk_builder_get_object (builder, "profile-icon-entry"),
- "changed",
- G_CALLBACK (icon_changed),
- profile);
-#endif
-
#define CONNECT_WITH_FLAGS(name, prop, flags) property_change_new (editor, profile, prop, (GtkWidget *) gtk_builder_get_object (builder, name), flags)
#define CONNECT(name, prop) CONNECT_WITH_FLAGS (name, prop, 0)
#define SET_ENUM_VALUE(name, value) g_object_set_data (gtk_builder_get_object (builder, name), "enum-value", GINT_TO_POINTER (value))
@@ -1194,28 +1166,3 @@
GTK_WINDOW (transient_parent));
gtk_window_present (GTK_WINDOW (editor));
}
-
-#if 0
-static void
-profile_editor_update_icon (GtkWidget *editor,
- TerminalProfile *profile)
-{
- GtkWidget *w;
- char *current_filename;
- const char *profile_filename;
-
- w = profile_editor_get_widget (editor, "profile-icon-entry");
-
- current_filename = gnome_icon_entry_get_filename (GNOME_ICON_ENTRY (w));
-
- profile_filename = terminal_profile_get_icon_file (profile);
-
- if (current_filename && profile_filename &&
- strcmp (current_filename, profile_filename) == 0)
- return;
-
- g_free (current_filename);
-
- gnome_icon_entry_set_filename (GNOME_ICON_ENTRY (w), profile_filename);
-}
-#endif
Modified: trunk/src/profile-preferences.glade
==============================================================================
--- trunk/src/profile-preferences.glade (original)
+++ trunk/src/profile-preferences.glade Thu May 29 19:42:58 2008
@@ -228,72 +228,6 @@
</child>
<child>
- <widget class="GtkHBox" id="hbox3">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">12</property>
-
- <child>
- <widget class="GtkLabel" id="profile-icon-label">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Profile _icon:</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="mnemonic_widget">profile-icon-entry</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkAlignment" id="alignment28">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xscale">0</property>
- <property name="yscale">1</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">0</property>
- <property name="right_padding">0</property>
-
- <child>
- <widget class="GnomeIconEntry" id="profile-icon-entry">
- <property name="visible">True</property>
- <property name="browse_dialog_title" translatable="yes">Choose A Profile Icon</property>
- <property name="max_saved">10</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
<widget class="GtkTable" id="table19">
<property name="visible">True</property>
<property name="n_rows">4</property>
Modified: trunk/src/profile-preferences.ui
==============================================================================
--- trunk/src/profile-preferences.ui (original)
+++ trunk/src/profile-preferences.ui Thu May 29 19:42:58 2008
@@ -342,68 +342,6 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox3">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="profile-icon-label">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Profile _icon:</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="mnemonic_widget">profile-icon-entry</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </object>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment28">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xscale">0</property>
- <property name="yscale">1</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">0</property>
- <property name="right_padding">0</property>
- <child>
- <object class="GnomeIconEntry" id="profile-icon-entry">
- <property name="visible">True</property>
- <property name="browse_dialog_title" translatable="yes">Choose A Profile Icon</property>
- <property name="max_saved">10</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
<object class="GtkTable" id="table19">
<property name="visible">True</property>
<property name="n_rows">4</property>
Modified: trunk/src/terminal-profile.c
==============================================================================
--- trunk/src/terminal-profile.c (original)
+++ trunk/src/terminal-profile.c Thu May 29 19:42:58 2008
@@ -59,8 +59,6 @@
PROP_EXIT_ACTION,
PROP_FONT,
PROP_FOREGROUND_COLOR,
- PROP_ICON,
- PROP_ICON_FILE,
PROP_IS_DEFAULT,
PROP_LOGIN_SHELL,
PROP_NAME,
@@ -96,7 +94,6 @@
#define KEY_EXIT_ACTION "exit_action"
#define KEY_FONT "font"
#define KEY_FOREGROUND_COLOR "foreground_color"
-#define KEY_ICON_FILE "icon"
#define KEY_LOGIN_SHELL "login_shell"
#define KEY_NO_AA_WITHOUT_RENDER "no_aa_without_render"
#define KEY_PALETTE "palette"
@@ -130,8 +127,6 @@
#define DEFAULT_EXIT_ACTION (TERMINAL_EXIT_CLOSE)
#define DEFAULT_FONT ("Monospace 12")
#define DEFAULT_FOREGROUND_COLOR ("#000000")
-#define DEFAULT_ICON_FILE (NULL)
-#define DEFAULT_ICON (NULL)
#define DEFAULT_IS_DEFAULT (FALSE)
#define DEFAULT_LOGIN_SHELL (FALSE)
#define DEFAULT_NAME (NULL)
@@ -169,7 +164,6 @@
int in_notification_count;
- gboolean icon_load_failed;
gboolean background_load_failed;
guint initialising : 1;
@@ -1124,9 +1118,6 @@
case PROP_BACKGROUND_IMAGE:
ensure_pixbuf_property (profile, PROP_BACKGROUND_IMAGE_FILE, PROP_BACKGROUND_IMAGE, &priv->background_load_failed);
break;
- case PROP_ICON:
- ensure_pixbuf_property (profile, PROP_ICON_FILE, PROP_ICON, &priv->icon_load_failed);
- break;
default:
break;
}
@@ -1207,13 +1198,6 @@
g_object_notify (object, TERMINAL_PROFILE_BACKGROUND_IMAGE);
break;
- case PROP_ICON_FILE:
- /* Clear the cached icon */
- g_value_set_object (g_value_array_get_nth (priv->properties, PROP_ICON), NULL);
- priv->icon_load_failed = FALSE;
- g_object_notify (object, TERMINAL_PROFILE_ICON);
- break;
-
default:
break;
}
@@ -1371,12 +1355,10 @@
TERMINAL_PROFILE_PROPERTY_INT (SCROLLBACK_LINES, 1, G_MAXINT, DEFAULT_SCROLLBACK_LINES, KEY_SCROLLBACK_LINES);
TERMINAL_PROFILE_PROPERTY_OBJECT (BACKGROUND_IMAGE, GDK_TYPE_PIXBUF, NULL);
- TERMINAL_PROFILE_PROPERTY_OBJECT (ICON, GDK_TYPE_PIXBUF, NULL);
TERMINAL_PROFILE_PROPERTY_STRING_CO (NAME, DEFAULT_NAME, NULL);
TERMINAL_PROFILE_PROPERTY_STRING (BACKGROUND_IMAGE_FILE, DEFAULT_BACKGROUND_IMAGE_FILE, KEY_BACKGROUND_IMAGE_FILE);
TERMINAL_PROFILE_PROPERTY_STRING (CUSTOM_COMMAND, DEFAULT_CUSTOM_COMMAND, KEY_CUSTOM_COMMAND);
- TERMINAL_PROFILE_PROPERTY_STRING (ICON_FILE, DEFAULT_ICON_FILE, KEY_ICON_FILE);
TERMINAL_PROFILE_PROPERTY_STRING (TITLE, _(DEFAULT_TITLE), KEY_TITLE);
TERMINAL_PROFILE_PROPERTY_STRING (VISIBLE_NAME, _(DEFAULT_VISIBLE_NAME), KEY_VISIBLE_NAME);
TERMINAL_PROFILE_PROPERTY_STRING (WORD_CHARS, DEFAULT_WORD_CHARS, KEY_WORD_CHARS);
Modified: trunk/src/terminal-profile.h
==============================================================================
--- trunk/src/terminal-profile.h (original)
+++ trunk/src/terminal-profile.h Thu May 29 19:42:58 2008
@@ -80,8 +80,6 @@
#define TERMINAL_PROFILE_EXIT_ACTION "exit-action"
#define TERMINAL_PROFILE_FONT "font"
#define TERMINAL_PROFILE_FOREGROUND_COLOR "foreground-color"
-#define TERMINAL_PROFILE_ICON_FILE "icon-file"
-#define TERMINAL_PROFILE_ICON "icon"
#define TERMINAL_PROFILE_IS_DEFAULT "is-default"
#define TERMINAL_PROFILE_LOGIN_SHELL "login-shell"
#define TERMINAL_PROFILE_NAME "name"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
