From 07fb43f0f7697d74bef835d28990903e540dbc21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Mon, 17 Jun 2013 21:04:35 +0200 Subject: [PATCH] cambiado el estilo del input de b?squeda en linux y windows. corregido el estilo de la tabla en linux y windows. a?adido m?todo que permite a?adir espacios en titledtoolbar (corregido el aspecto de libraries) --- YACReaderLibrary/library_window.cpp | 1 + custom_widgets/yacreader_search_line_edit.cpp | 2 +- custom_widgets/yacreader_table_view.cpp | 4 ++-- custom_widgets/yacreader_titled_toolbar.cpp | 7 +++++++ custom_widgets/yacreader_titled_toolbar.h | 2 +- 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/YACReaderLibrary/library_window.cpp b/YACReaderLibrary/library_window.cpp index 3c10d74a..70339e14 100644 --- a/YACReaderLibrary/library_window.cpp +++ b/YACReaderLibrary/library_window.cpp @@ -188,6 +188,7 @@ void LibraryWindow::doLayout() librariesTitle->addAction(createLibraryAction); librariesTitle->addAction(openLibraryAction); + librariesTitle->addSpacing(4); foldersTitle->addAction(setRootIndexAction); foldersTitle->addAction(expandAllNodesAction); diff --git a/custom_widgets/yacreader_search_line_edit.cpp b/custom_widgets/yacreader_search_line_edit.cpp index e815dcd7..42a42f36 100644 --- a/custom_widgets/yacreader_search_line_edit.cpp +++ b/custom_widgets/yacreader_search_line_edit.cpp @@ -27,7 +27,7 @@ YACReaderSearchLineEdit::YACReaderSearchLineEdit(QWidget *parent) #ifdef Q_OS_MAC setStyleSheet(QString("QLineEdit {border-top:1px solid #9F9F9F; border-bottom:1px solid #ACACAC; border-right:1px solid #ACACAC; border-left:1px solid #ACACAC; border-radius: 10px; background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #CACACA, stop: 0.15 #FFFFFF); padding-left: %1px; padding-right: %2px; padding-bottom: 1px; margin-bottom: 1px;} ").arg(searchLabel->sizeHint().width() + frameWidth + 6).arg(clearButton->sizeHint().width() + frameWidth + 2)); #else - setStyleSheet(QString("QLineEdit { padding-left: %1px; padding-right: %2px; padding-bottom: 1px; margin-bottom: 1px;} ").arg(searchLabel->sizeHint().width() + frameWidth + 6).arg(clearButton->sizeHint().width() + frameWidth + 2)); + setStyleSheet(QString("QLineEdit {border:none; background-color:#FFFFFF; padding-left: %1px; padding-right: %2px; padding-bottom: 1px; margin-bottom: 0px;} ").arg(searchLabel->sizeHint().width() + frameWidth + 6).arg(clearButton->sizeHint().width() + frameWidth + 2)); #endif QSize msz = minimumSizeHint(); setMinimumSize(qMax(msz.width(), clearButton->sizeHint().height() + frameWidth * 2 + 2), diff --git a/custom_widgets/yacreader_table_view.cpp b/custom_widgets/yacreader_table_view.cpp index 2f87e657..6b9b8995 100644 --- a/custom_widgets/yacreader_table_view.cpp +++ b/custom_widgets/yacreader_table_view.cpp @@ -14,9 +14,9 @@ YACReaderTableView::YACReaderTableView(QWidget *parent) : setStyleSheet("QTableView {alternate-background-color: #F2F2F2;background-color: #FAFAFA; outline: 0px;}"// border: 1px solid #999999; border-right:none; border-bottom:none;}" "QTableCornerButton::section {background-color:#F5F5F5; border:none; border-bottom:1px solid #B8BDC4; border-right:1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #D1D1D1, stop: 1 #B8BDC4);}" "QTableView::item {outline: 0px; border-bottom: 1px solid #DFDFDF;border-top: 1px solid #FEFEFE; padding-bottom:1px; color:#252626;}" - "QTableView {border-top:1px solid #B8B8B8;border-bottom:none;border-left:none;border-right:none;}" + "QTableView {border-top:1px solid #B8B8B8;border-bottom:none;border-left:1px solid #B8B8B8;border-right:none;}" #ifdef Q_OS_MAC - + "QTableView {border-top:1px solid #B8B8B8;border-bottom:none;border-left:none;border-right:none;}" "QTableView::item:selected {outline: 0px; border-bottom: 1px solid #3875D7;border-top: 1px solid #3875D7; padding-bottom:1px; background-color: #3875D7; color: #FFFFFF; }" #else diff --git a/custom_widgets/yacreader_titled_toolbar.cpp b/custom_widgets/yacreader_titled_toolbar.cpp index f1dd5f10..74c9cf15 100644 --- a/custom_widgets/yacreader_titled_toolbar.cpp +++ b/custom_widgets/yacreader_titled_toolbar.cpp @@ -103,3 +103,10 @@ void YACReaderTitledToolBar::addAction(QAction * action) mainLayout->addWidget(tb); } + +void YACReaderTitledToolBar::addSpacing(int spacing) +{ + QHBoxLayout * mainLayout = dynamic_cast(layout()); + + mainLayout->addSpacing(spacing); +} diff --git a/custom_widgets/yacreader_titled_toolbar.h b/custom_widgets/yacreader_titled_toolbar.h index e98c8887..0705e7b8 100644 --- a/custom_widgets/yacreader_titled_toolbar.h +++ b/custom_widgets/yacreader_titled_toolbar.h @@ -37,7 +37,7 @@ signals: public slots: void addAction(QAction * action); - + void addSpacing(int space); private: DropShadowLabel * nameLabel; };