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

Merged luisangelsm/yacreader into default

Browse Source
This commit is contained in:
Felix Kauselmann
2015-08-20 12:28:47 +02:00
parent 3a6b2d9b98
commit 23c33cef61
64 changed files with 1758 additions and 877 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
custom_widgets/yacreader_macosx_toolbar.mm
View File

@ -175,7 +175,7 @@ YACReaderMacOSXToolbar::YACReaderMacOSXToolbar(QObject *parent)
{
yosemite = true;
//TODO yosemite new constants are not found in compilation time
[nswindow setTitleVisibility:1]; //NSWindowTitleHidden
[nswindow setTitleVisibility:NSWindowTitleHidden];
//TODO NSFullSizeContentViewWindowMask produces an offset in the windows' content
//nswindow.styleMask |= 1 << 15; // NSFullSizeContentViewWindowMask;
[nativeToolBar setSizeMode:NSToolbarSizeModeSmall]; //TODO figure out how to load specific images in Yosemite
@ -215,7 +215,7 @@ void YACReaderMacOSXToolbar::addSpace(int size)
QMacToolBarItem *toolBarItem = addItem(QIcon(),"");
NSToolbarItem * nativeItem = toolBarItem->nativeToolBarItem();
static const NSRect frameRect = { { 0.0, 0.0 }, { size, 16.0 } };
static const NSRect frameRect = { { 0.0, 0.0 }, { CGFloat(size), 16.0 } };
NSView *view = [[NSView alloc] initWithFrame:frameRect];
[nativeItem setView:view];

5
custom_widgets/yacreader_options_dialog.cpp
View File

@ -46,6 +46,9 @@ YACReaderOptionsDialog::YACReaderOptionsDialog(QWidget * parent)
#ifndef NO_OPENGL
useGL = new QCheckBox(tr("Use hardware acceleration (restart needed)"));
connect(useGL,SIGNAL(stateChanged(int)),this,SLOT(saveUseGL(int)));
#endif
#ifdef FORCE_ANGLE
useGL->setHidden(true);
#endif
//sw CONNECTIONS
connect(sw->radio1,SIGNAL(toggled(bool)),this,SLOT(setClassicConfigSW()));
@ -395,4 +398,4 @@ void YACReaderOptionsDialog::setRouletteConfig()
saveFlowParameters();
}
#endif
#endif

10
custom_widgets/yacreader_titled_toolbar.cpp
View File

@ -85,9 +85,9 @@ YACReaderTitledToolBar::YACReaderTitledToolBar(const QString & title, QWidget *p
setLayout(mainLayout);
setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Minimum);
setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Minimum);
setMinimumHeight(25);
setMinimumHeight(25);
}
@ -97,9 +97,9 @@ void YACReaderTitledToolBar::addAction(QAction * action)
QToolButton * tb = new QToolButton(this);
tb->setCursor(QCursor(Qt::ArrowCursor));
tb->setDefaultAction(action);
tb->setIconSize(QSize(16,16));
tb->setSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum);
tb->setDefaultAction(action);
tb->setIconSize(QSize(16,16));
tb->setSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum);
//tb->setStyleSheet("QToolButton:hover {background-color:#C5C5C5;}");
mainLayout->addWidget(tb);

4
custom_widgets/yacreader_tool_bar_stretch.h
View File

@ -4,10 +4,10 @@
#include <QWidget>
#include <QHBoxLayout>
class QToolBarStretch : public QWidget
class YACReaderToolBarStretch : public QWidget
{
public:
QToolBarStretch(QWidget * parent=0):QWidget(parent)
YACReaderToolBarStretch(QWidget * parent=0):QWidget(parent)
{
QHBoxLayout * l= new QHBoxLayout();
l->addStretch();