[meego-commits] 24390: Changes to MeeGo:1.2.0:oss:Update:Testing/meego-panel-web

[lionel]

Hi,
I have made the following changes to meego-panel-web in project MeeGo:1.2.0:oss:Update:Testing. Please review and accept ASAP.

Thank You,
lionel

[This message was auto-generated]

---

Request #24390:

  submit:   home:lionel:branches:MeeGo:1.2.0:oss:Update:Testing/meego-panel-web(r5)(cleanup) -> MeeGo:1.2.0:oss:Update:Testing/meego-panel-web


Message:
    * Wed Oct 26 2011 Lionel Landwerlin <lionel.g.landwerlin at linux.intel.com> - 0.2.2
- Fix panel height on big screen mode (BMC#23623)

State:   new          2011-10-26T10:46:28 lionel
Comment: None



changes files:
--------------
--- meego-panel-web.changes
+++ meego-panel-web.changes
@@ -0,0 +1,3 @@
+* Wed Oct 26 2011 Lionel Landwerlin <lionel.g.landwerlin at linux.intel.com> - 0.2.2
+- Fix panel height on big screen mode (BMC#23623)
+

new:
----
  0001-netpanel-prevent-panel-to-fill-all-the-screen.patch

spec files:
-----------
--- meego-panel-web.spec
+++ meego-panel-web.spec
@@ -16,6 +16,7 @@
 Source1:    meego-panel-web
 Source100:  meego-panel-web.yaml
 Patch0:     netpanel-ensure-tile-s-title-is-contained-within-the.patch
+Patch1:     0001-netpanel-prevent-panel-to-fill-all-the-screen.patch
 Requires:   mutter-netbook
 BuildRequires:  pkgconfig(clutter-x11-1.0)
 BuildRequires:  pkgconfig(gdk-x11-2.0)
@@ -39,6 +40,8 @@
 
 # netpanel-ensure-tile-s-title-is-contained-within-the.patch
 %patch0 -p1
+# 0001-netpanel-prevent-panel-to-fill-all-the-screen.patch
+%patch1 -p1
 # >> setup
 # << setup
 
@@ -46,7 +49,8 @@
 # >> build pre
 # << build pre
 
-%autogen --disable-static
+%autogen --disable-static \
+
 %configure --disable-static
 make %{?jobs:-j%jobs}
 

other changes:
--------------

++++++ 0001-netpanel-prevent-panel-to-fill-all-the-screen.patch (new)
--- 0001-netpanel-prevent-panel-to-fill-all-the-screen.patch
+++ 0001-netpanel-prevent-panel-to-fill-all-the-screen.patch
+From e2ac50f9c2bc3cabfeecaabe017650783141c207 Mon Sep 17 00:00:00 2001
+From: Lionel Landwerlin <lionel.g.landwerlin at linux.intel.com>
+Date: Wed, 26 Oct 2011 18:31:49 +0100
+Subject: [PATCH] netpanel: prevent panel to fill all the screen
+
+---
+ netpanel/meego-panel-web.cc |   35 ++++++++++++++++++++++++++++++++++-
+ 1 files changed, 34 insertions(+), 1 deletions(-)
+
+diff --git a/netpanel/meego-panel-web.cc b/netpanel/meego-panel-web.cc
+index a9aa5a6..fe22a75 100644
+--- a/netpanel/meego-panel-web.cc
++++ b/netpanel/meego-panel-web.cc
+@@ -61,9 +61,18 @@ stage_delete_event (ClutterStage *stage,
+ 
+ 
+ static gboolean standalone = FALSE;
++static char const *geometry = NULL;
++static int         dpi = 0;
+ 
+ static GOptionEntry entries[] = {
+-  {"standalone", 's', 0, G_OPTION_ARG_NONE, &standalone, "Do not embed into the mutter-meego panel", NULL}
++  {"standalone", 's', 0, G_OPTION_ARG_NONE, &standalone, "Do not embed into the mutter-meego panel", NULL},
++  { "geometry", 'g', 0, G_OPTION_ARG_STRING, &geometry,
++    "Window geometry in standalone mode", NULL },
++#if CLUTTER_CHECK_VERSION(1, 3, 0)
++  { "clutter-font-dpi", 'd', 0, G_OPTION_ARG_INT, &dpi,
++    "Set clutter font resolution to <dpi>", "<dpi>" },
++#endif
++  { NULL }
+ };
+ 
+ 
+@@ -99,6 +108,14 @@ main (int    argc,
+ 
+   mpl_panel_clutter_init_with_gtk (&argc, &argv);
+ 
++  if (dpi)
++    {
++#if CLUTTER_CHECK_VERSION(1, 3, 0)
++      ClutterSettings *settings = clutter_settings_get_default ();
++      g_object_set (settings, "font-dpi", dpi * 1000, NULL);
++#endif
++    }
++
+   mx_texture_cache_load_cache (mx_texture_cache_get_default (),
+                                  MX_CACHE);
+   mx_style_load_from_file (mx_style_get_default (),
+@@ -116,6 +133,8 @@ main (int    argc,
+ 
+     mpl_panel_clutter_setup_events_with_gtk (MPL_PANEL_CLUTTER(client));
+ 
++    mpl_panel_client_set_height_request (client, 600);
++
+     stage = mpl_panel_clutter_get_stage (MPL_PANEL_CLUTTER (client));
+     netpanel = MEEGO_NETBOOK_NETPANEL (meego_netbook_netpanel_new ());
+ 
+@@ -166,6 +185,20 @@ main (int    argc,
+     xwin = clutter_x11_get_stage_window (CLUTTER_STAGE (stage));
+ 
+     mpl_panel_clutter_setup_events_with_gtk_for_xid (xwin);
++
++    if (geometry)
++      {
++        int x, y;
++        unsigned int width, height;
++        XParseGeometry (geometry, &x, &y, &width, &height);
++        clutter_actor_set_size (stage, width, height);
++      }
++    else
++      {
++        clutter_actor_set_size (stage, 1008, 600);
++      }
++
++    mpl_panel_clutter_setup_events_with_gtk_for_xid (xwin);
+     netpanel = MEEGO_NETBOOK_NETPANEL (meego_netbook_netpanel_new ());
+ 
+     base_pane = mx_box_layout_new();
+-- 
+1.7.7
+

++++++ meego-panel-web.yaml
--- meego-panel-web.yaml
+++ meego-panel-web.yaml
@@ -13,6 +13,7 @@
 
 Patches:
     - netpanel-ensure-tile-s-title-is-contained-within-the.patch
+    - 0001-netpanel-prevent-panel-to-fill-all-the-screen.patch
 
 Requires:
     - mutter-netbook