cambio en la toolbar

YACReaderLibrary/library_window.cpp

@@ -115,8 +115,6 @@ void LibraryWindow::setupUI()
 	socialDialog->setHidden(true);*/
 }
 
-//#define NEW_LAYOUT
-
 void LibraryWindow::doLayout()
 {
 	//LAYOUT ELEMENTS------------------------------------------------------------
@@ -132,10 +130,10 @@ void LibraryWindow::doLayout()
 	//TOOLBARS-------------------------------------------------------------------
 	//---------------------------------------------------------------------------
 	editInfoToolBar = new QToolBar();
-#ifdef NEW_LAYOUT
+#ifdef Q_OS_MAC
-	libraryToolBar = new QToolBar();
-#else
 	libraryToolBar = addToolBar(tr("Library"));
+#else
+	libraryToolBar = new YACReaderMainToolBar;
 #endif
 
 	//FLOW-----------------------------------------------------------------------
@@ -211,9 +209,9 @@ void LibraryWindow::doLayout()
 	comics->setLayout(comicsLayout);
 	sVertical->addWidget(comics);
 	sHorizontal->addWidget(sideBar);
-#ifdef NEW_LAYOUT
+#ifndef Q_OS_MAC
 	QVBoxLayout * rightLayout = new QVBoxLayout;
-	rightLayout->addWidget(new YACReaderMainToolBar);
+	rightLayout->addWidget(libraryToolBar);
 	rightLayout->addWidget(sVertical);
 
 	rightLayout->setMargin(0);
@@ -299,6 +297,18 @@ void LibraryWindow::doModels()
 
 void LibraryWindow::createActions()
 {
+	backAction = new QAction(this);
+	QIcon icoBackButton;
+    icoBackButton.addPixmap(QPixmap(":/images/main_toolbar/back.png"), QIcon::Normal);
+    icoBackButton.addPixmap(QPixmap(":/images/main_toolbar/back_disabled.png"), QIcon::Disabled);
+	backAction->setIcon(icoBackButton);
+
+	fordwardAction = new QAction(this);
+	QIcon icoFordwardButton;
+    icoFordwardButton.addPixmap(QPixmap(":/images/main_toolbar/forward.png"), QIcon::Normal);
+    icoFordwardButton.addPixmap(QPixmap(":/images/main_toolbar/forward_disabled.png"), QIcon::Disabled);
+	fordwardAction->setIcon(icoFordwardButton);
+
 	createLibraryAction = new QAction(this);
 	createLibraryAction->setToolTip(tr("Create a new library"));
 	createLibraryAction->setShortcut(Qt::Key_A);
@@ -376,12 +386,16 @@ void LibraryWindow::createActions()
 	toggleFullScreenAction = new QAction(tr("Fullscreen mode on/off"),this);
 	toggleFullScreenAction->setToolTip(tr("Fullscreen mode on/off (F)"));
 	toggleFullScreenAction->setShortcut(Qt::Key_F);
-	toggleFullScreenAction->setIcon(QIcon(":/images/fit.png"));
+	QIcon icoFullscreenButton;
+    icoFullscreenButton.addPixmap(QPixmap(":/images/main_toolbar/fullscreen.png"), QIcon::Normal);
+	toggleFullScreenAction->setIcon(icoFullscreenButton);
 
 	helpAboutAction = new QAction(this);
 	helpAboutAction->setToolTip(tr("Help, About YACReader"));
 	helpAboutAction->setShortcut(Qt::Key_F1);
-	helpAboutAction->setIcon(QIcon(":/images/help.png"));
+	QIcon icoHelpButton;
+    icoHelpButton.addPixmap(QPixmap(":/images/main_toolbar/help.png"), QIcon::Normal);
+	helpAboutAction->setIcon(icoHelpButton);
 
 	setRootIndexAction = new QAction(this);
 	setRootIndexAction->setShortcut(Qt::Key_0);
@@ -401,12 +415,16 @@ void LibraryWindow::createActions()
 	optionsAction = new QAction(this);
 	optionsAction->setShortcut(Qt::Key_C);
 	optionsAction->setToolTip(tr("Show options dialog"));
-	optionsAction->setIcon(QIcon(":/images/options.png"));
+	QIcon icoSettingsButton;
+    icoSettingsButton.addPixmap(QPixmap(":/images/main_toolbar/settings.png"), QIcon::Normal);
+	optionsAction->setIcon(icoSettingsButton);
 
 	serverConfigAction = new QAction(this);
 	serverConfigAction->setShortcut(Qt::Key_S);
 	serverConfigAction->setToolTip(tr("Show comics server options dialog"));
-	serverConfigAction->setIcon(QIcon(":/images/server.png"));
+	QIcon icoServerButton;
+	icoServerButton.addPixmap(QPixmap(":/images/main_toolbar/server.png"), QIcon::Normal);
+	serverConfigAction->setIcon(icoServerButton);
 
 	//socialAction = new QAction(this);
 
@@ -517,50 +535,36 @@ void LibraryWindow::enableLibraryActions()
 
 void LibraryWindow::createToolBars()
 {
-	libraryToolBar->setIconSize(QSize(32,32)); //TODO make icon size dynamic
 
-	libraryToolBar->addAction(createLibraryAction);
-	libraryToolBar->addAction(openLibraryAction);
-
-	libraryToolBar->addSeparator();
-
-	libraryToolBar->addAction(exportComicsInfo);
-	libraryToolBar->addAction(importComicsInfo);
-
-	libraryToolBar->addSeparator();
-
-	libraryToolBar->addAction(exportLibraryAction);
-	libraryToolBar->addAction(importLibraryAction);
-	
-
-	libraryToolBar->addSeparator();
-	libraryToolBar->addAction(updateLibraryAction); 
-	libraryToolBar->addAction(renameLibraryAction);
-	libraryToolBar->addAction(removeLibraryAction);
-	//libraryToolBar->addAction(deleteLibraryAction);
-
-	libraryToolBar->addSeparator();
-	libraryToolBar->addAction(toggleFullScreenAction);
 #ifdef Q_OS_MAC
-   libraryToolBar->addSeparator();
+	libraryToolBar->setIconSize(QSize(16,16)); //TODO make icon size dynamic
-#else
-	libraryToolBar->addWidget(new QToolBarStretch());
-#endif
 
 #ifdef SERVER_RELEASE
 	libraryToolBar->addAction(serverConfigAction);
 #endif
 	libraryToolBar->addAction(optionsAction);
 	libraryToolBar->addAction(helpAboutAction);
-	//libraryToolBar->addAction(socialAction);
 
-#ifdef Q_OS_MAC
+	libraryToolBar->addSeparator();
+	libraryToolBar->addAction(toggleFullScreenAction);
+
+	libraryToolBar->addSeparator();
+
 	libraryToolBar->addWidget(new QToolBarStretch());
 	libraryToolBar->addWidget(foldersFilter);
-#endif
 
 	libraryToolBar->setMovable(false);
 
+	
+#else
+	libraryToolBar->backButton->setDefaultAction(backAction);
+    libraryToolBar->forwardButton->setDefaultAction(fordwardAction);
+    libraryToolBar->settingsButton->setDefaultAction(optionsAction);
+    libraryToolBar->serverButton->setDefaultAction(serverConfigAction);
+    libraryToolBar->helpButton->setDefaultAction(helpAboutAction);
+    libraryToolBar->fullscreenButton->setDefaultAction(toggleFullScreenAction);
+#endif
+
 	editInfoToolBar->setIconSize(QSize(18,18));
 	editInfoToolBar->addAction(openComicAction);
 	editInfoToolBar->addSeparator();

YACReaderLibrary/library_window.h

@@ -47,6 +47,7 @@ class YACReaderTableView;
 class YACReaderSideBar;
 class YACReaderLibraryListWidget;
 class YACReaderTreeView;
+class YACReaderMainToolBar;
 #include "comic_db.h"
 
 class LibraryWindow : public QMainWindow
@@ -105,6 +106,9 @@ private:
 
 	int i;
 	
+	QAction  * backAction;
+	QAction  * fordwardAction;
+
 	QAction * openComicAction;
 	QAction * showPropertiesAction;
 	QAction * createLibraryAction;
@@ -146,8 +150,11 @@ private:
 	QAction * deleteComicsAction;
 	QAction * hideComicViewAction;
 
-
+#ifdef Q_OS_MAC
 	QToolBar * libraryToolBar;
+#else
+	YACReaderMainToolBar * libraryToolBar;
+#endif
 	QToolBar * treeActions;
 	QToolBar * comicsToolBar;
 	QToolBar * editInfoToolBar;

YACReaderLibrary/yacreader_main_toolbar.cpp

@@ -6,6 +6,7 @@
 #include <QLabel>
 #include <QResizeEvent>
 #include <QPaintEvent>
+#include <QAction>
 
 YACReaderMainToolBar::YACReaderMainToolBar(QWidget *parent) :
     QWidget(parent)
@@ -24,46 +25,29 @@ YACReaderMainToolBar::YACReaderMainToolBar(QWidget *parent) :
 
     backButton = new QToolButton();
     backButton->setStyleSheet(qToolButtonStyleSheet);
-	QIcon icoBackButton;
+
-    icoBackButton.addPixmap(QPixmap(":/images/main_toolbar/back.png"), QIcon::Normal);
-    icoBackButton.addPixmap(QPixmap(":/images/main_toolbar/back_disabled.png"), QIcon::Disabled);
-	backButton->setIcon(icoBackButton);
 
     forwardButton = new QToolButton();
     forwardButton->setStyleSheet(qToolButtonStyleSheet);
 	forwardButton->setDisabled(true);
-	QIcon icoFordwardButton;
-    icoFordwardButton.addPixmap(QPixmap(":/images/main_toolbar/forward.png"), QIcon::Normal);
-    icoFordwardButton.addPixmap(QPixmap(":/images/main_toolbar/forward_disabled.png"), QIcon::Disabled);
-	forwardButton->setIcon(icoFordwardButton);
 
     settingsButton = new QToolButton();
     settingsButton->setStyleSheet(qToolButtonStyleSheet);
-    QIcon icoSettingsButton;
 	settingsButton->setIconSize(QSize(24,24));
-    icoSettingsButton.addPixmap(QPixmap(":/images/main_toolbar/settings.png"), QIcon::Normal);
-    settingsButton->setIcon(icoSettingsButton);
 
     serverButton = new QToolButton();
     serverButton->setStyleSheet(qToolButtonStyleSheet);
-    QIcon icoServerButton;
     serverButton->setIconSize(QSize(17,24));
-    icoServerButton.addPixmap(QPixmap(":/images/main_toolbar/server.png"), QIcon::Normal);
+
-    serverButton->setIcon(icoServerButton);
 
     helpButton = new QToolButton();
     helpButton->setStyleSheet(qToolButtonStyleSheet);
-    QIcon icoHelpButton;
     helpButton->setIconSize(QSize(14,25));
-    icoHelpButton.addPixmap(QPixmap(":/images/main_toolbar/help.png"), QIcon::Normal);
-    helpButton->setIcon(icoHelpButton);
 
     fullscreenButton = new QToolButton();
     fullscreenButton->setStyleSheet(qToolButtonStyleSheet);
-    QIcon icoFullscreenButton;
     fullscreenButton->setIconSize(QSize(24,24));
-    icoFullscreenButton.addPixmap(QPixmap(":/images/main_toolbar/fullscreen.png"), QIcon::Normal);
+
-    fullscreenButton->setIcon(icoFullscreenButton);
 
     mainLayout->setMargin(0);
     mainLayout->setSpacing(0);

YACReaderLibrary/yacreader_main_toolbar.h

@@ -15,6 +15,13 @@ class YACReaderMainToolBar : public QWidget
 public:
     explicit YACReaderMainToolBar(QWidget *parent = 0);
     QSize sizeHint() const;
+
+	QToolButton * backButton;
+    QToolButton * forwardButton;
+    QToolButton * settingsButton;
+    QToolButton * serverButton;
+    QToolButton * helpButton;
+    QToolButton * fullscreenButton;
 signals:
     
 public slots:
@@ -23,12 +30,7 @@ private:
     void paintEvent(QPaintEvent *);
     void resizeEvent(QResizeEvent *);
 
-    QToolButton * backButton;
+
-    QToolButton * forwardButton;
-    QToolButton * settingsButton;
-    QToolButton * serverButton;
-    QToolButton * helpButton;
-    QToolButton * fullscreenButton;
 
 	QHBoxLayout * mainLayout;