diff --git a/src/edt/edt/InstPropertiesPage.ui b/src/edt/edt/InstPropertiesPage.ui index 3b173f591..e022a1cd4 100644 --- a/src/edt/edt/InstPropertiesPage.ui +++ b/src/edt/edt/InstPropertiesPage.ui @@ -731,7 +731,7 @@ - :/warn_16px.png + :/warn_16px@2x.png Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop diff --git a/src/edt/edt/edtPCellParametersPage.cc b/src/edt/edt/edtPCellParametersPage.cc index 4afa93938..ed28773cf 100644 --- a/src/edt/edt/edtPCellParametersPage.cc +++ b/src/edt/edt/edtPCellParametersPage.cc @@ -183,7 +183,7 @@ PCellParametersPage::init () } mp_changed_icon = new QLabel (mp_update_frame); - mp_changed_icon->setPixmap (QPixmap (":/warn_16px.png")); + mp_changed_icon->setPixmap (QPixmap (":/warn_16px@2x.png")); update_frame_layout->addWidget (mp_changed_icon, 0, 0, 1, 1); mp_update_button = new QToolButton (mp_update_frame); @@ -210,7 +210,7 @@ PCellParametersPage::init () } mp_error_icon = new QLabel (mp_update_frame); - mp_error_icon->setPixmap (QPixmap (":/warn_16px.png")); + mp_error_icon->setPixmap (QPixmap (":/warn_16px@2x.png")); error_frame_layout->addWidget (mp_error_icon, 1, 0, 1, 1); mp_error_label = new QLabel (mp_update_frame); diff --git a/src/icons/icons.pro b/src/icons/icons.pro index 071d66895..7a6ebd3c0 100644 --- a/src/icons/icons.pro +++ b/src/icons/icons.pro @@ -15,4 +15,3 @@ SOURCES = \ RESOURCES = \ icons.qrc \ - diff --git a/src/lay/lay/CrashMessage.ui b/src/lay/lay/CrashMessage.ui index 267fe5aef..3523c40a1 100644 --- a/src/lay/lay/CrashMessage.ui +++ b/src/lay/lay/CrashMessage.ui @@ -67,7 +67,7 @@ - :/bug.png + :/bug@2x.png Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter diff --git a/src/lay/lay/CustomizeMenuConfigPage.ui b/src/lay/lay/CustomizeMenuConfigPage.ui index 698768e18..43877de45 100644 --- a/src/lay/lay/CustomizeMenuConfigPage.ui +++ b/src/lay/lay/CustomizeMenuConfigPage.ui @@ -195,7 +195,7 @@ For special keys: - :/find_16px.png + :/find_16px@2x.png diff --git a/src/lay/lay/HelpAboutDialog.ui b/src/lay/lay/HelpAboutDialog.ui index 07b329094..69753802a 100644 --- a/src/lay/lay/HelpAboutDialog.ui +++ b/src/lay/lay/HelpAboutDialog.ui @@ -137,7 +137,7 @@ - :/logo.png + :/logo@2x.png diff --git a/src/lay/lay/LogViewerDialog.ui b/src/lay/lay/LogViewerDialog.ui index 7d252850d..011959d13 100644 --- a/src/lay/lay/LogViewerDialog.ui +++ b/src/lay/lay/LogViewerDialog.ui @@ -169,7 +169,7 @@ - :/warn_16px.png + :/warn_16px@2x.png diff --git a/src/lay/lay/ReplacePropertiesBox.ui b/src/lay/lay/ReplacePropertiesBox.ui index 2c33b9c67..3a7b3ce70 100644 --- a/src/lay/lay/ReplacePropertiesBox.ui +++ b/src/lay/lay/ReplacePropertiesBox.ui @@ -48,7 +48,7 @@ - :/right_16px.png + :/right_16px@2x.png @@ -58,7 +58,7 @@ - :/right_16px.png + :/right_16px@2x.png @@ -78,7 +78,7 @@ - :/right_16px.png + :/right_16px@2x.png diff --git a/src/lay/lay/ReplacePropertiesInstance.ui b/src/lay/lay/ReplacePropertiesInstance.ui index 772decf8b..e8eea4307 100644 --- a/src/lay/lay/ReplacePropertiesInstance.ui +++ b/src/lay/lay/ReplacePropertiesInstance.ui @@ -1,7 +1,8 @@ - + + ReplacePropertiesInstance - - + + 0 0 @@ -9,35 +10,35 @@ 195 - + Form - - + + 9 - + 6 - - - + + + - - :/right_16px.png + + :/right_16px@2x.png - + - + Qt::Vertical - + QSizePolicy::Expanding - + 200 71 @@ -45,19 +46,17 @@ - - - + + + Instance cell name - - - - - 7 - 0 + + + + 1 0 @@ -66,6 +65,8 @@ - + + + diff --git a/src/lay/lay/ReplacePropertiesPath.ui b/src/lay/lay/ReplacePropertiesPath.ui index 99a621b2c..9be6091e7 100644 --- a/src/lay/lay/ReplacePropertiesPath.ui +++ b/src/lay/lay/ReplacePropertiesPath.ui @@ -55,7 +55,7 @@ - :/right_16px.png + :/right_16px@2x.png @@ -68,7 +68,7 @@ - :/right_16px.png + :/right_16px@2x.png diff --git a/src/lay/lay/ReplacePropertiesShape.ui b/src/lay/lay/ReplacePropertiesShape.ui index c1b749972..0493ba1f5 100644 --- a/src/lay/lay/ReplacePropertiesShape.ui +++ b/src/lay/lay/ReplacePropertiesShape.ui @@ -25,7 +25,7 @@ - :/right_16px.png + :/right_16px@2x.png diff --git a/src/lay/lay/ReplacePropertiesText.ui b/src/lay/lay/ReplacePropertiesText.ui index 41b9959ec..a5b6da715 100644 --- a/src/lay/lay/ReplacePropertiesText.ui +++ b/src/lay/lay/ReplacePropertiesText.ui @@ -105,7 +105,7 @@ - :/right_16px.png + :/right_16px@2x.png @@ -115,7 +115,7 @@ - :/right_16px.png + :/right_16px@2x.png @@ -141,7 +141,7 @@ - :/right_16px.png + :/right_16px@2x.png @@ -158,7 +158,7 @@ - :/right_16px.png + :/right_16px@2x.png diff --git a/src/lay/lay/SaltManagerDialog.ui b/src/lay/lay/SaltManagerDialog.ui index 4afd2a16c..de9b8baa4 100644 --- a/src/lay/lay/SaltManagerDialog.ui +++ b/src/lay/lay/SaltManagerDialog.ui @@ -103,7 +103,7 @@ - :/find_16px.png + :/find_16px@2x.png @@ -401,7 +401,7 @@ - :/find_16px.png + :/find_16px@2x.png @@ -688,7 +688,7 @@ - :/find_16px.png + :/find_16px@2x.png @@ -826,7 +826,7 @@ - :/salt.png + :/salt@2x.png @@ -868,7 +868,7 @@ <table> <tr><td>The "Install New Packages" tab to install a package<br/>from an external repository</td></tr> <tr></tr> - <tr><td>The <a href=":add"><img src=":/add_16px.png"></a> button to create a new package</td></tr> + <tr><td>The <a href=":add"><img src=":/add_16px@2x.png"></a> button to create a new package</td></tr> </table> </body></html> diff --git a/src/lay/lay/SaltManagerInstallConfirmationDialog.ui b/src/lay/lay/SaltManagerInstallConfirmationDialog.ui index ef18920d2..cc85b33f2 100644 --- a/src/lay/lay/SaltManagerInstallConfirmationDialog.ui +++ b/src/lay/lay/SaltManagerInstallConfirmationDialog.ui @@ -260,7 +260,7 @@ - :/warn_16px.png + :/warn_16px@2x.png diff --git a/src/lay/lay/layProgressWidget.cc b/src/lay/lay/layProgressWidget.cc index 276d3dd0b..3c9cfd3d5 100644 --- a/src/lay/lay/layProgressWidget.cc +++ b/src/lay/lay/layProgressWidget.cc @@ -172,7 +172,7 @@ ProgressWidget::ProgressWidget (ProgressReporter *pr, QWidget *parent, bool fw) attn_layout->setContentsMargins (0, 0, 0, 0); QLabel *attn_label1 = new QLabel (attn_frame); - attn_label1->setPixmap (QPixmap (QString::fromUtf8 (":/warn_16px.png"))); + attn_label1->setPixmap (QPixmap (QString::fromUtf8 (":/warn_16px@2x.png"))); attn_layout->addWidget (attn_label1); QLabel *attn_label2 = new QLabel (attn_frame); diff --git a/src/layui/layui/CellSelectionForm.ui b/src/layui/layui/CellSelectionForm.ui index 2e2aa4b06..c92eaa52f 100644 --- a/src/layui/layui/CellSelectionForm.ui +++ b/src/layui/layui/CellSelectionForm.ui @@ -205,7 +205,7 @@ - :/right_16px.png + :/right_16px@2x.png @@ -428,7 +428,7 @@ - :/right_16px.png + :/right_16px@2x.png diff --git a/src/layui/layui/MarkerBrowserPage.ui b/src/layui/layui/MarkerBrowserPage.ui index 604547cde..1eafe265d 100644 --- a/src/layui/layui/MarkerBrowserPage.ui +++ b/src/layui/layui/MarkerBrowserPage.ui @@ -188,7 +188,7 @@ - :/find_16px.png + :/find_16px@2x.png diff --git a/src/layui/layui/TipDialog.ui b/src/layui/layui/TipDialog.ui index e634e5c6b..3eae32f3b 100644 --- a/src/layui/layui/TipDialog.ui +++ b/src/layui/layui/TipDialog.ui @@ -202,7 +202,7 @@ - :/bulb.png + :/bulb@2x.png false diff --git a/src/layui/layui/layLayerControlPanel.cc b/src/layui/layui/layLayerControlPanel.cc index e223ba989..5b1ff584c 100644 --- a/src/layui/layui/layLayerControlPanel.cc +++ b/src/layui/layui/layLayerControlPanel.cc @@ -373,7 +373,7 @@ LayerControlPanel::LayerControlPanel (lay::LayoutViewBase *view, db::Manager *ma m_no_stipples_label = new QLabel (tb); m_no_stipples_label->hide (); - m_no_stipples_label->setPixmap (QPixmap (QString::fromUtf8 (":/warn_16px.png"))); + m_no_stipples_label->setPixmap (QPixmap (QString::fromUtf8 (":/warn_16px@2x.png"))); m_no_stipples_label->setToolTip (tr ("Stipples are disabled - unselect \"View/Show Layers Without Fill\" to re-enable them")); ltb->addWidget (m_no_stipples_label); diff --git a/src/layui/layui/layLayerToolbox.cc b/src/layui/layui/layLayerToolbox.cc index 579a57ee0..9ca37c265 100644 --- a/src/layui/layui/layLayerToolbox.cc +++ b/src/layui/layui/layLayerToolbox.cc @@ -796,7 +796,7 @@ LCPColorPalette::LCPColorPalette (QWidget *parent, const char *name) b = new LCPActiveLabel (-10, f); b->setFrameStyle (QFrame::Panel | QFrame::Raised); b->setLineWidth (1); - b->setPixmap (QPixmap (QString::fromUtf8 (":dark_12px.png"))); + b->setPixmap (QPixmap (QString::fromUtf8 (":dark_12px@2x.png"))); b->setBackgroundRole (QPalette::Button); b->setAlignment (Qt::AlignHCenter); connect (b, SIGNAL (clicked (int)), this, SLOT (button_clicked (int))); @@ -805,7 +805,7 @@ LCPColorPalette::LCPColorPalette (QWidget *parent, const char *name) b = new LCPActiveLabel (-11, f); b->setFrameStyle (QFrame::Panel | QFrame::Raised); b->setLineWidth (1); - b->setPixmap (QPixmap (QString::fromUtf8 (":bright_12px.png"))); + b->setPixmap (QPixmap (QString::fromUtf8 (":bright_12px@2x.png"))); b->setBackgroundRole (QPalette::Button); b->setAlignment (Qt::AlignHCenter); connect (b, SIGNAL (clicked (int)), this, SLOT (button_clicked (int))); @@ -814,7 +814,7 @@ LCPColorPalette::LCPColorPalette (QWidget *parent, const char *name) b = new LCPActiveLabel (-12, f); b->setFrameStyle (QFrame::Panel | QFrame::Raised); b->setLineWidth (1); - b->setPixmap (QPixmap (QString::fromUtf8 (":neutral_12px.png"))); + b->setPixmap (QPixmap (QString::fromUtf8 (":neutral_12px@2x.png"))); b->setBackgroundRole (QPalette::Button); b->setAlignment (Qt::AlignHCenter); connect (b, SIGNAL (clicked (int)), this, SLOT (button_clicked (int))); diff --git a/src/layui/layui/layWidgets.cc b/src/layui/layui/layWidgets.cc index aa2c557b0..2fe2b043b 100644 --- a/src/layui/layui/layWidgets.cc +++ b/src/layui/layui/layWidgets.cc @@ -1001,12 +1001,12 @@ DecoratedLineEdit::DecoratedLineEdit (QWidget *parent) mp_options_label = new QLabel (this); mp_options_label->hide (); mp_options_label->setCursor (Qt::ArrowCursor); - mp_options_label->setPixmap (QString::fromUtf8 (":/options_edit_16px.png")); + mp_options_label->setPixmap (QString::fromUtf8 (":/options_edit_16px@2x.png")); mp_clear_label = new QLabel (this); mp_clear_label->hide (); mp_clear_label->setCursor (Qt::ArrowCursor); - mp_clear_label->setPixmap (QString::fromUtf8 (":/clear_edit_16px.png")); + mp_clear_label->setPixmap (QString::fromUtf8 (":/clear_edit_16px@2x.png")); QMargins margins = textMargins (); m_default_left_margin = margins.left (); diff --git a/src/plugins/streamers/lefdef/lay_plugin/LEFDEFTechnologyComponentEditor.ui b/src/plugins/streamers/lefdef/lay_plugin/LEFDEFTechnologyComponentEditor.ui index a28b97c7b..d00f96cf6 100644 --- a/src/plugins/streamers/lefdef/lay_plugin/LEFDEFTechnologyComponentEditor.ui +++ b/src/plugins/streamers/lefdef/lay_plugin/LEFDEFTechnologyComponentEditor.ui @@ -236,7 +236,7 @@ ... - + :/down_16px.png:/down_16px.png @@ -250,7 +250,7 @@ ... - + :/clear_16px.png:/clear_16px.png @@ -264,7 +264,7 @@ ... - + :/add_16px.png:/add_16px.png @@ -278,7 +278,7 @@ ... - + :/up_16px.png:/up_16px.png @@ -340,7 +340,7 @@ ... - + :/add_16px.png:/add_16px.png @@ -354,7 +354,7 @@ ... - + :/clear_16px.png:/clear_16px.png @@ -368,7 +368,7 @@ ... - + :/up_16px.png:/up_16px.png @@ -382,7 +382,7 @@ ... - + :/down_16px.png:/down_16px.png @@ -620,7 +620,7 @@ - :/right_16px.png + :/right_16px@2x.png @@ -670,7 +670,7 @@ - :/right_16px.png + :/right_16px@2x.png @@ -716,7 +716,7 @@ - :/right_16px.png + :/right_16px@2x.png @@ -736,7 +736,7 @@ - :/right_16px.png + :/right_16px@2x.png @@ -765,7 +765,7 @@ - :/right_16px.png + :/right_16px@2x.png @@ -899,7 +899,7 @@ - :/right_16px.png + :/right_16px@2x.png @@ -1084,7 +1084,7 @@ suffix ... - :/right_16px.png + :/right_16px@2x.png @@ -1107,7 +1107,7 @@ suffix ... - :/right_16px.png + :/right_16px@2x.png @@ -1143,7 +1143,7 @@ suffix ... - :/right_16px.png + :/right_16px@2x.png @@ -1159,7 +1159,7 @@ suffix ... - :/right_16px.png + :/right_16px@2x.png @@ -1195,7 +1195,7 @@ suffix ... - :/right_16px.png + :/right_16px@2x.png @@ -1211,7 +1211,7 @@ suffix ... - :/right_16px.png + :/right_16px@2x.png @@ -1228,7 +1228,7 @@ suffix ... - :/right_16px.png + :/right_16px@2x.png @@ -1265,7 +1265,7 @@ suffix ... - :/right_16px.png + :/right_16px@2x.png @@ -1364,7 +1364,7 @@ suffix ... - :/right_16px.png + :/right_16px@2x.png @@ -1470,7 +1470,7 @@ type ... - :/right_16px.png + :/right_16px@2x.png @@ -1639,7 +1639,7 @@ type ... read_all_cbx - + diff --git a/src/plugins/streamers/oasis/lay_plugin/OASISWriterOptionPage.ui b/src/plugins/streamers/oasis/lay_plugin/OASISWriterOptionPage.ui index fd744207f..995fbd702 100644 --- a/src/plugins/streamers/oasis/lay_plugin/OASISWriterOptionPage.ui +++ b/src/plugins/streamers/oasis/lay_plugin/OASISWriterOptionPage.ui @@ -284,7 +284,7 @@ - :/warn_16px.png + :/warn_16px@2x.png @@ -379,7 +379,7 @@ - :/warn_16px.png + :/warn_16px@2x.png