libre.patch 5.4 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485
  1. diff --git a/modules/highgui/src/window_QT.cpp b/modules/highgui/src/window_QT.cpp
  2. index 1600bd9..9a05294 100644
  3. --- a/modules/highgui/src/window_QT.cpp
  4. +++ b/modules/highgui/src/window_QT.cpp
  5. @@ -1996,47 +1996,47 @@ void CvWindow::createActions()
  6. QWidget* view = myView->getWidget();
  7. //if the shortcuts are changed in window_QT.h, we need to update the tooltip manually
  8. - vect_QActions[0] = new QAction(QIcon(":/left-icon"), "Panning left (CTRL+arrowLEFT)", this);
  9. + vect_QActions[0] = new QAction(QIcon::fromTheme(QStringLiteral("go-previous")), "Panning left (CTRL+arrowLEFT)", this);
  10. vect_QActions[0]->setIconVisibleInMenu(true);
  11. QObject::connect(vect_QActions[0], SIGNAL(triggered()), view, SLOT(siftWindowOnLeft()));
  12. - vect_QActions[1] = new QAction(QIcon(":/right-icon"), "Panning right (CTRL+arrowRIGHT)", this);
  13. + vect_QActions[1] = new QAction(QIcon::fromTheme(QStringLiteral("go-next")), "Panning right (CTRL+arrowRIGHT)", this);
  14. vect_QActions[1]->setIconVisibleInMenu(true);
  15. QObject::connect(vect_QActions[1], SIGNAL(triggered()), view, SLOT(siftWindowOnRight()));
  16. - vect_QActions[2] = new QAction(QIcon(":/up-icon"), "Panning up (CTRL+arrowUP)", this);
  17. + vect_QActions[2] = new QAction(QIcon::fromTheme(QStringLiteral("go-up")), "Panning up (CTRL+arrowUP)", this);
  18. vect_QActions[2]->setIconVisibleInMenu(true);
  19. QObject::connect(vect_QActions[2], SIGNAL(triggered()), view, SLOT(siftWindowOnUp()));
  20. - vect_QActions[3] = new QAction(QIcon(":/down-icon"), "Panning down (CTRL+arrowDOWN)", this);
  21. + vect_QActions[3] = new QAction(QIcon::fromTheme(QStringLiteral("go-down")), "Panning down (CTRL+arrowDOWN)", this);
  22. vect_QActions[3]->setIconVisibleInMenu(true);
  23. QObject::connect(vect_QActions[3], SIGNAL(triggered()), view, SLOT(siftWindowOnDown()) );
  24. - vect_QActions[4] = new QAction(QIcon(":/zoom_x1-icon"), "Zoom x1 (CTRL+P)", this);
  25. + vect_QActions[4] = new QAction(QIcon::fromTheme(QStringLiteral("zoom-original")), "Zoom x1 (CTRL+P)", this);
  26. vect_QActions[4]->setIconVisibleInMenu(true);
  27. QObject::connect(vect_QActions[4], SIGNAL(triggered()), view, SLOT(resetZoom()));
  28. - vect_QActions[5] = new QAction(QIcon(":/imgRegion-icon"), tr("Zoom x%1 (see label) (CTRL+X)").arg(threshold_zoom_img_region), this);
  29. + vect_QActions[5] = new QAction(QIcon::fromTheme(QStringLiteral("edit-find")), tr("Zoom x%1 (see label) (CTRL+X)").arg(threshold_zoom_img_region), this);
  30. vect_QActions[5]->setIconVisibleInMenu(true);
  31. QObject::connect(vect_QActions[5], SIGNAL(triggered()), view, SLOT(imgRegion()));
  32. - vect_QActions[6] = new QAction(QIcon(":/zoom_in-icon"), "Zoom in (CTRL++)", this);
  33. + vect_QActions[6] = new QAction(QIcon::fromTheme(QStringLiteral("zoom-in")), "Zoom in (CTRL++)", this);
  34. vect_QActions[6]->setIconVisibleInMenu(true);
  35. QObject::connect(vect_QActions[6], SIGNAL(triggered()), view, SLOT(ZoomIn()));
  36. - vect_QActions[7] = new QAction(QIcon(":/zoom_out-icon"), "Zoom out (CTRL+-)", this);
  37. + vect_QActions[7] = new QAction(QIcon::fromTheme(QStringLiteral("zoom-out")), "Zoom out (CTRL+-)", this);
  38. vect_QActions[7]->setIconVisibleInMenu(true);
  39. QObject::connect(vect_QActions[7], SIGNAL(triggered()), view, SLOT(ZoomOut()));
  40. - vect_QActions[8] = new QAction(QIcon(":/save-icon"), "Save current image (CTRL+S)", this);
  41. + vect_QActions[8] = new QAction(QIcon::fromTheme(QStringLiteral("document-save")), "Save current image (CTRL+S)", this);
  42. vect_QActions[8]->setIconVisibleInMenu(true);
  43. QObject::connect(vect_QActions[8], SIGNAL(triggered()), view, SLOT(saveView()));
  44. - vect_QActions[9] = new QAction(QIcon(":/copy_clipbrd-icon"), "Copy image to clipboard (CTRL+C)", this);
  45. + vect_QActions[9] = new QAction(QIcon::fromTheme(QStringLiteral("edit-copy")), "Copy image to clipboard (CTRL+C)", this);
  46. vect_QActions[9]->setIconVisibleInMenu(true);
  47. QObject::connect(vect_QActions[9], SIGNAL(triggered()), view, SLOT(copy2Clipbrd()));
  48. - vect_QActions[10] = new QAction(QIcon(":/properties-icon"), "Display properties window (CTRL+P)", this);
  49. + vect_QActions[10] = new QAction(QIcon::fromTheme(QStringLiteral("document-properties")), "Display properties window (CTRL+P)", this);
  50. vect_QActions[10]->setIconVisibleInMenu(true);
  51. QObject::connect(vect_QActions[10], SIGNAL(triggered()), this, SLOT(displayPropertiesWin()));
  52. diff --git a/modules/highgui/src/window_QT.qrc b/modules/highgui/src/window_QT.qrc
  53. index efdd8c2..f7e6f37 100644
  54. --- a/modules/highgui/src/window_QT.qrc
  55. +++ b/modules/highgui/src/window_QT.qrc
  56. @@ -1,16 +1,5 @@
  57. <RCC>
  58. <qresource prefix="/">
  59. - <file alias="left-icon">files_Qt/Milky/48/28.png</file>
  60. - <file alias="right-icon">files_Qt/Milky/48/23.png</file>
  61. - <file alias="up-icon">files_Qt/Milky/48/19.png</file>
  62. - <file alias="down-icon">files_Qt/Milky/48/24.png</file>
  63. - <file alias="zoom_x1-icon">files_Qt/Milky/48/27.png</file>
  64. - <file alias="imgRegion-icon">files_Qt/Milky/48/61.png</file>
  65. - <file alias="zoom_in-icon">files_Qt/Milky/48/106.png</file>
  66. - <file alias="zoom_out-icon">files_Qt/Milky/48/107.png</file>
  67. - <file alias="save-icon">files_Qt/Milky/48/7.png</file>
  68. - <file alias="copy_clipbrd-icon">files_Qt/Milky/48/43.png</file>
  69. - <file alias="properties-icon">files_Qt/Milky/48/38.png</file>
  70. <file alias="stylesheet-trackbar">files_Qt/stylesheet_trackbar.qss</file>
  71. </qresource>
  72. </RCC>