From fa7c8d8b40c62b639b6d1eb3433ae657f62cd290 Mon Sep 17 00:00:00 2001 From: Eberhard Graether Date: Mon, 23 Nov 2015 14:01:56 +0100 Subject: [PATCH] ui: use icons in directory list box UI --- bin/app/data/gui/setting_window/listbox.css | 8 +------- bin/app/data/gui/setting_window/minus.png | Bin 0 -> 4028 bytes bin/app/data/gui/setting_window/plus.png | Bin 0 -> 4049 bytes .../data/projects/tutorial/src/code_tutorial_2.h | 8 ++++---- src/app/qt/element/QtDirectoryListBox.cpp | 4 ++-- 5 files changed, 7 insertions(+), 13 deletions(-) create mode 100644 bin/app/data/gui/setting_window/minus.png create mode 100644 bin/app/data/gui/setting_window/plus.png diff --git a/bin/app/data/gui/setting_window/listbox.css b/bin/app/data/gui/setting_window/listbox.css index 8b452bbf..33118a92 100644 --- a/bin/app/data/gui/setting_window/listbox.css +++ b/bin/app/data/gui/setting_window/listbox.css @@ -46,17 +46,11 @@ QtListItemWidget #button:hover { } #roundedButton { - background: dimgray; - border-radius: 8px; color: white; - font-size: 15px; height: 16px; margin-right: 3px; width: 16px; -} - -#roundedButton:hover { - background: gray; + border: none; } #dropInfo { diff --git a/bin/app/data/gui/setting_window/minus.png b/bin/app/data/gui/setting_window/minus.png new file mode 100644 index 0000000000000000000000000000000000000000..290b0a33f1317c35b7110300a7c615fc424cb38e GIT binary patch literal 4028 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 Dlf#Q# literal 0 HcmV?d00001 diff --git a/bin/app/data/projects/tutorial/src/code_tutorial_2.h b/bin/app/data/projects/tutorial/src/code_tutorial_2.h index 9c033133..9496f932 100644 --- a/bin/app/data/projects/tutorial/src/code_tutorial_2.h +++ b/bin/app/data/projects/tutorial/src/code_tutorial_2.h @@ -47,10 +47,10 @@ void deep_thought() // where does it come from? // // 3 - EXPANDING TO SCOPES -// Do you see first line of this snippet? I mean the one that has just two dots -// as line number and reads "deep_thought". Actually that's the name of the -// function's scope that encapsulates the snippet. By clicking that line you -// can tell Coati to expand the view to show the entire scope. +// Do you see the first line of this snippet? I mean the one that has just two +// dots as line number and reads "deep_thought". Actually that's the name of +// the function's scope that encapsulates the snippet. By clicking that line +// you can tell Coati to expand the view to show the entire scope. // Give it a try! // //------------------------------------------------------------------------------ diff --git a/src/app/qt/element/QtDirectoryListBox.cpp b/src/app/qt/element/QtDirectoryListBox.cpp index 19be3a21..70369300 100644 --- a/src/app/qt/element/QtDirectoryListBox.cpp +++ b/src/app/qt/element/QtDirectoryListBox.cpp @@ -104,13 +104,13 @@ QtDirectoryListBox::QtDirectoryListBox(QWidget *parent) innerLayout->setContentsMargins(8, 4, 8, 3); innerLayout->setSpacing(0); - m_addButton = new QPushButton("+", this); + m_addButton = new QPushButton(QIcon("data/gui/setting_window/plus.png"), "", this); m_addButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); m_addButton->setAttribute(Qt::WA_LayoutUsesWidgetRect); // fixes layouting on Mac m_addButton->setObjectName("roundedButton"); innerLayout->addWidget(m_addButton); - m_removeButton = new QPushButton("-", this); + m_removeButton = new QPushButton(QIcon("data/gui/setting_window/minus.png"), "", this); m_removeButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); m_removeButton->setAttribute(Qt::WA_LayoutUsesWidgetRect); // fixes layouting on Mac m_removeButton->setObjectName("roundedButton");