[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kst-plot] src: Icon fixes and fix qt5 color button.
From:       Barth Netterfield <netterfield () astro ! utoronto ! ca>
Date:       2016-01-31 22:00:53
Message-ID: E1aQ03B-0006TV-7b () scm ! kde ! org
[Download RAW message or body]

Git commit 6fb423d82c3764e7fa5d2b65f8a97645a3716452 by Barth Netterfield.
Committed on 30/01/2016 at 17:26.
Pushed by netterfield into branch 'master'.

Icon fixes and fix qt5 color button.

M  +0    -1    src/images/icons.qrc
A  +-    --    src/images/insert-image.png
M  +-    --    src/images/svg_icons/text-x-log.svgz
M  +-    --    src/images/svg_icons/y-zoom.svgz
M  +0    -4    src/libkstapp/application.cpp
M  +3    -2    src/widgets/colorbutton.cpp
M  +2    -2    src/widgets/geticon.cpp

http://commits.kde.org/kst-plot/6fb423d82c3764e7fa5d2b65f8a97645a3716452

diff --git a/src/images/icons.qrc b/src/images/icons.qrc
index fc14996..3ca27c5 100644
--- a/src/images/icons.qrc
+++ b/src/images/icons.qrc
@@ -110,7 +110,6 @@
         <file>svg_icons/document-open.svgz</file>
         <file>svg_icons/new-log-event.svgz</file>
         <file>svg_icons/code-class.svgz</file>
-        <file>svg_icons/text-x-log.svgz</file>
         <file>svg_icons/dialog-information.svgz</file>
         <file>svg_icons/kst_gfx_rectangle.svgz</file>
         <file>svg_icons/kst_gfx_line.svgz</file>
diff --git a/src/images/insert-image.png b/src/images/insert-image.png
new file mode 100644
index 0000000..90b25ba
Binary files /dev/null and b/src/images/insert-image.png differ
diff --git a/src/images/svg_icons/text-x-log.svgz b/src/images/svg_icons/text-x-log.svgz
index 8a1c782..f9aee82 100644
Binary files a/src/images/svg_icons/text-x-log.svgz and b/src/images/svg_icons/text-x-log.svgz differ
diff --git a/src/images/svg_icons/y-zoom.svgz b/src/images/svg_icons/y-zoom.svgz
index eef8b10..8cd27e9 100644
Binary files a/src/images/svg_icons/y-zoom.svgz and b/src/images/svg_icons/y-zoom.svgz differ
diff --git a/src/libkstapp/application.cpp b/src/libkstapp/application.cpp
index 46f121d..5349cd0 100644
--- a/src/libkstapp/application.cpp
+++ b/src/libkstapp/application.cpp
@@ -35,10 +35,6 @@ namespace Kst {
 Application::Application(int &argc, char **argv)
     : QApplication(argc, argv) {
 
-#ifdef QT5
-  QApplication::setStyle("Fusion");
-#endif
-
   QCoreApplication::setApplicationName("Kst");
   setWindowIcon(QPixmap(":kst.png"));
 
diff --git a/src/widgets/colorbutton.cpp b/src/widgets/colorbutton.cpp
index 22ef636..3c97d0e 100644
--- a/src/widgets/colorbutton.cpp
+++ b/src/widgets/colorbutton.cpp
@@ -15,6 +15,7 @@
 #include <QPainter>
 #include <QColorDialog>
 #include <QDebug>
+#include <qdrawutil.h>
 
 namespace Kst {
 
@@ -67,10 +68,10 @@ void ColorButton::paintEvent(QPaintEvent *event)
   QPainter painter(this);
   QBrush brush(_color);
   int m = (rect().height())/6;
-#ifndef QT5 // TODO 
+
   qDrawShadePanel(&painter, rect().x() + m, rect().y() + m, rect().width() - 2*m, rect().height() - 2*m,
                   palette(), /*sunken*/ isDown(), /*lineWidth*/ 1, /*fill*/ &brush);
-#endif
+
 }
 
 
diff --git a/src/widgets/geticon.cpp b/src/widgets/geticon.cpp
index 0816a5e..0c8aeb8 100644
--- a/src/widgets/geticon.cpp
+++ b/src/widgets/geticon.cpp
@@ -18,11 +18,11 @@ QIcon KstGetIcon(QString icon_name) {
 
   QString svg_name = ":svg_icons/"+icon_name+".svgz";
   if (QFile::exists(svg_name)) {
-    //qDebug() << svg_name;
+    qDebug() << svg_name;
     return QIcon(svg_name);
   } else {
     QString png_name = ":"+icon_name+".png";
-    qDebug() << png_name;
+    //qDebug() << png_name;
     return QIcon(png_name);
   }
 }

[prev in list] [next in list] [prev in thread] [next in thread]