From be56655264d65fcc78e8bc088bdb6687a42f0d81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Wed, 28 Nov 2018 15:31:17 +0300 Subject: [PATCH] =?UTF-8?q?Patch:=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5?= =?UTF-8?q?=D0=BD=D0=BE=20=D0=BF=D0=BE=D0=BB=D1=83=D1=87=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D1=81=D1=82=D0=B0=D0=BD=D0=B4=D0=B0=D1=80=D1=82=D0=BD?= =?UTF-8?q?=D1=8B=D1=85=20=D0=B8=D0=BA=D0=BE=D0=BD=D0=BE=D0=BA=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20dev-qt/qtwidgets?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * добавлено получение стандартных иконок из темы SP_FileDialogListView -> view-list-text SP_FileDialogContentsView -> view-list-icons SP_FileDialogInfoView -> view-list-images --- .../dev-qt/.calculate_directory | 1 + .../dev-qt/qtwidgets/.calculate_directory | 1 + .../dev-qt/qtwidgets/qtwidgets.patch | 33 +++++++++++++++++++ 3 files changed, 35 insertions(+) create mode 100644 profiles/templates/3.6/6_ac_install_patch/dev-qt/.calculate_directory create mode 100644 profiles/templates/3.6/6_ac_install_patch/dev-qt/qtwidgets/.calculate_directory create mode 100644 profiles/templates/3.6/6_ac_install_patch/dev-qt/qtwidgets/qtwidgets.patch diff --git a/profiles/templates/3.6/6_ac_install_patch/dev-qt/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/dev-qt/.calculate_directory new file mode 100644 index 000000000..720d52e47 --- /dev/null +++ b/profiles/templates/3.6/6_ac_install_patch/dev-qt/.calculate_directory @@ -0,0 +1 @@ +# Calculate append=skip diff --git a/profiles/templates/3.6/6_ac_install_patch/dev-qt/qtwidgets/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/dev-qt/qtwidgets/.calculate_directory new file mode 100644 index 000000000..615bc8bdf --- /dev/null +++ b/profiles/templates/3.6/6_ac_install_patch/dev-qt/qtwidgets/.calculate_directory @@ -0,0 +1 @@ +# Calculate append=skip merge()!= diff --git a/profiles/templates/3.6/6_ac_install_patch/dev-qt/qtwidgets/qtwidgets.patch b/profiles/templates/3.6/6_ac_install_patch/dev-qt/qtwidgets/qtwidgets.patch new file mode 100644 index 000000000..d68c53adc --- /dev/null +++ b/profiles/templates/3.6/6_ac_install_patch/dev-qt/qtwidgets/qtwidgets.patch @@ -0,0 +1,33 @@ +# Calculate format=diff +diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp +index 7420bfb..c971836 100644 +--- a/src/widgets/styles/qcommonstyle.cpp ++++ b/src/widgets/styles/qcommonstyle.cpp +@@ -5464,6 +5464,12 @@ QPixmap QCommonStyle::standardPixmap(StandardPixmap sp, const QStyleOption *opti + pixmap = QIcon::fromTheme(QLatin1String("go-previous"), + QIcon::fromTheme(QLatin1String("back"))).pixmap(16); + break; ++ case SP_FileDialogContentsView: ++ pixmap = QIcon::fromTheme(QLatin1String("view_contents")).pixmap(16); ++ break; ++ case SP_FileDialogInfoView: ++ pixmap = QIcon::fromTheme(QLatin1String("view_info")).pixmap(16); ++ break; + case SP_FileDialogDetailedView: + pixmap = QIcon::fromTheme(QLatin1String("view_detailed")).pixmap(16); + break; +@@ -5884,8 +5890,14 @@ QIcon QCommonStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption + icon = QIcon::fromTheme(QLatin1String("view-list-details")); + break; + case SP_FileDialogListView: ++ icon = QIcon::fromTheme(QLatin1String("view-list-text")); ++ break; ++ case SP_FileDialogContentsView: + icon = QIcon::fromTheme(QLatin1String("view-list-icons")); + break; ++ case SP_FileDialogInfoView: ++ icon = QIcon::fromTheme(QLatin1String("view-list-images")); ++ break; + case SP_BrowserReload: + icon = QIcon::fromTheme(QLatin1String("view-refresh")); + break;