mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-07-20 22:14:41 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

added all empty container views

Browse Source
This commit is contained in:
Luis Ángel San Martín
2014-11-22 14:03:15 +01:00
parent d128b4e851
commit f0d69cb032
25 changed files with 584 additions and 484 deletions
Download Patch File Download Diff File Expand all files Collapse all files

598
YACReaderLibrary/YACReaderLibrary.pro
View File

@ -1,296 +1,302 @@
###################################################################### ######################################################################
# Automatically generated by qmake (2.01a) dom 12. oct 20:47:48 2008 # Automatically generated by qmake (2.01a) dom 12. oct 20:47:48 2008
###################################################################### ######################################################################
TEMPLATE = app TEMPLATE = app
TARGET = YACReaderLibrary TARGET = YACReaderLibrary
DEPENDPATH += . DEPENDPATH += .
INCLUDEPATH += . INCLUDEPATH += .
INCLUDEPATH += ../common \ INCLUDEPATH += ../common \
./server \ ./server \
./db \ ./db \
../custom_widgets \ ../custom_widgets \
./comic_vine \ ./comic_vine \
./comic_vine/model ./comic_vine/model
DEFINES += SERVER_RELEASE NOMINMAX YACREADER_LIBRARY DEFINES += SERVER_RELEASE NOMINMAX YACREADER_LIBRARY
win32 { win32 {
LIBS += -L../dependencies/poppler/lib -loleaut32 -lole32 -lshell32 LIBS += -L../dependencies/poppler/lib -loleaut32 -lole32 -lshell32
isEqual(QT_MAJOR_VERSION, 5) { isEqual(QT_MAJOR_VERSION, 5) {
LIBS += -lpoppler-qt5 LIBS += -lpoppler-qt5
INCLUDEPATH += ../dependencies/poppler/include/qt5 INCLUDEPATH += ../dependencies/poppler/include/qt5
} }
else { else {
LIBS += -lpoppler-qt4 LIBS += -lpoppler-qt4
INCLUDEPATH += ../dependencies/poppler/include/qt4 INCLUDEPATH += ../dependencies/poppler/include/qt4
} }
#QMAKE_CXXFLAGS_RELEASE += /MP /Ob2 /Oi /Ot /GT /GL #QMAKE_CXXFLAGS_RELEASE += /MP /Ob2 /Oi /Ot /GT /GL
#QMAKE_LFLAGS_RELEASE += /LTCG #QMAKE_LFLAGS_RELEASE += /LTCG
CONFIG -= embed_manifest_exe CONFIG -= embed_manifest_exe
} }
unix:!macx{ unix:!macx{
isEqual(QT_MAJOR_VERSION, 5) { isEqual(QT_MAJOR_VERSION, 5) {
INCLUDEPATH += /usr/include/poppler/qt5 INCLUDEPATH += /usr/include/poppler/qt5
LIBS += -L/usr/lib -lpoppler-qt5 LIBS += -L/usr/lib -lpoppler-qt5
} }
else { else {
INCLUDEPATH += /usr/include/poppler/qt4 INCLUDEPATH += /usr/include/poppler/qt4
LIBS += -L/usr/lib -lpoppler-qt4 LIBS += -L/usr/lib -lpoppler-qt4
} }
LIBS += -lGLU LIBS += -lGLU
} }
macx{ macx{
#INCLUDEPATH += "/Volumes/Mac OS X Lion/usr/X11/include" #INCLUDEPATH += "/Volumes/Mac OS X Lion/usr/X11/include"
#isEqual(QT_MAJOR_VERSION, 5) { #isEqual(QT_MAJOR_VERSION, 5) {
#INCLUDEPATH += /usr/local/include/poppler/qt5 #INCLUDEPATH += /usr/local/include/poppler/qt5
#LIBS += -L/usr/local/lib -lpoppler-qt5 #LIBS += -L/usr/local/lib -lpoppler-qt5
#} #}
#else { #else {
#INCLUDEPATH += /usr/local/include/poppler/qt4 #INCLUDEPATH += /usr/local/include/poppler/qt4
#LIBS += -L/usr/local/lib -lpoppler-qt4 #LIBS += -L/usr/local/lib -lpoppler-qt4
#} #}
#QT += macextras #QT += macextras
LIBS += -framework Foundation -framework ApplicationServices -framework AppKit LIBS += -framework Foundation -framework ApplicationServices -framework AppKit
OBJECTIVE_SOURCES += $$PWD/../common/pdf_comic.mm OBJECTIVE_SOURCES += $$PWD/../common/pdf_comic.mm
HEADERS += $$PWD/../common/pdf_comic.h HEADERS += $$PWD/../common/pdf_comic.h
CONFIG += objective_c CONFIG += objective_c
QT += macextras gui-private QT += macextras gui-private
} }
unix{ unix{
QMAKE_CXXFLAGS += -std=c++11 QMAKE_CXXFLAGS += -std=c++11
} }
#CONFIG += release #CONFIG += release
CONFIG -= flat CONFIG -= flat
QT += sql network opengl script QT += sql network opengl script
# Input # Input
HEADERS += comic_flow.h \ HEADERS += comic_flow.h \
create_library_dialog.h \ create_library_dialog.h \
library_creator.h \ library_creator.h \
library_window.h \ library_window.h \
add_library_dialog.h \ add_library_dialog.h \
rename_library_dialog.h \ rename_library_dialog.h \
properties_dialog.h \ properties_dialog.h \
options_dialog.h \ options_dialog.h \
export_library_dialog.h \ export_library_dialog.h \
import_library_dialog.h \ import_library_dialog.h \
package_manager.h \ package_manager.h \
bundle_creator.h \ bundle_creator.h \
export_comics_info_dialog.h \ export_comics_info_dialog.h \
import_comics_info_dialog.h \ import_comics_info_dialog.h \
server_config_dialog.h \ server_config_dialog.h \
comic_flow_widget.h \ comic_flow_widget.h \
db_helper.h \ db_helper.h \
./db/data_base_management.h \ ./db/data_base_management.h \
./db/folder_item.h \ ./db/folder_item.h \
./db/folder_model.h \ ./db/folder_model.h \
./db/comic_model.h \ ./db/comic_model.h \
./db/comic_item.h \ ./db/comic_item.h \
../common/comic_db.h \ ../common/comic_db.h \
../common/folder.h \ ../common/folder.h \
../common/library_item.h \ ../common/library_item.h \
../common/comic.h \ ../common/comic.h \
../common/bookmarks.h \ ../common/bookmarks.h \
../common/pictureflow.h \ ../common/pictureflow.h \
../common/custom_widgets.h \ ../common/custom_widgets.h \
../common/qnaturalsorting.h \ ../common/qnaturalsorting.h \
../common/yacreader_flow_gl.h \ ../common/yacreader_flow_gl.h \
../common/yacreader_global.h \ ../common/yacreader_global.h \
../common/onstart_flow_selection_dialog.h \ ../common/onstart_flow_selection_dialog.h \
no_libraries_widget.h \ no_libraries_widget.h \
import_widget.h \ import_widget.h \
yacreader_local_server.h \ yacreader_local_server.h \
yacreader_main_toolbar.h \ yacreader_main_toolbar.h \
comics_remover.h \ comics_remover.h \
../common/http_worker.h \ ../common/http_worker.h \
yacreader_libraries.h \ yacreader_libraries.h \
../common/exit_check.h \ ../common/exit_check.h \
comics_view.h \ comics_view.h \
classic_comics_view.h \ classic_comics_view.h \
empty_folder_widget.h \ empty_folder_widget.h \
no_search_results_widget.h \ no_search_results_widget.h \
comic_files_manager.h \ comic_files_manager.h \
db/reading_list_model.h \ db/reading_list_model.h \
db/reading_list_item.h \ db/reading_list_item.h \
yacreader_folders_view.h \ yacreader_folders_view.h \
yacreader_reading_lists_view.h \ yacreader_reading_lists_view.h \
add_label_dialog.h \ add_label_dialog.h \
yacreader_history_controller.h \ yacreader_history_controller.h \
yacreader_navigation_controller.h \ yacreader_navigation_controller.h \
empty_label_widget.h empty_label_widget.h \
empty_container_info.h \
empty_special_list.h \
SOURCES += comic_flow.cpp \ empty_reading_list_widget.h
create_library_dialog.cpp \
library_creator.cpp \
library_window.cpp \ SOURCES += comic_flow.cpp \
main.cpp \ create_library_dialog.cpp \
add_library_dialog.cpp \ library_creator.cpp \
rename_library_dialog.cpp \ library_window.cpp \
properties_dialog.cpp \ main.cpp \
options_dialog.cpp \ add_library_dialog.cpp \
export_library_dialog.cpp \ rename_library_dialog.cpp \
import_library_dialog.cpp \ properties_dialog.cpp \
package_manager.cpp \ options_dialog.cpp \
bundle_creator.cpp \ export_library_dialog.cpp \
export_comics_info_dialog.cpp \ import_library_dialog.cpp \
import_comics_info_dialog.cpp \ package_manager.cpp \
server_config_dialog.cpp \ bundle_creator.cpp \
comic_flow_widget.cpp \ export_comics_info_dialog.cpp \
db_helper.cpp \ import_comics_info_dialog.cpp \
./db/data_base_management.cpp \ server_config_dialog.cpp \
./db/folder_item.cpp \ comic_flow_widget.cpp \
./db/folder_model.cpp \ db_helper.cpp \
./db/comic_model.cpp \ ./db/data_base_management.cpp \
./db/comic_item.cpp \ ./db/folder_item.cpp \
../common/comic_db.cpp \ ./db/folder_model.cpp \
../common/folder.cpp \ ./db/comic_model.cpp \
../common/library_item.cpp \ ./db/comic_item.cpp \
../common/comic.cpp \ ../common/comic_db.cpp \
../common/bookmarks.cpp \ ../common/folder.cpp \
../common/pictureflow.cpp \ ../common/library_item.cpp \
../common/custom_widgets.cpp \ ../common/comic.cpp \
../common/qnaturalsorting.cpp \ ../common/bookmarks.cpp \
../common/yacreader_flow_gl.cpp \ ../common/pictureflow.cpp \
../common/onstart_flow_selection_dialog.cpp \ ../common/custom_widgets.cpp \
no_libraries_widget.cpp \ ../common/qnaturalsorting.cpp \
import_widget.cpp \ ../common/yacreader_flow_gl.cpp \
yacreader_local_server.cpp \ ../common/onstart_flow_selection_dialog.cpp \
yacreader_main_toolbar.cpp \ no_libraries_widget.cpp \
comics_remover.cpp \ import_widget.cpp \
../common/http_worker.cpp \ yacreader_local_server.cpp \
../common/yacreader_global.cpp \ yacreader_main_toolbar.cpp \
yacreader_libraries.cpp \ comics_remover.cpp \
../common/exit_check.cpp \ ../common/http_worker.cpp \
comics_view.cpp \ ../common/yacreader_global.cpp \
classic_comics_view.cpp \ yacreader_libraries.cpp \
empty_folder_widget.cpp \ ../common/exit_check.cpp \
no_search_results_widget.cpp \ comics_view.cpp \
comic_files_manager.cpp \ classic_comics_view.cpp \
db/reading_list_model.cpp \ empty_folder_widget.cpp \
db/reading_list_item.cpp \ no_search_results_widget.cpp \
yacreader_folders_view.cpp \ comic_files_manager.cpp \
yacreader_reading_lists_view.cpp \ db/reading_list_model.cpp \
add_label_dialog.cpp \ db/reading_list_item.cpp \
yacreader_history_controller.cpp \ yacreader_folders_view.cpp \
yacreader_navigation_controller.cpp \ yacreader_reading_lists_view.cpp \
empty_label_widget.cpp add_label_dialog.cpp \
yacreader_history_controller.cpp \
yacreader_navigation_controller.cpp \
include(./server/server.pri) empty_label_widget.cpp \
include(../custom_widgets/custom_widgets_yacreaderlibrary.pri) empty_container_info.cpp \
include(../compressed_archive/wrapper.pri) empty_special_list.cpp \
include(./comic_vine/comic_vine.pri) empty_reading_list_widget.cpp
include(../QsLog/QsLog.pri)
include(../shortcuts_management/shortcuts_management.pri)
include(./server/server.pri)
RESOURCES += images.qrc files.qrc include(../custom_widgets/custom_widgets_yacreaderlibrary.pri)
win32:RESOURCES += images_win.qrc include(../compressed_archive/wrapper.pri)
unix:!macx:RESOURCES += images_win.qrc include(./comic_vine/comic_vine.pri)
macx:RESOURCES += images_osx.qrc include(../QsLog/QsLog.pri)
include(../shortcuts_management/shortcuts_management.pri)
RC_FILE = icon.rc
RESOURCES += images.qrc files.qrc
macx { win32:RESOURCES += images_win.qrc
ICON = YACReaderLibrary.icns unix:!macx:RESOURCES += images_win.qrc
} macx:RESOURCES += images_osx.qrc
TRANSLATIONS = yacreaderlibrary_es.ts \ RC_FILE = icon.rc
yacreaderlibrary_ru.ts \
yacreaderlibrary_pt.ts \ macx {
yacreaderlibrary_fr.ts \ ICON = YACReaderLibrary.icns
yacreaderlibrary_nl.ts \ }
yacreaderlibrary_tr.ts \
yacreaderlibrary_de.ts \ TRANSLATIONS = yacreaderlibrary_es.ts \
yacreaderlibrary_source.ts yacreaderlibrary_ru.ts \
yacreaderlibrary_pt.ts \
isEqual(QT_MAJOR_VERSION, 5) { yacreaderlibrary_fr.ts \
Release:DESTDIR = ../release5 yacreaderlibrary_nl.ts \
Debug:DESTDIR = ../debug5 yacreaderlibrary_tr.ts \
yacreaderlibrary_de.ts \
#QML/GridView yacreaderlibrary_source.ts
QT += quick qml
isEqual(QT_MAJOR_VERSION, 5) {
HEADERS += grid_comics_view.h \ Release:DESTDIR = ../release5
comics_view_transition.h Debug:DESTDIR = ../debug5
SOURCES += grid_comics_view.cpp \ #QML/GridView
comics_view_transition.cpp QT += quick qml
RESOURCES += qml.qrc HEADERS += grid_comics_view.h \
win32:RESOURCES += qml_win.qrc comics_view_transition.h
unix:!macx:RESOURCES += qml_win.qrc
macx:RESOURCES += qml_osx.qrc SOURCES += grid_comics_view.cpp \
comics_view_transition.cpp
} else {
Release:DESTDIR = ../release RESOURCES += qml.qrc
Debug:DESTDIR = ../debug win32:RESOURCES += qml_win.qrc
} unix:!macx:RESOURCES += qml_win.qrc
macx:RESOURCES += qml_osx.qrc
win32 {
!exists(../compressed_archive/lib7zip){ } else {
error(You\'ll need 7zip source code to compile YACReader. \ Release:DESTDIR = ../release
Please check the compressed_archive folder for further instructions.) Debug:DESTDIR = ../debug
} }
}
win32 {
unix { !exists(../compressed_archive/lib7zip){
exists (../compressed_archive/libp7zip) { error(You\'ll need 7zip source code to compile YACReader. \
message(Found p7zip source code...) Please check the compressed_archive folder for further instructions.)
system(patch -d ../compressed_archive -N -p0 -i libp7zip.patch) }
} else { }
error(You\'ll need 7zip source code to compile YACReader. \
Please check the compressed_archive folder for further instructions.) unix {
} exists (../compressed_archive/libp7zip) {
} message(Found p7zip source code...)
system(patch -d ../compressed_archive -N -p0 -i libp7zip.patch)
unix:!macx { } else {
#set install prefix if it's empty error(You\'ll need 7zip source code to compile YACReader. \
isEmpty(PREFIX) { Please check the compressed_archive folder for further instructions.)
PREFIX = /usr }
} }
BINDIR = $$PREFIX/bin unix:!macx {
LIBDIR = $$PREFIX/lib #set install prefix if it's empty
DATADIR = $$PREFIX/share isEmpty(PREFIX) {
PREFIX = /usr
DEFINES += "LIBDIR=\\\"$$LIBDIR\\\"" "DATADIR=\\\"$$DATADIR\\\"" "BINDIR=\\\"$$BINDIR\\\"" }
#MAKE INSTALL BINDIR = $$PREFIX/bin
INSTALLS += bin icon desktop server translation manpage LIBDIR = $$PREFIX/lib
DATADIR = $$PREFIX/share
bin.path = $$BINDIR
isEmpty(DESTDIR) { DEFINES += "LIBDIR=\\\"$$LIBDIR\\\"" "DATADIR=\\\"$$DATADIR\\\"" "BINDIR=\\\"$$BINDIR\\\""
bin.files = YACReaderLibrary
} else { #MAKE INSTALL
bin.files = $$DESTDIR/YACReaderLibrary INSTALLS += bin icon desktop server translation manpage
}
bin.path = $$BINDIR
server.path = $$DATADIR/yacreader isEmpty(DESTDIR) {
server.files = ../release/server bin.files = YACReaderLibrary
} else {
icon.path = $$DATADIR/yacreader bin.files = $$DESTDIR/YACReaderLibrary
icon.files = ../images/iconLibrary.png ../images/db.png ../images/coversPackage.png }
desktop.path = $$DATADIR/applications server.path = $$DATADIR/yacreader
desktop.extra = desktop-file-edit --set-icon=$$DATADIR/yacreader/iconLibrary.png $$PWD/../YACReaderLibrary.desktop server.files = ../release/server
desktop.files = ../YACReaderLibrary.desktop
#TODO: icons should be located at /usr/share/icons and have the same basename as their application icon.path = $$DATADIR/yacreader
icon.files = ../images/iconLibrary.png ../images/db.png ../images/coversPackage.png
translation.path = $$DATADIR/yacreader/languages
translation.files = ../release/languages/yacreaderlibrary_* desktop.path = $$DATADIR/applications
desktop.extra = desktop-file-edit --set-icon=$$DATADIR/yacreader/iconLibrary.png $$PWD/../YACReaderLibrary.desktop
manpage.path = $$DATADIR/man/man1 desktop.files = ../YACReaderLibrary.desktop
manpage.files = ../YACReaderLibrary.1 #TODO: icons should be located at /usr/share/icons and have the same basename as their application
}
translation.path = $$DATADIR/yacreader/languages
translation.files = ../release/languages/yacreaderlibrary_*
manpage.path = $$DATADIR/man/man1
manpage.files = ../YACReaderLibrary.1
}

9
YACReaderLibrary/db/reading_list_item.cpp
View File

@ -38,6 +38,15 @@ QIcon SpecialListItem::getIcon() const
} }
} }
ReadingListModel::TypeSpecialList SpecialListItem::getType() const
{
if(itemData.count()>1)
{
int id = itemData.at(1).toInt();
return (ReadingListModel::TypeSpecialList)id;
}
}
//------------------------------------------------------ //------------------------------------------------------
LabelItem::LabelItem(const QList<QVariant> &data) LabelItem::LabelItem(const QList<QVariant> &data)

2
YACReaderLibrary/db/reading_list_item.h
View File

@ -5,6 +5,7 @@
#include <QVariant> #include <QVariant>
#include "yacreader_global.h" #include "yacreader_global.h"
#include "reading_list_model.h"
//TODO add propper constructors, using QList<QVariant> is not safe //TODO add propper constructors, using QList<QVariant> is not safe
class ListItem class ListItem
@ -25,6 +26,7 @@ class SpecialListItem : public ListItem
public: public:
SpecialListItem(const QList<QVariant> &data); SpecialListItem(const QList<QVariant> &data);
QIcon getIcon() const; QIcon getIcon() const;
ReadingListModel::TypeSpecialList getType() const;
}; };
//------------------------------------------------------ //------------------------------------------------------

6
YACReaderLibrary/db/reading_list_model.cpp
View File

@ -82,6 +82,12 @@ QVariant ReadingListModel::data(const QModelIndex &index, int role) const
if (role == ReadingListModel::IDRole) if (role == ReadingListModel::IDRole)
return item->getId(); return item->getId();
if (role == ReadingListModel::SpecialListTypeRole && typeid(*item) == typeid(SpecialListItem))
{
SpecialListItem * specialListItem = static_cast<SpecialListItem*>(item);
return QVariant(specialListItem->getType());
}
if(typeid(*item) == typeid(ReadingListSeparatorItem)) if(typeid(*item) == typeid(ReadingListSeparatorItem))
return QVariant(); return QVariant();

8
YACReaderLibrary/db/reading_list_model.h
View File

@ -53,7 +53,8 @@ public:
enum Roles { enum Roles {
TypeListsRole = Qt::UserRole + 1, TypeListsRole = Qt::UserRole + 1,
IDRole, IDRole,
LabelColorRole LabelColorRole,
SpecialListTypeRole
}; };
enum TypeList { enum TypeList {
@ -63,6 +64,11 @@ public:
Separator Separator
}; };
enum TypeSpecialList {
Reading,
Favorites
};
signals: signals:
private: private:

47
YACReaderLibrary/empty_container_info.cpp Normal file
View File

@ -0,0 +1,47 @@
#include "empty_container_info.h"
EmptyContainerInfo::EmptyContainerInfo(QWidget *parent) :
QWidget(parent), iconLabel(new QLabel()), titleLabel(new QLabel())
{
#ifdef Q_OS_MAC
backgroundColor = "#FFFFFF";
titleLabel->setStyleSheet("QLabel {color:#888888; font-size:24px;font-family:Arial;font-weight:bold;}");
#else
backgroundColor = "#2A2A2A";
titleLabel->setStyleSheet("QLabel {color:#CCCCCC; font-size:24px;font-family:Arial;font-weight:bold;}");
#endif
iconLabel->setAlignment(Qt::AlignCenter);
titleLabel->setAlignment(Qt::AlignCenter);
}
void EmptyContainerInfo::setPixmap(const QPixmap &pixmap)
{
iconLabel->setPixmap(pixmap);
}
void EmptyContainerInfo::setText(const QString &text)
{
titleLabel->setText(text);
}
QVBoxLayout * EmptyContainerInfo::setUpDefaultLayout(bool addStretch)
{
QVBoxLayout * layout = new QVBoxLayout;
layout->addSpacing(100);
layout->addWidget(iconLabel);
layout->addSpacing(30);
layout->addWidget(titleLabel);
if(addStretch)
layout->addStretch();
setLayout(layout);
return layout;
}
void EmptyContainerInfo::paintEvent(QPaintEvent *)
{
QPainter painter (this);
painter.fillRect(0,0,width(),height(),QColor(backgroundColor));
}

26
YACReaderLibrary/empty_container_info.h Normal file
View File

@ -0,0 +1,26 @@
#ifndef EMPTY_CONTAINER_INFO_H
#define EMPTY_CONTAINER_INFO_H
#include <QtWidgets>
class EmptyContainerInfo : public QWidget
{
Q_OBJECT
public:
explicit EmptyContainerInfo(QWidget *parent = 0);
void setPixmap(const QPixmap & pixmap);
void setText(const QString & text);
QVBoxLayout *setUpDefaultLayout(bool addStretch);
signals:
public slots:
protected:
void paintEvent(QPaintEvent *);
QLabel * iconLabel;
QLabel * titleLabel;
QString backgroundColor;
};
#endif // EMPTY_CONTAINER_INFO_H

33
YACReaderLibrary/empty_folder_widget.cpp
View File

@ -17,28 +17,12 @@ void testListView(QListView * l)
} }
EmptyFolderWidget::EmptyFolderWidget(QWidget *parent) : EmptyFolderWidget::EmptyFolderWidget(QWidget *parent) :
QWidget(parent),subfoldersModel(new QStringListModel()) EmptyContainerInfo(parent),subfoldersModel(new QStringListModel())
{ {
#ifdef Q_OS_MAC QVBoxLayout * layout = setUpDefaultLayout(false);
backgroundColor = "#FFFFFF";
#else
backgroundColor = "#2A2A2A";
#endif
QVBoxLayout * layout = new QVBoxLayout;
iconLabel = new QLabel();
iconLabel->setPixmap(QPixmap(":/images/empty_folder.png")); iconLabel->setPixmap(QPixmap(":/images/empty_folder.png"));
iconLabel->setAlignment(Qt::AlignCenter); titleLabel->setText(tr("Subfolders in this folder"));
titleLabel = new QLabel(tr("Subfolders in this folder"));
titleLabel->setAlignment(Qt::AlignCenter);
#ifdef Q_OS_MAC
titleLabel->setStyleSheet("QLabel {color:#888888; font-size:24px;font-family:Arial;font-weight:bold;}");
#else
titleLabel->setStyleSheet("QLabel {color:#CCCCCC; font-size:24px;font-family:Arial;font-weight:bold;}");
#endif
foldersView = new QListView(); foldersView = new QListView();
foldersView->setMinimumWidth(282); foldersView->setMinimumWidth(282);
@ -83,10 +67,6 @@ EmptyFolderWidget::EmptyFolderWidget(QWidget *parent) :
foldersView->setSizePolicy(QSizePolicy ::Expanding , QSizePolicy ::Expanding ); foldersView->setSizePolicy(QSizePolicy ::Expanding , QSizePolicy ::Expanding );
testListView(foldersView); testListView(foldersView);
layout->addSpacing(100);
layout->addWidget(iconLabel);
layout->addSpacing(30);
layout->addWidget(titleLabel);
layout->addSpacing(12); layout->addSpacing(12);
layout->addWidget(foldersView,1,Qt::AlignHCenter); layout->addWidget(foldersView,1,Qt::AlignHCenter);
layout->addStretch(); layout->addStretch();
@ -98,7 +78,6 @@ EmptyFolderWidget::EmptyFolderWidget(QWidget *parent) :
setStyleSheet(QString("QWidget {background:%1}").arg(backgroundColor)); setStyleSheet(QString("QWidget {background:%1}").arg(backgroundColor));
setSizePolicy(QSizePolicy ::Expanding , QSizePolicy ::Expanding ); setSizePolicy(QSizePolicy ::Expanding , QSizePolicy ::Expanding );
setLayout(layout);
setAcceptDrops(true); setAcceptDrops(true);
@ -126,12 +105,6 @@ void EmptyFolderWidget::onItemClicked(const QModelIndex &mi)
emit subfolderSelected(parent,mi.row()); emit subfolderSelected(parent,mi.row());
} }
void EmptyFolderWidget::paintEvent(QPaintEvent *)
{
QPainter painter (this);
painter.fillRect(0,0,width(),height(),QColor(backgroundColor));
}
//TODO remove repeated code in drag & drop support.... //TODO remove repeated code in drag & drop support....
void EmptyFolderWidget::dragEnterEvent(QDragEnterEvent *event) void EmptyFolderWidget::dragEnterEvent(QDragEnterEvent *event)
{ {

13
YACReaderLibrary/empty_folder_widget.h
View File

@ -1,14 +1,12 @@
#ifndef EMPTY_FOLDER_WIDGET_H #ifndef EMPTY_FOLDER_WIDGET_H
#define EMPTY_FOLDER_WIDGET_H #define EMPTY_FOLDER_WIDGET_H
#include <QWidget> #include "empty_container_info.h"
#include <QModelIndex> #include <QtWidgets>
class QLabel;
class QListView;
class QStringListModel;
class EmptyFolderWidget : public QWidget
class EmptyFolderWidget : public EmptyContainerInfo
{ {
Q_OBJECT Q_OBJECT
public: public:
@ -25,12 +23,9 @@ public slots:
void onItemClicked(const QModelIndex & mi); void onItemClicked(const QModelIndex & mi);
protected: protected:
QLabel * iconLabel;
QLabel * titleLabel;
QListView * foldersView; QListView * foldersView;
QModelIndex parent; QModelIndex parent;
QStringListModel * subfoldersModel; QStringListModel * subfoldersModel;
void paintEvent(QPaintEvent *);
QString backgroundColor; QString backgroundColor;
//Drop to import //Drop to import

35
YACReaderLibrary/empty_label_widget.cpp
View File

@ -1,37 +1,14 @@
#include "empty_label_widget.h" #include "empty_label_widget.h"
EmptyLabelWidget::EmptyLabelWidget(QWidget *parent) : EmptyLabelWidget::EmptyLabelWidget(QWidget *parent) :
QWidget(parent) EmptyContainerInfo(parent)
{ {
#ifdef Q_OS_MAC setUpDefaultLayout(true);
backgroundColor = "#FFFFFF";
#else
backgroundColor = "#2A2A2A";
#endif
QVBoxLayout * layout = new QVBoxLayout;
iconLabel = new QLabel();
iconLabel->setPixmap(QPixmap(":/images/empty_label.png")); iconLabel->setPixmap(QPixmap(":/images/empty_label.png"));
iconLabel->setAlignment(Qt::AlignCenter);
//titleLabel->setText(tr("This label doesn't contain comics yet") + QString("<p style='color:rgb(150,150,150);font-size:14px;font-weight:normal;'>%1</p>").arg(tr("Drag and drop folders and comics here"))); //titleLabel->setText(tr("This label doesn't contain comics yet") + QString("<p style='color:rgb(150,150,150);font-size:14px;font-weight:normal;'>%1</p>").arg(tr("Drag and drop folders and comics here")));
titleLabel = new QLabel(("This label doesn't contain comics yet")); titleLabel->setText(tr("This label doesn't contain comics yet"));
titleLabel->setAlignment(Qt::AlignCenter);
#ifdef Q_OS_MAC
titleLabel->setStyleSheet("QLabel {color:#888888; font-size:24px;font-family:Arial;font-weight:bold;}");
#else
titleLabel->setStyleSheet("QLabel {color:#CCCCCC; font-size:24px;font-family:Arial;font-weight:bold;}");
#endif
layout->addSpacing(100);
layout->addWidget(iconLabel);
layout->addSpacing(30);
layout->addWidget(titleLabel);
layout->addStretch();
setLayout(layout);
} }
void EmptyLabelWidget::setColor(YACReader::LabelColors color) void EmptyLabelWidget::setColor(YACReader::LabelColors color)
@ -42,9 +19,3 @@ void EmptyLabelWidget::setColor(YACReader::LabelColors color)
YACReader::colorize(img,destColor); YACReader::colorize(img,destColor);
iconLabel->setPixmap(QPixmap::fromImage(img)); iconLabel->setPixmap(QPixmap::fromImage(img));
} }
void EmptyLabelWidget::paintEvent(QPaintEvent * event)
{
QPainter painter (this);
painter.fillRect(0,0,width(),height(),QColor(backgroundColor));
}

8
YACReaderLibrary/empty_label_widget.h
View File

@ -2,25 +2,21 @@
#define EMPTY_LABEL_WIDGET_H #define EMPTY_LABEL_WIDGET_H
#include <QtWidgets> #include <QtWidgets>
#include "empty_container_info.h"
#include "yacreader_global.h" #include "yacreader_global.h"
class EmptyLabelWidget : public QWidget class EmptyLabelWidget : public EmptyContainerInfo
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit EmptyLabelWidget(QWidget *parent = 0); explicit EmptyLabelWidget(QWidget *parent = 0);
void setColor(YACReader::LabelColors color); void setColor(YACReader::LabelColors color);
void paintEvent(QPaintEvent *event);
signals: signals:
public slots: public slots:
protected: protected:
QLabel * iconLabel;
QLabel * titleLabel;
QString backgroundColor;
}; };
#endif // EMPTY_LABEL_WIDGET_H #endif // EMPTY_LABEL_WIDGET_H

9
YACReaderLibrary/empty_reading_list_widget.cpp Normal file
View File

@ -0,0 +1,9 @@
#include "empty_reading_list_widget.h"
EmptyReadingListWidget::EmptyReadingListWidget(QWidget *parent)
:EmptyContainerInfo(parent)
{
setUpDefaultLayout(true);
setPixmap(QPixmap(":/images/empty_reading_list"));
setText(tr("This reading list doesn't cotain comics yet"));
}

13
YACReaderLibrary/empty_reading_list_widget.h Normal file
View File

@ -0,0 +1,13 @@
#ifndef EMPTY_READING_LIST_WIDGET_H
#define EMPTY_READING_LIST_WIDGET_H
#include <QtWidgets>
#include "empty_container_info.h"
class EmptyReadingListWidget : public EmptyContainerInfo
{
public:
EmptyReadingListWidget(QWidget * parent = 0);
};
#endif // EMPTY_READING_LIST_WIDGET_H

7
YACReaderLibrary/empty_special_list.cpp Normal file
View File

@ -0,0 +1,7 @@
#include "empty_special_list.h"
EmptySpecialListWidget::EmptySpecialListWidget(QWidget *parent)
:EmptyContainerInfo(parent)
{
setUpDefaultLayout(true);
}

13
YACReaderLibrary/empty_special_list.h Normal file
View File

@ -0,0 +1,13 @@
#ifndef EMPTY_SPECIAL_LIST_H
#define EMPTY_SPECIAL_LIST_H
#include <QtWidgets>
#include "empty_container_info.h"
class EmptySpecialListWidget : public EmptyContainerInfo
{
public:
EmptySpecialListWidget(QWidget * parent = 0);
};
#endif // EMPTY_SPECIAL_LIST_H

71
YACReaderLibrary/images.qrc
View File

@ -1,5 +1,5 @@
<RCC> <RCC>
<qresource prefix="/" > <qresource prefix="/">
<file>../images/folder.png</file> <file>../images/folder.png</file>
<file>../images/folder_finished.png</file> <file>../images/folder_finished.png</file>
<file>../images/icon.png</file> <file>../images/icon.png</file>
@ -12,7 +12,7 @@
<file>../images/notCover.png</file> <file>../images/notCover.png</file>
<file>../images/edit.png</file> <file>../images/edit.png</file>
<file>../images/editIcon.png</file> <file>../images/editIcon.png</file>
<file>../images/flow1.png</file> <file>../images/flow1.png</file>
<file>../images/flow2.png</file> <file>../images/flow2.png</file>
<file>../images/flow3.png</file> <file>../images/flow3.png</file>
<file>../images/flow4.png</file> <file>../images/flow4.png</file>
@ -21,13 +21,13 @@
<file>../images/importLibraryIcon.png</file> <file>../images/importLibraryIcon.png</file>
<file>../images/exportLibrary.png</file> <file>../images/exportLibrary.png</file>
<file>../images/exportLibraryIcon.png</file> <file>../images/exportLibraryIcon.png</file>
<file>../images/importLibraryIcon.png</file> <file>../images/importLibraryIcon.png</file>
<file>../images/open.png</file> <file>../images/open.png</file>
<file>../images/coversPackage.png</file> <file>../images/coversPackage.png</file>
<file>../images/setRead.png</file> <file>../images/setRead.png</file>
<!--<file>../images/setAllRead.png</file>--> <!--<file>../images/setAllRead.png</file>-->
<file>../images/setUnread.png</file> <file>../images/setUnread.png</file>
<!--<file>../images/setAllUnread.png</file>--> <!--<file>../images/setAllUnread.png</file>-->
<file>../images/showMarks.png</file> <file>../images/showMarks.png</file>
<file>../images/editComic.png</file> <file>../images/editComic.png</file>
<file>../images/selectAll.png</file> <file>../images/selectAll.png</file>
@ -59,26 +59,11 @@
<file>../images/trash.png</file> <file>../images/trash.png</file>
<file>../images/setReadButton.png</file> <file>../images/setReadButton.png</file>
<file>../images/openInYACReader.png</file> <file>../images/openInYACReader.png</file>
<!--<file>../images/deleting_progress/imgTopLeft.png</file> <!--<file>../images/deleting_progress/imgTopLeft.png</file><file>../images/deleting_progress/imgTopMiddle.png</file><file>../images/deleting_progress/imgTopRight.png</file><file>../images/deleting_progress/imgLeftMiddle.png</file><file>../images/deleting_progress/imgRightMiddle.png</file><file>../images/deleting_progress/imgBottomLeft.png</file><file>../images/deleting_progress/imgBottomMiddle.png</file><file>../images/deleting_progress/imgBottomRight.png</file><file>../images/deleting_progress/icon.png</file><file>../images/social_dialog/close.png</file><file>../images/social_dialog/facebook.png</file><file>../images/social_dialog/google+.png</file><file>../images/social_dialog/icon.png</file><file>../images/social_dialog/shadow.png</file><file>../images/social_dialog/twitter.png</file><file>../images/social_dialog/separator.png</file>-->
<file>../images/deleting_progress/imgTopMiddle.png</file> <file>../images/main_toolbar/divider.png</file>
<file>../images/deleting_progress/imgTopRight.png</file>
<file>../images/deleting_progress/imgLeftMiddle.png</file>
<file>../images/deleting_progress/imgRightMiddle.png</file>
<file>../images/deleting_progress/imgBottomLeft.png</file>
<file>../images/deleting_progress/imgBottomMiddle.png</file>
<file>../images/deleting_progress/imgBottomRight.png</file>
<file>../images/deleting_progress/icon.png</file>
<file>../images/social_dialog/close.png</file>
<file>../images/social_dialog/facebook.png</file>
<file>../images/social_dialog/google+.png</file>
<file>../images/social_dialog/icon.png</file>
<file>../images/social_dialog/shadow.png</file>
<file>../images/social_dialog/twitter.png</file>
<file>../images/social_dialog/separator.png</file>-->
<file>../images/main_toolbar/divider.png</file>
<file>../images/collapsed_branch_osx.png</file> <file>../images/collapsed_branch_osx.png</file>
<file>../images/expanded_branch_osx.png</file> <file>../images/expanded_branch_osx.png</file>
<file>../images/folder_macosx.png</file> <file>../images/folder_macosx.png</file>
<file>../images/libraryIconSelected.png</file> <file>../images/libraryIconSelected.png</file>
<file>../images/libraryOptions.png</file> <file>../images/libraryOptions.png</file>
<file>../images/branch-open.png</file> <file>../images/branch-open.png</file>
@ -90,28 +75,30 @@
<file>../images/getInfo.png</file> <file>../images/getInfo.png</file>
<file>../images/comic_vine/radioChecked.png</file> <file>../images/comic_vine/radioChecked.png</file>
<file>../images/comic_vine/radioUnchecked.png</file> <file>../images/comic_vine/radioUnchecked.png</file>
<file>../images/comic_vine/radioUnchecked.png</file> <file>../images/comic_vine/radioUnchecked.png</file>
<file>../images/comic_vine/rowDown.png</file> <file>../images/comic_vine/rowDown.png</file>
<file>../images/comic_vine/rowUp.png</file> <file>../images/comic_vine/rowUp.png</file>
<file>../images/comic_vine/previousPage.png</file> <file>../images/comic_vine/previousPage.png</file>
<file>../images/comic_vine/nextPage.png</file> <file>../images/comic_vine/nextPage.png</file>
<file>../images/comic_vine/downArrow.png</file> <file>../images/comic_vine/downArrow.png</file>
<file>../images/comic_vine/upArrow.png</file> <file>../images/comic_vine/upArrow.png</file>
<file>../images/find_folder.png</file> <file>../images/find_folder.png</file>
<file>../images/clear_shortcut.png</file> <file>../images/clear_shortcut.png</file>
<file>../images/accept_shortcut.png</file> <file>../images/accept_shortcut.png</file>
<file>../images/f_overlayed.png</file> <file>../images/f_overlayed.png</file>
<file>../images/f_overlayed_retina.png</file> <file>../images/f_overlayed_retina.png</file>
<file>../images/shortcuts_group_comics.png</file> <file>../images/shortcuts_group_comics.png</file>
<file>../images/shortcuts_group_folders.png</file> <file>../images/shortcuts_group_folders.png</file>
<file>../images/shortcuts_group_general.png</file> <file>../images/shortcuts_group_general.png</file>
<file>../images/shortcuts_group_libraries.png</file> <file>../images/shortcuts_group_libraries.png</file>
<file>../images/shortcuts_group_mglass.png</file> <file>../images/shortcuts_group_mglass.png</file>
<file>../images/shortcuts_group_page.png</file> <file>../images/shortcuts_group_page.png</file>
<file>../images/shortcuts_group_reading.png</file> <file>../images/shortcuts_group_reading.png</file>
<file>../images/shortcuts_group_visualization.png</file> <file>../images/shortcuts_group_visualization.png</file>
<file>../images/searching_icon.png</file> <file>../images/searching_icon.png</file>
<file>../images/empty_label.png</file> <file>../images/empty_label.png</file>
<file>../images/empty_current_readings.png</file>
<file>../images/empty_favorites.png</file>
<!--<file>../images/busy_background.png</file>--> <!--<file>../images/busy_background.png</file>-->
</qresource> </qresource>
</RCC> </RCC>

97
YACReaderLibrary/images_osx.qrc
View File

@ -1,51 +1,48 @@
<RCC> <RCC>
<qresource prefix="/" > <qresource prefix="/">
<file>../images/folder_finished_macosx.png</file> <file>../images/folder_finished_macosx.png</file>
<file alias="images/main_toolbar/back.png">../images/main_toolbar/back_osx.png</file> <file alias="images/main_toolbar/back.png">../images/main_toolbar/back_osx.png</file>
<file alias="images/main_toolbar/back@2x.png">../images/main_toolbar/back_osx@2x.png</file> <file alias="images/main_toolbar/back@2x.png">../images/main_toolbar/back_osx@2x.png</file>
<file alias="images/main_toolbar/forward.png">../images/main_toolbar/forward_osx.png</file> <file alias="images/main_toolbar/forward.png">../images/main_toolbar/forward_osx.png</file>
<file alias="images/main_toolbar/forward@2x.png">../images/main_toolbar/forward_osx@2x.png</file> <file alias="images/main_toolbar/forward@2x.png">../images/main_toolbar/forward_osx@2x.png</file>
<file alias="images/main_toolbar/settings.png">../images/main_toolbar/settings_osx.png</file> <file alias="images/main_toolbar/settings.png">../images/main_toolbar/settings_osx.png</file>
<file alias="images/main_toolbar/settings@2x.png">../images/main_toolbar/settings_osx@2x.png</file> <file alias="images/main_toolbar/settings@2x.png">../images/main_toolbar/settings_osx@2x.png</file>
<file alias="images/main_toolbar/server.png">../images/main_toolbar/server_osx.png</file> <file alias="images/main_toolbar/server.png">../images/main_toolbar/server_osx.png</file>
<file alias="images/main_toolbar/server@2x.png">../images/main_toolbar/server_osx@2x.png</file> <file alias="images/main_toolbar/server@2x.png">../images/main_toolbar/server_osx@2x.png</file>
<file alias="images/main_toolbar/help.png">../images/main_toolbar/help_osx.png</file> <file alias="images/main_toolbar/help.png">../images/main_toolbar/help_osx.png</file>
<file alias="images/main_toolbar/help@2x.png">../images/main_toolbar/help_osx@2x.png</file> <file alias="images/main_toolbar/help@2x.png">../images/main_toolbar/help_osx@2x.png</file>
<file alias="images/main_toolbar/flow.png">../images/main_toolbar/flow_osx.png</file> <file alias="images/main_toolbar/flow.png">../images/main_toolbar/flow_osx.png</file>
<file alias="images/main_toolbar/flow@2x.png">../images/main_toolbar/flow_osx@2x.png</file> <file alias="images/main_toolbar/flow@2x.png">../images/main_toolbar/flow_osx@2x.png</file>
<file alias="images/main_toolbar/grid.png">../images/main_toolbar/grid_osx.png</file> <file alias="images/main_toolbar/grid.png">../images/main_toolbar/grid_osx.png</file>
<file alias="images/main_toolbar/grid@2x.png">../images/main_toolbar/grid_osx@2x.png</file> <file alias="images/main_toolbar/grid@2x.png">../images/main_toolbar/grid_osx@2x.png</file>
<file alias="images/libraryIcon.png">../images/libraryIcon_osx.png</file>
<file alias="images/libraryIcon.png">../images/libraryIcon_osx.png</file> <file alias="images/setRoot.png">../images/setRoot_osx.png</file>
<file alias="images/setRoot.png">../images/setRoot_osx.png</file> <file alias="images/expand.png">../images/expand_osx.png</file>
<file alias="images/expand.png">../images/expand_osx.png</file> <file alias="images/colapse.png">../images/colapse_osx.png</file>
<file alias="images/colapse.png">../images/colapse_osx.png</file> <file alias="images/newLibraryIcon.png">../images/newLibraryIcon_osx.png</file>
<file alias="images/newLibraryIcon.png">../images/newLibraryIcon_osx.png</file> <file alias="images/openLibraryIcon.png">../images/openLibraryIcon_osx.png</file>
<file alias="images/openLibraryIcon.png">../images/openLibraryIcon_osx.png</file> <file alias="images/flow_to_grid.gif">../images/flow_to_grid.gif</file>
<file alias="images/flow_to_grid.gif">../images/flow_to_grid.gif</file> <file alias="images/grid_to_flow.gif">../images/grid_to_flow.gif</file>
<file alias="images/grid_to_flow.gif">../images/grid_to_flow.gif</file> <file alias="images/empty_folder.png">../images/empty_folder_osx.png</file>
<file alias="images/empty_folder.png">../images/empty_folder_osx.png</file> <file alias="images/empty_search.png">../images/empty_search_osx.png</file>
<file alias="images/empty_search.png">../images/empty_search_osx.png</file> <file>../images/iconSearch.png</file>
<file>../images/iconSearch.png</file> <file>../images/clearSearch.png</file>
<file>../images/clearSearch.png</file> <!--reading lists-->
<file alias="images/lists/default_0.png">../images/lists/default_0_osx.png</file>
<!--reading lists--> <file alias="images/lists/default_1.png">../images/lists/default_1_osx.png</file>
<file alias="images/lists/default_0.png">../images/lists/default_0_osx.png</file> <file alias="images/lists/label_blue.png">../images/lists/label_blue_osx.png</file>
<file alias="images/lists/default_1.png">../images/lists/default_1_osx.png</file> <file alias="images/lists/label_cyan.png">../images/lists/label_cyan_osx.png</file>
<file alias="images/lists/label_blue.png">../images/lists/label_blue_osx.png</file> <file alias="images/lists/label_dark.png">../images/lists/label_dark_osx.png</file>
<file alias="images/lists/label_cyan.png">../images/lists/label_cyan_osx.png</file> <file alias="images/lists/label_green.png">../images/lists/label_green_osx.png</file>
<file alias="images/lists/label_dark.png">../images/lists/label_dark_osx.png</file> <file alias="images/lists/label_light.png">../images/lists/label_light_osx.png</file>
<file alias="images/lists/label_green.png">../images/lists/label_green_osx.png</file> <file alias="images/lists/label_orange.png">../images/lists/label_orange_osx.png</file>
<file alias="images/lists/label_light.png">../images/lists/label_light_osx.png</file> <file alias="images/lists/label_pink.png">../images/lists/label_pink_osx.png</file>
<file alias="images/lists/label_orange.png">../images/lists/label_orange_osx.png</file> <file alias="images/lists/label_purple.png">../images/lists/label_purple_osx.png</file>
<file alias="images/lists/label_pink.png">../images/lists/label_pink_osx.png</file> <file alias="images/lists/label_red.png">../images/lists/label_red_osx.png</file>
<file alias="images/lists/label_purple.png">../images/lists/label_purple_osx.png</file> <file alias="images/lists/label_violet.png">../images/lists/label_violet_osx.png</file>
<file alias="images/lists/label_red.png">../images/lists/label_red_osx.png</file> <file alias="images/lists/label_white.png">../images/lists/label_white_osx.png</file>
<file alias="images/lists/label_violet.png">../images/lists/label_violet_osx.png</file> <file alias="images/lists/label_yellow.png">../images/lists/label_yellow_osx.png</file>
<file alias="images/lists/label_white.png">../images/lists/label_white_osx.png</file> <file alias="images/lists/list.png">../images/lists/list_osx.png</file>
<file alias="images/lists/label_yellow.png">../images/lists/label_yellow_osx.png</file> <file alias="images/empty_reading_list.png">../images/empty_reading_list_osx.png</file>
<file alias="images/lists/list.png">../images/lists/list_osx.png</file> </qresource>
</RCC>
</qresource>
</RCC>

34
YACReaderLibrary/images_win.qrc
View File

@ -27,21 +27,21 @@
<file>../images/addLabelIcon.png</file> <file>../images/addLabelIcon.png</file>
<file>../images/renameListIcon.png</file> <file>../images/renameListIcon.png</file>
<!--reading lists--> <!--reading lists-->
<file>../images/lists/default_0.png</file> <file>../images/lists/default_0.png</file>
<file>../images/lists/default_1.png</file> <file>../images/lists/default_1.png</file>
<file>../images/lists/label_blue.png</file> <file>../images/lists/label_blue.png</file>
<file>../images/lists/label_cyan.png</file> <file>../images/lists/label_cyan.png</file>
<file>../images/lists/label_dark.png</file> <file>../images/lists/label_dark.png</file>
<file>../images/lists/label_green.png</file> <file>../images/lists/label_green.png</file>
<file>../images/lists/label_light.png</file> <file>../images/lists/label_light.png</file>
<file>../images/lists/label_orange.png</file> <file>../images/lists/label_orange.png</file>
<file>../images/lists/label_pink.png</file> <file>../images/lists/label_pink.png</file>
<file>../images/lists/label_purple.png</file> <file>../images/lists/label_purple.png</file>
<file>../images/lists/label_red.png</file> <file>../images/lists/label_red.png</file>
<file>../images/lists/label_violet.png</file> <file>../images/lists/label_violet.png</file>
<file>../images/lists/label_white.png</file> <file>../images/lists/label_white.png</file>
<file>../images/lists/label_yellow.png</file> <file>../images/lists/label_yellow.png</file>
<file>../images/lists/list.png</file> <file>../images/lists/list.png</file>
<file>../images/empty_reading_list.png</file>
</qresource> </qresource>
</RCC> </RCC>

15
YACReaderLibrary/library_window.cpp
View File

@ -66,6 +66,8 @@
#include "comics_view_transition.h" #include "comics_view_transition.h"
#include "empty_folder_widget.h" #include "empty_folder_widget.h"
#include "empty_label_widget.h" #include "empty_label_widget.h"
#include "empty_special_list.h"
#include "empty_reading_list_widget.h"
#include "edit_shortcuts_dialog.h" #include "edit_shortcuts_dialog.h"
#include "shortcuts_manager.h" #include "shortcuts_manager.h"
@ -242,7 +244,10 @@ void LibraryWindow::doLayout()
comicsViewStack->addWidget(comicsViewTransition = new ComicsViewTransition()); comicsViewStack->addWidget(comicsViewTransition = new ComicsViewTransition());
comicsViewStack->addWidget(emptyFolderWidget = new EmptyFolderWidget()); comicsViewStack->addWidget(emptyFolderWidget = new EmptyFolderWidget());
comicsViewStack->addWidget(emptyLabelWidget = new EmptyLabelWidget()); comicsViewStack->addWidget(emptyLabelWidget = new EmptyLabelWidget());
comicsViewStack->addWidget(emptySpecialList = new EmptySpecialListWidget());
comicsViewStack->addWidget(emptyReadingList = new EmptyReadingListWidget());
comicsViewStack->addWidget(noSearchResultsWidget = new NoSearchResultsWidget()); comicsViewStack->addWidget(noSearchResultsWidget = new NoSearchResultsWidget());
comicsViewStack->addWidget(comicsView); comicsViewStack->addWidget(comicsView);
comicsViewStack->setCurrentWidget(comicsView); comicsViewStack->setCurrentWidget(comicsView);
@ -2167,6 +2172,16 @@ void LibraryWindow::showEmptyLabelView()
comicsViewStack->setCurrentWidget(emptyLabelWidget); comicsViewStack->setCurrentWidget(emptyLabelWidget);
} }
void LibraryWindow::showEmptySpecialList()
{
comicsViewStack->setCurrentWidget(emptySpecialList);
}
void LibraryWindow::showEmptyReadingListWidget()
{
comicsViewStack->setCurrentWidget(emptyReadingList);
}
void LibraryWindow::showNoSearchResultsView() void LibraryWindow::showNoSearchResultsView()
{ {
comicsViewStack->setCurrentWidget(noSearchResultsWidget); comicsViewStack->setCurrentWidget(noSearchResultsWidget);

6
YACReaderLibrary/library_window.h
View File

@ -69,6 +69,8 @@ class ReadingListModelProxy;
class YACReaderReadingListsView; class YACReaderReadingListsView;
class YACReaderHistoryController; class YACReaderHistoryController;
class EmptyLabelWidget; class EmptyLabelWidget;
class EmptySpecialListWidget;
class EmptyReadingListWidget;
#include "comic_db.h" #include "comic_db.h"
@ -123,6 +125,8 @@ private:
ComicsViewTransition * comicsViewTransition; ComicsViewTransition * comicsViewTransition;
EmptyFolderWidget * emptyFolderWidget; EmptyFolderWidget * emptyFolderWidget;
EmptyLabelWidget * emptyLabelWidget; EmptyLabelWidget * emptyLabelWidget;
EmptySpecialListWidget * emptySpecialList;
EmptyReadingListWidget * emptyReadingList;
NoSearchResultsWidget * noSearchResultsWidget; NoSearchResultsWidget * noSearchResultsWidget;
YACReaderFoldersView * foldersView; YACReaderFoldersView * foldersView;
@ -361,6 +365,8 @@ public slots:
void showComicsView(); void showComicsView();
void showEmptyFolderView(); void showEmptyFolderView();
void showEmptyLabelView(); void showEmptyLabelView();
void showEmptySpecialList();
void showEmptyReadingListWidget();
void showNoSearchResultsView(); void showNoSearchResultsView();
void toggleComicsView(); void toggleComicsView();
void checkSearchNumResults(int numResults); void checkSearchNumResults(int numResults);

18
YACReaderLibrary/yacreader_navigation_controller.cpp
View File

@ -15,6 +15,7 @@
#include "yacreader_search_line_edit.h" #include "yacreader_search_line_edit.h"
#include "yacreader_global.h" #include "yacreader_global.h"
#include "empty_label_widget.h" #include "empty_label_widget.h"
#include "empty_special_list.h"
#include "QsLog.h" #include "QsLog.h"
@ -98,7 +99,21 @@ void YACReaderNavigationController::loadListInfo(const QModelIndex &modelIndex)
void YACReaderNavigationController::loadSpecialListInfo(const QModelIndex &modelIndex) void YACReaderNavigationController::loadSpecialListInfo(const QModelIndex &modelIndex)
{ {
ReadingListModel::TypeSpecialList type = (ReadingListModel::TypeSpecialList)modelIndex.data(ReadingListModel::SpecialListTypeRole).toInt();
switch(type)
{
case ReadingListModel::Favorites:
libraryWindow->emptySpecialList->setPixmap(QPixmap(":/images/empty_favorites.png"));
libraryWindow->emptySpecialList->setText(tr("No favorites"));
break;
case ReadingListModel::Reading:
libraryWindow->emptySpecialList->setPixmap(QPixmap(":/images/empty_current_readings.png"));
libraryWindow->emptySpecialList->setText(tr("You are not reading anything yet, come on!!"));
break;
}
libraryWindow->showEmptySpecialList();
libraryWindow->disableComicsActions(true);
} }
void YACReaderNavigationController::loadLabelInfo(const QModelIndex &modelIndex) void YACReaderNavigationController::loadLabelInfo(const QModelIndex &modelIndex)
@ -126,7 +141,8 @@ void YACReaderNavigationController::loadLabelInfo(const QModelIndex &modelIndex)
void YACReaderNavigationController::loadReadingListInfo(const QModelIndex &modelIndex) void YACReaderNavigationController::loadReadingListInfo(const QModelIndex &modelIndex)
{ {
libraryWindow->showEmptyReadingListWidget();
libraryWindow->disableComicsActions(true);
} }
void YACReaderNavigationController::selectedList(const QModelIndex &mi) void YACReaderNavigationController::selectedList(const QModelIndex &mi)

BIN
images/empty_current_readings.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
images/empty_favorites.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
images/empty_reading_list.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
images/empty_reading_list_osx.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB