[Xfce4-commits] r24240 - in squeeze/trunk: . libsqueeze po src
Stephan Arts
stephan at xfce.org
Tue Jan 2 17:01:27 CET 2007
Author: stephan
Date: 2007-01-02 16:01:26 +0000 (Tue, 02 Jan 2007)
New Revision: 24240
Removed:
squeeze/trunk/libsqueeze/mime.c
squeeze/trunk/libsqueeze/mime.h
Modified:
squeeze/trunk/configure.in.in
squeeze/trunk/libsqueeze/Makefile.am
squeeze/trunk/libsqueeze/archive-support-gnu-tar.c
squeeze/trunk/libsqueeze/archive-support-zip.c
squeeze/trunk/libsqueeze/archive-support.c
squeeze/trunk/libsqueeze/archive-support.h
squeeze/trunk/libsqueeze/archive.c
squeeze/trunk/libsqueeze/archive.h
squeeze/trunk/libsqueeze/internals.c
squeeze/trunk/libsqueeze/internals.h
squeeze/trunk/libsqueeze/libsqueeze.c
squeeze/trunk/libsqueeze/libsqueeze.h
squeeze/trunk/libsqueeze/slist.c
squeeze/trunk/po/POTFILES.in
squeeze/trunk/po/fi.po
squeeze/trunk/po/nl.po
squeeze/trunk/src/add_dialog.c
squeeze/trunk/src/application.c
squeeze/trunk/src/archive_store.c
squeeze/trunk/src/extract_dialog.c
squeeze/trunk/src/main.c
squeeze/trunk/src/main_window.c
squeeze/trunk/src/navigation_bar.c
squeeze/trunk/src/new_dialog.c
squeeze/trunk/src/notebook.c
squeeze/trunk/src/path_bar.c
squeeze/trunk/src/preferences_dialog.c
squeeze/trunk/src/properties_dialog.c
squeeze/trunk/src/tool_bar.c
squeeze/trunk/src/widget_factory.c
Log:
- Cleaned up some code
- Added G_GNUC_INTERNAL to functions inside internals.h (As pointed out by Nick)
- Updated Dutch translation
Modified: squeeze/trunk/configure.in.in
===================================================================
--- squeeze/trunk/configure.in.in 2007-01-02 13:27:10 UTC (rev 24239)
+++ squeeze/trunk/configure.in.in 2007-01-02 16:01:26 UTC (rev 24240)
@@ -122,9 +122,10 @@
XDT_CHECK_PACKAGE([THUNAR_VFS], [thunar-vfs-1], [0.4.0])
XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.99])
-AC_DEFINE([HAVE_THUNAR_VFS], [1], [Define if we have thunar-vfs])
-AC_DEFINE([HAVE_LIBXFCE4UTIL], [1], [Define if we have thunar-vfs])
+AC_DEFINE([HAVE_LIBXFCE4UTIL], [1], [Define if we have libxfce4util (will become optional eventually)])
+AC_DEFINE([EXO_API_SUBJECT_TO_CHANGE], [1], [Define we understand libexo is subject to api churn])
+
dnl XDT_CHECK_OPTIONAL_PACKAGE([THUNAR_VFS], [thunar-vfs-1], [0.4.0], [thunar-vfs],
dnl AC_HELP_STRING([--disable-thunar-vfs],
dnl [Disable the use of Thunar's VFS layer)]))
Modified: squeeze/trunk/libsqueeze/Makefile.am
===================================================================
--- squeeze/trunk/libsqueeze/Makefile.am 2007-01-02 13:27:10 UTC (rev 24239)
+++ squeeze/trunk/libsqueeze/Makefile.am 2007-01-02 16:01:26 UTC (rev 24240)
@@ -3,7 +3,6 @@
libsqueeze_1_la_SOURCES = \
internals.c internals.h \
libsqueeze.c libsqueeze.h \
- mime.c mime.h \
slist.c slist.h \
archive.c archive.h \
archive-support.c archive-support.h \
Modified: squeeze/trunk/libsqueeze/archive-support-gnu-tar.c
===================================================================
--- squeeze/trunk/libsqueeze/archive-support-gnu-tar.c 2007-01-02 13:27:10 UTC (rev 24239)
+++ squeeze/trunk/libsqueeze/archive-support-gnu-tar.c 2007-01-02 16:01:26 UTC (rev 24240)
@@ -22,9 +22,8 @@
#include <glib.h>
#include <glib/gstdio.h>
#include <glib-object.h>
-#include <gettext.h>
+#include <thunar-vfs/thunar-vfs.h>
-#include "mime.h"
#include "archive.h"
#include "archive-support.h"
#include "archive-support-gnu-tar.h"
@@ -259,7 +258,7 @@
return -1;
}
- if(!lsq_archive_support_mime_supported(archive->support, lsq_mime_info_get_name(archive->mime_info)))
+ if(!lsq_archive_support_mime_supported(archive->support, thunar_vfs_mime_info_get_name(archive->mime_info)))
{
return 1;
}
@@ -268,29 +267,29 @@
gchar *command = NULL;
archive->files = lsq_concat_filenames(filenames);
lsq_archive_set_status(archive, LSQ_ARCHIVESTATUS_ADD);
- if(!g_file_test(archive->path, G_FILE_TEST_EXISTS))
+ if(!archive->file_info) /* FIXME */
{
- if(!g_strcasecmp(lsq_mime_info_get_name(archive->mime_info), "application/x-tar"))
+ if(!g_strcasecmp(thunar_vfs_mime_info_get_name(archive->mime_info), "application/x-tar"))
command = g_strconcat(LSQ_ARCHIVE_SUPPORT_GNU_TAR(archive->support)->app_name,
" -cf ", archive->path,
" --mode='", LSQ_ARCHIVE_SUPPORT_GNU_TAR(archive->support)->_add_mode,
"' ", archive->files, NULL);
- if(!g_strcasecmp(lsq_mime_info_get_name(archive->mime_info), "application/x-tarz"))
+ if(!g_strcasecmp(thunar_vfs_mime_info_get_name(archive->mime_info), "application/x-tarz"))
command = g_strconcat(LSQ_ARCHIVE_SUPPORT_GNU_TAR(archive->support)->app_name,
" -Zcf ", archive->path,
" --mode=", LSQ_ARCHIVE_SUPPORT_GNU_TAR(archive->support)->_add_mode,
" ", archive->files, NULL);
- if(!g_strcasecmp(lsq_mime_info_get_name(archive->mime_info), "application/x-compressed-tar"))
+ if(!g_strcasecmp(thunar_vfs_mime_info_get_name(archive->mime_info), "application/x-compressed-tar"))
command = g_strconcat(LSQ_ARCHIVE_SUPPORT_GNU_TAR(archive->support)->app_name,
" -zcf ", archive->path,
" --mode=", LSQ_ARCHIVE_SUPPORT_GNU_TAR(archive->support)->_add_mode,
" ", archive->files, NULL);
- if(!g_strcasecmp(lsq_mime_info_get_name(archive->mime_info), "application/x-bzip-compressed-tar"))
+ if(!g_strcasecmp(thunar_vfs_mime_info_get_name(archive->mime_info), "application/x-bzip-compressed-tar"))
command = g_strconcat(LSQ_ARCHIVE_SUPPORT_GNU_TAR(archive->support)->app_name,
" -jcf ", archive->path,
" --mode=", LSQ_ARCHIVE_SUPPORT_GNU_TAR(archive->support)->_add_mode,
" ", archive->files, NULL);
- if(!g_strcasecmp(lsq_mime_info_get_name(archive->mime_info), "application/x-tzo"))
+ if(!g_strcasecmp(thunar_vfs_mime_info_get_name(archive->mime_info), "application/x-tzo"))
command = g_strconcat(LSQ_ARCHIVE_SUPPORT_GNU_TAR(archive->support)->app_name,
" --use-compress-program=lzop -cf ", archive->path,
" --mode=", LSQ_ARCHIVE_SUPPORT_GNU_TAR(archive->support)->_add_mode,
@@ -299,7 +298,7 @@
lsq_execute(command, archive, NULL, NULL, NULL, NULL);
} else
{
- if(!g_strcasecmp(lsq_mime_info_get_name(archive->mime_info), "application/x-tar"))
+ if(!g_strcasecmp(thunar_vfs_mime_info_get_name(archive->mime_info), "application/x-tar"))
{
command = g_strconcat(LSQ_ARCHIVE_SUPPORT_GNU_TAR(archive->support)->app_name, " -rf ", archive->path, " ", archive->files, NULL);
lsq_execute(command, archive, NULL, NULL, NULL, NULL);
@@ -309,13 +308,13 @@
archive->tmp_file = g_strconcat(lsq_tmp_dir, "/squeeze-XXXXXX" , NULL);
g_mkstemp(archive->tmp_file);
g_unlink(archive->tmp_file);
- if(!g_strcasecmp(lsq_mime_info_get_name(archive->mime_info), "application/x-tarz"))
+ if(!g_strcasecmp(thunar_vfs_mime_info_get_name(archive->mime_info), "application/x-tarz"))
command = g_strconcat("uncompress -c ", archive->path, NULL);
- if(!g_strcasecmp(lsq_mime_info_get_name(archive->mime_info), "application/x-compressed-tar"))
+ if(!g_strcasecmp(thunar_vfs_mime_info_get_name(archive->mime_info), "application/x-compressed-tar"))
command = g_strconcat("gunzip -c ", archive->path, NULL);
- if(!g_strcasecmp(lsq_mime_info_get_name(archive->mime_info), "application/x-bzip-compressed-tar"))
+ if(!g_strcasecmp(thunar_vfs_mime_info_get_name(archive->mime_info), "application/x-bzip-compressed-tar"))
command = g_strconcat("bunzip2 -c ", archive->path, NULL);
- if(!g_strcasecmp(lsq_mime_info_get_name(archive->mime_info), "application/x-tzo"))
+ if(!g_strcasecmp(thunar_vfs_mime_info_get_name(archive->mime_info), "application/x-tzo"))
command = g_strconcat("lzop -dc ", archive->path, NULL);
lsq_execute(command, archive, lsq_archive_support_gnu_tar_decompress_watch, NULL, lsq_archive_support_gnu_tar_decompress_parse_output, NULL);
g_free(command);
@@ -327,13 +326,6 @@
gint
lsq_archive_support_gnu_tar_extract(LSQArchive *archive, gchar *dest_path, GSList *filenames)
{
- gchar *command = NULL;
- gchar *command_options = g_strconcat(
- LSQ_ARCHIVE_SUPPORT_GNU_TAR(archive->support)->_extr_keep_newer?" --keep-newer-files ":" ",
- LSQ_ARCHIVE_SUPPORT_GNU_TAR(archive->support)->_extr_overwrite?" --overwrite ":" ",
- LSQ_ARCHIVE_SUPPORT_GNU_TAR(archive->support)->_extr_touch?" --touch ":" ",
- NULL
- );
if(!LSQ_IS_ARCHIVE_SUPPORT_GNU_TAR(archive->support))
{
@@ -341,45 +333,52 @@
return -1;
}
- if(!lsq_archive_support_mime_supported(archive->support, lsq_mime_info_get_name(archive->mime_info)))
+ if(!lsq_archive_support_mime_supported(archive->support, thunar_vfs_mime_info_get_name(archive->mime_info)))
{
return 1;
}
else
{
+ gchar *command = NULL;
+ gchar *command_options = g_strconcat(
+ LSQ_ARCHIVE_SUPPORT_GNU_TAR(archive->support)->_extr_keep_newer?" --keep-newer-files ":" ",
+ LSQ_ARCHIVE_SUPPORT_GNU_TAR(archive->support)->_extr_overwrite?" --overwrite ":" ",
+ LSQ_ARCHIVE_SUPPORT_GNU_TAR(archive->support)->_extr_touch?" --touch ":" ",
+ NULL
+ );
archive->files = lsq_concat_filenames(filenames);
lsq_archive_set_status(archive, LSQ_ARCHIVESTATUS_EXTRACT);
- if(g_file_test(archive->path, G_FILE_TEST_EXISTS))
+ if(archive->file_info) /* FIXME */
{
- if(!g_strcasecmp(lsq_mime_info_get_name(archive->mime_info), "application/x-tar"))
+ if(!g_strcasecmp(thunar_vfs_mime_info_get_name(archive->mime_info), "application/x-tar"))
{
command = g_strconcat(LSQ_ARCHIVE_SUPPORT_GNU_TAR(archive->support)->app_name, " -xf ", archive->path,
" -C \"", dest_path, "\"",
command_options,
archive->files, NULL);
}
- if(!g_strcasecmp(lsq_mime_info_get_name(archive->mime_info), "application/x-tarz"))
+ if(!g_strcasecmp(thunar_vfs_mime_info_get_name(archive->mime_info), "application/x-tarz"))
{
command = g_strconcat(LSQ_ARCHIVE_SUPPORT_GNU_TAR(archive->support)->app_name, " -Zxf ", archive->path,
" -C \"", dest_path, "\"",
command_options,
archive->files, NULL);
}
- if(!g_strcasecmp(lsq_mime_info_get_name(archive->mime_info), "application/x-compressed-tar"))
+ if(!g_strcasecmp(thunar_vfs_mime_info_get_name(archive->mime_info), "application/x-compressed-tar"))
{
command = g_strconcat(LSQ_ARCHIVE_SUPPORT_GNU_TAR(archive->support)->app_name, " -zxf ", archive->path,
" -C \"", dest_path, "\"",
command_options,
archive->files, NULL);
}
- if(!g_strcasecmp(lsq_mime_info_get_name(archive->mime_info), "application/x-bzip-compressed-tar"))
+ if(!g_strcasecmp(thunar_vfs_mime_info_get_name(archive->mime_info), "application/x-bzip-compressed-tar"))
{
command = g_strconcat(LSQ_ARCHIVE_SUPPORT_GNU_TAR(archive->support)->app_name, " -jxf ", archive->path,
" -C \"", dest_path, "\"",
command_options,
archive->files, NULL);
}
- if(!g_strcasecmp(lsq_mime_info_get_name(archive->mime_info), "application/x-tzo"))
+ if(!g_strcasecmp(thunar_vfs_mime_info_get_name(archive->mime_info), "application/x-tzo"))
{
command = g_strconcat(LSQ_ARCHIVE_SUPPORT_GNU_TAR(archive->support)->app_name, " -xf --use-compress-program=lzop ", archive->path,
" -C \"", dest_path, "\"",
@@ -410,7 +409,7 @@
return -1;
}
- if(!lsq_archive_support_mime_supported(archive->support, lsq_mime_info_get_name(archive->mime_info)))
+ if(!lsq_archive_support_mime_supported(archive->support, thunar_vfs_mime_info_get_name(archive->mime_info)))
{
return 1;
}
@@ -419,9 +418,9 @@
gchar *command = NULL;
archive->files = lsq_concat_filenames(filenames);
lsq_archive_set_status(archive, LSQ_ARCHIVESTATUS_REMOVE);
- if(g_file_test(archive->path, G_FILE_TEST_EXISTS))
+ if(archive->file_info)
{
- if(!g_strcasecmp(lsq_mime_info_get_name(archive->mime_info), "application/x-tar"))
+ if(!g_strcasecmp(thunar_vfs_mime_info_get_name(archive->mime_info), "application/x-tar"))
{
command = g_strconcat(LSQ_ARCHIVE_SUPPORT_GNU_TAR(archive->support)->app_name, " -f ", archive->path, " --delete ", archive->files, NULL);
lsq_execute(command, archive, NULL, NULL, NULL, NULL);
@@ -431,13 +430,13 @@
archive->tmp_file = g_strconcat(lsq_tmp_dir, "/squeeze-XXXXXX" , NULL);
g_mkstemp(archive->tmp_file);
g_unlink(archive->tmp_file);
- if(!g_strcasecmp(lsq_mime_info_get_name(archive->mime_info), "application/x-tarz"))
+ if(!g_strcasecmp(thunar_vfs_mime_info_get_name(archive->mime_info), "application/x-tarz"))
command = g_strconcat("uncompress -c ", archive->path, NULL);
- if(!g_strcasecmp(lsq_mime_info_get_name(archive->mime_info), "application/x-compressed-tar"))
+ if(!g_strcasecmp(thunar_vfs_mime_info_get_name(archive->mime_info), "application/x-compressed-tar"))
command = g_strconcat("gunzip -c ", archive->path, NULL);
- if(!g_strcasecmp(lsq_mime_info_get_name(archive->mime_info), "application/x-bzip-compressed-tar"))
+ if(!g_strcasecmp(thunar_vfs_mime_info_get_name(archive->mime_info), "application/x-bzip-compressed-tar"))
command = g_strconcat("bunzip2 -c ", archive->path, NULL);
- if(!g_strcasecmp(lsq_mime_info_get_name(archive->mime_info), "application/x-tzo"))
+ if(!g_strcasecmp(thunar_vfs_mime_info_get_name(archive->mime_info), "application/x-tzo"))
command = g_strconcat("lzop -dc ", archive->path, NULL);
lsq_execute(command, archive, lsq_archive_support_gnu_tar_decompress_watch, NULL, lsq_archive_support_gnu_tar_decompress_parse_output, NULL);
g_free(command);
@@ -458,7 +457,7 @@
return -1;
}
- if(!lsq_archive_support_mime_supported(archive->support, lsq_mime_info_get_name(archive->mime_info)))
+ if(!lsq_archive_support_mime_supported(archive->support, thunar_vfs_mime_info_get_name(archive->mime_info)))
{
return 1;
}
@@ -485,7 +484,7 @@
lsq_archive_set_property_type(archive, i, G_TYPE_STRING, _("Time"));
i++;
}
- if(!g_strcasecmp(lsq_mime_info_get_name(archive->mime_info), "application/x-tzo"))
+ if(!g_strcasecmp(thunar_vfs_mime_info_get_name(archive->mime_info), "application/x-tzo"))
command = g_strconcat(LSQ_ARCHIVE_SUPPORT_GNU_TAR(archive->support)->app_name, " --use-compress-program=lzop -tvf " , archive->path, NULL);
else
command = g_strconcat(LSQ_ARCHIVE_SUPPORT_GNU_TAR(archive->support)->app_name, " -tvf " , archive->path, NULL);
@@ -509,14 +508,14 @@
archive->child_pid = 0;
gchar *command = NULL;
- if(!g_strcasecmp(lsq_mime_info_get_name(archive->mime_info), "application/x-tarz"))
+ if(!g_strcasecmp(thunar_vfs_mime_info_get_name(archive->mime_info), "application/x-tarz"))
command = g_strconcat("compress -c ", archive->tmp_file, NULL);
- if(!g_strcasecmp(lsq_mime_info_get_name(archive->mime_info), "application/x-compressed-tar"))
+ if(!g_strcasecmp(thunar_vfs_mime_info_get_name(archive->mime_info), "application/x-compressed-tar"))
command = g_strconcat("gzip -c ", archive->tmp_file, NULL);
- if(!g_strcasecmp(lsq_mime_info_get_name(archive->mime_info), "application/x-bzip-compressed-tar"))
+ if(!g_strcasecmp(thunar_vfs_mime_info_get_name(archive->mime_info), "application/x-bzip-compressed-tar"))
command = g_strconcat("bzip2 -c ", archive->tmp_file, NULL);
- if(!g_strcasecmp(lsq_mime_info_get_name(archive->mime_info), "application/x-tzo"))
- command = g_strconcat("lzop -c ", archive->path, NULL);
+ if(!g_strcasecmp(thunar_vfs_mime_info_get_name(archive->mime_info), "application/x-tzo"))
+ command = g_strconcat("lzop -c ", archive->tmp_file, NULL);
lsq_execute(command, archive, NULL, NULL, lsq_archive_support_gnu_tar_compress_parse_output, NULL);
}
@@ -748,7 +747,7 @@
LSQ_ARCHIVE_SUPPORT_GNU_TAR(object)->_add_mode = g_value_dup_string(value);
break;
-/* */
+/* VIEW */
case LSQ_ARCHIVE_SUPPORT_GNU_TAR_VIEW_SIZE:
LSQ_ARCHIVE_SUPPORT_GNU_TAR(object)->_view_size = g_value_get_boolean(value);
break;
@@ -793,7 +792,7 @@
g_value_set_string(value, LSQ_ARCHIVE_SUPPORT_GNU_TAR(object)->_add_mode);
break;
-/* */
+/* VIEW */
case LSQ_ARCHIVE_SUPPORT_GNU_TAR_VIEW_SIZE:
g_value_set_boolean(value, LSQ_ARCHIVE_SUPPORT_GNU_TAR(object)->_view_size);
break;
Modified: squeeze/trunk/libsqueeze/archive-support-zip.c
===================================================================
--- squeeze/trunk/libsqueeze/archive-support-zip.c 2007-01-02 13:27:10 UTC (rev 24239)
+++ squeeze/trunk/libsqueeze/archive-support-zip.c 2007-01-02 16:01:26 UTC (rev 24240)
@@ -20,9 +20,8 @@
#include <string.h>
#include <glib.h>
#include <glib-object.h>
-#include <gettext.h>
+#include <thunar-vfs/thunar-vfs.h>
-#include "mime.h"
#include "archive.h"
#include "archive-support.h"
#include "archive-support-zip.h"
@@ -218,7 +217,7 @@
return -1;
}
- if(!lsq_archive_support_mime_supported(archive->support, lsq_mime_info_get_name(archive->mime_info)))
+ if(!lsq_archive_support_mime_supported(archive->support, thunar_vfs_mime_info_get_name(archive->mime_info)))
{
return 1;
}
@@ -226,8 +225,8 @@
{
gchar *command = NULL;
gchar *files = lsq_concat_filenames(filenames);
- if(!g_strcasecmp((gchar *)lsq_mime_info_get_name(archive->mime_info), "application/x-zip") ||
- !g_strcasecmp((gchar *)lsq_mime_info_get_name(archive->mime_info), "application/zip"))
+ if(!g_strcasecmp((gchar *)thunar_vfs_mime_info_get_name(archive->mime_info), "application/x-zip") ||
+ !g_strcasecmp((gchar *)thunar_vfs_mime_info_get_name(archive->mime_info), "application/zip"))
{
command = g_strconcat("zip -r ", archive->path, " ", files, NULL);
lsq_execute(command, archive, NULL, NULL, NULL, NULL);
@@ -245,7 +244,7 @@
return -1;
}
- if(!lsq_archive_support_mime_supported(archive->support, lsq_mime_info_get_name(archive->mime_info)))
+ if(!lsq_archive_support_mime_supported(archive->support, thunar_vfs_mime_info_get_name(archive->mime_info)))
{
return 1;
}
@@ -253,10 +252,10 @@
{
gchar *command = NULL;
gchar *files = lsq_concat_filenames(filenames);
- if(g_file_test(archive->path, G_FILE_TEST_EXISTS))
+ if(archive->file_info) /* FIXME */
{
- if(!g_strcasecmp((gchar *)lsq_mime_info_get_name(archive->mime_info), "application/x-zip") ||
- !g_strcasecmp((gchar *)lsq_mime_info_get_name(archive->mime_info), "application/zip"))
+ if(!g_strcasecmp((gchar *)thunar_vfs_mime_info_get_name(archive->mime_info), "application/x-zip") ||
+ !g_strcasecmp((gchar *)thunar_vfs_mime_info_get_name(archive->mime_info), "application/zip"))
{
command = g_strconcat("unzip -o ", archive->path, " ", files, " -d ", dest_path, NULL);
lsq_execute(command, archive, NULL, NULL, NULL, NULL);
@@ -276,7 +275,7 @@
return -1;
}
- if(!lsq_archive_support_mime_supported(archive->support, lsq_mime_info_get_name(archive->mime_info)))
+ if(!lsq_archive_support_mime_supported(archive->support, thunar_vfs_mime_info_get_name(archive->mime_info)))
{
return 1;
}
@@ -284,8 +283,8 @@
{
gchar *command = NULL;
gchar *files = lsq_concat_filenames(filenames);
- if(!g_strcasecmp((gchar *)lsq_mime_info_get_name(archive->mime_info), "application/x-zip") ||
- !g_strcasecmp((gchar *)lsq_mime_info_get_name(archive->mime_info), "application/zip"))
+ if(!g_strcasecmp((gchar *)thunar_vfs_mime_info_get_name(archive->mime_info), "application/x-zip") ||
+ !g_strcasecmp((gchar *)thunar_vfs_mime_info_get_name(archive->mime_info), "application/zip"))
{
command = g_strconcat("zip -d ", archive->path, " ", files, NULL);
lsq_execute(command, archive, NULL, NULL, NULL, NULL);
@@ -304,7 +303,7 @@
return -1;
}
- if(!lsq_archive_support_mime_supported(archive->support, lsq_mime_info_get_name(archive->mime_info)))
+ if(!lsq_archive_support_mime_supported(archive->support, thunar_vfs_mime_info_get_name(archive->mime_info)))
{
return 1;
}
Modified: squeeze/trunk/libsqueeze/archive-support.c
===================================================================
--- squeeze/trunk/libsqueeze/archive-support.c 2007-01-02 13:27:10 UTC (rev 24239)
+++ squeeze/trunk/libsqueeze/archive-support.c 2007-01-02 16:01:26 UTC (rev 24240)
@@ -16,12 +16,13 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <config.h>
#include <string.h>
#include <glib.h>
#include <glib/gstdio.h>
#include <glib-object.h>
+#include <thunar-vfs/thunar-vfs.h>
-#include "mime.h"
#include "archive.h"
#include "archive-support.h"
@@ -140,9 +141,9 @@
*
*/
LSQArchiveSupport *
-lsq_get_support_for_mime(const gchar *mime)
+lsq_get_support_for_mime(ThunarVfsMimeInfo *mime_info)
{
- return lsq_get_support_for_mime_from_slist(lsq_archive_support_list, mime);
+ return lsq_get_support_for_mime_from_slist(lsq_archive_support_list, thunar_vfs_mime_info_get_name(mime_info));
}
/*
Modified: squeeze/trunk/libsqueeze/archive-support.h
===================================================================
--- squeeze/trunk/libsqueeze/archive-support.h 2007-01-02 13:27:10 UTC (rev 24239)
+++ squeeze/trunk/libsqueeze/archive-support.h 2007-01-02 16:01:26 UTC (rev 24240)
@@ -95,7 +95,7 @@
gboolean lsq_archive_support_mime_supported(LSQArchiveSupport *,const gchar *mime);
gboolean lsq_register_support(LSQArchiveSupport *);
-LSQArchiveSupport * lsq_get_support_for_mime(const gchar *mime);
+LSQArchiveSupport * lsq_get_support_for_mime(ThunarVfsMimeInfo *mime_info);
LSQArchiveSupport * lsq_get_support_for_mime_from_slist(GSList *list, const gchar *mime);
gint lsq_archive_support_lookup_mime(gconstpointer support_mime, gconstpointer mime);
Modified: squeeze/trunk/libsqueeze/archive.c
===================================================================
--- squeeze/trunk/libsqueeze/archive.c 2007-01-02 13:27:10 UTC (rev 24239)
+++ squeeze/trunk/libsqueeze/archive.c 2007-01-02 16:01:26 UTC (rev 24240)
@@ -23,10 +23,8 @@
#include <signal.h>
#include <sys/wait.h>
#include <sys/types.h>
-#include <gettext.h>
+#include <thunar-vfs/thunar-vfs.h>
-#include "mime.h"
-
#include "archive.h"
#include "archive-support.h"
#include "slist.h"
@@ -44,7 +42,7 @@
struct _LSQEntry
{
gchar *filename;
- LSQMimeInfo *mime_info;
+ ThunarVfsMimeInfo *mime_info;
gpointer props;
LSQEntry **children;
LSQSList *buffer;
@@ -206,6 +204,13 @@
LSQArchive *archive = (LSQArchive *)(object);
if(archive->path)
g_free(archive->path);
+ if(archive->path_info)
+ thunar_vfs_path_unref(archive->path_info);
+ if(archive->file_info)
+ thunar_vfs_info_unref(archive->file_info);
+ if(archive->mime_info)
+ thunar_vfs_mime_info_unref(archive->mime_info);
+
lsq_archive_entry_free(archive, archive->root_entry);
switch(archive->status)
{
@@ -228,16 +233,26 @@
archive = g_object_new(lsq_archive_get_type(), NULL);
if(path)
- archive->path = g_strdup(path);
+ {
+ archive->path_info = thunar_vfs_path_new(path, NULL);
+ archive->path = thunar_vfs_path_dup_string(archive->path_info);
+ }
else
- archive->path = NULL;
+ archive->path_info = NULL;
- if(!mime)
- archive->mime_info = lsq_mime_get_mime_info_for_file(archive->path);
+
+ archive->file_info = thunar_vfs_info_new_for_path(archive->path_info, NULL);
+ if(archive->file_info)
+ {
+ archive->mime_info = archive->file_info->mime_info;
+ thunar_vfs_mime_info_ref(archive->mime_info);
+ }
else
- archive->mime_info = lsq_mime_get_mime_info(mime);
+ {
+ archive->mime_info = thunar_vfs_mime_database_get_info(lsq_mime_database, mime);
+ }
- if(!lsq_get_support_for_mime(lsq_mime_info_get_name(archive->mime_info)))
+ if(!lsq_get_support_for_mime(archive->mime_info))
{
g_object_unref(archive);
archive = NULL;
@@ -532,12 +547,12 @@
if(pos)
{
entry->filename = g_strndup(filename, (gsize)(pos - filename));
- lsq_archive_iter_set_mime(archive, entry, lsq_mime_get_mime_info(LSQ_MIME_DIRECTORY));
+ lsq_archive_iter_set_mime(archive, entry, thunar_vfs_mime_database_get_info(lsq_mime_database, LSQ_MIME_DIRECTORY));
}
else
{
entry->filename = g_strdup(filename);
- lsq_archive_iter_set_mime(archive, entry, lsq_mime_get_mime_info_for_filename(entry->filename));
+ lsq_archive_iter_set_mime(archive, entry, thunar_vfs_mime_database_get_info_for_name(lsq_mime_database, entry->filename));
}
return entry;
@@ -588,7 +603,7 @@
g_free(entry->props);
}
if(entry->mime_info)
- lsq_mime_info_unref(entry->mime_info);
+ thunar_vfs_mime_info_unref(entry->mime_info);
g_free(entry->filename);
g_free(entry);
}
@@ -884,7 +899,7 @@
static const gchar *
lsq_archive_iter_get_mimetype(const LSQArchive *archive, const LSQArchiveIter *iter)
{
- return lsq_mime_info_get_name(((LSQEntry *)iter)->mime_info);
+ return thunar_vfs_mime_info_get_name(((LSQEntry *)iter)->mime_info);
}
/**
@@ -894,9 +909,11 @@
* set mime type to entry
*/
void
-lsq_archive_iter_set_mime(LSQArchive *archive, LSQArchiveIter *iter, LSQMimeInfo *mime)
+lsq_archive_iter_set_mime(LSQArchive *archive, LSQArchiveIter *iter, ThunarVfsMimeInfo *mime_info)
{
- ((LSQEntry *)iter)->mime_info = mime;
+ if(((LSQEntry *)iter)->mime_info)
+ thunar_vfs_mime_info_unref(((LSQEntry *)iter)->mime_info);
+ ((LSQEntry *)iter)->mime_info = mime_info;
}
/**
@@ -1272,7 +1289,7 @@
lsq_archive_get_filename(LSQArchive *archive)
{
g_return_val_if_fail(LSQ_IS_ARCHIVE(archive), "<unknown>");
- return g_basename(archive->path);
+ return thunar_vfs_path_get_name(archive->path_info);
}
LSQArchiveStatus
@@ -1327,3 +1344,14 @@
}
return msg;
}
+
+void
+lsq_archive_iter_get_icon_name(const LSQArchive *archive, const LSQArchiveIter *iter, GValue *value, GtkIconTheme *icon_theme)
+{
+ g_value_init(value, G_TYPE_STRING);
+ const gchar *icon_name = thunar_vfs_mime_info_lookup_icon_name(iter->mime_info, icon_theme);
+ if(gtk_icon_theme_has_icon(icon_theme, icon_name))
+ g_value_set_string(value, icon_name);
+ else
+ g_value_set_string(value, NULL);
+}
Modified: squeeze/trunk/libsqueeze/archive.h
===================================================================
--- squeeze/trunk/libsqueeze/archive.h 2007-01-02 13:27:10 UTC (rev 24239)
+++ squeeze/trunk/libsqueeze/archive.h 2007-01-02 16:01:26 UTC (rev 24240)
@@ -69,7 +69,9 @@
{
GObject parent;
gchar *path;
- LSQMimeInfo *mime_info;
+ ThunarVfsPath *path_info;
+ ThunarVfsInfo *file_info;
+ ThunarVfsMimeInfo *mime_info;
guint entry_n_property;
GType *entry_property_types;
gchar **entry_property_names;
@@ -120,7 +122,7 @@
gboolean lsq_archive_iter_del_child(LSQArchive *, LSQArchiveIter *, LSQArchiveIter *);
/* void lsq_archive_iter_set_filename(LSQArchive *, LSQArchiveIter *, const gchar *); */
-void lsq_archive_iter_set_mime(LSQArchive *, LSQArchiveIter *, LSQMimeInfo *);
+void lsq_archive_iter_set_mime(LSQArchive *, LSQArchiveIter *, ThunarVfsMimeInfo *);
void lsq_archive_iter_set_prop_str(LSQArchive *, LSQArchiveIter *, guint, const gchar *);
void lsq_archive_iter_set_prop_uint(LSQArchive *, LSQArchiveIter *, guint, guint);
void lsq_archive_iter_set_prop_uint64(LSQArchive *, LSQArchiveIter *, guint, guint64);
@@ -129,6 +131,7 @@
void lsq_archive_iter_set_propsv(LSQArchive *, LSQArchiveIter *, gconstpointer *);
gboolean lsq_archive_iter_get_prop_value(const LSQArchive *, const LSQArchiveIter *, guint, GValue *);
+void lsq_archive_iter_get_icon_name(const LSQArchive *, const LSQArchiveIter *, GValue *, GtkIconTheme *icon_theme);
LSQArchiveIter *lsq_archive_add_file(LSQArchive *, const gchar *);
LSQArchiveIter *lsq_archive_get_iter(LSQArchive *, const gchar *);
Modified: squeeze/trunk/libsqueeze/internals.c
===================================================================
--- squeeze/trunk/libsqueeze/internals.c 2007-01-02 13:27:10 UTC (rev 24239)
+++ squeeze/trunk/libsqueeze/internals.c 2007-01-02 16:01:26 UTC (rev 24240)
@@ -21,8 +21,8 @@
#include <stdlib.h>
#include <glib.h>
#include <glib-object.h>
+#include <thunar-vfs/thunar-vfs.h>
-#include "mime.h"
#include "archive.h"
#include "archive-support.h"
Modified: squeeze/trunk/libsqueeze/internals.h
===================================================================
--- squeeze/trunk/libsqueeze/internals.h 2007-01-02 13:27:10 UTC (rev 24239)
+++ squeeze/trunk/libsqueeze/internals.h 2007-01-02 16:01:26 UTC (rev 24240)
@@ -32,7 +32,9 @@
GChildWatchFunc function,
GIOFunc f_in,
GIOFunc f_out,
- GIOFunc f_err);
+ GIOFunc f_err) G_GNUC_INTERNAL;
gchar *
-lsq_concat_filenames(GSList *filenames);
+lsq_concat_filenames(GSList *filenames) G_GNUC_INTERNAL;
+
+ThunarVfsMimeDatabase *lsq_mime_database;
Modified: squeeze/trunk/libsqueeze/libsqueeze.c
===================================================================
--- squeeze/trunk/libsqueeze/libsqueeze.c 2007-01-02 13:27:10 UTC (rev 24239)
+++ squeeze/trunk/libsqueeze/libsqueeze.c 2007-01-02 16:01:26 UTC (rev 24240)
@@ -21,7 +21,7 @@
#include <glib.h>
#include <glib/gstdio.h>
#include <glib-object.h>
-#include <gettext.h>
+#include <thunar-vfs/thunar-vfs.h>
#include "libsqueeze.h"
#include "libsqueeze/archive-support-zip.h"
@@ -34,8 +34,7 @@
{
lsq_tmp_dir = g_get_tmp_dir();
- lsq_mime_init();
-
+ lsq_mime_database = thunar_vfs_mime_database_get_default();
lsq_register_support(lsq_archive_support_gnu_tar_new());
lsq_register_support(lsq_archive_support_zip_new());
@@ -51,7 +50,7 @@
{
g_slist_foreach(lsq_archive_support_list, (GFunc)g_object_unref, NULL);
- lsq_mime_destroy();
+ g_object_unref(lsq_mime_database);
}
/*
Modified: squeeze/trunk/libsqueeze/libsqueeze.h
===================================================================
--- squeeze/trunk/libsqueeze/libsqueeze.h 2007-01-02 13:27:10 UTC (rev 24239)
+++ squeeze/trunk/libsqueeze/libsqueeze.h 2007-01-02 16:01:26 UTC (rev 24240)
@@ -18,9 +18,6 @@
#ifndef __LIBSQUEEZE_H__
#define __LIBSQUEEZE_H__
-#define EXO_API_SUBJECT_TO_CHANGE
-
-#include <libsqueeze/mime.h>
#include <libsqueeze/archive.h>
#include <libsqueeze/archive-support.h>
Deleted: squeeze/trunk/libsqueeze/mime.c
Deleted: squeeze/trunk/libsqueeze/mime.h
Modified: squeeze/trunk/libsqueeze/slist.c
===================================================================
--- squeeze/trunk/libsqueeze/slist.c 2007-01-02 13:27:10 UTC (rev 24239)
+++ squeeze/trunk/libsqueeze/slist.c 2007-01-02 16:01:26 UTC (rev 24240)
@@ -1,9 +1,10 @@
+#include <config.h>
#include <string.h>
#include <glib.h>
#include <glib-object.h>
+#include <thunar-vfs/thunar-vfs.h>
-#include "mime.h"
#include "archive.h"
#include "internals.h"
#include "slist.h"
Modified: squeeze/trunk/po/POTFILES.in
===================================================================
--- squeeze/trunk/po/POTFILES.in 2007-01-02 13:27:10 UTC (rev 24239)
+++ squeeze/trunk/po/POTFILES.in 2007-01-02 16:01:26 UTC (rev 24240)
@@ -4,7 +4,6 @@
libsqueeze/archive-support-gnu-tar.c
libsqueeze/archive-support-zip.c
libsqueeze/internals.c
-libsqueeze/mime.c
src/main.c
src/main_window.c
@@ -13,6 +12,8 @@
src/new_dialog.c
src/add_dialog.c
src/extract_dialog.c
+src/preferences_dialog.c
+src/properties_dialog.c
src/tool_bar.c
src/path_bar.c
Modified: squeeze/trunk/po/fi.po
===================================================================
--- squeeze/trunk/po/fi.po 2007-01-02 13:27:10 UTC (rev 24239)
+++ squeeze/trunk/po/fi.po 2007-01-02 16:01:26 UTC (rev 24240)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: xarchiver 0.4.2rc2\n"
"Report-Msgid-Bugs-To: stephan at xfce.org\n"
-"POT-Creation-Date: 2006-12-26 00:53+0100\n"
+"POT-Creation-Date: 2007-01-02 13:58+0100\n"
"PO-Revision-Date: 2006-12-13 12:43+0200\n"
"Last-Translator: Jari Rahkonen <jari.rahkonen at pp1.inet.fi>\n"
"Language-Team: Finnish <translation-team-fi at lists.sourceforge.net>\n"
@@ -15,146 +15,146 @@
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../libsqueeze/archive.c:411
+#: ../libsqueeze/archive.c:415 ../src/preferences_dialog.c:234
msgid "Filename"
msgstr "Tiedostonimi"
-#: ../libsqueeze/archive.c:414
+#: ../libsqueeze/archive.c:418
msgid "Mime type"
msgstr "MIME-tyyppi"
-#: ../libsqueeze/archive.c:1301
+#: ../libsqueeze/archive.c:1307
msgid "Initializing archive"
msgstr ""
-#: ../libsqueeze/archive.c:1304
+#: ../libsqueeze/archive.c:1310
msgid "Refreshing archive contents"
msgstr ""
-#: ../libsqueeze/archive.c:1307
+#: ../libsqueeze/archive.c:1313
#, fuzzy
msgid "Adding file(s) to archive"
msgstr "Lisää tiedosto(ja) arkistoon"
-#: ../libsqueeze/archive.c:1310
+#: ../libsqueeze/archive.c:1316
#, fuzzy
msgid "Extracting file(s) from archive"
msgstr "Lisää tiedosto(ja) arkistoon"
-#: ../libsqueeze/archive.c:1313
+#: ../libsqueeze/archive.c:1319
#, fuzzy
msgid "Removing file(s) from archive"
msgstr "Lisää tiedosto(ja) arkistoon"
-#: ../libsqueeze/archive.c:1316
+#: ../libsqueeze/archive.c:1322
msgid "Done"
msgstr ""
-#: ../libsqueeze/archive.c:1319
+#: ../libsqueeze/archive.c:1325
msgid "Performing an extended action"
msgstr ""
-#: ../libsqueeze/archive.c:1322
+#: ../libsqueeze/archive.c:1328
msgid "Cancelled"
msgstr ""
-#: ../libsqueeze/archive.c:1325
+#: ../libsqueeze/archive.c:1331
msgid "Error"
msgstr ""
-#: ../libsqueeze/archive-support-gnu-tar.c:155
-#: ../libsqueeze/archive-support-zip.c:138
+#: ../libsqueeze/archive-support-gnu-tar.c:154
+#: ../libsqueeze/archive-support-zip.c:137
msgid "Overwrite existing files"
msgstr "Korvaa olemassaolevat"
-#: ../libsqueeze/archive-support-gnu-tar.c:156
-#: ../libsqueeze/archive-support-zip.c:139
+#: ../libsqueeze/archive-support-gnu-tar.c:155
+#: ../libsqueeze/archive-support-zip.c:138
msgid "Overwrite existing files on extraction"
msgstr "Korvaa olemassaolevat tiedostot purkaessa"
+#: ../libsqueeze/archive-support-gnu-tar.c:161
#: ../libsqueeze/archive-support-gnu-tar.c:162
-#: ../libsqueeze/archive-support-gnu-tar.c:163
msgid "Touch files"
msgstr "Kosketa tiedostoja"
+#: ../libsqueeze/archive-support-gnu-tar.c:168
#: ../libsqueeze/archive-support-gnu-tar.c:169
-#: ../libsqueeze/archive-support-gnu-tar.c:170
msgid "Strip directories"
msgstr "Karsi hakemistot"
-#: ../libsqueeze/archive-support-gnu-tar.c:178
+#: ../libsqueeze/archive-support-gnu-tar.c:177
msgid "Keep newer files"
msgstr "Säilytä uudemmat"
-#: ../libsqueeze/archive-support-gnu-tar.c:179
+#: ../libsqueeze/archive-support-gnu-tar.c:178
msgid "Do not overwrite files newer then those in the archive"
msgstr "Älä korvaa, jos tiedosto on arkistossa olevaa uudempi"
+#: ../libsqueeze/archive-support-gnu-tar.c:184
#: ../libsqueeze/archive-support-gnu-tar.c:185
-#: ../libsqueeze/archive-support-gnu-tar.c:186
msgid "Override permissions"
msgstr "Ohita oikeudet"
-#: ../libsqueeze/archive-support-gnu-tar.c:192
-#: ../libsqueeze/archive-support-gnu-tar.c:477
-#: ../libsqueeze/archive-support-zip.c:173
-#: ../libsqueeze/archive-support-zip.c:315
+#: ../libsqueeze/archive-support-gnu-tar.c:191
+#: ../libsqueeze/archive-support-gnu-tar.c:476
+#: ../libsqueeze/archive-support-zip.c:172
+#: ../libsqueeze/archive-support-zip.c:314
msgid "Size"
msgstr "Koko"
-#: ../libsqueeze/archive-support-gnu-tar.c:193
-#: ../libsqueeze/archive-support-zip.c:174
+#: ../libsqueeze/archive-support-gnu-tar.c:192
+#: ../libsqueeze/archive-support-zip.c:173
msgid "View filesize"
msgstr "Näytä tiedostokoko"
-#: ../libsqueeze/archive-support-gnu-tar.c:199
-#: ../libsqueeze/archive-support-gnu-tar.c:469
+#: ../libsqueeze/archive-support-gnu-tar.c:198
+#: ../libsqueeze/archive-support-gnu-tar.c:468
msgid "Permissions"
msgstr "Oikeudet"
-#: ../libsqueeze/archive-support-gnu-tar.c:200
+#: ../libsqueeze/archive-support-gnu-tar.c:199
msgid "View permissions"
msgstr "Näytä oikeudet"
-#: ../libsqueeze/archive-support-gnu-tar.c:206
-#: ../libsqueeze/archive-support-gnu-tar.c:473
+#: ../libsqueeze/archive-support-gnu-tar.c:205
+#: ../libsqueeze/archive-support-gnu-tar.c:472
msgid "Owner/Group"
msgstr "Omistaja/ryhmä"
-#: ../libsqueeze/archive-support-gnu-tar.c:207
+#: ../libsqueeze/archive-support-gnu-tar.c:206
msgid "View owner/group"
msgstr "Näytä omistaja/ryhmä"
-#: ../libsqueeze/archive-support-gnu-tar.c:213
-#: ../libsqueeze/archive-support-gnu-tar.c:481
-#: ../libsqueeze/archive-support-zip.c:159
-#: ../libsqueeze/archive-support-zip.c:331
+#: ../libsqueeze/archive-support-gnu-tar.c:212
+#: ../libsqueeze/archive-support-gnu-tar.c:480
+#: ../libsqueeze/archive-support-zip.c:158
+#: ../libsqueeze/archive-support-zip.c:330
msgid "Date"
msgstr "Pvm"
-#: ../libsqueeze/archive-support-gnu-tar.c:214
-#: ../libsqueeze/archive-support-zip.c:160
+#: ../libsqueeze/archive-support-gnu-tar.c:213
+#: ../libsqueeze/archive-support-zip.c:159
msgid "View date"
msgstr "Näytä pvm"
-#: ../libsqueeze/archive-support-gnu-tar.c:220
-#: ../libsqueeze/archive-support-gnu-tar.c:485
-#: ../libsqueeze/archive-support-zip.c:152
-#: ../libsqueeze/archive-support-zip.c:335
+#: ../libsqueeze/archive-support-gnu-tar.c:219
+#: ../libsqueeze/archive-support-gnu-tar.c:484
+#: ../libsqueeze/archive-support-zip.c:151
+#: ../libsqueeze/archive-support-zip.c:334
msgid "Time"
msgstr "Aika"
-#: ../libsqueeze/archive-support-gnu-tar.c:221
-#: ../libsqueeze/archive-support-zip.c:153
+#: ../libsqueeze/archive-support-gnu-tar.c:220
+#: ../libsqueeze/archive-support-zip.c:152
msgid "View time"
msgstr "Näytä aika"
-#: ../libsqueeze/archive-support-zip.c:111
+#: ../libsqueeze/archive-support-zip.c:110
msgid "Test"
msgstr "Tarkista"
#. TRANSATORS: first line is short comment, after newline is long comment
-#: ../libsqueeze/archive-support-zip.c:113
+#: ../libsqueeze/archive-support-zip.c:112
msgid ""
"Test archive integrity\n"
"Test the integrity of the archive"
@@ -162,68 +162,68 @@
"Tarkista arkiston eheys\n"
"Suorita arkiston eheystarkistus"
+#: ../libsqueeze/archive-support-zip.c:130
#: ../libsqueeze/archive-support-zip.c:131
-#: ../libsqueeze/archive-support-zip.c:132
msgid "Password"
msgstr "Salasana"
-#: ../libsqueeze/archive-support-zip.c:145
-#: ../libsqueeze/archive-support-zip.c:323
+#: ../libsqueeze/archive-support-zip.c:144
+#: ../libsqueeze/archive-support-zip.c:322
msgid "Compressed Size"
msgstr "Koko pakattuna"
-#: ../libsqueeze/archive-support-zip.c:146
+#: ../libsqueeze/archive-support-zip.c:145
msgid "View compressed filesize"
msgstr "Näytä koko pakattuna"
-#: ../libsqueeze/archive-support-zip.c:166
-#: ../libsqueeze/archive-support-zip.c:327
+#: ../libsqueeze/archive-support-zip.c:165
+#: ../libsqueeze/archive-support-zip.c:326
msgid "Ratio"
msgstr "Suhde"
-#: ../libsqueeze/archive-support-zip.c:167
+#: ../libsqueeze/archive-support-zip.c:166
msgid "View ratio"
msgstr "Näytä suhde"
-#: ../libsqueeze/archive-support-zip.c:180
-#: ../libsqueeze/archive-support-zip.c:319
+#: ../libsqueeze/archive-support-zip.c:179
+#: ../libsqueeze/archive-support-zip.c:318
msgid "Method"
msgstr "Metodi"
-#: ../libsqueeze/archive-support-zip.c:181
+#: ../libsqueeze/archive-support-zip.c:180
msgid "View method"
msgstr "Näytä metodi"
-#: ../libsqueeze/archive-support-zip.c:187
-#: ../libsqueeze/archive-support-zip.c:339
+#: ../libsqueeze/archive-support-zip.c:186
+#: ../libsqueeze/archive-support-zip.c:338
msgid "Checksum"
msgstr "Tarkiste"
-#: ../libsqueeze/archive-support-zip.c:188
+#: ../libsqueeze/archive-support-zip.c:187
msgid "View Checksum"
msgstr "Näytä tarkiste"
-#: ../src/main.c:53
+#: ../src/main.c:52
msgid "[destination path]"
msgstr "[kohdepolku]"
-#: ../src/main.c:61
+#: ../src/main.c:60
msgid "[archive path] [file1] [file2] ... [fileN]"
msgstr "[arkiston polku] [tied1] ... [tiedN]"
-#: ../src/main.c:65
+#: ../src/main.c:64
msgid "[file1] [file2] ... [fileN]"
msgstr "[tied1] ... [tiedN]"
-#: ../src/main.c:68
+#: ../src/main.c:67
msgid "Version information"
msgstr "Versiotiedot"
-#: ../src/main.c:115
+#: ../src/main.c:114
msgid "[archive name]"
msgstr "[arkiston nimi]"
-#: ../src/main.c:119
+#: ../src/main.c:118
#, c-format
msgid ""
"%s: %s\n"
@@ -232,23 +232,23 @@
"%s: %s\n"
"Kirjoittamalla %s --help saat täyden listan komentorivivalitsimista.\n"
-#: ../src/main_window.c:121
+#: ../src/main_window.c:119
msgid "Internal Style"
msgstr "Sisäinen tyyli"
-#: ../src/main_window.c:123
+#: ../src/main_window.c:121
msgid "Tool Bar Style"
msgstr "Työkalupalkkityyli"
-#: ../src/main_window.c:126
+#: ../src/main_window.c:124
msgid "Path Bar Style"
msgstr "Polkupalkkityyli"
-#: ../src/main_window.c:174
+#: ../src/main_window.c:172
msgid "Navigation Style"
msgstr "Navigointitapa"
-#: ../src/main_window.c:175
+#: ../src/main_window.c:173
msgid ""
"Style of navigation\n"
"The style to navigate trough the archive"
@@ -257,69 +257,69 @@
"Tapa, jolla navigoit arkistossa"
#. File menu
-#: ../src/main_window.c:260
+#: ../src/main_window.c:258
msgid "_File"
msgstr "_Tiedosto"
#. Action menu: ref all the childs
-#: ../src/main_window.c:292
+#: ../src/main_window.c:290
msgid "_Action"
msgstr "Toi_minto"
-#: ../src/main_window.c:297
+#: ../src/main_window.c:295
msgid "_Add"
msgstr "_Lisää"
-#: ../src/main_window.c:303
+#: ../src/main_window.c:301
msgid "_Extract"
msgstr "P_ura"
#. View menu
-#: ../src/main_window.c:317
+#: ../src/main_window.c:315
msgid "_View"
msgstr "_Näytä"
#. Help menu
-#: ../src/main_window.c:339
+#: ../src/main_window.c:337
msgid "_Help"
msgstr ""
-#: ../src/main_window.c:370
+#: ../src/main_window.c:368
msgid "Add"
msgstr "Lisää"
-#: ../src/main_window.c:374 ../src/main_window.c:869
+#: ../src/main_window.c:372 ../src/main_window.c:868
#: ../src/extract_dialog.c:102
msgid "Extract"
msgstr "Pura"
-#: ../src/main_window.c:618
+#: ../src/main_window.c:616
msgid "Open archive"
msgstr "Avaa arkisto"
-#: ../src/main_window.c:785
+#: ../src/main_window.c:784
msgid ""
"Squeeze is a lightweight and flexible archive manager for the Xfce Desktop "
"Environment"
msgstr ""
-#: ../src/main_window.c:791
+#: ../src/main_window.c:790
msgid "translator-credits"
msgstr "Jari Rahkonen <jari.rahkonen at pp1.inet.fi>"
-#: ../src/main_window.c:868
+#: ../src/main_window.c:867
msgid "Which action do you want to perform on the selected file(s)?"
msgstr "Mitä haluat tehdä valitu(i)lle tiedosto(i)lle?"
-#: ../src/main_window.c:869
+#: ../src/main_window.c:868
msgid "View"
msgstr "Näytä"
-#: ../src/main_window.c:932
+#: ../src/main_window.c:931
msgid "Failed to open file"
msgstr "Linkin avaaminen epäonnistui"
-#: ../src/main_window.c:933
+#: ../src/main_window.c:932
#, c-format
msgid ""
"'%s'\n"
@@ -331,7 +331,7 @@
#.
#. * Could not create archive (mime type unsupported)
#.
-#: ../src/application.c:223
+#: ../src/application.c:222
msgid "Could not create archive, MIME-type unsupported"
msgstr "Arkistoa ei voi luoda, MIME-tyyppiä ei tueta"
@@ -339,7 +339,7 @@
#. * Could not open archive (mime type not supported or file did not exist)
#. * Should be a more specific error message.
#.
-#: ../src/application.c:240
+#: ../src/application.c:239
msgid "Could not open archive, MIME-type unsupported or file did not exist"
msgstr ""
"Arkistoa ei voi avata, MIME-tyyppiä ei tueta tai tiedostoa ei ole olemassa"
@@ -398,6 +398,68 @@
msgid "Extract archive"
msgstr "Pura arkisto"
+#: ../src/preferences_dialog.c:107
+msgid "_General"
+msgstr ""
+
+#: ../src/preferences_dialog.c:110
+#, fuzzy
+msgid "Archive viewer:"
+msgstr "Arkistonhallinta"
+
+#: ../src/preferences_dialog.c:119
+#, fuzzy
+msgid "_Show Icons"
+msgstr "Näytä MIME-kuvakkeet"
+
+#: ../src/preferences_dialog.c:122
+msgid "_Rules Hint"
+msgstr ""
+
+#: ../src/preferences_dialog.c:125
+msgid "Sorting:"
+msgstr ""
+
+#: ../src/preferences_dialog.c:134
+#, fuzzy
+msgid "Sort _Case Sensitive "
+msgstr "Huomioi kirjainkoko järjestäessä"
+
+#: ../src/preferences_dialog.c:137
+#, fuzzy
+msgid "Sort _Folders First"
+msgstr "Hakemistot ennen tiedostoja"
+
+#: ../src/preferences_dialog.c:140
+#, fuzzy
+msgid "Navigation bar:"
+msgstr "Navigointitapa"
+
+#: ../src/preferences_dialog.c:150
+#, fuzzy
+msgid "_Archivers"
+msgstr "Arkistonhallinta"
+
+#: ../src/preferences_dialog.c:197
+msgid "_Behaviour"
+msgstr ""
+
+#: ../src/preferences_dialog.c:214
+msgid "Preferences"
+msgstr ""
+
+#: ../src/preferences_dialog.c:232
+msgid "Visible:"
+msgstr ""
+
+#: ../src/preferences_dialog.c:255
+msgid "Availble:"
+msgstr ""
+
+#: ../src/properties_dialog.c:83
+msgid "Properties"
+msgstr ""
+
#: ../src/tool_bar.c:159
msgid "Location:"
msgstr "Sijainti:"
@@ -410,41 +472,41 @@
msgid "The amount of space between the path buttons"
msgstr "Polkupainikkeiden välinen tyhjä tila"
-#: ../src/notebook.c:335
+#: ../src/notebook.c:339
#, c-format
msgid "Failed to open archive '%s'."
msgstr "Arkiston \"%s\" avaaminen epäonnistui."
-#: ../src/notebook.c:338
+#: ../src/notebook.c:347
#, fuzzy, c-format
msgid "Failed to extract contents of archive '%s'."
msgstr "Arkiston \"%s\" avaaminen epäonnistui."
-#: ../src/archive_store.c:242
+#: ../src/archive_store.c:241
msgid "Show mime icons"
msgstr "Näytä MIME-kuvakkeet"
-#: ../src/archive_store.c:243
+#: ../src/archive_store.c:242
msgid "Show the mime type icons for each entry"
msgstr "Näytä listan kohteiden MIME-tyyppikuvakkeet"
-#: ../src/archive_store.c:249
+#: ../src/archive_store.c:248
msgid "Show up dir entry"
msgstr "Näytä ylähakemisto"
-#: ../src/archive_store.c:250
+#: ../src/archive_store.c:249
msgid "Show '..' to go to the parent directory"
msgstr "Näytä kohde \"..\" ylähakemistoon siirtymiseen"
-#: ../src/archive_store.c:256
+#: ../src/archive_store.c:255
msgid "Sort folders before files"
msgstr "Hakemistot ennen tiedostoja"
-#: ../src/archive_store.c:257
+#: ../src/archive_store.c:256
msgid "The folders will be put at the top of the list"
msgstr "Näytä hakemistot listan alkupäässä"
-#: ../src/archive_store.c:263 ../src/archive_store.c:264
+#: ../src/archive_store.c:262 ../src/archive_store.c:263
msgid "Sort text case sensitive"
msgstr "Huomioi kirjainkoko järjestäessä"
Modified: squeeze/trunk/po/nl.po
===================================================================
--- squeeze/trunk/po/nl.po 2007-01-02 13:27:10 UTC (rev 24239)
+++ squeeze/trunk/po/nl.po 2007-01-02 16:01:26 UTC (rev 24240)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Squeeze 0.0.1-svn-r24005\n"
"Report-Msgid-Bugs-To: stephan at xfce.org\n"
-"POT-Creation-Date: 2006-12-26 00:53+0100\n"
+"POT-Creation-Date: 2007-01-02 13:58+0100\n"
"PO-Revision-Date: 2006-11-28 22:52+0100\n"
"Last-Translator: Stephan Arts <stephan at xfce.org>\n"
"Language-Team: Dutch <vertaling at vrijschrift.org>\n"
@@ -16,143 +16,143 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../libsqueeze/archive.c:411
+#: ../libsqueeze/archive.c:415 ../src/preferences_dialog.c:234
msgid "Filename"
msgstr "Bestandsnaam"
-#: ../libsqueeze/archive.c:414
+#: ../libsqueeze/archive.c:418
msgid "Mime type"
msgstr "Mime type"
-#: ../libsqueeze/archive.c:1301
+#: ../libsqueeze/archive.c:1307
msgid "Initializing archive"
msgstr "Archief initialiseren"
-#: ../libsqueeze/archive.c:1304
+#: ../libsqueeze/archive.c:1310
msgid "Refreshing archive contents"
msgstr "Inhoud van archief vernieuwen"
-#: ../libsqueeze/archive.c:1307
+#: ../libsqueeze/archive.c:1313
msgid "Adding file(s) to archive"
msgstr "Bestand(en) aan het toevoegen aan archief"
-#: ../libsqueeze/archive.c:1310
+#: ../libsqueeze/archive.c:1316
msgid "Extracting file(s) from archive"
msgstr "Bestand(en) uitpakken uit archief"
-#: ../libsqueeze/archive.c:1313
+#: ../libsqueeze/archive.c:1319
msgid "Removing file(s) from archive"
msgstr "Bestand(en) verwijderen uit archief"
-#: ../libsqueeze/archive.c:1316
+#: ../libsqueeze/archive.c:1322
msgid "Done"
msgstr "Klaar"
-#: ../libsqueeze/archive.c:1319
+#: ../libsqueeze/archive.c:1325
msgid "Performing an extended action"
msgstr "Uitgebreide actie uitvoeren"
-#: ../libsqueeze/archive.c:1322
+#: ../libsqueeze/archive.c:1328
msgid "Cancelled"
msgstr "Geannulleerd"
-#: ../libsqueeze/archive.c:1325
+#: ../libsqueeze/archive.c:1331
msgid "Error"
msgstr "Fout"
-#: ../libsqueeze/archive-support-gnu-tar.c:155
-#: ../libsqueeze/archive-support-zip.c:138
+#: ../libsqueeze/archive-support-gnu-tar.c:154
+#: ../libsqueeze/archive-support-zip.c:137
msgid "Overwrite existing files"
msgstr "Bestaande bestanden overschrijven"
-#: ../libsqueeze/archive-support-gnu-tar.c:156
-#: ../libsqueeze/archive-support-zip.c:139
+#: ../libsqueeze/archive-support-gnu-tar.c:155
+#: ../libsqueeze/archive-support-zip.c:138
msgid "Overwrite existing files on extraction"
msgstr "Bestaande bestanden overschrijven tijdens uitpakken"
+#: ../libsqueeze/archive-support-gnu-tar.c:161
#: ../libsqueeze/archive-support-gnu-tar.c:162
-#: ../libsqueeze/archive-support-gnu-tar.c:163
msgid "Touch files"
msgstr "Bestanden aanraken"
+#: ../libsqueeze/archive-support-gnu-tar.c:168
#: ../libsqueeze/archive-support-gnu-tar.c:169
-#: ../libsqueeze/archive-support-gnu-tar.c:170
msgid "Strip directories"
msgstr "Mappen strippen"
-#: ../libsqueeze/archive-support-gnu-tar.c:178
+#: ../libsqueeze/archive-support-gnu-tar.c:177
msgid "Keep newer files"
msgstr "Nieuwere bestanden behouden"
-#: ../libsqueeze/archive-support-gnu-tar.c:179
+#: ../libsqueeze/archive-support-gnu-tar.c:178
msgid "Do not overwrite files newer then those in the archive"
msgstr "Bestanden die nieuwer zijn dan die in het archief niet overschrijven"
+#: ../libsqueeze/archive-support-gnu-tar.c:184
#: ../libsqueeze/archive-support-gnu-tar.c:185
-#: ../libsqueeze/archive-support-gnu-tar.c:186
msgid "Override permissions"
msgstr "Rechten overschrijven"
-#: ../libsqueeze/archive-support-gnu-tar.c:192
-#: ../libsqueeze/archive-support-gnu-tar.c:477
-#: ../libsqueeze/archive-support-zip.c:173
-#: ../libsqueeze/archive-support-zip.c:315
+#: ../libsqueeze/archive-support-gnu-tar.c:191
+#: ../libsqueeze/archive-support-gnu-tar.c:476
+#: ../libsqueeze/archive-support-zip.c:172
+#: ../libsqueeze/archive-support-zip.c:314
msgid "Size"
msgstr "Grootte"
-#: ../libsqueeze/archive-support-gnu-tar.c:193
-#: ../libsqueeze/archive-support-zip.c:174
+#: ../libsqueeze/archive-support-gnu-tar.c:192
+#: ../libsqueeze/archive-support-zip.c:173
msgid "View filesize"
msgstr "Grootte weergeven"
-#: ../libsqueeze/archive-support-gnu-tar.c:199
-#: ../libsqueeze/archive-support-gnu-tar.c:469
+#: ../libsqueeze/archive-support-gnu-tar.c:198
+#: ../libsqueeze/archive-support-gnu-tar.c:468
msgid "Permissions"
msgstr "Rechten"
-#: ../libsqueeze/archive-support-gnu-tar.c:200
+#: ../libsqueeze/archive-support-gnu-tar.c:199
msgid "View permissions"
msgstr "Rechten weergeven"
-#: ../libsqueeze/archive-support-gnu-tar.c:206
-#: ../libsqueeze/archive-support-gnu-tar.c:473
+#: ../libsqueeze/archive-support-gnu-tar.c:205
+#: ../libsqueeze/archive-support-gnu-tar.c:472
msgid "Owner/Group"
msgstr "Eigenaar/Groep"
-#: ../libsqueeze/archive-support-gnu-tar.c:207
+#: ../libsqueeze/archive-support-gnu-tar.c:206
msgid "View owner/group"
msgstr "Eigenaar / groep weergeven"
-#: ../libsqueeze/archive-support-gnu-tar.c:213
-#: ../libsqueeze/archive-support-gnu-tar.c:481
-#: ../libsqueeze/archive-support-zip.c:159
-#: ../libsqueeze/archive-support-zip.c:331
+#: ../libsqueeze/archive-support-gnu-tar.c:212
+#: ../libsqueeze/archive-support-gnu-tar.c:480
+#: ../libsqueeze/archive-support-zip.c:158
+#: ../libsqueeze/archive-support-zip.c:330
msgid "Date"
msgstr "Datum"
-#: ../libsqueeze/archive-support-gnu-tar.c:214
-#: ../libsqueeze/archive-support-zip.c:160
+#: ../libsqueeze/archive-support-gnu-tar.c:213
+#: ../libsqueeze/archive-support-zip.c:159
msgid "View date"
msgstr "Datum weergeven"
-#: ../libsqueeze/archive-support-gnu-tar.c:220
-#: ../libsqueeze/archive-support-gnu-tar.c:485
-#: ../libsqueeze/archive-support-zip.c:152
-#: ../libsqueeze/archive-support-zip.c:335
+#: ../libsqueeze/archive-support-gnu-tar.c:219
+#: ../libsqueeze/archive-support-gnu-tar.c:484
+#: ../libsqueeze/archive-support-zip.c:151
+#: ../libsqueeze/archive-support-zip.c:334
msgid "Time"
msgstr "Tijd"
-#: ../libsqueeze/archive-support-gnu-tar.c:221
-#: ../libsqueeze/archive-support-zip.c:153
+#: ../libsqueeze/archive-support-gnu-tar.c:220
+#: ../libsqueeze/archive-support-zip.c:152
msgid "View time"
msgstr "Tijd weergeven"
-#: ../libsqueeze/archive-support-zip.c:111
+#: ../libsqueeze/archive-support-zip.c:110
msgid "Test"
msgstr "Testen"
#. TRANSATORS: first line is short comment, after newline is long comment
-#: ../libsqueeze/archive-support-zip.c:113
+#: ../libsqueeze/archive-support-zip.c:112
msgid ""
"Test archive integrity\n"
"Test the integrity of the archive"
@@ -160,68 +160,68 @@
"Test archief integriteir\n"
"Test de integriteit van het archief"
+#: ../libsqueeze/archive-support-zip.c:130
#: ../libsqueeze/archive-support-zip.c:131
-#: ../libsqueeze/archive-support-zip.c:132
msgid "Password"
msgstr "Wachtwoord"
-#: ../libsqueeze/archive-support-zip.c:145
-#: ../libsqueeze/archive-support-zip.c:323
+#: ../libsqueeze/archive-support-zip.c:144
+#: ../libsqueeze/archive-support-zip.c:322
msgid "Compressed Size"
msgstr "Gecomprimeerde Grootte"
-#: ../libsqueeze/archive-support-zip.c:146
+#: ../libsqueeze/archive-support-zip.c:145
msgid "View compressed filesize"
msgstr "Gecomprimeerde bestandsgrootte weergeven"
-#: ../libsqueeze/archive-support-zip.c:166
-#: ../libsqueeze/archive-support-zip.c:327
+#: ../libsqueeze/archive-support-zip.c:165
+#: ../libsqueeze/archive-support-zip.c:326
msgid "Ratio"
msgstr "Verhouding"
-#: ../libsqueeze/archive-support-zip.c:167
+#: ../libsqueeze/archive-support-zip.c:166
msgid "View ratio"
msgstr "Verhouding weergeven"
-#: ../libsqueeze/archive-support-zip.c:180
-#: ../libsqueeze/archive-support-zip.c:319
+#: ../libsqueeze/archive-support-zip.c:179
+#: ../libsqueeze/archive-support-zip.c:318
msgid "Method"
msgstr "Methode"
-#: ../libsqueeze/archive-support-zip.c:181
+#: ../libsqueeze/archive-support-zip.c:180
msgid "View method"
msgstr "methode weergeven"
-#: ../libsqueeze/archive-support-zip.c:187
-#: ../libsqueeze/archive-support-zip.c:339
+#: ../libsqueeze/archive-support-zip.c:186
+#: ../libsqueeze/archive-support-zip.c:338
msgid "Checksum"
msgstr "Checksom"
-#: ../libsqueeze/archive-support-zip.c:188
+#: ../libsqueeze/archive-support-zip.c:187
msgid "View Checksum"
msgstr "Checksom weergeven"
-#: ../src/main.c:53
+#: ../src/main.c:52
msgid "[destination path]"
msgstr "[bestemmings map]"
-#: ../src/main.c:61
+#: ../src/main.c:60
msgid "[archive path] [file1] [file2] ... [fileN]"
msgstr "[archief pad] [bestand1] ... [bestandN]"
-#: ../src/main.c:65
+#: ../src/main.c:64
msgid "[file1] [file2] ... [fileN]"
msgstr "[bestand1] [bestand2] ... [bestandN]"
-#: ../src/main.c:68
+#: ../src/main.c:67
msgid "Version information"
msgstr "Versie informatie"
-#: ../src/main.c:115
+#: ../src/main.c:114
msgid "[archive name]"
msgstr "[archief naam]"
-#: ../src/main.c:119
+#: ../src/main.c:118
#, c-format
msgid ""
"%s: %s\n"
@@ -230,23 +230,23 @@
"%s: %s\n"
"Probeer %s --help voor een volledige lijst van mogelijke opties.\n"
-#: ../src/main_window.c:121
+#: ../src/main_window.c:119
msgid "Internal Style"
msgstr "Interne Stijl"
-#: ../src/main_window.c:123
+#: ../src/main_window.c:121
msgid "Tool Bar Style"
msgstr "Werkbalk Stijl"
-#: ../src/main_window.c:126
+#: ../src/main_window.c:124
msgid "Path Bar Style"
msgstr "Padbalk Stijl"
-#: ../src/main_window.c:174
+#: ../src/main_window.c:172
msgid "Navigation Style"
msgstr "Navigatie Stijl"
-#: ../src/main_window.c:175
+#: ../src/main_window.c:173
msgid ""
"Style of navigation\n"
"The style to navigate trough the archive"
@@ -255,47 +255,47 @@
"De stijl om te navigeren door het archief"
#. File menu
-#: ../src/main_window.c:260
+#: ../src/main_window.c:258
msgid "_File"
msgstr "_Bestand"
#. Action menu: ref all the childs
-#: ../src/main_window.c:292
+#: ../src/main_window.c:290
msgid "_Action"
msgstr "_Actie"
-#: ../src/main_window.c:297
+#: ../src/main_window.c:295
msgid "_Add"
msgstr "_Toevoegen"
-#: ../src/main_window.c:303
+#: ../src/main_window.c:301
msgid "_Extract"
msgstr "_Uitpakken"
#. View menu
-#: ../src/main_window.c:317
+#: ../src/main_window.c:315
msgid "_View"
msgstr "B_eeld"
#. Help menu
-#: ../src/main_window.c:339
+#: ../src/main_window.c:337
msgid "_Help"
msgstr "_Help"
-#: ../src/main_window.c:370
+#: ../src/main_window.c:368
msgid "Add"
msgstr "Toevoegen"
-#: ../src/main_window.c:374 ../src/main_window.c:869
+#: ../src/main_window.c:372 ../src/main_window.c:868
#: ../src/extract_dialog.c:102
msgid "Extract"
msgstr "Uitpakken"
-#: ../src/main_window.c:618
+#: ../src/main_window.c:616
msgid "Open archive"
msgstr "Archief openen"
-#: ../src/main_window.c:785
+#: ../src/main_window.c:784
msgid ""
"Squeeze is a lightweight and flexible archive manager for the Xfce Desktop "
"Environment"
@@ -303,23 +303,23 @@
"Squeeze is een lightgewicht en flexibele archief beheerder voor de Xfce "
"Bureaublad omgeving"
-#: ../src/main_window.c:791
+#: ../src/main_window.c:790
msgid "translator-credits"
msgstr "Stephan Arts <stephan at xfce.org>"
-#: ../src/main_window.c:868
+#: ../src/main_window.c:867
msgid "Which action do you want to perform on the selected file(s)?"
msgstr "Welke actie wil je uitvoeren op de geselecteerde bestand(en)?"
-#: ../src/main_window.c:869
+#: ../src/main_window.c:868
msgid "View"
msgstr "Weergeven"
-#: ../src/main_window.c:932
+#: ../src/main_window.c:931
msgid "Failed to open file"
msgstr "Kan bestand niet openen"
-#: ../src/main_window.c:933
+#: ../src/main_window.c:932
#, c-format
msgid ""
"'%s'\n"
@@ -331,7 +331,7 @@
#.
#. * Could not create archive (mime type unsupported)
#.
-#: ../src/application.c:223
+#: ../src/application.c:222
msgid "Could not create archive, MIME-type unsupported"
msgstr "Kan archief niet maken, MIME-type niet ondersteund"
@@ -339,7 +339,7 @@
#. * Could not open archive (mime type not supported or file did not exist)
#. * Should be a more specific error message.
#.
-#: ../src/application.c:240
+#: ../src/application.c:239
msgid "Could not open archive, MIME-type unsupported or file did not exist"
msgstr ""
"Kan archief niet openen, MIME-type niet ondersteund of bestand bestaat niet"
@@ -398,6 +398,62 @@
msgid "Extract archive"
msgstr "Archief uitpakken"
+#: ../src/preferences_dialog.c:107
+msgid "_General"
+msgstr "_Algemeen"
+
+#: ../src/preferences_dialog.c:110
+msgid "Archive viewer:"
+msgstr "Archieveerder:"
+
+#: ../src/preferences_dialog.c:119
+msgid "_Show Icons"
+msgstr "Pictogrammenn _Tonen"
+
+#: ../src/preferences_dialog.c:122
+msgid "_Rules Hint"
+msgstr "_Regel Hints"
+
+#: ../src/preferences_dialog.c:125
+msgid "Sorting:"
+msgstr "Sorteren:"
+
+#: ../src/preferences_dialog.c:134
+msgid "Sort _Case Sensitive "
+msgstr "Tekst _hoofdlettergevoelig sorteren"
+
+#: ../src/preferences_dialog.c:137
+msgid "Sort _Folders First"
+msgstr "_Mappen voor bestanden sorteren"
+
+#: ../src/preferences_dialog.c:140
+msgid "Navigation bar:"
+msgstr "Navigatie balk:"
+
+#: ../src/preferences_dialog.c:150
+msgid "_Archivers"
+msgstr "_Archiveerders"
+
+#: ../src/preferences_dialog.c:197
+msgid "_Behaviour"
+msgstr "_Gedrag"
+
+#: ../src/preferences_dialog.c:214
+msgid "Preferences"
+msgstr "Voorkeuren"
+
+#: ../src/preferences_dialog.c:232
+msgid "Visible:"
+msgstr "Zichtbaar:"
+
+#: ../src/preferences_dialog.c:255
+msgid "Availble:"
+msgstr "Beschikbaar:"
+
+#: ../src/properties_dialog.c:83
+msgid "Properties"
+msgstr "Eigenschappen"
+
#: ../src/tool_bar.c:159
msgid "Location:"
msgstr "Locatie:"
@@ -410,41 +466,41 @@
msgid "The amount of space between the path buttons"
msgstr "De ruimte tussen de pad knoppen"
-#: ../src/notebook.c:335
+#: ../src/notebook.c:339
#, c-format
msgid "Failed to open archive '%s'."
msgstr "Kan archief '%s' niet openen."
-#: ../src/notebook.c:338
+#: ../src/notebook.c:347
#, c-format
msgid "Failed to extract contents of archive '%s'."
msgstr "Het uitpakken van de inhoud van archief '%s' is mislukt."
-#: ../src/archive_store.c:242
+#: ../src/archive_store.c:241
msgid "Show mime icons"
msgstr "Mime iconen weergeven"
-#: ../src/archive_store.c:243
+#: ../src/archive_store.c:242
msgid "Show the mime type icons for each entry"
msgstr "Mime type iconen weergeven voor elk item"
-#: ../src/archive_store.c:249
+#: ../src/archive_store.c:248
msgid "Show up dir entry"
msgstr "Toon map-omhoog item"
-#: ../src/archive_store.c:250
+#: ../src/archive_store.c:249
msgid "Show '..' to go to the parent directory"
msgstr "Toon '..' om naar de bovenliggende map te gaan"
-#: ../src/archive_store.c:256
+#: ../src/archive_store.c:255
msgid "Sort folders before files"
msgstr "Mappen voor bestanden sorteren"
-#: ../src/archive_store.c:257
+#: ../src/archive_store.c:256
msgid "The folders will be put at the top of the list"
msgstr "De mappen zullen boven aan de lijst geplaatst worden"
-#: ../src/archive_store.c:263 ../src/archive_store.c:264
+#: ../src/archive_store.c:262 ../src/archive_store.c:263
msgid "Sort text case sensitive"
msgstr "Tekst hoofdlettergevoelig sorteren"
Modified: squeeze/trunk/src/add_dialog.c
===================================================================
--- squeeze/trunk/src/add_dialog.c 2007-01-02 13:27:10 UTC (rev 24239)
+++ squeeze/trunk/src/add_dialog.c 2007-01-02 16:01:26 UTC (rev 24240)
@@ -19,8 +19,8 @@
#include <config.h>
#include <glib.h>
#include <gtk/gtk.h>
+#include <thunar-vfs/thunar-vfs.h>
#include <libsqueeze/libsqueeze.h>
-#include <gettext.h>
#include "add_dialog.h"
#include "widget_factory.h"
Modified: squeeze/trunk/src/application.c
===================================================================
--- squeeze/trunk/src/application.c 2007-01-02 13:27:10 UTC (rev 24239)
+++ squeeze/trunk/src/application.c 2007-01-02 16:01:26 UTC (rev 24240)
@@ -20,10 +20,9 @@
#include <string.h>
#include <glib.h>
#include <gtk/gtk.h>
+#include <thunar-vfs/thunar-vfs.h>
#include <libsqueeze/libsqueeze.h>
-#include <gettext.h>
-
#include "new_dialog.h"
#include "add_dialog.h"
#include "extract_dialog.h"
@@ -168,7 +167,7 @@
if(!lsq_open_archive(archive_path, &lp_archive))
{
g_signal_connect(G_OBJECT(lp_archive), "lsq_status_changed", G_CALLBACK(cb_sq_application_archive_status_changed), app);
- lp_support = lsq_get_support_for_mime(lsq_mime_info_get_name(lp_archive->mime_info));
+ lp_support = lsq_get_support_for_mime(lp_archive->mime_info);
if(!dest_path)
{
dialog = sq_extract_archive_dialog_new(lp_support, lp_archive, FALSE);
@@ -245,7 +244,7 @@
}
}
g_signal_connect(G_OBJECT(lp_archive), "lsq_status_changed", G_CALLBACK(cb_sq_application_archive_status_changed), NULL);
- lp_support = lsq_get_support_for_mime(lsq_mime_info_get_name(lp_archive->mime_info));
+ lp_support = lsq_get_support_for_mime(lp_archive->mime_info);
lsq_archive_support_add(lp_support, lp_archive, files);
g_object_ref(app);
return 0;
Modified: squeeze/trunk/src/archive_store.c
===================================================================
--- squeeze/trunk/src/archive_store.c 2007-01-02 13:27:10 UTC (rev 24239)
+++ squeeze/trunk/src/archive_store.c 2007-01-02 16:01:26 UTC (rev 24240)
@@ -21,9 +21,8 @@
#include <glib.h>
#include <glib-object.h>
#include <gtk/gtk.h>
+#include <thunar-vfs/thunar-vfs.h>
#include <libsqueeze/libsqueeze.h>
-#include <libsqueeze/mime.h>
-#include <gettext.h>
#include "archive_store.h"
@@ -514,8 +513,7 @@
{
if(column == -1)
{
- lsq_archive_iter_get_prop_value(archive, entry, LSQ_ARCHIVE_PROP_MIME_TYPE, value);
- lsq_mime_convert_to_icon_name(store->icon_theme, value);
+ lsq_archive_iter_get_icon_name(archive, entry, value, store->icon_theme);
}
else
{
Modified: squeeze/trunk/src/extract_dialog.c
===================================================================
--- squeeze/trunk/src/extract_dialog.c 2007-01-02 13:27:10 UTC (rev 24239)
+++ squeeze/trunk/src/extract_dialog.c 2007-01-02 16:01:26 UTC (rev 24240)
@@ -23,8 +23,8 @@
#include <string.h>
#include <glib.h>
#include <gtk/gtk.h>
+#include <thunar-vfs/thunar-vfs.h>
#include <libsqueeze/libsqueeze.h>
-#include <gettext.h>
#include "extract_dialog.h"
#include "widget_factory.h"
Modified: squeeze/trunk/src/main.c
===================================================================
--- squeeze/trunk/src/main.c 2007-01-02 13:27:10 UTC (rev 24239)
+++ squeeze/trunk/src/main.c 2007-01-02 16:01:26 UTC (rev 24240)
@@ -20,10 +20,9 @@
#include <glib.h>
#include <glib-object.h>
#include <gtk/gtk.h>
+#include <thunar-vfs/thunar-vfs.h>
#include <libsqueeze/libsqueeze.h>
-#include <gettext.h>
-
#include "settings.h"
#include "archive_store.h"
#include "navigation_bar.h"
@@ -122,6 +121,7 @@
}
}
+ thunar_vfs_init();
lsq_init();
sq_icon_theme = gtk_icon_theme_get_default();
@@ -178,6 +178,7 @@
g_object_unref(sq_app);
gtk_main();
lsq_destroy();
+ thunar_vfs_shutdown();
return 0;
}
Modified: squeeze/trunk/src/main_window.c
===================================================================
--- squeeze/trunk/src/main_window.c 2007-01-02 13:27:10 UTC (rev 24239)
+++ squeeze/trunk/src/main_window.c 2007-01-02 16:01:26 UTC (rev 24240)
@@ -31,13 +31,11 @@
#include <string.h>
#include <glib.h>
#include <gtk/gtk.h>
+#include <thunar-vfs/thunar-vfs.h>
#include <libsqueeze/libsqueeze.h>
-#include <libsqueeze/mime.h>
#ifdef HAVE_LIBXFCE4UTIL
#include <libxfce4util/libxfce4util.h>
-#else
-#include <gettext.h>
#endif
#include "settings.h"
@@ -594,7 +592,7 @@
if(!lsq_new_archive(new_archive_path, TRUE, NULL, &archive))
{
- support = lsq_get_support_for_mime(lsq_mime_info_get_name(archive->mime_info));
+ support = lsq_get_support_for_mime(archive->mime_info);
sq_notebook_add_archive(SQ_NOTEBOOK(window->notebook), archive, support, TRUE);
}
else
@@ -915,7 +913,7 @@
if(!lsq_open_archive(path, &archive))
{
- support = lsq_get_support_for_mime(lsq_mime_info_get_name(archive->mime_info));
+ support = lsq_get_support_for_mime(archive->mime_info);
if(replace < 0)
sq_notebook_add_archive(SQ_NOTEBOOK(window->notebook), archive, support, FALSE);
else
Modified: squeeze/trunk/src/navigation_bar.c
===================================================================
--- squeeze/trunk/src/navigation_bar.c 2007-01-02 13:27:10 UTC (rev 24239)
+++ squeeze/trunk/src/navigation_bar.c 2007-01-02 16:01:26 UTC (rev 24240)
@@ -20,6 +20,7 @@
#include <string.h>
#include <glib.h>
#include <gtk/gtk.h>
+#include <thunar-vfs/thunar-vfs.h>
#include <libsqueeze/libsqueeze.h>
#include "archive_store.h"
#include "navigation_bar.h"
Modified: squeeze/trunk/src/new_dialog.c
===================================================================
--- squeeze/trunk/src/new_dialog.c 2007-01-02 13:27:10 UTC (rev 24239)
+++ squeeze/trunk/src/new_dialog.c 2007-01-02 16:01:26 UTC (rev 24240)
@@ -19,8 +19,8 @@
#include <config.h>
#include <glib.h>
#include <gtk/gtk.h>
+#include <thunar-vfs/thunar-vfs.h>
#include <libsqueeze/libsqueeze.h>
-#include <gettext.h>
#include "new_dialog.h"
Modified: squeeze/trunk/src/notebook.c
===================================================================
--- squeeze/trunk/src/notebook.c 2007-01-02 13:27:10 UTC (rev 24239)
+++ squeeze/trunk/src/notebook.c 2007-01-02 16:01:26 UTC (rev 24240)
@@ -20,8 +20,8 @@
#include <string.h>
#include <glib.h>
#include <gtk/gtk.h>
+#include <thunar-vfs/thunar-vfs.h>
#include <libsqueeze/libsqueeze.h>
-#include <gettext.h>
#include "archive_store.h"
#include "navigation_bar.h"
#include "tool_bar.h"
@@ -267,7 +267,7 @@
{
GtkWidget *lbl_hbox = gtk_hbox_new(FALSE, 0);
GtkWidget *label = gtk_label_new(lsq_archive_get_filename(archive));
- GtkWidget *archive_image = gtk_image_new_from_icon_name(lsq_mime_info_get_icon_name(archive->mime_info, notebook->icon_theme), GTK_ICON_SIZE_MENU);
+ GtkWidget *archive_image = gtk_image_new_from_icon_name(thunar_vfs_mime_info_lookup_icon_name(archive->mime_info, notebook->icon_theme), GTK_ICON_SIZE_MENU);
GtkWidget *close_button = gtk_button_new();
GtkWidget *close_image = gtk_image_new_from_stock(GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU);
GtkWidget *scroll_window = gtk_scrolled_window_new(NULL, NULL);
@@ -332,10 +332,20 @@
switch(lsq_archive_get_old_status(archive))
{
case LSQ_ARCHIVESTATUS_REFRESH:
- dialog = gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Failed to open archive '%s'."), archive->path);
+ dialog = gtk_message_dialog_new(NULL,
+ 0,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_OK,
+ _("Failed to open archive '%s'."),
+ lsq_archive_get_filename(archive));
break;
case LSQ_ARCHIVESTATUS_EXTRACT:
- dialog = gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Failed to extract contents of archive '%s'."), archive->path);
+ dialog = gtk_message_dialog_new(NULL,
+ 0,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_OK,
+ _("Failed to extract contents of archive '%s'."),
+ lsq_archive_get_filename(archive));
break;
default:
break;
Modified: squeeze/trunk/src/path_bar.c
===================================================================
--- squeeze/trunk/src/path_bar.c 2007-01-02 13:27:10 UTC (rev 24239)
+++ squeeze/trunk/src/path_bar.c 2007-01-02 16:01:26 UTC (rev 24240)
@@ -23,7 +23,7 @@
#include <string.h>
#include <glib.h>
#include <gtk/gtk.h>
-#include <gettext.h>
+#include <thunar-vfs/thunar-vfs.h>
#include <libsqueeze/libsqueeze.h>
#include "archive_store.h"
#include "navigation_bar.h"
Modified: squeeze/trunk/src/preferences_dialog.c
===================================================================
--- squeeze/trunk/src/preferences_dialog.c 2007-01-02 13:27:10 UTC (rev 24239)
+++ squeeze/trunk/src/preferences_dialog.c 2007-01-02 16:01:26 UTC (rev 24240)
@@ -19,16 +19,10 @@
#include <config.h>
#include <glib.h>
#include <gtk/gtk.h>
+#include <thunar-vfs/thunar-vfs.h>
#include <libsqueeze/libsqueeze.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
-#ifdef HAVE_THUNAR_VFS
-#define EXO_API_SUBJECT_TO_CHANGE
-#include <thunar-vfs/thunar-vfs.h>
-#else
-#include <gettext.h>
-#endif
-
#include "preferences_dialog.h"
static void
Modified: squeeze/trunk/src/properties_dialog.c
===================================================================
--- squeeze/trunk/src/properties_dialog.c 2007-01-02 13:27:10 UTC (rev 24239)
+++ squeeze/trunk/src/properties_dialog.c 2007-01-02 16:01:26 UTC (rev 24240)
@@ -19,10 +19,10 @@
#include <config.h>
#include <glib.h>
#include <gtk/gtk.h>
+#include <thunar-vfs/thunar-vfs.h>
#include <libsqueeze/libsqueeze.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gettext.h>
#include "properties_dialog.h"
Modified: squeeze/trunk/src/tool_bar.c
===================================================================
--- squeeze/trunk/src/tool_bar.c 2007-01-02 13:27:10 UTC (rev 24239)
+++ squeeze/trunk/src/tool_bar.c 2007-01-02 16:01:26 UTC (rev 24240)
@@ -20,8 +20,8 @@
#include <string.h>
#include <glib.h>
#include <gtk/gtk.h>
+#include <thunar-vfs/thunar-vfs.h>
#include <libsqueeze/libsqueeze.h>
-#include <gettext.h>
#include "archive_store.h"
#include "navigation_bar.h"
#include "tool_bar.h"
Modified: squeeze/trunk/src/widget_factory.c
===================================================================
--- squeeze/trunk/src/widget_factory.c 2007-01-02 13:27:10 UTC (rev 24239)
+++ squeeze/trunk/src/widget_factory.c 2007-01-02 16:01:26 UTC (rev 24240)
@@ -23,7 +23,7 @@
#include <signal.h>
#include <sys/wait.h>
#include <sys/types.h>
-#include <gettext.h>
+#include <thunar-vfs/thunar-vfs.h>
#include <libsqueeze/libsqueeze.h>
#include "widget_factory.h"
More information about the Xfce4-commits
mailing list