Skip to content

Commit

Permalink
move icons to icons folder (#226)
Browse files Browse the repository at this point in the history
* move icons to icons folder

* rm pb_tool.cfg, we don't use it
  • Loading branch information
jackieleng authored and renierkramer committed Apr 23, 2018
1 parent 0d8ed8e commit 1e65df6
Show file tree
Hide file tree
Showing 18 changed files with 33 additions and 100 deletions.
2 changes: 2 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ threedi-qgis-plugin changelog
0.16 (unreleased)
-----------------

- Move icons to ``icons`` folder.

- Wrap layer generation code in transactions to improve performance (it was
very slow on Windows, this improves it considerably so it's possible that
it autocommited on every statement, see: http://gdal.org/drv_sqlite.html)
Expand Down
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
4 changes: 2 additions & 2 deletions misc_tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class About(object):

def __init__(self, iface):
self.iface = iface
self.icon_path = ':/plugins/ThreeDiToolbox/icon.png'
self.icon_path = ':/plugins/ThreeDiToolbox/icons/icon.png'
self.menu_text = "3Di about"

def run(self):
Expand Down Expand Up @@ -62,7 +62,7 @@ def __init__(self, iface, ts_datasource):
ts_datasource: TimeseriesDatasourceModel instance
"""
self.iface = iface
self.icon_path = ':/plugins/ThreeDiToolbox/icon_broom.png'
self.icon_path = ':/plugins/ThreeDiToolbox/icons/icon_broom.png'
self.menu_text = "Clear cache"
self.ts_datasource = ts_datasource

Expand Down
74 changes: 0 additions & 74 deletions pb_tool.cfg

This file was deleted.

27 changes: 16 additions & 11 deletions resources.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Resource object code
#
# Created: di jun. 6 11:39:32 2017
# Created: ma apr. 23 11:38:22 2018
# by: The Resource Compiler for PyQt (Qt v4.8.6)
#
# WARNING! All changes made in this file will be lost!
Expand Down Expand Up @@ -623,6 +623,10 @@
\x04\x75\x0a\x08\
\x00\x54\
\x00\x68\x00\x72\x00\x65\x00\x65\x00\x44\x00\x69\x00\x54\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x6f\x00\x78\
\x00\x05\
\x00\x6f\xa6\x53\
\x00\x69\
\x00\x63\x00\x6f\x00\x6e\x00\x73\
\x00\x10\
\x01\xa6\xf2\x87\
\x00\x69\
Expand Down Expand Up @@ -668,16 +672,17 @@
qt_resource_struct = "\
\x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x01\
\x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x02\
\x00\x00\x00\x14\x00\x02\x00\x00\x00\x09\x00\x00\x00\x03\
\x00\x00\x00\x36\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
\x00\x00\x00\x5c\x00\x00\x00\x00\x00\x01\x00\x00\x06\xf8\
\x00\x00\x00\xb2\x00\x00\x00\x00\x00\x01\x00\x00\x13\x33\
\x00\x00\x01\x4a\x00\x00\x00\x00\x00\x01\x00\x00\x1e\x16\
\x00\x00\x01\x06\x00\x00\x00\x00\x00\x01\x00\x00\x1a\x37\
\x00\x00\x01\x34\x00\x00\x00\x00\x00\x01\x00\x00\x1b\xbb\
\x00\x00\x01\x6c\x00\x00\x00\x00\x00\x01\x00\x00\x22\x0d\
\x00\x00\x00\xe4\x00\x00\x00\x00\x00\x01\x00\x00\x16\x42\
\x00\x00\x00\x7e\x00\x00\x00\x00\x00\x01\x00\x00\x0d\x45\
\x00\x00\x00\x14\x00\x02\x00\x00\x00\x01\x00\x00\x00\x03\
\x00\x00\x00\x36\x00\x02\x00\x00\x00\x09\x00\x00\x00\x04\
\x00\x00\x00\x46\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
\x00\x00\x00\x6c\x00\x00\x00\x00\x00\x01\x00\x00\x06\xf8\
\x00\x00\x00\xc2\x00\x00\x00\x00\x00\x01\x00\x00\x13\x33\
\x00\x00\x01\x5a\x00\x00\x00\x00\x00\x01\x00\x00\x1e\x16\
\x00\x00\x01\x16\x00\x00\x00\x00\x00\x01\x00\x00\x1a\x37\
\x00\x00\x01\x44\x00\x00\x00\x00\x00\x01\x00\x00\x1b\xbb\
\x00\x00\x01\x7c\x00\x00\x00\x00\x00\x01\x00\x00\x22\x0d\
\x00\x00\x00\xf4\x00\x00\x00\x00\x00\x01\x00\x00\x16\x42\
\x00\x00\x00\x8e\x00\x00\x00\x00\x00\x01\x00\x00\x0d\x45\
"

def qInitResources():
Expand Down
18 changes: 9 additions & 9 deletions resources.qrc
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<RCC>
<qresource prefix="/plugins/ThreeDiToolbox" >
<file>icon.png</file>
<file>icon_graph.png</file>
<file>icon_toolbox.png</file>
<file>icon_toolbox_small.png</file>
<file>icon_hammer_small.png</file>
<file>icon_add_datasource.png</file>
<file>icon_route.png</file>
<file>icon_route_small.png</file>
<file>icon_broom.png</file>
<file>icons/icon.png</file>
<file>icons/icon_graph.png</file>
<file>icons/icon_toolbox.png</file>
<file>icons/icon_toolbox_small.png</file>
<file>icons/icon_hammer_small.png</file>
<file>icons/icon_add_datasource.png</file>
<file>icons/icon_route.png</file>
<file>icons/icon_route_small.png</file>
<file>icons/icon_broom.png</file>
</qresource>
</RCC>
2 changes: 1 addition & 1 deletion threedi_graph.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def __init__(self, iface, ts_datasource, root_tool):
# initialize plugin directory
self.plugin_dir = os.path.dirname(__file__)

self.icon_path = ':/plugins/ThreeDiToolbox/icon_graph.png'
self.icon_path = ':/plugins/ThreeDiToolbox/icons/icon_graph.png'
self.menu_text = u'Show 3Di results in Graph'

self.dock_widgets = []
Expand Down
2 changes: 1 addition & 1 deletion threedi_result_selection.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def __init__(self, iface, ts_datasource):
# initialize plugin directory
self.plugin_dir = os.path.dirname(__file__)

self.icon_path = ':/plugins/ThreeDiToolbox/icon_add_datasource.png'
self.icon_path = ':/plugins/ThreeDiToolbox/icons/icon_add_datasource.png'
self.menu_text = u'Select 3Di results'

self.is_active = False
Expand Down
2 changes: 1 addition & 1 deletion threedi_sideview.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def __init__(self, iface, tdi_root_tool):
# initialize plugin directory
self.plugin_dir = os.path.dirname(__file__)

self.icon_path = ':/plugins/ThreeDiToolbox/icon_route.png'
self.icon_path = ':/plugins/ThreeDiToolbox/icons/icon_route.png'
self.menu_text = u'Show sideview of 3Di model with results'

self.dock_widgets = []
Expand Down
2 changes: 1 addition & 1 deletion threedi_toolbox.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def __init__(self, iface, ts_datasource):
# initialize plugin directory
self.plugin_dir = os.path.dirname(__file__)

self.icon_path = ':/plugins/ThreeDiToolbox/icon_toolbox.png'
self.icon_path = ':/plugins/ThreeDiToolbox/icons/icon_toolbox.png'
self.menu_text = u'Toolbox for working with 3Di models'

self.pluginIsActive = False
Expand Down

0 comments on commit 1e65df6

Please sign in to comment.