[Goodies-commits] r6322 - in sion/trunk: . src
Enrico Troeger
enrico at xfce.org
Sun Dec 14 21:37:52 CET 2008
Author: enrico
Date: 2008-12-14 20:37:52 +0000 (Sun, 14 Dec 2008)
New Revision: 6322
Modified:
sion/trunk/ChangeLog
sion/trunk/src/backendgvfs.c
sion/trunk/src/bookmarkdialog.c
sion/trunk/src/bookmarkeditdialog.c
sion/trunk/src/common.c
sion/trunk/src/common.h
sion/trunk/src/window.c
Log:
Use more descriptive strings when displaying URI schemes.
Modified: sion/trunk/ChangeLog
===================================================================
--- sion/trunk/ChangeLog 2008-12-14 20:07:34 UTC (rev 6321)
+++ sion/trunk/ChangeLog 2008-12-14 20:37:52 UTC (rev 6322)
@@ -13,6 +13,9 @@
Add domain and share fields for bookmarks to improve Samba support.
* src/bookmarkeditdialog.c:
Display share and domain fields in the bookmark dialog.
+ * src/backendgvfs.c, src/bookmarkdialog.c, src/bookmarkeditdialog.c,
+ src/common.c, src/common.h, src/window.c:
+ Use more descriptive strings when displaying URI schemes.
2008-12-13 Enrico Tröger <enrico(at)xfce(dot)org>
Modified: sion/trunk/src/backendgvfs.c
===================================================================
--- sion/trunk/src/backendgvfs.c 2008-12-14 20:07:34 UTC (rev 6321)
+++ sion/trunk/src/backendgvfs.c 2008-12-14 20:37:52 UTC (rev 6322)
@@ -188,7 +188,7 @@
sion_backend_gvfs_get_name_and_uri_from_mount(ref, &name, &uri);
result = g_strdup_printf(
- _("<b>%s</b>\n\nURI: %s\nMounted: Yes\nType: %s"), name, uri, type);
+ _("<b>%s</b>\n\nURI: %s\nMounted: Yes\nService Type: %s"), name, uri, type);
g_free(uri);
g_free(name);
@@ -218,7 +218,8 @@
GVolume *volume;
GIcon *icon;
GtkTreeIter iter;
- gchar *vol_name, *scheme, *uri, *scheme_upper, *tooltip_text;
+ gchar *vol_name, *scheme, *uri, *tooltip_text;
+ const gchar *scheme_name;
SionBackendGVFSPrivate *priv = SION_BACKEND_GVFS_GET_PRIVATE(backend);
gtk_list_store_clear(priv->store);
@@ -231,16 +232,16 @@
vol_name = g_mount_get_name(mount);
file = g_mount_get_root(mount);
scheme = g_file_get_uri_scheme(file);
- scheme_upper = sion_beautify_scheme(scheme);
+ scheme_name = sion_describe_scheme(scheme);
uri = g_file_get_uri(file);
icon = g_mount_get_icon(mount);
- tooltip_text = get_tooltip_text(mount, SION_WINDOW_REF_TYPE_MOUNT, scheme_upper);
+ tooltip_text = get_tooltip_text(mount, SION_WINDOW_REF_TYPE_MOUNT, scheme_name);
gtk_list_store_append(priv->store, &iter);
gtk_list_store_set(priv->store, &iter,
SION_WINDOW_COL_IS_MOUNTED, TRUE,
SION_WINDOW_COL_NAME, vol_name,
- SION_WINDOW_COL_SCHEME, scheme_upper,
+ SION_WINDOW_COL_SCHEME, scheme_name,
SION_WINDOW_COL_REF, mount,
SION_WINDOW_COL_REF_TYPE, SION_WINDOW_REF_TYPE_MOUNT,
SION_WINDOW_COL_PIXBUF, icon,
@@ -249,7 +250,6 @@
-1);
g_free(vol_name);
g_free(scheme);
- g_free(scheme_upper);
g_free(uri);
g_free(tooltip_text);
g_object_unref(file);
@@ -275,7 +275,7 @@
gtk_list_store_set(priv->store, &iter,
SION_WINDOW_COL_IS_MOUNTED, FALSE,
SION_WINDOW_COL_NAME, vol_name,
- SION_WINDOW_COL_SCHEME, "",
+ SION_WINDOW_COL_SCHEME, sion_describe_scheme("file"),
SION_WINDOW_COL_REF, volume,
SION_WINDOW_COL_REF_TYPE, SION_WINDOW_REF_TYPE_VOLUME,
SION_WINDOW_COL_PIXBUF, icon,
Modified: sion/trunk/src/bookmarkdialog.c
===================================================================
--- sion/trunk/src/bookmarkdialog.c 2008-12-14 20:07:34 UTC (rev 6321)
+++ sion/trunk/src/bookmarkdialog.c 2008-12-14 20:37:52 UTC (rev 6322)
@@ -128,7 +128,7 @@
gtk_list_store_set(priv->store, iter,
COL_NAME, sion_bookmark_get_name(bm),
- COL_SCHEME, sion_bookmark_get_scheme(bm),
+ COL_SCHEME, sion_describe_scheme(sion_bookmark_get_scheme(bm)),
COL_HOST, sion_bookmark_get_host(bm),
COL_PORT, port,
COL_USERNAME, sion_bookmark_get_user(bm),
@@ -317,7 +317,7 @@
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes(
- _("URI Scheme"), renderer, "text", COL_SCHEME, NULL);
+ _("Service Type"), renderer, "text", COL_SCHEME, NULL);
gtk_tree_view_column_set_sort_indicator(column, TRUE);
gtk_tree_view_column_set_sort_column_id(column, COL_SCHEME);
gtk_tree_view_column_set_resizable(GTK_TREE_VIEW_COLUMN(column), TRUE);
Modified: sion/trunk/src/bookmarkeditdialog.c
===================================================================
--- sion/trunk/src/bookmarkeditdialog.c 2008-12-14 20:07:34 UTC (rev 6321)
+++ sion/trunk/src/bookmarkeditdialog.c 2008-12-14 20:37:52 UTC (rev 6322)
@@ -81,7 +81,6 @@
const gchar *scheme;
guint port;
guint flags;
- const gchar *desc;
};
enum
@@ -107,13 +106,12 @@
};
static struct MethodInfo methods[] = {
- { "ftp", 21, SHOW_PORT | SHOW_USER, N_("FTP") },
- { "sftp", 22, SHOW_PORT | SHOW_USER, N_("SSH") },
- { "smb", 0, SHOW_SHARE | SHOW_USER | SHOW_DOMAIN, N_("Windows share") },
- { "davs", 443, SHOW_PORT | SHOW_USER, N_("Secure WebDAV (HTTPS)") },
- { "dav", 80, SHOW_PORT | SHOW_USER, N_("WebDAV (HTTP)") },
- /* must always be the last item */
- { NULL, 0, 0, N_("Custom Location") }
+ { "ftp", 21, SHOW_PORT | SHOW_USER },
+ { "sftp", 22, SHOW_PORT | SHOW_USER },
+ { "smb", 0, SHOW_SHARE | SHOW_USER | SHOW_DOMAIN },
+ { "davs", 443, SHOW_PORT | SHOW_USER },
+ { "dav", 80, SHOW_PORT | SHOW_USER },
+ { NULL, 0, 0 }
};
static guint methods_len = G_N_ELEMENTS(methods);
@@ -462,6 +460,7 @@
GtkListStore *store;
GtkTreeModel *filter;
GtkTreeIter iter;
+ const gchar *scheme;
SionBookmarkEditDialogPrivate *priv = SION_BOOKMARK_EDIT_DIALOG_GET_PRIVATE(dialog);
/* 0 - method index, 1 - visible/supported flag, 2 - description */
@@ -480,11 +479,17 @@
break;
}
}
+ if (methods[i].scheme != NULL)
+ scheme = sion_describe_scheme(methods[i].scheme);
+ else
+ scheme = _("Custom Location");
+
gtk_list_store_append(store, &iter);
gtk_list_store_set(store, &iter,
COLUMN_INDEX, i,
COLUMN_VISIBLE, visible,
- COLUMN_DESC, methods[i].desc, -1);
+ COLUMN_DESC, scheme,
+ -1);
}
filter = gtk_tree_model_filter_new(GTK_TREE_MODEL(store), NULL);
Modified: sion/trunk/src/common.c
===================================================================
--- sion/trunk/src/common.c 2008-12-14 20:07:34 UTC (rev 6321)
+++ sion/trunk/src/common.c 2008-12-14 20:37:52 UTC (rev 6322)
@@ -22,6 +22,7 @@
#include <string.h>
#include <gtk/gtk.h>
+#include <glib/gi18n.h>
#include "common.h"
#include "main.h"
@@ -55,20 +56,29 @@
}
-gchar *sion_beautify_scheme(const gchar *scheme)
+const gchar *sion_describe_scheme(const gchar *scheme)
{
- gchar *result;
-
if (sion_str_equal(scheme, "file"))
- {
- result = g_strdup(scheme);
- /* Capitalise first character */
- result[0] = g_unichar_toupper(scheme[0]);
- }
- else
- result = g_utf8_strup(scheme, -1);
+ return _("Unix Device");
+ else if (sion_str_equal(scheme, "smb"))
+ return _("Windows Share");
+ else if (sion_str_equal(scheme, "ftp"))
+ return _("FTP");
+ else if (sion_str_equal(scheme, "http"))
+ return _("HTTP");
+ else if (sion_str_equal(scheme, "sftp"))
+ return _("SSH");
+ else if (sion_str_equal(scheme, "obex"))
+ /// TODO find something better
+ return _("OBEX");
+ else if (sion_str_equal(scheme, "dav"))
+ return _("WebDAV");
+ else if (sion_str_equal(scheme, "davs"))
+ return _("Secure WebDAV");
+ else if (sion_str_equal(scheme, "network"))
+ return _("Network");
- return result;
+ return NULL;
}
Modified: sion/trunk/src/common.h
===================================================================
--- sion/trunk/src/common.h 2008-12-14 20:07:34 UTC (rev 6321)
+++ sion/trunk/src/common.h 2008-12-14 20:37:52 UTC (rev 6322)
@@ -48,7 +48,7 @@
};
-gchar *sion_beautify_scheme(const gchar *scheme);
+const gchar *sion_describe_scheme(const gchar *scheme);
gboolean sion_str_equal(const gchar *a, const gchar *b);
Modified: sion/trunk/src/window.c
===================================================================
--- sion/trunk/src/window.c 2008-12-14 20:07:34 UTC (rev 6321)
+++ sion/trunk/src/window.c 2008-12-14 20:37:52 UTC (rev 6322)
@@ -954,7 +954,7 @@
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes(
- _("URI Scheme"), renderer, "text", SION_WINDOW_COL_SCHEME, NULL);
+ _("Service Type"), renderer, "text", SION_WINDOW_COL_SCHEME, NULL);
gtk_tree_view_column_set_sort_indicator(column, TRUE);
gtk_tree_view_column_set_sort_column_id(column, SION_WINDOW_COL_SCHEME);
gtk_tree_view_column_set_resizable(GTK_TREE_VIEW_COLUMN(column), TRUE);
More information about the Goodies-commits
mailing list