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

fixes for utf and non-utf locales

Browse source
This commit is contained in:
Sergey V. Udaltsov 2004-01-10 00:06:29 +00:00
parent 4a5e483105
commit 9d9d09a564
3 changed files with 458 additions and 473 deletions
Download patch file Download diff file Expand all files Collapse all files

2
capplets/keyboard/gnome-keyboard-properties-xkb.c
View file

@ -135,7 +135,7 @@ add_model_to_option_menu (const XklConfigItemPtr configItem, GtkWidget * menu)
GtkWidget *menuItem = GTK_WIDGET (existingItemNode->data);
GtkWidget *lbl = GTK_BIN (menuItem)->child;
const char *txt = gtk_label_get_text (GTK_LABEL (lbl));
if (g_strcasecmp (txt, utfModelName) > 0)
if (g_utf8_collate(txt, utfModelName) > 0)
break;
}
g_free (utfModelName);

106
capplets/keyboard/gnome-keyboard-properties-xkblt.c
View file

@ -47,7 +47,8 @@ static int maxSelectedLayouts = -1;
void
clear_xkb_elements_list (GSList * list)
{
while (list != NULL) {
while (list != NULL)
{
GSList *p = list;
list = list->next;
g_free (p->data);
@ -72,10 +73,8 @@ add_variant_to_available_layouts_tree (const XklConfigItemPtr
GtkWidget *layoutsTree = WID ("xkb_layouts_available");
GtkTreeIter iter;
GtkTreeStore *treeStore =
GTK_TREE_STORE (gtk_tree_view_get_model
(GTK_TREE_VIEW (layoutsTree)));
const gchar *fullLayoutName =
GSwitchItConfigMergeItems (current1stLevelId,
GTK_TREE_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (layoutsTree)));
const gchar *fullLayoutName = GSwitchItConfigMergeItems (current1stLevelId,
configItem->name);
char *utfVariantName = xci_desc_to_utf8 (configItem);
@ -91,8 +90,7 @@ add_layout_to_available_layouts_tree (const XklConfigItemPtr
{
GtkWidget *layoutsTree = WID ("xkb_layouts_available");
GtkTreeStore *treeStore =
GTK_TREE_STORE (gtk_tree_view_get_model
(GTK_TREE_VIEW (layoutsTree)));
GTK_TREE_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (layoutsTree)));
char *utfLayoutName = xci_desc_to_utf8 (configItem);
gtk_tree_store_append (treeStore, &current1stLevelIter, NULL);
@ -104,8 +102,7 @@ add_layout_to_available_layouts_tree (const XklConfigItemPtr
XklConfigEnumLayoutVariants (configItem->name,
(ConfigItemProcessFunc)
add_variant_to_available_layouts_tree,
dialog);
add_variant_to_available_layouts_tree, dialog);
}
static void
@ -119,13 +116,11 @@ enable_disable_layouts_buttons (GladeXML * dialog)
GtkWidget *selectedLayoutsTree = WID ("xkb_layouts_selected");
GtkTreeSelection *aSelection =
gtk_tree_view_get_selection (GTK_TREE_VIEW
(availableLayoutsTree));
gtk_tree_view_get_selection (GTK_TREE_VIEW (availableLayoutsTree));
const int nSelectedAvailableLayouts =
gtk_tree_selection_count_selected_rows (aSelection);
GtkTreeSelection *sSelection =
gtk_tree_view_get_selection (GTK_TREE_VIEW
(selectedLayoutsTree));
gtk_tree_view_get_selection (GTK_TREE_VIEW (selectedLayoutsTree));
const int nSelectedSelectedLayouts =
gtk_tree_selection_count_selected_rows (sSelection);
gboolean canMoveUp = FALSE;
@ -139,16 +134,15 @@ enable_disable_layouts_buttons (GladeXML * dialog)
gtk_widget_set_sensitive (addLayoutBtn,
(nSelectedAvailableLayouts > 0)
&& (nSelectedLayouts <
maxSelectedLayouts));
gtk_widget_set_sensitive (delLayoutBtn,
nSelectedSelectedLayouts > 0);
&& (nSelectedLayouts < maxSelectedLayouts));
gtk_widget_set_sensitive (delLayoutBtn, nSelectedSelectedLayouts > 0);
if (gtk_tree_selection_get_selected (sSelection, NULL, &iter)) {
GtkTreePath *path =
gtk_tree_model_get_path (selectedLayoutsModel,
if (gtk_tree_selection_get_selected (sSelection, NULL, &iter))
{
GtkTreePath *path = gtk_tree_model_get_path (selectedLayoutsModel,
&iter);
if (path != NULL) {
if (path != NULL)
{
int *indices = gtk_tree_path_get_indices (path);
int idx = indices[0];
canMoveUp = idx > 0;
@ -168,8 +162,7 @@ prepare_selected_layouts_tree (GladeXML * dialog)
GtkWidget *treeView = WID ("xkb_layouts_selected");
GtkCellRenderer *renderer =
GTK_CELL_RENDERER (gtk_cell_renderer_text_new ());
GtkTreeViewColumn *column =
gtk_tree_view_column_new_with_attributes (NULL,
GtkTreeViewColumn *column = gtk_tree_view_column_new_with_attributes (NULL,
renderer,
"text",
0,
@ -181,10 +174,8 @@ prepare_selected_layouts_tree (GladeXML * dialog)
gtk_tree_view_append_column (GTK_TREE_VIEW (treeView), column);
g_signal_connect_swapped (G_OBJECT (selection), "changed",
G_CALLBACK
(enable_disable_layouts_buttons),
dialog);
maxSelectedLayouts =
XklMultipleLayoutsSupported ()? XkbNumKbdGroups : 1;
(enable_disable_layouts_buttons), dialog);
maxSelectedLayouts = XklMultipleLayoutsSupported ()? XkbNumKbdGroups : 1;
}
void
@ -194,32 +185,34 @@ fill_selected_layouts_tree (GladeXML * dialog)
GSList *curLayout;
GtkListStore *listStore =
GTK_LIST_STORE (gtk_tree_view_get_model
(GTK_TREE_VIEW
(WID ("xkb_layouts_selected"))));
(GTK_TREE_VIEW (WID ("xkb_layouts_selected"))));
gtk_list_store_clear (listStore);
for (curLayout = layouts; curLayout != NULL;
curLayout = curLayout->next) {
for (curLayout = layouts; curLayout != NULL; curLayout = curLayout->next)
{
GtkTreeIter iter;
char *l, *sl, *v, *sv;
char *v1, *utfVisible;
const char *visible = (char *) curLayout->data;
gtk_list_store_append (listStore, &iter);
if (GSwitchItConfigGetDescriptions
(visible, &sl, &l, &sv, &v))
if (GSwitchItConfigGetDescriptions (visible, &sl, &l, &sv, &v))
visible = GSwitchItConfigFormatFullLayout (l, v);
v1 = g_strdup (visible);
utfVisible = g_locale_to_utf8 (g_strstrip (v1), -1, NULL, NULL, NULL);
gtk_list_store_set (listStore, &iter,
0, visible, 1, curLayout->data, -1);
0, utfVisible, 1, curLayout->data, -1);
g_free (utfVisible);
g_free (v1);
}
clear_xkb_elements_list (layouts);
enable_disable_layouts_buttons (dialog);
if (idx2Select != -1) {
if (idx2Select != -1)
{
GtkTreeSelection *selection =
gtk_tree_view_get_selection ((GTK_TREE_VIEW
(WID
("xkb_layouts_selected"))));
GtkTreePath *path =
gtk_tree_path_new_from_indices (idx2Select, -1);
(WID ("xkb_layouts_selected"))));
GtkTreePath *path = gtk_tree_path_new_from_indices (idx2Select, -1);
gtk_tree_selection_select_path (selection, path);
gtk_tree_path_free (path);
idx2Select = -1;
@ -237,8 +230,7 @@ sort_tree_content (GtkWidget * treeView)
gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE
(sortedTreeModel), 0,
GTK_SORT_ASCENDING);
gtk_tree_view_set_model (GTK_TREE_VIEW (treeView),
sortedTreeModel);
gtk_tree_view_set_model (GTK_TREE_VIEW (treeView), sortedTreeModel);
}
void
@ -249,8 +241,7 @@ fill_available_layouts_tree (GladeXML * dialog)
GtkWidget *treeView = WID ("xkb_layouts_available");
GtkCellRenderer *renderer =
GTK_CELL_RENDERER (gtk_cell_renderer_text_new ());
GtkTreeViewColumn *column =
gtk_tree_view_column_new_with_attributes (NULL,
GtkTreeViewColumn *column = gtk_tree_view_column_new_with_attributes (NULL,
renderer,
"text",
0,
@ -263,14 +254,12 @@ fill_available_layouts_tree (GladeXML * dialog)
gtk_tree_view_append_column (GTK_TREE_VIEW (treeView), column);
XklConfigEnumLayouts ((ConfigItemProcessFunc)
add_layout_to_available_layouts_tree,
dialog);
add_layout_to_available_layouts_tree, dialog);
sort_tree_content (treeView);
g_signal_connect_swapped (G_OBJECT (selection), "changed",
G_CALLBACK
(enable_disable_layouts_buttons),
dialog);
(enable_disable_layouts_buttons), dialog);
}
static void
@ -281,8 +270,8 @@ add_selected_layout (GtkWidget * button, GladeXML * dialog)
(WID ("xkb_layouts_available")));
GtkTreeIter selectedIter;
GtkTreeModel *model;
if (gtk_tree_selection_get_selected
(selection, &model, &selectedIter)) {
if (gtk_tree_selection_get_selected (selection, &model, &selectedIter))
{
gchar *id;
GSList *layoutsList = get_selected_layouts_list ();
gtk_tree_model_get (model, &selectedIter, 1, &id, -1);
@ -300,29 +289,28 @@ move_selected_layout (GladeXML * dialog, int offset)
(WID ("xkb_layouts_selected")));
GtkTreeIter selectedIter;
GtkTreeModel *model;
if (gtk_tree_selection_get_selected
(selection, &model, &selectedIter)) {
if (gtk_tree_selection_get_selected (selection, &model, &selectedIter))
{
GSList *layoutsList = get_selected_layouts_list ();
GtkTreePath *path = gtk_tree_model_get_path (model,
&selectedIter);
if (path != NULL) {
if (path != NULL)
{
int *indices = gtk_tree_path_get_indices (path);
char *id = NULL;
GSList *node2Remove =
g_slist_nth (layoutsList, indices[0]);
GSList *node2Remove = g_slist_nth (layoutsList, indices[0]);
layoutsList =
g_slist_remove_link (layoutsList, node2Remove);
layoutsList = g_slist_remove_link (layoutsList, node2Remove);
id = (char *) node2Remove->data;
g_slist_free_1 (node2Remove);
if (offset == 0)
g_free (id);
else {
else
{
layoutsList =
g_slist_insert (layoutsList, id,
indices[0] + offset);
g_slist_insert (layoutsList, id, indices[0] + offset);
idx2Select = indices[0] + offset;
}

125
capplets/keyboard/gnome-keyboard-properties-xkbot.c
View file

@ -58,8 +58,7 @@ can_add_option (GladeXML * dialog)
GtkWidget *availableOptionsTree = WID ("xkb_options_available");
GtkWidget *selectedOptionsTree = WID ("xkb_options_selected");
GtkTreeSelection *aSelection =
gtk_tree_view_get_selection (GTK_TREE_VIEW
(availableOptionsTree));
gtk_tree_view_get_selection (GTK_TREE_VIEW (availableOptionsTree));
GtkTreeIter aiter, siter, groupIter;
GtkTreeModel *availableOptionsModel, *selectedOptionsModel;
GtkTreePath *path, *groupPath;
@ -78,19 +77,20 @@ can_add_option (GladeXML * dialog)
depth = gtk_tree_path_get_depth (path);
if (depth != 2) {
if (depth != 2)
{
gtk_tree_path_free (path);
return FALSE;
}
if (!gtk_tree_model_iter_parent
(availableOptionsModel, &groupIter, &aiter)) {
if (!gtk_tree_model_iter_parent (availableOptionsModel, &groupIter, &aiter))
{
gtk_tree_path_free (path);
return FALSE;
}
groupPath =
gtk_tree_model_get_path (availableOptionsModel, &groupIter);
if (groupPath == NULL) {
groupPath = gtk_tree_model_get_path (availableOptionsModel, &groupIter);
if (groupPath == NULL)
{
gtk_tree_path_free (path);
return FALSE;
}
@ -102,7 +102,8 @@ can_add_option (GladeXML * dialog)
&selectedFullOptionId, -1);
if (!GSwitchItConfigSplitItems
(selectedFullOptionId, &selectedGroupId, &selectedOptionId)) {
(selectedFullOptionId, &selectedGroupId, &selectedOptionId))
{
gtk_tree_path_free (groupPath);
gtk_tree_path_free (path);
return FALSE;
@ -115,31 +116,35 @@ can_add_option (GladeXML * dialog)
retval = TRUE;
if (gtk_tree_model_get_iter_first (selectedOptionsModel, &siter)) {
do {
if (gtk_tree_model_get_iter_first (selectedOptionsModel, &siter))
{
do
{
char *sid = NULL;
gtk_tree_model_get (selectedOptionsModel,
&siter, 1, &sid, -1);
if (multipleAllowed) {
gtk_tree_model_get (selectedOptionsModel, &siter, 1, &sid, -1);
if (multipleAllowed)
{
// look for the _same_ option - and do not allow it twice
if (!g_strcasecmp
(sid, selectedFullOptionId)) {
if (!g_strcasecmp (sid, selectedFullOptionId))
{
retval = FALSE;
}
} else {
}
else
{
// look for options within same group
char *sgid = NULL, *soid = NULL;
gtk_tree_model_get (selectedOptionsModel,
&siter, 1, &sid, -1);
gtk_tree_model_get (selectedOptionsModel, &siter, 1, &sid, -1);
if (GSwitchItConfigSplitItems
(sid, &sgid, &soid)
&& !g_strcasecmp (sgid,
selectedGroupId)) {
&& !g_strcasecmp (sgid, selectedGroupId))
{
retval = FALSE;
}
}
g_free (sid);
} while (retval && gtk_tree_model_iter_next
}
while (retval && gtk_tree_model_iter_next
(selectedOptionsModel, &siter));
}
@ -160,14 +165,12 @@ enable_disable_options_buttons (GladeXML * dialog)
GtkWidget *selectedOptionsTree = WID ("xkb_options_selected");
GtkTreeSelection *sSelection =
gtk_tree_view_get_selection (GTK_TREE_VIEW
(selectedOptionsTree));
gtk_tree_view_get_selection (GTK_TREE_VIEW (selectedOptionsTree));
const int nSelectedSelectedOptions =
gtk_tree_selection_count_selected_rows (sSelection);
gtk_widget_set_sensitive (addOptionBtn, can_add_option (dialog));
gtk_widget_set_sensitive (delOptionBtn,
nSelectedSelectedOptions > 0);
gtk_widget_set_sensitive (delOptionBtn, nSelectedSelectedOptions > 0);
}
void
@ -179,8 +182,7 @@ prepare_selected_options_tree (GladeXML * dialog)
GtkWidget *treeView = WID ("xkb_options_selected");
GtkCellRenderer *renderer =
GTK_CELL_RENDERER (gtk_cell_renderer_text_new ());
GtkTreeViewColumn *column =
gtk_tree_view_column_new_with_attributes (NULL,
GtkTreeViewColumn *column = gtk_tree_view_column_new_with_attributes (NULL,
renderer,
"text",
0,
@ -192,8 +194,7 @@ prepare_selected_options_tree (GladeXML * dialog)
gtk_tree_view_append_column (GTK_TREE_VIEW (treeView), column);
g_signal_connect_swapped (G_OBJECT (selection), "changed",
G_CALLBACK
(enable_disable_options_buttons),
dialog);
(enable_disable_options_buttons), dialog);
}
static void
@ -204,8 +205,8 @@ add_selected_option (GtkWidget * button, GladeXML * dialog)
(WID ("xkb_options_available")));
GtkTreeIter selectedIter;
GtkTreeModel *model;
if (gtk_tree_selection_get_selected
(selection, &model, &selectedIter)) {
if (gtk_tree_selection_get_selected (selection, &model, &selectedIter))
{
gchar *id;
GSList *optionsList = get_selected_options_list ();
gtk_tree_model_get (model, &selectedIter, 1, &id, -1);
@ -223,19 +224,18 @@ remove_selected_option (GtkWidget * button, GladeXML * dialog)
(WID ("xkb_options_selected")));
GtkTreeIter selectedIter;
GtkTreeModel *model;
if (gtk_tree_selection_get_selected
(selection, &model, &selectedIter)) {
if (gtk_tree_selection_get_selected (selection, &model, &selectedIter))
{
GSList *optionsList = get_selected_options_list ();
GtkTreePath *path = gtk_tree_model_get_path (model,
&selectedIter);
if (path != NULL) {
if (path != NULL)
{
int *indices = gtk_tree_path_get_indices (path);
char *id = NULL;
GSList *node2Remove =
g_slist_nth (optionsList, indices[0]);
GSList *node2Remove = g_slist_nth (optionsList, indices[0]);
optionsList =
g_slist_remove_link (optionsList, node2Remove);
optionsList = g_slist_remove_link (optionsList, node2Remove);
id = (char *) node2Remove->data;
g_slist_free_1 (node2Remove);
@ -256,10 +256,8 @@ add_option_to_available_options_tree (const XklConfigItemPtr
GtkWidget *optionsTree = WID ("xkb_options_available");
GtkTreeIter iter;
GtkTreeStore *treeStore =
GTK_TREE_STORE (gtk_tree_view_get_model
(GTK_TREE_VIEW (optionsTree)));
const gchar *fullOptionName =
GSwitchItConfigMergeItems (current1stLevelId,
GTK_TREE_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (optionsTree)));
const gchar *fullOptionName = GSwitchItConfigMergeItems (current1stLevelId,
configItem->name);
char *utfOptionName = xci_desc_to_utf8 (configItem);
@ -277,8 +275,7 @@ add_group_to_available_options_tree (const XklConfigItemPtr
{
GtkWidget *optionsTree = WID ("xkb_options_available");
GtkTreeStore *treeStore =
GTK_TREE_STORE (gtk_tree_view_get_model
(GTK_TREE_VIEW (optionsTree)));
GTK_TREE_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (optionsTree)));
char *utfGroupName = xci_desc_to_utf8 (configItem);
gtk_tree_store_append (treeStore, &current1stLevelIter, NULL);
@ -290,8 +287,7 @@ add_group_to_available_options_tree (const XklConfigItemPtr
current1stLevelId = configItem->name;
XklConfigEnumOptions (configItem->name, (ConfigItemProcessFunc)
add_option_to_available_options_tree,
dialog);
add_option_to_available_options_tree, dialog);
}
void
@ -303,8 +299,7 @@ fill_available_options_tree (GladeXML * dialog)
GtkWidget *treeView = WID ("xkb_options_available");
GtkCellRenderer *renderer =
GTK_CELL_RENDERER (gtk_cell_renderer_text_new ());
GtkTreeViewColumn *column =
gtk_tree_view_column_new_with_attributes (NULL,
GtkTreeViewColumn *column = gtk_tree_view_column_new_with_attributes (NULL,
renderer,
"text",
0,
@ -317,15 +312,13 @@ fill_available_options_tree (GladeXML * dialog)
gtk_tree_view_append_column (GTK_TREE_VIEW (treeView), column);
XklConfigEnumOptionGroups ((GroupProcessFunc)
add_group_to_available_options_tree,
dialog);
add_group_to_available_options_tree, dialog);
sort_tree_content (treeView);
g_signal_connect_swapped (G_OBJECT (selection), "changed",
G_CALLBACK
(enable_disable_options_buttons),
dialog);
(enable_disable_options_buttons), dialog);
}
void
@ -335,28 +328,32 @@ fill_selected_options_tree (GladeXML * dialog)
GSList *curOption;
GtkListStore *listStore =
GTK_LIST_STORE (gtk_tree_view_get_model
(GTK_TREE_VIEW
(WID ("xkb_options_selected"))));
(GTK_TREE_VIEW (WID ("xkb_options_selected"))));
gtk_list_store_clear (listStore);
for (curOption = options; curOption != NULL;
curOption = curOption->next) {
for (curOption = options; curOption != NULL; curOption = curOption->next)
{
GtkTreeIter iter;
char *groupName, *optionName;
const char *visible = (char *) curOption->data;
if (GSwitchItConfigSplitItems
(visible, &groupName, &optionName)) {
if (GSwitchItConfigSplitItems (visible, &groupName, &optionName))
{
XklConfigItem citem;
g_snprintf (citem.name, sizeof (citem.name), "%s",
optionName);
if (XklConfigFindOption (groupName, &citem)) {
char *v1, *utfVisible;
g_snprintf (citem.name, sizeof (citem.name), "%s", optionName);
if (XklConfigFindOption (groupName, &citem))
{
visible = citem.description;
}
v1 = g_strdup (visible);
utfVisible =
g_locale_to_utf8 (g_strstrip (v1), -1, NULL, NULL, NULL);
gtk_list_store_append (listStore, &iter);
gtk_list_store_set (listStore, &iter,
0, visible, 1, curOption->data,
-1);
0, utfVisible, 1, curOption->data, -1);
g_free (utfVisible);
g_free (v1);
}
}