mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-07-23 15:35:03 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

merged

Browse Source
This commit is contained in:
Luis Ángel San Martín
2014-08-19 16:12:47 +02:00
parent 679cd96d5b
commit ec57c8f9bd
82 changed files with 3744 additions and 753 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
custom_widgets/yacreader_options_dialog.cpp
View File

@ -10,6 +10,7 @@
#include <QRadioButton>
#include <QSlider>
#include <QSettings>
#include <QGroupBox>
YACReaderOptionsDialog::YACReaderOptionsDialog(QWidget * parent)
:QDialog(parent)
@ -23,6 +24,16 @@ YACReaderOptionsDialog::YACReaderOptionsDialog(QWidget * parent)
cancel->setDefault(true);
QVBoxLayout * shortcutsLayout = new QVBoxLayout();
QPushButton * shortcutsButton = new QPushButton(tr("Edit shortcuts"));
shortcutsLayout->addWidget(shortcutsButton);
shortcutsBox = new QGroupBox(tr("Shortcuts"));
shortcutsBox->setLayout(shortcutsLayout);
connect(shortcutsButton,SIGNAL(clicked()),this,SIGNAL(editShortcuts()));
connect(accept,SIGNAL(clicked()),this,SLOT(saveOptions()));
connect(cancel,SIGNAL(clicked()),this,SLOT(restoreOptions())); //TODO fix this
connect(cancel,SIGNAL(clicked()),this,SLOT(close()));

6
custom_widgets/yacreader_options_dialog.h
View File

@ -8,6 +8,7 @@ class YACReaderGLFlowConfigWidget;
class QCheckBox;
class QPushButton;
class QSettings;
class QGroupBox;
class YACReaderOptionsDialog : public QDialog
{
@ -20,6 +21,8 @@ protected:
QPushButton * accept;
QPushButton * cancel;
QGroupBox * shortcutsBox;
QSettings * settings;
QSettings * previousSettings;
@ -56,6 +59,7 @@ protected slots:
signals:
void optionsChanged();
void editShortcuts();
};
#endif // YACREADER_OPTIONS_DIALOG_H
#endif // YACREADER_OPTIONS_DIALOG_H

2
custom_widgets/yacreader_search_line_edit.cpp
View File

@ -34,7 +34,7 @@ YACReaderSearchLineEdit::YACReaderSearchLineEdit(QWidget *parent)
qMax(msz.height(), clearButton->sizeHint().height() + frameWidth * 2 + 2));
#ifdef Q_OS_MAC
setMaximumWidth(300);
setMaximumWidth(212);
#endif
}