[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/extragear/graphics
From:       Michael Georg Hansen <mike () mghansen ! de>
Date:       2010-07-31 20:47:55
Message-ID: 20100731204755.62FC5AC783 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1157681 by mghansen:

Some polish and icons.



 M  +1 -1      digikam/utilities/gpssearch/gpssearchview.cpp  
 M  +19 -11    libkmap/libkmap/kmap.cpp  


--- branches/extragear/graphics/digikam/utilities/gpssearch/gpssearchview.cpp \
#1157680:1157681 @@ -191,7 +191,7 @@
     vlayTop->addWidget(d->mapSearchWidget->getControlWidget());
 
     d->actionRemoveCurrentSelection = new KAction(this);
-    d->actionRemoveCurrentSelection->setIcon(SmallIcon(""));
+    d->actionRemoveCurrentSelection->setIcon(SmallIcon("edit-clear"));
     d->actionRemoveCurrentSelection->setToolTip(i18n("Removes the current selection \
and shows all images on the map."));  
 
--- branches/extragear/graphics/libkmap/libkmap/kmap.cpp #1157680:1157681
@@ -278,15 +278,25 @@
     d->actionDecreaseThumbnailSize = new KAction(i18n("T-"), this);
     d->actionDecreaseThumbnailSize->setToolTip(i18n("Decrease the thumbnail size on \
the map"));  
-    d->actionSetSelectionMode = new KAction(i18n("S"), this);
+    d->actionSetSelectionMode = new KAction(this);
     d->actionSetSelectionMode->setCheckable(true);
-    d->actionSetSelectionMode->setToolTip(i18n("Selection mode."));
+    d->actionSetSelectionMode->setIcon(SmallIcon("select-rectangular"));
+    d->actionSetSelectionMode->setToolTip(i18n("Set a search rectangle mode."));
 
-    d->actionSetPanMode = new KAction(i18n("P"), this);
+    d->actionSetPanMode = new KAction(this);
     d->actionSetPanMode->setCheckable(true);
     d->actionSetPanMode->setToolTip(i18n("Pan mode."));
+    d->actionSetPanMode->setIcon(SmallIcon("transform-move"));
     d->actionSetPanMode->setChecked(true);
 
+    // TODO: for later actions
+//     action->setToolTip(i18n("Zoom into a group"));
+//     action->setIcon(SmallIcon("page-zoom"));
+//     action->setToolTip(i18n("Filter images"));
+//     action->setIcon(SmallIcon("view-filter"));
+//     action->setToolTip(i18n("Select images"));
+//     action->setIcon(SmallIcon("edit-select"));
+
     connect(d->actionIncreaseThumbnailSize, SIGNAL(triggered(bool)),
             this, SLOT(slotIncreaseThumbnailSize()));
 
@@ -394,11 +404,10 @@
             disconnect(d->currentBackend->mapWidget(), SIGNAL(regionSelected(const \
                QList<double>&)),
                     this, SLOT(slotNewSelectionFromMap(const QList<double>&)));
         }
+
             disconnect(d->currentBackend, SIGNAL(signalSelectionHasBeenMade(const \
                QList<double>&)),
                     this, SLOT(slotNewSelectionFromMap(const QList<double>&))); 
 
-       
-
     }
 
     MapBackend* backend;
@@ -442,10 +451,10 @@
                connect(d->currentBackend->mapWidget(), SIGNAL(regionSelected(const \
                QList<double>&)),
                        this, SLOT(slotNewSelectionFromMap(const QList<double>&)));
             }
+
                connect(d->currentBackend, SIGNAL(signalSelectionHasBeenMade(const \
                QList<double>&)),
                        this, SLOT(slotNewSelectionFromMap(const QList<double>&))); 
             
-
             // call this slot manually in case the backend was ready right away:
             if (d->currentBackend->isReady())
             {
@@ -692,12 +701,14 @@
         QToolButton* const decreaseThumbnailSizeButton = new \
                QToolButton(d->controlWidget);
         decreaseThumbnailSizeButton->setDefaultAction(d->actionDecreaseThumbnailSize);
  
-        QToolButton* const setSelectionModeButton = new \
                QToolButton(d->controlWidget);
-        setSelectionModeButton->setDefaultAction(d->actionSetSelectionMode);
+        new KSeparator(Qt::Vertical, d->controlWidget);
 
         QToolButton* const setPanModeButton = new QToolButton(d->controlWidget);
         setPanModeButton->setDefaultAction(d->actionSetPanMode);
 
+        QToolButton* const setSelectionModeButton = new \
QToolButton(d->controlWidget); +        \
setSelectionModeButton->setDefaultAction(d->actionSetSelectionMode); +
         d->hBoxForAdditionalControlWidgetItems = new KHBox(d->controlWidget);
 
         // add stretch after the controls:
@@ -1393,11 +1404,8 @@
     for (int i=0; i<clusterIndices.count(); ++i)
     {
         const int clusterIndex = clusterIndices.at(i);
-        kDebug()<<clusterIndex;
         const WMWCluster currentCluster = s->clusterList.at(clusterIndex);
 
-        const bool doSelect = (currentCluster.selectedState!=WMWSelectedAll);
-
         // TODO: use a consistent format for tile indices
         AbstractMarkerTiler::TileIndex::List tileIndices;
         for (int j=0; j<currentCluster.tileIndicesList.count(); ++j)


[prev in list] [next in list] [prev in thread] [next in thread]