rpms/gnome-panel/F-12 panel-padding.patch, NONE, 1.1 gnome-panel.spec, 1.373, 1.374 redhat-panel-default-setup.entries, 1.18, 1.19
Matthias Clasen
mclasen at fedoraproject.org
Thu Oct 15 05:32:41 UTC 2009
- Previous message (by thread): rpms/kdevplatform/devel kdevplatform.spec,1.4,1.5
- Next message (by thread): rpms/rubygem-extlib/devel import.log, NONE, 1.1 rubygem-extlib.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mclasen
Update of /cvs/pkgs/rpms/gnome-panel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23175
Modified Files:
gnome-panel.spec redhat-panel-default-setup.entries
Added Files:
panel-padding.patch
Log Message:
panel setup tweaks
panel-padding.patch:
panel-profile.c | 3 +++
panel-profile.h | 5 ++++-
panel-toplevel.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
panel-toplevel.h | 3 +++
panel-toplevel.schemas.in | 13 +++++++++++++
panel-widget.c | 39 +++++++++++++++++++++++++++------------
6 files changed, 94 insertions(+), 13 deletions(-)
--- NEW FILE panel-padding.patch ---
diff -u -r gnome-panel-2.28.0/gnome-panel/panel-profile.c hacked/gnome-panel/panel-profile.c
--- gnome-panel-2.28.0/gnome-panel/panel-profile.c 2009-09-21 12:29:33.000000000 -0400
+++ hacked/gnome-panel/panel-profile.c 2009-10-15 00:41:56.366647539 -0400
@@ -638,6 +638,7 @@
TOPLEVEL_GET_SET_FUNCS ("size", toplevel, int, size, int)
TOPLEVEL_GET_SET_FUNCS ("expand", toplevel, bool, expand, gboolean)
+TOPLEVEL_GET_SET_FUNCS ("padding", toplevel, int, padding, int)
TOPLEVEL_GET_SET_FUNCS ("auto_hide", toplevel, bool, auto_hide, gboolean)
TOPLEVEL_GET_SET_FUNCS ("enable_buttons", toplevel, bool, enable_buttons, gboolean)
TOPLEVEL_GET_SET_FUNCS ("enable_arrows", toplevel, bool, enable_arrows, gboolean)
@@ -1185,6 +1186,7 @@
else UPDATE_INT ("monitor", monitor)
else UPDATE_STRING ("name", name)
else UPDATE_BOOL ("expand", expand)
+ else UPDATE_INT ("padding", padding)
else UPDATE_STRING ("orientation", orientation)
else UPDATE_INT ("size", size)
else UPDATE_POS ("x", x, x_right)
@@ -1706,6 +1708,7 @@
GET_STRING ("name", name);
GET_INT ("monitor", monitor);
GET_BOOL ("expand", expand);
+ GET_INT ("padding", padding);
GET_STRING ("orientation", orientation);
GET_INT ("size", size);
GET_BOOL ("auto_hide", auto_hide);
diff -u -r gnome-panel-2.28.0/gnome-panel/panel-profile.h hacked/gnome-panel/panel-profile.h
--- gnome-panel-2.28.0/gnome-panel/panel-profile.h 2009-04-19 13:45:09.000000000 -0400
+++ hacked/gnome-panel/panel-profile.h 2009-10-15 00:44:04.449650481 -0400
@@ -92,7 +92,10 @@
gboolean expand);
gboolean panel_profile_get_toplevel_expand (PanelToplevel *toplevel);
gboolean panel_profile_is_writable_toplevel_expand (PanelToplevel *toplevel);
-
+void panel_profile_set_toplevel_padding (PanelToplevel *toplevel,
+ int padding);
+int panel_profile_get_toplevel_padding (PanelToplevel *padding);
+gboolean panel_profile_is_writable_toplevel_padding (PanelToplevel *toplevel);
void panel_profile_set_toplevel_auto_hide (PanelToplevel *toplevel,
gboolean auto_hide);
gboolean panel_profile_get_toplevel_auto_hide (PanelToplevel *toplevel);
diff -u -r gnome-panel-2.28.0/gnome-panel/panel-toplevel.c hacked/gnome-panel/panel-toplevel.c
--- gnome-panel-2.28.0/gnome-panel/panel-toplevel.c 2009-08-21 06:31:49.000000000 -0400
+++ hacked/gnome-panel/panel-toplevel.c 2009-10-15 00:56:09.477897456 -0400
@@ -79,6 +79,7 @@
gboolean expand;
PanelOrientation orientation;
int size;
+ int padding;
/* relative to the monitor origin */
int x;
@@ -213,6 +214,7 @@
PROP_0,
PROP_NAME,
PROP_EXPAND,
+ PROP_PADDING,
PROP_ORIENTATION,
PROP_SIZE,
PROP_X,
@@ -3862,6 +3864,9 @@
case PROP_EXPAND:
panel_toplevel_set_expand (toplevel, g_value_get_boolean (value));
break;
+ case PROP_PADDING:
+ panel_toplevel_set_padding (toplevel, g_value_get_int (value));
+ break;
case PROP_ORIENTATION:
panel_toplevel_set_orientation (toplevel, g_value_get_enum (value));
break;
@@ -3956,6 +3961,9 @@
case PROP_EXPAND:
g_value_set_boolean (value, toplevel->priv->expand);
break;
+ case PROP_PADDING:
+ g_value_set_int (value, toplevel->priv->padding);
+ break;
case PROP_ORIENTATION:
g_value_set_enum (value, toplevel->priv->orientation);
break;
@@ -4118,6 +4126,18 @@
g_object_class_install_property (
gobject_class,
+ PROP_PADDING,
+ g_param_spec_int (
+ "padding",
+ "Padding",
+ "Padding that is inserted between objects",
+ 0,
+ G_MAXINT,
+ 0,
+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+
+ g_object_class_install_property (
+ gobject_class,
PROP_ORIENTATION,
g_param_spec_enum (
"orientation",
@@ -4698,6 +4718,30 @@
return toplevel->priv->expand;
}
+void
+panel_toplevel_set_padding (PanelToplevel *toplevel,
+ int padding)
+{
+ g_return_if_fail (PANEL_IS_TOPLEVEL (toplevel));
+
+ if (toplevel->priv->padding == padding)
+ return;
+
+ toplevel->priv->padding = padding;
+
+ gtk_widget_queue_resize (GTK_WIDGET (toplevel));
+
+ g_object_notify (G_OBJECT (toplevel), "padding");
+}
+
+int
+panel_toplevel_get_padding (PanelToplevel *toplevel)
+{
+ g_return_val_if_fail (PANEL_IS_TOPLEVEL (toplevel), 0);
+
+ return toplevel->priv->padding;
+}
+
gboolean
panel_toplevel_get_is_floating (PanelToplevel *toplevel)
{
diff -u -r gnome-panel-2.28.0/gnome-panel/panel-toplevel.h hacked/gnome-panel/panel-toplevel.h
--- gnome-panel-2.28.0/gnome-panel/panel-toplevel.h 2009-08-19 11:28:09.000000000 -0400
+++ hacked/gnome-panel/panel-toplevel.h 2009-10-15 00:46:33.972648015 -0400
@@ -83,6 +83,9 @@
void panel_toplevel_set_expand (PanelToplevel *toplevel,
gboolean expand);
gboolean panel_toplevel_get_expand (PanelToplevel *toplevel);
+void panel_toplevel_set_padding (PanelToplevel *toplevel,
+ int padding);
+int panel_toplevel_get_padding (PanelToplevel *toplevel);
void panel_toplevel_set_orientation (PanelToplevel *toplevel,
PanelOrientation orientation);
PanelOrientation panel_toplevel_get_orientation (PanelToplevel *toplevel);
diff -u -r gnome-panel-2.28.0/gnome-panel/panel-toplevel.schemas.in hacked/gnome-panel/panel-toplevel.schemas.in
--- gnome-panel-2.28.0/gnome-panel/panel-toplevel.schemas.in 2009-07-01 09:06:23.000000000 -0400
+++ hacked/gnome-panel/panel-toplevel.schemas.in 2009-10-15 00:39:49.307648259 -0400
@@ -103,6 +103,19 @@
</schema>
<schema>
+ <key>/schemas/apps/panel/toplevels/padding</key>
+ <owner>panel</owner>
+ <type>int</type>
+ <default>0</default>
+ <locale name="C">
+ <short>Padding</short>
+ <long>
+ Padding that will be inserted between objects on this panel.
+ </long>
+ </locale>
+ </schema>
+
+ <schema>
<key>/schemas/apps/panel/toplevels/x</key>
<owner>panel</owner>
<type>int</type>
diff -u -r gnome-panel-2.28.0/gnome-panel/panel-widget.c hacked/gnome-panel/panel-widget.c
--- gnome-panel-2.28.0/gnome-panel/panel-widget.c 2009-08-11 07:32:38.000000000 -0400
+++ hacked/gnome-panel/panel-widget.c 2009-10-15 01:00:07.721647522 -0400
@@ -710,9 +710,12 @@
{
AppletData *ad;
AppletData *nad = NULL;
-
+ gint padding;
+
g_assert (list != NULL);
+ padding = panel_toplevel_get_padding (panel->toplevel);
+
ad = list->data;
if (ad->constrained + ad->min_cells >= panel->size)
return;
@@ -720,8 +723,8 @@
if (list->next)
nad = list->next->data;
- if (!nad || nad->constrained >= ad->constrained + ad->min_cells + MOVE_INCREMENT) {
- ad->pos = ad->constrained += MOVE_INCREMENT;
+ if (!nad || nad->constrained >= ad->constrained + ad->min_cells + MOVE_INCREMENT + padding) {
+ ad->pos = ad->constrained += MOVE_INCREMENT + padding;
gtk_widget_queue_resize (GTK_WIDGET (panel));
emit_applet_moved (panel, ad);
return;
@@ -786,6 +789,9 @@
{
AppletData *ad;
AppletData *pad = NULL;
+ gint padding;
+
+ padding = panel_toplevel_get_padding (panel->toplevel);
ad = list->data;
if (ad->constrained <= 0)
@@ -794,8 +800,8 @@
if (list->prev)
pad = list->prev->data;
- if (!pad || pad->constrained + pad->min_cells <= ad->constrained - MOVE_INCREMENT) {
- ad->pos = ad->constrained -= MOVE_INCREMENT;
+ if (!pad || pad->constrained + pad->min_cells <= ad->constrained - MOVE_INCREMENT - padding) {
+ ad->pos = ad->constrained -= MOVE_INCREMENT + padding;
gtk_widget_queue_resize (GTK_WIDGET (panel));
emit_applet_moved (panel, ad);
return;
@@ -874,15 +880,18 @@
{
AppletData *ad;
AppletData *nad = NULL;
+ gint padding;
g_assert (list != NULL);
+ padding = panel_toplevel_get_padding (panel->toplevel);
+
ad = list->data;
if (list->next)
nad = list->next->data;
- if (!nad || nad->constrained >= ad->constrained + ad->min_cells + MOVE_INCREMENT)
- return ad->constrained + MOVE_INCREMENT;
+ if (!nad || nad->constrained >= ad->constrained + ad->min_cells + MOVE_INCREMENT + padding)
+ return ad->constrained + MOVE_INCREMENT + padding;
if (nad->locked)
return panel_widget_get_right_jump_pos (panel,
@@ -948,15 +957,18 @@
{
AppletData *ad;
AppletData *pad = NULL;
+ gint padding;
g_assert (list != NULL);
+ padding = panel_toplevel_get_padding (panel->toplevel);
+
ad = list->data;
if (list->prev)
pad = list->prev->data;
- if (!pad || pad->constrained + pad->min_cells <= ad->constrained - MOVE_INCREMENT)
- return ad->constrained - MOVE_INCREMENT;
+ if (!pad || pad->constrained + pad->min_cells <= ad->constrained - MOVE_INCREMENT - padding)
+ return ad->constrained - MOVE_INCREMENT - padding;
if (pad->locked)
return panel_widget_get_left_jump_pos (panel,
@@ -1333,12 +1345,15 @@
int i;
int old_size;
gboolean ltr;
+ gint padding;
g_return_if_fail(PANEL_IS_WIDGET(widget));
g_return_if_fail(allocation!=NULL);
panel = PANEL_WIDGET(widget);
+ padding = panel_toplevel_get_padding (panel->toplevel);
+
old_size = panel->size;
ltr = gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR;
@@ -1404,7 +1419,7 @@
}
ad->min_cells = ad->cells;
gtk_widget_size_allocate(ad->applet,&challoc);
- i += ad->cells;
+ i += ad->cells + padding;
}
/* EEEEK, there might be not enough room and we don't handle
@@ -1439,7 +1454,7 @@
if (ad->constrained < i)
ad->constrained = i;
- i = ad->constrained + ad->cells;
+ i = ad->constrained + ad->cells + padding;
}
/* Now expand from the right */
@@ -1464,7 +1479,7 @@
ad->cells = cells;
}
- i = ad->constrained;
+ i = ad->constrained - padding;
}
/* EEEEK, there's not enough room, so shift applets even
Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/F-12/gnome-panel.spec,v
retrieving revision 1.373
retrieving revision 1.374
diff -u -p -r1.373 -r1.374
--- gnome-panel.spec 8 Oct 2009 17:56:46 -0000 1.373
+++ gnome-panel.spec 15 Oct 2009 05:32:41 -0000 1.374
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.28.0
-Release: 4%{?dist}
+Release: 5%{?dist}
URL: http://www.gnome.org
Source0: http://download.gnome.org/sources/gnome-panel/2.28/%{name}-%{version}.tar.bz2
@@ -117,6 +117,9 @@ Patch41: bookmarks-submenu.patch
# from upstream
Patch42: panel-randr-crashes.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=343436
+Patch43: panel-padding.patch
+
Conflicts: gnome-power-manager < 2.15.3
%description
@@ -165,6 +168,7 @@ Panel Applets using the libpanel-applet
%patch40 -p1 -b .clock-home
%patch41 -p1 -b .bookmarks-submenu
%patch42 -p1 -b .randr-crashes
+%patch43 -p1 -b .panel-padding
. %{SOURCE6}
@@ -363,6 +367,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Wed Oct 14 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-5
+- Tweaks to the default panel configuration
+
* Thu Oct 8 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-4
- Fix possible crashes related to randr events
Index: redhat-panel-default-setup.entries
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/F-12/redhat-panel-default-setup.entries,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- redhat-panel-default-setup.entries 2 Jun 2009 04:41:12 -0000 1.18
+++ redhat-panel-default-setup.entries 15 Oct 2009 05:32:41 -0000 1.19
@@ -56,9 +56,6 @@
<string>systray</string>
</value>
<value>
- <string>show_desktop_button</string>
- </value>
- <value>
<string>window_list</string>
</value>
<value>
@@ -91,6 +88,13 @@
</value>
</entry>
<entry>
+ <key>toplevels/top_panel/padding</key>
+ <schema_key>/schemas/apps/panel/toplevels/padding</schema_key>
+ <value>
+ <int>10</int>
+ </value>
+ </entry>
+ <entry>
<key>toplevels/top_panel/orientation</key>
<schema_key>/schemas/apps/panel/toplevels/orientation</schema_key>
<value>
@@ -143,6 +147,13 @@
</value>
</entry>
<entry>
+ <key>toplevels/bottom_panel/padding</key>
+ <schema_key>/schemas/apps/panel/toplevels/padding</schema_key>
+ <value>
+ <int>10</int>
+ </value>
+ </entry>
+ <entry>
<key>toplevels/bottom_panel/orientation</key>
<schema_key>/schemas/apps/panel/toplevels/orientation</schema_key>
<value>
@@ -260,7 +271,7 @@
<key>objects/web_launcher/locked</key>
<schema_key>/schemas/apps/panel/objects/locked</schema_key>
<value>
- <bool>false</bool>
+ <bool>true</bool>
</value>
</entry>
<entry>
@@ -314,7 +325,7 @@
<key>objects/email_launcher/locked</key>
<schema_key>/schemas/apps/panel/objects/locked</schema_key>
<value>
- <bool>false</bool>
+ <bool>true</bool>
</value>
</entry>
<entry>
@@ -361,7 +372,7 @@
<key>applets/gnote/panel_right_stick</key>
<schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
<value>
- <bool>true</bool>
+ <bool>false</bool>
</value>
</entry>
<entry>
@@ -408,7 +419,7 @@
<key>applets/fast_user_switch_applet/position</key>
<schema_key>/schemas/apps/panel/objects/position</schema_key>
<value>
- <int>2</int>
+ <int>0</int>
</value>
</entry>
<entry>
@@ -550,60 +561,6 @@
<entry><key>applets/systray/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
<entry><key>applets/systray/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
- <!-- Show Desktop Applet -->
-
- <entry>
- <key>applets/show_desktop_button/object_type</key>
- <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
- <value>
- <string>bonobo-applet</string>
- </value>
- </entry>
- <entry>
- <key>applets/show_desktop_button/toplevel_id</key>
- <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
- <value>
- <string>bottom_panel</string>
- </value>
- </entry>
- <entry>
- <key>applets/show_desktop_button/position</key>
- <schema_key>/schemas/apps/panel/objects/position</schema_key>
- <value>
- <int>0</int>
- </value>
- </entry>
- <entry>
- <key>applets/show_desktop_button/panel_right_stick</key>
- <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
- <value>
- <bool>false</bool>
- </value>
- </entry>
- <entry>
- <key>applets/show_desktop_button/locked</key>
- <schema_key>/schemas/apps/panel/objects/locked</schema_key>
- <value>
- <bool>true</bool>
- </value>
- </entry>
- <entry>
- <key>applets/show_desktop_button/bonobo_iid</key>
- <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
- <value>
- <string>OAFIID:GNOME_ShowDesktopApplet</string>
- </value>
- </entry>
-
- <entry><key>applets/show_desktop_button/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
- <entry><key>applets/show_desktop_button/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
- <entry><key>applets/show_desktop_button/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
- <entry><key>applets/show_desktop_button/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
- <entry><key>applets/show_desktop_button/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
- <entry><key>applets/show_desktop_button/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
- <entry><key>applets/show_desktop_button/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
- <entry><key>applets/show_desktop_button/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
-
<!-- Window List Applet -->
<entry>
- Previous message (by thread): rpms/kdevplatform/devel kdevplatform.spec,1.4,1.5
- Next message (by thread): rpms/rubygem-extlib/devel import.log, NONE, 1.1 rubygem-extlib.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list