applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(http://bugzilla.gnome.org/show_bug.cgi?id=143958) Revert option added.

Browse source 
2004-06-20  David Sedeo <david@alderia.com>

        (http://bugzilla.gnome.org/show_bug.cgi?id=143958)
        * gnome-theme-manager.c, theme-properties.glade: Revert option added.
        Two now gboolean global var: 'themes_loaded' to check if its the first
        time that has cold meta_theme_selection_changed. 'rervert' to known
        in the same function if the selection has change because a revert.
        (meta_theme_selection_changed):  If it's the same time, save the
        initial theme in initial_meta_theme_info. If the selection has change
        because a revert click, set the sensitive of the revert button
        to false.
        (revert_theme_clicked): callback for the revert button clicked signal.
        Set the initial_meta_theme and set sensitive to FALSE.
        (setup_dialog): Added the revert button to the gtk_size_group, connect
        the clicked callback and set sensitive initially to FALSE.
This commit is contained in:
David Sedeo 2004-06-20 11:02:04 +00:00 • committed by David Sedeño Fernández
parent 71d47e6105
commit f0a452b3f7
3 changed files with 148 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
capplets/theme-switcher/ChangeLog
View file

@ -1,3 +1,19 @@
2004-06-20 David Sedeño <david@alderia.com>
(http://bugzilla.gnome.org/show_bug.cgi?id=143958)
* gnome-theme-manager.c, theme-properties.glade: Revert option added.
Two now gboolean global var: 'themes_loaded' to check if its the first
time that has cold meta_theme_selection_changed. 'rervert' to known
in the same function if the selection has change because a revert.
(meta_theme_selection_changed): If it's the same time, save the
initial theme in initial_meta_theme_info. If the selection has change
because a revert click, set the sensitive of the revert button
to false.
(revert_theme_clicked): callback for the revert button clicked signal.
Set the initial_meta_theme and set sensitive to FALSE.
(setup_dialog): Added the revert button to the gtk_size_group, connect
the clicked callback and set sensitive initially to FALSE.
2004-05-27 Padraig O'Briain <padraig.obriain@sun.com>
* theme-properties.glade: Set accessible name for GtkTreeViews

60
capplets/theme-switcher/gnome-theme-manager.c
View file

@ -62,6 +62,8 @@ static gboolean reload_themes;
static gboolean initial_meta_theme_set = FALSE;
static GdkPixbuf *default_image = NULL;
static GdkPixbuf *broken_image = NULL;
static gboolean themes_loaded = FALSE;
static gboolean reverted = FALSE;
static GnomeThemeMetaInfo custom_meta_theme_info;
static GnomeThemeMetaInfo initial_meta_theme_info;
@ -534,7 +536,13 @@ meta_theme_selection_changed (GtkTreeSelection *selection,
GtkTreeIter iter;
gchar *meta_theme_name;
GtkTreeModel *model;
gchar *current_gtk_theme;
gchar *current_window_theme;
gchar *current_icon_theme;
GConfClient *client;
GnomeWindowManager *window_manager;
GnomeWMSettings wm_settings;
if (gtk_tree_selection_get_selected (selection, &model, &iter))
{
gtk_tree_model_get (model, &iter,
@ -561,8 +569,35 @@ meta_theme_selection_changed (GtkTreeSelection *selection,
if (setting_model)
return;
if (meta_theme_info)
if (meta_theme_info)
gnome_meta_theme_set (meta_theme_info);
if (!themes_loaded) {
client = gconf_client_get_default ();
/* Get the settings */
current_gtk_theme = gconf_client_get_string (client, GTK_THEME_KEY, NULL);
current_icon_theme = gconf_client_get_string (client, ICON_THEME_KEY, NULL);
window_manager = gnome_wm_manager_get_current (gdk_display_get_default_screen (gdk_display_get_default ()));
wm_settings.flags = GNOME_WM_SETTING_THEME;
if (window_manager) {
gnome_window_manager_get_settings (window_manager, &wm_settings);
current_window_theme = g_strdup (wm_settings.theme);
} else
current_window_theme = g_strdup ("");
initial_meta_theme_info.name = g_strdup ("__Initial Theme__");
initial_meta_theme_info.gtk_theme_name = g_strdup (current_gtk_theme);
initial_meta_theme_info.metacity_theme_name = g_strdup (current_window_theme);
initial_meta_theme_info.icon_theme_name = g_strdup (current_icon_theme);
themes_loaded = TRUE;
} else {
if (!reverted) {
gtk_widget_set_sensitive(WID("meta_theme_revert_button"),TRUE);
} else {
reverted = FALSE;
}
}
}
/* This function will adjust the list to reflect the current theme
@ -1080,8 +1115,20 @@ apply_font_clicked (GtkWidget *button,
gconf_client_set_string (client, FONT_KEY, meta_theme_info->application_font, NULL);
}
}
static void
revert_theme_clicked (GtkWidget *button,
gpointer data)
{
GladeXML *dialog;
gnome_meta_theme_set(&initial_meta_theme_info);
dialog = gnome_theme_manager_get_theme_dialog ();
gtk_widget_set_sensitive(WID("meta_theme_revert_button"), FALSE);
reverted = TRUE;
}
static void
setup_dialog (GladeXML *dialog)
{
@ -1107,14 +1154,19 @@ setup_dialog (GladeXML *dialog)
gtk_size_group_add_widget (size_group, WID ("meta_theme_background1_button"));
gtk_size_group_add_widget (size_group, WID ("meta_theme_font2_button"));
gtk_size_group_add_widget (size_group, WID ("meta_theme_background2_button"));
gtk_size_group_add_widget (size_group, WID ("meta_theme_revert_button"));
g_object_unref (size_group);
gtk_widget_set_sensitive(WID("meta_theme_revert_button"),FALSE);
g_signal_connect (G_OBJECT (WID ("meta_theme_install_button")), "clicked", G_CALLBACK (gnome_meta_theme_installer_run_cb), parent);
g_signal_connect (G_OBJECT (WID ("meta_theme_details_button")), "clicked", gnome_theme_details_show, NULL);
g_signal_connect (G_OBJECT (WID ("meta_theme_font1_button")), "clicked", G_CALLBACK (apply_font_clicked), dialog);
g_signal_connect (G_OBJECT (WID ("meta_theme_revert_button")), "clicked", G_CALLBACK (revert_theme_clicked),NULL);
setup_meta_tree_view (GTK_TREE_VIEW (WID ("meta_theme_treeview")),
(GCallback) meta_theme_selection_changed,
dialog);

82
capplets/theme-switcher/theme-properties.glade
View file

@ -313,6 +313,76 @@
<property name="fill">False</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="meta_theme_revert_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<child>
<widget class="GtkAlignment" id="alignment16">
<property name="visible">True</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
<widget class="GtkHBox" id="hbox26">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">2</property>
<child>
<widget class="GtkImage" id="image15">
<property name="visible">True</property>
<property name="stock">gtk-undo</property>
<property name="icon_size">4</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label50">
<property name="visible">True</property>
<property name="label" translatable="yes">_Revert</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
</widget>
</child>
</widget>
</child>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
</widget>
<packing>
<property name="padding">0</property>
@ -704,9 +774,9 @@
<property name="rules_hint">False</property>
<property name="reorderable">False</property>
<property name="enable_search">True</property>
<accessibility>
<accessibility>
<atkproperty name="AtkObject::accessible_name" translatable="yes">theme selection tree</atkproperty>
</accessibility>
</accessibility>
</widget>
</child>
</widget>
@ -981,9 +1051,9 @@
<property name="rules_hint">False</property>
<property name="reorderable">False</property>
<property name="enable_search">True</property>
<accessibility>
<accessibility>
<atkproperty name="AtkObject::accessible_name" translatable="yes">theme selection tree</atkproperty>
</accessibility>
</accessibility>
</widget>
</child>
</widget>
@ -1258,9 +1328,9 @@
<property name="rules_hint">False</property>
<property name="reorderable">False</property>
<property name="enable_search">True</property>
<accessibility>
<accessibility>
<atkproperty name="AtkObject::accessible_name" translatable="yes">theme selection tree</atkproperty>
</accessibility>
</accessibility>
</widget>
</child>
</widget>