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

- Add files for Style tab - Implement changing gtk and metacity themes

Browse source 
2007-05-07  Thomas Wood  <thos@gnome.org>

	* Makefile.am:
	* appearance-main.c: (main):
	* appearance-style.c:
	* appearance-style.h:
	- Add files for Style tab
	- Implement changing gtk and metacity themes

	* appearance.glade: Change "Themes" to "Theme" and name some widgets

svn path=/trunk/; revision=7570
This commit is contained in:
Thomas Wood 2007-05-07 19:09:24 +00:00 • committed by Thomas Wood
parent 5a4c409418
commit 88c4cb5314
6 changed files with 172 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
capplets/appearance/ChangeLog
View file

@ -1,3 +1,14 @@
2007-05-07 Thomas Wood <thos@gnome.org>
* Makefile.am:
* appearance-main.c: (main):
* appearance-style.c:
* appearance-style.h:
- Add files for Style tab
- Implement changing gtk and metacity themes
* appearance.glade: Change "Themes" to "Theme" and name some widgets
2007-05-07 Denis Washington <denisw@svn.nome.org>
* appearance.glade:

2
capplets/appearance/Makefile.am
View file

@ -12,6 +12,8 @@ gnome_appearance_properties_SOURCES = \
appearance-main.c \
appearance-themes.c \
appearance-themes.h \
appearance-style.c \
appearance-style.h \
appearance-ui.c \
appearance-ui.h \
gnome-wp-info.c \

2
capplets/appearance/appearance-main.c
View file

@ -22,6 +22,7 @@
#include "appearance-desktop.h"
#include "appearance-font.h"
#include "appearance-themes.h"
#include "appearance-style.h"
#include "appearance-ui.h"
#include "theme-thumbnail.h"
#include "activate-settings-daemon.h"
@ -84,6 +85,7 @@ main (int argc, char **argv)
/* init tabs */
themes_init (data);
style_init (data);
desktop_init (data);
font_init (data);
ui_init (data);

128
capplets/appearance/appearance-style.c Normal file
View file

@ -0,0 +1,128 @@
/*
* Copyright (C) 2007 The GNOME Foundation
* Written by Thomas Wood <thos@gnome.org>
* All Rights Reserved
*
* This program is free software; you can redistribute it and/or modify
* 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 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.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <gtk/gtk.h>
#include <string.h>
#include "gnome-theme-info.h"
#include "appearance.h"
enum ThemeType {
GTK_THEMES,
METACITY_THEMES,
ICON_THEMES,
CURSOR_THEMES
};
static gchar *gconf_keys[] = {
"/desktop/gnome/interface/gtk_theme",
"/apps/metacity/general/theme",
"/desktop/gnome/interface/icon_theme",
"/desktop/gnome/peripherals/mouse/cursor_theme"
};
static void
theme_changed (GtkComboBox *combo, AppearanceData *data)
{
enum ThemeType type;
gchar *value;
GtkTreeIter iter;
GtkTreeModel *model;
model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo));
gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo), &iter);
gtk_tree_model_get (model, &iter, 0, &value, -1);
type = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (combo), "theme_type"));
if (!value)
return;
gconf_client_set_string (data->client, gconf_keys[type], value, NULL);
}
static void
prepare_combo (AppearanceData *data, GtkWidget *combo, enum ThemeType type)
{
GtkListStore *store;
GList *l, *list = NULL;
GtkCellRenderer *renderer;
GnomeThemeElement element = 0;
gchar *value = NULL;
GtkTreeIter active_row;
switch (type)
{
case GTK_THEMES:
element = GNOME_THEME_GTK_2;
case METACITY_THEMES:
if (!element) element = GNOME_THEME_METACITY;
list = gnome_theme_info_find_by_type (element);
break;
case ICON_THEMES:
list = gnome_theme_icon_info_find_all ();
case CURSOR_THEMES:
list = NULL; /* don't know what to do yet */
}
if (!list)
return;
renderer = gtk_cell_renderer_text_new ();
store = gtk_list_store_new (1, G_TYPE_STRING);
value = gconf_client_get_string (data->client, gconf_keys[type], NULL);
for (l = list; l; l = g_list_next (l))
{
gchar *name;
GtkTreeIter i;
if (type < ICON_THEMES)
name = ((GnomeThemeInfo*) l->data)->name;
else
name = ((GnomeThemeIconInfo*) l->data)->name;
if (!name)
continue; /* just in case... */
gtk_list_store_insert_with_values (store, &i, 0, 0, name, -1);
if (value && !strcmp (value, name))
active_row = i;
}
gtk_combo_box_set_model (GTK_COMBO_BOX (combo), GTK_TREE_MODEL (store));
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, TRUE);
gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (combo), renderer, "text", 0);
gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo), &active_row);
g_object_set_data (G_OBJECT (combo), "theme_type", GINT_TO_POINTER (type));
g_signal_connect (G_OBJECT (combo), "changed", (GCallback) theme_changed, data);
}
void
style_init (AppearanceData *data)
{
prepare_combo (data, glade_xml_get_widget (data->xml, "gtk_themes_combobox"), GTK_THEMES);
prepare_combo (data, glade_xml_get_widget (data->xml, "window_themes_combobox"), METACITY_THEMES);
prepare_combo (data, glade_xml_get_widget (data->xml, "icon_themes_combobox"), ICON_THEMES);
}

23
capplets/appearance/appearance-style.h Normal file
View file

@ -0,0 +1,23 @@
/*
* Copyright (C) 2007 The GNOME Foundation
* Written by Thomas Wood <thos@gnome.org>
* All Rights Reserved
*
* This program is free software; you can redistribute it and/or modify
* 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 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.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
void style_init (AppearanceData *data);

12
capplets/appearance/appearance.glade
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
<!--Generated with glade3 3.2.1 on Mon May 7 18:14:16 2007 by thomas@draco-->
<!--Generated with glade3 3.2.1 on Mon May 7 20:02:47 2007 by thomas@draco-->
<glade-interface>
<widget class="GtkDialog" id="render_details">
<property name="border_width">5</property>
@ -705,7 +705,7 @@
<widget class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">Themes</property>
<property name="label" translatable="yes">Theme</property>
</widget>
<packing>
<property name="type">tab</property>
@ -741,7 +741,7 @@
<property name="column_spacing">24</property>
<property name="row_spacing">6</property>
<child>
<widget class="GtkComboBox" id="combobox4">
<widget class="GtkComboBox" id="cursor_themes_combobox">
<property name="visible">True</property>
</widget>
<packing>
@ -805,7 +805,7 @@
</packing>
</child>
<child>
<widget class="GtkComboBox" id="combobox3">
<widget class="GtkComboBox" id="gtk_themes_combobox">
<property name="visible">True</property>
</widget>
<packing>
@ -814,7 +814,7 @@
</packing>
</child>
<child>
<widget class="GtkComboBox" id="combobox2">
<widget class="GtkComboBox" id="window_themes_combobox">
<property name="visible">True</property>
</widget>
<packing>
@ -825,7 +825,7 @@
</packing>
</child>
<child>
<widget class="GtkComboBox" id="combobox1">
<widget class="GtkComboBox" id="icon_themes_combobox">
<property name="visible">True</property>
</widget>
<packing>