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

This commit is contained in:
2018-05-28 11:41:07 +00:00
parent 46d6928ebe
commit 5bc79ad451
2 changed files with 3 additions and 2 deletions

View File

@@ -24,6 +24,7 @@ CDPultWindow::CDPultWindow(QWidget *parent) : EMainWindow(parent), Ui::CDPultWin
centralWidget()->hide(); centralWidget()->hide();
CDCore::instance()->initPult(); CDCore::instance()->initPult();
def_config = codeConfig->text(); def_config = codeConfig->text();
checkDefaultConfig->setChecked(true);
new ConfigHighlighter(codeConfig->document()); new ConfigHighlighter(codeConfig->document());
widgetK->setType(CDUtils::CDType::cdK); widgetK->setType(CDUtils::CDType::cdK);
widgetX->setType(CDUtils::CDType::cdX); widgetX->setType(CDUtils::CDType::cdX);

View File

@@ -178,7 +178,7 @@
<item> <item>
<widget class="QPushButton" name="buttonIcon"> <widget class="QPushButton" name="buttonIcon">
<property name="toolTip"> <property name="toolTip">
<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/blockview/qad_blockview.qrc">
@@ -329,7 +329,7 @@ device.cd = eth://udp:${ip.pult}:27002:${ip.app}:27001 #s
<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">
<string>Open</string> <string>Open...</string>
</property> </property>
<property name="shortcut"> <property name="shortcut">
<string>Ctrl+O</string> <string>Ctrl+O</string>