[Goodies-commits] r4958 - xfburn/trunk/xfburn
David Mohr
squisher at xfce.org
Tue Jun 17 17:11:44 CEST 2008
Author: squisher
Date: 2008-06-17 15:11:44 +0000 (Tue, 17 Jun 2008)
New Revision: 4958
Modified:
xfburn/trunk/xfburn/xfburn-compositions-notebook.c
xfburn/trunk/xfburn/xfburn-compositions-notebook.h
xfburn/trunk/xfburn/xfburn-data-composition.c
xfburn/trunk/xfburn/xfburn-data-composition.h
xfburn/trunk/xfburn/xfburn-main-window.c
xfburn/trunk/xfburn/xfburn-main-window.h
xfburn/trunk/xfburn/xfburn-main.c
Log:
Adding cli option to start with data composition window, adding of files not implemented yet
Modified: xfburn/trunk/xfburn/xfburn-compositions-notebook.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-compositions-notebook.c 2008-06-17 12:15:46 UTC (rev 4957)
+++ xfburn/trunk/xfburn/xfburn-compositions-notebook.c 2008-06-17 15:11:44 UTC (rev 4958)
@@ -27,7 +27,6 @@
#include "xfburn-compositions-notebook.h"
-#include "xfburn-composition.h"
#include "xfburn-notebook-tab.h"
#include "xfburn-welcome-tab.h"
#include "xfburn-data-composition.h"
@@ -218,12 +217,12 @@
return obj;
}
-void
+XfburnComposition *
xfburn_compositions_notebook_add_composition (XfburnCompositionsNotebook *notebook, XfburnCompositionType type)
{
g_assert (type != XFBURN_WELCOME_TAB);
- add_composition_with_data (notebook, type, NULL);
+ return add_composition_with_data (notebook, type, NULL);
}
XfburnWelcomeTab *
Modified: xfburn/trunk/xfburn/xfburn-compositions-notebook.h
===================================================================
--- xfburn/trunk/xfburn/xfburn-compositions-notebook.h 2008-06-17 12:15:46 UTC (rev 4957)
+++ xfburn/trunk/xfburn/xfburn-compositions-notebook.h 2008-06-17 15:11:44 UTC (rev 4958)
@@ -24,6 +24,7 @@
#include "xfburn-main-window.h"
#include "xfburn-welcome-tab.h"
+#include "xfburn-composition.h"
G_BEGIN_DECLS
#define XFBURN_TYPE_COMPOSITIONS_NOTEBOOK (xfburn_compositions_notebook_get_type ())
@@ -54,7 +55,7 @@
GtkWidget *xfburn_compositions_notebook_new ();
-void xfburn_compositions_notebook_add_composition (XfburnCompositionsNotebook *notebook, XfburnCompositionType type);
+XfburnComposition *xfburn_compositions_notebook_add_composition (XfburnCompositionsNotebook *notebook, XfburnCompositionType type);
XfburnWelcomeTab *xfburn_compositions_notebook_add_welcome_tab (XfburnCompositionsNotebook *notebook, XfburnMainWindow *window);
void xfburn_compositions_notebook_close_composition (XfburnCompositionsNotebook *notebook);
Modified: xfburn/trunk/xfburn/xfburn-data-composition.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-data-composition.c 2008-06-17 12:15:46 UTC (rev 4957)
+++ xfburn/trunk/xfburn/xfburn-data-composition.c 2008-06-17 15:11:44 UTC (rev 4958)
@@ -1813,6 +1813,14 @@
return g_object_new (xfburn_data_composition_get_type (), NULL);
}
+void
+xfburn_data_composition_add_files (XfburnDataComposition *content, int filec, char **filenames)
+{
+ if (filec > 0) {
+ g_error ("not yet implemented");
+ }
+}
+
void
xfburn_data_composition_hide_toolbar (XfburnDataComposition * composition)
{
Modified: xfburn/trunk/xfburn/xfburn-data-composition.h
===================================================================
--- xfburn/trunk/xfburn/xfburn-data-composition.h 2008-06-17 12:15:46 UTC (rev 4957)
+++ xfburn/trunk/xfburn/xfburn-data-composition.h 2008-06-17 15:11:44 UTC (rev 4958)
@@ -54,8 +54,10 @@
GtkType xfburn_data_composition_get_type (void);
GtkWidget *xfburn_data_composition_new (void);
+void xfburn_data_composition_add_files (XfburnDataComposition *content, int filec, char **filenames);
void xfburn_data_composition_hide_toolbar (XfburnDataComposition *content);
void xfburn_data_composition_show_toolbar (XfburnDataComposition *content);
+
G_END_DECLS
#endif
Modified: xfburn/trunk/xfburn/xfburn-main-window.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-main-window.c 2008-06-17 12:15:46 UTC (rev 4957)
+++ xfburn/trunk/xfburn/xfburn-main-window.c 2008-06-17 15:11:44 UTC (rev 4958)
@@ -469,9 +469,7 @@
static void
action_new_data_composition (GtkAction *action, XfburnMainWindow * window)
{
- XfburnMainWindowPrivate *priv = XFBURN_MAIN_WINDOW_GET_PRIVATE (window);
-
- xfburn_compositions_notebook_add_composition (XFBURN_COMPOSITIONS_NOTEBOOK (priv->compositions_notebook), XFBURN_DATA_COMPOSITION);
+ xfburn_main_window_add_data_composition_with_files (window, 0, NULL);
}
/*
@@ -695,6 +693,16 @@
return XFBURN_FILE_BROWSER (priv->file_browser);
}
+void
+xfburn_main_window_add_data_composition_with_files (XfburnMainWindow *window, int filec, char **filenames)
+{
+ XfburnMainWindowPrivate *priv = XFBURN_MAIN_WINDOW_GET_PRIVATE (window);
+ XfburnComposition *comp;
+
+ comp = xfburn_compositions_notebook_add_composition (XFBURN_COMPOSITIONS_NOTEBOOK (priv->compositions_notebook), XFBURN_DATA_COMPOSITION);
+ xfburn_data_composition_add_files (XFBURN_DATA_COMPOSITION (comp), filec, filenames);
+}
+
gboolean
xfburn_main_window_support_cdr (XfburnMainWindow *window)
{
Modified: xfburn/trunk/xfburn/xfburn-main-window.h
===================================================================
--- xfburn/trunk/xfburn/xfburn-main-window.h 2008-06-17 12:15:46 UTC (rev 4957)
+++ xfburn/trunk/xfburn/xfburn-main-window.h 2008-06-17 15:11:44 UTC (rev 4958)
@@ -56,6 +56,8 @@
GtkUIManager *xfburn_main_window_get_ui_manager (XfburnMainWindow *window);
XfburnFileBrowser *xfburn_main_window_get_file_browser (XfburnMainWindow *window);
+void xfburn_main_window_add_data_composition_with_files (XfburnMainWindow *window, int filec, char **filenames);
+
gboolean xfburn_main_window_support_cdr (XfburnMainWindow *window);
gboolean xfburn_main_window_support_cdrw (XfburnMainWindow *window);
Modified: xfburn/trunk/xfburn/xfburn-main.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-main.c 2008-06-17 12:15:46 UTC (rev 4957)
+++ xfburn/trunk/xfburn/xfburn-main.c 2008-06-17 15:11:44 UTC (rev 4958)
@@ -54,10 +54,13 @@
static gboolean show_version = FALSE;
static gboolean other_action = FALSE;
static gboolean show_main = FALSE;
+static gboolean add_data_composition = FALSE;
static GOptionEntry optionentries[] = {
{ "burn-image", 'i', G_OPTION_FLAG_OPTIONAL_ARG /* || G_OPTION_FLAG_FILENAME */, G_OPTION_ARG_CALLBACK, &parse_option,
"Open the burn image dialog. The filename of the image can optionally be specified as a parameter", NULL },
+ { "data-composition", 'd', G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, &parse_option,
+ "Start a data composition. Optionally followed by files to be added to the composition.", NULL },
{ "version", 'V', G_OPTION_FLAG_NO_ARG , G_OPTION_ARG_NONE, &show_version,
"Display program version and exit", NULL },
{ "main", 'm', G_OPTION_FLAG_NO_ARG , G_OPTION_ARG_NONE, &show_main,
@@ -73,6 +76,8 @@
image_filename = "";
else
image_filename = g_strdup(value);
+ } else if (strcmp (option_name, "-d") == 0 || strcmp (option_name, "--data-composition") == 0) {
+ add_data_composition = TRUE;
} else {
g_set_error (error, 0, G_OPTION_ERROR_FAILED, "Invalid command line option. Please report, this is a bug.");
return FALSE;
@@ -172,6 +177,9 @@
gtk_widget_show (mainwin);
+ if (add_data_composition)
+ xfburn_main_window_add_data_composition_with_files (XFBURN_MAIN_WINDOW (mainwin), argc-1, argv+1);
+
gtk_main ();
}
More information about the Goodies-commits
mailing list