applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ui-review

Browse source
This commit is contained in:
Jody Goldberg 2002-07-10 17:02:59 +00:00
parent 6f4eb48226
commit 71b67b6586
33 changed files with 126 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

2
capplets/accessibility/keyboard/accessibility-keyboard.desktop.in
View file

@ -1,6 +1,6 @@
[Desktop Entry]
_Name=Keyboard
_Comment=Keyboard Accessibility Properties
_Comment=Set your keyboard accessibility preferences
Exec=gnome-accessibility-keyboard-properties
Icon=accessibility-keyboard-capplet.png
Terminal=0

2
capplets/background/background.desktop.in
View file

@ -1,6 +1,6 @@
[Desktop Entry]
_Name=Background
_Comment=Change the desktop background
_Comment=Customize your desktop background
Exec=gnome-background-properties
Icon=background-capplet.png
Terminal=0

11
capplets/common/ChangeLog
View file

@ -1,3 +1,14 @@
2002-07-10 Jody Goldberg <jody@gnome.org>
* capplet-util.c (capplet_set_icon) : look in more places.
2002-07-02 Jody Goldberg <jody@gnome.org>
http://bugzilla.gnome.org/show_bug.cgi?id=86018
* gconf-property-editor.c (peditor_image_set_filename) : Patch from
Chema. We should only assign the filename to the label if the file
is valid.
2002-06-27 Jody Goldberg <jody@gnome.org>
* capplet-util.c (capplet_set_icon) : new util.

24
capplets/common/capplet-util.c
View file

@ -352,16 +352,22 @@ capplet_help (GtkWindow *parent, char const *helpfile, char const *section)
void
capplet_set_icon (GtkWidget *window, char const *icon_file_name)
{
char *path = gnome_program_locate_file (NULL,
GNOME_FILE_DOMAIN_APP_PIXMAP,
icon_file_name, TRUE, NULL);
char *path;
GdkPixbuf *icon_pixbuf;
if (path != NULL) {
GdkPixbuf *icon_pixbuf = gdk_pixbuf_new_from_file (path, NULL);
if (icon_pixbuf != NULL) {
gtk_window_set_icon (GTK_WINDOW (window), icon_pixbuf);
g_object_unref (icon_pixbuf);
path = g_strconcat (GNOMECC_DATA_DIR "/icons/", icon_file_name, NULL);
icon_pixbuf = gdk_pixbuf_new_from_file (path, NULL);
g_free (path);
if (icon_pixbuf == NULL) {
path = gnome_pixmap_file (icon_file_name);
if (path != NULL) {
icon_pixbuf = gdk_pixbuf_new_from_file (path, NULL);
g_free (path);
}
g_free (path);
}
if (icon_pixbuf != NULL) {
gtk_window_set_icon (GTK_WINDOW (window), icon_pixbuf);
g_object_unref (icon_pixbuf);
}
}

2
capplets/common/gconf-property-editor.c
View file

@ -1504,7 +1504,7 @@ peditor_image_set_filename (GConfPropertyEditor *peditor, const gchar *filename)
{
if (GTK_IS_IMAGE (l->data))
image = GTK_IMAGE (l->data);
else if (GTK_IS_LABEL (l->data))
else if (GTK_IS_LABEL (l->data) && message == NULL)
{
gchar *base = g_path_get_basename (filename);
gtk_label_set_text (GTK_LABEL (l->data), base);

2
capplets/default-applications/default-applications.desktop.in
View file

@ -1,6 +1,6 @@
[Desktop Entry]
_Name=Preferred Applications
_Comment=Choose the applications used by default
_Comment=Select your default applications
Exec=gnome-default-applications-properties
Icon=default-applications-capplet.png
Terminal=0

2
capplets/desktop-links/Sawfish/appearance-properties.desktop.in
View file

@ -1,6 +1,6 @@
[Desktop Entry]
_Name=Appearance
_Comment=Configure window appearance
_Comment=Select themes and fonts for your windows
Exec=sawfish-capplet --sawfish-group=appearance
Icon=sawfish-appearance.png
Terminal=0

2
capplets/desktop-links/Sawfish/bindings-properties.desktop.in
View file

@ -1,6 +1,6 @@
[Desktop Entry]
_Name=Shortcuts
_Comment=Configure key shortcuts
_Comment=Customize shortcut keys for your windows
Exec=sawfish-capplet --sawfish-group=bindings
Icon=sawfish-shortcuts.png
Terminal=0

2
capplets/desktop-links/Sawfish/focus-properties.desktop.in
View file

@ -1,6 +1,6 @@
[Desktop Entry]
_Name=Focus behavior
_Comment=Configure window focusing
_Comment=Configure how to give focus to windows
Exec=sawfish-capplet --sawfish-group=focus
Icon=sawfish-focus.png
Terminal=0

2
capplets/desktop-links/Sawfish/match-properties.desktop.in
View file

@ -1,6 +1,6 @@
[Desktop Entry]
_Name=Matched Windows
_Comment=Configure window properties
_Comment=Configure matched windows to have particular characteristics
Exec=sawfish-capplet --sawfish-group=match-window
Icon=sawfish-matched.png
Terminal=0

2
capplets/desktop-links/Sawfish/maximize-properties.desktop.in
View file

@ -1,6 +1,6 @@
[Desktop Entry]
_Name=Minimizing and Maximizing
_Comment=Configure window minimization and maximization
_Comment=Configure how to minimize, maximize, and restore windows
Exec=sawfish-capplet --sawfish-group=min-max
Icon=sawfish-minmax.png
Terminal=0

2
capplets/desktop-links/Sawfish/meta-properties.desktop.in
View file

@ -1,6 +1,6 @@
[Desktop Entry]
_Name=Meta
_Comment=Configure window manager configuration properties
_Comment=Select your Sawfish user level
Exec=sawfish-capplet --sawfish-no-flatten
Icon=gnome-ccdialog.png
Terminal=0

2
capplets/desktop-links/Sawfish/misc-properties.desktop.in
View file

@ -1,6 +1,6 @@
[Desktop Entry]
_Name=Miscellaneous
_Comment=Configure miscellaneous window features
_Comment=Select miscellaneous window options
Exec=sawfish-capplet --sawfish-group=misc
Icon=sawfish-misc.png
Terminal=0

2
capplets/desktop-links/Sawfish/move-properties.desktop.in
View file

@ -1,6 +1,6 @@
[Desktop Entry]
_Name=Moving and Resizing
_Comment=Configure window move/resize
_Comment=Configure how windows move and resize
Exec=sawfish-capplet --sawfish-group=move
Icon=sawfish-moveresize.png
Terminal=0

2
capplets/desktop-links/Sawfish/placement-properties.desktop.in
View file

@ -1,6 +1,6 @@
[Desktop Entry]
_Name=Placement
_Comment=Configure window placement
_Comment=Configure positioning of windows on the desktop
Exec=sawfish-capplet --sawfish-group=placement
Icon=sawfish-placement.png
Terminal=0

2
capplets/desktop-links/Sawfish/sound-properties.desktop.in
View file

@ -1,6 +1,6 @@
[Desktop Entry]
_Name=Sound
_Comment=Enable window manager sound events
_Comment=Associate sounds with window manager events
Exec=sawfish-capplet --sawfish-group=audio
Icon=gnome-multimedia.png
Terminal=0

2
capplets/desktop-links/Sawfish/workspace-properties.desktop.in
View file

@ -1,6 +1,6 @@
[Desktop Entry]
_Name=Workspaces
_Comment=Configure workspaces
_Comment=Configure your workspaces and viewports
Exec=sawfish-capplet --sawfish-group=workspace
Icon=sawfish-workspaces.png
Terminal=0

2
capplets/file-types/file-types.desktop.in
View file

@ -1,6 +1,6 @@
[Desktop Entry]
_Name=File Types and Programs
_Comment=Specify which programs are used to open or view each file type
_Comment=Associate applications with file types
Icon=gnome-ccmime.png
Exec=gnome-file-types-properties
Terminal=0

2
capplets/font/font-properties.desktop.in
View file

@ -1,6 +1,6 @@
[Desktop Entry]
_Name=Font
_Comment=Change the default fonts used by the desktop and applications
_Comment=Select fonts for the desktop
Exec=gnome-font-properties
Icon=font-capplet.png
Terminal=0

6
capplets/keybindings/eggcellrendererkeys.c
View file

@ -306,7 +306,7 @@ egg_cell_renderer_keys_get_size (GtkCellRenderer *cell,
GtkRequisition requisition;
if (keys->sizing_label == NULL)
keys->sizing_label = gtk_label_new (_("Type a new accelerator, or press Backspace to clear"));
keys->sizing_label = gtk_label_new (_("Type a new shortcut"));
gtk_widget_size_request (keys->sizing_label, &requisition);
(* GTK_CELL_RENDERER_CLASS (parent_class)->get_size) (cell, widget, cell_area, x_offset, y_offset, width, height);
@ -503,10 +503,10 @@ egg_cell_renderer_keys_start_editing (GtkCellRenderer *cell,
if (keys->accel_key != 0)
gtk_label_set_text (GTK_LABEL (label),
_("Type a new accelerator, or press Backspace to clear"));
_("Type a new shortcut"));
else
gtk_label_set_text (GTK_LABEL (label),
_("Type a new accelerator"));
_("Type a new shortcut"));
gtk_container_add (GTK_CONTAINER (eventbox), label);

51
capplets/keybindings/gnome-keybinding-properties.c
View file

@ -136,8 +136,16 @@ make_key_theme_menu_item (const gchar *key_theme)
{
GtkWidget *retval;
retval = gtk_menu_item_new_with_label (key_theme);
g_object_set_data_full (G_OBJECT (retval), LABEL_DATA, g_strdup (key_theme), g_free);
if (!strcmp (key_theme, "Default"))
{
retval = gtk_menu_item_new_with_label ("GNOME Default");
g_object_set_data_full (G_OBJECT (retval), LABEL_DATA, g_strdup ("Default"), g_free);
}
else
{
retval = gtk_menu_item_new_with_label (key_theme);
g_object_set_data_full (G_OBJECT (retval), LABEL_DATA, g_strdup (key_theme), g_free);
}
g_signal_connect (G_OBJECT (retval), "activate", G_CALLBACK (menu_item_activate), NULL);
gtk_widget_show (retval);
@ -438,15 +446,9 @@ append_keys_to_tree (GladeXML *dialog,
}
if (i == 0)
{
gtk_widget_hide (WID ("shortcuts_vbox"));
gtk_widget_hide (WID ("shortcuts_hbox"));
}
else
{
gtk_widget_show (WID ("shortcuts_vbox"));
gtk_widget_show (WID ("shortcuts_hbox"));
}
}
static void
@ -594,10 +596,10 @@ theme_changed_func (gpointer uri,
menu_item = make_key_theme_menu_item (info->name);
if (!strcmp (info->name, "Default"))
/* Put default first, always */
gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menu_item);
/* Put default first, always */
gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menu_item);
else
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
}
gtk_widget_show (menu);
@ -682,6 +684,7 @@ setup_dialog (GladeXML *dialog)
GConfClient *client;
GList *key_theme_list;
GtkCellRenderer *renderer;
GtkTreeViewColumn *column;
GtkWidget *widget;
gboolean found_keys = FALSE;
GList *list;
@ -710,7 +713,6 @@ setup_dialog (GladeXML *dialog)
gtk_dialog_run (GTK_DIALOG (msg_dialog));
gtk_widget_destroy (msg_dialog);
gtk_widget_hide (WID ("shortcut_hbox"));
}
else
{
@ -728,12 +730,14 @@ setup_dialog (GladeXML *dialog)
"button_press_event",
G_CALLBACK (start_editing_cb), dialog),
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (WID ("shortcut_treeview")),
-1,
_("Action"),
gtk_cell_renderer_text_new (),
"text", DESCRIPTION_COLUMN,
NULL);
column = gtk_tree_view_column_new_with_attributes (_("Action"),
gtk_cell_renderer_text_new (),
"text", DESCRIPTION_COLUMN,
NULL);
gtk_tree_view_column_set_resizable (column, TRUE);
gtk_tree_view_append_column (GTK_TREE_VIEW (WID ("shortcut_treeview")), column);
renderer = (GtkCellRenderer *) g_object_new (EGG_TYPE_CELL_RENDERER_KEYS,
"editable", TRUE,
NULL);
@ -741,10 +745,13 @@ setup_dialog (GladeXML *dialog)
"keys_edited",
G_CALLBACK (accel_edited_callback),
WID ("shortcut_treeview"));
gtk_tree_view_insert_column_with_data_func (GTK_TREE_VIEW (WID ("shortcut_treeview")),
-1, _("Shortcut"),
renderer,
accel_set_func, NULL, NULL);
column = gtk_tree_view_column_new_with_attributes (_("Shortcut"), renderer, NULL);
gtk_tree_view_column_set_cell_data_func (column, renderer, accel_set_func, NULL, NULL);
gtk_tree_view_column_set_resizable (column, TRUE);
gtk_tree_view_append_column (GTK_TREE_VIEW (WID ("shortcut_treeview")), column);
gconf_client_add_dir (client, "/apps/gnome_keybinding_properties", GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
gconf_client_add_dir (client, "/apps/metacity/general", GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
gconf_client_notify_add (client,

87
capplets/keybindings/gnome-keybinding-properties.glade
View file

@ -26,18 +26,17 @@
<property name="layout_style">GTK_BUTTONBOX_END</property>
<property name="spacing">10</property>
<child>
<widget class="GtkButton" id="helpbutton1">
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="can_focus">True</property>
<property name="label">gtk-help</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="response_id">-11</property>
</widget>
</child>
<child>
<widget class="GtkButton" id="helpbutton1">
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="can_focus">True</property>
<property name="label">gtk-help</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="response_id">-11</property>
</widget>
</child>
<child>
<widget class="GtkButton" id="closebutton1">
@ -76,7 +75,7 @@
<child>
<widget class="GtkLabel" id="label8">
<property name="visible">True</property>
<property name="label" translatable="yes">Keyboard _Navigation scheme for use in applications:</property>
<property name="label" translatable="yes">_Text editing shortcuts:</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@ -103,18 +102,23 @@
<accessibility>
<atkproperty name="AtkObject::accessible_description" translatable="yes">Click for a list of keyboard navigation schemes.</atkproperty>
</accessibility>
<child>
<widget class="GtkMenu" id="menu1">
</widget>
</child>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="fill">False</property>
</packing>
</child>
@ -179,57 +183,6 @@
<property name="fill">True</property>
</packing>
</child>
<child>
<widget class="GtkHBox" id="shortcuts_hbox">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">8</property>
<child>
<widget class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="stock">gtk-dialog-info</property>
<property name="icon_size">6</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">True</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label10">
<property name="visible">True</property>
<property name="label" translatable="yes">To assign a shortcut to an action, click in the shortcut column and press the key combination you want to associate with it.</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">True</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>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">True</property>
</packing>
</child>
</widget>
<packing>
<property name="padding">0</property>

2
capplets/keybindings/keybinding.desktop.in
View file

@ -1,6 +1,6 @@
[Desktop Entry]
_Name=Keyboard Shortcuts
_Comment=Associate keyboard shortcuts with panel actions
_Comment=Assign shortcut keys to commands
Exec=gnome-keybinding-properties
Icon=keyboard-shortcut.png
Terminal=0

2
capplets/keyboard/keyboard.desktop.in
View file

@ -1,6 +1,6 @@
[Desktop Entry]
_Name=Keyboard
_Comment=Keyboard Properties
_Comment=Set your keyboard preferences
Exec=gnome-keyboard-properties
Icon=keyboard-capplet.png
Terminal=0

14
capplets/mime-type/mime-data.c
View file

@ -223,7 +223,7 @@ mime_load_from_dir (const char *mime_info_dir, gboolean system_dir)
if (!dir)
return;
if (system_dir) {
filename = g_concat_dir_and_file (mime_info_dir, "gnome.mime");
filename = g_build_filename (mime_info_dir, "gnome.mime", NULL);
mime_fill_from_file (filename, FALSE);
g_free (filename);
}
@ -241,12 +241,12 @@ mime_load_from_dir (const char *mime_info_dir, gboolean system_dir)
if (!system_dir && !strcmp (dent->d_name, "user.mime"))
continue;
filename = g_concat_dir_and_file (mime_info_dir, dent->d_name);
filename = g_build_filename (mime_info_dir, dent->d_name, NULL);
mime_fill_from_file (filename, FALSE);
g_free (filename);
}
if (!system_dir) {
filename = g_concat_dir_and_file (mime_info_dir, "user.mime");
filename = g_build_filename (mime_info_dir, "user.mime", NULL);
mime_fill_from_file (filename, TRUE);
g_free (filename);
}
@ -473,7 +473,7 @@ init_mime_type (void)
mime_load_from_dir (mime_info_dir, TRUE);
g_free (mime_info_dir);
mime_info_dir = g_concat_dir_and_file (gnome_util_user_home (), ".gnome/mime-info");
mime_info_dir = g_build_filename (gnome_util_user_home (), ".gnome/mime-info", NULL);
mime_load_from_dir (mime_info_dir, FALSE);
g_free (mime_info_dir);
finalize_user_mime ();
@ -581,7 +581,7 @@ write_mime (GHashTable *hash)
FILE *file;
GtkWidget *error_box;
dirname = g_concat_dir_and_file (gnome_util_user_home (), ".gnome/mime-info");
dirname = g_build_filename (gnome_util_user_home (), ".gnome/mime-info", NULL);
if ((stat (dirname, &s) < 0) || !(S_ISDIR (s.st_mode))){
if (errno == ENOENT) {
if (mkdir (dirname, S_IRWXU) < 0) {
@ -597,7 +597,7 @@ write_mime (GHashTable *hash)
return;
}
}
filename = g_concat_dir_and_file (dirname, "user.mime");
filename = g_build_filename (dirname, "user.mime", NULL);
remove (filename);
file = fopen (filename, "w");
@ -646,7 +646,7 @@ discard_mime_info ()
user_mime_types = g_hash_table_new (g_str_hash, g_str_equal);
initial_user_mime_types = g_hash_table_new (g_str_hash, g_str_equal);
filename = g_concat_dir_and_file (gnome_util_user_home (), "/.gnome/mime-info/user.keys");
filename = g_build_filename (gnome_util_user_home (), "/.gnome/mime-info/user.keys", NULL);
mime_fill_from_file (filename, TRUE);
finalize_user_mime ();
reread_list ();

8
capplets/mime-type/mime-info.c
View file

@ -325,7 +325,7 @@ init_mime_info (void)
initial_specific_types = g_hash_table_new (g_str_hash, g_str_equal);
initial_generic_types = g_hash_table_new (g_str_hash, g_str_equal);
filename = g_concat_dir_and_file (gnome_util_user_home (), "/.gnome/mime-info/user.keys");
filename = g_build_filename (gnome_util_user_home (), "/.gnome/mime-info/user.keys", NULL);
load_mime_type_info_from (filename);
g_free (filename);
}
@ -420,7 +420,7 @@ write_keys (GHashTable *spec_hash, GHashTable *generic_hash)
FILE *file;
GtkWidget *error_box;
dirname = g_concat_dir_and_file (gnome_util_user_home (), ".gnome/mime-info");
dirname = g_build_filename (gnome_util_user_home (), ".gnome/mime-info", NULL);
if ((stat (dirname, &s) < 0) || !(S_ISDIR (s.st_mode))){
if (errno == ENOENT) {
if (mkdir (dirname, S_IRWXU) < 0) {
@ -436,7 +436,7 @@ write_keys (GHashTable *spec_hash, GHashTable *generic_hash)
return;
}
}
filename = g_concat_dir_and_file (dirname, "user.keys");
filename = g_build_filename (dirname, "user.keys", NULL);
remove (filename);
file = fopen (filename, "w");
@ -479,7 +479,7 @@ discard_key_info (void)
specific_types = g_hash_table_new (g_str_hash, g_str_equal);
generic_types = g_hash_table_new (g_str_hash, g_str_equal);
filename = g_concat_dir_and_file (gnome_util_user_home (), "/.gnome/mime-info/user.keys");
filename = g_build_filename (gnome_util_user_home (), "/.gnome/mime-info/user.keys", NULL);
load_mime_type_info_from (filename);
reread_list ();
g_free (filename);

2
capplets/mouse/mouse.desktop.in
View file

@ -1,6 +1,6 @@
[Desktop Entry]
_Name=Mouse
_Comment=Mouse Properties
_Comment=Set your mouse preferences
Exec=gnome-mouse-properties
Icon=mouse-capplet.png
Terminal=0

2
capplets/sound/sound-properties.glade
View file

@ -3,7 +3,7 @@
<glade-interface>
<widget class="GtkWindow" id="window1">
<property name="title" translatable="yes">window2</property>
<property name="title" translatable="yes">Sound Preferences</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="modal">no</property>
<property name="allow_shrink">no</property>

2
capplets/sound/sound.desktop.in
View file

@ -1,6 +1,6 @@
[Desktop Entry]
_Name=Sound
_Comment=Configure GNOME's use of sound
_Comment=Enable sound and associate sounds with events
Exec=gnome-sound-properties
Icon=gnome-audio2.png
Terminal=0

2
capplets/theme-switcher/gtk-theme-selector.desktop.in
View file

@ -1,6 +1,6 @@
[Desktop Entry]
_Name=Theme
_Comment=Change the appearance of buttons, scrollbars, etc
_Comment=Select themes for various parts of the desktop
Exec=gnome-theme-properties
Icon=gnome-ccthemes.png
Terminal=0

2
capplets/ui-properties/behavior.desktop.in
View file

@ -1,6 +1,6 @@
[Desktop Entry]
_Name=Toolbars & Menus
_Comment=Change how toolbars and menus are displayed
_Comment=Customize the appearance of toolbars and menubars in applications
Exec=gnome-ui-properties
Icon=behavior-capplet.png
Terminal=0

2
capplets/windows/gnome-window-properties.glade
View file

@ -6,7 +6,7 @@
<widget class="GtkWindow" id="window1">
<property name="visible">True</property>
<property name="title" translatable="yes">Window Properties</property>
<property name="title" translatable="yes">Window Preferences</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
<property name="modal">False</property>