From 3324d9753ce245395ffac0728ecb9970177934fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?=
 =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= <peri4ko@yandex.ru>
Date: Sat, 21 Oct 2017 20:12:54 +0000
Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@302
 a8b55f48-bf90-11e4-a774-851b48703e85

---
 qad/blockview/drawtools.cpp            |   2 +
 qad/blockview/lang/qad_blockview_ru.ts | 125 ++++++++++++++++---------
 2 files changed, 84 insertions(+), 43 deletions(-)

diff --git a/qad/blockview/drawtools.cpp b/qad/blockview/drawtools.cpp
index 075a27c..3c40b7d 100644
--- a/qad/blockview/drawtools.cpp
+++ b/qad/blockview/drawtools.cpp
@@ -756,11 +756,13 @@ void DrawTools::comboLineStyleChanged() {
 			QPen p(ishape->pen());
 			p.setStyle((Qt::PenStyle)ui->comboLineStyle->currentIndex());
 			ishape->setPen(p);
+			changeFinished();
 		}
 	} else if (iline) {
 		QPen p(iline->pen());
 		p.setStyle((Qt::PenStyle)ui->comboLineStyle->currentIndex());
 		iline->setPen(p);
+		changeFinished();
 	}
 }
 
diff --git a/qad/blockview/lang/qad_blockview_ru.ts b/qad/blockview/lang/qad_blockview_ru.ts
index 430c2ea..5d154a9 100644
--- a/qad/blockview/lang/qad_blockview_ru.ts
+++ b/qad/blockview/lang/qad_blockview_ru.ts
@@ -4,7 +4,7 @@
 <context>
     <name>BlockBusItem</name>
     <message>
-        <location filename="../blockbusitem.cpp" line="451"/>
+        <location filename="../blockbusitem.cpp" line="453"/>
         <source>Add point: Ctrl + LeftClick
 Remove point\segment: Ctrl + RightClick
 New branch: Shift + LeftClick
@@ -149,177 +149,216 @@ Remove connection: Shift + RightClick</source>
     </message>
     <message>
         <location filename="../drawtools.ui" line="123"/>
-        <location filename="../drawtools.ui" line="143"/>
-        <location filename="../drawtools.ui" line="242"/>
+        <location filename="../drawtools.ui" line="137"/>
+        <location filename="../drawtools.ui" line="230"/>
         <source>Align center left</source>
         <translation>Выравнивание слева по центру</translation>
     </message>
     <message>
-        <location filename="../drawtools.ui" line="190"/>
+        <location filename="../drawtools.ui" line="178"/>
         <source>Align center</source>
         <translation>Выравнивание по центру</translation>
     </message>
     <message>
-        <location filename="../drawtools.ui" line="216"/>
+        <location filename="../drawtools.ui" line="204"/>
         <source>Align center right</source>
         <translation>Выравнивание справа по центру</translation>
     </message>
     <message>
-        <location filename="../drawtools.ui" line="268"/>
+        <location filename="../drawtools.ui" line="256"/>
         <source>Align top right</source>
         <translation>Выравнивание справа сверху</translation>
     </message>
     <message>
-        <location filename="../drawtools.ui" line="294"/>
+        <location filename="../drawtools.ui" line="282"/>
         <source>Align bottom right</source>
         <translation>Выравнивание справа снизу</translation>
     </message>
     <message>
-        <location filename="../drawtools.ui" line="320"/>
+        <location filename="../drawtools.ui" line="308"/>
         <source>Align bottom center</source>
         <translation>Выравнивание снизу по центру</translation>
     </message>
     <message>
-        <location filename="../drawtools.ui" line="346"/>
+        <location filename="../drawtools.ui" line="334"/>
         <source>Align top left</source>
         <translation>Выравнивание слева сверху</translation>
     </message>
     <message>
-        <location filename="../drawtools.ui" line="372"/>
+        <location filename="../drawtools.ui" line="360"/>
         <source>Align top center</source>
         <translation>Выравнивание сверху по центру</translation>
     </message>
     <message>
-        <location filename="../drawtools.ui" line="398"/>
+        <location filename="../drawtools.ui" line="386"/>
         <source>Align bottom left</source>
         <translation>Выравнивание снизу слева</translation>
     </message>
     <message>
-        <location filename="../drawtools.ui" line="443"/>
         <source>Size: </source>
-        <translation>Размер: </translation>
+        <translation type="vanished">Размер: </translation>
     </message>
     <message>
-        <location filename="../drawtools.ui" line="475"/>
-        <source>X</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../drawtools.ui" line="523"/>
+        <location filename="../drawtools.ui" line="471"/>
         <source>Width: </source>
+        <translation>Ширина: </translation>
+    </message>
+    <message>
+        <location filename="../drawtools.ui" line="506"/>
+        <source>Thickness: </source>
         <translation>Толщина: </translation>
     </message>
     <message>
-        <location filename="../drawtools.ui" line="571"/>
+        <location filename="../drawtools.ui" line="522"/>
+        <source>Height:</source>
+        <translation>Высота:</translation>
+    </message>
+    <message>
+        <location filename="../drawtools.ui" line="554"/>
+        <source>Style:</source>
+        <translation>Стиль:</translation>
+    </message>
+    <message>
+        <location filename="../drawtools.ui" line="591"/>
         <source>Load image ...</source>
         <translation>Загрузить картинку ...</translation>
     </message>
     <message>
-        <location filename="../drawtools.ui" line="604"/>
+        <location filename="../drawtools.ui" line="624"/>
         <source>Scale:</source>
         <translation>Масштаб:</translation>
     </message>
     <message>
-        <location filename="../drawtools.ui" line="707"/>
+        <location filename="../drawtools.ui" line="727"/>
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../drawtools.ui" line="715"/>
-        <location filename="../drawtools.ui" line="718"/>
-        <location filename="../drawtools.ui" line="737"/>
-        <location filename="../drawtools.ui" line="740"/>
+        <location filename="../drawtools.ui" line="735"/>
+        <location filename="../drawtools.ui" line="738"/>
+        <location filename="../drawtools.ui" line="757"/>
+        <location filename="../drawtools.ui" line="760"/>
         <source>Center</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../drawtools.ui" line="726"/>
-        <location filename="../drawtools.ui" line="729"/>
+        <location filename="../drawtools.ui" line="746"/>
+        <location filename="../drawtools.ui" line="749"/>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../drawtools.ui" line="748"/>
-        <location filename="../drawtools.ui" line="751"/>
+        <location filename="../drawtools.ui" line="768"/>
+        <location filename="../drawtools.ui" line="771"/>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../drawtools.ui" line="759"/>
-        <location filename="../drawtools.ui" line="762"/>
+        <location filename="../drawtools.ui" line="779"/>
+        <location filename="../drawtools.ui" line="782"/>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../drawtools.cpp" line="232"/>
+        <location filename="../drawtools.cpp" line="236"/>
+        <source>NoPen</source>
+        <translation>НетЛинии</translation>
+    </message>
+    <message>
+        <location filename="../drawtools.cpp" line="236"/>
+        <source>Solid</source>
+        <translation>Сплошная</translation>
+    </message>
+    <message>
+        <location filename="../drawtools.cpp" line="236"/>
+        <source>Dash</source>
+        <translation>Штриховая</translation>
+    </message>
+    <message>
+        <location filename="../drawtools.cpp" line="237"/>
+        <source>Dot</source>
+        <translation>Пунктирная</translation>
+    </message>
+    <message>
+        <location filename="../drawtools.cpp" line="237"/>
+        <source>Dash-Dot</source>
+        <translation>ШтрихПунктирная</translation>
+    </message>
+    <message>
+        <location filename="../drawtools.cpp" line="237"/>
+        <source>Dash-Dot-Dot</source>
+        <translation>ШтрихПунктирПунктирная</translation>
+    </message>
+    <message>
+        <location filename="../drawtools.cpp" line="257"/>
         <source>Edit text</source>
         <translation>Редактировать текст</translation>
     </message>
     <message>
-        <location filename="../drawtools.cpp" line="239"/>
+        <location filename="../drawtools.cpp" line="264"/>
         <source>Bring
 forward</source>
         <translation>Переместить
 выше</translation>
     </message>
     <message>
-        <location filename="../drawtools.cpp" line="240"/>
+        <location filename="../drawtools.cpp" line="265"/>
         <source>Bring
 to front</source>
         <translation>На передний
 фон</translation>
     </message>
     <message>
-        <location filename="../drawtools.cpp" line="241"/>
+        <location filename="../drawtools.cpp" line="266"/>
         <source>Send
 backward</source>
         <translation>Переместить
 ниже</translation>
     </message>
     <message>
-        <location filename="../drawtools.cpp" line="242"/>
+        <location filename="../drawtools.cpp" line="267"/>
         <source>Send
 to back</source>
         <translation>На задний
 фон</translation>
     </message>
     <message>
-        <location filename="../drawtools.cpp" line="243"/>
+        <location filename="../drawtools.cpp" line="268"/>
         <source>Draw
 Rectangle</source>
         <translation>Нарисовать
 прямоугольник</translation>
     </message>
     <message>
-        <location filename="../drawtools.cpp" line="244"/>
+        <location filename="../drawtools.cpp" line="269"/>
         <source>Draw
 Ellipse</source>
         <translation>Нарисовать
 эллипс</translation>
     </message>
     <message>
-        <location filename="../drawtools.cpp" line="245"/>
+        <location filename="../drawtools.cpp" line="270"/>
         <source>Draw
 Line</source>
         <translation>Нарисовать
 линию</translation>
     </message>
     <message>
-        <location filename="../drawtools.cpp" line="246"/>
+        <location filename="../drawtools.cpp" line="271"/>
         <source>Draw
 Text</source>
         <translation>Нарисовать
 текст</translation>
     </message>
     <message>
-        <location filename="../drawtools.cpp" line="247"/>
+        <location filename="../drawtools.cpp" line="272"/>
         <source>Draw
 Image</source>
         <translation>Нарисовать
 картинку</translation>
     </message>
     <message>
-        <location filename="../drawtools.cpp" line="716"/>
+        <location filename="../drawtools.cpp" line="778"/>
         <source>Select image</source>
         <translation>Выбрать картинку</translation>
     </message>