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

remove accidentally committed (and broken) desktop effects changes

Browse source 
svn path=/trunk/; revision=8641
This commit is contained in:
Jens Granseuer 2008-04-08 18:56:46 +00:00
parent 5a99e085c1
commit bdf68d23a0
6 changed files with 1080 additions and 1079 deletions
Download patch file Download diff file Expand all files Collapse all files

2
capplets/appearance/Makefile.am
View file

@ -9,8 +9,6 @@ gnome_appearance_properties_SOURCES = \
appearance.h \ appearance.h \
appearance-desktop.c \ appearance-desktop.c \
appearance-desktop.h \ appearance-desktop.h \
appearance-desktop-effects.c \
appearance-desktop-effects.h \
appearance-font.c \ appearance-font.c \
appearance-font.h \ appearance-font.h \
appearance-main.c \ appearance-main.c \

137
capplets/appearance/appearance-desktop-effects.c
View file

@ -1,137 +0,0 @@
/*
* Copyright (C) 2007 The GNOME Foundation
* Written by Rodrigo Moya <rodrigo@gnome-db.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 "appearance.h"
#include "wm-common.h"
#include <string.h>
#include <glib/gi18n.h>
static void
display_error (const gchar *message)
{
GtkWidget *dialog;
dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_OK,
message);
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
}
static void
set_busy (GtkWidget *widget, gboolean busy)
{
GdkCursor *cursor;
if (busy)
cursor = gdk_cursor_new (GDK_WATCH);
else
cursor = NULL;
gdk_window_set_cursor (widget->window, cursor);
if (cursor)
gdk_cursor_unref (cursor);
gdk_flush ();
}
static void
enable_desktop_effects_cb (GtkToggleButton *toggle_button, AppearanceData *data)
{
GError *error = NULL;
gboolean toggled = gtk_toggle_button_get_active (toggle_button);
const gchar *cmd_line = toggled ? "compiz --replace ccp" : "metacity --replace";
if (!g_spawn_command_line_async (cmd_line, &error)) {
display_error (error->message);
g_error_free (error);
gtk_toggle_button_set_active (toggle_button, !toggled);
} else {
gchar *wm_name = wm_common_get_current_window_manager ();
/* disable customize button for metacity */
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->enable_effects_button))
&& !strcmp (wm_name, "compiz"))
gtk_widget_show (data->customize_effects_button);
else
gtk_widget_hide (data->customize_effects_button);
g_free (wm_name);
}
}
static void
customize_desktop_effects_cb (GtkButton *button, AppearanceData *data)
{
GError *error = NULL;
gchar *wm_name;
wm_name = wm_common_get_current_window_manager ();
if (!strcmp (wm_name, "compiz")) {
if (!g_spawn_command_line_async ("ccsm", &error)) {
display_error (error->message);
g_error_free (error);
}
}
g_free (wm_name);
}
static void
window_manager_changed_cb (gpointer wm_name, AppearanceData *data)
{
}
void
desktop_effects_init (AppearanceData *data)
{
gchar *wm_name;
wm_common_register_window_manager_change ((GFunc) window_manager_changed_cb, data);
wm_name = wm_common_get_current_window_manager ();
/* initialize widgets */
data->enable_effects_button = glade_xml_get_widget (data->xml, "enable_desktop_effects");
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->enable_effects_button),
gtk_widget_is_composited (data->enable_effects_button));
g_signal_connect (G_OBJECT (data->enable_effects_button), "toggled",
(GCallback) enable_desktop_effects_cb, data);
data->customize_effects_button = glade_xml_get_widget (data->xml, "customize_desktop_effects");
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->enable_effects_button))
&& !strcmp (wm_name, "compiz"))
gtk_widget_show (data->customize_effects_button);
else
gtk_widget_hide (data->customize_effects_button);
g_signal_connect (G_OBJECT (data->customize_effects_button), "clicked",
(GCallback) customize_desktop_effects_cb, data);
g_free (wm_name);
}
void
desktop_effects_shutdown (AppearanceData *data)
{
}

22
capplets/appearance/appearance-desktop-effects.h
View file

@ -1,22 +0,0 @@
/*
* Copyright (C) 2008 The GNOME Foundation
* Written by Rodrigo Moya <rodrigo@gnome-db.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 desktop_effects_init (AppearanceData *data);
void desktop_effects_shutdown (AppearanceData *data);

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

@ -20,10 +20,9 @@
#include "appearance.h" #include "appearance.h"
#include "appearance-desktop.h" #include "appearance-desktop.h"
#include "appearance-desktop-effects.h"
#include "appearance-font.h" #include "appearance-font.h"
#include "appearance-style.h"
#include "appearance-themes.h" #include "appearance-themes.h"
#include "appearance-style.h"
#include "appearance-ui.h" #include "appearance-ui.h"
#include "theme-installer.h" #include "theme-installer.h"
#include "theme-thumbnail.h" #include "theme-thumbnail.h"
@ -80,7 +79,6 @@ main_window_response (GtkWidget *widget,
themes_shutdown (data); themes_shutdown (data);
style_shutdown (data); style_shutdown (data);
desktop_effects_shutdown (data);
desktop_shutdown (data); desktop_shutdown (data);
font_shutdown (data); font_shutdown (data);
@ -153,7 +151,6 @@ main (int argc, char **argv)
themes_init (data); themes_init (data);
style_init (data); style_init (data);
desktop_init (data, (const gchar **) wallpaper_files); desktop_init (data, (const gchar **) wallpaper_files);
desktop_effects_init (data);
g_strfreev (wallpaper_files); g_strfreev (wallpaper_files);
font_init (data); font_init (data);
ui_init (data); ui_init (data);

4
capplets/appearance/appearance.h
View file

@ -48,10 +48,6 @@ typedef struct {
GtkWidget *wp_image; GtkWidget *wp_image;
GSList *wp_uris; GSList *wp_uris;
/* desktop effects */
GtkWidget *enable_effects_button;
GtkWidget *customize_effects_button;
/* font */ /* font */
GtkWidget *font_details; GtkWidget *font_details;
GSList *font_groups; GSList *font_groups;

1989
capplets/appearance/data/appearance.glade
View file

File diff suppressed because it is too large Load diff