From ac38de88e887c181a068f39186ecefa0d61f685f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Fri, 31 Oct 2014 14:33:53 +0100 Subject: [PATCH] add label dialog --- YACReaderLibrary/YACReaderLibrary.pro | 6 +++-- YACReaderLibrary/add_label_dialog.cpp | 31 ++++++++++++++++++++++++++ YACReaderLibrary/add_label_dialog.h | 22 ++++++++++++++++++ YACReaderLibrary/library_window.cpp | 22 ++++++++++++++++++ YACReaderLibrary/library_window.h | 3 +++ images/lists/favorites.png | Bin 323 -> 383 bytes 6 files changed, 82 insertions(+), 2 deletions(-) create mode 100644 YACReaderLibrary/add_label_dialog.cpp create mode 100644 YACReaderLibrary/add_label_dialog.h diff --git a/YACReaderLibrary/YACReaderLibrary.pro b/YACReaderLibrary/YACReaderLibrary.pro index db6d7eda..2c9b7e98 100644 --- a/YACReaderLibrary/YACReaderLibrary.pro +++ b/YACReaderLibrary/YACReaderLibrary.pro @@ -124,7 +124,8 @@ HEADERS += comic_flow.h \ db/reading_list_model.h \ db/reading_list_item.h \ yacreader_folders_view.h \ - yacreader_reading_lists_view.h + yacreader_reading_lists_view.h \ + add_label_dialog.h SOURCES += comic_flow.cpp \ @@ -177,7 +178,8 @@ SOURCES += comic_flow.cpp \ db/reading_list_model.cpp \ db/reading_list_item.cpp \ yacreader_folders_view.cpp \ - yacreader_reading_lists_view.cpp + yacreader_reading_lists_view.cpp \ + add_label_dialog.cpp include(./server/server.pri) diff --git a/YACReaderLibrary/add_label_dialog.cpp b/YACReaderLibrary/add_label_dialog.cpp new file mode 100644 index 00000000..372324e6 --- /dev/null +++ b/YACReaderLibrary/add_label_dialog.cpp @@ -0,0 +1,31 @@ +#include "add_label_dialog.h" + +AddLabelDialog::AddLabelDialog(QWidget *parent) : + QDialog(parent) +{ + QVBoxLayout * layout = new QVBoxLayout; + + layout->addWidget(new QLabel(tr("Label name:"))); + layout->addWidget(edit = new QLineEdit()); + + layout->addWidget(new QLabel(tr("Choose a color:"))); + layout->addWidget(list = new QListWidget() ); + + list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_red.png"), tr("red"))); + list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_orange.png"), tr("orange"))); + list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_yellow.png"), tr("yellow"))); + list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_green.png"), tr("green"))); + list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_cyan.png"), tr("cyan"))); + list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_blue.png"), tr("blue"))); + list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_violet.png"), tr("violet"))); + list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_purple.png"), tr("purple"))); + list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_pink.png"), tr("pink"))); + list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_white.png"), tr("white"))); + list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_light.png"), tr("light"))); + list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_dark.png"), tr("dark"))); + + //this->palette().background().color(). + list->setStyleSheet("QListWidget {border : none; background-color:#BCBCBCBC;}"); + + setLayout(layout); +} diff --git a/YACReaderLibrary/add_label_dialog.h b/YACReaderLibrary/add_label_dialog.h new file mode 100644 index 00000000..6f10984e --- /dev/null +++ b/YACReaderLibrary/add_label_dialog.h @@ -0,0 +1,22 @@ +#ifndef ADD_LABEL_DIALOG_H +#define ADD_LABEL_DIALOG_H + +#include + +class AddLabelDialog : public QDialog +{ + Q_OBJECT +public: + explicit AddLabelDialog(QWidget *parent = 0); + +signals: + +public slots: + +protected: + QLineEdit * edit; + QListWidget * list; + +}; + +#endif // ADD_LABEL_DIALOG_H diff --git a/YACReaderLibrary/library_window.cpp b/YACReaderLibrary/library_window.cpp index c1e75fb0..7f5b0534 100644 --- a/YACReaderLibrary/library_window.cpp +++ b/YACReaderLibrary/library_window.cpp @@ -75,6 +75,7 @@ #include "reading_list_model.h" #include "yacreader_reading_lists_view.h" +#include "add_label_dialog.h" #include "QsLog.h" @@ -1129,6 +1130,11 @@ void LibraryWindow::createConnections() //update folders (partial updates) connect(updateCurrentFolderAction,SIGNAL(triggered()), this, SLOT(updateCurrentFolder())); connect(updateFolderAction,SIGNAL(triggered()), this, SLOT(updateTreeFolder())); + + //lists + connect(addReadingListAction,SIGNAL(triggered()),this,SLOT(addNewReadingList())); + connect(deleteReadingListAction,SIGNAL(triggered()),this,SLOT(deleteSelectedReadingList())); + connect(addLabelAction,SIGNAL(triggered()),this,SLOT(addNewLabel())); } void LibraryWindow::loadLibrary(const QString & name) @@ -1589,6 +1595,22 @@ void LibraryWindow::errorDeletingFolder() QMessageBox::critical(this,tr("Unable to delete"),tr("There was an issue trying to delete the selected folders. Please, check for write permissions and be sure that any applications are using these folders or any of the contained files.")); } +void LibraryWindow::addNewReadingList() +{ + +} + +void LibraryWindow::deleteSelectedReadingList() +{ + +} + +void LibraryWindow::addNewLabel() +{ + AddLabelDialog * dialog = new AddLabelDialog(); + dialog->open(); +} + void LibraryWindow::selectSubfolder(const QModelIndex &mi, int child) { QModelIndex dest = foldersModel->index(child,0,mi); diff --git a/YACReaderLibrary/library_window.h b/YACReaderLibrary/library_window.h index 34dfe0a3..ea399504 100644 --- a/YACReaderLibrary/library_window.h +++ b/YACReaderLibrary/library_window.h @@ -357,6 +357,9 @@ public slots: void addFolderToCurrentIndex(); void deleteSelectedFolder(); void errorDeletingFolder(); + void addNewReadingList(); + void deleteSelectedReadingList(); + void addNewLabel(); }; #endif diff --git a/images/lists/favorites.png b/images/lists/favorites.png index 12d7fee1b0891cdcff18403c13ffeee6ff43c205..93b55e470f15aa60f2ce7a0ddccf5813514e6791 100644 GIT binary patch delta 320 zcmV-G0l)sk0{;S#NPht#Nkl1D!2v+3ABYuzcmohOO6*vB0Vr+&WY+^R zNd5v;d;=p?!+Hi(@BxSmp#}+{$pwNmod+@u7>EZKm`KzB0tQTP{``JHiVl!^rf0u@ z9VA5)NIlccx6c>+`v3n2F&aMq`}+Z;p7}o?-;>9`e+oMA2!B}M(*QEK@AZ?ZC%=7O z!2IUjyFXuexG!)rF{$csaBJYwwDHs1waeeXZn$yh_6KIL=ia^h@_>Ww22i6UHjOJk zyxutV&GQzZhC3iWGdxt@y?X)D`1}8VL0wL66=p_87Lb$Xy?eP9h(Q`Iz|=CM1Se4A zb1sf6KtD1Xb2;&9biH~!ck`!rJwOdtkkv6_bH9d)ssxaV0OA!u4H)qV5MTiB0gfw) S+<5c=0000c83NPht3NklEZKK$`wDkO-LW-MjaN6b&HtOgC=aI6;ag zkb0($j*gXIzkdBgjD}aQUi|>6XS#j+_KLW;xFdu#fDF#f&3xShQqTPV|Nmc4o;*4F z<;xd02L}fcT$*}%dd{t0y*l;Zzke?fA;QGuk(rr!9U74+7$gpo#~zeGiO9&v%fJx& z4N?rEL42GVkTlu=!T!saFMkKoAU<)C$Hb%p#LGc6HhF*m0|3(`nnY*85j_9^002ov JPDHLkV1h=1bq4?d