From: maier Date: Tue, 5 Nov 2013 23:50:14 +0000 (+0000) Subject: Remove bundled icons from parameter_gui and use system defaults instead X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=398511eb89811a70c91416fe80335f04b9e5dd5e;p=dealii-svn.git Remove bundled icons from parameter_gui and use system defaults instead git-svn-id: https://svn.dealii.org/trunk@31557 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/contrib/parameter_gui/icons/document.png b/deal.II/contrib/parameter_gui/icons/document.png deleted file mode 100644 index 8901c3aa35..0000000000 Binary files a/deal.II/contrib/parameter_gui/icons/document.png and /dev/null differ diff --git a/deal.II/contrib/parameter_gui/icons/exit.png b/deal.II/contrib/parameter_gui/icons/exit.png deleted file mode 100644 index b266020f50..0000000000 Binary files a/deal.II/contrib/parameter_gui/icons/exit.png and /dev/null differ diff --git a/deal.II/contrib/parameter_gui/icons/fileclose.png b/deal.II/contrib/parameter_gui/icons/fileclose.png deleted file mode 100644 index 7cb985935f..0000000000 Binary files a/deal.II/contrib/parameter_gui/icons/fileclose.png and /dev/null differ diff --git a/deal.II/contrib/parameter_gui/icons/fileopen.png b/deal.II/contrib/parameter_gui/icons/fileopen.png deleted file mode 100644 index a79982ea1f..0000000000 Binary files a/deal.II/contrib/parameter_gui/icons/fileopen.png and /dev/null differ diff --git a/deal.II/contrib/parameter_gui/icons/filesave.png b/deal.II/contrib/parameter_gui/icons/filesave.png deleted file mode 100644 index 3bc2a37a21..0000000000 Binary files a/deal.II/contrib/parameter_gui/icons/filesave.png and /dev/null differ diff --git a/deal.II/contrib/parameter_gui/icons/filesaveas.png b/deal.II/contrib/parameter_gui/icons/filesaveas.png deleted file mode 100644 index c8d4816eef..0000000000 Binary files a/deal.II/contrib/parameter_gui/icons/filesaveas.png and /dev/null differ diff --git a/deal.II/contrib/parameter_gui/icons/folder.png b/deal.II/contrib/parameter_gui/icons/folder.png deleted file mode 100644 index df2426e631..0000000000 Binary files a/deal.II/contrib/parameter_gui/icons/folder.png and /dev/null differ diff --git a/deal.II/contrib/parameter_gui/icons/folder_open.png b/deal.II/contrib/parameter_gui/icons/folder_open.png deleted file mode 100644 index f00c1e8dcf..0000000000 Binary files a/deal.II/contrib/parameter_gui/icons/folder_open.png and /dev/null differ diff --git a/deal.II/contrib/parameter_gui/icons/idea.png b/deal.II/contrib/parameter_gui/icons/idea.png deleted file mode 100644 index 78c073fa4f..0000000000 Binary files a/deal.II/contrib/parameter_gui/icons/idea.png and /dev/null differ diff --git a/deal.II/contrib/parameter_gui/mainwindow.cpp b/deal.II/contrib/parameter_gui/mainwindow.cpp index dbd2f430f0..e7613967cc 100644 --- a/deal.II/contrib/parameter_gui/mainwindow.cpp +++ b/deal.II/contrib/parameter_gui/mainwindow.cpp @@ -221,32 +221,34 @@ namespace dealii void MainWindow::create_actions() { + QStyle * style = tree_widget->style(); + open_act = new QAction(tr("&Open..."), this); // create actions - open_act->setIcon(QIcon(":/icons/fileopen.png")); // and set icons + open_act->setIcon(style->standardPixmap(QStyle::SP_DialogOpenButton)); // and set icons open_act->setShortcut(Qt::CTRL + Qt::Key_O); // set a short cut open_act->setStatusTip(tr("Open a XML file")); // set a status tip connect(open_act, SIGNAL(triggered()), this, SLOT(open())); // and connect save_act = new QAction(tr("&Save ..."), this); - save_act->setIcon(QIcon(":/icons/filesave.png")); + save_act->setIcon(style->standardPixmap(QStyle::SP_DialogSaveButton)); save_act->setShortcut(Qt::CTRL + Qt::Key_S); save_act->setStatusTip(tr("Save the current XML file")); connect(save_act, SIGNAL(triggered()), this, SLOT(save())); save_as_act = new QAction(tr("&Save As..."), this); - save_as_act->setIcon(QIcon(":/icons/filesaveas.png")); + save_as_act->setIcon(style->standardPixmap(QStyle::SP_DialogSaveButton)); save_as_act->setShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_Q); save_as_act->setStatusTip(tr("Save the current XML file as")); connect(save_as_act, SIGNAL(triggered()), this, SLOT(save_as())); exit_act = new QAction(tr("E&xit"), this); - exit_act->setIcon(QIcon(":/icons/exit.png")); + exit_act->setIcon(style->standardPixmap(QStyle::SP_DialogCloseButton)); exit_act->setShortcut(Qt::CTRL + Qt::Key_Q); exit_act->setStatusTip(tr("Exit the parameterGUI application")); connect(exit_act, SIGNAL(triggered()), this, SLOT(close())); about_act = new QAction(tr("&About"), this); - about_act->setIcon(QIcon(":/icons/idea.png")); + about_act->setIcon(style->standardPixmap(QStyle::SP_FileDialogInfoView)); about_act->setStatusTip(tr("Show the parameterGUI About box")); connect(about_act, SIGNAL(triggered()), this, SLOT(about()));