nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-04-15 05:32:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI Nits: Searchboxm on a Mac cosmetics

Browse Source 
.. just rounded corners and slightly different icons.
This commit is contained in:
Mark Liversedge
2013-04-05 19:45:37 +01:00
parent 69298ef7c2
commit c822c566e0
4 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/GcSideBarItem.cpp
View File

@@ -19,7 +19,7 @@
#include "GcSideBarItem.h"
#include "GcCalendar.h"
QIcon iconFromPNG(QString filename)
QIcon iconFromPNG(QString filename, bool emboss)
{
QImage pngImage;
pngImage.load(filename);
@@ -37,7 +37,8 @@ QIcon iconFromPNG(QString filename)
QPainter painter;
painter.begin(&white);
painter.setBackgroundMode(Qt::TransparentMode);
painter.drawImage(0,-1, gray);
if (emboss) painter.drawImage(0,-1, gray);
else painter.drawImage(0,0, gray);
painter.end();
QIcon icon(QPixmap::fromImage(white));

2
src/GcSideBarItem.h
View File

@@ -160,5 +160,5 @@ private:
};
extern QIcon iconFromPNG(QString filename);
extern QIcon iconFromPNG(QString filename, bool emboss = true);
#endif

27
src/SearchBox.cpp
View File

@@ -19,6 +19,7 @@
#include "SearchBox.h"
#include "MainWindow.h"
#include "NamedSearch.h"
#include "GcSideBarItem.h"
#include <QToolButton>
#include <QInputDialog>
@@ -33,7 +34,7 @@ SearchBox::SearchBox(MainWindow *main, QWidget *parent)
//clear button
clearButton = new QToolButton(this);
clearButton->setStyleSheet("QToolButton { border: none; padding: 0px; }");
QPixmap pixmap(":images/toolbar/clear.png");
QIcon pixmap(":images/toolbar/clear.png");
clearButton->setIcon(QIcon(pixmap));
clearButton->setIconSize(QSize(16,16));
clearButton->setCursor(Qt::ArrowCursor);
@@ -51,10 +52,10 @@ SearchBox::SearchBox(MainWindow *main, QWidget *parent)
// search button
searchButton = new QToolButton(this);
QPixmap search(":images/toolbar/search.png");
QIcon search = iconFromPNG(":images/toolbar/search3.png", false);
searchButton->setStyleSheet("QToolButton { border: none; padding: 0px; }");
searchButton->setIcon(QIcon(search));
searchButton->setIconSize(QSize(16,16));
searchButton->setIcon(search);
searchButton->setIconSize(QSize(11,11));
searchButton->setCursor(Qt::ArrowCursor);
connect(searchButton, SIGNAL(clicked()), this, SLOT(toggleMode()));
@@ -93,10 +94,8 @@ void SearchBox::resizeEvent(QResizeEvent *)
int frameWidth = style()->pixelMetric(QStyle::PM_DefaultFrameWidth);
clearButton->move(rect().right() - frameWidth - sz.width(),
(rect().bottom() + 1 - sz.height())/2);
searchButton->move(rect().left() + frameWidth,
(rect().bottom() + 1 - sz.height())/2);
toolButton->move(rect().left() + frameWidth + 18,
(rect().bottom() + 1 - sz.height())/2);
searchButton->move(5, 5);
toolButton->move(13, 3);
//container->move(rect().left(), rect().bottom() + 3); // named dialog...
checkMenu();
@@ -115,9 +114,9 @@ void SearchBox::setMode(SearchBoxMode mode)
case Filter:
{
QPixmap filter(":images/toolbar/filter.png");
searchButton->setIcon(QIcon(filter));
searchButton->setIconSize(filter.size());
QIcon filter = iconFromPNG(":images/toolbar/filter3.png", false);
searchButton->setIcon(filter);
searchButton->setIconSize(QSize(11,11));
setPlaceholderText(tr("Filter..."));
}
break;
@@ -125,9 +124,9 @@ void SearchBox::setMode(SearchBoxMode mode)
case Search:
default:
{
QPixmap search(":images/toolbar/search.png");
searchButton->setIcon(QIcon(search));
searchButton->setIconSize(search.size());
QIcon search = iconFromPNG(":images/toolbar/search3.png", false);
searchButton->setIcon(search);
searchButton->setIconSize(QSize(11,11));
setPlaceholderText(tr("Search..."));
}
break;

2
src/application.qrc
View File

@@ -25,6 +25,8 @@
<file>images/toolbar/main/train.png</file>
<file>images/toolbar/clear.png</file>
<file>images/toolbar/search.png</file>
<file>images/toolbar/search3.png</file>
<file>images/toolbar/filter3.png</file>
<file>images/toolbar/filter.png</file>
<file>images/toolbar/GeneralPreferences.png</file>
<file>images/toolbar/user.png</file>