Better button

ossia · Sep 11, 2015 · ff7d605 · ff7d605
1 parent 369ed8c
commit ff7d605
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 9 deletions.
diff --git a/base/lib/resources/LICENSES b/base/lib/resources/LICENSES
@@ -0,0 +1 @@
+forward.svg part of Entypo, licensed under CC BY-SA 4.0
diff --git a/base/lib/resources/forward.svg b/base/lib/resources/forward.svg
diff --git a/base/lib/resources/iscore.qrc b/base/lib/resources/iscore.qrc
@@ -1,6 +1,7 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource>
-    <file>Ubuntu-R.ttf</file>
-    <file>iscore.png</file>
-</qresource>
+<RCC>
+    <qresource prefix="/">
+        <file>Ubuntu-R.ttf</file>
+        <file>iscore.png</file>
+        <file>forward.svg</file>
+    </qresource>
 </RCC>
diff --git a/base/plugins/iscore-plugin-scenario/source/Inspector/SelectionButton.cpp b/base/plugins/iscore-plugin-scenario/source/Inspector/SelectionButton.cpp
@@ -3,7 +3,7 @@
 #include <QPushButton>
 #include <iscore/selection/SelectionDispatcher.hpp>
 #include <iscore/widgets/MarginLess.hpp>
-
+#include <QIcon>
 SelectionButton::SelectionButton(
         const QString &text,
         Selection target,
@@ -15,6 +15,7 @@ SelectionButton::SelectionButton(
     auto lay = new iscore::MarginLess<QHBoxLayout>;
 
     m_button = new QPushButton{tr("None")}; // TODO clickable label instead
+    m_button->setIcon(QIcon(":/forward.svg"));
     m_button->setStyleSheet ("margin: 5px; margin-left: 10px; text-align: left; text-decoration: underline");
     m_button->setFlat(true);
 

diff --git a/base/plugins/iscore-plugin-scenario/source/Inspector/SelectionButton.hpp b/base/plugins/iscore-plugin-scenario/source/Inspector/SelectionButton.hpp
@@ -5,7 +5,8 @@ class QPushButton;
 namespace iscore {
 class SelectionDispatcher;
 }
-class SelectionButton : public QWidget
+class
+        SelectionButton : public QWidget
 {
     public:
         SelectionButton(const QString& text,
@@ -20,7 +21,7 @@ class SelectionButton : public QWidget
                 QWidget* parent)
         {
             return new SelectionButton{
-                QString::number(*obj->id().val()) + " ↪",
+                QString::number(*obj->id().val()),
                 Selection{obj},
                 disp,
                 parent};
@@ -34,7 +35,7 @@ class SelectionButton : public QWidget
                 QWidget* parent)
         {
             auto but = new SelectionButton{
-                text + " ↪",
+                text,
                 Selection{obj},
                 disp,
                 parent};