git-svn-id: svn://db.shs.com.ru/libs@392 a8b55f48-bf90-11e4-a774-851b48703e85

qcd_utils/pult/cdgraphics.cpp

@@ -214,6 +214,7 @@ QByteArray CDGraphics::save() const {
 	X.lock();
 	cs.add(4, getList(X.enabledList()));
 	X.unlock();
+	cs.add(5, buttonConfigVisible->isChecked());
 	return cs.data();
 }
 
@@ -240,6 +241,9 @@ void CDGraphics::load(QByteArray ba) {
 			X.setEnabledList(setList(cs.getData<QStringList>()));
 			X.unlock();
 			break;
+		case 5:
+			buttonConfigVisible->setChecked(cs.getData<bool>());
+			break;
 		default: break;
 		}
 	}
@@ -258,6 +262,13 @@ GDockWidget * CDGraphics::graphicDock(Graphic * o) const {
 void CDGraphics::addGraphic() {
 	GDockWidget * dw = new GDockWidget(QString("area %1").arg(docks.size()), da);
 	connect(dw, SIGNAL(removeRequest()), this, SLOT(removeGraphic()));
+	connect(buttonConfigVisible, SIGNAL(toggled(bool)), dw->graphic, SLOT(setConfigVisible(bool)));
+	connect(buttonLegendVisible, SIGNAL(clicked(bool)), dw->graphic->graphic(), SLOT(setLegendVisible(bool)));
+	connect(buttonBorderInputsVisible, SIGNAL(clicked(bool)), dw->graphic->graphic(), SLOT(setBorderInputsVisible(bool)));
+	connect(buttonPause, SIGNAL(clicked(bool)), dw->graphic->graphic(), SLOT(setPaused(bool)));
+	dw->graphic->setConfigVisible(buttonConfigVisible->isChecked());
+	dw->graphic->graphic()->setLegendVisible(buttonLegendVisible->isChecked());
+	dw->graphic->graphic()->setBorderInputsVisible(buttonBorderInputsVisible->isChecked());
 	da->addDockWidget(Qt::RightDockWidgetArea, dw);
 	docks << dw;
 	for (int i = 0; i < docks.size(); ++i)

qcd_utils/pult/cdgraphics.ui

@@ -32,13 +32,19 @@
       <enum>QFrame::StyledPanel</enum>
      </property>
      <layout class="QHBoxLayout" name="horizontalLayout">
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
       <item>
        <widget class="QToolButton" name="buttonAdd">
         <property name="toolTip">
          <string>Add new</string>
         </property>
         <property name="icon">
-         <iconset resource="../../qad/application/qad_application.qrc">
+         <iconset resource="../../qad/utils/qad_utils.qrc">
           <normaloff>:/icons/list-add.png</normaloff>:/icons/list-add.png</iconset>
         </property>
        </widget>
@@ -49,7 +55,7 @@
          <string>Clear all</string>
         </property>
         <property name="icon">
-         <iconset resource="../../qad/application/qad_application.qrc">
+         <iconset resource="../../qad/utils/qad_utils.qrc">
           <normaloff>:/icons/edit-clear.png</normaloff>:/icons/edit-clear.png</iconset>
         </property>
        </widget>
@@ -60,11 +66,80 @@
          <string>Remove all</string>
         </property>
         <property name="icon">
-         <iconset resource="../../qad/application/qad_application.qrc">
+         <iconset resource="../../qad/utils/qad_utils.qrc">
           <normaloff>:/icons/edit-delete.png</normaloff>:/icons/edit-delete.png</iconset>
         </property>
        </widget>
       </item>
+      <item>
+       <widget class="QToolButton" name="buttonConfigVisible">
+        <property name="toolTip">
+         <string>Remove all</string>
+        </property>
+        <property name="icon">
+         <iconset resource="../../qad/application/qad_application.qrc">
+          <normaloff>:/icons/layer-visible-off.png</normaloff>
+          <normalon>:/icons/layer-visible-on.png</normalon>:/icons/layer-visible-off.png</iconset>
+        </property>
+        <property name="checkable">
+         <bool>true</bool>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QToolButton" name="buttonLegendVisible">
+        <property name="toolTip">
+         <string>Remove all</string>
+        </property>
+        <property name="icon">
+         <iconset resource="../../qad/widgets/qad_widgets.qrc">
+          <normaloff>:/icons/legend.png</normaloff>:/icons/legend.png</iconset>
+        </property>
+        <property name="checkable">
+         <bool>true</bool>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QToolButton" name="buttonPause">
+        <property name="toolTip">
+         <string>Remove all</string>
+        </property>
+        <property name="icon">
+         <iconset resource="../../qad/graphic/qad_graphic.qrc">
+          <normaloff>:/icons/media-playback-pause.png</normaloff>:/icons/media-playback-pause.png</iconset>
+        </property>
+        <property name="checkable">
+         <bool>true</bool>
+        </property>
+        <property name="checked">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QToolButton" name="buttonBorderInputsVisible">
+        <property name="toolTip">
+         <string>Remove all</string>
+        </property>
+        <property name="icon">
+         <iconset resource="../../qad/widgets/qad_widgets.qrc">
+          <normaloff>:/icons/border-line.png</normaloff>:/icons/border-line.png</iconset>
+        </property>
+        <property name="checkable">
+         <bool>true</bool>
+        </property>
+        <property name="checked">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
       <item>
        <spacer name="horizontalSpacer">
         <property name="orientation">
@@ -84,7 +159,10 @@
   </layout>
  </widget>
  <resources>
+  <include location="../../qad/utils/qad_utils.qrc"/>
+  <include location="../../qad/widgets/qad_widgets.qrc"/>
   <include location="../../qad/application/qad_application.qrc"/>
+  <include location="../../qad/graphic/qad_graphic.qrc"/>
  </resources>
  <connections/>
 </ui>

qcd_utils/qcd_graphic.h

@@ -24,9 +24,11 @@ public:
 	CDGraphicWidget(QWidget * p = 0);
 
 	Graphic * graphic() const;
-	void setConfigVisible(bool on);
 	bool isConfigVisible() const;
 
+public slots:
+	void setConfigVisible(bool on);
+
 private:
 	Ui::CDGraphicWidget * ui;
 

qcd_utils/qcd_graphic.ui

@@ -14,6 +14,21 @@
    <string>CD Pult</string>
   </property>
   <layout class="QVBoxLayout" name="layoutMain">
+   <property name="spacing">
+    <number>0</number>
+   </property>
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
    <item>
     <widget class="Graphic" name="graphic">
      <property name="buttons">