Dodanie narzedzi giap pod logiem, usuniecie wstegi narzedzia giap

GIAPspzoo · Jun 23, 2021 · b792991 · b792991
1 parent 84f2cbd
commit b792991
Show file tree

Hide file tree

Showing 9 changed files with 115 additions and 52 deletions.
diff --git a/OrtoTools.py b/OrtoTools.py
@@ -7,7 +7,7 @@
 from qgis.utils import iface
 from .utils import WMS_SERVERS, WMS_SERVERS_GROUPS
 from .CustomMessageBox import CustomMessageBox
-from .giap_layout import tr
+from .utils import tr
 
 
 class OrtoAddingTool(object):

diff --git a/Searcher/searchTool.py b/Searcher/searchTool.py
@@ -10,8 +10,6 @@ def __init__(self, dock, iface):
         self.dock = dock
 
     def run(self):
-        self.dock.toolButton_address.clicked.connect(
-            self.search_address)
         self.dock.lineEdit_address.returnPressed.connect(
             self.search_address)
         self.dock.comboBox_woj.currentIndexChanged.connect(

diff --git a/config.json b/config.json
diff --git a/giap_dynamic_layout.ui b/giap_dynamic_layout.ui
@@ -13,13 +13,13 @@
   <property name="minimumSize">
    <size>
     <width>1291</width>
-    <height>167</height>
+    <height>150</height>
    </size>
   </property>
   <property name="maximumSize">
    <size>
     <width>1291000</width>
-    <height>178</height>
+    <height>179</height>
    </size>
   </property>
   <property name="windowTitle">
@@ -49,12 +49,6 @@
    </property>
    <item>
     <widget class="QTabWidget" name="tabWidget">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
      <property name="minimumSize">
       <size>
        <width>0</width>
@@ -200,6 +194,9 @@
          <height>16777215</height>
         </size>
        </property>
+       <property name="toolTip">
+        <string>Enter the data according to the scheme: TERYT: 146513_8.1016.17/2 or fill in the previous fields and indicate the parcel number, e.g. 17/2</string>
+       </property>
        <property name="statusTip">
         <string extracomment="wpisz numer działki"/>
        </property>
@@ -236,18 +233,14 @@
          <height>26</height>
         </size>
        </property>
+       <property name="toolTip">
+        <string>Enter the data according to the scheme: for the address point: Warszawa, Pasaż Ursynowski 1, for the street: Warszawa, Pasaż Ursynowsk</string>
+       </property>
        <property name="text">
         <string/>
        </property>
        <property name="placeholderText">
-        <string>address</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QToolButton" name="toolButton_address">
-       <property name="text">
-        <string>Search</string>
+        <string>Search address point</string>
        </property>
       </widget>
      </item>
@@ -264,6 +257,48 @@
        </property>
       </spacer>
      </item>
+     <item>
+      <widget class="QLabel" name="labelGiapTools">
+       <property name="styleSheet">
+        <string notr="true">color: rgb(255, 255, 255);
+font: 87 10pt &quot;Arial Black&quot;;</string>
+       </property>
+       <property name="text">
+        <string>Narzędzia GIAP  </string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="runQuickPrintButton">
+       <property name="text">
+        <string>...</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="runCompositionButton">
+       <property name="text">
+        <string>...</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="runOrtoTool">
+       <property name="text">
+        <string>...</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="offOnSearchButton">
+       <property name="toolTip">
+        <string>Turn off or turn on search tool</string>
+       </property>
+       <property name="text">
+        <string>...</string>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
   </layout>

diff --git a/giap_layout.py b/giap_layout.py
@@ -9,6 +9,8 @@
 
 # Initialize Qt resources from file resources.py
 from qgis._core import QgsProject, Qgis
+
+from .OrtoTools import OrtoAddingTool
 from .QuickPrint import PrintMapTool
 
 from .Kompozycje.Kompozycje import CompositionsTool
@@ -23,7 +25,7 @@
 from .StyleManager.stylemanager import StyleManagerDialog
 from .Searcher.searchTool import SearcherTool
 
-from .giap_dynamic_layout import Widget
+from .giap_dynamic_layout import Widget, CustomToolButton
 from .ribbon_config import RIBBON_DEFAULT
 
 project = QgsProject.instance()
@@ -58,6 +60,7 @@ def __init__(self, iface):
 
         # initialize StyleManager for styling handling
         self.style_manager = StyleManager(self)
+        self.print_map_tool = PrintMapTool(self.iface)
 
         self.iface.projectRead.connect(self.projekt_wczytany)
         self.iface.newProjectCreated.connect(self.projekt_wczytany)
@@ -122,6 +125,23 @@ def initGui(self):
             os.path.abspath(project.fileName()))
         self.toolbar.show()
 
+        #tools under GIAP logo
+        self.main_widget.runQuickPrintButton.clicked.connect(self.print_map_tool.run)
+        self.main_widget.runQuickPrintButton.setToolTip(tr("Map fast print"))
+        self.main_widget.runQuickPrintButton.setIcon(QIcon(f'{self.plugin_dir}/icons/quick_print.png'))
+
+        self.main_widget.runCompositionButton.clicked.connect(self.kompozycje.config)
+        self.main_widget.runCompositionButton.setIcon(QIcon(f'{self.plugin_dir}/icons/compositions_giap.png'))
+        self.main_widget.runCompositionButton.setToolTip(tr("Composition settings"))
+
+        orto_button = self.main_widget.runOrtoTool
+        orto_button.setIcon(QIcon(f'{self.plugin_dir}/icons/orto_icon2.png'))
+        self.orto = OrtoAddingTool(self.main_widget, orto_button)
+
+        self.visibility_search_tool = False
+        self.main_widget.offOnSearchButton.clicked.connect(lambda: self.off_on_search_tool(self.visibility_search_tool))
+        self.main_widget.offOnSearchButton.setIcon(QIcon(f'{self.plugin_dir}/styles/giap/icons/close.png'))
+
         self.searcher.run()
         # set strong focus to get keypressevent
         self.main_widget.setFocusPolicy(Qt.StrongFocus)
@@ -153,10 +173,18 @@ def load_ribbons(self):
         # turn off ribbon editing
         self.main_widget.edit_session_toggle()
 
+    def off_on_search_tool(self, visibility):
+        elements = ['comboBox_woj', 'comboBox_pow', 'comboBox_gmina', 'comboBox_obr',
+                    'lineEdit_parcel', 'toolButton_parcel', 'lineEdit_address',
+                    'line', 'line_2']
+
+        for elem in elements:
+            getattr(self.main_widget, elem).setVisible(visibility)
+        self.visibility_search_tool = not visibility
+
     def custom_prints(self):
         """Load custom tools to qgis"""
         self.quick_print = PrintMapTool(self.iface, self.main_widget)
-
         b_qprints = self.main_widget.findChildren(
             QToolButton, 'giapQuickPrint')
         for b_qprint in b_qprints:

diff --git a/i18n/giap_pl.qm b/i18n/giap_pl.qm
diff --git a/i18n/giap_pl.ts b/i18n/giap_pl.ts
@@ -588,6 +588,21 @@ Porszę czekać...</translation>
         <source>parcel number or TERYT</source>
         <translation>nr działki lub TERYT</translation>
     </message>
+    <message>
+        <location filename="../giap_dynamic_layout.ui" line="198"/>
+        <source>Enter the data according to the scheme: TERYT: 146513_8.1016.17/2 or fill in the previous fields and indicate the parcel number, e.g. 17/2</source>
+        <translation>Wpisz dane według schematu: TERYT: 146513_8.1016.17/2 lub uzupełnij wcześniejsze pola i wskaż numer działki np. 17/2</translation>
+    </message>
+    <message>
+        <location filename="../giap_dynamic_layout.ui" line="237"/>
+        <source>Enter the data according to the scheme: for the address point: Warszawa, Pasaż Ursynowski 1, for the street: Warszawa, Pasaż Ursynowsk</source>
+        <translation>Wpisz dane według schematu: dla punktu adresowego: Warszawa, Pasaż Ursynowski 1, dla ulicy: Warszawa, Pasaż Ursynowski</translation>
+    </message>
+    <message>
+        <location filename="../giap_dynamic_layout.ui" line="243"/>
+        <source>Search address point</source>
+        <translation>Wyszukaj punkt adresowy</translation>
+    </message>
     <message>
         <location filename="../giap_dynamic_layout.ui" line="244"/>
         <source>Search</source>
@@ -598,6 +613,11 @@ Porszę czekać...</translation>
         <source>address</source>
         <translation>adres</translation>
     </message>
+    <message>
+        <location filename="../giap_dynamic_layout.ui" line="295"/>
+        <source>Turn off or turn on search tool</source>
+        <translation>Wyłącz lub włącz wyszukiwarke</translation>
+    </message>
 </context>
 <context>
     <name>KompozycjeDialog</name>

diff --git a/ribbon_config.py b/ribbon_config.py
@@ -73,6 +73,17 @@
                 ],
             },
 
+            {
+                'label': tr('Prints'),
+                'id': 'Prints',
+                'btn_size': 30,
+                'btns': [
+                    ['mActionNewPrintLayout', 0, 0],
+                    ['giapMyPrints', 0, 1],
+                    ['mActionShowLayoutManager', 1, 0],
+                ]
+            },
+
         ]
     },
 
@@ -163,35 +174,6 @@
         ]
     },
 
-    {
-        "tab_name": tr("GIAP Tools"),
-        "tab_id": "GIAP Tools",
-        "sections": [
-            {
-                'label': tr('Prints'),
-                'id': 'Prints',
-                'btn_size': 30,
-                'btns': [
-                    ['mActionNewPrintLayout', 0, 0],
-                    ['giapMyPrints', 0, 1],
-                    ['mActionShowLayoutManager', 1, 0],
-                    ['giapQuickPrint', 1, 1],
-                ]
-            },
-
-            {
-                'label': tr('GIAP Tools'),
-                'id': 'GIAP Tools',
-                'btn_size': 60,
-                'btns': [
-                    ['giapCompositions', 0, 0],
-                    ['giapWMS', 0, 1],
-                ]
-            },
-
-        ]
-    },
-
     {
         "tab_name": tr("Vector"),
         "tab_id": "Vector",

diff --git a/utils.py b/utils.py
@@ -481,4 +481,4 @@ def get_project_config(parameter, key, default=''):
 
 ]
 
-DEFAULT_TABS = ['Main', 'Tools', 'GIAP Tools', 'Vector', 'Raster']
+DEFAULT_TABS = ['Main', 'Tools', 'Vector', 'Raster']
Original file line number	Diff line number	Diff line change
Expand Up		@@ -481,4 +481,4 @@ def get_project_config(parameter, key, default=''):

		]

		DEFAULT_TABS = ['Main', 'Tools', 'GIAP Tools', 'Vector', 'Raster']
		DEFAULT_TABS = ['Main', 'Tools', 'Vector', 'Raster']