Author: pollux
Date: 2006-07-30 14:03:23 +0000 (Sun, 30 Jul 2006)
New Revision: 22564
Modified:
xfburn/trunk/xfburn-toolbars.ui
xfburn/trunk/xfburn.ui
xfburn/trunk/xfburn/xfburn-burn-data-composition-dialog.c
xfburn/trunk/xfburn/xfburn-burn-data-composition-dialog.h
xfburn/trunk/xfburn/xfburn-data-composition.c
xfburn/trunk/xfburn/xfburn-data-composition.h
xfburn/trunk/xfburn/xfburn-disc-usage.c
xfburn/trunk/xfburn/xfburn-main-window.c
Log:
* deactivate the save/load actions
* add volume name support
Modified: xfburn/trunk/xfburn/xfburn-burn-data-composition-dialog.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-burn-data-composition-dialog.c 2006-07-30
12:09:37 UTC (rev 22563)
+++ xfburn/trunk/xfburn/xfburn-burn-data-composition-dialog.c 2006-07-30
14:03:23 UTC (rev 22564)
@@ -57,6 +57,7 @@
GtkWidget *check_dummy;
gchar *file_list;
+ XfburnDataComposition *composition;
};
/* globals */
@@ -297,6 +298,8 @@
static void
cb_dialog_response (XfburnBurnDataCompositionDialog * dialog, gint
response_id, XfburnBurnDataCompositionDialogPrivate * priv)
{
+ gchar *dummy_dir = NULL;
+
if (response_id == GTK_RESPONSE_OK) {
gchar *command = NULL;
GtkWidget *dialog_progress = NULL;
@@ -308,9 +311,10 @@
dialog_progress = xfburn_create_iso_from_composition_progress_dialog_new
();
}
else {
- gchar *speed;
- gchar *write_mode;
- gchar *device_name;
+ gchar *speed = NULL;
+ gchar *write_mode = NULL;
+ gchar *device_name = NULL;
+ gchar *volid = NULL;
XfburnDevice *device;
device_name = gtk_combo_box_get_active_text (GTK_COMBO_BOX
(priv->combo_device));
@@ -334,8 +338,10 @@
write_mode = g_strdup (" -tao");
}
+ volid = xfburn_data_composition_get_volume_id (priv->composition);
+
command = g_strconcat ("sh -c \"mkisofs -gui -graft-points -joliet
-full-iso9660-filenames -iso-level 2 -path-list ",
- priv->file_list, " | cdrecord -v gracetime=2", "
dev=", device->node_path, write_mode, " speed=", speed,
+ priv->file_list, " -volid ", volid, " | cdrecord
-v gracetime=2", " dev=", device->node_path, write_mode, " speed=", speed,
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
(priv->check_eject)) ? " -eject" : "",
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
(priv->check_dummy)) ? " -dummy" : "",
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
(priv->check_burnfree)) ? " driveropts=burnfree" : "",
@@ -343,6 +349,8 @@
g_free (device_name);
g_free (speed);
g_free (write_mode);
+ g_free (volid);
+
dialog_progress = xfburn_burn_data_composition_progress_dialog_new ();
}
@@ -351,10 +359,15 @@
g_object_set_data (G_OBJECT (dialog_progress), "command", command);
gtk_dialog_run (GTK_DIALOG (dialog_progress));
-
- unlink (priv->file_list);
+
g_free (command);
}
+
+ unlink (priv->file_list);
+ dummy_dir = xfburn_data_composition_get_dummy_dir (priv->composition);
+ if (dummy_dir) {
+ rmdir (dummy_dir);
+ }
}
/* public */
@@ -371,13 +384,14 @@
}
GtkWidget *
-xfburn_burn_data_composition_dialog_new (const gchar * file_list)
+xfburn_burn_data_composition_dialog_new (XfburnDataComposition *composition,
const gchar * file_list)
{
XfburnBurnDataCompositionDialog *obj;
obj = XFBURN_BURN_COMPOSITION_DIALOG (g_object_new
(XFBURN_TYPE_BURN_COMPOSITION_DIALOG, NULL));
obj->priv->file_list = g_strdup (file_list);
-
+ obj->priv->composition = composition;
+
return GTK_WIDGET (obj);
}
Modified: xfburn/trunk/xfburn/xfburn-burn-data-composition-dialog.h
===================================================================
--- xfburn/trunk/xfburn/xfburn-burn-data-composition-dialog.h 2006-07-30
12:09:37 UTC (rev 22563)
+++ xfburn/trunk/xfburn/xfburn-burn-data-composition-dialog.h 2006-07-30
14:03:23 UTC (rev 22564)
@@ -26,6 +26,8 @@
#include <gtk/gtk.h>
+#include "xfburn-data-composition.h"
+
G_BEGIN_DECLS
#define XFBURN_TYPE_BURN_COMPOSITION_DIALOG
(xfburn_burn_data_composition_dialog_get_type ())
@@ -48,7 +50,7 @@
} XfburnBurnDataCompositionDialogClass;
GtkType xfburn_burn_data_composition_dialog_get_type ();
-GtkWidget *xfburn_burn_data_composition_dialog_new (const gchar *file_list);
+GtkWidget *xfburn_burn_data_composition_dialog_new (XfburnDataComposition
*composition, const gchar *file_list);
gchar *xfburn_burn_data_composition_dialog_get_command_iso
(XfburnBurnDataCompositionDialog *dialog);
gchar *xfburn_burn_data_composition_dialog_get_command_burn
(XfburnBurnDataCompositionDialog *dialog);
Modified: xfburn/trunk/xfburn/xfburn-data-composition.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-data-composition.c 2006-07-30 12:09:37 UTC
(rev 22563)
+++ xfburn/trunk/xfburn/xfburn-data-composition.c 2006-07-30 14:03:23 UTC
(rev 22564)
@@ -116,6 +116,7 @@
GtkUIManager *ui_manager;
GtkWidget *toolbar;
+ GtkWidget *entry_volume_name;
GtkWidget *content;
GtkWidget *disc_usage;
#if 0
@@ -211,6 +212,8 @@
gint x, y;
ExoToolbarsModel *model_toolbar;
gint toolbar_position;
+ GtkWidget *hbox_toolbar;
+ GtkWidget *hbox, *label;
GtkWidget *scrolled_window;
GtkTreeStore *model;
GtkTreeViewColumn *column_file;
@@ -245,6 +248,10 @@
gtk_ui_manager_add_ui_from_string (priv->ui_manager, ui_string, -1, NULL);
+ hbox_toolbar = gtk_hbox_new (FALSE, 5);
+ gtk_box_pack_start (GTK_BOX (composition), hbox_toolbar, FALSE, TRUE, 0);
+ gtk_widget_show (hbox_toolbar);
+
/* toolbar */
model_toolbar = exo_toolbars_model_new ();
exo_toolbars_model_set_actions (model_toolbar, (gchar **) toolbar_actions,
G_N_ELEMENTS (toolbar_actions));
@@ -258,9 +265,25 @@
//exo_toolbars_model_add_item (model_toolbar, toolbar_position, -1,
"import-session", EXO_TOOLBARS_ITEM_TYPE);
priv->toolbar = exo_toolbars_view_new_with_model (priv->ui_manager,
model_toolbar);
- gtk_box_pack_start (GTK_BOX (composition), priv->toolbar, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox_toolbar), priv->toolbar, TRUE, TRUE, 0);
gtk_widget_show (priv->toolbar);
+
+ /* volume name */
+ hbox = gtk_hbox_new (FALSE, 5);
+ gtk_container_set_border_width (GTK_CONTAINER (hbox), 10);
+ gtk_box_pack_start (GTK_BOX (hbox_toolbar), hbox, FALSE, FALSE, 0);
+ gtk_widget_show (hbox);
+
+ label = gtk_label_new (_("Volume name :"));
+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+ gtk_widget_show (label);
+
+ priv->entry_volume_name = gtk_entry_new ();
+ gtk_entry_set_text (GTK_ENTRY (priv->entry_volume_name), _("Data
composition"));
+ gtk_box_pack_start (GTK_BOX (hbox), priv->entry_volume_name, FALSE, FALSE,
0);
+ gtk_widget_show (priv->entry_volume_name);
+
/* content treeview */
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
@@ -306,7 +329,7 @@
g_signal_connect (G_OBJECT (priv->content), "button-press-event",
G_CALLBACK (cb_treeview_button_pressed), composition);
-
+
#if 0
/* adding progress window */
priv->progress = xfburn_adding_progress_new ();
@@ -376,7 +399,7 @@
generate_file_list (XFBURN_DATA_COMPOSITION (dc), &tmpfile);
- dialog = xfburn_burn_data_composition_dialog_new (tmpfile);
+ dialog = xfburn_burn_data_composition_dialog_new (dc, tmpfile);
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (mainwin));
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
@@ -1298,3 +1321,22 @@
gtk_widget_show (priv->toolbar);
}
+
+gchar *
+xfburn_data_composition_get_dummy_dir (XfburnDataComposition * composition)
+{
+ XfburnDataCompositionPrivate *priv = XFBURN_DATA_COMPOSITION_GET_PRIVATE
(composition);
+ GtkTreeModel *model;
+
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->content));
+
+ return g_object_get_data (G_OBJECT (model), "dummy-dir");
+}
+
+gchar *
+xfburn_data_composition_get_volume_id (XfburnDataComposition * composition)
+{
+ XfburnDataCompositionPrivate *priv = XFBURN_DATA_COMPOSITION_GET_PRIVATE
(composition);
+
+ return g_strdup (gtk_entry_get_text (GTK_ENTRY (priv->entry_volume_name)));
+}
Modified: xfburn/trunk/xfburn/xfburn-data-composition.h
===================================================================
--- xfburn/trunk/xfburn/xfburn-data-composition.h 2006-07-30 12:09:37 UTC
(rev 22563)
+++ xfburn/trunk/xfburn/xfburn-data-composition.h 2006-07-30 14:03:23 UTC
(rev 22564)
@@ -57,5 +57,8 @@
void xfburn_data_composition_hide_toolbar (XfburnDataComposition *content);
void xfburn_data_composition_show_toolbar (XfburnDataComposition *content);
+gchar * xfburn_data_composition_get_dummy_dir (XfburnDataComposition *
composition);
+gchar * xfburn_data_composition_get_volume_id (XfburnDataComposition *
composition);
+
G_END_DECLS
#endif
Modified: xfburn/trunk/xfburn/xfburn-disc-usage.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-disc-usage.c 2006-07-30 12:09:37 UTC (rev
22563)
+++ xfburn/trunk/xfburn/xfburn-disc-usage.c 2006-07-30 14:03:23 UTC (rev
22564)
@@ -47,11 +47,11 @@
gchar *label;
} datadisksizes[] = {
{
- 200 *1000 * 1000, "200MB CD"},
+ 200 *1024 * 1024, "200MB CD"},
{
- 600 *1000 * 1000, "600MB CD"},
+ 600 *1024 * 1024, "600MB CD"},
{
- 700 *1000 * 1000, "700MB CD"},
+ 700 *1024 * 1024, "700MB CD"},
/* {
4.7 *1000 * 1000 * 1000, "4.7GB DVD"},
{
Modified: xfburn/trunk/xfburn/xfburn-main-window.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-main-window.c 2006-07-30 12:09:37 UTC (rev
22563)
+++ xfburn/trunk/xfburn/xfburn-main-window.c 2006-07-30 14:03:23 UTC (rev
22564)
@@ -92,12 +92,12 @@
G_CALLBACK (xfburn_window_action_new_data_composition),},
{"new-audio-composition", "audio-x-generic", N_("New audio composition"),
"<Control><Alt>A", N_("New audio composition"),
G_CALLBACK (xfburn_window_action_new_audio_composition),},*/
- {"load-composition", GTK_STOCK_OPEN, N_("Load composition"), NULL, N_("Load
composition"),
+ /*{"load-composition", GTK_STOCK_OPEN, N_("Load composition"), NULL,
N_("Load composition"),
G_CALLBACK (xfburn_window_action_load),},
{"save-composition", GTK_STOCK_SAVE, N_("Save composition"), NULL, N_("Save
composition"),
G_CALLBACK (xfburn_window_action_save),},
{"save-composition-as", GTK_STOCK_SAVE_AS, N_("Save composition as..."),
NULL, N_("Save composition as"),
- G_CALLBACK (xfburn_window_action_save_as),},
+ G_CALLBACK (xfburn_window_action_save_as),},*/
{"close-composition", GTK_STOCK_CLOSE, N_("Close composition"), NULL,
N_("Close composition"),
G_CALLBACK (xfburn_window_action_close),},
{"quit", GTK_STOCK_QUIT, N_("_Quit"), NULL, N_("Quit Xfburn"), G_CALLBACK
(xfburn_window_action_quit),},
@@ -130,9 +130,9 @@
static const gchar *toolbar_actions[] = {
"new-composition",
- "load-composition",
+/* "load-composition",
"save-composition",
- "close-composition",
+ "close-composition",*/
"blank-cd",
//"format-dvd",
"copy-data",
@@ -572,8 +572,8 @@
gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
xfburn_settings_get_boolean ("show-filebrowser", TRUE));
action = gtk_action_group_get_action (priv->action_group, "show-toolbar");
gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
xfburn_settings_get_boolean ("show-toolbar", TRUE));
- action = gtk_action_group_get_action (priv->action_group,
"save-composition");
- gtk_action_set_sensitive (GTK_ACTION (action), FALSE);
+ /* action = gtk_action_group_get_action (priv->action_group,
"save-composition");
+ gtk_action_set_sensitive (GTK_ACTION (action), FALSE);*/
}
return obj;
Modified: xfburn/trunk/xfburn-toolbars.ui
===================================================================
--- xfburn/trunk/xfburn-toolbars.ui 2006-07-30 12:09:37 UTC (rev 22563)
+++ xfburn/trunk/xfburn-toolbars.ui 2006-07-30 14:03:23 UTC (rev 22564)
@@ -4,9 +4,9 @@
<toolbars>
<toolbar name="main" style="both">
<toolitem id="new-composition" />
- <toolitem id="load-composition" />
- <toolitem id="save-composition" />
- <toolitem id="close-composition" />
+<!-- <toolitem id="load-composition" />-->
+<!-- <toolitem id="save-composition" /> -->
+<!-- <toolitem id="close-composition" />-->
<separator />
Modified: xfburn/trunk/xfburn.ui
===================================================================
--- xfburn/trunk/xfburn.ui 2006-07-30 12:09:37 UTC (rev 22563)
+++ xfburn/trunk/xfburn.ui 2006-07-30 14:03:23 UTC (rev 22564)
@@ -15,10 +15,11 @@
<menuitem action="new-data-composition"/>
<menuitem action="new-audio-composition"/>
-->
- <menuitem action="load-composition"/>
+ <!-- <menuitem action="load-composition"/> -->
<separator/>
+ <!--
<menuitem action="save-composition"/>
- <menuitem action="save-composition-as"/>
+ <menuitem action="save-composition-as"/>-->
<menuitem action="close-composition"/>
<separator />
<menuitem action="quit"/>
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
