Savannah Git Hosting - mdk.git/commitdiff

diff --git a/mixgtk/mixgtk.glade b/mixgtk/mixgtk.glade

index f245c16d4b192488c70e943c1e8ac9bd78a8ab2c..35e0147fd172c7a0fc6f070fcfe7ab4e4d738d64 100644 (file)

--- a/mixgtk/mixgtk.glade

+++ b/mixgtk/mixgtk.glade

</packing>

</child>

<child>

- <object class="GtkToolButton" id="attach_button2">

+ <object class="GtkToolButton" id="attach_button_dev">

<property name="visible">True</property>

<property name="can_focus">False</property>

<property name="is_important">True</property>

<property name="is_important">True</property>

<property name="label" translatable="yes">Attach</property>

<property name="use_underline">True</property>

- <property name="stock_id">gtk-dnd</property>

+ <property name="stock_id">gtk-revert-to-saved</property>

<signal name="clicked" handler="on_attach_all_clicked" swapped="no"/>

</object>

<packing>

</packing>

</child>

<child>

- <object class="GtkToolButton" id="attach_button1">

+ <object class="GtkToolButton" id="attach_button_mixal">

<property name="visible">True</property>

<property name="can_focus">False</property>

<property name="is_important">True</property>

<property name="is_important">True</property>

<property name="label" translatable="yes">Font</property>

<property name="use_underline">True</property>

- <property name="stock_id">gtk-disconnect</property>

+ <property name="stock_id">gtk-select-font</property>

<signal name="clicked" handler="on_mix_font_activate" swapped="no"/>

</object>

<packing>

</packing>

</child>

<child>

- <object class="GtkToolButton" id="attach_button3">

+ <object class="GtkToolButton" id="attach_button_mixvm">

<property name="name">attach_button</property>

<property name="visible">True</property>

<property name="can_focus">False</property>

diff --git a/mixgtk/mixgtk_wm.c b/mixgtk/mixgtk_wm.c

index f1cf8d77d295b5b10302c83ce40ec44ce54ea666..b442eb9d42d6a63a2d445c0876e3a869473ed983 100644 (file)

--- a/mixgtk/mixgtk_wm.c

+++ b/mixgtk/mixgtk_wm.c

const gchar *menu_name;

const gchar *config_key;

const gchar *toolbar_name;

+ const gchar *attach_button;

gboolean detached;

void (*detach) (void);

void (*attach) (void);

static window_info_t_ infos_[] = {

{MIXGTK_MIXVM_DIALOG, NULL, NULL,

- "detach_vm", "MIX.detach", "mixvm_toolbar",

+ "detach_vm", "MIX.detach", "mixvm_toolbar", "attach_button_mixvm",

FALSE, mixvm_detach_, mixvm_attach_},

{MIXGTK_MIXAL_DIALOG, NULL, NULL,

- "detach_source", "MIXAL.detach", "mixal_toolbar",

+ "detach_source", "MIXAL.detach", "mixal_toolbar", "attach_button_mixal",

FALSE, mixal_detach_, mixal_attach_},

{MIXGTK_DEVICES_DIALOG, NULL, NULL,

- "detach_dev", "Devices.detach", "dev_toolbar",

+ "detach_dev", "Devices.detach", "dev_toolbar", "attach_button_dev",

FALSE, dev_detach_, dev_attach_}

};

G_OBJECT (mixgtk_widget_factory_get_dialog (infos_[k].dialog));

GObject *button =

- G_OBJECT (mixgtk_widget_factory_get (infos_[k].dialog,

- MIXGTK_WIDGET_ATTACH_BUTTON));

+ G_OBJECT (mixgtk_widget_factory_get_by_name (infos_[k].attach_button));

g_assert (dialog != NULL);

g_assert (button != NULL);

static void

reparent_ (GtkWidget *widget, GtkWidget *parent)

{

- gtk_container_remove (GTK_CONTAINER (gtk_widget_get_parent (widget)),

- widget);

+ gtk_container_remove (GTK_CONTAINER (gtk_widget_get_parent (widget)), widget);

gtk_container_add (GTK_CONTAINER (parent), widget);

}

reparent_ (infos_[MIXGTK_DEVICES_WINDOW].widget, GTK_WIDGET (dev_container_));

}

+

static void

on_nb_switch_ (GtkNotebook *notebook, GtkWidget *page,

guint page_num, gpointer user_data)