diff --git a/YACReaderLibrary/library_window.cpp b/YACReaderLibrary/library_window.cpp index 1055bdde..de0dcb57 100644 --- a/YACReaderLibrary/library_window.cpp +++ b/YACReaderLibrary/library_window.cpp @@ -50,6 +50,8 @@ #include "yacreader_titled_toolbar.h" #include "yacreader_main_toolbar.h" +#include "yacreader_sidebar.h" + #include "comics_remover.h" //#include "yacreader_social_dialog.h" @@ -181,7 +183,7 @@ void LibraryWindow::doLayout() foldersView->setStyleSheet("QTreeView::branch:open:selected:has-children {image: url(':/images/expanded_branch_osx.png');}" "QTreeView::branch:closed:selected:has-children {image: url(':/images/collapsed_branch_osx.png');}"); #endif - sideBar = new QWidget; + sideBar = new YACReaderSideBar; QVBoxLayout * l = new QVBoxLayout; selectedLibrary = new QComboBox; selectedLibrary->setAttribute(Qt::WA_MacShowFocusRect,false); diff --git a/YACReaderLibrary/library_window.h b/YACReaderLibrary/library_window.h index 6be19439..6a99db17 100644 --- a/YACReaderLibrary/library_window.h +++ b/YACReaderLibrary/library_window.h @@ -44,14 +44,14 @@ class ImportWidget; class QSettings; class LibraryItem; class YACReaderTableView; -//class YACReaderSocialDialog; +class YACReaderSideBar; #include "comic_db.h" class LibraryWindow : public QMainWindow { Q_OBJECT private: - QWidget * sideBar; + YACReaderSideBar * sideBar; QSplitter * sVertical; CreateLibraryDialog * createLibraryDialog; UpdateLibraryDialog * updateLibraryDialog; diff --git a/custom_widgets/custom_widgets.pri b/custom_widgets/custom_widgets.pri index ec6f45b9..a70d81ce 100644 --- a/custom_widgets/custom_widgets.pri +++ b/custom_widgets/custom_widgets.pri @@ -15,7 +15,9 @@ HEADERS += $$PWD/help_about_dialog.h \ $$PWD/yacreader_titled_toolbar.h \ $$PWD/yacreader_deleting_progress.h \ $$PWD/yacreader_table_view.h \ - $$PWD/yacreader_social_dialog.h + $$PWD/yacreader_social_dialog.h \ + $$PWD/yacreader_sidebar.h + SOURCES += $$PWD/help_about_dialog.cpp \ $$PWD/yacreader_field_edit.cpp \ @@ -31,4 +33,5 @@ SOURCES += $$PWD/help_about_dialog.cpp \ $$PWD/yacreader_titled_toolbar.cpp \ $$PWD/yacreader_deleting_progress.cpp \ $$PWD/yacreader_table_view.cpp \ - $$PWD/yacreader_social_dialog.cpp \ No newline at end of file + $$PWD/yacreader_social_dialog.cpp \ + $$PWD/yacreader_sidebar.cpp \ No newline at end of file diff --git a/custom_widgets/yacreader_sidebar.cpp b/custom_widgets/yacreader_sidebar.cpp new file mode 100644 index 00000000..d741384c --- /dev/null +++ b/custom_widgets/yacreader_sidebar.cpp @@ -0,0 +1,39 @@ +#include "yacreader_sidebar.h" + +#include +#include + +YACReaderSideBar::YACReaderSideBar(QWidget *parent) : + QWidget(parent) +{ + setSizePolicy(QSizePolicy::Preferred,QSizePolicy::Minimum); +} + + +void YACReaderSideBar::paintEvent(QPaintEvent * event) +{ +#ifdef Q_OS_MAC + QPainter painter(this); + + QLinearGradient lG(0,0,0,height()); + lG.setColorAt(0,QColor("#E8ECF1")); + lG.setColorAt(1,QColor("#D1D8E0")); + + painter.fillRect(0,0,width(),height(),lG); +#else + QWidget::paintEvent(event); +#endif + + //QPixmap shadow(":/images/side_bar/shadow.png"); + //painter.drawPixmap(width()-shadow.width(),0,shadow.width(),height(),shadow); + + // painter.setRenderHint(QPainter::Antialiasing); + // painter.drawLine(rect().topLeft(), rect().bottomRight()); + + //QWidget::paintEvent(event); +} + +QSize YACReaderSideBar::sizeHint() const +{ + return QSize(225,200); +} \ No newline at end of file diff --git a/custom_widgets/yacreader_sidebar.h b/custom_widgets/yacreader_sidebar.h new file mode 100644 index 00000000..9ea7975c --- /dev/null +++ b/custom_widgets/yacreader_sidebar.h @@ -0,0 +1,22 @@ +#ifndef YACREADER_SIDEBAR_H +#define YACREADER_SIDEBAR_H + +#include + +class YACReaderSideBar : public QWidget +{ + Q_OBJECT +public: + explicit YACReaderSideBar(QWidget *parent = 0); + QSize sizeHint() const; + +signals: + +public slots: + +protected: + void paintEvent(QPaintEvent *); + +}; + +#endif // YACREADER_SIDEBAR_H