Merge lp:~uriboni/unity-2d/panel-size-policy-up-to-applets into lp:unity-2d/3.0

[Ugo Riboni]

Leave the size policy of panel applets up to the applets themselves, and put back the correct size policy for the appname applet.

[Alberto Mardegan (mardy)]

Gorgeous! :-)

I just noted something else that we might want to do, just for safety:

 QWidget *applet = provider->createApplet();
 panel->addWidget(applet);

Add a "if (applet != 0)" check. But it's not affecting this bug report, and all current applets always return a proper widget, so we can have it done separately as an improvement.

review: Approve

=== modified file 'data/com.canonical.Unity2d.gschema.xml'
--- data/com.canonical.Unity2d.gschema.xml	2011-08-12 09:41:42 +0000
+++ data/com.canonical.Unity2d.gschema.xml	2011-08-17 09:23:55 +0000
@@ -26,14 +26,5 @@
         only on the panel living in the leftmost screen.
       </description>
     </key>
-    <key type="s" name="expanding">
-      <default>"appname"</default>
-      <summary>Applet that should expand to fill all unused space</summary>
-      <description>
-        If this property names a valid applet from the list in the applets property, then this
-        applet will be setup so that it tries to use all the panel space that remains empty after
-        the other applets have resized themselves to display their content.
-      </description>
-    </key>
   </schema>
 </schemalist>

=== modified file 'libunity-2d-private/src/panelapplet.cpp'
--- libunity-2d-private/src/panelapplet.cpp	2011-08-16 12:58:45 +0000
+++ libunity-2d-private/src/panelapplet.cpp	2011-08-17 09:23:55 +0000
@@ -6,6 +6,7 @@
 PanelApplet::PanelApplet(QWidget* parent) :
     QWidget(parent)
 {
+    setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum);
 }
 
 } // namespace Unity2d

=== modified file 'panel/app/panelmanager.cpp'
--- panel/app/panelmanager.cpp	2011-08-16 12:58:45 +0000
+++ panel/app/panelmanager.cpp	2011-08-17 09:23:55 +0000
@@ -47,7 +47,6 @@
 
 static const char* PANEL_DCONF_SCHEMA = "com.canonical.Unity2d.Panel";
 static const char* PANEL_DCONF_PROPERTY_APPLETS = "applets";
-static const char* PANEL_DCONF_PROPERTY_EXPAND = "expanding";
 static const char* PANEL_PLUGINS_DEV_DIR_ENV = "DEV_PLUGIN_PATH";
 
 static QPalette getPalette()
@@ -116,7 +115,7 @@
     return plugins;
 }
 
-static bool loadPanelConfiguration(QStringList& applets, QString& expanding)
+static QStringList loadPanelConfiguration()
 {
     QConf panelConfig(PANEL_DCONF_SCHEMA);
 
@@ -125,16 +124,10 @@
         qWarning() << "Missing or invalid panel applets configuration in dconf. Please check"
                    << "the property" << PANEL_DCONF_PROPERTY_APPLETS
                    << "in schema" << PANEL_DCONF_SCHEMA;
-        return false;
+        return QStringList();
     }
 
-    applets.append(appletsConfig.toStringList());
-    qDebug() << "Configured plugins list is:" << applets;
-
-    expanding = panelConfig.property(PANEL_DCONF_PROPERTY_EXPAND).toString();
-    qDebug() << "Expanding applet is:" << expanding;
-
-    return true;
+    return appletsConfig.toStringList();
 }
 
 static Unity2dPanel* instantiatePanel(int screen)
@@ -148,9 +141,8 @@
 
     QHash<QString, PanelAppletProviderInterface*> plugins = loadPlugins();
 
-    QString expandingApplet;
-    QStringList panelConfiguration;
-    loadPanelConfiguration(panelConfiguration, expandingApplet);
+    QStringList panelConfiguration = loadPanelConfiguration();
+    qDebug() << "Configured plugins list is:" << panelConfiguration;
 
     Q_FOREACH(QString appletName, panelConfiguration) {
         bool onlyLeftmost = appletName.startsWith('!');
@@ -165,11 +157,6 @@
         } else {
             if (screen == leftmost || !onlyLeftmost) {
                 QWidget *applet = provider->createApplet();
-                if (appletName == expandingApplet) {
-                    applet->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Minimum);
-                } else {
-                    applet->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum);
-                }
                 panel->addWidget(applet);
             }
         }

=== modified file 'panel/applets/appname/appnameapplet.cpp'
--- panel/applets/appname/appnameapplet.cpp	2011-08-16 10:56:09 +0000
+++ panel/applets/appname/appnameapplet.cpp	2011-08-17 09:23:55 +0000
@@ -216,6 +216,7 @@
 : d(new AppNameAppletPrivate)
 {
     d->q = this;
+    setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Minimum);
 
     QPalette palette;
     palette.setColor(QPalette::WindowText, Qt::white);