pool/gnome-control-center
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-control-center?expand=0&rev=9

Browse Source
This commit is contained in:
OBS User unknown 2008-08-18 23:31:00 +00:00 committed by Git OBS Bridge
parent 7eb3663f61
commit 95ffa35949
3 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gnome-control-center-monitor-labeling.diff
View File

@ -1,5 +1,5 @@
diff --git a/capplets/display/xrandr-capplet.c b/capplets/display/xrandr-capplet.c diff --git a/capplets/display/xrandr-capplet.c b/capplets/display/xrandr-capplet.c
index 23d3c5d..faa75a7 100644 index c6d1237..91d4d2e 100644
--- a/capplets/display/xrandr-capplet.c --- a/capplets/display/xrandr-capplet.c
+++ b/capplets/display/xrandr-capplet.c +++ b/capplets/display/xrandr-capplet.c
@@ -28,6 +28,7 @@ @@ -28,6 +28,7 @@
@ -10,14 +10,17 @@ index 23d3c5d..faa75a7 100644
#include <gdk/gdkx.h> #include <gdk/gdkx.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <glib/gi18n.h> #include <glib/gi18n.h>
@@ -40,6 +41,7 @@ struct App @@ -40,8 +41,9 @@ struct App
{ {
GnomeRRScreen *screen; GnomeRRScreen *screen;
GnomeRRConfig *current_configuration; GnomeRRConfig *current_configuration;
+ GnomeRRLabeler *labeler; + GnomeRRLabeler *labeler;
GnomeOutputInfo *current_output; GnomeOutputInfo *current_output;
-
+
GtkWidget *dialog; GtkWidget *dialog;
GtkListStore *resolution_store;
GtkWidget *resolution_combo;
@@ -139,6 +141,13 @@ on_screen_changed (GnomeRRScreen *scr, @@ -139,6 +141,13 @@ on_screen_changed (GnomeRRScreen *scr,
qsort (app->current_configuration->outputs, i, sizeof (GnomeOutputInfo *), qsort (app->current_configuration->outputs, i, sizeof (GnomeOutputInfo *),
compare_outputs); compare_outputs);
@ -32,7 +35,7 @@ index 23d3c5d..faa75a7 100644
#if 0 #if 0
for (i = 0; app->current_configuration->outputs[i] != NULL; ++i) for (i = 0; app->current_configuration->outputs[i] != NULL; ++i)
{ {
@@ -1351,6 +1360,8 @@ paint_output (App *app, cairo_t *cr, int i) @@ -1351,9 +1360,11 @@ paint_output (App *app, cairo_t *cr, int i)
PangoRectangle extent; PangoRectangle extent;
GdkRectangle viewport; GdkRectangle viewport;
double angle; double angle;
@ -40,15 +43,22 @@ index 23d3c5d..faa75a7 100644
+ double r, g, b; + double r, g, b;
cairo_save (cr); cairo_save (cr);
-
+
foo_scroll_area_get_viewport (FOO_SCROLL_AREA (app->area), &viewport);
get_geometry (output, &w, &h);
@@ -1419,12 +1430,22 @@ paint_output (App *app, cairo_t *cr, int i)
@@ -1420,10 +1431,20 @@ paint_output (App *app, cairo_t *cr, int i)
cairo_rectangle (cr, x, y, w * scale + 0.5, h * scale + 0.5); cairo_rectangle (cr, x, y, w * scale + 0.5, h * scale + 0.5);
cairo_clip_preserve (cr); cairo_clip_preserve (cr);
-
- if (output->on) - if (output->on)
- cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, 1.0); - cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, 1.0);
- else - else
- cairo_set_source_rgba (cr, 0.2, 0.2, 0.2, 1.0); - cairo_set_source_rgba (cr, 0.2, 0.2, 0.2, 1.0);
-
+
+ gnome_rr_labeler_get_color_for_output (app->labeler, output, &output_color); + gnome_rr_labeler_get_color_for_output (app->labeler, output, &output_color);
+ r = output_color.red / 65535.0; + r = output_color.red / 65535.0;
+ g = output_color.green / 65535.0; + g = output_color.green / 65535.0;
@ -63,6 +73,7 @@ index 23d3c5d..faa75a7 100644
+ } + }
+ +
+ cairo_set_source_rgba (cr, r, g, b, 1.0); + cairo_set_source_rgba (cr, r, g, b, 1.0);
+
foo_scroll_area_add_input_from_fill (FOO_SCROLL_AREA (app->area), foo_scroll_area_add_input_from_fill (FOO_SCROLL_AREA (app->area),
cr, on_output_event, output); cr, on_output_event, output);
cairo_fill (cr);

5
gnome-control-center.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Aug 19 00:28:33 CEST 2008 - federico@novell.com
- Updated gnome-control-center-monitor-labeling.diff so that it applies cleanly.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Aug 15 18:26:15 CEST 2008 - federico@novell.com Fri Aug 15 18:26:15 CEST 2008 - federico@novell.com

4
gnome-control-center.spec
View File

@ -26,7 +26,7 @@ Group: System/GUI/GNOME
Obsoletes: fontilus themus acme Obsoletes: fontilus themus acme
Provides: fontilus themus acme Provides: fontilus themus acme
Version: 2.23.6 Version: 2.23.6
Release: 2 Release: 3
Summary: The GNOME Control Center Summary: The GNOME Control Center
Source: gnome-%{_name}-%{version}.tar.bz2 Source: gnome-%{_name}-%{version}.tar.bz2
Source1: control-center-art.tar.bz2 Source1: control-center-art.tar.bz2
@ -234,6 +234,8 @@ fi
%{_libdir}/pkgconfig/*.pc %{_libdir}/pkgconfig/*.pc
%changelog %changelog
* Tue Aug 19 2008 federico@novell.com
- Updated gnome-control-center-monitor-labeling.diff so that it applies cleanly.
* Fri Aug 15 2008 federico@novell.com * Fri Aug 15 2008 federico@novell.com
- Added gnome-control-center-monitor-labeling.diff to implement - Added gnome-control-center-monitor-labeling.diff to implement
labeling of physical monitors while their properties are being set labeling of physical monitors while their properties are being set