separadas en ficheros todas las clases que habia en custom_widgets.h/.cpp

eliminado c?digo que ya no se usaba en custom_widgets.h/.cpp

YACReaderLibrary/YACReaderLibrary.pro

@@ -9,7 +9,8 @@ INCLUDEPATH += .
 INCLUDEPATH += ../common \
 	           ./server \
 			   ./db \
-			   ../YACReader 
+			   ../YACReader  \
+			   ../custom_widgets
 
 DEFINES += SERVER_RELEASE
 			   
@@ -37,8 +38,6 @@ CONFIG += release
 CONFIG -= flat
 QT += sql network opengl
 
-
-
 # Input
 HEADERS += comic_flow.h \
            create_library_dialog.h \
@@ -73,8 +72,8 @@ HEADERS += comic_flow.h \
 		   ../common/yacreader_flow_gl.h \
 		   ../common/yacreader_global.h \
 		   ../common/onstart_flow_selection_dialog.h \
-    no_libraries_widget.h \
-    import_widget.h
+			no_libraries_widget.h \
+			import_widget.h
 		   
 SOURCES += comic_flow.cpp \
            create_library_dialog.cpp \
@@ -109,11 +108,12 @@ SOURCES += comic_flow.cpp \
 		   ../common/qnaturalsorting.cpp \
 		   ../common/yacreader_flow_gl.cpp \
 		   ../common/onstart_flow_selection_dialog.cpp \
-    no_libraries_widget.cpp \
-    import_widget.cpp
+			no_libraries_widget.cpp \
+			import_widget.cpp \
+			
 		   
 include(./server/server.pri)
-
+include(../custom_widgets/custom_widgets.pri)
 
 RESOURCES += images.qrc files.qrc
 RC_FILE = icon.rc

YACReaderLibrary/comic_flow.cpp

@@ -1,9 +1,13 @@
 #include "comic_flow.h"
 #include "qnaturalsorting.h"
 
+#include "yacreader_global.h"
+
+#include <algorithm>
+
 #include <QMutex>
 #include <QImageReader>
-#include <algorithm>
+#include <QTimer>
 
 ComicFlow::ComicFlow(QWidget* parent,FlowType flowType)
 :YACReaderFlow(parent,flowType)

YACReaderLibrary/comic_flow.h

@@ -1,7 +1,8 @@
 #ifndef __COMICFLOW_H
 #define __COMICFLOW_H
 
-#include "custom_widgets.h"
+#include "yacreader_flow.h"
+
 #include <QtCore>
 #include <QObject>
 #include <QThread>

YACReaderLibrary/db/tableitem.h

@@ -3,7 +3,6 @@
 
 #include <QList>
 #include <QVariant>
-#include "comic_db.h"
 
 //! [0]
 class TableItem

YACReaderLibrary/db/tablemodel.cpp

@@ -6,6 +6,7 @@
 #include "tablemodel.h"
 #include "data_base_management.h"
 #include "qnaturalsorting.h"
+#include "comic_db.h"
 
 //ci.number,ci.title,c.fileName,ci.numPages,c.id,c.parentId,c.path,ci.hash,ci.read
 #define NUMBER 0

YACReaderLibrary/db/tablemodel.h

@@ -7,7 +7,7 @@
 #include <QSqlQuery>
 #include <QSqlDatabase>
 
-#include "comic_db.h"
+class ComicDB;
 
 class TableItem;
 

YACReaderLibrary/db_helper.h

@@ -3,7 +3,7 @@
 
 class QString;
 class LibraryItem;
-class ComicDB;
+#include "comic_db.h"
 #include <QMap>
 #include <QList>
 

YACReaderLibrary/library_window.cpp

@@ -14,6 +14,8 @@
 #include <QHBoxLayout>
 #include <QFileIconProvider>
 #include <QMatrix>
+#include <QSettings>
+#include <QGLFormat>
 
 #include <iterator>
 #include <typeinfo>
@@ -24,6 +26,26 @@
 #include "no_libraries_widget.h"
 #include "import_widget.h"
 
+#include "yacreader_search_line_edit.h"
+#include "comic_db.h"
+#include "library_creator.h"
+#include "package_manager.h"
+#include "comic_flow_widget.h"
+#include "create_library_dialog.h"
+#include "rename_library_dialog.h"
+#include "properties_dialog.h"
+#include "export_library_dialog.h"
+#include "import_library_dialog.h"
+#include "export_comics_info_dialog.h"
+#include "import_comics_info_dialog.h"
+#include "add_library_dialog.h"
+#include "options_dialog.h"
+#include "help_about_dialog.h"
+#include "server_config_dialog.h"
+#include "tablemodel.h"
+#include "yacreader_tool_bar_stretch.h"
+
+
 //
 
 LibraryWindow::LibraryWindow()
@@ -181,7 +203,7 @@ void LibraryWindow::doLayout()
 	QVBoxLayout * searchLayout = new QVBoxLayout;
 
 	QHBoxLayout * filter = new QHBoxLayout;
-	filter->addWidget(foldersFilter = new YACReaderLineEdit());
+	filter->addWidget(foldersFilter = new YACReaderSearchLineEdit());
 	foldersFilter->setPlaceholderText(tr("Search folders and comics"));
 	previousFilter = "";
 	//filter->addWidget(clearFoldersFilter = new QPushButton(tr("Clear")));

YACReaderLibrary/library_window.h

@@ -2,38 +2,49 @@
 #define __LIBRARYWINDOW_H
 
 #include <QMainWindow>
-#include <QTableView>
-#include <QTreeView>
+#include <QMap>
 #include <QModelIndex>
-#include <QDirModel>
-#include <QAction>
-#include <QToolBar>
-#include <QComboBox>
-#include <QThread>
-#include <QFileInfoList>
-#include <QStackedWidget>
+#include <QFileInfo>
 
-//TODO cambiar por class XXXXX
-#include "create_library_dialog.h"
-#include "add_library_dialog.h"
-#include "library_creator.h"
-//#include "comic_flow.h"
-#include "comic_flow_widget.h"
-#include "custom_widgets.h"
-#include "rename_library_dialog.h"
-#include "properties_dialog.h"
-#include "options_dialog.h"
-#include "export_comics_info_dialog.h"
-#include "import_comics_info_dialog.h"
-#include "export_library_dialog.h"
-#include "import_library_dialog.h"
-#include "package_manager.h"
-#include "treemodel.h"
-#include "tablemodel.h"
-#include "treeitem.h"
-#include "server_config_dialog.h"
-#include "no_libraries_widget.h"
-#include "import_widget.h"
+class QTableView;
+class QTreeView;
+class QDirModel;
+class QAction;
+class QToolBar;
+class QComboBox;
+class QThread;
+class QStackedWidget;
+class YACReaderSearchLineEdit;
+class CreateLibraryDialog;
+class UpdateLibraryDialog;
+class ExportLibraryDialog;
+class ImportLibraryDialog;
+class ExportComicsInfoDialog;
+class ImportComicsInfoDialog;
+class AddLibraryDialog;
+class LibraryCreator;
+class HelpAboutDialog;
+class RenameLibraryDialog;
+class PropertiesDialog;
+class PackageManager;
+class ComicFlowWidget;
+class QCheckBox;
+class QPushButton;
+class TableModel;
+class QSplitter;
+class TreeItem;
+class TreeModel;
+class QItemSelectionModel;
+class QString;
+class QLabel;
+class NoLibrariesWidget;
+class OptionsDialog;
+class ServerConfigDialog;
+class QCloseEvent;
+class ImportWidget;
+class QSettings;
+class LibraryItem;
+#include "comic_db.h"
 
 class LibraryWindow : public QMainWindow
 {
@@ -64,7 +75,7 @@ private:
 	QSize slideSizeW;
 	QSize slideSizeF;
 	//search filter
-	YACReaderLineEdit * foldersFilter;
+	YACReaderSearchLineEdit * foldersFilter;
 	TreeItem * index; //index al que hay que hacer scroll despu<70>s de pulsar sobre un folder filtrado
 	int column;
 	QString previousFilter;
@@ -81,7 +92,6 @@ private:
 	//QStringList paths;
 	QMap<QString,QString> libraries;
 	QLabel * fullScreenToolTip;
-	YACReaderIconProvider fip;
 
 	QStackedWidget * mainWidget;
 	NoLibrariesWidget * noLibrariesWidget;

YACReaderLibrary/main.cpp

@@ -1,6 +1,11 @@
 #include "library_window.h"
 
 #include <QApplication>
+#include <QTranslator>
+#include <QSettings>
+#include <QLocale>
+
+#include "yacreader_global.h"
 #include "startup.h"
 #define PICTUREFLOW_QT4 1
 

YACReaderLibrary/options_dialog.cpp

@@ -1,4 +1,9 @@
 #include "options_dialog.h"
+
+#include "yacreader_flow_gl.h"
+#include "yacreader_flow_config_widget.h"
+#include "yacreader_gl_flow_config_widget.h"
+
 #include <QVBoxLayout>
 #include <QHBoxLayout>
 #include <QFileDialog>
@@ -10,9 +15,6 @@
 #include <QMessageBox>
 #include <QCheckBox>
 
-#include "custom_widgets.h"
-#include "yacreader_flow_gl.h"
-
 FlowType flowType = Strip;
 
 OptionsDialog::OptionsDialog(QWidget * parent)

YACReaderLibrary/options_dialog.h

@@ -1,18 +1,9 @@
 #ifndef __OPTIONS_DIALOG_H
 #define __OPTIONS_DIALOG_H
 
-#include <QDialog>
-#include <QLabel>
-#include <QLineEdit>
-#include <QPushButton>
-#include <QSlider>
-#include <QPushButton>
-#include <QRadioButton>
-#include <QCheckBox>
-#include <QSettings>
-#include "pictureflow.h"
+#include "yacreader_options_dialog.h"
 
-#include "custom_widgets.h"
+#include "yacreader_global.h"
 
 extern FlowType flowType;
 

YACReaderLibrary/properties_dialog.cpp

@@ -1,4 +1,10 @@
 #include "properties_dialog.h"
+
+#include "data_base_management.h"
+#include "library_creator.h"
+#include "yacreader_field_edit.h"
+#include "yacreader_field_plain_text_edit.h"
+
 #include <QHBoxLayout>
 #include <QApplication>
 #include <QDesktopWidget>
@@ -8,9 +14,6 @@
 #include <QTabWidget>
 #include <QIntValidator>
 
-#include "data_base_management.h"
-#include "library_creator.h"
-
 PropertiesDialog::PropertiesDialog(QWidget * parent)
 :QDialog(parent)
 {

YACReaderLibrary/properties_dialog.h

@@ -2,18 +2,20 @@
 #define __PROPERTIES_DIALOG_H
 
 #include <QDialog>
-#include <QLabel>
-#include <QPushButton>
-#include <QScrollArea>
-#include <QGroupBox>
-#include <QDialogButtonBox>
-#include <QGridLayout>
-#include <QTabWidget>
-#include <QCheckBox>
+
 #include <QIntValidator>
 
+class QGridLayout;
+class QTabWidget;
+class QGroupBox;
+class QLabel;
+class QScrollArea;
+class QWidget;
+class YACReaderFieldEdit;
+class YACReaderFieldPlainTextEdit;
+class QDialogButtonBox;
+class QCheckBox;
 #include "comic_db.h"
-#include "custom_widgets.h"
 
 	class PropertiesDialog : public QDialog
 	{