[gnome-screensaver] Add control center extension panel
- From: William Jon McCann <mccann src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-screensaver] Add control center extension panel
- Date: Thu, 25 Feb 2010 12:23:26 +0000 (UTC)
commit 9c201069a316e7610eab55681d3a5a153333c68a
Author: William Jon McCann <jmccann redhat com>
Date: Sun Jan 31 21:55:43 2010 -0500
Add control center extension panel
configure.ac | 12 +
data/gnome-screensaver-preferences.ui | 420 +++------
src/Makefile.am | 78 +-
src/cc-screensaver-page.c | 1679 +++++++++++++++++++++++++++++++++
src/cc-screensaver-page.h | 55 ++
src/cc-screensaver-panel.c | 144 +++
src/cc-screensaver-panel.h | 54 ++
src/screensaver-module.c | 42 +
8 files changed, 2170 insertions(+), 314 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 17af53b..fbe5a04 100644
--- a/configure.ac
+++ b/configure.ac
@@ -172,6 +172,18 @@ PKG_CHECK_MODULES(LIB_GNOME_MENU,
AC_SUBST(LIB_GNOME_MENU_CFLAGS)
AC_SUBST(LIB_GNOME_MENU_LIBS)
+dnl ================================================================
+dnl Control Center Extension
+dnl ================================================================
+
+PKG_CHECK_MODULES(CC_EXTENSION, libgnome-control-center-extension)
+
+CC_EXTENSION_LIBTOOL_FLAGS="-export_dynamic -avoid-version -module -no-undefined -export-symbols-regex '^g_io_module_(load|unload)'"
+AC_SUBST(CC_EXTENSION_LIBTOOL_FLAGS)
+
+CCEXTENSIONSDIR="${libdir}/control-center-1/extensions"
+AC_SUBST(CCEXTENSIONSDIR)
+
dnl ---------------------------------------------------------------------------
dnl - Where should we put documentation ?
dnl ---------------------------------------------------------------------------
diff --git a/data/gnome-screensaver-preferences.ui b/data/gnome-screensaver-preferences.ui
index cfa6ccd..7708276 100644
--- a/data/gnome-screensaver-preferences.ui
+++ b/data/gnome-screensaver-preferences.ui
@@ -1,438 +1,339 @@
<?xml version="1.0"?>
-<!--*- mode: xml -*-->
<interface>
+ <!-- interface-requires gtk+ 2.12 -->
+ <!-- interface-naming-policy toplevel-contextual -->
<object class="GtkImage" id="preview_image">
<property name="stock">gtk-fullscreen</property>
- <property name="icon_size">4</property>
</object>
<object class="GtkImage" id="power_image">
<property name="stock">gtk-jump-to</property>
- <property name="icon_size">4</property>
</object>
<object class="GtkAdjustment" id="adjustment1">
- <property name="upper">120</property>
+ <property name="value">10</property>
<property name="lower">1</property>
- <property name="page_increment">10</property>
+ <property name="upper">120</property>
<property name="step_increment">1</property>
- <property name="page_size">0</property>
- <property name="value">10</property>
+ <property name="page_increment">10</property>
</object>
<object class="GtkDialog" id="prefs_dialog">
<property name="border_width">5</property>
- <property name="visible">True</property>
<property name="title" translatable="yes">Screensaver Preferences</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</property>
<property name="default_width">600</property>
<property name="default_height">400</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="focus_on_map">True</property>
- <property name="urgency_hint">False</property>
+ <property name="type_hint">dialog</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox1">
- <property name="orientation">vertical</property>
<property name="visible">True</property>
- <property name="homogeneous">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">2</property>
- <child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area1">
- <property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
- <child>
- <object class="GtkButton" id="helpbutton1">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-help</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- </object>
- </child>
- <child>
- <object class="GtkButton" id="gpm_button">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="image">power_image</property>
- <property name="label" translatable="yes">Power _Management</property>
- <property name="use_underline">True</property>
- </object>
- </child>
- <child>
- <object class="GtkButton" id="button1">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-close</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
<child>
- <object class="GtkVBox" id="vbox1">
- <property name="orientation">vertical</property>
- <property name="border_width">5</property>
+ <object class="GtkVBox" id="screensaver_vbox">
<property name="visible">True</property>
- <property name="homogeneous">False</property>
+ <property name="border_width">5</property>
+ <property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkHBox" id="hbox1">
<property name="visible">True</property>
- <property name="homogeneous">False</property>
<property name="spacing">12</property>
<child>
<object class="GtkVBox" id="vbox8">
- <property name="orientation">vertical</property>
<property name="visible">True</property>
- <property name="homogeneous">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="savers_label">
<property name="visible">True</property>
+ <property name="xalign">0</property>
<property name="label" translatable="yes">_Screensaver theme:</property>
- <property name="use_underline">True</property>
<property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
+ <property name="use_underline">True</property>
</object>
<packing>
- <property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox6">
<property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
<child>
<object class="GtkTable" id="table1">
<property name="visible">True</property>
<property name="n_rows">2</property>
<property name="n_columns">2</property>
- <property name="homogeneous">False</property>
- <property name="row_spacing">6</property>
<property name="column_spacing">6</property>
+ <property name="row_spacing">6</property>
<child>
<object class="GtkScrolledWindow" id="themes_scrolled_window">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+ <property name="hscrollbar_policy">never</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="savers_treeview">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="headers_visible">False</property>
- <property name="rules_hint">False</property>
- <property name="reorderable">False</property>
- <property name="enable_search">True</property>
- <property name="fixed_height_mode">False</property>
- <property name="hover_selection">False</property>
- <property name="hover_expand">False</property>
<accessibility>
- <relation target="savers_treeview" type="label-for"/>
+ <relation type="label-for" target="savers_treeview"/>
</accessibility>
</object>
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_options">fill</property>
+ <property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
- <object class="GtkDrawingArea" id="preview_area">
- </object>
+ <object class="GtkDrawingArea" id="preview_area"/>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">0</property>
<property name="bottom_attach">2</property>
</packing>
</child>
<child>
<object class="GtkHButtonBox" id="hbuttonbox1">
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_START</property>
- <property name="spacing">0</property>
+ <property name="layout_style">start</property>
<child>
<object class="GtkButton" id="preview_button">
+ <property name="label" translatable="yes">_Preview</property>
<property name="visible">True</property>
- <property name="can_default">True</property>
<property name="can_focus">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
<property name="image">preview_image</property>
- <property name="label" translatable="yes">_Preview</property>
<property name="use_underline">True</property>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_options">fill</property>
- <property name="y_options">fill</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
</object>
<packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
<packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
<packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox2">
<property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
<child>
<object class="GtkVBox" id="vbox5">
- <property name="orientation">vertical</property>
<property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkHBox" id="hbox3">
<property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
<child>
<object class="GtkVBox" id="vbox6">
- <property name="orientation">vertical</property>
<property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkVBox" id="vbox3">
- <property name="orientation">vertical</property>
<property name="visible">True</property>
- <property name="homogeneous">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkHBox" id="activate_delay_hbox">
<property name="visible">True</property>
- <property name="homogeneous">False</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="activate_delay_label">
<property name="visible">True</property>
<property name="label" translatable="yes">Regard the computer as _idle after:</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>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
</object>
<packing>
- <property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox4">
<property name="visible">True</property>
- <property name="homogeneous">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkHScale" id="activate_delay_hscale">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="draw_value">True</property>
- <property name="value_pos">GTK_POS_TOP</property>
- <property name="digits">0</property>
- <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
- <property name="inverted">False</property>
<property name="adjustment">adjustment1</property>
+ <property name="digits">0</property>
</object>
<packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
<packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
- <property name="padding">0</property>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="enable_checkbox">
+ <property name="label" translatable="yes">_Activate screensaver when computer is idle</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">_Activate screensaver when computer is idle</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
</object>
<packing>
- <property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="lock_checkbox">
+ <property name="label" translatable="yes">_Lock screen when screensaver is active</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">_Lock screen when screensaver is active</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
</object>
<packing>
- <property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="root_warning_label">
+ <property name="xalign">0</property>
<property name="label" translatable="yes"><b>Warning: the screen will not be locked for the root user.</b></property>
- <property name="use_underline">False</property>
<property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">True</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
</object>
<packing>
- <property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">3</property>
</packing>
</child>
</object>
<packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
<packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
<packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
<packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
<packing>
- <property name="padding">0</property>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area1">
+ <property name="visible">True</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="helpbutton1">
+ <property name="label">gtk-help</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="gpm_button">
+ <property name="label" translatable="yes">Power _Management</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="image">power_image</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button1">
+ <property name="label">gtk-close</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
<packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
@@ -447,161 +348,108 @@
<property name="can_focus">True</property>
<property name="has_focus">True</property>
<property name="title" translatable="yes">Screensaver Preview</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_CENTER</property>
<property name="modal">True</property>
- <property name="resizable">True</property>
+ <property name="window_position">center</property>
<property name="destroy_with_parent">True</property>
- <property name="decorated">False</property>
<property name="skip_taskbar_hint">True</property>
<property name="skip_pager_hint">True</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="focus_on_map">True</property>
- <property name="urgency_hint">False</property>
+ <property name="decorated">False</property>
<child>
<object class="GtkVBox" id="vbox10">
- <property name="orientation">vertical</property>
<property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkHBox" id="hbox9">
<property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
<child>
<object class="GtkImage" id="image2">
<property name="visible">True</property>
- <property name="stock">gtk-dialog-warning</property>
- <property name="icon_size">4</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
<property name="xpad">10</property>
- <property name="ypad">0</property>
+ <property name="stock">gtk-dialog-warning</property>
</object>
<packing>
- <property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label15">
<property name="visible">True</property>
+ <property name="xalign">0</property>
<property name="label" translatable="yes"><b>Screensaver preview</b></property>
- <property name="use_underline">False</property>
<property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_FILL</property>
+ <property name="justify">fill</property>
<property name="wrap">True</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
</object>
<packing>
- <property name="padding">0</property>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="fullscreen_preview_theme_label">
<property name="visible">True</property>
- <property name="label" translatable="yes"/>
- <property name="use_underline">False</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>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
</object>
<packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkButton" id="fullscreen_preview_previous_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>
+ <property name="receives_default">False</property>
<child>
<object class="GtkImage" id="image5">
<property name="visible">True</property>
<property name="stock">gtk-go-back</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>
</object>
</child>
</object>
<packing>
- <property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
<object class="GtkButton" id="fullscreen_preview_next_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>
+ <property name="receives_default">False</property>
<child>
<object class="GtkImage" id="image4">
<property name="visible">True</property>
<property name="stock">gtk-go-forward</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>
</object>
</child>
</object>
<packing>
- <property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">4</property>
</packing>
</child>
<child>
<object class="GtkButton" id="fullscreen_preview_close">
+ <property name="label">gtk-leave-fullscreen</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label">gtk-leave-fullscreen</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
</object>
<packing>
- <property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">5</property>
</packing>
</child>
</object>
<packing>
- <property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -609,9 +457,7 @@
<property name="visible">True</property>
</object>
<packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
diff --git a/src/Makefile.am b/src/Makefile.am
index 290aac1..6e0fd8a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -51,6 +51,14 @@ noinst_PROGRAMS = \
test-window \
$(NULL)
+noinst_LTLIBRARIES = \
+ libscreensaver-settings-common.la \
+ libscreensaver-common.la \
+ $(NULL)
+
+ccmodulesdir = $(CCEXTENSIONSDIR)
+ccmodules_LTLIBRARIES = libgnome-screensaver.la
+
desktopdir = $(sysconfdir)/xdg/autostart
desktop_in_files = gnome-screensaver.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@@ -73,11 +81,10 @@ test_fade_SOURCES = \
test-fade.c \
gs-fade.c \
gs-fade.h \
- gs-debug.c \
- gs-debug.h \
$(NULL)
test_fade_LDADD = \
+ libscreensaver-common.la \
$(GNOME_SCREENSAVER_LIBS) \
$(SAVER_LIBS) \
$(NULL)
@@ -87,11 +94,10 @@ test_passwd_SOURCES = \
$(AUTH_SOURCES) \
setuid.c \
setuid.h \
- subprocs.c \
- subprocs.h \
$(NULL)
test_passwd_LDADD = \
+ libscreensaver-common.la \
$(GNOME_SCREENSAVER_DIALOG_LIBS)\
$(AUTH_LIBS) \
$(NULL)
@@ -102,11 +108,10 @@ test_watcher_SOURCES = \
gs-watcher-x11.c \
gs-marshal.c \
gs-marshal.h \
- gs-debug.c \
- gs-debug.h \
$(NULL)
test_watcher_LDADD = \
+ libscreensaver-common.la \
$(GNOME_SCREENSAVER_LIBS) \
$(SAVER_LIBS) \
$(NULL)
@@ -119,13 +124,10 @@ test_window_SOURCES = \
gs-grab.h \
gs-marshal.c \
gs-marshal.h \
- gs-debug.c \
- gs-debug.h \
- subprocs.c \
- subprocs.h \
$(NULL)
test_window_LDADD = \
+ libscreensaver-common.la \
$(GNOME_SCREENSAVER_LIBS) \
$(SAVER_LIBS) \
$(NULL)
@@ -134,12 +136,8 @@ gnome_screensaver_dialog_SOURCES = \
gnome-screensaver-dialog.c \
gs-lock-plug.c \
gs-lock-plug.h \
- gs-debug.c \
- gs-debug.h \
setuid.c \
setuid.h \
- subprocs.c \
- subprocs.h \
$(AUTH_SOURCES) \
$(NULL)
@@ -150,6 +148,7 @@ EXTRA_gnome_screensaver_dialog_SOURCES = \
$(NULL)
gnome_screensaver_dialog_LDADD = \
+ libscreensaver-common.la \
$(GNOME_SCREENSAVER_DIALOG_LIBS)\
$(SAVER_LIBS) \
$(AUTH_LIBS) \
@@ -184,14 +183,6 @@ gnome_screensaver_SOURCES = \
gs-window.h \
gs-prefs.c \
gs-prefs.h \
- gs-theme-manager.c \
- gs-theme-manager.h \
- gs-job.c \
- gs-job.h \
- gs-debug.c \
- gs-debug.h \
- subprocs.c \
- subprocs.h \
gs-grab-x11.c \
gs-grab.h \
gs-fade.c \
@@ -211,16 +202,14 @@ gnome_screensaver_gl_helper_SOURCES = \
$(NULL)
gnome_screensaver_LDADD = \
+ libscreensaver-common.la \
$(GNOME_SCREENSAVER_LIBS) \
$(SAVER_LIBS) \
$(NULL)
gnome_screensaver_LDFLAGS = -export-dynamic
-gnome_screensaver_preferences_SOURCES = \
- gnome-screensaver-preferences.c \
- copy-theme-dialog.c \
- copy-theme-dialog.h \
+libscreensaver_common_la_SOURCES = \
gs-theme-manager.c \
gs-theme-manager.h \
gs-job.c \
@@ -231,7 +220,42 @@ gnome_screensaver_preferences_SOURCES = \
subprocs.h \
$(NULL)
-gnome_screensaver_preferences_LDADD = \
+libscreensaver_settings_common_la_SOURCES = \
+ copy-theme-dialog.c \
+ copy-theme-dialog.h \
+ $(NULL)
+
+libgnome_screensaver_la_SOURCES = \
+ screensaver-module.c \
+ cc-screensaver-panel.c \
+ cc-screensaver-panel.h \
+ cc-screensaver-page.c \
+ cc-screensaver-page.h \
+ $(NULL)
+
+libgnome_screensaver_la_LDFLAGS = \
+ $(CC_EXTENSION_LIBTOOL_FLAGS) \
+ $(NULL)
+
+libgnome_screensaver_la_LIBADD = \
+ libscreensaver-settings-common.la \
+ libscreensaver-common.la \
+ $(CC_EXTENSION_LIBS) \
+ $(NULL)
+
+libgnome_screensaver_la_CFLAGS = \
+ $(CC_EXTENSION_CFLAGS) \
+ $(NULL)
+
+libgnome_screensaver_la_LIBTOOLFLAGS = --tag=disable-static
+
+gnome_screensaver_preferences_SOURCES = \
+ gnome-screensaver-preferences.c \
+ $(NULL)
+
+gnome_screensaver_preferences_LDADD = \
+ libscreensaver-settings-common.la \
+ libscreensaver-common.la \
$(GNOME_SCREENSAVER_CAPPLET_LIBS) \
$(NULL)
diff --git a/src/cc-screensaver-page.c b/src/cc-screensaver-page.c
new file mode 100644
index 0000000..04d8b0c
--- /dev/null
+++ b/src/cc-screensaver-page.c
@@ -0,0 +1,1679 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2010 Red Hat, Inc.
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+#include "config.h"
+
+#define _GNU_SOURCE /* for getresuid */
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/types.h> /* For uid_t, gid_t */
+
+#include <gtk/gtk.h>
+#include <gdk/gdkx.h>
+#include <gio/gio.h>
+#include <glib/gi18n-lib.h>
+#include <gconf/gconf-client.h>
+
+#include "copy-theme-dialog.h"
+#include "gs-theme-manager.h"
+#include "gs-job.h"
+#include "gs-prefs.h" /* for GS_MODE enum */
+
+#include "cc-screensaver-page.h"
+
+#define CC_SCREENSAVER_PAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CC_TYPE_SCREENSAVER_PAGE, CcScreensaverPagePrivate))
+
+#define WID(s) GTK_WIDGET (gtk_builder_get_object (builder, s))
+
+#define GTK_BUILDER_FILE GTKBUILDERDIR "/gnome-screensaver-preferences.ui"
+
+#define GNOME_LOCKDOWN_DIR "/desktop/gnome/lockdown"
+#define KEY_LOCK_DISABLE GNOME_LOCKDOWN_DIR "/disable_lock_screen"
+
+#define KEY_DIR "/apps/gnome-screensaver"
+#define GNOME_SESSION_DIR "/desktop/gnome/session"
+#define KEY_LOCK KEY_DIR "/lock_enabled"
+#define KEY_IDLE_ACTIVATION_ENABLED KEY_DIR "/idle_activation_enabled"
+#define KEY_MODE KEY_DIR "/mode"
+#define KEY_ACTIVATE_DELAY GNOME_SESSION_DIR "/idle_delay"
+#define KEY_LOCK_DELAY KEY_DIR "/lock_delay"
+#define KEY_CYCLE_DELAY KEY_DIR "/cycle_delay"
+#define KEY_THEMES KEY_DIR "/themes"
+
+#define GPM_COMMAND "gnome-power-preferences"
+
+struct CcScreensaverPagePrivate
+{
+ GtkWidget *preview;
+ GtkWidget *fullscreen_preview;
+
+ GtkWidget *tree_view;
+ GtkWidget *list_scroller;
+ GtkWidget *activate_delay_hscale;
+ GtkWidget *activate_delay_hbox;
+ GtkWidget *label;
+ GtkWidget *enabled_checkbox;
+ GtkWidget *lock_checkbox;
+ GtkWidget *root_warning_label;
+ GtkWidget *preview_button;
+ GtkWidget *gpm_button;
+
+ GtkWidget *fullscreen_preview_window;
+ GtkWidget *fullscreen_preview_theme_label;
+ GtkWidget *fullscreen_preview_previous_button;
+ GtkWidget *fullscreen_preview_next_button;
+ GtkWidget *fullscreen_preview_area_button;
+ GtkWidget *fullscreen_preview_close_button;
+
+ guint load_model_id;
+ GSThemeManager *theme_manager;
+ GSJob *job;
+};
+
+enum {
+ PROP_0,
+};
+
+static void cc_screensaver_page_class_init (CcScreensaverPageClass *klass);
+static void cc_screensaver_page_init (CcScreensaverPage *screensaver_page);
+static void cc_screensaver_page_finalize (GObject *object);
+
+G_DEFINE_TYPE (CcScreensaverPage, cc_screensaver_page, CC_TYPE_PAGE)
+
+enum {
+ NAME_COLUMN = 0,
+ ID_COLUMN,
+ N_COLUMNS
+};
+
+static GConfEnumStringPair mode_enum_map [] = {
+ { GS_MODE_BLANK_ONLY, "blank-only" },
+ { GS_MODE_RANDOM, "random" },
+ { GS_MODE_SINGLE, "single" },
+ { 0, NULL }
+};
+
+/* Drag and drop info */
+enum {
+ TARGET_URI_LIST,
+ TARGET_NS_URL
+};
+
+static GtkTargetEntry drop_types [] =
+{
+ { "text/uri-list", 0, TARGET_URI_LIST },
+ { "_NETSCAPE_URL", 0, TARGET_NS_URL }
+};
+
+static gint32
+config_get_activate_delay (CcScreensaverPage *page,
+ gboolean *is_writable)
+{
+ GConfClient *client;
+ gint32 delay;
+
+ client = gconf_client_get_default ();
+
+ if (is_writable) {
+ *is_writable = gconf_client_key_is_writable (client,
+ KEY_ACTIVATE_DELAY,
+ NULL);
+ }
+
+ delay = gconf_client_get_int (client, KEY_ACTIVATE_DELAY, NULL);
+
+ if (delay < 1) {
+ delay = 1;
+ }
+
+ g_object_unref (client);
+
+ return delay;
+}
+
+static void
+config_set_activate_delay (CcScreensaverPage *page,
+ gint32 timeout)
+{
+ GConfClient *client;
+
+ client = gconf_client_get_default ();
+
+ gconf_client_set_int (client, KEY_ACTIVATE_DELAY, timeout, NULL);
+
+ g_object_unref (client);
+}
+
+static int
+config_get_mode (CcScreensaverPage *page,
+ gboolean *is_writable)
+{
+ GConfClient *client;
+ int mode;
+ char *string;
+
+ client = gconf_client_get_default ();
+
+ if (is_writable) {
+ *is_writable = gconf_client_key_is_writable (client,
+ KEY_MODE,
+ NULL);
+ }
+
+ string = gconf_client_get_string (client, KEY_MODE, NULL);
+ if (string) {
+ gconf_string_to_enum (mode_enum_map, string, &mode);
+ g_free (string);
+ } else {
+ mode = GS_MODE_BLANK_ONLY;
+ }
+
+ g_object_unref (client);
+
+ return mode;
+}
+
+static void
+config_set_mode (CcScreensaverPage *page,
+ int mode)
+{
+ GConfClient *client;
+ const char *mode_string;
+
+ client = gconf_client_get_default ();
+
+ mode_string = gconf_enum_to_string (mode_enum_map, mode);
+ gconf_client_set_string (client, KEY_MODE, mode_string, NULL);
+
+ g_object_unref (client);
+}
+
+static char *
+config_get_theme (CcScreensaverPage *page,
+ gboolean *is_writable)
+{
+ GConfClient *client;
+ char *name;
+ int mode;
+
+ client = gconf_client_get_default ();
+
+ if (is_writable) {
+ gboolean can_write_theme;
+ gboolean can_write_mode;
+
+ can_write_theme = gconf_client_key_is_writable (client,
+ KEY_THEMES,
+ NULL);
+ can_write_mode = gconf_client_key_is_writable (client,
+ KEY_MODE,
+ NULL);
+ *is_writable = can_write_theme && can_write_mode;
+ }
+
+ mode = config_get_mode (page, NULL);
+
+ name = NULL;
+ if (mode == GS_MODE_BLANK_ONLY) {
+ name = g_strdup ("__blank-only");
+ } else if (mode == GS_MODE_RANDOM) {
+ name = g_strdup ("__random");
+ } else {
+ GSList *list;
+ list = gconf_client_get_list (client,
+ KEY_THEMES,
+ GCONF_VALUE_STRING,
+ NULL);
+ if (list != NULL) {
+ name = g_strdup (list->data);
+ } else {
+ /* TODO: handle error */
+ /* default to blank */
+ name = g_strdup ("__blank-only");
+ }
+
+ g_slist_foreach (list, (GFunc)g_free, NULL);
+ g_slist_free (list);
+ }
+
+ g_object_unref (client);
+
+ return name;
+}
+
+static GSList *
+get_all_theme_ids (GSThemeManager *theme_manager)
+{
+ GSList *ids = NULL;
+ GSList *entries;
+ GSList *l;
+
+ entries = gs_theme_manager_get_info_list (theme_manager);
+ for (l = entries; l; l = l->next) {
+ GSThemeInfo *info = l->data;
+
+ ids = g_slist_prepend (ids, g_strdup (gs_theme_info_get_id (info)));
+ gs_theme_info_unref (info);
+ }
+ g_slist_free (entries);
+
+ return ids;
+}
+
+static void
+config_set_theme (CcScreensaverPage *page,
+ const char *theme_id)
+{
+ GConfClient *client;
+ GSList *list = NULL;
+ int mode;
+
+ client = gconf_client_get_default ();
+
+ if (theme_id && strcmp (theme_id, "__blank-only") == 0) {
+ mode = GS_MODE_BLANK_ONLY;
+ } else if (theme_id && strcmp (theme_id, "__random") == 0) {
+ mode = GS_MODE_RANDOM;
+
+ /* set the themes key to contain all available screensavers */
+ list = get_all_theme_ids (page->priv->theme_manager);
+ } else {
+ mode = GS_MODE_SINGLE;
+ list = g_slist_append (list, g_strdup (theme_id));
+ }
+
+ config_set_mode (page, mode);
+
+ gconf_client_set_list (client,
+ KEY_THEMES,
+ GCONF_VALUE_STRING,
+ list,
+ NULL);
+
+ g_slist_foreach (list, (GFunc) g_free, NULL);
+ g_slist_free (list);
+
+ g_object_unref (client);
+}
+
+static gboolean
+config_get_enabled (CcScreensaverPage *page,
+ gboolean *is_writable)
+{
+ int enabled;
+ GConfClient *client;
+
+ client = gconf_client_get_default ();
+
+ if (is_writable) {
+ *is_writable = gconf_client_key_is_writable (client,
+ KEY_LOCK,
+ NULL);
+ }
+
+ enabled = gconf_client_get_bool (client, KEY_IDLE_ACTIVATION_ENABLED, NULL);
+
+ g_object_unref (client);
+
+ return enabled;
+}
+
+static void
+config_set_enabled (CcScreensaverPage *page,
+ gboolean enabled)
+{
+ GConfClient *client;
+
+ client = gconf_client_get_default ();
+
+ gconf_client_set_bool (client, KEY_IDLE_ACTIVATION_ENABLED, enabled, NULL);
+
+ g_object_unref (client);
+}
+
+static gboolean
+config_get_lock (CcScreensaverPage *page,
+ gboolean *is_writable)
+{
+ GConfClient *client;
+ gboolean lock;
+
+ client = gconf_client_get_default ();
+
+ if (is_writable) {
+ *is_writable = gconf_client_key_is_writable (client,
+ KEY_LOCK,
+ NULL);
+ }
+
+ lock = gconf_client_get_bool (client, KEY_LOCK, NULL);
+
+ g_object_unref (client);
+
+ return lock;
+}
+
+static gboolean
+config_get_lock_disabled (CcScreensaverPage *page)
+{
+ GConfClient *client;
+ gboolean lock;
+
+ client = gconf_client_get_default ();
+
+ lock = gconf_client_get_bool (client, KEY_LOCK_DISABLE, NULL);
+
+ g_object_unref (client);
+ return lock;
+}
+
+static void
+config_set_lock (CcScreensaverPage *page,
+ gboolean lock)
+{
+ GConfClient *client;
+
+ client = gconf_client_get_default ();
+
+ gconf_client_set_bool (client, KEY_LOCK, lock, NULL);
+
+ g_object_unref (client);
+}
+
+static void
+preview_clear (CcScreensaverPage *page)
+{
+ GdkColor color = { 0, 0, 0 };
+
+ gtk_widget_modify_bg (page->priv->preview, GTK_STATE_NORMAL, &color);
+ gdk_window_clear (page->priv->preview->window);
+
+ gtk_widget_modify_bg (page->priv->fullscreen_preview, GTK_STATE_NORMAL, &color);
+ gdk_window_clear (page->priv->fullscreen_preview->window);
+}
+
+static void
+job_set_theme (CcScreensaverPage *page,
+ GSJob *job,
+ const char *theme)
+{
+ GSThemeInfo *info;
+ const char *command;
+
+ command = NULL;
+
+ info = gs_theme_manager_lookup_theme_info (page->priv->theme_manager, theme);
+ if (info != NULL) {
+ command = gs_theme_info_get_exec (info);
+ }
+
+ gs_job_set_command (job, command);
+
+ if (info != NULL) {
+ gs_theme_info_unref (info);
+ }
+}
+
+static void
+preview_set_theme (CcScreensaverPage *page,
+ const char *theme,
+ const char *name)
+{
+ char *markup;
+
+ if (page->priv->job != NULL) {
+ gs_job_stop (page->priv->job);
+ }
+
+ preview_clear (page);
+
+ markup = g_markup_printf_escaped ("<i>%s</i>", name);
+ gtk_label_set_markup (GTK_LABEL (page->priv->fullscreen_preview_theme_label),
+ markup);
+ g_free (markup);
+
+ if ((theme && strcmp (theme, "__blank-only") == 0)) {
+
+ } else if (theme && strcmp (theme, "__random") == 0) {
+ GSList *themes;
+
+ themes = get_all_theme_ids (page->priv->theme_manager);
+ if (themes != NULL) {
+ GSList *l;
+ gint32 i;
+
+ i = g_random_int_range (0, g_slist_length (themes));
+ l = g_slist_nth (themes, i);
+
+ job_set_theme (page, page->priv->job, (const char *) l->data);
+ g_slist_foreach (themes, (GFunc) g_free, NULL);
+ g_slist_free (themes);
+
+ gs_job_start (page->priv->job);
+ }
+ } else {
+ job_set_theme (page, page->priv->job, theme);
+ gs_job_start (page->priv->job);
+ }
+}
+
+static GSList *
+get_theme_info_list (CcScreensaverPage *page)
+{
+ return gs_theme_manager_get_info_list (page->priv->theme_manager);
+}
+
+static void
+populate_model (CcScreensaverPage *page)
+{
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+ GSList *themes;
+ GSList *l;
+
+ themes = NULL;
+
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (page->priv->tree_view));
+ gtk_tree_store_clear (GTK_TREE_STORE (model));
+
+ gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
+ gtk_tree_store_set (GTK_TREE_STORE (model),
+ &iter,
+ NAME_COLUMN, _("Blank screen"),
+ ID_COLUMN, "__blank-only",
+ -1);
+
+ gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
+ gtk_tree_store_set (GTK_TREE_STORE (model),
+ &iter,
+ NAME_COLUMN, _("Random"),
+ ID_COLUMN, "__random",
+ -1);
+
+ gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
+ gtk_tree_store_set (GTK_TREE_STORE (model),
+ &iter,
+ NAME_COLUMN, NULL,
+ ID_COLUMN, "__separator",
+ -1);
+
+ themes = get_theme_info_list (page);
+
+ if (themes == NULL) {
+ return;
+ }
+
+ for (l = themes; l; l = l->next) {
+ const char *name;
+ const char *id;
+ GSThemeInfo *info = l->data;
+
+ if (info == NULL) {
+ continue;
+ }
+
+ name = gs_theme_info_get_name (info);
+ id = gs_theme_info_get_id (info);
+
+ gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
+ gtk_tree_store_set (GTK_TREE_STORE (model),
+ &iter,
+ NAME_COLUMN, name,
+ ID_COLUMN, id,
+ -1);
+
+ gs_theme_info_unref (info);
+ }
+
+ g_slist_free (themes);
+}
+
+static void
+tree_selection_previous (GtkTreeSelection *selection)
+{
+ GtkTreeIter iter;
+ GtkTreeModel *model;
+ GtkTreePath *path;
+
+ if (! gtk_tree_selection_get_selected (selection, &model, &iter)) {
+ return;
+ }
+
+ path = gtk_tree_model_get_path (model, &iter);
+ if (gtk_tree_path_prev (path)) {
+ gtk_tree_selection_select_path (selection, path);
+ }
+}
+
+static void
+tree_selection_next (GtkTreeSelection *selection)
+{
+ GtkTreeIter iter;
+ GtkTreeModel *model;
+ GtkTreePath *path;
+
+ if (! gtk_tree_selection_get_selected (selection, &model, &iter)) {
+ return;
+ }
+
+ path = gtk_tree_model_get_path (model, &iter);
+ gtk_tree_path_next (path);
+ gtk_tree_selection_select_path (selection, path);
+}
+
+static void
+on_tree_selection_changed (GtkTreeSelection *selection,
+ CcScreensaverPage *page)
+{
+ GtkTreeIter iter;
+ GtkTreeModel *model;
+ char *theme;
+ char *name;
+
+ if (! gtk_tree_selection_get_selected (selection, &model, &iter)) {
+ return;
+ }
+
+ gtk_tree_model_get (model, &iter, ID_COLUMN, &theme, NAME_COLUMN, &name, -1);
+
+ if (theme == NULL) {
+ g_free (name);
+ return;
+ }
+
+ preview_set_theme (page, theme, name);
+ config_set_theme (page, theme);
+
+ g_free (theme);
+ g_free (name);
+}
+
+static void
+on_activate_delay_value_changed (GtkRange *range,
+ CcScreensaverPage *page)
+{
+ gdouble value;
+
+ value = gtk_range_get_value (range);
+ config_set_activate_delay (page, (gint32)value);
+}
+
+static int
+compare_theme_names (char *name_a,
+ char *name_b,
+ char *id_a,
+ char *id_b)
+{
+
+ if (id_a == NULL) {
+ return 1;
+ } else if (id_b == NULL) {
+ return -1;
+ }
+
+ if (strcmp (id_a, "__blank-only") == 0) {
+ return -1;
+ } else if (strcmp (id_b, "__blank-only") == 0) {
+ return 1;
+ } else if (strcmp (id_a, "__random") == 0) {
+ return -1;
+ } else if (strcmp (id_b, "__random") == 0) {
+ return 1;
+ } else if (strcmp (id_a, "__separator") == 0) {
+ return -1;
+ } else if (strcmp (id_b, "__separator") == 0) {
+ return 1;
+ }
+
+ if (name_a == NULL) {
+ return 1;
+ } else if (name_b == NULL) {
+ return -1;
+ }
+
+ return g_utf8_collate (name_a, name_b);
+}
+
+static int
+compare_theme (GtkTreeModel *model,
+ GtkTreeIter *a,
+ GtkTreeIter *b,
+ gpointer user_data)
+{
+ char *name_a;
+ char *name_b;
+ char *id_a;
+ char *id_b;
+ int result;
+
+ gtk_tree_model_get (model, a, NAME_COLUMN, &name_a, -1);
+ gtk_tree_model_get (model, b, NAME_COLUMN, &name_b, -1);
+ gtk_tree_model_get (model, a, ID_COLUMN, &id_a, -1);
+ gtk_tree_model_get (model, b, ID_COLUMN, &id_b, -1);
+
+ result = compare_theme_names (name_a, name_b, id_a, id_b);
+
+ g_free (name_a);
+ g_free (name_b);
+ g_free (id_a);
+ g_free (id_b);
+
+ return result;
+}
+
+static gboolean
+separator_func (GtkTreeModel *model,
+ GtkTreeIter *iter,
+ gpointer data)
+{
+ int column = GPOINTER_TO_INT (data);
+ char *text;
+
+ gtk_tree_model_get (model, iter, column, &text, -1);
+
+ if (text != NULL && strcmp (text, "__separator") == 0) {
+ return TRUE;
+ }
+
+ g_free (text);
+
+ return FALSE;
+}
+
+static void
+setup_treeview (CcScreensaverPage *page)
+{
+ GtkTreeStore *store;
+ GtkTreeViewColumn *column;
+ GtkCellRenderer *renderer;
+ GtkTreeSelection *select;
+
+ store = gtk_tree_store_new (N_COLUMNS,
+ G_TYPE_STRING,
+ G_TYPE_STRING);
+
+ gtk_tree_view_set_model (GTK_TREE_VIEW (page->priv->tree_view),
+ GTK_TREE_MODEL (store));
+
+ g_object_unref (store);
+
+#if GTK_CHECK_VERSION(2,10,0)
+ g_object_set (page->priv->tree_view, "show-expanders", FALSE, NULL);
+#endif
+
+ renderer = gtk_cell_renderer_text_new ();
+ column = gtk_tree_view_column_new_with_attributes ("Name", renderer,
+ "text", NAME_COLUMN,
+ NULL);
+ gtk_tree_view_append_column (GTK_TREE_VIEW (page->priv->tree_view), column);
+
+ gtk_tree_view_column_set_sort_column_id (column, NAME_COLUMN);
+ gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (store),
+ NAME_COLUMN,
+ compare_theme,
+ NULL, NULL);
+ gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (store),
+ NAME_COLUMN,
+ GTK_SORT_ASCENDING);
+
+ gtk_tree_view_set_row_separator_func (GTK_TREE_VIEW (page->priv->tree_view),
+ separator_func,
+ GINT_TO_POINTER (ID_COLUMN),
+ NULL);
+
+ select = gtk_tree_view_get_selection (GTK_TREE_VIEW (page->priv->tree_view));
+ gtk_tree_selection_set_mode (select, GTK_SELECTION_SINGLE);
+ g_signal_connect (G_OBJECT (select),
+ "changed",
+ G_CALLBACK (on_tree_selection_changed),
+ page);
+
+}
+
+static void
+setup_treeview_selection (CcScreensaverPage *page)
+{
+ char *theme;
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+ GtkTreePath *path = NULL;
+ gboolean is_writable;
+
+ theme = config_get_theme (page, &is_writable);
+
+ if (! is_writable) {
+ gtk_widget_set_sensitive (page->priv->tree_view, FALSE);
+ }
+
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (page->priv->tree_view));
+
+ if (theme && gtk_tree_model_get_iter_first (model, &iter)) {
+
+ do {
+ char *id;
+ gboolean found;
+
+ gtk_tree_model_get (model, &iter,
+ ID_COLUMN, &id, -1);
+ found = (id && strcmp (id, theme) == 0);
+ g_free (id);
+
+ if (found) {
+ path = gtk_tree_model_get_path (model, &iter);
+ break;
+ }
+
+ } while (gtk_tree_model_iter_next (model, &iter));
+ }
+
+ if (path) {
+ gtk_tree_view_set_cursor (GTK_TREE_VIEW (page->priv->tree_view),
+ path,
+ NULL,
+ FALSE);
+
+ gtk_tree_path_free (path);
+ }
+
+ g_free (theme);
+}
+
+static void
+reload_themes (CcScreensaverPage *page)
+{
+ populate_model (page);
+}
+
+static void
+on_theme_copy_complete (GtkWidget *dialog,
+ CcScreensaverPage *page)
+{
+ reload_themes (page);
+ gtk_widget_destroy (dialog);
+}
+
+static void
+theme_installer_run (CcScreensaverPage *page,
+ GList *files)
+{
+ GtkWidget *dialog;
+ GtkWidget *toplevel;
+
+ toplevel = gtk_widget_get_toplevel (GTK_WIDGET (page));
+ if (!GTK_WIDGET_TOPLEVEL (toplevel)) {
+ toplevel = NULL;
+ }
+
+ dialog = copy_theme_dialog_new (files);
+ g_list_foreach (files, (GFunc) (g_object_unref), NULL);
+ g_list_free (files);
+
+ gtk_window_set_transient_for (GTK_WINDOW (dialog),
+ GTK_WINDOW (toplevel));
+ gtk_window_set_icon_name (GTK_WINDOW (dialog),
+ "preferences-desktop-screensaver");
+
+ g_signal_connect (dialog,
+ "complete",
+ G_CALLBACK (on_theme_copy_complete),
+ page);
+
+ copy_theme_dialog_begin (COPY_THEME_DIALOG (dialog));
+}
+
+/* Callback issued during drag movements */
+static gboolean
+on_drag_motion (GtkWidget *widget,
+ GdkDragContext *context,
+ int x,
+ int y,
+ guint time,
+ CcScreensaverPage *page)
+{
+ return FALSE;
+}
+
+/* Callback issued during drag leaves */
+static void
+on_drag_leave (GtkWidget *widget,
+ GdkDragContext *context,
+ guint time,
+ CcScreensaverPage *page)
+{
+ gtk_widget_queue_draw (widget);
+}
+
+/* GIO has no version of gnome_vfs_uri_list_parse(), so copy from GnomeVFS
+ * and re-work to create GFiles.
+**/
+static GList *
+uri_list_parse (const char *uri_list)
+{
+ const gchar *p, *q;
+ gchar *retval;
+ GFile *file;
+ GList *result = NULL;
+
+ g_return_val_if_fail (uri_list != NULL, NULL);
+
+ p = uri_list;
+
+ /* We don't actually try to validate the URI according to RFC
+ * 2396, or even check for allowed characters - we just ignore
+ * comments and trim whitespace off the ends. We also
+ * allow LF delimination as well as the specified CRLF.
+ */
+ while (p != NULL) {
+ if (*p != '#') {
+ while (g_ascii_isspace (*p))
+ p++;
+
+ q = p;
+ while ((*q != '\0')
+ && (*q != '\n')
+ && (*q != '\r'))
+ q++;
+
+ if (q > p) {
+ q--;
+ while (q > p
+ && g_ascii_isspace (*q))
+ q--;
+
+ retval = g_malloc (q - p + 2);
+ strncpy (retval, p, q - p + 1);
+ retval[q - p + 1] = '\0';
+
+ file = g_file_new_for_uri (retval);
+
+ g_free (retval);
+
+ if (file != NULL)
+ result = g_list_prepend (result, file);
+ }
+ }
+ p = strchr (p, '\n');
+ if (p != NULL)
+ p++;
+ }
+
+ return g_list_reverse (result);
+}
+
+/* Callback issued on actual drops. Attempts to load the file dropped. */
+static void
+on_drag_data_received (GtkWidget *widget,
+ GdkDragContext *context,
+ int x,
+ int y,
+ GtkSelectionData *selection_data,
+ guint info,
+ guint time,
+ CcScreensaverPage *page)
+{
+ GList *files;
+
+ if (!(info == TARGET_URI_LIST || info == TARGET_NS_URL))
+ return;
+
+ files = uri_list_parse ((char *) selection_data->data);
+ if (files != NULL) {
+ theme_installer_run (page, files);
+ }
+}
+
+/* Adapted from totem_time_to_string_text */
+static char *
+time_to_string_text (long time)
+{
+ char *secs, *mins, *hours, *string;
+ int sec, min, hour;
+
+ sec = time % 60;
+ time = time - sec;
+ min = (time % (60 * 60)) / 60;
+ time = time - (min * 60);
+ hour = time / (60 * 60);
+
+ hours = g_strdup_printf (ngettext ("%d hour",
+ "%d hours", hour), hour);
+
+ mins = g_strdup_printf (ngettext ("%d minute",
+ "%d minutes", min), min);
+
+ secs = g_strdup_printf (ngettext ("%d second",
+ "%d seconds", sec), sec);
+
+ if (hour > 0) {
+ if (sec > 0) {
+ /* hour:minutes:seconds */
+ string = g_strdup_printf (_("%s %s %s"), hours, mins, secs);
+ } else if (min > 0) {
+ /* hour:minutes */
+ string = g_strdup_printf (_("%s %s"), hours, mins);
+ } else {
+ /* hour */
+ string = g_strdup_printf (_("%s"), hours);
+ }
+ } else if (min > 0) {
+ if (sec > 0) {
+ /* minutes:seconds */
+ string = g_strdup_printf (_("%s %s"), mins, secs);
+ } else {
+ /* minutes */
+ string = g_strdup_printf (_("%s"), mins);
+ }
+ } else {
+ /* seconds */
+ string = g_strdup_printf (_("%s"), secs);
+ }
+
+ g_free (hours);
+ g_free (mins);
+ g_free (secs);
+
+ return string;
+}
+
+static char *
+on_delay_format_value (GtkScale *scale,
+ gdouble value,
+ CcScreensaverPage *page)
+{
+ if (value == 0)
+ return g_strdup_printf (_("Never"));
+
+ return time_to_string_text (value * 60.0);
+}
+
+static void
+on_lock_checkbox_toggled (GtkToggleButton *button,
+ CcScreensaverPage *page)
+{
+ config_set_lock (page, gtk_toggle_button_get_active (button));
+}
+
+static void
+on_enabled_checkbox_toggled (GtkToggleButton *button,
+ CcScreensaverPage *page)
+{
+ config_set_enabled (page, gtk_toggle_button_get_active (button));
+}
+
+static void
+invalid_type_warning (const char *type)
+{
+ g_warning ("Error retrieving configuration key '%s': Invalid type",
+ type);
+}
+
+static void
+ui_disable_lock (CcScreensaverPage *page,
+ gboolean disable)
+{
+ gtk_widget_set_sensitive (page->priv->lock_checkbox, !disable);
+ if (disable) {
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (page->priv->lock_checkbox), FALSE);
+ }
+}
+
+static void
+ui_set_lock (CcScreensaverPage *page,
+ gboolean enabled)
+{
+ gboolean active;
+ gboolean lock_disabled;
+
+ active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (page->priv->lock_checkbox));
+ if (active != enabled) {
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (page->priv->lock_checkbox), enabled);
+ }
+ lock_disabled = config_get_lock_disabled (page);
+ ui_disable_lock (page, lock_disabled);
+}
+
+static void
+ui_set_enabled (CcScreensaverPage *page,
+ gboolean enabled)
+{
+ gboolean active;
+ gboolean is_writable;
+ gboolean lock_disabled;
+
+ active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (page->priv->enabled_checkbox));
+ if (active != enabled) {
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (page->priv->enabled_checkbox), enabled);
+ }
+
+ config_get_lock (page, &is_writable);
+ if (is_writable) {
+ gtk_widget_set_sensitive (page->priv->lock_checkbox, enabled);
+ }
+ lock_disabled = config_get_lock_disabled (page);
+ ui_disable_lock (page, lock_disabled);
+}
+
+static void
+ui_set_delay (CcScreensaverPage *page,
+ int delay)
+{
+ gtk_range_set_value (GTK_RANGE (page->priv->activate_delay_hscale), delay);
+}
+
+static void
+on_key_changed (GConfClient *client,
+ guint cnxn_id,
+ GConfEntry *entry,
+ CcScreensaverPage *page)
+{
+ const char *key;
+ GConfValue *value;
+
+ key = gconf_entry_get_key (entry);
+
+ if (! g_str_has_prefix (key, KEY_DIR)
+ && ! g_str_has_prefix (key, GNOME_LOCKDOWN_DIR)) {
+ return;
+ }
+
+ value = gconf_entry_get_value (entry);
+
+ if (strcmp (key, KEY_IDLE_ACTIVATION_ENABLED) == 0) {
+ if (value->type == GCONF_VALUE_BOOL) {
+ gboolean enabled;
+
+ enabled = gconf_value_get_bool (value);
+
+ ui_set_enabled (page, enabled);
+ } else {
+ invalid_type_warning (key);
+ }
+ } else if (strcmp (key, KEY_LOCK) == 0) {
+ if (value->type == GCONF_VALUE_BOOL) {
+ gboolean enabled;
+
+ enabled = gconf_value_get_bool (value);
+
+ ui_set_lock (page, enabled);
+ } else {
+ invalid_type_warning (key);
+ }
+ } else if (strcmp (key, KEY_LOCK_DISABLE) == 0) {
+ if (value->type == GCONF_VALUE_BOOL) {
+ gboolean disabled;
+
+ disabled = gconf_value_get_bool (value);
+
+ ui_disable_lock (page, disabled);
+ } else {
+ invalid_type_warning (key);
+ }
+ } else if (strcmp (key, KEY_THEMES) == 0) {
+ if (value->type == GCONF_VALUE_LIST) {
+ setup_treeview_selection (page);
+ } else {
+ invalid_type_warning (key);
+ }
+ } else if (strcmp (key, KEY_ACTIVATE_DELAY) == 0) {
+
+ if (value->type == GCONF_VALUE_INT) {
+ int delay;
+
+ delay = gconf_value_get_int (value);
+ ui_set_delay (page, delay);
+ } else {
+ invalid_type_warning (key);
+ }
+
+ } else {
+ /*g_warning ("Config key not handled: %s", key);*/
+ }
+}
+
+static void
+on_fullscreen_preview_previous_clicked (GtkWidget *button,
+ CcScreensaverPage *page)
+{
+ GtkTreeSelection *selection;
+
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (page->priv->tree_view));
+ tree_selection_previous (selection);
+}
+
+static void
+on_fullscreen_preview_next_clicked (GtkWidget *button,
+ CcScreensaverPage *page)
+{
+ GtkTreeSelection *selection;
+
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (page->priv->tree_view));
+ tree_selection_next (selection);
+}
+
+static void
+on_fullscreen_preview_close_clicked (GtkWidget *button,
+ CcScreensaverPage *page)
+{
+ GtkWidget *toplevel;
+
+ toplevel = gtk_widget_get_toplevel (GTK_WIDGET (page));
+ if (!GTK_WIDGET_TOPLEVEL (toplevel)) {
+ toplevel = NULL;
+ }
+
+ gs_job_set_widget (page->priv->job, page->priv->preview);
+
+ preview_clear (page);
+
+ gtk_widget_hide (page->priv->fullscreen_preview_window);
+
+ gtk_widget_show (toplevel);
+ gtk_window_present (GTK_WINDOW (toplevel));
+}
+
+static void
+on_fullscreen_preview_button_clicked (GtkWidget *button,
+ CcScreensaverPage *page)
+{
+ GtkWidget *toplevel;
+
+ toplevel = gtk_widget_get_toplevel (GTK_WIDGET (page));
+ if (!GTK_WIDGET_TOPLEVEL (toplevel)) {
+ toplevel = NULL;
+ }
+ gtk_widget_hide (toplevel);
+
+ gtk_window_fullscreen (GTK_WINDOW (page->priv->fullscreen_preview_window));
+ gtk_window_set_keep_above (GTK_WINDOW (page->priv->fullscreen_preview_window), TRUE);
+
+ gtk_widget_show (page->priv->fullscreen_preview_window);
+ gtk_widget_grab_focus (page->priv->fullscreen_preview_window);
+
+ preview_clear (page);
+ gs_job_set_widget (page->priv->job, page->priv->fullscreen_preview);
+}
+
+static void
+constrain_list_size (GtkWidget *widget,
+ GtkRequisition *requisition,
+ GtkWidget *to_size)
+{
+ GtkRequisition req;
+ int max_height;
+
+ /* constrain height to be the tree height up to a max */
+ max_height = (gdk_screen_get_height (gtk_widget_get_screen (widget))) / 4;
+
+ gtk_widget_size_request (to_size, &req);
+
+ requisition->height = MIN (req.height, max_height);
+}
+
+static void
+setup_list_size_constraint (GtkWidget *widget,
+ GtkWidget *to_size)
+{
+ g_signal_connect (widget,
+ "size-request",
+ G_CALLBACK (constrain_list_size),
+ to_size);
+}
+
+static gboolean
+check_is_root_user (void)
+{
+#ifndef G_OS_WIN32
+ uid_t ruid, euid, suid; /* Real, effective and saved user ID's */
+ gid_t rgid, egid, sgid; /* Real, effective and saved group ID's */
+
+#ifdef HAVE_GETRESUID
+ if (getresuid (&ruid, &euid, &suid) != 0 ||
+ getresgid (&rgid, &egid, &sgid) != 0)
+#endif /* HAVE_GETRESUID */
+ {
+ suid = ruid = getuid ();
+ sgid = rgid = getgid ();
+ euid = geteuid ();
+ egid = getegid ();
+ }
+
+ if (ruid == 0) {
+ return TRUE;
+ }
+
+#endif
+ return FALSE;
+}
+
+static void
+setup_for_root_user (CcScreensaverPage *page)
+{
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (page->priv->lock_checkbox), FALSE);
+ gtk_widget_set_sensitive (page->priv->lock_checkbox, FALSE);
+
+ gtk_widget_show (page->priv->root_warning_label);
+}
+
+static GdkVisual *
+get_best_visual (void)
+{
+ char *command;
+ char *std_output;
+ int exit_status;
+ GError *error;
+ unsigned long v;
+ char c;
+ GdkVisual *visual;
+ gboolean res;
+
+ visual = NULL;
+
+ command = g_build_filename (LIBEXECDIR, "gnome-screensaver-gl-helper", NULL);
+
+ error = NULL;
+ res = g_spawn_command_line_sync (command,
+ &std_output,
+ NULL,
+ &exit_status,
+ &error);
+
+ if (! res) {
+ g_debug ("Could not run command '%s': %s", command, error->message);
+ g_error_free (error);
+ goto out;
+ }
+
+ if (1 == sscanf (std_output, "0x%lx %c", &v, &c)) {
+ if (v != 0) {
+ VisualID visual_id;
+
+ visual_id = (VisualID) v;
+ visual = gdkx_visual_get (visual_id);
+
+ g_debug ("Found best visual for GL: 0x%x",
+ (unsigned int) visual_id);
+ }
+ }
+
+ out:
+ g_free (std_output);
+ g_free (command);
+
+ return visual;
+}
+
+static GdkColormap *
+get_best_colormap_for_screen (GdkScreen *screen)
+{
+ GdkColormap *colormap;
+ GdkVisual *visual;
+
+ g_return_val_if_fail (screen != NULL, NULL);
+
+ visual = get_best_visual ();
+
+ colormap = NULL;
+ if (visual != NULL) {
+ colormap = gdk_colormap_new (visual, FALSE);
+ }
+
+ return colormap;
+}
+
+static void
+widget_set_best_colormap (GtkWidget *widget)
+{
+ GdkColormap *colormap;
+
+ g_return_if_fail (widget != NULL);
+
+ colormap = get_best_colormap_for_screen (gtk_widget_get_screen (widget));
+ if (colormap != NULL) {
+ gtk_widget_set_colormap (widget, colormap);
+ g_object_unref (colormap);
+ }
+}
+
+static gboolean
+load_model_idle (CcScreensaverPage *page)
+{
+ populate_model (page);
+ setup_treeview_selection (page);
+
+ return FALSE;
+}
+
+static gboolean
+is_program_in_path (const char *program)
+{
+ char *tmp = g_find_program_in_path (program);
+ if (tmp != NULL) {
+ g_free (tmp);
+ return TRUE;
+ } else {
+ return FALSE;
+ }
+}
+
+static void
+setup_page (CcScreensaverPage *page)
+{
+ GtkBuilder *builder;
+ GtkWidget *widget;
+ GtkWidget *label;
+ GConfClient *client;
+ GError *error;
+ char *string;
+ gdouble activate_delay;
+ gboolean enabled;
+ gboolean is_writable;
+
+ builder = gtk_builder_new ();
+
+ error = NULL;
+ gtk_builder_add_from_file (builder, GTK_BUILDER_FILE, &error);
+ if (error != NULL) {
+ g_error (_("Could not load user interface file: %s"),
+ error->message);
+ g_error_free (error);
+ return;
+ }
+
+ page->priv->preview = WID ("preview_area");
+ page->priv->tree_view = WID ("savers_treeview");
+ page->priv->list_scroller = WID ("themes_scrolled_window");
+ page->priv->activate_delay_hscale = WID ("activate_delay_hscale");
+ page->priv->activate_delay_hbox = WID ("activate_delay_hbox");
+ page->priv->enabled_checkbox = WID ("enable_checkbox");
+ page->priv->lock_checkbox = WID ("lock_checkbox");
+ page->priv->root_warning_label = WID ("root_warning_label");
+ page->priv->preview_button = WID ("preview_button");
+ page->priv->fullscreen_preview_window = WID ("fullscreen_preview_window");
+ page->priv->fullscreen_preview = WID ("fullscreen_preview_area");
+ page->priv->fullscreen_preview_theme_label = WID ("fullscreen_preview_theme_label");
+ page->priv->fullscreen_preview_close_button = WID ("fullscreen_preview_close");
+ page->priv->fullscreen_preview_previous_button = WID ("fullscreen_preview_previous_button");
+ page->priv->fullscreen_preview_next_button = WID ("fullscreen_preview_next_button");
+ label = WID ("activate_delay_label");
+ gtk_label_set_mnemonic_widget (GTK_LABEL (label), page->priv->activate_delay_hscale);
+ label = WID ("savers_label");
+ gtk_label_set_mnemonic_widget (GTK_LABEL (label), page->priv->tree_view);
+
+ gtk_widget_set_no_show_all (page->priv->root_warning_label, TRUE);
+ widget_set_best_colormap (page->priv->preview);
+
+#if 0
+ page->priv->gpm_button = NULL;
+ if (! is_program_in_path (GPM_COMMAND)) {
+ gtk_widget_set_no_show_all (page->priv->gpm_button, TRUE);
+ gtk_widget_hide (page->priv->gpm_button);
+ }
+#endif
+
+ activate_delay = config_get_activate_delay (page, &is_writable);
+ ui_set_delay (page, activate_delay);
+ if (! is_writable) {
+ gtk_widget_set_sensitive (page->priv->activate_delay_hbox, FALSE);
+ }
+ g_signal_connect (page->priv->activate_delay_hscale,
+ "format-value",
+ G_CALLBACK (on_delay_format_value),
+ page);
+
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (page->priv->lock_checkbox),
+ config_get_lock (page, &is_writable));
+ if (! is_writable) {
+ gtk_widget_set_sensitive (page->priv->lock_checkbox, FALSE);
+ }
+ g_signal_connect (page->priv->lock_checkbox,
+ "toggled",
+ G_CALLBACK (on_lock_checkbox_toggled),
+ page);
+
+ enabled = config_get_enabled (page, &is_writable);
+ ui_set_enabled (page, enabled);
+ if (! is_writable) {
+ gtk_widget_set_sensitive (page->priv->enabled_checkbox, FALSE);
+ }
+ g_signal_connect (page->priv->enabled_checkbox,
+ "toggled",
+ G_CALLBACK (on_enabled_checkbox_toggled),
+ page);
+
+ setup_list_size_constraint (page->priv->list_scroller, page->priv->tree_view);
+ gtk_widget_set_size_request (page->priv->preview, 480, 300);
+
+ gtk_drag_dest_set (GTK_WIDGET (page),
+ GTK_DEST_DEFAULT_ALL,
+ drop_types,
+ G_N_ELEMENTS (drop_types),
+ GDK_ACTION_COPY | GDK_ACTION_LINK | GDK_ACTION_MOVE);
+
+ g_signal_connect (page,
+ "drag-motion",
+ G_CALLBACK (on_drag_motion),
+ page);
+ g_signal_connect (page,
+ "drag-leave",
+ G_CALLBACK (on_drag_leave),
+ page);
+ g_signal_connect (page,
+ "drag-data-received",
+ G_CALLBACK (on_drag_data_received),
+ page);
+
+ /* Update list of themes if using random screensaver */
+ client = gconf_client_get_default ();
+ string = gconf_client_get_string (client, KEY_MODE, NULL);
+ if (string != NULL) {
+ int mode;
+ GSList *list;
+
+ gconf_string_to_enum (mode_enum_map, string, &mode);
+ g_free (string);
+
+ if (mode == GS_MODE_RANDOM) {
+ list = get_all_theme_ids (page->priv->theme_manager);
+ gconf_client_set_list (client, KEY_THEMES, GCONF_VALUE_STRING, list, NULL);
+
+ g_slist_foreach (list, (GFunc) g_free, NULL);
+ g_slist_free (list);
+ }
+ }
+
+ gconf_client_add_dir (client,
+ KEY_DIR,
+ GCONF_CLIENT_PRELOAD_ONELEVEL,
+ NULL);
+ gconf_client_notify_add (client,
+ KEY_DIR,
+ (GConfClientNotifyFunc) on_key_changed,
+ page,
+ NULL, NULL);
+ gconf_client_add_dir (client,
+ GNOME_LOCKDOWN_DIR,
+ GCONF_CLIENT_PRELOAD_ONELEVEL,
+ NULL);
+ gconf_client_notify_add (client,
+ GNOME_LOCKDOWN_DIR,
+ (GConfClientNotifyFunc) on_key_changed,
+ page,
+ NULL, NULL);
+
+ gs_job_set_widget (page->priv->job, page->priv->preview);
+
+ if (check_is_root_user ()) {
+ setup_for_root_user (page);
+ }
+
+ g_signal_connect (page->priv->activate_delay_hscale,
+ "value-changed",
+ G_CALLBACK (on_activate_delay_value_changed),
+ page);
+
+ g_signal_connect (page->priv->preview_button,
+ "clicked",
+ G_CALLBACK (on_fullscreen_preview_button_clicked),
+ page);
+
+ g_signal_connect (page->priv->fullscreen_preview_close_button,
+ "clicked",
+ G_CALLBACK (on_fullscreen_preview_close_clicked),
+ page);
+ g_signal_connect (page->priv->fullscreen_preview_previous_button,
+ "clicked",
+ G_CALLBACK (on_fullscreen_preview_previous_clicked),
+ page);
+ g_signal_connect (page->priv->fullscreen_preview_next_button,
+ "clicked",
+ G_CALLBACK (on_fullscreen_preview_next_clicked),
+ page);
+
+ setup_treeview (page);
+
+ widget = WID ("screensaver_vbox");
+ gtk_widget_reparent (widget, GTK_WIDGET (page));
+ gtk_widget_show (widget);
+
+ g_object_unref (builder);
+ g_object_unref (client);
+}
+
+static GObject *
+cc_screensaver_page_constructor (GType type,
+ guint n_construct_properties,
+ GObjectConstructParam *construct_properties)
+{
+ CcScreensaverPage *screensaver_page;
+
+ screensaver_page = CC_SCREENSAVER_PAGE (G_OBJECT_CLASS (cc_screensaver_page_parent_class)->constructor (type,
+ n_construct_properties,
+ construct_properties));
+
+ g_object_set (screensaver_page,
+ "display-name", _("Screensaver"),
+ "id", "general",
+ NULL);
+
+ setup_page (screensaver_page);
+
+ return G_OBJECT (screensaver_page);
+}
+
+static void
+start_working (CcScreensaverPage *page)
+{
+ static gboolean once = FALSE;
+
+ if (!once) {
+ if (page->priv->load_model_id == 0) {
+ page->priv->load_model_id = g_idle_add ((GSourceFunc)load_model_idle, page);
+ }
+ once = TRUE;
+ }
+
+ if (page->priv->job != NULL) {
+ gs_job_suspend (page->priv->job, FALSE);
+ }
+}
+
+static void
+stop_working (CcScreensaverPage *page)
+{
+ if (page->priv->job != NULL) {
+ gs_job_suspend (page->priv->job, TRUE);
+ }
+}
+
+static void
+cc_screensaver_page_active_changed (CcPage *base_page,
+ gboolean is_active)
+{
+ CcScreensaverPage *page = CC_SCREENSAVER_PAGE (base_page);
+
+ if (is_active) {
+ start_working (page);
+ } else {
+ stop_working (page);
+ }
+
+ CC_PAGE_CLASS (cc_screensaver_page_parent_class)->active_changed (base_page, is_active);
+}
+
+static void
+cc_screensaver_page_class_init (CcScreensaverPageClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ CcPageClass *page_class = CC_PAGE_CLASS (klass);
+
+ page_class->active_changed = cc_screensaver_page_active_changed;
+
+ object_class->constructor = cc_screensaver_page_constructor;
+ object_class->finalize = cc_screensaver_page_finalize;
+
+ g_type_class_add_private (klass, sizeof (CcScreensaverPagePrivate));
+}
+
+static void
+cc_screensaver_page_init (CcScreensaverPage *page)
+{
+ page->priv = CC_SCREENSAVER_PAGE_GET_PRIVATE (page);
+
+ page->priv->job = gs_job_new ();
+ page->priv->theme_manager = gs_theme_manager_new ();
+}
+
+static void
+cc_screensaver_page_finalize (GObject *object)
+{
+ CcScreensaverPage *page;
+
+ g_return_if_fail (object != NULL);
+ g_return_if_fail (CC_IS_SCREENSAVER_PAGE (object));
+
+ page = CC_SCREENSAVER_PAGE (object);
+
+ g_return_if_fail (page->priv != NULL);
+
+ if (page->priv->load_model_id == 0) {
+ g_source_remove (page->priv->load_model_id);
+ }
+
+ if (page->priv->theme_manager != NULL) {
+ g_object_unref (page->priv->theme_manager);
+ }
+
+ if (page->priv->job != NULL) {
+ g_object_unref (page->priv->job);
+ }
+
+ G_OBJECT_CLASS (cc_screensaver_page_parent_class)->finalize (object);
+}
+
+CcPage *
+cc_screensaver_page_new (void)
+{
+ GObject *object;
+
+ object = g_object_new (CC_TYPE_SCREENSAVER_PAGE, NULL);
+
+ return CC_PAGE (object);
+}
diff --git a/src/cc-screensaver-page.h b/src/cc-screensaver-page.h
new file mode 100644
index 0000000..faa503c
--- /dev/null
+++ b/src/cc-screensaver-page.h
@@ -0,0 +1,55 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2010 Red Hat, Inc.
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+#ifndef __CC_SCREENSAVER_PAGE_H
+#define __CC_SCREENSAVER_PAGE_H
+
+#include <gtk/gtk.h>
+#include <libgnome-control-center-extension/cc-page.h>
+
+G_BEGIN_DECLS
+
+#define CC_TYPE_SCREENSAVER_PAGE (cc_screensaver_page_get_type ())
+#define CC_SCREENSAVER_PAGE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), CC_TYPE_SCREENSAVER_PAGE, CcScreensaverPage))
+#define CC_SCREENSAVER_PAGE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), CC_TYPE_SCREENSAVER_PAGE, CcScreensaverPageClass))
+#define CC_IS_SCREENSAVER_PAGE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), CC_TYPE_SCREENSAVER_PAGE))
+#define CC_IS_SCREENSAVER_PAGE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), CC_TYPE_SCREENSAVER_PAGE))
+#define CC_SCREENSAVER_PAGE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), CC_TYPE_SCREENSAVER_PAGE, CcScreensaverPageClass))
+
+typedef struct CcScreensaverPagePrivate CcScreensaverPagePrivate;
+
+typedef struct
+{
+ CcPage parent;
+ CcScreensaverPagePrivate *priv;
+} CcScreensaverPage;
+
+typedef struct
+{
+ CcPageClass parent_class;
+} CcScreensaverPageClass;
+
+GType cc_screensaver_page_get_type (void);
+
+CcPage * cc_screensaver_page_new (void);
+
+G_END_DECLS
+
+#endif /* __CC_SCREENSAVER_PAGE_H */
diff --git a/src/cc-screensaver-panel.c b/src/cc-screensaver-panel.c
new file mode 100644
index 0000000..f769ae4
--- /dev/null
+++ b/src/cc-screensaver-panel.c
@@ -0,0 +1,144 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2010 Red Hat, Inc.
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+
+#include <gtk/gtk.h>
+#include <gio/gio.h>
+#include <glib/gi18n-lib.h>
+
+#include "cc-screensaver-panel.h"
+#include "cc-screensaver-page.h"
+
+#define CC_SCREENSAVER_PANEL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CC_TYPE_SCREENSAVER_PANEL, CcScreensaverPanelPrivate))
+
+struct CcScreensaverPanelPrivate
+{
+ GtkWidget *notebook;
+ CcPage *screensaver_page;
+};
+
+enum {
+ PROP_0,
+};
+
+static void cc_screensaver_panel_class_init (CcScreensaverPanelClass *klass);
+static void cc_screensaver_panel_init (CcScreensaverPanel *screensaver_panel);
+static void cc_screensaver_panel_finalize (GObject *object);
+
+G_DEFINE_DYNAMIC_TYPE (CcScreensaverPanel, cc_screensaver_panel, CC_TYPE_PANEL)
+
+static void
+setup_panel (CcScreensaverPanel *panel)
+{
+ GtkWidget *label;
+ char *display_name;
+
+ panel->priv->notebook = gtk_notebook_new ();
+ gtk_container_add (GTK_CONTAINER (panel), panel->priv->notebook);
+ gtk_widget_show (panel->priv->notebook);
+
+ panel->priv->screensaver_page = cc_screensaver_page_new ();
+ g_object_get (panel->priv->screensaver_page,
+ "display-name", &display_name,
+ NULL);
+ label = gtk_label_new (display_name);
+ g_free (display_name);
+ gtk_notebook_append_page (GTK_NOTEBOOK (panel->priv->notebook),
+ GTK_WIDGET (panel->priv->screensaver_page),
+ label);
+ gtk_widget_show (GTK_WIDGET (panel->priv->screensaver_page));
+
+ gtk_notebook_set_show_tabs (GTK_NOTEBOOK (panel->priv->notebook),
+ FALSE);
+ g_object_set (panel,
+ "current-page", panel->priv->screensaver_page,
+ NULL);
+}
+
+static GObject *
+cc_screensaver_panel_constructor (GType type,
+ guint n_construct_properties,
+ GObjectConstructParam *construct_properties)
+{
+ CcScreensaverPanel *screensaver_panel;
+
+ screensaver_panel = CC_SCREENSAVER_PANEL (G_OBJECT_CLASS (cc_screensaver_panel_parent_class)->constructor (type,
+ n_construct_properties,
+ construct_properties));
+ g_object_set (screensaver_panel,
+ "display-name", _("Screensaver"),
+ "id", "gnome-screensaver-preferences.desktop",
+ NULL);
+
+ setup_panel (screensaver_panel);
+
+ return G_OBJECT (screensaver_panel);
+}
+
+static void
+cc_screensaver_panel_class_init (CcScreensaverPanelClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+ object_class->constructor = cc_screensaver_panel_constructor;
+ object_class->finalize = cc_screensaver_panel_finalize;
+
+ g_type_class_add_private (klass, sizeof (CcScreensaverPanelPrivate));
+}
+
+static void
+cc_screensaver_panel_class_finalize (CcScreensaverPanelClass *klass)
+{
+}
+
+static void
+cc_screensaver_panel_init (CcScreensaverPanel *panel)
+{
+ panel->priv = CC_SCREENSAVER_PANEL_GET_PRIVATE (panel);
+}
+
+static void
+cc_screensaver_panel_finalize (GObject *object)
+{
+ CcScreensaverPanel *screensaver_panel;
+
+ g_return_if_fail (object != NULL);
+ g_return_if_fail (CC_IS_SCREENSAVER_PANEL (object));
+
+ screensaver_panel = CC_SCREENSAVER_PANEL (object);
+
+ g_return_if_fail (screensaver_panel->priv != NULL);
+
+ G_OBJECT_CLASS (cc_screensaver_panel_parent_class)->finalize (object);
+}
+
+void
+cc_screensaver_panel_register (GIOModule *module)
+{
+ cc_screensaver_panel_register_type (G_TYPE_MODULE (module));
+ g_io_extension_point_implement (CC_PANEL_EXTENSION_POINT_NAME,
+ CC_TYPE_SCREENSAVER_PANEL,
+ "screensaver",
+ 10);
+}
diff --git a/src/cc-screensaver-panel.h b/src/cc-screensaver-panel.h
new file mode 100644
index 0000000..73e4897
--- /dev/null
+++ b/src/cc-screensaver-panel.h
@@ -0,0 +1,54 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2010 Red Hat, Inc.
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+#ifndef __CC_SCREENSAVER_PANEL_H
+#define __CC_SCREENSAVER_PANEL_H
+
+#include <gtk/gtk.h>
+#include <libgnome-control-center-extension/cc-panel.h>
+
+G_BEGIN_DECLS
+
+#define CC_TYPE_SCREENSAVER_PANEL (cc_screensaver_panel_get_type ())
+#define CC_SCREENSAVER_PANEL(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), CC_TYPE_SCREENSAVER_PANEL, CcScreensaverPanel))
+#define CC_SCREENSAVER_PANEL_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), CC_TYPE_SCREENSAVER_PANEL, CcScreensaverPanelClass))
+#define CC_IS_SCREENSAVER_PANEL(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), CC_TYPE_SCREENSAVER_PANEL))
+#define CC_IS_SCREENSAVER_PANEL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), CC_TYPE_SCREENSAVER_PANEL))
+#define CC_SCREENSAVER_PANEL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), CC_TYPE_SCREENSAVER_PANEL, CcScreensaverPanelClass))
+
+typedef struct CcScreensaverPanelPrivate CcScreensaverPanelPrivate;
+
+typedef struct
+{
+ CcPanel parent;
+ CcScreensaverPanelPrivate *priv;
+} CcScreensaverPanel;
+
+typedef struct
+{
+ CcPanelClass parent_class;
+} CcScreensaverPanelClass;
+
+GType cc_screensaver_panel_get_type (void);
+void cc_screensaver_panel_register (GIOModule *module);
+
+G_END_DECLS
+
+#endif /* __CC_SCREENSAVER_PANEL_H */
diff --git a/src/screensaver-module.c b/src/screensaver-module.c
new file mode 100644
index 0000000..fef2a0f
--- /dev/null
+++ b/src/screensaver-module.c
@@ -0,0 +1,42 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2010 Red Hat, Inc.
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+#include <config.h>
+
+#include <glib.h>
+#include <glib/gi18n-lib.h>
+#include <gmodule.h>
+#include <gio/gio.h>
+
+#include <cc-screensaver-panel.h>
+
+void
+g_io_module_load (GIOModule *module)
+{
+ bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+
+ cc_screensaver_panel_register (module);
+}
+
+void
+g_io_module_unload (GIOModule *module)
+{
+}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
