Skip to content

Commit

Permalink
[topology checker] revamped icons for the topology checker and add to…
Browse files Browse the repository at this point in the history 
…olbar for a consistant look
  • Loading branch information
@slarosa
slarosa committed Dec 13, 2015
1 parent ceddb7e commit 6e9ff36
Show file tree
Hide file tree
Showing 9 changed files with 636 additions and 45 deletions.
10 changes: 3 additions & 7 deletions src/plugins/topology/checkDock.cpp
View file
Expand Up @@ -62,10 +62,6 @@ checkDock::checkDock( QgisInterface* qIface, QWidget* parent )
mConfigureDialog = new rulesDialog( mTest->testMap(), qIface, parent );
mTestTable = mConfigureDialog->rulesTable();

mValidateExtentButton->setIcon( QIcon( ":/topology/validateExtent.png" ) );
mValidateAllButton->setIcon( QIcon( ":/topology/validateAll.png" ) );
mConfigureButton->setIcon( QIcon( ":/topology/configureRules.png" ) );

QgsMapCanvas* canvas = qIface->mapCanvas();// mQgisApp->mapCanvas();
mRBFeature1 = new QgsRubberBand( canvas );
mRBFeature2 = new QgsRubberBand( canvas );
Expand All @@ -83,10 +79,10 @@ checkDock::checkDock( QgisInterface* qIface, QWidget* parent )
mVMFeature1 = 0;
mVMFeature2 = 0;

connect( mConfigureButton, SIGNAL( clicked() ), this, SLOT( configure() ) );
connect( mValidateAllButton, SIGNAL( clicked() ), this, SLOT( validateAll() ) );
connect( actionConfigure, SIGNAL( triggered() ), this, SLOT( configure() ) );
connect( actionValidateAll, SIGNAL( triggered() ), this, SLOT( validateAll() ) );
//connect( mValidateSelectedButton, SIGNAL( clicked() ), this, SLOT( validateSelected() ) );
connect( mValidateExtentButton, SIGNAL( clicked() ), this, SLOT( validateExtent() ) );
connect( actionValidateExtent, SIGNAL( triggered() ), this, SLOT( validateExtent() ) );
connect( mToggleRubberband, SIGNAL( clicked() ), this, SLOT( toggleErrorMarker() ) );

connect( mFixButton, SIGNAL( clicked() ), this, SLOT( fix() ) );
Expand Down
96 changes: 64 additions & 32 deletions src/plugins/topology/checkDock.ui
View file
Expand Up @@ -6,52 +6,46 @@
<rect>
<x>0</x>
<y>0</y>
<width>307</width>
<width>382</width>
<height>280</height>
</rect>
</property>
<property name="windowTitle">
<string>Topology Checker</string>
<string>Topology Checker Panel</string>
</property>
<widget class="QWidget" name="dockWidgetContents">
<layout class="QGridLayout" name="gridLayout_2">
<property name="margin">
<number>0</number>
</property>
<item row="0" column="0">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QTableView" name="mErrorTableView"/>
</item>
</layout>
<widget class="QToolBar" name="mTopologyToolbar">
<property name="iconSize">
<size>
<width>16</width>
<height>16</height>
</size>
</property>
<property name="floatable">
<bool>false</bool>
</property>
<addaction name="actionValidateAll"/>
<addaction name="actionValidateExtent"/>
<addaction name="actionConfigure"/>
</widget>
</item>
<item row="1" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_4">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QPushButton" name="mConfigureButton">
<property name="text">
<string>Configure</string>
</property>
<widget class="QTableView" name="mErrorTableView">
<attribute name="horizontalHeaderStretchLastSection">
<bool>true</bool>
</attribute>
</widget>
</item>
</layout>
</item>
<item row="2" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QPushButton" name="mValidateAllButton">
<property name="text">
<string>Validate All</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="mValidateExtentButton">
<property name="text">
<string>Validate Extent</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="3" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
<widget class="QCheckBox" name="mToggleRubberband">
Expand All @@ -75,7 +69,7 @@
</item>
</layout>
</item>
<item row="4" column="0">
<item row="3" column="0">
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QComboBox" name="mFixBox">
Expand All @@ -97,7 +91,45 @@
</item>
</layout>
</widget>
<action name="actionValidateAll">
<property name="icon">
<iconset resource="topol.qrc">
<normaloff>:/topology/mActionValidateAll.svg</normaloff>:/topology/mActionValidateAll.svg</iconset>
</property>
<property name="text">
<string>Validate All</string>
</property>
<property name="toolTip">
<string>Validate All</string>
</property>
</action>
<action name="actionValidateExtent">
<property name="icon">
<iconset resource="topol.qrc">
<normaloff>:/topology/mActionValidateExtent.svg</normaloff>:/topology/mActionValidateExtent.svg</iconset>
</property>
<property name="text">
<string>Validate Extent</string>
</property>
<property name="toolTip">
<string>Validate Extent</string>
</property>
</action>
<action name="actionConfigure">
<property name="icon">
<iconset resource="topol.qrc">
<normaloff>:/topology/mActionConfigure.svg</normaloff>:/topology/mActionConfigure.svg</iconset>
</property>
<property name="text">
<string>Configure</string>
</property>
<property name="toolTip">
<string>Configure</string>
</property>
</action>
</widget>
<resources/>
<resources>
<include location="topol.qrc"/>
</resources>
<connections/>
</ui>
Binary file removed src/plugins/topology/configureRules.png
View file
Binary file not shown.

1 comment on commit 6e9ff36

@jef-n
Copy link
Member

@jef-n jef-n commented on 6e9ff36 Dec 14, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@slarosa There are svgs missing in this commit

Please sign in to comment.