Author: stephan
Date: 2006-12-25 23:58:24 +0000 (Mon, 25 Dec 2006)
New Revision: 24189
Modified:
squeeze/trunk/libsqueeze/archive.c
squeeze/trunk/libsqueeze/archive.h
squeeze/trunk/po/fi.po
squeeze/trunk/po/nl.po
squeeze/trunk/src/archive_store.c
squeeze/trunk/src/main_window.c
squeeze/trunk/src/notebook.c
squeeze/trunk/src/properties_dialog.c
Log:
Made more preparations for properties-dialog
Modified: squeeze/trunk/libsqueeze/archive.c
===================================================================
--- squeeze/trunk/libsqueeze/archive.c 2006-12-25 19:45:32 UTC (rev 24188)
+++ squeeze/trunk/libsqueeze/archive.c 2006-12-25 23:58:24 UTC (rev 24189)
@@ -61,10 +61,10 @@
lsq_archive_finalize(GObject *object);
static GType *
-lsq_archive_get_property_types(LSQArchive *archive, guint size);
+lsq_archive_get_entry_property_types(LSQArchive *archive, guint size);
static gchar **
-lsq_archive_get_property_names(LSQArchive *archive, guint size);
+lsq_archive_get_entry_property_names(LSQArchive *archive, guint size);
static LSQEntry *
lsq_entry_new(LSQArchive *, const gchar *);
@@ -313,65 +313,65 @@
}
static GType *
-lsq_archive_get_property_types(LSQArchive *archive, guint size)
+lsq_archive_get_entry_property_types(LSQArchive *archive, guint size)
{
GType *new_props;
gchar **new_names;
guint i;
- if(archive->n_property < size)
+ if(archive->entry_n_property < size)
{
new_props = g_new0(GType, size);
new_names = g_new0(gchar*, size);
- for(i = 0; i < archive->n_property; ++i)
+ for(i = 0; i < archive->entry_n_property; ++i)
{
- new_props[i] = archive->property_types[i];
- new_names[i] = archive->property_names[i];
+ new_props[i] = archive->entry_property_types[i];
+ new_names[i] = archive->entry_property_names[i];
}
- g_free(archive->property_types);
- g_free(archive->property_names);
- archive->property_types = new_props;
- archive->property_names = new_names;
- archive->n_property = size;
+ g_free(archive->entry_property_types);
+ g_free(archive->entry_property_names);
+ archive->entry_property_types = new_props;
+ archive->entry_property_names = new_names;
+ archive->entry_n_property = size;
}
- return archive->property_types;
+ return archive->entry_property_types;
}
static gchar **
-lsq_archive_get_property_names(LSQArchive *archive, guint size)
+lsq_archive_get_entry_property_names(LSQArchive *archive, guint size)
{
GType *new_types;
gchar **new_names;
guint i;
- if(archive->n_property < size)
+ if(archive->entry_n_property < size)
{
new_types = g_new0(GType, size);
new_names = g_new0(gchar*, size);
- for(i = 0; i < archive->n_property; ++i)
+ for(i = 0; i < archive->entry_n_property; ++i)
{
- new_types[i] = archive->property_types[i];
- new_names[i] = archive->property_names[i];
+ new_types[i] = archive->entry_property_types[i];
+ new_names[i] = archive->entry_property_names[i];
}
- g_free(archive->property_types);
- g_free(archive->property_names);
- archive->property_types = new_types;
- archive->property_names = new_names;
- archive->n_property = size;
+ g_free(archive->entry_property_types);
+ g_free(archive->entry_property_names);
+ archive->entry_property_types = new_types;
+ archive->entry_property_names = new_names;
+ archive->entry_n_property = size;
}
- return archive->property_names;
+ return archive->entry_property_names;
}
/*
* GType
- * lsq_archive_get_property_type(LSQArchive *archive, guint i)
+ * lsq_archive_get_entry_property_type(LSQArchive *archive, guint i)
*
*/
GType
-lsq_archive_get_property_type(LSQArchive *archive, guint i)
+lsq_archive_get_entry_property_type(LSQArchive *archive, guint i)
{
#ifdef DEBUG /* n_property + 2, filename and MIME */
- g_return_val_if_fail(i < (archive->n_property+LSQ_ARCHIVE_PROP_USER),
G_TYPE_INVALID);
+ g_return_val_if_fail(i <
(archive->entry_n_property+LSQ_ARCHIVE_PROP_USER), G_TYPE_INVALID);
#endif
GType retval = G_TYPE_INVALID;
@@ -384,7 +384,7 @@
retval = G_TYPE_STRING;
break;
default:
- retval = archive->property_types[i -
LSQ_ARCHIVE_PROP_USER];
+ retval = archive->entry_property_types[i -
LSQ_ARCHIVE_PROP_USER];
break;
}
return retval;
@@ -392,15 +392,15 @@
/*
* const gchar *
- * lsq_archive_get_property_name(LSQArchive *, guint)
+ * lsq_archive_get_entry_property_name(LSQArchive *, guint)
*
*/
const gchar *
-lsq_archive_get_property_name(LSQArchive *archive, guint i)
+lsq_archive_get_entry_property_name(LSQArchive *archive, guint i)
{
#ifdef DEBUG /* n_property + 2, filename and MIME */
- g_return_val_if_fail(i < (archive->n_property+LSQ_ARCHIVE_PROP_USER),
NULL);
+ g_return_val_if_fail(i <
(archive->entry_n_property+LSQ_ARCHIVE_PROP_USER), NULL);
#endif
const gchar *retval = NULL;
@@ -414,7 +414,7 @@
retval = _("Mime type");
break;
default:
- retval = archive->property_names[i -
LSQ_ARCHIVE_PROP_USER];
+ retval = archive->entry_property_names[i -
LSQ_ARCHIVE_PROP_USER];
break;
}
@@ -434,8 +434,8 @@
g_return_if_fail(i >= LSQ_ARCHIVE_PROP_USER);
#endif
- GType *types_iter = lsq_archive_get_property_types(archive,
i+1-LSQ_ARCHIVE_PROP_USER);
- gchar **names_iter = lsq_archive_get_property_names(archive,
i+1-LSQ_ARCHIVE_PROP_USER);
+ GType *types_iter = lsq_archive_get_entry_property_types(archive,
i+1-LSQ_ARCHIVE_PROP_USER);
+ gchar **names_iter = lsq_archive_get_entry_property_names(archive,
i+1-LSQ_ARCHIVE_PROP_USER);
types_iter[i-LSQ_ARCHIVE_PROP_USER] = type;
g_free(names_iter[i-LSQ_ARCHIVE_PROP_USER]);
@@ -460,8 +460,8 @@
type_iter++;
name_iter++;
}
- GType *types_iter = lsq_archive_get_property_types(archive, size);
- gchar **names_iter = lsq_archive_get_property_names(archive, size);
+ GType *types_iter = lsq_archive_get_entry_property_types(archive, size);
+ gchar **names_iter = lsq_archive_get_entry_property_names(archive,
size);
type_iter = types;
name_iter = names;
while(type_iter && name_iter)
@@ -479,7 +479,7 @@
guint
lsq_archive_n_property(LSQArchive *archive)
{
- return archive->n_property + LSQ_ARCHIVE_PROP_USER;
+ return archive->entry_n_property + LSQ_ARCHIVE_PROP_USER;
}
LSQArchiveIter *
@@ -569,9 +569,9 @@
if(props_iter)
{
- for(i=0; i<archive->n_property; ++i)
+ for(i=0; i<archive->entry_n_property; ++i)
{
- switch(archive->property_types[i])
+ switch(archive->entry_property_types[i])
{
case(G_TYPE_STRING):
g_free(*(gchar **)props_iter);
@@ -745,9 +745,9 @@
if(!entry->props)
{
- for(i = 0; i < archive->n_property; ++i)
+ for(i = 0; i < archive->entry_n_property; ++i)
{
- switch(archive->property_types[i])
+ switch(archive->entry_property_types[i])
{
case G_TYPE_STRING:
size += sizeof(gchar *);
@@ -911,9 +911,9 @@
gpointer props_iter = NULL;
guint n;
#ifdef DEBUG
- g_return_if_fail(i < (archive->n_property+LSQ_ARCHIVE_PROP_USER));
+ g_return_if_fail(i < (archive->entry_n_property+LSQ_ARCHIVE_PROP_USER));
if(i >= LSQ_ARCHIVE_PROP_USER)
-
g_return_if_fail(archive->property_types[i-LSQ_ARCHIVE_PROP_USER] ==
G_TYPE_STRING);
+
g_return_if_fail(archive->entry_property_types[i-LSQ_ARCHIVE_PROP_USER] ==
G_TYPE_STRING);
#endif
switch(i)
@@ -932,7 +932,7 @@
props_iter = lsq_archive_entry_get_props(archive,
(LSQEntry *)iter);
for(n = 0; n < (i-LSQ_ARCHIVE_PROP_USER); ++n)
{
- switch(archive->property_types[n])
+ switch(archive->entry_property_types[n])
{
case G_TYPE_STRING:
props_iter += sizeof(gchar *);
@@ -962,16 +962,16 @@
{
#ifdef DEBUG
- g_return_if_fail(i < (archive->n_property+LSQ_ARCHIVE_PROP_USER));
+ g_return_if_fail(i < (archive->entry_n_property+LSQ_ARCHIVE_PROP_USER));
g_return_if_fail(i >= LSQ_ARCHIVE_PROP_USER);
- g_return_if_fail(archive->property_types[i-LSQ_ARCHIVE_PROP_USER] ==
G_TYPE_UINT);
+ g_return_if_fail(archive->entry_property_types[i-LSQ_ARCHIVE_PROP_USER]
== G_TYPE_UINT);
#endif /* DEBUG */
gpointer props_iter = lsq_archive_entry_get_props(archive, (LSQEntry
*)iter);
guint n;
for(n = 0; n < (i-LSQ_ARCHIVE_PROP_USER); ++n)
{
- switch(archive->property_types[n])
+ switch(archive->entry_property_types[n])
{
case G_TYPE_STRING:
props_iter += sizeof(gchar *);
@@ -998,16 +998,16 @@
{
#ifdef DEBUG
- g_return_if_fail(i < (archive->n_property+LSQ_ARCHIVE_PROP_USER));
+ g_return_if_fail(i < (archive->entry_n_property+LSQ_ARCHIVE_PROP_USER));
g_return_if_fail(i >= LSQ_ARCHIVE_PROP_USER);
- g_return_if_fail(archive->property_types[i-LSQ_ARCHIVE_PROP_USER] ==
G_TYPE_UINT64);
+ g_return_if_fail(archive->entry_property_types[i-LSQ_ARCHIVE_PROP_USER]
== G_TYPE_UINT64);
#endif /* DEBUG */
gpointer props_iter = lsq_archive_entry_get_props(archive, (LSQEntry
*)iter);
guint n;
for(n = 0; n < (i-LSQ_ARCHIVE_PROP_USER); ++n)
{
- switch(archive->property_types[n])
+ switch(archive->entry_property_types[n])
{
case G_TYPE_STRING:
props_iter += sizeof(gchar *);
@@ -1062,9 +1062,9 @@
va_start(ap, iter);
- for(i = 0; i < archive->n_property; ++i)
+ for(i = 0; i < archive->entry_n_property; ++i)
{
- switch(archive->property_types[i])
+ switch(archive->entry_property_types[i])
{
case G_TYPE_STRING:
(*((gchar **)props_iter)) = g_strdup(va_arg(ap,
gchar*));
@@ -1096,9 +1096,9 @@
gpointer props_iter = lsq_archive_entry_get_props(archive, (LSQEntry
*)iter);
guint i;
- for(i = 0; i < archive->n_property; ++i)
+ for(i = 0; i < archive->entry_n_property; ++i)
{
- switch(archive->property_types[i])
+ switch(archive->entry_property_types[i])
{
case G_TYPE_STRING:
(*((gchar **)props_iter)) = g_strdup((const
gchar*)props[i]);
@@ -1127,7 +1127,7 @@
{
if(i>=LSQ_ARCHIVE_PROP_USER)
- g_value_init(value,
archive->property_types[i-LSQ_ARCHIVE_PROP_USER]);
+ g_value_init(value,
archive->entry_property_types[i-LSQ_ARCHIVE_PROP_USER]);
else
g_value_init(value, G_TYPE_STRING);
@@ -1159,9 +1159,9 @@
gpointer props_iter = NULL;
guint n;
#ifdef DEBUG
- g_return_val_if_fail(i < (archive->n_property+LSQ_ARCHIVE_PROP_USER),
NULL);
+ g_return_val_if_fail(i <
(archive->entry_n_property+LSQ_ARCHIVE_PROP_USER), NULL);
if(i >= LSQ_ARCHIVE_PROP_USER)
-
g_return_val_if_fail(archive->property_types[i-LSQ_ARCHIVE_PROP_USER] ==
G_TYPE_STRING, NULL);
+
g_return_val_if_fail(archive->entry_property_types[i-LSQ_ARCHIVE_PROP_USER] ==
G_TYPE_STRING, NULL);
#endif
switch(i)
@@ -1178,7 +1178,7 @@
{
for(n = 0; n < (i-LSQ_ARCHIVE_PROP_USER); ++n)
{
- switch(archive->property_types[n])
+ switch(archive->entry_property_types[n])
{
case G_TYPE_STRING:
props_iter +=
sizeof(gchar *);
@@ -1209,15 +1209,15 @@
gpointer props_iter = ((LSQEntry *)iter)->props;
guint n;
#ifdef DEBUG
- g_return_val_if_fail(i < (archive->n_property+LSQ_ARCHIVE_PROP_USER),
0);
+ g_return_val_if_fail(i <
(archive->entry_n_property+LSQ_ARCHIVE_PROP_USER), 0);
g_return_val_if_fail(i >= LSQ_ARCHIVE_PROP_USER, 0);
- g_return_val_if_fail(archive->property_types[i-LSQ_ARCHIVE_PROP_USER]
== G_TYPE_UINT, 0);
+
g_return_val_if_fail(archive->entry_property_types[i-LSQ_ARCHIVE_PROP_USER] ==
G_TYPE_UINT, 0);
#endif
if(!props_iter)
return 0;
for(n = 0; n < (i-LSQ_ARCHIVE_PROP_USER); ++n)
{
- switch(archive->property_types[n])
+ switch(archive->entry_property_types[n])
{
case G_TYPE_STRING:
props_iter += sizeof(gchar *);
@@ -1244,15 +1244,15 @@
gpointer props_iter = ((LSQEntry *)iter)->props;
guint n;
#ifdef DEBUG
- g_return_val_if_fail(i < (archive->n_property+LSQ_ARCHIVE_PROP_USER),
0);
+ g_return_val_if_fail(i <
(archive->entry_n_property+LSQ_ARCHIVE_PROP_USER), 0);
g_return_val_if_fail(i >= LSQ_ARCHIVE_PROP_USER, 0);
- g_return_val_if_fail(archive->property_types[i-LSQ_ARCHIVE_PROP_USER]
== G_TYPE_UINT64, 0);
+
g_return_val_if_fail(archive->entry_property_types[i-LSQ_ARCHIVE_PROP_USER] ==
G_TYPE_UINT64, 0);
#endif
if(!props_iter)
return 0;
for(n = 0; n < (i-LSQ_ARCHIVE_PROP_USER); ++n)
{
- switch(archive->property_types[n])
+ switch(archive->entry_property_types[n])
{
case G_TYPE_STRING:
props_iter += sizeof(gchar *);
Modified: squeeze/trunk/libsqueeze/archive.h
===================================================================
--- squeeze/trunk/libsqueeze/archive.h 2006-12-25 19:45:32 UTC (rev 24188)
+++ squeeze/trunk/libsqueeze/archive.h 2006-12-25 23:58:24 UTC (rev 24189)
@@ -70,9 +70,9 @@
GObject parent;
gchar *path;
LSQMimeInfo *mime_info;
- guint n_property;
- GType *property_types;
- gchar **property_names;
+ guint entry_n_property;
+ GType *entry_property_types;
+ gchar **entry_property_names;
LSQEntry *root_entry;
#ifdef G_THREADS_ENABLED
GStaticRWLock rw_lock;
@@ -89,6 +89,10 @@
gchar *tmp_file;
gchar *files;
gboolean has_passwd;
+ struct {
+ gint64 archive_size;
+ gint64 content_size;
+ } props;
};
typedef struct _LSQArchiveClass LSQArchiveClass;
@@ -128,8 +132,8 @@
LSQArchiveIter *lsq_archive_add_file(LSQArchive *, const gchar *);
LSQArchiveIter *lsq_archive_get_iter(LSQArchive *, const gchar *);
-GType lsq_archive_get_property_type(LSQArchive *, guint);
-const gchar *lsq_archive_get_property_name(LSQArchive *, guint);
+GType lsq_archive_get_entry_property_type(LSQArchive *, guint);
+const gchar *lsq_archive_get_entry_property_name(LSQArchive *, guint);
void lsq_archive_set_property_type(LSQArchive *, guint, GType,
const gchar *);
void lsq_archive_set_property_typesv(LSQArchive *, GType *,
const gchar **);
guint lsq_archive_n_property(LSQArchive *);
Modified: squeeze/trunk/po/fi.po
===================================================================
--- squeeze/trunk/po/fi.po 2006-12-25 19:45:32 UTC (rev 24188)
+++ squeeze/trunk/po/fi.po 2006-12-25 23:58:24 UTC (rev 24189)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: xarchiver 0.4.2rc2\n"
"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2006-12-19 13:41+0100\n"
+"POT-Creation-Date: 2006-12-26 00:53+0100\n"
"PO-Revision-Date: 2006-12-13 12:43+0200\n"
"Last-Translator: Jari Rahkonen <[EMAIL PROTECTED]>\n"
"Language-Team: Finnish <[EMAIL PROTECTED]>\n"
@@ -15,50 +15,50 @@
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../libsqueeze/archive.c:403
+#: ../libsqueeze/archive.c:411
msgid "Filename"
msgstr "Tiedostonimi"
-#: ../libsqueeze/archive.c:406
+#: ../libsqueeze/archive.c:414
msgid "Mime type"
msgstr "MIME-tyyppi"
-#: ../libsqueeze/archive.c:1292
+#: ../libsqueeze/archive.c:1301
msgid "Initializing archive"
msgstr ""
-#: ../libsqueeze/archive.c:1295
+#: ../libsqueeze/archive.c:1304
msgid "Refreshing archive contents"
msgstr ""
-#: ../libsqueeze/archive.c:1298
+#: ../libsqueeze/archive.c:1307
#, fuzzy
msgid "Adding file(s) to archive"
msgstr "Lisää tiedosto(ja) arkistoon"
-#: ../libsqueeze/archive.c:1301
+#: ../libsqueeze/archive.c:1310
#, fuzzy
msgid "Extracting file(s) from archive"
msgstr "Lisää tiedosto(ja) arkistoon"
-#: ../libsqueeze/archive.c:1304
+#: ../libsqueeze/archive.c:1313
#, fuzzy
msgid "Removing file(s) from archive"
msgstr "Lisää tiedosto(ja) arkistoon"
-#: ../libsqueeze/archive.c:1307
+#: ../libsqueeze/archive.c:1316
msgid "Done"
msgstr ""
-#: ../libsqueeze/archive.c:1310
+#: ../libsqueeze/archive.c:1319
msgid "Performing an extended action"
msgstr ""
-#: ../libsqueeze/archive.c:1313
+#: ../libsqueeze/archive.c:1322
msgid "Cancelled"
msgstr ""
-#: ../libsqueeze/archive.c:1316
+#: ../libsqueeze/archive.c:1325
msgid "Error"
msgstr ""
@@ -232,23 +232,23 @@
"%s: %s\n"
"Kirjoittamalla %s --help saat täyden listan komentorivivalitsimista.\n"
-#: ../src/main_window.c:120
+#: ../src/main_window.c:121
msgid "Internal Style"
msgstr "Sisäinen tyyli"
-#: ../src/main_window.c:122
+#: ../src/main_window.c:123
msgid "Tool Bar Style"
msgstr "Työkalupalkkityyli"
-#: ../src/main_window.c:125
+#: ../src/main_window.c:126
msgid "Path Bar Style"
msgstr "Polkupalkkityyli"
-#: ../src/main_window.c:173
+#: ../src/main_window.c:174
msgid "Navigation Style"
msgstr "Navigointitapa"
-#: ../src/main_window.c:174
+#: ../src/main_window.c:175
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:259
+#: ../src/main_window.c:260
msgid "_File"
msgstr "_Tiedosto"
#. Action menu: ref all the childs
-#: ../src/main_window.c:291
+#: ../src/main_window.c:292
msgid "_Action"
msgstr "Toi_minto"
-#: ../src/main_window.c:296
+#: ../src/main_window.c:297
msgid "_Add"
msgstr "_Lisää"
-#: ../src/main_window.c:302
+#: ../src/main_window.c:303
msgid "_Extract"
msgstr "P_ura"
#. View menu
-#: ../src/main_window.c:316
+#: ../src/main_window.c:317
msgid "_View"
msgstr "_Näytä"
#. Help menu
-#: ../src/main_window.c:338
+#: ../src/main_window.c:339
msgid "_Help"
msgstr ""
-#: ../src/main_window.c:369
+#: ../src/main_window.c:370
msgid "Add"
msgstr "Lisää"
-#: ../src/main_window.c:373 ../src/main_window.c:861
+#: ../src/main_window.c:374 ../src/main_window.c:869
#: ../src/extract_dialog.c:102
msgid "Extract"
msgstr "Pura"
-#: ../src/main_window.c:617
+#: ../src/main_window.c:618
msgid "Open archive"
msgstr "Avaa arkisto"
-#: ../src/main_window.c:777
+#: ../src/main_window.c:785
msgid ""
"Squeeze is a lightweight and flexible archive manager for the Xfce Desktop "
"Environment"
msgstr ""
-#: ../src/main_window.c:783
+#: ../src/main_window.c:791
msgid "translator-credits"
msgstr "Jari Rahkonen <[EMAIL PROTECTED]>"
-#: ../src/main_window.c:860
+#: ../src/main_window.c:868
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:861
+#: ../src/main_window.c:869
msgid "View"
msgstr "Näytä"
-#: ../src/main_window.c:924
+#: ../src/main_window.c:932
msgid "Failed to open file"
msgstr "Linkin avaaminen epäonnistui"
-#: ../src/main_window.c:925
+#: ../src/main_window.c:933
#, c-format
msgid ""
"'%s'\n"
@@ -410,12 +410,12 @@
msgid "The amount of space between the path buttons"
msgstr "Polkupainikkeiden välinen tyhjä tila"
-#: ../src/notebook.c:325
+#: ../src/notebook.c:335
#, c-format
msgid "Failed to open archive '%s'."
msgstr "Arkiston \"%s\" avaaminen epäonnistui."
-#: ../src/notebook.c:328
+#: ../src/notebook.c:338
#, fuzzy, c-format
msgid "Failed to extract contents of archive '%s'."
msgstr "Arkiston \"%s\" avaaminen epäonnistui."
Modified: squeeze/trunk/po/nl.po
===================================================================
--- squeeze/trunk/po/nl.po 2006-12-25 19:45:32 UTC (rev 24188)
+++ squeeze/trunk/po/nl.po 2006-12-25 23:58:24 UTC (rev 24189)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Squeeze 0.0.1-svn-r24005\n"
"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2006-12-19 13:41+0100\n"
+"POT-Creation-Date: 2006-12-26 00:53+0100\n"
"PO-Revision-Date: 2006-11-28 22:52+0100\n"
"Last-Translator: Stephan Arts <[EMAIL PROTECTED]>\n"
"Language-Team: Dutch <[EMAIL PROTECTED]>\n"
@@ -16,47 +16,47 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../libsqueeze/archive.c:403
+#: ../libsqueeze/archive.c:411
msgid "Filename"
msgstr "Bestandsnaam"
-#: ../libsqueeze/archive.c:406
+#: ../libsqueeze/archive.c:414
msgid "Mime type"
msgstr "Mime type"
-#: ../libsqueeze/archive.c:1292
+#: ../libsqueeze/archive.c:1301
msgid "Initializing archive"
msgstr "Archief initialiseren"
-#: ../libsqueeze/archive.c:1295
+#: ../libsqueeze/archive.c:1304
msgid "Refreshing archive contents"
msgstr "Inhoud van archief vernieuwen"
-#: ../libsqueeze/archive.c:1298
+#: ../libsqueeze/archive.c:1307
msgid "Adding file(s) to archive"
msgstr "Bestand(en) aan het toevoegen aan archief"
-#: ../libsqueeze/archive.c:1301
+#: ../libsqueeze/archive.c:1310
msgid "Extracting file(s) from archive"
msgstr "Bestand(en) uitpakken uit archief"
-#: ../libsqueeze/archive.c:1304
+#: ../libsqueeze/archive.c:1313
msgid "Removing file(s) from archive"
msgstr "Bestand(en) verwijderen uit archief"
-#: ../libsqueeze/archive.c:1307
+#: ../libsqueeze/archive.c:1316
msgid "Done"
msgstr "Klaar"
-#: ../libsqueeze/archive.c:1310
+#: ../libsqueeze/archive.c:1319
msgid "Performing an extended action"
msgstr "Uitgebreide actie uitvoeren"
-#: ../libsqueeze/archive.c:1313
+#: ../libsqueeze/archive.c:1322
msgid "Cancelled"
msgstr "Geannulleerd"
-#: ../libsqueeze/archive.c:1316
+#: ../libsqueeze/archive.c:1325
msgid "Error"
msgstr "Fout"
@@ -230,23 +230,23 @@
"%s: %s\n"
"Probeer %s --help voor een volledige lijst van mogelijke opties.\n"
-#: ../src/main_window.c:120
+#: ../src/main_window.c:121
msgid "Internal Style"
msgstr "Interne Stijl"
-#: ../src/main_window.c:122
+#: ../src/main_window.c:123
msgid "Tool Bar Style"
msgstr "Werkbalk Stijl"
-#: ../src/main_window.c:125
+#: ../src/main_window.c:126
msgid "Path Bar Style"
msgstr "Padbalk Stijl"
-#: ../src/main_window.c:173
+#: ../src/main_window.c:174
msgid "Navigation Style"
msgstr "Navigatie Stijl"
-#: ../src/main_window.c:174
+#: ../src/main_window.c:175
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:259
+#: ../src/main_window.c:260
msgid "_File"
msgstr "_Bestand"
#. Action menu: ref all the childs
-#: ../src/main_window.c:291
+#: ../src/main_window.c:292
msgid "_Action"
msgstr "_Actie"
-#: ../src/main_window.c:296
+#: ../src/main_window.c:297
msgid "_Add"
msgstr "_Toevoegen"
-#: ../src/main_window.c:302
+#: ../src/main_window.c:303
msgid "_Extract"
msgstr "_Uitpakken"
#. View menu
-#: ../src/main_window.c:316
+#: ../src/main_window.c:317
msgid "_View"
msgstr "B_eeld"
#. Help menu
-#: ../src/main_window.c:338
+#: ../src/main_window.c:339
msgid "_Help"
msgstr "_Help"
-#: ../src/main_window.c:369
+#: ../src/main_window.c:370
msgid "Add"
msgstr "Toevoegen"
-#: ../src/main_window.c:373 ../src/main_window.c:861
+#: ../src/main_window.c:374 ../src/main_window.c:869
#: ../src/extract_dialog.c:102
msgid "Extract"
msgstr "Uitpakken"
-#: ../src/main_window.c:617
+#: ../src/main_window.c:618
msgid "Open archive"
msgstr "Archief openen"
-#: ../src/main_window.c:777
+#: ../src/main_window.c:785
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:783
+#: ../src/main_window.c:791
msgid "translator-credits"
msgstr "Stephan Arts <[EMAIL PROTECTED]>"
-#: ../src/main_window.c:860
+#: ../src/main_window.c:868
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:861
+#: ../src/main_window.c:869
msgid "View"
msgstr "Weergeven"
-#: ../src/main_window.c:924
+#: ../src/main_window.c:932
msgid "Failed to open file"
msgstr "Kan bestand niet openen"
-#: ../src/main_window.c:925
+#: ../src/main_window.c:933
#, c-format
msgid ""
"'%s'\n"
@@ -410,12 +410,12 @@
msgid "The amount of space between the path buttons"
msgstr "De ruimte tussen de pad knoppen"
-#: ../src/notebook.c:325
+#: ../src/notebook.c:335
#, c-format
msgid "Failed to open archive '%s'."
msgstr "Kan archief '%s' niet openen."
-#: ../src/notebook.c:328
+#: ../src/notebook.c:338
#, c-format
msgid "Failed to extract contents of archive '%s'."
msgstr "Het uitpakken van de inhoud van archief '%s' is mislukt."
Modified: squeeze/trunk/src/archive_store.c
===================================================================
--- squeeze/trunk/src/archive_store.c 2006-12-25 19:45:32 UTC (rev 24188)
+++ squeeze/trunk/src/archive_store.c 2006-12-25 23:58:24 UTC (rev 24189)
@@ -410,7 +410,7 @@
return G_TYPE_STRING;
}
- return lsq_archive_get_property_type(archive, index);
+ return lsq_archive_get_entry_property_type(archive, index);
}
static gboolean
@@ -535,7 +535,7 @@
g_value_set_string(value, "..");
break;
default:
- g_value_init(value,
lsq_archive_get_property_type(archive, column));
+ g_value_init(value,
lsq_archive_get_entry_property_type(archive, column));
break;
}
}
@@ -815,7 +815,7 @@
lsq_archive_iter_get_prop_value(archive, a, column, &prop_a);
lsq_archive_iter_get_prop_value(archive, b, column, &prop_b);
- switch(lsq_archive_get_property_type(archive, column))
+ switch(lsq_archive_get_entry_property_type(archive, column))
{
case G_TYPE_STRING:
switch(store->props._sort_case_sensitive)
Modified: squeeze/trunk/src/main_window.c
===================================================================
--- squeeze/trunk/src/main_window.c 2006-12-25 19:45:32 UTC (rev 24188)
+++ squeeze/trunk/src/main_window.c 2006-12-25 23:58:24 UTC (rev 24189)
@@ -762,6 +762,7 @@
GtkWidget *dialog = sq_properties_dialog_new(lp_archive);
gtk_dialog_run(GTK_DIALOG(dialog));
+ gtk_widget_destroy(dialog);
}
Modified: squeeze/trunk/src/notebook.c
===================================================================
--- squeeze/trunk/src/notebook.c 2006-12-25 19:45:32 UTC (rev 24188)
+++ squeeze/trunk/src/notebook.c 2006-12-25 23:58:24 UTC (rev 24189)
@@ -436,19 +436,19 @@
gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
gtk_tree_view_column_set_sort_column_id(column,
LSQ_ARCHIVE_PROP_FILENAME + 1);
- gtk_tree_view_column_set_title(column,
lsq_archive_get_property_name(archive, LSQ_ARCHIVE_PROP_FILENAME));
+ gtk_tree_view_column_set_title(column,
lsq_archive_get_entry_property_name(archive, LSQ_ARCHIVE_PROP_FILENAME));
gtk_tree_view_append_column(treeview, column);
if(!show_only_filenames)
{
for(x = LSQ_ARCHIVE_PROP_USER; x <
lsq_archive_n_property(archive); ++x)
{
- switch(lsq_archive_get_property_type(archive, x))
+ switch(lsq_archive_get_entry_property_type(archive, x))
{
case(G_TYPE_STRING):
case(G_TYPE_UINT64):
renderer = gtk_cell_renderer_text_new();
- column =
gtk_tree_view_column_new_with_attributes(lsq_archive_get_property_name(archive,
x), renderer, "text", x+1, NULL);
+ column =
gtk_tree_view_column_new_with_attributes(lsq_archive_get_entry_property_name(archive,
x), renderer, "text", x+1, NULL);
break;
}
gtk_tree_view_column_set_resizable(column, TRUE);
Modified: squeeze/trunk/src/properties_dialog.c
===================================================================
--- squeeze/trunk/src/properties_dialog.c 2006-12-25 19:45:32 UTC (rev
24188)
+++ squeeze/trunk/src/properties_dialog.c 2006-12-25 23:58:24 UTC (rev
24189)
@@ -22,12 +22,7 @@
#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 "properties_dialog.h"
@@ -71,6 +66,12 @@
static void
sq_properties_dialog_init(SQPropertiesDialog *dialog)
{
+ GtkWidget *tree_view = gtk_tree_view_new();
+
+ gtk_container_add(GTK_CONTAINER(((GtkDialog *)dialog)->vbox),
tree_view);
+ gtk_dialog_add_buttons(GTK_DIALOG(dialog),
+ GTK_STOCK_CLOSE, GTK_RESPONSE_OK,
+ NULL);
}
GtkWidget *
@@ -82,5 +83,7 @@
"title", _("Properties"),
NULL);
+ gtk_widget_set_size_request(GTK_WIDGET(dialog), 100, 200);
+
return dialog;
}
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
