manual fix for the icon

opengisch · Feb 7, 2020 · b54ecab · b54ecab
1 parent 087eeef
commit b54ecab
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 252 deletions.
diff --git a/qfieldsync/Makefile b/qfieldsync/Makefile
diff --git a/qfieldsync/gui/__init__.py b/qfieldsync/gui/__init__.py
@@ -1 +0,0 @@
-from .. import resources_rc

diff --git a/qfieldsync/gui/project_configuration_dialog.py b/qfieldsync/gui/project_configuration_dialog.py
@@ -20,6 +20,7 @@
 import os
 
 from qgis.PyQt.QtCore import Qt
+from qgis.PyQt.QtGui import QIcon
 from qgis.PyQt.QtWidgets import QDialog, QTableWidgetItem, QToolButton, QComboBox, QMenu, QAction
 from qgis.PyQt.uic import loadUiType
 
@@ -30,7 +31,6 @@
 from qfieldsync.core.layer import LayerSource, SyncAction
 from qfieldsync.core.project import ProjectProperties
 
-from .. import resources_rc as resources_rc
 
 DialogUi, _ = loadUiType(
     os.path.join(os.path.dirname(__file__), '../ui/project_configuration_dialog.ui'),
@@ -53,6 +53,7 @@ def __init__(self, iface, parent=None):
         self.__project_configuration = ProjectConfiguration(self.project)
 
         self.setupUi(self)
+        self.multipleToggleButton.setIcon(QIcon(os.path.join(os.path.dirname(__file__), '../resources/visibility.svg')))
 
         self.toggle_menu = QMenu(self)
         self.remove_all_action = QAction(self.tr("remove all layers"), self.toggle_menu)

diff --git a/qfieldsync/gui/resources_rc.py b/qfieldsync/gui/resources_rc.py
diff --git a/qfieldsync/qfield_sync.py b/qfieldsync/qfield_sync.py
@@ -41,8 +41,6 @@
 from qfieldsync.gui.synchronize_dialog import SynchronizeDialog
 from qfieldsync.gui.project_configuration_dialog import ProjectConfigurationDialog
 
-import qfieldsync.resources_rc  # pylint: disable=unused-import  # NOQA
-
 
 class QFieldSync(object):
     """QGIS Plugin Implementation."""
@@ -183,27 +181,27 @@ def initGui(self):
         """Create the menu entries and toolbar icons inside the QGIS GUI."""
 
         self.push_action = self.add_action(
-            ':/plugins/qfieldsync/refresh.png',
+            os.path.join(os.path.dirname(__file__), 'resources/refresh.png'),
             text=self.tr(u'Package for QField'),
             callback=self.show_package_dialog,
             parent=self.iface.mainWindow())
 
         self.add_action(
-            ':/plugins/qfieldsync/refresh-reverse.png',
+            os.path.join(os.path.dirname(__file__), 'resources/refresh-reverse.png'),
             text=self.tr(u'Synchronize from QField'),
             callback=self.show_synchronize_dialog,
             parent=self.iface.mainWindow())
 
         self.add_action(
-            ':/plugins/qfieldsync/icon.png',
+            './resources/icon.png',
             text=self.tr(u'Project Configuration'),
             callback=self.show_project_configuration_dialog,
             parent=self.iface.mainWindow(),
             add_to_toolbar=False
         )
 
         self.add_action(
-            ':/plugins/qfieldsync/icon.png',
+            './resources/icon.png',
             text=self.tr(u'Preferences'),
             callback=self.show_preferences_dialog,
             parent=self.iface.mainWindow(),

diff --git a/...nc/resources/icon-refresh-128-reverse.png → qfieldsync/resources/refresh-reverse.png b/...nc/resources/icon-refresh-128-reverse.png → qfieldsync/resources/refresh-reverse.png
diff --git a/qfieldsync/resources/icon-refresh-128.png → qfieldsync/resources/refresh.png b/qfieldsync/resources/icon-refresh-128.png → qfieldsync/resources/refresh.png
diff --git a/qfieldsync/tests/test_project_configuration_dialog.py b/qfieldsync/tests/test_project_configuration_dialog.py
@@ -27,6 +27,7 @@
 
 start_app()
 
+
 class ProjectConfigurationDialogTest(unittest.TestCase):
 
     @classmethod

diff --git a/qfieldsync/ui/project_configuration_dialog.ui b/qfieldsync/ui/project_configuration_dialog.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>543</width>
-    <height>510</height>
+    <width>525</width>
+    <height>579</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -298,6 +298,7 @@
    <header>qgsmaplayercombobox.h</header>
   </customwidget>
  </customwidgets>
+ <resources/>
  <connections>
   <connection>
    <sender>buttonBox</sender>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -27,6 +27,7 @@

		start_app()


		class ProjectConfigurationDialogTest(unittest.TestCase):

		@classmethod
Expand Down