[Xfce4-commits] [apps/xfburn] 09/42: fixed vbox and hbox deprecation warnings
noreply at xfce.org
noreply at xfce.org
Tue Oct 15 02:21:52 CEST 2019
This is an automated email from the git hooks/post-receive script.
k a t a n a s t e e l p u s h e d a c o m m i t t o b r a n c h m a s t e r
in repository apps/xfburn.
commit 9d746ec2ada8e5c1a1fbf5c326c140fb81a38cef
Author: Rene Kjellerup <rk.katana.steel at gmail.com>
Date: Thu Sep 5 00:48:18 2019 -0700
fixed vbox and hbox deprecation warnings
---
xfburn/xfburn-burn-audio-cd-composition-dialog.c | 9 +--
xfburn/xfburn-burn-data-composition-base-dialog.c | 14 ++--
xfburn/xfburn-burn-image-dialog.c | 4 +-
xfburn/xfburn-device-box.c | 9 +--
xfburn/xfburn-device-list.c | 2 +-
xfburn/xfburn-main-window.c | 86 +++++++++++------------
xfburn/xfburn-progress-dialog.c | 40 +++++------
xfburn/xfburn-welcome-tab.c | 55 +++++++--------
xfburn/xfburn-welcome-tab.h | 4 +-
9 files changed, 109 insertions(+), 114 deletions(-)
diff --git a/xfburn/xfburn-burn-audio-cd-composition-dialog.c b/xfburn/xfburn-burn-audio-cd-composition-dialog.c
index 73d5ba4..5baf823 100644
--- a/xfburn/xfburn-burn-audio-cd-composition-dialog.c
+++ b/xfburn/xfburn-burn-audio-cd-composition-dialog.c
@@ -147,7 +147,7 @@ xfburn_burn_audio_cd_composition_dialog_constructor (GType type, guint n_constru
gtk_window_set_title (GTK_WINDOW (obj), _("Burn Composition"));
gtk_window_set_destroy_with_parent (GTK_WINDOW (obj), TRUE);
- icon = gtk_widget_render_icon (GTK_WIDGET (obj), "stock_xfburn", GTK_ICON_SIZE_DIALOG, NULL);
+ icon = gtk_icon_theme_load_icon(gtk_icon_theme_get_default(), "stock_xfburn", GTK_ICON_SIZE_DIALOG, 0, NULL);
gtk_window_set_icon (GTK_WINDOW (obj), icon);
g_object_unref (icon);
@@ -188,7 +188,7 @@ xfburn_burn_audio_cd_composition_dialog_constructor (GType type, guint n_constru
*/
/* options */
- vbox = gtk_vbox_new (FALSE, 0);
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_show (vbox);
frame = xfce_gtk_frame_box_new_with_content (_("Options"), vbox);
@@ -209,13 +209,14 @@ xfburn_burn_audio_cd_composition_dialog_constructor (GType type, guint n_constru
gtk_widget_show (priv->check_burnfree);
gtk_box_pack_start (GTK_BOX (vbox), priv->check_burnfree, FALSE, FALSE, BORDER);
+/*
align = gtk_alignment_new (0, 0, 0, 0);
gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 0, BORDER * 4, 0);
gtk_widget_show (align);
gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);
-
+*/
/* action buttons */
- button = gtk_button_new_from_stock ("_Cancel");
+ button = gtk_button_new_with_mnemonic (_("_Cancel"));
gtk_widget_show (button);
gtk_dialog_add_action_widget (GTK_DIALOG (obj), button, GTK_RESPONSE_CANCEL);
diff --git a/xfburn/xfburn-burn-data-composition-base-dialog.c b/xfburn/xfburn-burn-data-composition-base-dialog.c
index 786dab6..06f03f1 100644
--- a/xfburn/xfburn-burn-data-composition-base-dialog.c
+++ b/xfburn/xfburn-burn-data-composition-base-dialog.c
@@ -204,7 +204,7 @@ xfburn_burn_data_composition_base_dialog_constructor (GType type, guint n_constr
comp_name = iso_image_get_volume_id (priv->image);
if (priv->show_volume_name) {
GtkWidget *label;
- vbox = gtk_vbox_new (FALSE, 0);
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_show (vbox);
frame = xfce_gtk_frame_box_new_with_content (_("Composition name"), vbox);
@@ -225,7 +225,7 @@ xfburn_burn_data_composition_base_dialog_constructor (GType type, guint n_constr
}
/* options */
- vbox = gtk_vbox_new (FALSE, 0);
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_show (vbox);
frame = xfce_gtk_frame_box_new_with_content (_("Options"), vbox);
@@ -256,15 +256,15 @@ xfburn_burn_data_composition_base_dialog_constructor (GType type, guint n_constr
gtk_widget_show (priv->check_only_iso);
gtk_box_pack_start (GTK_BOX (vbox), priv->check_only_iso, FALSE, FALSE, BORDER);
g_signal_connect (G_OBJECT (priv->check_only_iso), "toggled", G_CALLBACK (cb_check_only_iso_toggled), obj);
-
+/*
align = gtk_alignment_new (0, 0, 0, 0);
gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 0, BORDER * 4, 0);
gtk_widget_show (align);
gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);
-
- priv->hbox_iso = gtk_hbox_new (FALSE, 0);
+*/
+ priv->hbox_iso = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, BORDER*4);
gtk_widget_show (priv->hbox_iso);
- gtk_container_add (GTK_CONTAINER (align), priv->hbox_iso);
+ gtk_container_add (GTK_CONTAINER(vbox), priv->hbox_iso);
gtk_widget_set_sensitive (priv->hbox_iso, FALSE);
priv->entry_path_iso = gtk_entry_new ();
@@ -285,7 +285,7 @@ xfburn_burn_data_composition_base_dialog_constructor (GType type, guint n_constr
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (cb_browse_iso), obj);
/* action buttons */
- button = gtk_button_new_from_stock ("_Cancel");
+ button = gtk_button_new_with_mnemonic ("_Cancel");
gtk_widget_show (button);
gtk_dialog_add_action_widget (GTK_DIALOG (obj), button, GTK_RESPONSE_CANCEL);
diff --git a/xfburn/xfburn-burn-image-dialog.c b/xfburn/xfburn-burn-image-dialog.c
index fd3c8d7..21f039c 100644
--- a/xfburn/xfburn-burn-image-dialog.c
+++ b/xfburn/xfburn-burn-image-dialog.c
@@ -211,7 +211,7 @@ xfburn_burn_image_dialog_init (XfburnBurnImageDialog * obj)
gtk_box_pack_start (box, frame, FALSE, FALSE, BORDER);
/* options */
- vbox = gtk_vbox_new (FALSE, 0);
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_show (vbox);
frame = xfce_gtk_frame_box_new_with_content (_("Options"), vbox);
@@ -243,7 +243,7 @@ xfburn_burn_image_dialog_init (XfburnBurnImageDialog * obj)
gtk_box_pack_start (GTK_BOX (vbox), priv->check_quit, FALSE, FALSE, BORDER);
/* action buttons */
- button = gtk_button_new_from_stock ("_Cancel");
+ button = gtk_button_new_with_mnemonic (_("_Cancel"));
gtk_widget_show (button);
gtk_dialog_add_action_widget (GTK_DIALOG (obj), button, GTK_RESPONSE_CANCEL);
diff --git a/xfburn/xfburn-device-box.c b/xfburn/xfburn-device-box.c
index 9548b46..f2a0157 100644
--- a/xfburn/xfburn-device-box.c
+++ b/xfburn/xfburn-device-box.c
@@ -140,7 +140,7 @@ xfburn_device_box_get_type (void)
NULL
};
- device_box_type = g_type_register_static (GTK_TYPE_VBOX, "XfburnDeviceBox", &device_box_info, 0);
+ device_box_type = g_type_register_static (GTK_TYPE_BOX, "XfburnDeviceBox", &device_box_info, 0);
}
return device_box_type;
@@ -220,7 +220,7 @@ xfburn_device_box_constructor (GType type, guint n_construct_properties, GObject
*/
/* disc label */
- priv->hbox_refresh = gtk_hbox_new (FALSE, 0);
+ priv->hbox_refresh = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
gtk_widget_show (priv->hbox_refresh);
gtk_box_pack_start (GTK_BOX (box), priv->hbox_refresh, TRUE, TRUE, BORDER);
@@ -232,7 +232,7 @@ xfburn_device_box_constructor (GType type, guint n_construct_properties, GObject
gtk_box_pack_start (GTK_BOX (priv->hbox_refresh), xfburn_device_list_get_refresh_button (devlist), FALSE, FALSE, BORDER);
/* speed */
- priv->hbox_speed_selection = gtk_hbox_new (FALSE, 0);
+ priv->hbox_speed_selection = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
gtk_widget_show (priv->hbox_speed_selection);
gtk_box_pack_start (GTK_BOX (box), priv->hbox_speed_selection, TRUE, TRUE, BORDER);
@@ -255,7 +255,7 @@ xfburn_device_box_constructor (GType type, guint n_construct_properties, GObject
}
/* mode */
- priv->hbox_mode_selection = gtk_hbox_new (FALSE, 0);
+ priv->hbox_mode_selection = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
gtk_widget_show (priv->hbox_mode_selection);
gtk_box_pack_start (GTK_BOX (box), priv->hbox_mode_selection, FALSE, FALSE, BORDER);
@@ -493,6 +493,7 @@ status_label_update (XfburnDeviceBoxPrivate *priv)
g_free (text);
}
+
static gboolean
ask_for_blanking (XfburnDeviceBoxPrivate *priv)
{
diff --git a/xfburn/xfburn-device-list.c b/xfburn/xfburn-device-list.c
index 2b1a26b..557ef25 100644
--- a/xfburn/xfburn-device-list.c
+++ b/xfburn/xfburn-device-list.c
@@ -413,7 +413,7 @@ xfburn_device_list_get_device_combo (XfburnDeviceList *devlist)
GtkListStore *store = NULL;
GtkCellRenderer *cell;
- int i, selected;
+ int i, selected=-1;
store = gtk_list_store_new (DEVICE_N_COLUMNS, G_TYPE_STRING, G_TYPE_POINTER);
combo_device = gtk_combo_box_new_with_model (GTK_TREE_MODEL (store));
diff --git a/xfburn/xfburn-main-window.c b/xfburn/xfburn-main-window.c
index 03945a1..03789ac 100644
--- a/xfburn/xfburn-main-window.c
+++ b/xfburn/xfburn-main-window.c
@@ -5,12 +5,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Library General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -45,15 +45,15 @@
#define XFBURN_MAIN_WINDOW_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), XFBURN_TYPE_MAIN_WINDOW, XfburnMainWindowPrivate))
/* private struct */
-typedef struct {
+typedef struct {
GtkActionGroup *action_group;
GtkUIManager *ui_manager;
GtkWidget *menubar;
GtkWidget *toolbars;
-
+
GtkWidget *vpaned;
-
+
GtkWidget *file_browser;
GtkWidget *compositions_notebook;
@@ -99,7 +99,7 @@ static GtkWindowClass *parent_class = NULL;
static const GtkActionEntry action_entries[] = {
{"file-menu", NULL, N_("_File"), NULL, NULL, NULL},
/*{"new-composition", "document-new", N_("_New composition"), "", N_("Create a new composition"),},*/
- /*{"new-composition", "document-new", N_("_New composition"), NULL, N_("Create a new composition"),
+ /*{"new-composition", "document-new", N_("_New composition"), NULL, N_("Create a new composition"),
G_CALLBACK (action_new_data_composition),}, */
{"new-data-composition", "xfburn-new-data-composition", N_("New data composition"), "<Control><Alt>e", N_("New data composition"),
G_CALLBACK (action_new_data_composition),},
@@ -107,11 +107,11 @@ static const GtkActionEntry action_entries[] = {
G_CALLBACK (action_new_audio_composition),},
/*{"load-composition", "document-open", N_("Load composition"), NULL, N_("Load composition"),
G_CALLBACK (action_load),},
- {"save-composition", "document-save", N_("Save composition"), NULL, N_("Save composition"),
+ {"save-composition", "document-save", N_("Save composition"), NULL, N_("Save composition"),
G_CALLBACK (action_save),},
- {"save-composition-as", "document-save"_AS, N_("Save composition as..."), NULL, N_("Save composition as"),
+ {"save-composition-as", "document-save"_AS, N_("Save composition as..."), NULL, N_("Save composition as"),
G_CALLBACK (action_save_as),},*/
- {"close-composition", "window-close", N_("Close composition"), NULL, N_("Close composition"),
+ {"close-composition", "window-close", N_("Close composition"), NULL, N_("Close composition"),
G_CALLBACK (action_close),},
{"quit", "application-exit", N_("_Quit"), NULL, N_("Quit Xfburn"), G_CALLBACK (action_quit),},
{"edit-menu", NULL, N_("_Edit"), NULL, NULL, NULL},
@@ -260,7 +260,7 @@ xfburn_main_window_init (XfburnMainWindow * mainwin)
accel_group = gtk_ui_manager_get_accel_group (priv->ui_manager);
gtk_window_add_accel_group (GTK_WINDOW (mainwin), accel_group);
- vbox = gtk_vbox_new (FALSE, 0);
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add (GTK_CONTAINER (mainwin), vbox);
gtk_widget_show (vbox);
@@ -300,7 +300,7 @@ xfburn_main_window_init (XfburnMainWindow * mainwin)
*/
/* vpaned */
priv->vpaned = gtk_vpaned_new ();
- gtk_container_add (GTK_CONTAINER (vbox), priv->vpaned);
+ gtk_box_pack_start (GTK_BOX (vbox), priv->vpaned, TRUE, TRUE, 0);
gtk_widget_show (priv->vpaned);
/* filebrowser */
@@ -309,12 +309,12 @@ xfburn_main_window_init (XfburnMainWindow * mainwin)
gtk_widget_show (priv->file_browser);
gtk_paned_set_position (GTK_PANED (priv->file_browser), xfburn_settings_get_int ("hpaned-position", 250));
-
+
/* compositions notebook */
priv->compositions_notebook = xfburn_compositions_notebook_new ();
gtk_widget_show (priv->compositions_notebook);
gtk_paned_pack2 (GTK_PANED (priv->vpaned), priv->compositions_notebook, TRUE, FALSE);
-
+
gtk_paned_set_position (GTK_PANED (priv->vpaned), xfburn_settings_get_int ("vpaned-position", 200));
xfce_resource_pop_path (XFCE_RESOURCE_DATA);
@@ -361,7 +361,7 @@ cb_delete_main_window (XfburnMainWindow * mainwin, GdkEvent * event, XfburnMainW
{
gint x, y;
- gtk_window_get_size (GTK_WINDOW (mainwin), &x, &y);
+ gtk_window_get_size (GTK_WINDOW (mainwin), &x, &y);
xfburn_settings_set_int ("main-window-width", x);
xfburn_settings_set_int ("main-window-height", y);
@@ -377,7 +377,7 @@ static void
action_blank (GtkAction * action, XfburnMainWindow * window)
{
GtkWidget *dialog;
-
+
dialog = xfburn_blank_dialog_new ();
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (window));
gtk_dialog_run (GTK_DIALOG (dialog));
@@ -390,7 +390,7 @@ static void action_copy_cd (GtkAction *action, XfburnMainWindow *window)
GtkWidget *dialog;
dialog = xfburn_copy_cd_dialog_new ();
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (window));
- gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
*/
}
@@ -411,10 +411,10 @@ static void
action_copy_dvd (GtkAction * action, XfburnMainWindow * window)
{
GtkWidget *dialog;
-
+
dialog = xfburn_copy_dvd_dialog_new ();
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (window));
- gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
}
*/
@@ -429,7 +429,7 @@ static void
action_load (GtkAction *action, XfburnMainWindow * window)
{
//XfburnMainWindowPrivate *priv = XFBURN_MAIN_WINDOW_GET_PRIVATE (window);
-
+
//xfburn_data_composition_load_from_file (XFBURN_DATA_COMPOSITION (priv->data_composition), "/tmp/test.xml");
}
@@ -437,7 +437,7 @@ static void
action_save (GtkAction *action, XfburnMainWindow * window)
{
XfburnMainWindowPrivate *priv = XFBURN_MAIN_WINDOW_GET_PRIVATE (window);
-
+
xfburn_compositions_notebook_save_composition (XFBURN_COMPOSITIONS_NOTEBOOK (priv->compositions_notebook));
}
@@ -445,7 +445,7 @@ static void
action_save_as (GtkAction *action, XfburnMainWindow * window)
{
//XfburnMainWindowPrivate *priv = XFBURN_MAIN_WINDOW_GET_PRIVATE (window);
-
+
}
*/
@@ -453,7 +453,7 @@ static void
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));
}
@@ -467,7 +467,7 @@ static void
action_new_audio_composition (GtkAction *action, XfburnMainWindow * window)
{
//XfburnMainWindowPrivate *priv = XFBURN_MAIN_WINDOW_GET_PRIVATE (window);
-
+
xfburn_main_window_add_audio_composition_with_files (window, 0, NULL);
}
@@ -540,7 +540,7 @@ action_about (GtkAction * action, XfburnMainWindow * window)
"comments", _("Another CD burning GUI"),
"website", "http://www.xfce.org/projects/xfburn",
"copyright", "2005-2008 David Mohr, Mario Đanić, Jean-François Wauthy",
- "authors", auth,
+ "authors", auth,
"translator-credits", translators,
NULL);
@@ -555,7 +555,7 @@ action_preferences (GtkAction * action, XfburnMainWindow * window)
dialog = xfburn_preferences_dialog_new ();
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (window));
-
+
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
}
@@ -564,7 +564,7 @@ static void
action_refresh_directorybrowser (GtkAction * action, XfburnMainWindow * window)
{
XfburnMainWindowPrivate *priv = XFBURN_MAIN_WINDOW_GET_PRIVATE (window);
-
+
xfburn_file_browser_refresh (XFBURN_FILE_BROWSER (priv->file_browser));
}
@@ -572,11 +572,11 @@ static void
action_show_filebrowser (GtkToggleAction * action, XfburnMainWindow * window)
{
XfburnMainWindowPrivate *priv = XFBURN_MAIN_WINDOW_GET_PRIVATE (window);
-
+
xfburn_settings_set_boolean ("show-filebrowser", gtk_toggle_action_get_active (action));
-
+
if (gtk_toggle_action_get_active (action)) {
- gtk_widget_show (priv->file_browser);
+ gtk_widget_show (priv->file_browser);
}
else {
gtk_widget_hide (priv->file_browser);
@@ -587,9 +587,9 @@ static void
action_show_toolbar (GtkToggleAction * action, XfburnMainWindow * window)
{
XfburnMainWindowPrivate *priv = XFBURN_MAIN_WINDOW_GET_PRIVATE (window);
-
+
xfburn_settings_set_boolean ("show-toolbar", gtk_toggle_action_get_active (action));
-
+
if (gtk_toggle_action_get_active (action)) {
gtk_widget_show (priv->toolbars);
}
@@ -610,16 +610,16 @@ xfburn_main_window_new (void)
g_error ("An instance of XfburnMainWindow has already been created");
return NULL;
}
-
- obj = g_object_new (xfburn_main_window_get_type (), NULL);
-
+
+ obj = gtk_widget_new (xfburn_main_window_get_type (), NULL);
+
if (obj) {
XfburnMainWindow *win;
XfburnMainWindowPrivate *priv;
GtkAction *action;
GList *device = NULL;
XfburnDeviceList *devlist;
-
+
instance = win = XFBURN_MAIN_WINDOW (obj);
priv = XFBURN_MAIN_WINDOW_GET_PRIVATE (win);
@@ -645,9 +645,9 @@ xfburn_main_window_new (void)
g_object_get (G_OBJECT (device_info), "cdr", &cdr, "cdrw", &cdrw, NULL);
if (cdr)
- priv->support_cdr = TRUE;
+ priv->support_cdr = TRUE;
if (cdrw)
- priv->support_cdrw = TRUE;
+ priv->support_cdrw = TRUE;
device = g_list_next (device);
}
@@ -685,7 +685,7 @@ GtkUIManager *
xfburn_main_window_get_ui_manager (XfburnMainWindow *window)
{
XfburnMainWindowPrivate *priv = XFBURN_MAIN_WINDOW_GET_PRIVATE (window);
-
+
return priv->ui_manager;
}
@@ -693,30 +693,30 @@ XfburnFileBrowser *
xfburn_main_window_get_file_browser (XfburnMainWindow *window)
{
XfburnMainWindowPrivate *priv = XFBURN_MAIN_WINDOW_GET_PRIVATE (window);
-
+
return XFBURN_FILE_BROWSER (priv->file_browser);
}
-void
+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;
GSList * filelist;
-
+
comp = xfburn_compositions_notebook_add_composition (XFBURN_COMPOSITIONS_NOTEBOOK (priv->compositions_notebook), XFBURN_DATA_COMPOSITION);
filelist = xfburn_make_abosulet_file_list (filec, filenames);
xfburn_data_composition_add_files (XFBURN_DATA_COMPOSITION (comp), filelist);
}
-void
+void
xfburn_main_window_add_audio_composition_with_files (XfburnMainWindow *window, int filec, char **filenames)
{
XfburnMainWindowPrivate *priv = XFBURN_MAIN_WINDOW_GET_PRIVATE (window);
XfburnComposition *comp;
GSList * filelist;
-
+
comp = xfburn_compositions_notebook_add_composition (XFBURN_COMPOSITIONS_NOTEBOOK (priv->compositions_notebook), XFBURN_AUDIO_COMPOSITION);
filelist = xfburn_make_abosulet_file_list (filec, filenames);
xfburn_audio_composition_add_files (XFBURN_AUDIO_COMPOSITION (comp), filelist);
diff --git a/xfburn/xfburn-progress-dialog.c b/xfburn/xfburn-progress-dialog.c
index 8373f99..b404723 100644
--- a/xfburn/xfburn-progress-dialog.c
+++ b/xfburn/xfburn-progress-dialog.c
@@ -193,7 +193,7 @@ xfburn_progress_dialog_init (XfburnProgressDialog * obj)
/* label */
priv->label_action = gtk_label_new ("Initializing ...");
- gtk_misc_set_alignment (GTK_MISC (priv->label_action), 0.1, 0.0);
+ gtk_label_set_xalign(GTK_LABEL (priv->label_action), 0.1);
gtk_label_set_justify (GTK_LABEL (priv->label_action), GTK_JUSTIFY_LEFT);
gtk_label_set_selectable (GTK_LABEL (priv->label_action), TRUE);
set_action_text (obj, XFBURN_PROGRESS_DIALOG_STATUS_RUNNING, _("Initializing..."));
@@ -207,7 +207,7 @@ xfburn_progress_dialog_init (XfburnProgressDialog * obj)
gtk_progress_bar_set_pulse_step (GTK_PROGRESS_BAR (priv->progress_bar), 0.05);
/* buffers */
- priv->hbox_buffers = gtk_hbox_new (FALSE, BORDER);
+ priv->hbox_buffers = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, BORDER);
gtk_widget_show (priv->hbox_buffers);
gtk_box_pack_start (box, priv->hbox_buffers, FALSE, TRUE, BORDER);
@@ -219,39 +219,39 @@ xfburn_progress_dialog_init (XfburnProgressDialog * obj)
gtk_widget_show (priv->label_speed);
gtk_container_add (GTK_CONTAINER (frame), priv->label_speed);
- table = gtk_table_new (2, 2, FALSE);
- gtk_table_set_row_spacings (GTK_TABLE (table), BORDER);
- gtk_table_set_col_spacings (GTK_TABLE (table), BORDER * 2);
+ table = gtk_grid_new ();
+ gtk_grid_set_row_spacing (GTK_GRID (table), BORDER);
+ gtk_grid_set_column_spacing (GTK_GRID (table), BORDER * 2);
gtk_box_pack_start (GTK_BOX (priv->hbox_buffers), table, TRUE, TRUE, 0);
gtk_widget_show (table);
label = gtk_label_new (_("FIFO buffer:"));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_label_set_yalign(GTK_LABEL(label), 0.5);
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
+ gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1);
gtk_widget_show (label);
priv->fifo_bar = gtk_progress_bar_new ();
gtk_progress_bar_set_text (GTK_PROGRESS_BAR (priv->fifo_bar), _("unknown"));
- gtk_table_attach (GTK_TABLE (table), priv->fifo_bar, 1, 2, 0, 1, GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0);
+ gtk_grid_attach (GTK_GRID (table), priv->fifo_bar, 1, 0, 1, 1);
gtk_widget_show (priv->fifo_bar);
label = gtk_label_new (_("Device buffer:"));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_label_set_yalign(GTK_LABEL(label), 0.5);
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
+ gtk_grid_attach (GTK_GRID (table), label, 0, 1, 1, 1);
gtk_widget_show (label);
priv->buffer_bar = gtk_progress_bar_new ();
gtk_progress_bar_set_text (GTK_PROGRESS_BAR (priv->buffer_bar), _("unknown"));
- gtk_table_attach (GTK_TABLE (table), priv->buffer_bar, 1, 2, 1, 2, GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0);
+ gtk_grid_attach (GTK_GRID (table), priv->buffer_bar, 1, 1, 1, 1);
gtk_widget_show (priv->buffer_bar);
/* action buttons */
- priv->button_stop = gtk_button_new_from_stock ("_Stop");
+ priv->button_stop = gtk_button_new_with_mnemonic (_("_Stop"));
gtk_widget_show (priv->button_stop);
gtk_dialog_add_action_widget (GTK_DIALOG (obj), priv->button_stop, GTK_RESPONSE_CANCEL);
g_signal_connect (G_OBJECT (priv->button_stop), "clicked", G_CALLBACK (cb_button_stop_clicked), obj);
- priv->button_close = gtk_button_new_from_stock ("gtk-close");
+ priv->button_close = gtk_button_new_with_label ("gtk-close");
gtk_widget_show (priv->button_close);
gtk_dialog_add_action_widget (GTK_DIALOG (obj), priv->button_close, GTK_RESPONSE_CLOSE);
gtk_widget_set_can_default (priv->button_close, TRUE);
@@ -414,7 +414,7 @@ xfburn_progress_dialog_show_buffers (XfburnProgressDialog * dialog, gboolean sho
{
XfburnProgressDialogPrivate *priv = XFBURN_PROGRESS_DIALOG_GET_PRIVATE (dialog);
- gdk_threads_enter ();
+ gdk_threads_enter ();
if (show)
gtk_widget_show (priv->hbox_buffers);
else
@@ -426,7 +426,7 @@ void
xfburn_progress_dialog_pulse_progress_bar (XfburnProgressDialog * dialog)
{
XfburnProgressDialogPrivate *priv = XFBURN_PROGRESS_DIALOG_GET_PRIVATE (dialog);
-
+
gdk_threads_enter ();
gtk_progress_bar_pulse (GTK_PROGRESS_BAR (priv->progress_bar));
gdk_threads_leave ();
@@ -479,7 +479,7 @@ xfburn_progress_dialog_set_buffer_bar_fraction (XfburnProgressDialog * dialog, g
text = g_strdup_printf ("%d%%", (int) (fraction));
}
- gdk_threads_enter ();
+ gdk_threads_enter ();
gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (priv->buffer_bar), fraction / 100.0);
gtk_progress_bar_set_text (GTK_PROGRESS_BAR (priv->buffer_bar), text);
gdk_threads_leave ();
@@ -503,7 +503,7 @@ xfburn_progress_dialog_set_buffer_bar_min_fill (XfburnProgressDialog * dialog, g
text = g_strdup_printf (_("Min. fill was %2d%%"), (int) (fraction));
}
- gdk_threads_enter ();
+ gdk_threads_enter ();
gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (priv->buffer_bar), fraction / 100.0);
gtk_progress_bar_set_text (GTK_PROGRESS_BAR (priv->buffer_bar), text);
gdk_threads_leave ();
@@ -526,7 +526,7 @@ xfburn_progress_dialog_set_fifo_bar_fraction (XfburnProgressDialog * dialog, gdo
} else {
text = g_strdup_printf ("%d%%", (int) (fraction));
}
-
+
gdk_threads_enter ();
gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (priv->fifo_bar), fraction / 100.0);
gtk_progress_bar_set_text (GTK_PROGRESS_BAR (priv->fifo_bar), text);
@@ -607,7 +607,7 @@ xfburn_progress_dialog_set_progress_bar_fraction (XfburnProgressDialog * dialog,
return;
}
- gdk_threads_enter ();
+ gdk_threads_enter ();
gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (priv->progress_bar), fraction / 100.0);
gtk_progress_bar_set_text (GTK_PROGRESS_BAR (priv->progress_bar), text);
gdk_threads_leave ();
@@ -674,6 +674,6 @@ xfburn_progress_dialog_new (GtkWindow *parent)
XfburnProgressDialog *obj;
obj = XFBURN_PROGRESS_DIALOG (g_object_new (XFBURN_TYPE_PROGRESS_DIALOG, "transient-for", parent,
"modal", TRUE, NULL));
-
+
return GTK_WIDGET (obj);
}
diff --git a/xfburn/xfburn-welcome-tab.c b/xfburn/xfburn-welcome-tab.c
index d2f20b3..421ed90 100644
--- a/xfburn/xfburn-welcome-tab.c
+++ b/xfburn/xfburn-welcome-tab.c
@@ -87,7 +87,7 @@ xfburn_welcome_tab_get_type (void)
NULL
};
- type = g_type_register_static (GTK_TYPE_VBOX, "XfburnWelcomeTab", &our_info, 0);
+ type = g_type_register_static (GTK_TYPE_BOX, "XfburnWelcomeTab", &our_info, 0);
}
return type;
@@ -97,9 +97,9 @@ static void
xfburn_welcome_tab_class_init (XfburnWelcomeTabClass * klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
+
g_type_class_add_private (klass, sizeof (XfburnWelcomeTabPrivate));
-
+
parent_class = g_type_class_peek_parent (klass);
object_class->finalize = xfburn_welcome_tab_finalize;
@@ -117,43 +117,39 @@ xfburn_welcome_tab_init (XfburnWelcomeTab * obj)
gtk_box_set_homogeneous (GTK_BOX (obj), TRUE);
- align = gtk_alignment_new (0.5, 0.5, 0.5, 0.5);
- //gtk_container_add (GTK_CONTAINER (obj), align);
- gtk_box_pack_start (GTK_BOX (obj), align, TRUE, TRUE, BORDER);
- gtk_widget_show (align);
-
- vbox = gtk_vbox_new (FALSE, BORDER);
- gtk_container_add (GTK_CONTAINER (align), vbox);
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, BORDER);
+ gtk_box_pack_start (GTK_BOX (obj), vbox, FALSE, FALSE, BORDER);
gtk_widget_show (vbox);
label_welcome = gtk_label_new (_("Welcome to Xfburn!"));
- gtk_box_pack_start (GTK_BOX (vbox), label_welcome, FALSE, FALSE, BORDER);
+ gtk_box_pack_start (GTK_BOX (vbox), label_welcome, TRUE, FALSE, BORDER);
+ gtk_widget_set_valign (GTK_WIDGET (label_welcome), GTK_ALIGN_END);
gtk_widget_show (label_welcome);
- table = gtk_table_new (2,2,TRUE);
- gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, BORDER);
- gtk_table_set_row_spacings (GTK_TABLE (table), BORDER);
- gtk_table_set_col_spacings (GTK_TABLE (table), BORDER);
+ table = gtk_grid_new ();
+ gtk_box_pack_start (GTK_BOX (vbox), table, TRUE, TRUE, BORDER);
+ gtk_grid_set_row_spacing (GTK_GRID (table), BORDER);
+ gtk_grid_set_column_spacing (GTK_GRID (table), BORDER);
gtk_widget_show (table);
/* buttons */
priv->button_image = create_welcome_button ("stock_xfburn", _("<big>Burn _Image</big>"), _("Burn a prepared compilation, i.e. an .ISO file"));
- gtk_table_attach_defaults (GTK_TABLE (table), priv->button_image, 0, 1, 0, 1);
+ gtk_grid_attach (GTK_GRID (table), priv->button_image, 0, 0, 1, 1);
gtk_widget_show (priv->button_image);
g_signal_connect (G_OBJECT(priv->button_image), "clicked", G_CALLBACK(burn_image), obj);
priv->button_data_comp = create_welcome_button ("stock_xfburn-new-data-composition", _("<big>New _Data Composition</big>"), _("Create a new data disc with the files of your choosing"));
- gtk_table_attach_defaults (GTK_TABLE (table), priv->button_data_comp, 1, 2, 0, 1);
+ gtk_grid_attach (GTK_GRID (table), priv->button_data_comp, 1, 0, 1, 1);
gtk_widget_show (priv->button_data_comp);
g_signal_connect (G_OBJECT(priv->button_data_comp), "clicked", G_CALLBACK(new_data_composition), obj);
priv->button_blank = create_welcome_button ("stock_xfburn-blank-cdrw", _("<big>_Blank Disc</big>"), _("Prepare the rewriteable disc for a new burn"));
- gtk_table_attach_defaults (GTK_TABLE (table), priv->button_blank, 0, 1, 1, 2);
+ gtk_grid_attach (GTK_GRID (table), priv->button_blank, 0, 1, 1, 1);
gtk_widget_show (priv->button_blank);
g_signal_connect (G_OBJECT(priv->button_blank), "clicked", G_CALLBACK(blank_disc), obj);
priv->button_audio_comp = create_welcome_button ("stock_xfburn-audio-cd", _("<big>_Audio CD</big>"), _("Audio CD playable in regular stereos"));
- gtk_table_attach_defaults (GTK_TABLE (table), priv->button_audio_comp, 1, 2, 1, 2);
+ gtk_grid_attach (GTK_GRID (table), priv->button_audio_comp, 1, 1, 1, 1);
gtk_widget_show (priv->button_audio_comp);
g_signal_connect (G_OBJECT(priv->button_audio_comp), "clicked", G_CALLBACK(new_audio_cd), obj);
}
@@ -182,10 +178,8 @@ create_welcome_button (const gchar *stock, const gchar *text, const gchar *secon
gtk_label_set_mnemonic_widget (GTK_LABEL (label), button);
image = gtk_image_new_from_icon_name (stock, GTK_ICON_SIZE_DIALOG);
- hbox = gtk_hbox_new (FALSE, 20);
- vbox = gtk_vbox_new (FALSE, 2);
-
- align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 20);
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
gtk_box_pack_end (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
@@ -196,9 +190,8 @@ create_welcome_button (const gchar *stock, const gchar *text, const gchar *secon
gtk_label_set_text (GTK_LABEL (label), secondary);
gtk_box_pack_end (GTK_BOX (vbox), label, FALSE, FALSE, 0);
- gtk_container_add (GTK_CONTAINER (button), align);
- gtk_container_add (GTK_CONTAINER (align), hbox);
- gtk_widget_show_all (align);
+ gtk_container_add (GTK_CONTAINER (button), hbox);
+ gtk_widget_show_all (button);
return button;
}
@@ -229,7 +222,7 @@ static void
new_data_composition (GtkButton *button, XfburnWelcomeTab *tab)
{
XfburnWelcomeTabPrivate *priv = XFBURN_WELCOME_TAB_GET_PRIVATE (tab);
-
+
xfburn_compositions_notebook_add_composition (XFBURN_COMPOSITIONS_NOTEBOOK (priv->notebook), XFBURN_DATA_COMPOSITION);
}
@@ -237,7 +230,7 @@ static void
new_audio_cd (GtkButton *button, XfburnWelcomeTab *tab)
{
XfburnWelcomeTabPrivate *priv = XFBURN_WELCOME_TAB_GET_PRIVATE (tab);
-
+
xfburn_compositions_notebook_add_composition (XFBURN_COMPOSITIONS_NOTEBOOK (priv->notebook), XFBURN_AUDIO_COMPOSITION);
}
@@ -260,13 +253,13 @@ xfburn_welcome_tab_new (XfburnCompositionsNotebook *notebook, GtkActionGroup *ac
/* FIXME retrieve action group from UI Manager */
action = gtk_action_group_get_action (action_group, "burn-image");
gtk_widget_set_sensitive (priv->button_image, gtk_action_is_sensitive (action));
-
+
action = gtk_action_group_get_action (action_group, "new-data-composition");
gtk_widget_set_sensitive (priv->button_data_comp, gtk_action_is_sensitive (action));
-
+
action = gtk_action_group_get_action (action_group, "new-audio-composition");
gtk_widget_set_sensitive (priv->button_audio_comp, gtk_action_is_sensitive (action));
-
+
action = gtk_action_group_get_action (action_group, "blank-disc");
gtk_widget_set_sensitive (priv->button_blank, gtk_action_is_sensitive (action));
}
diff --git a/xfburn/xfburn-welcome-tab.h b/xfburn/xfburn-welcome-tab.h
index 3805b7c..6b0b8cd 100644
--- a/xfburn/xfburn-welcome-tab.h
+++ b/xfburn/xfburn-welcome-tab.h
@@ -39,12 +39,12 @@ G_BEGIN_DECLS
typedef struct
{
- GtkVBox parent;
+ GtkBox parent;
} XfburnWelcomeTab;
typedef struct
{
- GtkVBoxClass parent_class;
+ GtkBoxClass parent_class;
} XfburnWelcomeTabClass;
GType xfburn_welcome_tab_get_type (void);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list