comparison widgets/PropertyStack.cpp @ 242:50c0a548d23e sv1-1.0pre4

...

 #include "PropertyStack.h"
 #include "PropertyBox.h"
 #include "base/PropertyContainer.h"
 #include "view/View.h"
 #include "layer/Layer.h"
+#include "layer/LayerFactory.h"
 #include "widgets/NotifyingTabBar.h"
 
 #include <QIcon>
 #include <QTabWidget>
 

     connect(bar, SIGNAL(mouseLeft()), this, SLOT(mouseLeftTabBar()));
     connect(bar, SIGNAL(activeTabClicked()), this, SLOT(activeTabClicked()));
 
     setTabBar(bar);
 
-//    setElideMode(Qt::ElideRight); 
+#if (QT_VERSION >= 0x0402)
+    setElideMode(Qt::ElideNone); 
     tabBar()->setUsesScrollButtons(true); 
     tabBar()->setIconSize(QSize(16, 16));
+#endif
     
     repopulate();
 
     connect(this, SIGNAL(currentChanged(int)),
 	    this, SLOT(selectedContainerChanged(int)));

     for (size_t i = 0; i < m_client->getPropertyContainerCount(); ++i) {
 
 	PropertyContainer *container = m_client->getPropertyContainer(i);
 	QString name = container->getPropertyContainerName();
 	
-	QString iconName = container->getPropertyContainerIconName();
-
 	PropertyBox *box = new PropertyBox(container);
 
 	connect(box, SIGNAL(showLayer(bool)), this, SLOT(showLayer(bool)));
         connect(box, SIGNAL(contextHelpChanged(const QString &)),
                 this, SIGNAL(contextHelpChanged(const QString &)));

         Layer *layer = dynamic_cast<Layer *>(container);
         if (layer) {
             box->layerVisibilityChanged(!layer->isLayerDormant(m_client));
         }
 
+        QString shortName = name;
+
+        if (layer) {
+            shortName = LayerFactory::getInstance()->getLayerPresentationName
+                (LayerFactory::getInstance()->getLayerType(layer));
+        }
+
+        shortName = QString("&%1 %2").arg(i + 1).arg(shortName);
+
+#ifdef Q_WS_MAC
+
+        // Qt 4.2 on OS/X doesn't show the icons in the tab bar, and
+        // I'm not sure why -- use labels instead
+
+        addTab(box, shortName);
+        
+#else
+
+        // Icons on other platforms
+
+	QString iconName = container->getPropertyContainerIconName();
+
 	QIcon icon(QString(":/icons/%1.png").arg(iconName));
 	if (icon.isNull()) {
-	    addTab(box, name);
+	    addTab(box, shortName);
 	} else {
 	    addTab(box, icon, QString("&%1").arg(i + 1));
-	    tabBar()->setTabToolTip(count() - 1, name);
-            tabBar()->setTabIcon(count() - 1, icon);
-	}
+	    setTabToolTip(i, name);
+	}
+
+#endif
 
 	m_boxes.push_back(box);
     }    
 
     blockSignals(false);