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

Add some accelerators to buttons.

Browse source 
2002-04-18  Jody Goldberg <jody@gnome.org>

	* file-types-capplet-dialogs.c (initialize_edit_applications_dialog) :
	  Add some accelerators to buttons.
	(nautilus_mime_type_capplet_show_change_extension_window) : ditto.
	(run_edit_or_new_application_dialog) : and to checkboxes
	(create_application_list_item) : simplify.  No need for a label and a
	  checkbox in an hbox.

	* file-types-properties.glade : Add some accelerators to buttons and
	  checkboxes.

2002-04-12  Jody Goldberg <jody@gnome.org>

	* mime-type-info.c (mime_type_info_save) : revert part of Lauris's
	  changes that were stripping off the first character of the category.
This commit is contained in:
Jody Goldberg 2002-04-18 13:18:17 +00:00 • committed by Jody Goldberg
parent e1890c39f8
commit 9ea3c4537c
5 changed files with 93 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

17
capplets/file-types/ChangeLog
View file

@ -1,3 +1,20 @@
2002-04-18 Jody Goldberg <jody@gnome.org>
* file-types-capplet-dialogs.c (initialize_edit_applications_dialog) :
Add some accelerators to buttons.
(nautilus_mime_type_capplet_show_change_extension_window) : ditto.
(run_edit_or_new_application_dialog) : and to checkboxes
(create_application_list_item) : simplify. No need for a label and a
checkbox in an hbox.
* file-types-properties.glade : Add some accelerators to buttons and
checkboxes.
2002-04-12 Jody Goldberg <jody@gnome.org>
* mime-type-info.c (mime_type_info_save) : revert part of Lauris's
changes that were stripping off the first character of the category.
Wed Apr 10 18:04:10 2002 Jonathan Blandford <jrb@gnome.org>
* file-types.desktop.in (Exec): s/gnome2/gnome

42
capplets/file-types/file-types-capplet-dialogs.c
View file

@ -168,19 +168,11 @@ create_application_list_item (const char *id, const char *name, const char *mime
gboolean user_owned, GList *short_list)
{
GtkWidget *list_item;
GtkWidget *hbox, *check_button, *label;
GtkWidget *check_button;
check_button = gtk_check_button_new_with_label (name);
list_item = gtk_list_item_new ();
hbox = gtk_hbox_new (FALSE, GNOME_PAD_SMALL);
gtk_container_add (GTK_CONTAINER (list_item), hbox);
check_button = gtk_check_button_new ();
gtk_box_pack_start (GTK_BOX (hbox), check_button, FALSE, FALSE, 0);
label = gtk_label_new (name);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
gtk_container_add (GTK_CONTAINER (list_item), check_button);
gtk_widget_show_all (list_item);
/* Save ID and mime type*/
@ -428,20 +420,20 @@ initialize_edit_applications_dialog (const char *mime_type)
button_holder = g_new (ButtonHolder, 1);
button = gtk_button_new_with_label (_("Add Application..."));
button = gtk_button_new_with_mnemonic (_("_Add Application..."));
gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
gtk_object_set_data_full (GTK_OBJECT (button), "mime_type", g_strdup (mime_type), g_free);
gtk_signal_connect (GTK_OBJECT (button), "clicked", show_new_application_window, list);
gtk_widget_set_sensitive (GTK_WIDGET (button), TRUE);
button_holder->add_button = button;
button = gtk_button_new_with_label (_("Edit Application..."));
button = gtk_button_new_with_mnemonic (_("_Edit Application..."));
gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (button), "clicked", show_edit_application_window, list);
gtk_widget_set_sensitive (GTK_WIDGET (button), FALSE);
button_holder->edit_button = button;
button = gtk_button_new_with_label (_("Delete Application"));
button = gtk_button_new_with_mnemonic (_("_Delete Application"));
gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (button), "clicked", delete_selected_application, list);
gtk_widget_set_sensitive (GTK_WIDGET (button), FALSE);
@ -768,19 +760,21 @@ nautilus_mime_type_capplet_show_new_mime_window (void)
GNOME_STOCK_BUTTON_CANCEL, NULL);
gnome_dialog_set_default (GNOME_DIALOG (dialog), 1);
label = gtk_label_new (_("New MIME type (e.g. image/x-thumper):"));
label = gtk_label_new_with_mnemonic (_("New _MIME type (e.g. image/x-thumper):"));
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox), label, TRUE, TRUE, 0);
mime_entry = gtk_entry_new ();
gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox), mime_entry, TRUE, TRUE, 0);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), mime_entry);
label = gtk_label_new (_("Description (e.g. Thumper image):"));
label = gtk_label_new_with_mnemonic (_("_Description (e.g. Thumper image):"));
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox), label, TRUE, TRUE, 0);
desc_entry = gtk_entry_new ();
gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox), desc_entry, TRUE, TRUE, 0);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), desc_entry);
/* Set up text entry validation signal */
gtk_signal_connect (GTK_OBJECT (mime_entry), "changed",
@ -962,18 +956,16 @@ nautilus_mime_type_capplet_show_change_extension_window (const char *mime_type,
vbox = gtk_vbox_new (FALSE, GNOME_PAD_SMALL);
gtk_box_pack_end (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
button = gtk_button_new_with_label (_("Add..."));
button = gtk_button_new_with_mnemonic (_("_Add..."));
gtk_signal_connect (GTK_OBJECT (button), "clicked",
add_extension_clicked, list);
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
button = gtk_button_new_with_label (_(" Remove "));
button = gtk_button_new_with_mnemonic (_("_Remove"));
gtk_widget_set_sensitive (button, FALSE);
gtk_signal_connect (GTK_OBJECT (button), "clicked",
remove_extension_clicked, list);
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new (""), FALSE, FALSE, 0);
}
/* The left list */
@ -1047,11 +1039,12 @@ nautilus_mime_type_capplet_show_new_extension_window (void)
hbox = gtk_hbox_new (FALSE, GNOME_PAD_SMALL);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox), hbox, FALSE, FALSE, 0);
label = gtk_label_new (_("Extension:"));
label = gtk_label_new_with_mnemonic (_("_Extension:"));
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
hbox = gtk_hbox_new (FALSE, GNOME_PAD_SMALL);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
mime_entry = gtk_entry_new ();
gtk_label_set_mnemonic_widget (GTK_LABEL (label), mime_entry);
gtk_box_pack_start (GTK_BOX (hbox), mime_entry, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox), hbox, FALSE, FALSE, 0);
@ -1266,11 +1259,12 @@ run_edit_or_new_application_dialog (const char *mime_type, GtkWidget *list, Gnom
gtk_table_set_col_spacings (GTK_TABLE (table), GNOME_PAD_SMALL);
/* Application Name label and entry */
label = gtk_label_new (_("Application Name:"));
label = gtk_label_new_with_mnemonic (_("Application _Name:"));
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 0, 1);
app_entry = gtk_entry_new ();
gtk_label_set_mnemonic_widget (GTK_LABEL (label), app_entry);
gtk_table_attach_defaults ( GTK_TABLE (table), app_entry, 1, 2, 0, 1);
if (application != NULL) {
gtk_entry_set_text (GTK_ENTRY (app_entry), application->name);
@ -1294,7 +1288,7 @@ run_edit_or_new_application_dialog (const char *mime_type, GtkWidget *list, Gnom
frame_vbox = gtk_vbox_new (FALSE, GNOME_PAD_SMALL);
gtk_container_add (GTK_CONTAINER (behavior_frame), frame_vbox);
multiple_check_box = gtk_check_button_new_with_label (_("Can open multiple files"));
multiple_check_box = gtk_check_button_new_with_mnemonic (_("Can open _multiple files"));
gtk_box_pack_start (GTK_BOX (frame_vbox), multiple_check_box, FALSE, FALSE, 0);
initial_toggle_state = application == NULL
? FALSE
@ -1302,7 +1296,7 @@ run_edit_or_new_application_dialog (const char *mime_type, GtkWidget *list, Gnom
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (multiple_check_box), initial_toggle_state);
/* FIXME bugzilla.eazel.com 6066: This needs to be three options now: "yes", "no", and "use uris for non-file locations" */
uri_check_box = gtk_check_button_new_with_label (_("Can open from URI"));
uri_check_box = gtk_check_button_new_with_mnemonic (_("Can open from _URI"));
gtk_box_pack_start (GTK_BOX (frame_vbox), uri_check_box, FALSE, FALSE, 0);
initial_toggle_state = application == NULL
? FALSE

72
capplets/file-types/file-types-properties.glade
View file

@ -132,7 +132,8 @@
<widget class="GtkButton" id="add_mime_button">
<property name="can_default">yes</property>
<property name="can_focus">yes</property>
<property name="label" translatable="yes">Add file type...</property>
<property name="label" translatable="yes">Add _file type...</property>
<property name="use_underline">yes</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="visible">yes</property>
</widget>
@ -142,7 +143,8 @@
<widget class="GtkButton" id="add_service_button">
<property name="can_default">yes</property>
<property name="can_focus">yes</property>
<property name="label" translatable="yes">Add service...</property>
<property name="label" translatable="yes">Add _service...</property>
<property name="use_underline">yes</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="visible">yes</property>
</widget>
@ -152,7 +154,8 @@
<widget class="GtkButton" id="edit_button">
<property name="can_default">yes</property>
<property name="can_focus">yes</property>
<property name="label" translatable="yes">Edit...</property>
<property name="label" translatable="yes">_Edit...</property>
<property name="use_underline">yes</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="visible">yes</property>
</widget>
@ -162,7 +165,8 @@
<widget class="GtkButton" id="remove_button">
<property name="can_default">yes</property>
<property name="can_focus">yes</property>
<property name="label" translatable="yes">Remove</property>
<property name="label" translatable="yes">_Remove</property>
<property name="use_underline">yes</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="visible">yes</property>
</widget>
@ -266,7 +270,7 @@
<child>
<widget class="GtkLabel" id="description_label">
<property name="label" translatable="yes">Description</property>
<property name="label" translatable="yes">_Description</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
<property name="wrap">no</property>
<property name="xalign">0.5</property>
@ -274,6 +278,8 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="visible">yes</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">description_entry</property>
</widget>
<packing>
<property name="padding">0</property>
@ -313,7 +319,7 @@
<child>
<widget class="GtkLabel" id="mime_type_label">
<property name="label" translatable="yes">MIME Type</property>
<property name="label" translatable="yes">_MIME Type</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
<property name="wrap">no</property>
<property name="xalign">0.5</property>
@ -321,6 +327,8 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="visible">yes</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">mime_type_entry</property>
</widget>
<packing>
<property name="padding">0</property>
@ -360,7 +368,7 @@
<child>
<widget class="GtkLabel" id="category_label">
<property name="label" translatable="yes">Category</property>
<property name="label" translatable="yes">_Category</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
<property name="wrap">no</property>
<property name="xalign">0</property>
@ -368,6 +376,8 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="visible">yes</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">category_entry</property>
</widget>
<packing>
<property name="padding">0</property>
@ -395,7 +405,8 @@
<child>
<widget class="GtkButton" id="choose_button">
<property name="can_focus">yes</property>
<property name="label" translatable="yes">Choose...</property>
<property name="label" translatable="yes">_Choose...</property>
<property name="use_underline">yes</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="visible">yes</property>
</widget>
@ -434,7 +445,8 @@
<widget class="GtkButton" id="add_ext_button">
<property name="can_default">yes</property>
<property name="can_focus">yes</property>
<property name="label" translatable="yes">Add</property>
<property name="label" translatable="yes">_Add</property>
<property name="use_underline">yes</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="visible">yes</property>
</widget>
@ -475,7 +487,8 @@
<widget class="GtkButton" id="remove_ext_button">
<property name="can_default">yes</property>
<property name="can_focus">yes</property>
<property name="label" translatable="yes">Remove</property>
<property name="label" translatable="yes">_Remove</property>
<property name="use_underline">yes</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="visible">yes</property>
</widget>
@ -572,7 +585,8 @@
<child>
<widget class="GtkCheckButton" id="use_category_defaults_toggle">
<property name="can_focus">yes</property>
<property name="label" translatable="yes">Use category defaults</property>
<property name="label" translatable="yes">Use category _defaults</property>
<property name="use_underline">True</property>
<property name="active">no</property>
<property name="draw_indicator">yes</property>
<property name="visible">yes</property>
@ -692,7 +706,7 @@
<child>
<widget class="GtkLabel" id="program_label">
<property name="label" translatable="yes">Program to execute</property>
<property name="label" translatable="yes">_Program to execute</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
<property name="wrap">no</property>
<property name="xalign">0</property>
@ -700,6 +714,8 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="visible">yes</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">combo-entry1</property>
</widget>
<packing>
<property name="padding">0</property>
@ -742,7 +758,8 @@
<child>
<widget class="GtkCheckButton" id="needs_terminal_toggle">
<property name="can_focus">yes</property>
<property name="label" translatable="yes">Needs terminal</property>
<property name="label" translatable="yes">Needs _terminal</property>
<property name="use_underline">True</property>
<property name="active">no</property>
<property name="draw_indicator">yes</property>
<property name="visible">yes</property>
@ -853,7 +870,7 @@
<child>
<widget class="GtkLabel" id="description_label">
<property name="label" translatable="yes">Description</property>
<property name="label" translatable="yes">_Description</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
<property name="wrap">no</property>
<property name="xalign">0.5</property>
@ -861,6 +878,8 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="visible">yes</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">description_entry</property>
</widget>
<packing>
<property name="padding">0</property>
@ -900,7 +919,7 @@
<child>
<widget class="GtkLabel" id="protocol_label">
<property name="label" translatable="yes">Protocol name</property>
<property name="label" translatable="yes">_Protocol name</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
<property name="wrap">no</property>
<property name="xalign">0.5</property>
@ -908,6 +927,8 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="visible">yes</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">protocol_entry</property>
</widget>
<packing>
<property name="padding">0</property>
@ -1011,7 +1032,7 @@
<child>
<widget class="GtkLabel" id="custom_program_label">
<property name="label" translatable="yes">Program</property>
<property name="label" translatable="yes">_Program</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
<property name="wrap">no</property>
<property name="xalign">0.5</property>
@ -1019,6 +1040,8 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="visible">yes</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">combo-entry2</property>
</widget>
<packing>
<property name="padding">0</property>
@ -1061,7 +1084,8 @@
<child>
<widget class="GtkCheckButton" id="needs_terminal_toggle">
<property name="can_focus">yes</property>
<property name="label" translatable="yes">Needs terminal</property>
<property name="label" translatable="yes">Needs _terminal</property>
<property name="use_underline">True</property>
<property name="active">no</property>
<property name="draw_indicator">yes</property>
<property name="visible">yes</property>
@ -1161,7 +1185,7 @@
<child>
<widget class="GtkLabel" id="name_label">
<property name="label" translatable="yes">Name</property>
<property name="label" translatable="yes">_Name</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
<property name="wrap">no</property>
<property name="xalign">0.5</property>
@ -1169,6 +1193,8 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="visible">yes</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">name_entry</property>
</widget>
<packing>
<property name="padding">0</property>
@ -1217,7 +1243,8 @@
<child>
<widget class="GtkCheckButton" id="use_category_toggle">
<property name="can_focus">yes</property>
<property name="label" translatable="yes">Use parent category defaults</property>
<property name="label" translatable="yes">Use parent category _defaults</property>
<property name="use_underline">True</property>
<property name="active">no</property>
<property name="draw_indicator">yes</property>
<property name="visible">yes</property>
@ -1287,7 +1314,7 @@
<child>
<widget class="GtkLabel" id="program_label">
<property name="label" translatable="yes">Program to execute</property>
<property name="label" translatable="yes">_Program to execute</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
<property name="wrap">no</property>
<property name="xalign">0</property>
@ -1295,6 +1322,8 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="visible">yes</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">program_entry</property>
</widget>
<packing>
<property name="padding">0</property>
@ -1337,7 +1366,8 @@
<child>
<widget class="GtkCheckButton" id="needs_terminal_toggle">
<property name="can_focus">yes</property>
<property name="label" translatable="yes">Needs terminal</property>
<property name="label" translatable="yes">Needs _terminal</property>
<property name="use_underline">True</property>
<property name="active">no</property>
<property name="draw_indicator">yes</property>
<property name="visible">yes</property>

1
capplets/file-types/mime-edit-dialog.c
View file

@ -665,7 +665,6 @@ store_data (MimeEditDialog *dialog)
tmp1 = gtk_entry_get_text (GTK_ENTRY (WID ("category_entry")));
if (strcmp (tmp, tmp1)) {
cat_changed = TRUE;
if (tmp1[0] == '/') tmp1 += 1;
mime_type_info_set_category_name (dialog->p->info, tmp1, tmp1, dialog->p->model);
}
g_free (tmp);

20
capplets/file-types/mime-type-info.c
View file

@ -34,7 +34,6 @@
#include <libgnomevfs/gnome-vfs-application-registry.h>
#include <libgnomevfs/gnome-vfs-utils.h>
#include <gconf/gconf-client.h>
#include <ctype.h>
#include "libuuid/uuid.h"
@ -281,7 +280,7 @@ mime_type_info_save (const MimeTypeInfo *info)
gnome_vfs_mime_set_default_component (info->mime_type, NULL);
tmp = mime_type_info_get_category_name (info);
gnome_vfs_mime_set_value (info->mime_type, "category", tmp + 1);
gnome_vfs_mime_set_value (info->mime_type, "category", tmp);
g_free (tmp);
gnome_vfs_mime_set_value (info->mime_type, "use_category_default", info->use_category ? "yes" : "no");
@ -333,7 +332,8 @@ get_gconf_base_name (MimeCategoryInfo *category)
tmp1 = mime_category_info_get_full_name (category);
for (tmp = tmp1; *tmp != '\0'; tmp++)
if (isspace (*tmp) || *tmp == '(' || *tmp == ')') *tmp = '-';
if (g_ascii_isspace (*tmp) || *tmp == '(' || *tmp == ')')
*tmp = '-';
tmp = g_strconcat ("/desktop/gnome/file-types-categories/", tmp1, NULL);
@ -887,16 +887,10 @@ get_category (const gchar *category_name, const gchar *category_desc, GtkTreeMod
if (category_name == NULL && category_desc == NULL)
return NULL;
if (category_name != NULL) {
cf = g_strsplit (category_name, "/", -1);
categories = (category_name[0] == '/') ? cf : cf;
}
if (category_desc != NULL) {
df = g_strsplit (category_desc, "/", -1);
desc_categories = (category_desc[0] == '/') ? df : df;
}
if (category_name != NULL)
categories = cf = g_strsplit (category_name, "/", -1);
if (category_desc != NULL)
desc_categories = df = g_strsplit (category_desc, "/", -1);
if (category_name == NULL)
categories = desc_categories;
else if (category_desc == NULL)