Merge branch 'Dodanie_tooltipow_zmiana_fontu2' into 'dev'

Dodanie tooltipow zmiana fontu2

See merge request polamap/giap_layout!31

config.json

@@ -1 +1 @@
-[{"org_toolbars": ["mFileToolBar", "mLayerToolBar", "mDigitizeToolBar", "mMapNavToolBar", "mAttributesToolBar", "mPluginToolBar", "mLabelToolBar", "mSnappingToolBar", "mSelectionToolBar"], "styles": {"GIAP": "giap.qss", "ciemny": "wombat.qss"}, "ribbons_config": [{"tab_name": "Tools", "sections": [{"label": "Adv. Attributes", "btn_size": 30, "btns": [["mActionIdentify", 0, 0], ["mActionSelectFeatures", 0, 1], ["mActionSelectPolygon", 0, 2], ["mActionSelectByExpression", 0, 3], ["mActionInvertSelection", 0, 4], ["mActionDeselectAll", 0, 5], ["mActionOpenTable", 1, 0], ["mActionStatisticalSummary", 1, 1], ["mActionOpenFieldCalc", 1, 2], ["mActionMapTips", 1, 3], ["mActionNewBookmark", 1, 4], ["mActionShowBookmarks", 1, 5]]}, {"label": "Labels", "btn_size": 30, "btns": [["mActionLabeling", 0, 0], ["mActionChangeLabelProperties", 0, 1], ["mActionPinLabels", 0, 2], ["mActionShowPinnedLabels", 0, 3], ["mActionShowHideLabels", 0, 4], ["mActionMoveLabel", 1, 0], ["mActionRotateLabel", 1, 1], ["mActionDiagramProperties", 1, 2], ["mActionShowUnplacedLabels", 1, 3]]}, {"label": "Vector", "btn_size": 30, "btns": [["mActionToggleEditing", 0, 0], ["mActionSaveLayerEdits", 0, 1], ["mActionVertexTool", 0, 2], ["mActionUndo", 0, 3], ["mActionRedo", 0, 4], ["mActionAddFeature", 1, 0], ["mActionMoveFeature", 1, 1], ["mActionDeleteSelected", 1, 2], ["mActionCutFeatures", 1, 3], ["mActionCopyFeatures", 1, 4], ["mActionPasteFeatures", 1, 5]]}, {"label": "Digitalization", "btn_size": 30, "btns": [["EnableSnappingAction", 0, 0], ["EnableTracingAction", 0, 1], ["mActionRotateFeature", 0, 2], ["mActionSimplifyFeature", 0, 3], ["mActionAddRing", 0, 4], ["mActionAddPart", 0, 5], ["mActionFillRing", 0, 6], ["mActionOffsetCurve", 0, 7], ["mActionCircularStringCurvePoint", 0, 8], ["mActionDeleteRing", 1, 0], ["mActionDeletePart", 1, 1], ["mActionReshapeFeatures", 1, 2], ["mActionSplitParts", 1, 3], ["mActionSplitFeatures", 1, 4], ["mActionMergeFeatureAttributes", 1, 5], ["mActionMergeFeatures", 1, 6], ["mActionReverseLine", 1, 7], ["mActionTrimExtendFeature", 1, 8]]}]}], "active_style": "GIAP"}]
+[{"org_toolbars": ["mFileToolBar", "mLayerToolBar", "mDigitizeToolBar", "mMapNavToolBar", "mAttributesToolBar", "mPluginToolBar", "mLabelToolBar", "mSnappingToolBar", "mSelectionToolBar"], "styles": {"GIAP": "giap.qss", "ciemny": "wombat.qss"}, "ribbons_config": [{"tab_name": "Main", "sections": [{"label": "Project", "btn_size": 30, "btns": [["mActionOpenProject", 0, 0], ["mActionNewProject", 0, 1], ["mActionSaveProject", 1, 0], ["mActionSaveProjectAs", 1, 1]]}, {"label": "Navigation", "btn_size": 30, "btns": [["mActionPan", 0, 0], ["mActionZoomIn", 0, 1], ["mActionZoomOut", 0, 2], ["mActionZoomFullExtent", 0, 3], ["mActionZoomToLayer", 1, 0], ["mActionZoomToSelected", 1, 1], ["mActionZoomLast", 1, 2], ["mActionZoomNext", 1, 3]]}, {"label": "Attributes", "btn_size": 30, "btns": [["mActionIdentify", 0, 0], ["mActionSelectFeatures", 0, 1], ["mActionDeselectAll", 1, 0], ["mActionOpenTable", 1, 1]]}, {"label": "Measures", "btn_size": 30, "btns": [["mActionMeasure", 0, 0], ["mActionMeasureArea", 0, 1], ["mActionMeasureAngle", 1, 0]]}, {"label": "Layers", "btn_size": 30, "btns": [["mActionAddOgrLayer", 0, 0], ["mActionAddWmsLayer", 0, 1], ["mActionAddPgLayer", 0, 2], ["mActionAddMeshLayer", 0, 3], ["mActionAddWcsLayer", 0, 4], ["mActionAddDelimitedText", 0, 5], ["mActionAddRasterLayer", 1, 0], ["mActionAddWfsLayer", 1, 1], ["mActionAddSpatiaLiteLayer", 1, 2], ["mActionAddVirtualLayer", 1, 3], ["mActionNewMemoryLayer", 1, 4]]}, {"label": "Prints", "btn_size": 30, "btns": [["mActionNewPrintLayout", 0, 0], ["giapMyPrints", 0, 1], ["mActionShowLayoutManager", 1, 0]]}]}, {"tab_name": "Tools", "sections": [{"label": "Adv. Attributes", "btn_size": 30, "btns": [["mActionIdentify", 0, 0], ["mActionSelectFeatures", 0, 1], ["mActionSelectPolygon", 0, 2], ["mActionSelectByExpression", 0, 3], ["mActionInvertSelection", 0, 4], ["mActionDeselectAll", 0, 5], ["mActionOpenTable", 1, 0], ["mActionStatisticalSummary", 1, 1], ["mActionOpenFieldCalc", 1, 2], ["mActionMapTips", 1, 3], ["mActionNewBookmark", 1, 4], ["mActionShowBookmarks", 1, 5]]}, {"label": "Labels", "btn_size": 30, "btns": [["mActionLabeling", 0, 0], ["mActionChangeLabelProperties", 0, 1], ["mActionPinLabels", 0, 2], ["mActionShowPinnedLabels", 0, 3], ["mActionShowHideLabels", 0, 4], ["mActionMoveLabel", 1, 0], ["mActionRotateLabel", 1, 1], ["mActionDiagramProperties", 1, 2], ["mActionShowUnplacedLabels", 1, 3]]}, {"label": "Vector", "btn_size": 30, "btns": [["mActionToggleEditing", 0, 0], ["mActionSaveLayerEdits", 0, 1], ["mActionVertexTool", 0, 2], ["mActionUndo", 0, 3], ["mActionRedo", 0, 4], ["mActionAddFeature", 1, 0], ["mActionMoveFeature", 1, 1], ["mActionDeleteSelected", 1, 2], ["mActionCutFeatures", 1, 3], ["mActionCopyFeatures", 1, 4], ["mActionPasteFeatures", 1, 5]]}, {"label": "Digitalization", "btn_size": 30, "btns": [["EnableSnappingAction", 0, 0], ["EnableTracingAction", 0, 1], ["mActionRotateFeature", 0, 2], ["mActionSimplifyFeature", 0, 3], ["mActionAddRing", 0, 4], ["mActionAddPart", 0, 5], ["mActionFillRing", 0, 6], ["mActionOffsetCurve", 0, 7], ["mActionCircularStringCurvePoint", 0, 8], ["mActionDeleteRing", 1, 0], ["mActionDeletePart", 1, 1], ["mActionReshapeFeatures", 1, 2], ["mActionSplitParts", 1, 3], ["mActionSplitFeatures", 1, 4], ["mActionMergeFeatureAttributes", 1, 5], ["mActionMergeFeatures", 1, 6], ["mActionReverseLine", 1, 7], ["mActionTrimExtendFeature", 1, 8]]}]}, {"tab_name": "Vector", "sections": [{"label": "Geoprocessing", "btn_size": 30, "btns": [["mProcessingUserMenu_native:buffer", 0, 0], ["mProcessingUserMenu_native:convexhull", 0, 1], ["mProcessingUserMenu_native:difference", 0, 2], ["mProcessingUserMenu_native:dissolve", 0, 3], ["mProcessingUserMenu_qgis:eliminateselectedpolygons", 0, 4], ["mProcessingUserMenu_native:clip", 1, 0], ["mProcessingUserMenu_native:intersection", 1, 1], ["mProcessingUserMenu_native:symmetricaldifference", 1, 2], ["mProcessingUserMenu_native:union", 1, 3]]}, {"label": "Geometry", "btn_size": 30, "btns": [["mProcessingUserMenu_native:centroids", 0, 0], ["mProcessingUserMenu_native:collect", 0, 1], ["mProcessingUserMenu_native:densifygeometries", 0, 2], ["mProcessingUserMenu_native:extractvertices", 0, 3], ["mProcessingUserMenu_native:multiparttosingleparts", 0, 4], ["mProcessingUserMenu_native:polygonstolines", 0, 5], ["mProcessingUserMenu_native:simplifygeometries", 1, 0], ["mProcessingUserMenu_qgis:checkvalidity", 1, 1], ["mProcessingUserMenu_qgis:delaunaytriangulation", 1, 2], ["mProcessingUserMenu_qgis:exportaddgeometrycolumns", 1, 3], ["mProcessingUserMenu_qgis:linestopolygons", 1, 4], ["mProcessingUserMenu_qgis:voronoipolygons", 1, 5]]}, {"label": "Analysis", "btn_size": 30, "btns": [["mProcessingUserMenu_native:countpointsinpolygon", 0, 0], ["mProcessingUserMenu_native:lineintersections", 0, 1], ["mProcessingUserMenu_native:meancoordinates", 0, 2], ["mProcessingUserMenu_native:nearestneighbouranalysis", 0, 3], ["mProcessingUserMenu_native:sumlinelengths", 1, 0], ["mProcessingUserMenu_qgis:basicstatisticsforfields", 1, 1], ["mProcessingUserMenu_qgis:distancematrix", 1, 2], ["mProcessingUserMenu_qgis:listuniquevalues", 1, 3]]}, {"label": "Research", "btn_size": 30, "btns": [["mProcessingUserMenu_native:creategrid", 0, 0], ["mProcessingUserMenu_native:polygonfromlayerextent", 0, 1], ["mProcessingUserMenu_native:randompointsinextent", 0, 2], ["mProcessingUserMenu_native:randompointsinpolygons", 0, 3], ["mProcessingUserMenu_native:randompointsonlines", 0, 4], ["mProcessingUserMenu_native:selectbylocation", 0, 5], ["mProcessingUserMenu_qgis:randompointsinlayerbounds", 1, 0], ["mProcessingUserMenu_qgis:randompointsinsidepolygons", 1, 1], ["mProcessingUserMenu_qgis:randomselection", 1, 2], ["mProcessingUserMenu_qgis:randomselectionwithinsubsets", 1, 3], ["mProcessingUserMenu_qgis:regularpoints", 1, 4]]}, {"label": "Data tools", "btn_size": 30, "btns": [["mProcessingUserMenu_native:createspatialindex", 0, 0], ["mProcessingUserMenu_native:joinattributesbylocation", 0, 1], ["mProcessingUserMenu_native:mergevectorlayers", 0, 2], ["mProcessingUserMenu_native:reprojectlayer", 1, 0], ["mProcessingUserMenu_native:splitvectorlayer", 1, 1]]}]}, {"tab_name": "Raster", "sections": [{"label": "Raster", "btn_size": 60, "btns": [["mActionShowRasterCalculator", 0, 0], ["mActionShowGeoreferencer", 0, 1], ["mActionShowAlignRasterTool", 0, 2]]}, {"label": "Raster analysis", "btn_size": 30, "btns": [["mProcessingUserMenu_gdal:aspect", 0, 0], ["mProcessingUserMenu_gdal:fillnodata", 0, 1], ["mProcessingUserMenu_gdal:gridaverage", 0, 2], ["mProcessingUserMenu_gdal:griddatametrics", 0, 3], ["mProcessingUserMenu_gdal:gridinversedistance", 0, 4], ["mProcessingUserMenu_gdal:gridnearestneighbor", 0, 5], ["mProcessingUserMenu_gdal:hillshade", 0, 6], ["mProcessingUserMenu_gdal:nearblack", 1, 0], ["mProcessingUserMenu_gdal:proximity", 1, 1], ["mProcessingUserMenu_gdal:roughness", 1, 2], ["mProcessingUserMenu_gdal:sieve", 1, 3], ["mProcessingUserMenu_gdal:slope", 1, 4], ["mProcessingUserMenu_gdal:tpitopographicpositionindex", 1, 5], ["mProcessingUserMenu_gdal:triterrainruggednessindex", 1, 6]]}, {"label": "Projections", "btn_size": 60, "btns": [["mProcessingUserMenu_gdal:warpreproject", 0, 0], ["mProcessingUserMenu_gdal:assignprojection", 0, 1], ["mProcessingUserMenu_gdal:extractprojection", 0, 2]]}, {"label": "Miscellaneous", "btn_size": 30, "btns": [["mProcessingUserMenu_gdal:buildvirtualraster", 0, 0], ["mProcessingUserMenu_gdal:gdalinfo", 0, 1], ["mProcessingUserMenu_gdal:merge", 0, 2], ["mProcessingUserMenu_gdal:overviews", 1, 0], ["mProcessingUserMenu_gdal:tileindex", 1, 1]]}, {"label": "Extract", "btn_size": 30, "btns": [["mProcessingUserMenu_gdal:cliprasterbyextent", 0, 0], ["mProcessingUserMenu_gdal:cliprasterbymasklayer", 0, 1], ["mProcessingUserMenu_gdal:contour", 1, 0]]}, {"label": "Conversion", "btn_size": 30, "btns": [["mProcessingUserMenu_gdal:pcttorgb", 0, 0], ["mProcessingUserMenu_gdal:rgbtopct", 0, 1], ["mProcessingUserMenu_gdal:polygonize", 0, 2], ["mProcessingUserMenu_gdal:rasterize", 1, 0], ["mProcessingUserMenu_gdal:translate", 1, 1]]}]}], "active_style": "GIAP"}]

giap_dynamic_layout.ui

@@ -195,7 +195,9 @@
         </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>
+        <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"/>
@@ -227,7 +229,9 @@
         </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>
+        <string>Enter the data according to the scheme:
+for the address point: Warszawa, Pasaż Ursynowski 1
+for the street: Warszawa, Pasaż Ursynowski</string>
        </property>
        <property name="text">
         <string/>
@@ -253,8 +257,7 @@
      <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>
+        <string notr="true">color: rgb(255, 255, 255);</string>
        </property>
        <property name="text">
         <string>Narzędzia GIAP  </string>

giap_layout.py

@@ -142,7 +142,6 @@ def initGui(self):
         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)
 

i18n/giap_pl.ts

@@ -600,13 +600,21 @@ Porszę czekać...</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>
+        <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>
+        <source>Enter the data according to the scheme:
+for the address point: Warszawa, Pasaż Ursynowski 1
+for the street: Warszawa, Pasaż Ursynowski</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"/>

styles/ciemny/wombat.qss

@@ -296,6 +296,13 @@ QToolBar {
 	font-weight: bold;
 }
 
+QToolBar QLabel
+{
+    font: 9pt "Segoe UI";
+	font-weight: bold;
+	border: no;
+}
+
 QToolBar::handle:horizontal
 {
 	image: url(:/qss_icons/rc/Hmovetoolbar.png);

styles/giap/giap.qss

@@ -608,3 +608,10 @@ QPlainTextEdit
 QProgressBar::chunk:horizontal {
 	background-color: qlineargradient(spread:reflect, x1:1, y1:0.545, x2:1, y2:0, stop:0 rgba(28, 66, 111, 255), stop:1 rgba(37, 87, 146, 255));
 }
+
+QToolBar QLabel
+{
+    font: 9pt "Segoe UI";
+	font-weight: bold;
+	border: no;
+}