A?adidos textos finales no_libraries_widget e import_widget(faltan traducciones).

Corregido el color del link en el di?log del servidor.

A?adida implementaci?n de men? personalizado (dark).
This commit is contained in:
Luis Ángel San Martín 2013-05-19 15:29:03 +02:00
parent ea2216aef5
commit 45bb72ae21
7 changed files with 60 additions and 6 deletions

View File

@ -342,7 +342,7 @@ void ImportWidget::setUpdateLook()
{
iconLabel->setPixmap(QPixmap(":/images/updatingIcon.png"));
text->setText("<font color=\"#495252\">"+tr("Updating the library")+"</font>");
textDescription->setText("<font color=\"#565959\">"+tr("Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.")+"</font>");
textDescription->setText("<font color=\"#565959\">"+tr("<p>The current library is being updated. For faster updates, please, keep your libraries updated frequently.</p><p>You can stop the process and continue updating this library later.")+"</font>");
}
void ImportWidget::clearScene()

View File

@ -45,7 +45,7 @@
#include "tablemodel.h"
#include "yacreader_tool_bar_stretch.h"
#include "yacreader_dark_menu.h"
//
LibraryWindow::LibraryWindow()
@ -462,9 +462,9 @@ void LibraryWindow::createActions()
comicFlow->addAction(toggleFullScreenAction);
comicFlow->addAction(openComicAction);
comicFlow->setContextMenuPolicy(Qt::ActionsContextMenu);
}
//TODO unificar con disableActions

View File

@ -25,7 +25,7 @@ NoLibrariesWidget::NoLibrariesWidget(QWidget *parent) :
QLabel * text = new QLabel("<font color=\"#495252\">"+tr("You don't have any librarires yet")+"</font>");
text->setStyleSheet("QLabel {font-size:25px;font-weight:bold;}");
QLabel * textDescription = new QLabel("<font color=\"#565959\">"+tr("Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.")+"</font>");
QLabel * textDescription = new QLabel("<font color=\"#565959\">"+tr("<p>You can create a library in any folder, YACReaderLibrary will import all comics and folders from this folder. If you have created any library in the past you can open them.</p><p>Don't forget that you can use YACReader as a stand alone application for reading the comics on your computer.</p>")+"</font>");
textDescription->setWordWrap(true);
textDescription->setMaximumWidth(330);

View File

@ -78,7 +78,7 @@ ServerConfigDialog::ServerConfigDialog(QWidget * parent)
qrMessage->setWordWrap(true);
qrMessage->setFixedWidth(200);
QLabel * propaganda = new QLabel(tr("YACReader is now available for iOS devices, the best comic reading experience now in your iPad, iPhone or iPod touch. <a href='http://ios.yacreader.com'> Discover it! </a>"),this);
QLabel * propaganda = new QLabel(tr("YACReader is now available for iOS devices, the best comic reading experience now in your iPad, iPhone or iPod touch. <a href='http://ios.yacreader.com' style='color:rgb(193, 148, 65)'> Discover it! </a>"),this);
propaganda->move(36,375);
propaganda->setStyleSheet("QLabel {color:#1F1F1F; font-size:16px; font-family: Arial; font-style: italic;}"
"QLabel::a {color:#1A1A1A}");

View File

@ -11,6 +11,7 @@ HEADERS += $$PWD/help_about_dialog.h \
$$PWD/yacreader_search_line_edit.h \
$$PWD/yacreader_spin_slider_widget.h \
$$PWD/yacreader_tool_bar_stretch.h \
$$PWD/yacreader_dark_menu.h
SOURCES += $$PWD/help_about_dialog.cpp \
$$PWD/yacreader_field_edit.cpp yacreader_search_line_edit.cpp \
@ -21,4 +22,5 @@ SOURCES += $$PWD/help_about_dialog.cpp \
$$PWD/yacreader_options_dialog.cpp \
$$PWD/yacreader_search_line_edit.cpp \
$$PWD/yacreader_spin_slider_widget.cpp \
$$PWD/yacreader_tool_bar_stretch.cpp \
$$PWD/yacreader_tool_bar_stretch.cpp \
$$PWD/yacreader_dark_menu.cpp

View File

@ -0,0 +1,38 @@
#include "yacreader_dark_menu.h"
#include <QLabel>
#include <QPixmap>
#include <QHBoxLayout>
YACReaderDarkMenu::YACReaderDarkMenu(QWidget * parent)
:QMenu(parent)
{
//solid color: #454545
QString style = "QMenu {background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #6B6B6B, stop: 1 #424242); "
"border-left: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #BCBCBC, stop: 1 #4C4C4C);"
"border-right: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #BCBCBC, stop: 1 #4C4C4C);"
"border-top: 1px solid #BCBCBC;"
"border-bottom: 1px solid #4C4C4C;"
"padding-top:5px;padding-bottom:5px;}"
"QMenu::separator {height:0px;border-top: 1px solid #292929; border-bottom:1px solid #737373; margin-left:-1px; margin-right:-1px;}"
"QMenu::item {color:#CFD1D1;padding: 5px 25px 5px 32px;}"
"QMenu::item::selected {background-color:#242424;border-top: 1px solid #151515; border-bottom:1px solid #737373;}"
"QMenu::icon {padding-left:15px;}";
setStyleSheet(style);
/*
QPixmap p(":/images/icon.png");
QLabel * l = new QLabel();
l->setPixmap(p);
l->move(0,-10);
//test
YACReaderDarkMenu * customMenu = new YACReaderDarkMenu(this);
customMenu->addAction(toggleFullScreenAction);
customMenu->addAction(createLibraryAction);
customMenu->addSeparator();
customMenu->addAction(openComicAction);
customMenu->show();
*/
}

View File

@ -0,0 +1,14 @@
#ifndef YACREADER_DARK_MENU_H
#define YACREADER_DARK_MENU_H
#include <QMenu>
class YACReaderDarkMenu : public QMenu
{
Q_OBJECT
public:
YACReaderDarkMenu(QWidget * parent = 0);
};
#endif // YACREADER_DARK_MENU_H