Author: pollux
Date: 2006-07-24 14:26:57 +0000 (Mon, 24 Jul 2006)
New Revision: 22523
Modified:
xfburn/trunk/class diagram.zuml
xfburn/trunk/po/ChangeLog
xfburn/trunk/po/POTFILES.in
xfburn/trunk/xfburn-toolbars.ui
xfburn/trunk/xfburn.ui
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-main-window.c
Log:
* add some composition actions to the GUI
* fix wrong filename conflict detection
Modified: xfburn/trunk/class diagram.zuml
===================================================================
(Binary files differ)
Modified: xfburn/trunk/po/ChangeLog
===================================================================
--- xfburn/trunk/po/ChangeLog 2006-07-24 11:40:55 UTC (rev 22522)
+++ xfburn/trunk/po/ChangeLog 2006-07-24 14:26:57 UTC (rev 22523)
@@ -1,6 +1,6 @@
2006-07-23 Jean-François Wauthy <[EMAIL PROTECTED]>
- * fr.po: Updated German translations by Enrico Tröger
+ * de.po: Updated German translations by Enrico Tröger
<[EMAIL PROTECTED]>
* fr.po: Updated French translations by Maximilian Schleiss
<[EMAIL PROTECTED]>
Modified: xfburn/trunk/po/POTFILES.in
===================================================================
--- xfburn/trunk/po/POTFILES.in 2006-07-24 11:40:55 UTC (rev 22522)
+++ xfburn/trunk/po/POTFILES.in 2006-07-24 14:26:57 UTC (rev 22523)
@@ -20,6 +20,7 @@
xfburn/xfburn-fs-browser.c
xfburn/xfburn-main-window.c
xfburn/xfburn-main.c
+xfburn/xfburn-notebook-tab.c
xfburn/xfburn-preferences-dialog.c
xfburn/xfburn-progress-dialog.c
xfburn/xfburn-utils.c
Modified: xfburn/trunk/xfburn/xfburn-compositions-notebook.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-compositions-notebook.c 2006-07-24 11:40:55 UTC
(rev 22522)
+++ xfburn/trunk/xfburn/xfburn-compositions-notebook.c 2006-07-24 14:26:57 UTC
(rev 22523)
@@ -109,6 +109,10 @@
g_signal_connect (G_OBJECT (notebook), "move-focus-out", G_CALLBACK
(cb_move_focus_out), priv);
}
+/***********/
+/* actions */
+/***********/
+
/*************/
/* internals */
/*************/
@@ -199,6 +203,15 @@
}
void
+xfburn_compositions_notebook_close_composition (XfburnCompositionsNotebook
*notebook)
+{
+ gint page_num;
+
+ page_num = gtk_notebook_get_current_page (GTK_NOTEBOOK (notebook));
+ gtk_notebook_remove_page (GTK_NOTEBOOK (notebook), page_num);
+}
+
+void
xfburn_compositions_notebook_save_composition (XfburnCompositionsNotebook
*notebook)
{
XfburnComposition *composition;
Modified: xfburn/trunk/xfburn/xfburn-compositions-notebook.h
===================================================================
--- xfburn/trunk/xfburn/xfburn-compositions-notebook.h 2006-07-24 11:40:55 UTC
(rev 22522)
+++ xfburn/trunk/xfburn/xfburn-compositions-notebook.h 2006-07-24 14:26:57 UTC
(rev 22523)
@@ -51,6 +51,7 @@
GtkWidget *xfburn_compositions_notebook_new ();
void xfburn_compositions_notebook_add_composition (XfburnCompositionsNotebook
*notebook, XfburnCompositionType type);
+void xfburn_compositions_notebook_close_composition
(XfburnCompositionsNotebook *notebook);
void xfburn_compositions_notebook_load_composition (XfburnCompositionsNotebook
*notebook, const gchar *file);
void xfburn_compositions_notebook_save_composition (XfburnCompositionsNotebook
*notebook);
Modified: xfburn/trunk/xfburn/xfburn-data-composition.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-data-composition.c 2006-07-24 11:40:55 UTC
(rev 22522)
+++ xfburn/trunk/xfburn/xfburn-data-composition.c 2006-07-24 14:26:57 UTC
(rev 22523)
@@ -477,12 +477,13 @@
}
gtk_tree_model_get (model, ¤t_iter, DATA_COMPOSITION_COLUMN_CONTENT,
¤t_filename, -1);
- if (g_ascii_strcasecmp (current_filename, filename) == 0) {
+ if (strcmp (current_filename, filename) == 0) {
g_free (current_filename);
gtk_tree_path_free (current_path);
return TRUE;
}
+ g_free (current_filename);
gtk_tree_path_next (current_path);
} while (gtk_tree_model_iter_next (model, ¤t_iter));
Modified: xfburn/trunk/xfburn/xfburn-main-window.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-main-window.c 2006-07-24 11:40:55 UTC (rev
22522)
+++ xfburn/trunk/xfburn/xfburn-main-window.c 2006-07-24 14:26:57 UTC (rev
22523)
@@ -64,13 +64,15 @@
static void xfburn_window_action_about (GtkAction *, XfburnMainWindow *);
static void xfburn_window_action_preferences (GtkAction *, XfburnMainWindow *);
+static void xfburn_window_action_new_data_composition (GtkAction *,
XfburnMainWindow *);
+static void xfburn_window_action_new_audio_composition (GtkAction *,
XfburnMainWindow *);
+
static void xfburn_window_action_load (GtkAction *, XfburnMainWindow *);
static void xfburn_window_action_save (GtkAction *, XfburnMainWindow *);
+static void xfburn_window_action_save_as (GtkAction *, XfburnMainWindow *);
+static void xfburn_window_action_close (GtkAction *, XfburnMainWindow *);
static void xfburn_window_action_quit (GtkAction *, XfburnMainWindow *);
-static void xfburn_window_action_new_data_composition (GtkAction *,
XfburnMainWindow *);
-static void xfburn_window_action_new_audio_composition (GtkAction *,
XfburnMainWindow *);
-
static void xfburn_window_action_blank_cd (GtkAction *, XfburnMainWindow *);
static void xfburn_window_action_copy_cd (GtkAction *, XfburnMainWindow *);
static void xfburn_window_action_burn_image (GtkAction *, XfburnMainWindow *);
@@ -94,6 +96,10 @@
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),},
+ {"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),},
{"edit-menu", NULL, N_("_Edit"), NULL,},
{"preferences", GTK_STOCK_PREFERENCES, N_("Prefere_nces"), NULL, N_("Show
preferences dialog"),
@@ -124,6 +130,9 @@
static const gchar *toolbar_actions[] = {
"new-composition",
+ "load-composition",
+ "save-composition",
+ "close-composition",
"blank-cd",
//"format-dvd",
"copy-data",
@@ -392,6 +401,21 @@
}
static void
+xfburn_window_action_save_as (GtkAction *action, XfburnMainWindow * window)
+{
+ XfburnMainWindowPrivate *priv = XFBURN_MAIN_WINDOW_GET_PRIVATE (window);
+
+}
+
+static void
+xfburn_window_action_close (GtkAction *action, XfburnMainWindow * window)
+{
+ XfburnMainWindowPrivate *priv = XFBURN_MAIN_WINDOW_GET_PRIVATE (window);
+
+ xfburn_compositions_notebook_close_composition (XFBURN_COMPOSITIONS_NOTEBOOK
(priv->compositions_notebook));
+}
+
+static void
xfburn_window_action_new_data_composition (GtkAction *action, XfburnMainWindow
* window)
{
XfburnMainWindowPrivate *priv = XFBURN_MAIN_WINDOW_GET_PRIVATE (window);
Modified: xfburn/trunk/xfburn-toolbars.ui
===================================================================
--- xfburn/trunk/xfburn-toolbars.ui 2006-07-24 11:40:55 UTC (rev 22522)
+++ xfburn/trunk/xfburn-toolbars.ui 2006-07-24 14:26:57 UTC (rev 22523)
@@ -1,24 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE toolbars SYSTEM "toolbars.dtd">
-<!--
- Copyright (c) 2004 os-cillation
-
- Default toolbar configuration for Terminal.
--->
-
<toolbars>
<toolbar name="main" style="both">
- <toolitem id="blank-cd" />
- <toolitem id="format-dvd" />
-
+ <toolitem id="new-composition" />
+ <toolitem id="load-composition" />
+ <toolitem id="save-composition" />
+ <toolitem id="close-composition" />
+
<separator />
+ <toolitem id="blank-cd" />
+ <!-- <toolitem id="format-dvd" /> -->
+
<toolitem id="copy-data" />
- <toolitem id="copy-audio" />
+ <!-- <toolitem id="copy-audio" /> -->
- <separator />
-
<toolitem id="burn-cd" />
<separator />
Modified: xfburn/trunk/xfburn.ui
===================================================================
--- xfburn/trunk/xfburn.ui 2006-07-24 11:40:55 UTC (rev 22522)
+++ xfburn/trunk/xfburn.ui 2006-07-24 14:26:57 UTC (rev 22523)
@@ -10,13 +10,16 @@
<!-- The main menu bar -->
<menubar name="main-menu">
<menu action="file-menu">
- <menu action="new-composition">
+ <menuitem action="new-composition"/>
+ <!--
<menuitem action="new-data-composition"/>
<menuitem action="new-audio-composition"/>
- </menu>
- <separator />
+ -->
<menuitem action="load-composition"/>
+ <separator/>
<menuitem action="save-composition"/>
+ <menuitem action="save-composition-as"/>
+ <menuitem action="close-composition"/>
<separator />
<menuitem action="quit"/>
</menu>
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
