SHS/cd
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '949edb1f68b6b0ab36e7354f9240c7ca285cfb4f'

Browse Source
This commit is contained in:
Бычков Андрей
2020-10-21 11:20:27 +03:00
parent 1ef5152af2 949edb1f68
commit d6734e1954
6 changed files with 38 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
utils/pult/cddirectk.ui
View File

@@ -44,7 +44,7 @@
<string>Add new</string> <string>Add new</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../../qad/application/qad_application.qrc"> <iconset resource="../../../qad/libs/qglview/qglview.qrc">
<normaloff>:/icons/list-add.png</normaloff>:/icons/list-add.png</iconset> <normaloff>:/icons/list-add.png</normaloff>:/icons/list-add.png</iconset>
</property> </property>
</widget> </widget>
@@ -55,7 +55,7 @@
<string>Remove all</string> <string>Remove all</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../../qad/application/qad_application.qrc"> <iconset resource="../../../qad/libs/blockview/qad_blockview.qrc">
<normaloff>:/icons/edit-delete.png</normaloff>:/icons/edit-delete.png</iconset> <normaloff>:/icons/edit-delete.png</normaloff>:/icons/edit-delete.png</iconset>
</property> </property>
</widget> </widget>
@@ -79,7 +79,8 @@
</layout> </layout>
</widget> </widget>
<resources> <resources>
<include location="../../qad/application/qad_application.qrc"/> <include location="../../../qad/libs/blockview/qad_blockview.qrc"/>
<include location="../../../qad/libs/qglview/qglview.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>

30
utils/pult/cdgraphics.ui
View File

@@ -44,7 +44,7 @@
<string>Add new</string> <string>Add new</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../../qad/utils/qad_utils.qrc"> <iconset resource="../../../qad/libs/qglview/qglview.qrc">
<normaloff>:/icons/list-add.png</normaloff>:/icons/list-add.png</iconset> <normaloff>:/icons/list-add.png</normaloff>:/icons/list-add.png</iconset>
</property> </property>
</widget> </widget>
@@ -55,7 +55,7 @@
<string>Clear all</string> <string>Clear all</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../../qad/utils/qad_utils.qrc"> <iconset resource="../../../qad/libs/application/qad_application.qrc">
<normaloff>:/icons/edit-clear.png</normaloff>:/icons/edit-clear.png</iconset> <normaloff>:/icons/edit-clear.png</normaloff>:/icons/edit-clear.png</iconset>
</property> </property>
</widget> </widget>
@@ -66,7 +66,7 @@
<string>Remove all</string> <string>Remove all</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../../qad/utils/qad_utils.qrc"> <iconset resource="../../../qad/libs/blockview/qad_blockview.qrc">
<normaloff>:/icons/edit-delete.png</normaloff>:/icons/edit-delete.png</iconset> <normaloff>:/icons/edit-delete.png</normaloff>:/icons/edit-delete.png</iconset>
</property> </property>
</widget> </widget>
@@ -74,10 +74,10 @@
<item> <item>
<widget class="QToolButton" name="buttonConfigVisible"> <widget class="QToolButton" name="buttonConfigVisible">
<property name="toolTip"> <property name="toolTip">
<string>Remove all</string> <string>Show settings</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../../qad/application/qad_application.qrc"> <iconset resource="../../../qad/libs/application/qad_application.qrc">
<normaloff>:/icons/layer-visible-off.png</normaloff> <normaloff>:/icons/layer-visible-off.png</normaloff>
<normalon>:/icons/layer-visible-on.png</normalon>:/icons/layer-visible-off.png</iconset> <normalon>:/icons/layer-visible-on.png</normalon>:/icons/layer-visible-off.png</iconset>
</property> </property>
@@ -92,10 +92,10 @@
<item> <item>
<widget class="QToolButton" name="buttonLegendVisible"> <widget class="QToolButton" name="buttonLegendVisible">
<property name="toolTip"> <property name="toolTip">
<string>Remove all</string> <string>Legend</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../../qad/widgets/qad_widgets.qrc"> <iconset resource="../../../qad/libs/graphic/qad_graphic.qrc">
<normaloff>:/icons/legend.png</normaloff>:/icons/legend.png</iconset> <normaloff>:/icons/legend.png</normaloff>:/icons/legend.png</iconset>
</property> </property>
<property name="checkable"> <property name="checkable">
@@ -109,10 +109,10 @@
<item> <item>
<widget class="QToolButton" name="buttonPause"> <widget class="QToolButton" name="buttonPause">
<property name="toolTip"> <property name="toolTip">
<string>Remove all</string> <string>Pause</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../../qad/graphic/qad_graphic.qrc"> <iconset resource="../../../qad/libs/graphic/qad_graphic.qrc">
<normaloff>:/icons/media-playback-pause.png</normaloff>:/icons/media-playback-pause.png</iconset> <normaloff>:/icons/media-playback-pause.png</normaloff>:/icons/media-playback-pause.png</iconset>
</property> </property>
<property name="checkable"> <property name="checkable">
@@ -126,10 +126,10 @@
<item> <item>
<widget class="QToolButton" name="buttonBorderInputsVisible"> <widget class="QToolButton" name="buttonBorderInputsVisible">
<property name="toolTip"> <property name="toolTip">
<string>Remove all</string> <string>Edges</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../../qad/widgets/qad_widgets.qrc"> <iconset resource="../../../qad/libs/graphic/qad_graphic.qrc">
<normaloff>:/icons/border-line.png</normaloff>:/icons/border-line.png</iconset> <normaloff>:/icons/border-line.png</normaloff>:/icons/border-line.png</iconset>
</property> </property>
<property name="checkable"> <property name="checkable">
@@ -159,10 +159,10 @@
</layout> </layout>
</widget> </widget>
<resources> <resources>
<include location="../../qad/utils/qad_utils.qrc"/> <include location="../../../qad/libs/application/qad_application.qrc"/>
<include location="../../qad/widgets/qad_widgets.qrc"/> <include location="../../../qad/libs/blockview/qad_blockview.qrc"/>
<include location="../../qad/application/qad_application.qrc"/> <include location="../../../qad/libs/graphic/qad_graphic.qrc"/>
<include location="../../qad/graphic/qad_graphic.qrc"/> <include location="../../../qad/libs/qglview/qglview.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>

1
utils/pult/cdpult.qrc
View File

@@ -6,5 +6,6 @@
<file>icons/flame.png</file> <file>icons/flame.png</file>
<file>icons/accessories-calculator.png</file> <file>icons/accessories-calculator.png</file>
<file>icons/accessories-text-editor.png</file> <file>icons/accessories-text-editor.png</file>
<file>icons/dialog-information.png</file>
</qresource> </qresource>
</RCC> </RCC>

1
utils/pult/cdpultwindow.cpp
View File

@@ -26,6 +26,7 @@ CDPultWindow::CDPultWindow(QWidget *parent) : EMainWindow(parent), Ui::CDPultWin
centralWidget()->hide(); centralWidget()->hide();
setTabPosition(Qt::AllDockWidgetAreas, QTabWidget::North); setTabPosition(Qt::AllDockWidgetAreas, QTabWidget::North);
CDCore::instance()->initPult(); CDCore::instance()->initPult();
codeConfig->setCommentText("#");
def_config = codeConfig->text(); def_config = codeConfig->text();
checkDefaultConfig->setChecked(true); checkDefaultConfig->setChecked(true);
new ConfigHighlighter(codeConfig->document()); new ConfigHighlighter(codeConfig->document());

33
utils/pult/cdpultwindow.ui
View File

@@ -38,7 +38,7 @@
<string>Open recent</string> <string>Open recent</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../../qad/application/qad_application.qrc"> <iconset resource="../../../qad/libs/widgets/qad_widgets.qrc">
<normaloff>:/icons/document-open-recent.png</normaloff>:/icons/document-open-recent.png</iconset> <normaloff>:/icons/document-open-recent.png</normaloff>:/icons/document-open-recent.png</iconset>
</property> </property>
</widget> </widget>
@@ -51,7 +51,7 @@
</widget> </widget>
<widget class="EDockWidget" name="dockCDKView"> <widget class="EDockWidget" name="dockCDKView">
<property name="windowIcon"> <property name="windowIcon">
<iconset resource="../../qad/application/qad_application.qrc"> <iconset resource="../../../qad/libs/blockview/qad_blockview.qrc">
<normaloff>:/icons/document-edit.png</normaloff>:/icons/document-edit.png</iconset> <normaloff>:/icons/document-edit.png</normaloff>:/icons/document-edit.png</iconset>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@@ -73,7 +73,7 @@
</widget> </widget>
<widget class="EDockWidget" name="dockLog"> <widget class="EDockWidget" name="dockLog">
<property name="windowIcon"> <property name="windowIcon">
<iconset resource="cdpult.qrc"> <iconset>
<normaloff>:/icons/dialog-information.png</normaloff>:/icons/dialog-information.png</iconset> <normaloff>:/icons/dialog-information.png</normaloff>:/icons/dialog-information.png</iconset>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@@ -114,7 +114,7 @@
</widget> </widget>
<widget class="EDockWidget" name="dockCDXView"> <widget class="EDockWidget" name="dockCDXView">
<property name="windowIcon"> <property name="windowIcon">
<iconset resource="../../qad/widgets/qad_widgets.qrc"> <iconset resource="../../../qad/libs/widgets/qad_widgets.qrc">
<normaloff>:/icons/qvariantedit.png</normaloff>:/icons/qvariantedit.png</iconset> <normaloff>:/icons/qvariantedit.png</normaloff>:/icons/qvariantedit.png</iconset>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@@ -133,7 +133,7 @@
</widget> </widget>
<widget class="EDockWidget" name="dockSession"> <widget class="EDockWidget" name="dockSession">
<property name="windowIcon"> <property name="windowIcon">
<iconset resource="../../qad/application/qad_application.qrc"> <iconset resource="../../../qad/libs/application/qad_application.qrc">
<normaloff>:/icons/configure.png</normaloff>:/icons/configure.png</iconset> <normaloff>:/icons/configure.png</normaloff>:/icons/configure.png</iconset>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@@ -150,7 +150,7 @@
<string>Apply</string> <string>Apply</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../../qad/widgets/qad_widgets.qrc"> <iconset resource="../../../qad/libs/application/qad_application.qrc">
<normaloff>:/icons/dialog-ok-apply.png</normaloff>:/icons/dialog-ok-apply.png</iconset> <normaloff>:/icons/dialog-ok-apply.png</normaloff>:/icons/dialog-ok-apply.png</iconset>
</property> </property>
</widget> </widget>
@@ -181,7 +181,7 @@
<string>Select icon...</string> <string>Select icon...</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../../qad/blockview/qad_blockview.qrc"> <iconset resource="../../../qad/libs/blockview/qad_blockview.qrc">
<normaloff>:/icons/view-preview.png</normaloff>:/icons/view-preview.png</iconset> <normaloff>:/icons/view-preview.png</normaloff>:/icons/view-preview.png</iconset>
</property> </property>
</widget> </widget>
@@ -304,7 +304,7 @@ device.cd = eth://udp:${ip.pult}:27002:${ip.app}:27001 #s
</widget> </widget>
<widget class="EDockWidget" name="dockCDCView"> <widget class="EDockWidget" name="dockCDCView">
<property name="windowIcon"> <property name="windowIcon">
<iconset resource="../../qad/blockview/qad_blockview.qrc"> <iconset resource="../../../qad/libs/graphic/qad_graphic.qrc">
<normaloff>:/icons/legend.png</normaloff>:/icons/legend.png</iconset> <normaloff>:/icons/legend.png</normaloff>:/icons/legend.png</iconset>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@@ -323,7 +323,7 @@ device.cd = eth://udp:${ip.pult}:27002:${ip.app}:27001 #s
</widget> </widget>
<widget class="EDockWidget" name="dockGraphics"> <widget class="EDockWidget" name="dockGraphics">
<property name="windowIcon"> <property name="windowIcon">
<iconset resource="../../qad/blockview/qad_blockview.qrc"> <iconset resource="../../../qad/libs/blockview/qad_blockview.qrc">
<normaloff>:/icons/format-stroke-color.png</normaloff>:/icons/format-stroke-color.png</iconset> <normaloff>:/icons/format-stroke-color.png</normaloff>:/icons/format-stroke-color.png</iconset>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@@ -342,7 +342,7 @@ device.cd = eth://udp:${ip.pult}:27002:${ip.app}:27001 #s
</widget> </widget>
<widget class="EDockWidget" name="dockDirectK"> <widget class="EDockWidget" name="dockDirectK">
<property name="windowIcon"> <property name="windowIcon">
<iconset resource="../../qad/widgets/qad_widgets.qrc"> <iconset resource="../../../qad/libs/widgets/qad_widgets.qrc">
<normaloff>:/icons/tools-wizard.png</normaloff>:/icons/tools-wizard.png</iconset> <normaloff>:/icons/tools-wizard.png</normaloff>:/icons/tools-wizard.png</iconset>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@@ -380,7 +380,7 @@ device.cd = eth://udp:${ip.pult}:27002:${ip.app}:27001 #s
</widget> </widget>
<action name="actionOpen"> <action name="actionOpen">
<property name="icon"> <property name="icon">
<iconset resource="../../qad/application/qad_application.qrc"> <iconset resource="../../../qad/libs/blockview/qad_blockview.qrc">
<normaloff>:/icons/document-open.png</normaloff>:/icons/document-open.png</iconset> <normaloff>:/icons/document-open.png</normaloff>:/icons/document-open.png</iconset>
</property> </property>
<property name="text"> <property name="text">
@@ -392,7 +392,7 @@ device.cd = eth://udp:${ip.pult}:27002:${ip.app}:27001 #s
</action> </action>
<action name="actionSave"> <action name="actionSave">
<property name="icon"> <property name="icon">
<iconset resource="../../qad/application/qad_application.qrc"> <iconset resource="../../../qad/libs/blockview/qad_blockview.qrc">
<normaloff>:/icons/document-save.png</normaloff>:/icons/document-save.png</iconset> <normaloff>:/icons/document-save.png</normaloff>:/icons/document-save.png</iconset>
</property> </property>
<property name="text"> <property name="text">
@@ -404,7 +404,7 @@ device.cd = eth://udp:${ip.pult}:27002:${ip.app}:27001 #s
</action> </action>
<action name="actionSaveAs"> <action name="actionSaveAs">
<property name="icon"> <property name="icon">
<iconset resource="../../qad/application/qad_application.qrc"> <iconset resource="../../../qad/libs/widgets/qad_widgets.qrc">
<normaloff>:/icons/document-save-as.png</normaloff>:/icons/document-save-as.png</iconset> <normaloff>:/icons/document-save-as.png</normaloff>:/icons/document-save-as.png</iconset>
</property> </property>
<property name="text"> <property name="text">
@@ -490,10 +490,11 @@ device.cd = eth://udp:${ip.pult}:27002:${ip.app}:27001 #s
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<resources> <resources>
<include location="../../qad/application/qad_application.qrc"/>
<include location="../../qad/blockview/qad_blockview.qrc"/>
<include location="../../qad/widgets/qad_widgets.qrc"/>
<include location="cdpult.qrc"/> <include location="cdpult.qrc"/>
<include location="../../../qad/libs/application/qad_application.qrc"/>
<include location="../../../qad/libs/blockview/qad_blockview.qrc"/>
<include location="../../../qad/libs/graphic/qad_graphic.qrc"/>
<include location="../../../qad/libs/widgets/qad_widgets.qrc"/>
</resources> </resources>
<connections> <connections>
<connection> <connection>

BIN
utils/pult/icons/dialog-information.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 35 KiB