Changeset View
Changeset View
Standalone View
Standalone View
ui/annotationwidgets.cpp
| Show All 19 Lines | |||||
| 20 | #include <kcombobox.h> | 20 | #include <kcombobox.h> | ||
| 21 | #include <kfontrequester.h> | 21 | #include <kfontrequester.h> | ||
| 22 | #include <QIcon> | 22 | #include <QIcon> | ||
| 23 | #include <kiconloader.h> | 23 | #include <kiconloader.h> | ||
| 24 | #include <KLocalizedString> | 24 | #include <KLocalizedString> | ||
| 25 | #include <QDebug> | 25 | #include <QDebug> | ||
| 26 | #include <QMimeDatabase> | 26 | #include <QMimeDatabase> | ||
| 27 | #include <KFormat> | 27 | #include <KFormat> | ||
| 28 | #include <QFormLayout> | ||||
| 28 | 29 | | |||
| 29 | #include "core/document.h" | 30 | #include "core/document.h" | ||
| 30 | #include "guiutils.h" | 31 | #include "guiutils.h" | ||
| 31 | 32 | | |||
| 32 | #define FILEATTACH_ICONSIZE 48 | 33 | #define FILEATTACH_ICONSIZE 48 | ||
| 33 | 34 | | |||
| 34 | PixmapPreviewSelector::PixmapPreviewSelector( QWidget * parent ) | 35 | PixmapPreviewSelector::PixmapPreviewSelector( QWidget * parent ) | ||
| 35 | : QWidget( parent ) | 36 | : QWidget( parent ) | ||
| 36 | { | 37 | { | ||
| 37 | QHBoxLayout * mainlay = new QHBoxLayout( this ); | 38 | QHBoxLayout * mainlay = new QHBoxLayout( this ); | ||
| 38 | mainlay->setMargin( 0 ); | 39 | mainlay->setMargin( 0 ); | ||
| 39 | m_comboItems = new KComboBox( this ); | 40 | m_comboItems = new KComboBox( this ); | ||
| 40 | mainlay->addWidget( m_comboItems ); | 41 | mainlay->addWidget( m_comboItems ); | ||
| 42 | mainlay->setAlignment( m_comboItems, Qt::AlignTop ); | ||||
| 41 | m_iconLabel = new QLabel( this ); | 43 | m_iconLabel = new QLabel( this ); | ||
| 42 | mainlay->addWidget( m_iconLabel ); | 44 | mainlay->addWidget( m_iconLabel ); | ||
| 43 | m_iconLabel->setSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ); | 45 | m_iconLabel->setSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ); | ||
| 44 | m_iconLabel->setAlignment( Qt::AlignCenter ); | 46 | m_iconLabel->setAlignment( Qt::AlignCenter ); | ||
| 45 | m_iconLabel->setFrameStyle( QFrame::StyledPanel ); | 47 | m_iconLabel->setFrameStyle( QFrame::StyledPanel ); | ||
| 46 | setPreviewSize( 32 ); | 48 | setPreviewSize( 32 ); | ||
| 47 | 49 | | |||
| 50 | setFocusPolicy( Qt::TabFocus ); | ||||
| 51 | setFocusProxy( m_comboItems ); | ||||
| 52 | | ||||
| 48 | connect( m_comboItems, SIGNAL(currentIndexChanged(QString)), this, SLOT(iconComboChanged(QString)) ); | 53 | connect( m_comboItems, SIGNAL(currentIndexChanged(QString)), this, SLOT(iconComboChanged(QString)) ); | ||
| 49 | connect( m_comboItems, &QComboBox::editTextChanged, this, &PixmapPreviewSelector::iconComboChanged ); | 54 | connect( m_comboItems, &QComboBox::editTextChanged, this, &PixmapPreviewSelector::iconComboChanged ); | ||
| 50 | } | 55 | } | ||
| 51 | 56 | | |||
| 52 | PixmapPreviewSelector::~PixmapPreviewSelector() | 57 | PixmapPreviewSelector::~PixmapPreviewSelector() | ||
| 53 | { | 58 | { | ||
| 54 | } | 59 | } | ||
| 55 | 60 | | |||
| ▲ Show 20 Lines • Show All 138 Lines • ▼ Show 20 Line(s) | 198 | if (m_colorBn) | |||
| 194 | m_ann->style().setColor( m_colorBn->color() ); | 199 | m_ann->style().setColor( m_colorBn->color() ); | ||
| 195 | if (m_opacity) | 200 | if (m_opacity) | ||
| 196 | m_ann->style().setOpacity( (double)m_opacity->value() / 100.0 ); | 201 | m_ann->style().setOpacity( (double)m_opacity->value() / 100.0 ); | ||
| 197 | } | 202 | } | ||
| 198 | 203 | | |||
| 199 | QWidget * AnnotationWidget::createAppearanceWidget() | 204 | QWidget * AnnotationWidget::createAppearanceWidget() | ||
| 200 | { | 205 | { | ||
| 201 | QWidget * widget = new QWidget(); | 206 | QWidget * widget = new QWidget(); | ||
| 202 | QGridLayout * gridlayout = new QGridLayout( widget ); | 207 | QFormLayout * formlayout = new QFormLayout( widget ); | ||
| 208 | formlayout->setLabelAlignment( Qt::AlignRight ); | ||||
| 209 | formlayout->setFieldGrowthPolicy( QFormLayout::AllNonFixedFieldsGrow ); | ||||
simgunz: Is it correct to set this growth policy? I have not found any guideline on the HIG. Compared to… | |||||
For this one, FieldsStayAtSizeHint might be better, and then we just set sensible sizehints for anything that winds up too small. That's basically what we're doing for all our QML software. In general we're trying to move towards making the controls optimally sized in the first place and then static in size when the window grows or shrinks. We often manually set the width of spinboxes, comboboxes, and text fields to make sure they're all the same width. ngraham: For this one, `FieldsStayAtSizeHint` might be better, and then we just set sensible sizehints… | |||||
Let's not have static sizes, this is not a phone screen where you can't resize windows. aacid: Let's not have static sizes, this is not a phone screen where you can't resize windows. | |||||
| 203 | if ( hasColorButton() ) | 210 | if ( hasColorButton() ) | ||
| 204 | { | 211 | { | ||
| 205 | QLabel * tmplabel = new QLabel( i18n( "&Color:" ), widget ); | | |||
| 206 | gridlayout->addWidget( tmplabel, 0, 0, Qt::AlignRight ); | | |||
| 207 | m_colorBn = new KColorButton( widget ); | 212 | m_colorBn = new KColorButton( widget ); | ||
| 208 | m_colorBn->setColor( m_ann->style().color() ); | 213 | m_colorBn->setColor( m_ann->style().color() ); | ||
| 209 | tmplabel->setBuddy( m_colorBn ); | 214 | formlayout->addRow( i18n( "&Color:" ), m_colorBn ); | ||
| 210 | gridlayout->addWidget( m_colorBn, 0, 1 ); | | |||
| 211 | } | 215 | } | ||
| 212 | if ( hasOpacityBox() ) | 216 | if ( hasOpacityBox() ) | ||
| 213 | { | 217 | { | ||
| 214 | QLabel * tmplabel = new QLabel( i18n( "&Opacity:" ), widget ); | | |||
| 215 | gridlayout->addWidget( tmplabel, 1, 0, Qt::AlignRight ); | | |||
| 216 | m_opacity = new QSpinBox( widget ); | 218 | m_opacity = new QSpinBox( widget ); | ||
| 217 | m_opacity->setRange( 0, 100 ); | 219 | m_opacity->setRange( 0, 100 ); | ||
| 218 | m_opacity->setValue( (int)( m_ann->style().opacity() * 100 ) ); | 220 | m_opacity->setValue( (int)( m_ann->style().opacity() * 100 ) ); | ||
| 219 | m_opacity->setSuffix( i18nc( "Suffix for the opacity level, eg '80 %'", " %" ) ); | 221 | m_opacity->setSuffix( i18nc( "Suffix for the opacity level, eg '80 %'", " %" ) ); | ||
| 220 | tmplabel->setBuddy( m_opacity ); | 222 | formlayout->addRow( i18n( "&Opacity:" ), m_opacity); | ||
| 221 | gridlayout->addWidget( m_opacity, 1, 1 ); | | |||
| 222 | } | 223 | } | ||
| 223 | 224 | | |||
| 224 | QWidget * styleWidget = createStyleWidget(); | 225 | createStyleWidget( formlayout ); | ||
| 225 | if ( styleWidget ) | | |||
| 226 | gridlayout->addWidget( styleWidget, 2, 0, 1, 2 ); | | |||
| 227 | | ||||
| 228 | gridlayout->addItem( new QSpacerItem( 5, 5, QSizePolicy::Fixed, QSizePolicy::MinimumExpanding ), 3, 0 ); | | |||
| 229 | 226 | | |||
| 230 | if ( m_colorBn ) | 227 | if ( m_colorBn ) | ||
| 231 | connect( m_colorBn, &KColorButton::changed, this, &AnnotationWidget::dataChanged ); | 228 | connect( m_colorBn, &KColorButton::changed, this, &AnnotationWidget::dataChanged ); | ||
| 232 | if ( m_opacity ) | 229 | if ( m_opacity ) | ||
| 233 | connect( m_opacity, SIGNAL(valueChanged(int)), this, SIGNAL(dataChanged()) ); | 230 | connect( m_opacity, SIGNAL(valueChanged(int)), this, SIGNAL(dataChanged()) ); | ||
| 234 | 231 | | |||
| 235 | return widget; | 232 | return widget; | ||
| 236 | } | 233 | } | ||
| 237 | 234 | | |||
| 238 | QWidget * AnnotationWidget::createStyleWidget() | 235 | void AnnotationWidget::createStyleWidget(QFormLayout * formlayout) | ||
| 239 | { | 236 | { | ||
| 240 | return nullptr; | 237 | Q_UNUSED( formlayout ); | ||
| 241 | } | 238 | } | ||
| 242 | 239 | | |||
| 243 | QWidget * AnnotationWidget::createExtraWidget() | 240 | QWidget * AnnotationWidget::createExtraWidget() | ||
| 244 | { | 241 | { | ||
| 245 | return nullptr; | 242 | return nullptr; | ||
| 246 | } | 243 | } | ||
| 247 | 244 | | |||
| 248 | 245 | | |||
| 249 | TextAnnotationWidget::TextAnnotationWidget( Okular::Annotation * ann ) | 246 | TextAnnotationWidget::TextAnnotationWidget( Okular::Annotation * ann ) | ||
| 250 | : AnnotationWidget( ann ) | 247 | : AnnotationWidget( ann ) | ||
| 251 | { | 248 | { | ||
| 252 | m_textAnn = static_cast< Okular::TextAnnotation * >( ann ); | 249 | m_textAnn = static_cast< Okular::TextAnnotation * >( ann ); | ||
| 253 | } | 250 | } | ||
| 254 | 251 | | |||
| 255 | QWidget * TextAnnotationWidget::createStyleWidget() | 252 | void TextAnnotationWidget::createStyleWidget(QFormLayout * formlayout) | ||
| 256 | { | 253 | { | ||
| 257 | QWidget * widget = new QWidget(); | 254 | QWidget * widget = (QWidget*)formlayout->parent(); | ||
| 258 | QVBoxLayout * layout = new QVBoxLayout( widget ); | | |||
| 259 | layout->setMargin( 0 ); | | |||
| 260 | 255 | | |||
| 261 | if ( m_textAnn->textType() == Okular::TextAnnotation::Linked ) | 256 | if ( m_textAnn->textType() == Okular::TextAnnotation::Linked ) | ||
| 262 | { | 257 | { | ||
| 263 | createPopupNoteStyleUi( widget, layout ); | 258 | createPopupNoteStyleUi( widget, formlayout ); | ||
| 264 | } | 259 | } | ||
| 265 | else if ( m_textAnn->textType() == Okular::TextAnnotation::InPlace ) | 260 | else if ( m_textAnn->textType() == Okular::TextAnnotation::InPlace ) | ||
| 266 | { | 261 | { | ||
| 267 | if ( isTypewriter() ) | 262 | if ( isTypewriter() ) | ||
| 268 | createTypewriterStyleUi( widget, layout ); | 263 | createTypewriterStyleUi( widget, formlayout ); | ||
| 269 | else | 264 | else | ||
| 270 | createInlineNoteStyleUi( widget, layout ); | 265 | createInlineNoteStyleUi( widget, formlayout ); | ||
| 271 | } | 266 | } | ||
| 272 | | ||||
| 273 | return widget; | | |||
| 274 | } | 267 | } | ||
| 275 | 268 | | |||
| 276 | bool TextAnnotationWidget::hasColorButton() const { | 269 | bool TextAnnotationWidget::hasColorButton() const { | ||
| 277 | return !isTypewriter(); | 270 | return !isTypewriter(); | ||
| 278 | } | 271 | } | ||
| 279 | 272 | | |||
| 280 | bool TextAnnotationWidget::hasOpacityBox() const { | 273 | bool TextAnnotationWidget::hasOpacityBox() const { | ||
| 281 | return !isTypewriter(); | 274 | return !isTypewriter(); | ||
| Show All 20 Lines | 286 | { | |||
| 302 | else | 295 | else | ||
| 303 | { | 296 | { | ||
| 304 | Q_ASSERT( m_textColorBn ); | 297 | Q_ASSERT( m_textColorBn ); | ||
| 305 | m_textAnn->setTextColor( m_textColorBn->color() ); | 298 | m_textAnn->setTextColor( m_textColorBn->color() ); | ||
| 306 | } | 299 | } | ||
| 307 | } | 300 | } | ||
| 308 | } | 301 | } | ||
| 309 | 302 | | |||
| 310 | void TextAnnotationWidget::createPopupNoteStyleUi( QWidget * widget, QVBoxLayout * layout ) { | 303 | void TextAnnotationWidget::createPopupNoteStyleUi( QWidget * widget, QFormLayout * formlayout ) { | ||
| 311 | QGroupBox * gb = new QGroupBox( widget ); | 304 | addPixmapSelector( widget, formlayout ); | ||
| 312 | layout->addWidget( gb ); | | |||
| 313 | QHBoxLayout * gblay = new QHBoxLayout( gb ); | | |||
| 314 | gb->setTitle( i18n( "Icon" ) ); | | |||
| 315 | addPixmapSelector( gb, gblay ); | | |||
| 316 | } | | |||
| 317 | | ||||
| 318 | void TextAnnotationWidget::createInlineNoteStyleUi( QWidget * widget, QVBoxLayout * layout ) { | | |||
| 319 | QGridLayout * innerlay = new QGridLayout(); | | |||
| 320 | layout->addLayout( innerlay ); | | |||
| 321 | addFontRequester( widget, innerlay ); | | |||
| 322 | addTextAlignComboBox( widget, innerlay ); | | |||
| 323 | addWidthSpinBox( widget, innerlay ); | | |||
| 324 | } | | |||
| 325 | | ||||
| 326 | void TextAnnotationWidget::createTypewriterStyleUi( QWidget * widget, QVBoxLayout * layout ) { | | |||
| 327 | QGridLayout * innerlay = new QGridLayout(); | | |||
| 328 | layout->addLayout( innerlay ); | | |||
| 329 | addFontRequester( widget, innerlay ); | | |||
| 330 | addTextColorButton( widget, innerlay ); | | |||
| 331 | } | 305 | } | ||
| 332 | 306 | | |||
| 333 | void TextAnnotationWidget::addPixmapSelector( QWidget * widget, QLayout * layout ) | 307 | void TextAnnotationWidget::createInlineNoteStyleUi( QWidget * widget, QFormLayout * formlayout ) { | ||
| 308 | addFontRequester( widget, formlayout ); | ||||
| 309 | addTextAlignComboBox( widget, formlayout ); | ||||
| 310 | addWidthSpinBox( widget, formlayout ); | ||||
| 311 | } | ||||
| 312 | | ||||
| 313 | void TextAnnotationWidget::createTypewriterStyleUi( QWidget * widget, QFormLayout * formlayout ) { | ||||
| 314 | addFontRequester( widget, formlayout ); | ||||
| 315 | addTextColorButton( widget, formlayout ); | ||||
| 316 | } | ||||
| 317 | | ||||
| 318 | void TextAnnotationWidget::addPixmapSelector( QWidget * widget, QFormLayout * formlayout ) | ||||
| 334 | { | 319 | { | ||
| 335 | m_pixmapSelector = new PixmapPreviewSelector( widget ); | 320 | m_pixmapSelector = new PixmapPreviewSelector( widget ); | ||
| 336 | layout->addWidget( m_pixmapSelector ); | 321 | formlayout->addRow( i18n( "Icon:" ), m_pixmapSelector ); | ||
| 337 | m_pixmapSelector->addItem( i18n( "Comment" ), QStringLiteral("Comment") ); | 322 | m_pixmapSelector->addItem( i18n( "Comment" ), QStringLiteral("Comment") ); | ||
| 338 | m_pixmapSelector->addItem( i18n( "Help" ), QStringLiteral("Help") ); | 323 | m_pixmapSelector->addItem( i18n( "Help" ), QStringLiteral("Help") ); | ||
| 339 | m_pixmapSelector->addItem( i18n( "Insert" ), QStringLiteral("Insert") ); | 324 | m_pixmapSelector->addItem( i18n( "Insert" ), QStringLiteral("Insert") ); | ||
| 340 | m_pixmapSelector->addItem( i18n( "Key" ), QStringLiteral("Key") ); | 325 | m_pixmapSelector->addItem( i18n( "Key" ), QStringLiteral("Key") ); | ||
| 341 | m_pixmapSelector->addItem( i18n( "New Paragraph" ), QStringLiteral("NewParagraph") ); | 326 | m_pixmapSelector->addItem( i18n( "New paragraph" ), QStringLiteral("NewParagraph") ); | ||
| 342 | m_pixmapSelector->addItem( i18n( "Note" ), QStringLiteral("Note") ); | 327 | m_pixmapSelector->addItem( i18n( "Note" ), QStringLiteral("Note") ); | ||
| 343 | m_pixmapSelector->addItem( i18n( "Paragraph" ), QStringLiteral("Paragraph") ); | 328 | m_pixmapSelector->addItem( i18n( "Paragraph" ), QStringLiteral("Paragraph") ); | ||
| 344 | m_pixmapSelector->setIcon( m_textAnn->textIcon() ); | 329 | m_pixmapSelector->setIcon( m_textAnn->textIcon() ); | ||
| 345 | connect( m_pixmapSelector, &PixmapPreviewSelector::iconChanged, this, &AnnotationWidget::dataChanged ); | 330 | connect( m_pixmapSelector, &PixmapPreviewSelector::iconChanged, this, &AnnotationWidget::dataChanged ); | ||
| 346 | } | 331 | } | ||
| 347 | 332 | | |||
| 348 | void TextAnnotationWidget::addFontRequester( QWidget * widget, QGridLayout * layout ) | 333 | void TextAnnotationWidget::addFontRequester( QWidget * widget, QFormLayout * formlayout ) | ||
| 349 | { | 334 | { | ||
| 350 | const int row = layout->rowCount(); | | |||
| 351 | QLabel * tmplabel = new QLabel( i18n( "Font:" ), widget ); | | |||
| 352 | layout->addWidget( tmplabel, row, 0 ); | | |||
| 353 | m_fontReq = new KFontRequester( widget ); | 335 | m_fontReq = new KFontRequester( widget ); | ||
| 354 | layout->addWidget( m_fontReq, row, 1 ); | 336 | formlayout->addRow( i18n( "Font:" ), m_fontReq ); | ||
| 355 | m_fontReq->setFont( m_textAnn->textFont() ); | 337 | m_fontReq->setFont( m_textAnn->textFont() ); | ||
| 356 | connect( m_fontReq, &KFontRequester::fontSelected, this, &AnnotationWidget::dataChanged ); | 338 | connect( m_fontReq, &KFontRequester::fontSelected, this, &AnnotationWidget::dataChanged ); | ||
| 357 | } | 339 | } | ||
| 358 | 340 | | |||
| 359 | void TextAnnotationWidget::addTextColorButton( QWidget * widget, QGridLayout * layout ) | 341 | void TextAnnotationWidget::addTextColorButton( QWidget * widget, QFormLayout * formlayout ) | ||
| 360 | { | 342 | { | ||
| 361 | const int row = layout->rowCount(); | | |||
| 362 | QLabel * tmplabel = new QLabel( i18n( "&Text Color:" ), widget ); | | |||
| 363 | layout->addWidget( tmplabel, row, 0, Qt::AlignRight ); | | |||
| 364 | m_textColorBn = new KColorButton( widget ); | 343 | m_textColorBn = new KColorButton( widget ); | ||
| 365 | m_textColorBn->setColor( m_textAnn->textColor() ); | 344 | m_textColorBn->setColor( m_textAnn->textColor() ); | ||
| 366 | tmplabel->setBuddy( m_textColorBn ); | 345 | formlayout->addRow( i18n( "&Text color:" ), m_textColorBn ); | ||
| 367 | layout->addWidget( m_textColorBn, row, 1 ); | | |||
| 368 | connect( m_textColorBn, &KColorButton::changed, this, &AnnotationWidget::dataChanged ); | 346 | connect( m_textColorBn, &KColorButton::changed, this, &AnnotationWidget::dataChanged ); | ||
| 369 | } | 347 | } | ||
| 370 | 348 | | |||
| 371 | void TextAnnotationWidget::addTextAlignComboBox( QWidget * widget, QGridLayout * layout ) | 349 | void TextAnnotationWidget::addTextAlignComboBox( QWidget * widget, QFormLayout * formlayout ) | ||
| 372 | { | 350 | { | ||
| 373 | const int row = layout->rowCount(); | 351 | | ||
| 374 | QLabel * tmplabel = new QLabel( i18n( "Align:" ), widget ); | | |||
| 375 | layout->addWidget( tmplabel, row, 0 ); | | |||
| 376 | m_textAlign = new KComboBox( widget ); | 352 | m_textAlign = new KComboBox( widget ); | ||
| 377 | layout->addWidget( m_textAlign, row, 1 ); | 353 | formlayout->addRow( i18n( "Align:" ), m_textAlign ); | ||
| 378 | m_textAlign->addItem( i18n("Left") ); | 354 | m_textAlign->addItem( i18n("Left") ); | ||
| 379 | m_textAlign->addItem( i18n("Center") ); | 355 | m_textAlign->addItem( i18n("Center") ); | ||
| 380 | m_textAlign->addItem( i18n("Right") ); | 356 | m_textAlign->addItem( i18n("Right") ); | ||
| 381 | m_textAlign->setCurrentIndex( m_textAnn->inplaceAlignment() ); | 357 | m_textAlign->setCurrentIndex( m_textAnn->inplaceAlignment() ); | ||
| 382 | connect( m_textAlign, SIGNAL(currentIndexChanged(int)), this, SIGNAL(dataChanged()) ); | 358 | connect( m_textAlign, SIGNAL(currentIndexChanged(int)), this, SIGNAL(dataChanged()) ); | ||
| 383 | } | 359 | } | ||
| 384 | 360 | | |||
| 385 | void TextAnnotationWidget::addWidthSpinBox( QWidget * widget, QGridLayout * layout ) | 361 | void TextAnnotationWidget::addWidthSpinBox( QWidget * widget, QFormLayout * formlayout ) | ||
| 386 | { | 362 | { | ||
| 387 | const int row = layout->rowCount(); | | |||
| 388 | QLabel * tmplabel = new QLabel( i18n( "Border Width:" ), widget ); | | |||
| 389 | layout->addWidget( tmplabel, row, 0, Qt::AlignRight ); | | |||
| 390 | m_spinWidth = new QDoubleSpinBox( widget ); | 363 | m_spinWidth = new QDoubleSpinBox( widget ); | ||
| 391 | layout->addWidget( m_spinWidth, row, 1 ); | 364 | formlayout->addRow( i18n( "Border width:" ), m_spinWidth ); | ||
| 392 | tmplabel->setBuddy( m_spinWidth ); | | |||
| 393 | m_spinWidth->setRange( 0, 100 ); | 365 | m_spinWidth->setRange( 0, 100 ); | ||
| 394 | m_spinWidth->setValue( m_textAnn->style().width() ); | 366 | m_spinWidth->setValue( m_textAnn->style().width() ); | ||
| 395 | m_spinWidth->setSingleStep( 0.1 ); | 367 | m_spinWidth->setSingleStep( 0.1 ); | ||
| 396 | connect( m_spinWidth, SIGNAL(valueChanged(double)), this, SIGNAL(dataChanged()) ); | 368 | connect( m_spinWidth, SIGNAL(valueChanged(double)), this, SIGNAL(dataChanged()) ); | ||
| 397 | } | 369 | } | ||
| 398 | 370 | | |||
| 399 | StampAnnotationWidget::StampAnnotationWidget( Okular::Annotation * ann ) | 371 | StampAnnotationWidget::StampAnnotationWidget( Okular::Annotation * ann ) | ||
| 400 | : AnnotationWidget( ann ), m_pixmapSelector( nullptr ) | 372 | : AnnotationWidget( ann ), m_pixmapSelector( nullptr ) | ||
| 401 | { | 373 | { | ||
| 402 | m_stampAnn = static_cast< Okular::StampAnnotation * >( ann ); | 374 | m_stampAnn = static_cast< Okular::StampAnnotation * >( ann ); | ||
| 403 | } | 375 | } | ||
| 404 | 376 | | |||
| 405 | QWidget * StampAnnotationWidget::createStyleWidget() | 377 | void StampAnnotationWidget::createStyleWidget(QFormLayout * formlayout) | ||
| 406 | { | 378 | { | ||
| 407 | QWidget * widget = new QWidget(); | 379 | QWidget * widget = (QWidget*)formlayout->parent(); | ||
| 408 | QVBoxLayout * lay = new QVBoxLayout( widget ); | 380 | m_pixmapSelector = new PixmapPreviewSelector( widget ); | ||
| 409 | lay->setMargin( 0 ); | 381 | formlayout->addRow( i18n( "Stamp symbol:" ), m_pixmapSelector ); | ||
davidhurka: Capitalize symbol? | |||||
KDE HIG prescribe sentence style capitalization for labels in a form layout: https://hig.kde.org/style/writing/capitalization.html simgunz: KDE HIG prescribe sentence style capitalization for labels in a form layout: https://hig.kde. | |||||
| 410 | QGroupBox * gb = new QGroupBox( widget ); | | |||
| 411 | lay->addWidget( gb ); | | |||
| 412 | gb->setTitle( i18n( "Stamp Symbol" ) ); | | |||
| 413 | QHBoxLayout * gblay = new QHBoxLayout( gb ); | | |||
| 414 | m_pixmapSelector = new PixmapPreviewSelector( gb ); | | |||
| 415 | gblay->addWidget( m_pixmapSelector ); | | |||
| 416 | m_pixmapSelector->setEditable( true ); | 382 | m_pixmapSelector->setEditable( true ); | ||
davidhurka: Why is this editable? Entering a path to an image does not work. | |||||
davidhurka: Read in the user documentatio that it theoretically works. | |||||
Sometimes works. :-) Try with a path to an icon. In any case I'll improve the Stamp tool soon, adding a 'select file' button. I have some code ready that I'll share soon. simgunz: Sometimes works. :-) Try with a path to an icon. In any case I'll improve the Stamp tool soon… | |||||
Once you do that, it will fix https://bugs.kde.org/show_bug.cgi?id=383652 :) ngraham: Once you do that, it will fix https://bugs.kde.org/show_bug.cgi?id=383652 :) | |||||
| 417 | 383 | | |||
| 418 | m_pixmapSelector->addItem( i18n( "Okular" ), QStringLiteral("okular") ); | 384 | m_pixmapSelector->addItem( i18n( "Okular" ), QStringLiteral("okular") ); | ||
| 419 | m_pixmapSelector->addItem( i18n( "Bookmark" ), QStringLiteral("bookmarks") ); | 385 | m_pixmapSelector->addItem( i18n( "Bookmark" ), QStringLiteral("bookmarks") ); | ||
| 420 | m_pixmapSelector->addItem( i18n( "KDE" ), QStringLiteral("kde") ); | 386 | m_pixmapSelector->addItem( i18n( "KDE" ), QStringLiteral("kde") ); | ||
| 421 | m_pixmapSelector->addItem( i18n( "Information" ), QStringLiteral("help-about") ); | 387 | m_pixmapSelector->addItem( i18n( "Information" ), QStringLiteral("help-about") ); | ||
| 422 | m_pixmapSelector->addItem( i18n( "Approved" ), QStringLiteral("Approved") ); | 388 | m_pixmapSelector->addItem( i18n( "Approved" ), QStringLiteral("Approved") ); | ||
| 423 | m_pixmapSelector->addItem( i18n( "As Is" ), QStringLiteral("AsIs") ); | 389 | m_pixmapSelector->addItem( i18n( "As Is" ), QStringLiteral("AsIs") ); | ||
| 424 | m_pixmapSelector->addItem( i18n( "Confidential" ), QStringLiteral("Confidential") ); | 390 | m_pixmapSelector->addItem( i18n( "Confidential" ), QStringLiteral("Confidential") ); | ||
| 425 | m_pixmapSelector->addItem( i18n( "Departmental" ), QStringLiteral("Departmental") ); | 391 | m_pixmapSelector->addItem( i18n( "Departmental" ), QStringLiteral("Departmental") ); | ||
| 426 | m_pixmapSelector->addItem( i18n( "Draft" ), QStringLiteral("Draft") ); | 392 | m_pixmapSelector->addItem( i18n( "Draft" ), QStringLiteral("Draft") ); | ||
| 427 | m_pixmapSelector->addItem( i18n( "Experimental" ), QStringLiteral("Experimental") ); | 393 | m_pixmapSelector->addItem( i18n( "Experimental" ), QStringLiteral("Experimental") ); | ||
| 428 | m_pixmapSelector->addItem( i18n( "Expired" ), QStringLiteral("Expired") ); | 394 | m_pixmapSelector->addItem( i18n( "Expired" ), QStringLiteral("Expired") ); | ||
| 429 | m_pixmapSelector->addItem( i18n( "Final" ), QStringLiteral("Final") ); | 395 | m_pixmapSelector->addItem( i18n( "Final" ), QStringLiteral("Final") ); | ||
| 430 | m_pixmapSelector->addItem( i18n( "For Comment" ), QStringLiteral("ForComment") ); | 396 | m_pixmapSelector->addItem( i18n( "For Comment" ), QStringLiteral("ForComment") ); | ||
| 431 | m_pixmapSelector->addItem( i18n( "For Public Release" ), QStringLiteral("ForPublicRelease") ); | 397 | m_pixmapSelector->addItem( i18n( "For Public Release" ), QStringLiteral("ForPublicRelease") ); | ||
| 432 | m_pixmapSelector->addItem( i18n( "Not Approved" ), QStringLiteral("NotApproved") ); | 398 | m_pixmapSelector->addItem( i18n( "Not Approved" ), QStringLiteral("NotApproved") ); | ||
| 433 | m_pixmapSelector->addItem( i18n( "Not For Public Release" ), QStringLiteral("NotForPublicRelease") ); | 399 | m_pixmapSelector->addItem( i18n( "Not For Public Release" ), QStringLiteral("NotForPublicRelease") ); | ||
| 434 | m_pixmapSelector->addItem( i18n( "Sold" ), QStringLiteral("Sold") ); | 400 | m_pixmapSelector->addItem( i18n( "Sold" ), QStringLiteral("Sold") ); | ||
| 435 | m_pixmapSelector->addItem( i18n( "Top Secret" ), QStringLiteral("TopSecret") ); | 401 | m_pixmapSelector->addItem( i18n( "Top Secret" ), QStringLiteral("TopSecret") ); | ||
| 436 | m_pixmapSelector->setIcon( m_stampAnn->stampIconName() ); | 402 | m_pixmapSelector->setIcon( m_stampAnn->stampIconName() ); | ||
| 437 | m_pixmapSelector->setPreviewSize( 64 ); | 403 | m_pixmapSelector->setPreviewSize( 64 ); | ||
| 438 | 404 | | |||
| 439 | connect( m_pixmapSelector, &PixmapPreviewSelector::iconChanged, this, &AnnotationWidget::dataChanged ); | 405 | connect( m_pixmapSelector, &PixmapPreviewSelector::iconChanged, this, &AnnotationWidget::dataChanged ); | ||
| 440 | | ||||
| 441 | return widget; | | |||
| 442 | } | 406 | } | ||
| 443 | 407 | | |||
| 444 | void StampAnnotationWidget::applyChanges() | 408 | void StampAnnotationWidget::applyChanges() | ||
| 445 | { | 409 | { | ||
| 446 | AnnotationWidget::applyChanges(); | 410 | AnnotationWidget::applyChanges(); | ||
| 447 | m_stampAnn->setStampIconName( m_pixmapSelector->icon() ); | 411 | m_stampAnn->setStampIconName( m_pixmapSelector->icon() ); | ||
| 448 | } | 412 | } | ||
| 449 | 413 | | |||
| 450 | 414 | | |||
| 451 | 415 | | |||
| 452 | LineAnnotationWidget::LineAnnotationWidget( Okular::Annotation * ann ) | 416 | LineAnnotationWidget::LineAnnotationWidget( Okular::Annotation * ann ) | ||
| 453 | : AnnotationWidget( ann ) | 417 | : AnnotationWidget( ann ) | ||
| 454 | { | 418 | { | ||
| 455 | m_lineAnn = static_cast< Okular::LineAnnotation * >( ann ); | 419 | m_lineAnn = static_cast< Okular::LineAnnotation * >( ann ); | ||
| 456 | if ( m_lineAnn->linePoints().count() == 2 ) | 420 | if ( m_lineAnn->linePoints().count() == 2 ) | ||
| 457 | m_lineType = 0; // line | 421 | m_lineType = 0; // line | ||
| 458 | else if ( m_lineAnn->lineClosed() ) | 422 | else if ( m_lineAnn->lineClosed() ) | ||
| 459 | m_lineType = 1; // polygon | 423 | m_lineType = 1; // polygon | ||
| 460 | else | 424 | else | ||
| 461 | m_lineType = 2; // polyline | 425 | m_lineType = 2; // polyline | ||
| 462 | } | 426 | } | ||
| 463 | 427 | | |||
| 464 | QWidget * LineAnnotationWidget::createStyleWidget() | 428 | void LineAnnotationWidget::createStyleWidget(QFormLayout * formlayout) | ||
| 465 | { | | |||
| 466 | QWidget * widget = new QWidget(); | | |||
| 467 | QVBoxLayout * lay = new QVBoxLayout( widget ); | | |||
| 468 | lay->setMargin( 0 ); | | |||
| 469 | if ( m_lineType == 0 ) | | |||
| 470 | { | 429 | { | ||
| 471 | QGroupBox * gb = new QGroupBox( widget ); | 430 | QWidget * widget = (QWidget*)formlayout->parent(); | ||
| 472 | lay->addWidget( gb ); | 431 | | ||
| 473 | gb->setTitle( i18n( "Line Extensions" ) ); | 432 | m_spinSize = new QDoubleSpinBox( widget ); | ||
| 474 | QGridLayout * gridlay = new QGridLayout( gb ); | | |||
| 475 | QLabel * tmplabel = new QLabel( i18n( "Leader Line Length:" ), gb ); | | |||
| 476 | gridlay->addWidget( tmplabel, 0, 0, Qt::AlignRight ); | | |||
| 477 | m_spinLL = new QDoubleSpinBox( gb ); | | |||
| 478 | gridlay->addWidget( m_spinLL, 0, 1 ); | | |||
| 479 | tmplabel->setBuddy( m_spinLL ); | | |||
| 480 | tmplabel = new QLabel( i18n( "Leader Line Extensions Length:" ), gb ); | | |||
| 481 | gridlay->addWidget( tmplabel, 1, 0, Qt::AlignRight ); | | |||
| 482 | m_spinLLE = new QDoubleSpinBox( gb ); | | |||
| 483 | gridlay->addWidget( m_spinLLE, 1, 1 ); | | |||
| 484 | tmplabel->setBuddy( m_spinLLE ); | | |||
| 485 | } | | |||
| 486 | | ||||
| 487 | QGroupBox * gb2 = new QGroupBox( widget ); | | |||
| 488 | lay->addWidget( gb2 ); | | |||
| 489 | gb2->setTitle( i18n( "Style" ) ); | | |||
| 490 | QGridLayout * gridlay2 = new QGridLayout( gb2 ); | | |||
| 491 | QLabel * tmplabel2 = new QLabel( i18n( "&Size:" ), gb2 ); | | |||
| 492 | gridlay2->addWidget( tmplabel2, 0, 0, Qt::AlignRight ); | | |||
| 493 | m_spinSize = new QDoubleSpinBox( gb2 ); | | |||
| 494 | gridlay2->addWidget( m_spinSize, 0, 1 ); | | |||
| 495 | tmplabel2->setBuddy( m_spinSize ); | | |||
| 496 | | ||||
| 497 | if ( m_lineType == 1 ) //Polygon | | |||
| 498 | { | | |||
| 499 | m_useColor = new QCheckBox( i18n( "Inner color:" ), gb2 ); | | |||
| 500 | gridlay2->addWidget( m_useColor, 1, 0 ); | | |||
| 501 | m_innerColor = new KColorButton( gb2 ); | | |||
| 502 | gridlay2->addWidget( m_innerColor, 1, 1 ); | | |||
| 503 | m_innerColor->setColor( m_lineAnn->lineInnerColor() ); | | |||
| 504 | if ( m_lineAnn->lineInnerColor().isValid() ) | | |||
| 505 | { | | |||
| 506 | m_useColor->setChecked( true ); | | |||
| 507 | } | | |||
| 508 | else | | |||
| 509 | { | | |||
| 510 | m_innerColor->setEnabled( false ); | | |||
| 511 | } | | |||
| 512 | } | | |||
| 513 | 433 | | |||
| 514 | if ( m_lineType == 0 ) //Straight line | 434 | m_spinSize->setRange( 1, 100 ); | ||
| 435 | m_spinSize->setValue( m_lineAnn->style().width() ); | ||||
| 436 | | ||||
| 437 | connect( m_spinSize, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &LineAnnotationWidget::dataChanged ); | ||||
| 438 | | ||||
| 439 | // Straight line | ||||
| 440 | if ( m_lineType == 0 ) | ||||
| 515 | { | 441 | { | ||
| 516 | m_spinLL->setRange( -500, 500 ); | 442 | formlayout->addRow( i18n( "&Size:" ), m_spinSize ); | ||
| 517 | m_spinLL->setValue( m_lineAnn->lineLeadingForwardPoint() ); | | |||
| 518 | m_spinLLE->setRange( 0, 500 ); | | |||
| 519 | m_spinLLE->setValue( m_lineAnn->lineLeadingBackwardPoint() ); | | |||
| 520 | 443 | | |||
| 521 | //Line Term Styles | 444 | //Line Term Styles | ||
| 522 | QLabel * tmplabel3 = new QLabel( i18n( "Line Start:" ), widget ); | | |||
| 523 | QLabel * tmplabel4 = new QLabel( i18n( "Line End:" ), widget ); | | |||
| 524 | gridlay2->addWidget( tmplabel3, 1, 0, Qt::AlignRight ); | | |||
| 525 | gridlay2->addWidget( tmplabel4, 2, 0, Qt::AlignRight ); | | |||
| 526 | m_startStyleCombo = new QComboBox( widget ); | 445 | m_startStyleCombo = new QComboBox( widget ); | ||
| 446 | formlayout->addRow( i18n( "Line start:" ), m_startStyleCombo); | ||||
| 527 | m_endStyleCombo = new QComboBox( widget ); | 447 | m_endStyleCombo = new QComboBox( widget ); | ||
| 528 | tmplabel3->setBuddy( m_startStyleCombo ); | 448 | formlayout->addRow( i18n( "Line end:" ), m_endStyleCombo); | ||
| 529 | tmplabel4->setBuddy( m_endStyleCombo ); | 449 | formlayout->labelForField( m_startStyleCombo )->setToolTip( i18n("Only for PDF documents") ); | ||
you're going to have conflicts, AFAICS this "only for PDF documents" is gone. aacid: you're going to have conflicts, AFAICS this "only for PDF documents" is gone. | |||||
| 530 | gridlay2->addWidget( m_startStyleCombo, 1, 1, Qt::AlignLeft ); | 450 | formlayout->labelForField( m_endStyleCombo )->setToolTip( i18n("Only for PDF documents") ); | ||
| 531 | gridlay2->addWidget( m_endStyleCombo, 2, 1, Qt::AlignLeft ); | | |||
| 532 | tmplabel3->setToolTip( i18n("Only for PDF documents") ); | | |||
| 533 | tmplabel4->setToolTip( i18n("Only for PDF documents") ); | | |||
| 534 | m_startStyleCombo->setToolTip( i18n("Only for PDF documents") ); | 451 | m_startStyleCombo->setToolTip( i18n("Only for PDF documents") ); | ||
| 535 | m_endStyleCombo->setToolTip( i18n("Only for PDF documents") ); | 452 | m_endStyleCombo->setToolTip( i18n("Only for PDF documents") ); | ||
| 453 | //FIXME: Where does the tooltip goes?? | ||||
| 536 | 454 | | |||
| 537 | for ( const QString &i: { i18n( "Square" ), i18n( "Circle" ), i18n( "Diamond" ), i18n( "Open Arrow" ), i18n( "Closed Arrow" ), | 455 | for ( const QString &i: { i18n( "Square" ), i18n( "Circle" ), i18n( "Diamond" ), i18n( "Open arrow" ), i18n( "Closed arrow" ), | ||
| 538 | i18n( "None" ), i18n( "Butt" ), i18n( "Right Open Arrow" ), i18n( "Right Closed Arrow" ), i18n( "Slash" ) } ) | 456 | i18n( "None" ), i18n( "Butt" ), i18n( "Right open arrow" ), i18n( "Right closed arrow" ), i18n( "Slash" ) } ) | ||
| 539 | { | 457 | { | ||
| 540 | m_startStyleCombo->addItem( i ); | 458 | m_startStyleCombo->addItem( i ); | ||
| 541 | m_endStyleCombo->addItem( i ); | 459 | m_endStyleCombo->addItem( i ); | ||
| 542 | } | 460 | } | ||
| 543 | 461 | | |||
| 544 | m_startStyleCombo->setCurrentIndex( m_lineAnn->lineStartStyle() ); | 462 | m_startStyleCombo->setCurrentIndex( m_lineAnn->lineStartStyle() ); | ||
| 545 | m_endStyleCombo->setCurrentIndex( m_lineAnn->lineEndStyle() ); | 463 | m_endStyleCombo->setCurrentIndex( m_lineAnn->lineEndStyle() ); | ||
| 546 | connect( m_startStyleCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &LineAnnotationWidget::dataChanged ); | | |||
| 547 | connect( m_endStyleCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &LineAnnotationWidget::dataChanged ); | | |||
| 548 | 464 | | |||
| 549 | } | 465 | //Leaders lengths | ||
| 466 | m_spinLL = new QDoubleSpinBox( widget ); | ||||
| 467 | formlayout->addRow( i18n( "Leader line length:" ), m_spinLL ); | ||||
| 468 | m_spinLLE = new QDoubleSpinBox( widget ); | ||||
| 469 | formlayout->addRow( i18n( "Leader line extensions length:" ), m_spinLLE ); | ||||
| 550 | 470 | | |||
| 551 | m_spinSize->setRange( 1, 100 ); | 471 | m_spinLL->setRange( -500, 500 ); | ||
| 552 | m_spinSize->setValue( m_lineAnn->style().width() ); | 472 | m_spinLL->setValue( m_lineAnn->lineLeadingForwardPoint() ); | ||
| 473 | m_spinLLE->setRange( 0, 500 ); | ||||
| 474 | m_spinLLE->setValue( m_lineAnn->lineLeadingBackwardPoint() ); | ||||
| 553 | 475 | | |||
| 554 | if ( m_lineType == 0 ) | 476 | connect( m_startStyleCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &LineAnnotationWidget::dataChanged ); | ||
| 555 | { | 477 | connect( m_endStyleCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &LineAnnotationWidget::dataChanged ); | ||
| 556 | connect( m_spinLL, SIGNAL(valueChanged(double)), this, SIGNAL(dataChanged()) ); | 478 | connect( m_spinLL, SIGNAL(valueChanged(double)), this, SIGNAL(dataChanged()) ); | ||
| 557 | connect( m_spinLLE, SIGNAL(valueChanged(double)), this, SIGNAL(dataChanged()) ); | 479 | connect( m_spinLLE, SIGNAL(valueChanged(double)), this, SIGNAL(dataChanged()) ); | ||
| 558 | } | 480 | } | ||
| 559 | else if ( m_lineType == 1 ) | 481 | else if ( m_lineType == 1 ) // Polygon | ||
| 482 | { | ||||
| 483 | QHBoxLayout * colorlay = new QHBoxLayout(); | ||||
| 484 | m_useColor = new QCheckBox( i18n( "Enabled" ), widget ); | ||||
| 485 | colorlay->addWidget( m_useColor ); | ||||
| 486 | m_innerColor = new KColorButton( widget ); | ||||
| 487 | colorlay->addWidget( m_innerColor); | ||||
| 488 | formlayout->addRow( i18n( "Shape fill:" ), colorlay ); | ||||
| 489 | | ||||
| 490 | m_innerColor->setColor( m_lineAnn->lineInnerColor() ); | ||||
| 491 | if ( m_lineAnn->lineInnerColor().isValid() ) | ||||
| 560 | { | 492 | { | ||
| 493 | m_useColor->setChecked( true ); | ||||
| 494 | } | ||||
| 495 | else | ||||
| 496 | { | ||||
| 497 | m_innerColor->setEnabled( false ); | ||||
| 498 | } | ||||
| 499 | | ||||
| 500 | formlayout->addRow( i18n( "&Size:" ), m_spinSize ); | ||||
| 501 | | ||||
| 561 | connect( m_innerColor, &KColorButton::changed, this, &AnnotationWidget::dataChanged ); | 502 | connect( m_innerColor, &KColorButton::changed, this, &AnnotationWidget::dataChanged ); | ||
| 562 | connect( m_useColor, &QAbstractButton::toggled, this, &AnnotationWidget::dataChanged ); | 503 | connect( m_useColor, &QAbstractButton::toggled, this, &AnnotationWidget::dataChanged ); | ||
| 563 | connect( m_useColor, &QCheckBox::toggled, m_innerColor, &KColorButton::setEnabled ); | 504 | connect( m_useColor, &QCheckBox::toggled, m_innerColor, &KColorButton::setEnabled ); | ||
| 564 | } | 505 | } | ||
| 565 | connect( m_spinSize, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &LineAnnotationWidget::dataChanged ); | | |||
| 566 | | ||||
| 567 | return widget; | | |||
| 568 | } | 506 | } | ||
| 569 | 507 | | |||
| 570 | void LineAnnotationWidget::applyChanges() | 508 | void LineAnnotationWidget::applyChanges() | ||
| 571 | { | 509 | { | ||
| 572 | AnnotationWidget::applyChanges(); | 510 | AnnotationWidget::applyChanges(); | ||
| 573 | if ( m_lineType == 0 ) | 511 | if ( m_lineType == 0 ) | ||
| 574 | { | 512 | { | ||
| 575 | Q_ASSERT(m_spinLL && m_spinLLE && m_startStyleCombo && m_endStyleCombo); | 513 | Q_ASSERT(m_spinLL && m_spinLLE && m_startStyleCombo && m_endStyleCombo); | ||
| Show All 21 Lines | |||||
| 597 | 535 | | |||
| 598 | 536 | | |||
| 599 | InkAnnotationWidget::InkAnnotationWidget( Okular::Annotation * ann ) | 537 | InkAnnotationWidget::InkAnnotationWidget( Okular::Annotation * ann ) | ||
| 600 | : AnnotationWidget( ann ) | 538 | : AnnotationWidget( ann ) | ||
| 601 | { | 539 | { | ||
| 602 | m_inkAnn = static_cast< Okular::InkAnnotation * >( ann ); | 540 | m_inkAnn = static_cast< Okular::InkAnnotation * >( ann ); | ||
| 603 | } | 541 | } | ||
| 604 | 542 | | |||
| 605 | QWidget * InkAnnotationWidget::createStyleWidget() | 543 | void InkAnnotationWidget::createStyleWidget(QFormLayout * formlayout) | ||
| 606 | { | 544 | { | ||
| 607 | QWidget * widget = new QWidget(); | 545 | QWidget * widget = (QWidget*)formlayout->parent(); | ||
| 608 | QVBoxLayout * lay = new QVBoxLayout( widget ); | | |||
| 609 | lay->setMargin( 0 ); | | |||
| 610 | 546 | | |||
| 611 | QGroupBox * gb2 = new QGroupBox( widget ); | 547 | m_spinSize = new QDoubleSpinBox( widget ); | ||
| 612 | lay->addWidget( gb2 ); | 548 | formlayout->addRow( i18n( "&Size:" ), m_spinSize ); | ||
| 613 | gb2->setTitle( i18n( "Style" ) ); | | |||
| 614 | QGridLayout * gridlay2 = new QGridLayout( gb2 ); | | |||
| 615 | QLabel * tmplabel2 = new QLabel( i18n( "&Size:" ), gb2 ); | | |||
| 616 | gridlay2->addWidget( tmplabel2, 0, 0, Qt::AlignRight ); | | |||
| 617 | m_spinSize = new QDoubleSpinBox( gb2 ); | | |||
| 618 | gridlay2->addWidget( m_spinSize, 0, 1 ); | | |||
| 619 | tmplabel2->setBuddy( m_spinSize ); | | |||
| 620 | 549 | | |||
| 621 | m_spinSize->setRange( 1, 100 ); | 550 | m_spinSize->setRange( 1, 100 ); | ||
| 622 | m_spinSize->setValue( m_inkAnn->style().width() ); | 551 | m_spinSize->setValue( m_inkAnn->style().width() ); | ||
| 623 | 552 | | |||
| 624 | connect( m_spinSize, SIGNAL(valueChanged(double)), this, SIGNAL(dataChanged()) ); | 553 | connect( m_spinSize, SIGNAL(valueChanged(double)), this, SIGNAL(dataChanged()) ); | ||
| 625 | | ||||
| 626 | return widget; | | |||
| 627 | } | 554 | } | ||
| 628 | 555 | | |||
| 629 | void InkAnnotationWidget::applyChanges() | 556 | void InkAnnotationWidget::applyChanges() | ||
| 630 | { | 557 | { | ||
| 631 | AnnotationWidget::applyChanges(); | 558 | AnnotationWidget::applyChanges(); | ||
| 632 | m_inkAnn->style().setWidth( m_spinSize->value() ); | 559 | m_inkAnn->style().setWidth( m_spinSize->value() ); | ||
| 633 | } | 560 | } | ||
| 634 | 561 | | |||
| 635 | 562 | | |||
| 636 | 563 | | |||
| 637 | HighlightAnnotationWidget::HighlightAnnotationWidget( Okular::Annotation * ann ) | 564 | HighlightAnnotationWidget::HighlightAnnotationWidget( Okular::Annotation * ann ) | ||
| 638 | : AnnotationWidget( ann ) | 565 | : AnnotationWidget( ann ) | ||
| 639 | { | 566 | { | ||
| 640 | m_hlAnn = static_cast< Okular::HighlightAnnotation * >( ann ); | 567 | m_hlAnn = static_cast< Okular::HighlightAnnotation * >( ann ); | ||
| 641 | } | 568 | } | ||
| 642 | 569 | | |||
| 643 | QWidget * HighlightAnnotationWidget::createStyleWidget() | 570 | void HighlightAnnotationWidget::createStyleWidget(QFormLayout * formlayout) | ||
| 644 | { | 571 | { | ||
| 645 | QWidget * widget = new QWidget(); | 572 | QWidget * widget = (QWidget*)formlayout->parent(); | ||
| 646 | QVBoxLayout * lay = new QVBoxLayout( widget ); | 573 | | ||
| 647 | lay->setMargin( 0 ); | | |||
| 648 | QHBoxLayout * typelay = new QHBoxLayout(); | | |||
| 649 | lay->addLayout( typelay ); | | |||
| 650 | QLabel * tmplabel = new QLabel( i18n( "Type:" ), widget ); | | |||
| 651 | typelay->addWidget( tmplabel, 0, Qt::AlignRight ); | | |||
| 652 | m_typeCombo = new KComboBox( widget ); | 574 | m_typeCombo = new KComboBox( widget ); | ||
| 653 | tmplabel->setBuddy( m_typeCombo ); | 575 | formlayout->insertRow( 0, i18n( "Type:" ), m_typeCombo ); | ||
| 654 | typelay->addWidget( m_typeCombo ); | | |||
| 655 | 576 | | |||
| 656 | m_typeCombo->addItem( i18n( "Highlight" ) ); | 577 | m_typeCombo->addItem( i18n( "Highlight" ) ); | ||
| 657 | m_typeCombo->addItem( i18n( "Squiggle" ) ); | 578 | m_typeCombo->addItem( i18n( "Squiggle" ) ); | ||
| 658 | m_typeCombo->addItem( i18n( "Underline" ) ); | 579 | m_typeCombo->addItem( i18n( "Underline" ) ); | ||
| 659 | m_typeCombo->addItem( i18n( "Strike out" ) ); | 580 | m_typeCombo->addItem( i18n( "Strike out" ) ); | ||
| 660 | m_typeCombo->setCurrentIndex( m_hlAnn->highlightType() ); | 581 | m_typeCombo->setCurrentIndex( m_hlAnn->highlightType() ); | ||
| 661 | 582 | | |||
| 662 | connect( m_typeCombo, SIGNAL(currentIndexChanged(int)), this, SIGNAL(dataChanged()) ); | 583 | connect( m_typeCombo, SIGNAL(currentIndexChanged(int)), this, SIGNAL(dataChanged()) ); | ||
| 663 | | ||||
| 664 | return widget; | | |||
| 665 | } | 584 | } | ||
| 666 | 585 | | |||
| 667 | void HighlightAnnotationWidget::applyChanges() | 586 | void HighlightAnnotationWidget::applyChanges() | ||
| 668 | { | 587 | { | ||
| 669 | AnnotationWidget::applyChanges(); | 588 | AnnotationWidget::applyChanges(); | ||
| 670 | m_hlAnn->setHighlightType( (Okular::HighlightAnnotation::HighlightType)m_typeCombo->currentIndex() ); | 589 | m_hlAnn->setHighlightType( (Okular::HighlightAnnotation::HighlightType)m_typeCombo->currentIndex() ); | ||
| 671 | } | 590 | } | ||
| 672 | 591 | | |||
| 673 | 592 | | |||
| 674 | 593 | | |||
| 675 | GeomAnnotationWidget::GeomAnnotationWidget( Okular::Annotation * ann ) | 594 | GeomAnnotationWidget::GeomAnnotationWidget( Okular::Annotation * ann ) | ||
| 676 | : AnnotationWidget( ann ) | 595 | : AnnotationWidget( ann ) | ||
| 677 | { | 596 | { | ||
| 678 | m_geomAnn = static_cast< Okular::GeomAnnotation * >( ann ); | 597 | m_geomAnn = static_cast< Okular::GeomAnnotation * >( ann ); | ||
| 679 | } | 598 | } | ||
| 680 | 599 | | |||
| 681 | QWidget * GeomAnnotationWidget::createStyleWidget() | 600 | void GeomAnnotationWidget::createStyleWidget(QFormLayout * formlayout) | ||
| 682 | { | 601 | { | ||
| 683 | QWidget * widget = new QWidget(); | 602 | QWidget * widget = (QWidget*)formlayout->parent(); | ||
| 684 | QGridLayout * lay = new QGridLayout( widget ); | 603 | | ||
| 685 | lay->setMargin( 0 ); | | |||
| 686 | QLabel * tmplabel = new QLabel( i18n( "Type:" ), widget ); | | |||
| 687 | lay->addWidget( tmplabel, 0, 0, Qt::AlignRight ); | | |||
| 688 | m_typeCombo = new KComboBox( widget ); | 604 | m_typeCombo = new KComboBox( widget ); | ||
| 689 | tmplabel->setBuddy( m_typeCombo ); | 605 | formlayout->insertRow( 0, i18n( "Type:" ), m_typeCombo ); | ||
| 690 | lay->addWidget( m_typeCombo, 0, 1 ); | 606 | QHBoxLayout * colorlay = new QHBoxLayout(); | ||
| 691 | m_useColor = new QCheckBox( i18n( "Inner color:" ), widget ); | 607 | m_useColor = new QCheckBox( i18n( "Enabled" ), widget ); | ||
| 692 | lay->addWidget( m_useColor, 1, 0 ); | 608 | colorlay->addWidget(m_useColor); | ||
| 693 | m_innerColor = new KColorButton( widget ); | 609 | m_innerColor = new KColorButton( widget ); | ||
| 694 | lay->addWidget( m_innerColor, 1, 1 ); | 610 | colorlay->addWidget( m_innerColor); | ||
| 695 | tmplabel = new QLabel( i18n( "&Size:" ), widget ); | 611 | formlayout->addRow( i18n( "Shape fill:" ), colorlay ); | ||
| 696 | lay->addWidget( tmplabel, 2, 0, Qt::AlignRight ); | | |||
| 697 | m_spinSize = new QDoubleSpinBox( widget ); | 612 | m_spinSize = new QDoubleSpinBox( widget ); | ||
| 698 | lay->addWidget( m_spinSize, 2, 1 ); | 613 | formlayout->addRow( i18n( "&Size:" ), m_spinSize ); | ||
| 699 | tmplabel->setBuddy( m_spinSize ); | | |||
| 700 | 614 | | |||
| 701 | m_typeCombo->addItem( i18n( "Rectangle" ) ); | 615 | m_typeCombo->addItem( i18n( "Rectangle" ) ); | ||
| 702 | m_typeCombo->addItem( i18n( "Ellipse" ) ); | 616 | m_typeCombo->addItem( i18n( "Ellipse" ) ); | ||
| 703 | m_typeCombo->setCurrentIndex( m_geomAnn->geometricalType() ); | 617 | m_typeCombo->setCurrentIndex( m_geomAnn->geometricalType() ); | ||
| 704 | m_innerColor->setColor( m_geomAnn->geometricalInnerColor() ); | 618 | m_innerColor->setColor( m_geomAnn->geometricalInnerColor() ); | ||
| 705 | if ( m_geomAnn->geometricalInnerColor().isValid() ) | 619 | if ( m_geomAnn->geometricalInnerColor().isValid() ) | ||
| 706 | { | 620 | { | ||
| 707 | m_useColor->setChecked( true ); | 621 | m_useColor->setChecked( true ); | ||
| 708 | } | 622 | } | ||
| 709 | else | 623 | else | ||
| 710 | { | 624 | { | ||
| 711 | m_innerColor->setEnabled( false ); | 625 | m_innerColor->setEnabled( false ); | ||
| 712 | } | 626 | } | ||
| 713 | m_spinSize->setRange( 0, 100 ); | 627 | m_spinSize->setRange( 0, 100 ); | ||
| 714 | m_spinSize->setValue( m_geomAnn->style().width() ); | 628 | m_spinSize->setValue( m_geomAnn->style().width() ); | ||
| 715 | 629 | | |||
| 716 | connect( m_typeCombo, SIGNAL(currentIndexChanged(int)), this, SIGNAL(dataChanged()) ); | 630 | connect( m_typeCombo, SIGNAL(currentIndexChanged(int)), this, SIGNAL(dataChanged()) ); | ||
| 717 | connect( m_innerColor, &KColorButton::changed, this, &AnnotationWidget::dataChanged ); | 631 | connect( m_innerColor, &KColorButton::changed, this, &AnnotationWidget::dataChanged ); | ||
| 718 | connect( m_useColor, &QAbstractButton::toggled, this, &AnnotationWidget::dataChanged ); | 632 | connect( m_useColor, &QAbstractButton::toggled, this, &AnnotationWidget::dataChanged ); | ||
| 719 | connect(m_useColor, &QCheckBox::toggled, m_innerColor, &KColorButton::setEnabled); | 633 | connect(m_useColor, &QCheckBox::toggled, m_innerColor, &KColorButton::setEnabled); | ||
| 720 | connect( m_spinSize, SIGNAL(valueChanged(double)), this, SIGNAL(dataChanged()) ); | 634 | connect( m_spinSize, SIGNAL(valueChanged(double)), this, SIGNAL(dataChanged()) ); | ||
| 721 | | ||||
| 722 | return widget; | | |||
| 723 | } | 635 | } | ||
| 724 | 636 | | |||
| 725 | void GeomAnnotationWidget::applyChanges() | 637 | void GeomAnnotationWidget::applyChanges() | ||
| 726 | { | 638 | { | ||
| 727 | AnnotationWidget::applyChanges(); | 639 | AnnotationWidget::applyChanges(); | ||
| 728 | m_geomAnn->setGeometricalType( (Okular::GeomAnnotation::GeomType)m_typeCombo->currentIndex() ); | 640 | m_geomAnn->setGeometricalType( (Okular::GeomAnnotation::GeomType)m_typeCombo->currentIndex() ); | ||
| 729 | if ( !m_useColor->isChecked() ) | 641 | if ( !m_useColor->isChecked() ) | ||
| 730 | { | 642 | { | ||
| Show All 9 Lines | |||||
| 740 | 652 | | |||
| 741 | 653 | | |||
| 742 | FileAttachmentAnnotationWidget::FileAttachmentAnnotationWidget( Okular::Annotation * ann ) | 654 | FileAttachmentAnnotationWidget::FileAttachmentAnnotationWidget( Okular::Annotation * ann ) | ||
| 743 | : AnnotationWidget( ann ), m_pixmapSelector( nullptr ) | 655 | : AnnotationWidget( ann ), m_pixmapSelector( nullptr ) | ||
| 744 | { | 656 | { | ||
| 745 | m_attachAnn = static_cast< Okular::FileAttachmentAnnotation * >( ann ); | 657 | m_attachAnn = static_cast< Okular::FileAttachmentAnnotation * >( ann ); | ||
| 746 | } | 658 | } | ||
| 747 | 659 | | |||
| 748 | QWidget * FileAttachmentAnnotationWidget::createStyleWidget() | 660 | void FileAttachmentAnnotationWidget::createStyleWidget(QFormLayout * formlayout) | ||
| 749 | { | 661 | { | ||
| 750 | QWidget * widget = new QWidget(); | 662 | QWidget * widget = (QWidget*)formlayout->parent(); | ||
| 751 | QVBoxLayout * lay = new QVBoxLayout( widget ); | 663 | | ||
| 752 | lay->setMargin( 0 ); | 664 | m_pixmapSelector = new PixmapPreviewSelector( widget ); | ||
| 753 | QGroupBox * gb = new QGroupBox( widget ); | 665 | formlayout->addRow( i18n( "File attachment symbol:" ), m_pixmapSelector ); | ||
| 754 | lay->addWidget( gb ); | | |||
| 755 | gb->setTitle( i18n( "File Attachment Symbol" ) ); | | |||
| 756 | QHBoxLayout * gblay = new QHBoxLayout( gb ); | | |||
| 757 | m_pixmapSelector = new PixmapPreviewSelector( gb ); | | |||
| 758 | gblay->addWidget( m_pixmapSelector ); | | |||
| 759 | m_pixmapSelector->setEditable( true ); | 666 | m_pixmapSelector->setEditable( true ); | ||
| 760 | 667 | | |||
| 761 | m_pixmapSelector->addItem( i18nc( "Symbol for file attachment annotations", "Graph" ), QStringLiteral("graph") ); | 668 | m_pixmapSelector->addItem( i18nc( "Symbol for file attachment annotations", "Graph" ), QStringLiteral("graph") ); | ||
| 762 | m_pixmapSelector->addItem( i18nc( "Symbol for file attachment annotations", "Push Pin" ), QStringLiteral("pushpin") ); | 669 | m_pixmapSelector->addItem( i18nc( "Symbol for file attachment annotations", "Push Pin" ), QStringLiteral("pushpin") ); | ||
| 763 | m_pixmapSelector->addItem( i18nc( "Symbol for file attachment annotations", "Paperclip" ), QStringLiteral("paperclip") ); | 670 | m_pixmapSelector->addItem( i18nc( "Symbol for file attachment annotations", "Paperclip" ), QStringLiteral("paperclip") ); | ||
| 764 | m_pixmapSelector->addItem( i18nc( "Symbol for file attachment annotations", "Tag" ), QStringLiteral("tag") ); | 671 | m_pixmapSelector->addItem( i18nc( "Symbol for file attachment annotations", "Tag" ), QStringLiteral("tag") ); | ||
| 765 | m_pixmapSelector->setIcon( m_attachAnn->fileIconName() ); | 672 | m_pixmapSelector->setIcon( m_attachAnn->fileIconName() ); | ||
| 766 | 673 | | |||
| 767 | connect( m_pixmapSelector, &PixmapPreviewSelector::iconChanged, this, &AnnotationWidget::dataChanged ); | 674 | connect( m_pixmapSelector, &PixmapPreviewSelector::iconChanged, this, &AnnotationWidget::dataChanged ); | ||
| 768 | | ||||
| 769 | return widget; | | |||
| 770 | } | 675 | } | ||
| 771 | 676 | | |||
| 772 | QWidget * FileAttachmentAnnotationWidget::createExtraWidget() | 677 | QWidget * FileAttachmentAnnotationWidget::createExtraWidget() | ||
| 773 | { | 678 | { | ||
| 774 | QWidget * widget = new QWidget(); | 679 | QWidget * widget = new QWidget(); | ||
| 775 | widget->setWindowTitle( i18nc( "'File' as normal file, that can be opened, saved, etc..", "File" ) ); | 680 | widget->setWindowTitle( i18nc( "'File' as normal file, that can be opened, saved, etc..", "File" ) ); | ||
| 776 | 681 | | |||
| 777 | Okular::EmbeddedFile *ef = m_attachAnn->embeddedFile(); | 682 | Okular::EmbeddedFile *ef = m_attachAnn->embeddedFile(); | ||
| 778 | const int size = ef->size(); | 683 | const int size = ef->size(); | ||
| 779 | const QString sizeString = size <= 0 ? i18nc( "Not available size", "N/A" ) : KFormat().formatByteSize( size ); | 684 | const QString sizeString = size <= 0 ? i18nc( "Not available size", "N/A" ) : KFormat().formatByteSize( size ); | ||
| 780 | const QString descString = ef->description().isEmpty() ? i18n( "No description available." ) : ef->description(); | 685 | const QString descString = ef->description().isEmpty() ? i18n( "No description available." ) : ef->description(); | ||
| 781 | 686 | | |||
| 782 | QGridLayout * lay = new QGridLayout( widget ); | 687 | QHBoxLayout * mainLay = new QHBoxLayout( widget ); | ||
| 783 | lay->setMargin( 0 ); | 688 | QFormLayout * lay = new QFormLayout(); | ||
| 784 | QLabel * tmplabel = new QLabel( i18n( "Name: %1", ef->name() ), widget ); | 689 | mainLay->addLayout( lay ); | ||
| 690 | | ||||
| 691 | QLabel * tmplabel = new QLabel( ef->name() , widget ); | ||||
| 785 | tmplabel->setTextInteractionFlags( Qt::TextSelectableByMouse ); | 692 | tmplabel->setTextInteractionFlags( Qt::TextSelectableByMouse ); | ||
| 786 | lay->addWidget( tmplabel, 0, 0 ); | 693 | lay->addRow( i18n( "Name:" ), tmplabel ); | ||
| 787 | 694 | | |||
| 788 | tmplabel = new QLabel( i18n( "Size: %1", sizeString ), widget ); | 695 | tmplabel = new QLabel( sizeString, widget ); | ||
| 789 | tmplabel->setTextInteractionFlags( Qt::TextSelectableByMouse ); | 696 | tmplabel->setTextInteractionFlags( Qt::TextSelectableByMouse ); | ||
| 790 | lay->addWidget( tmplabel, 1, 0 ); | 697 | lay->addRow( i18n( "Size:" ), tmplabel ); | ||
| 791 | 698 | | |||
| 792 | tmplabel = new QLabel( i18n( "Description:" ), widget ); | | |||
| 793 | lay->addWidget( tmplabel, 2, 0 ); | | |||
| 794 | tmplabel = new QLabel( widget ); | 699 | tmplabel = new QLabel( widget ); | ||
| 795 | tmplabel->setTextFormat( Qt::PlainText ); | 700 | tmplabel->setTextFormat( Qt::PlainText ); | ||
| 796 | tmplabel->setWordWrap( true ); | 701 | tmplabel->setWordWrap( true ); | ||
| 797 | tmplabel->setText( descString ); | 702 | tmplabel->setText( descString ); | ||
| 798 | tmplabel->setTextInteractionFlags( Qt::TextSelectableByMouse ); | 703 | tmplabel->setTextInteractionFlags( Qt::TextSelectableByMouse ); | ||
| 799 | lay->addWidget( tmplabel, 3, 0, 1, 2 ); | 704 | lay->addRow( i18n( "Description:" ), tmplabel ); | ||
| 800 | 705 | | |||
| 801 | QMimeDatabase db; | 706 | QMimeDatabase db; | ||
| 802 | QMimeType mime = db.mimeTypeForFile( ef->name(), QMimeDatabase::MatchExtension); | 707 | QMimeType mime = db.mimeTypeForFile( ef->name(), QMimeDatabase::MatchExtension); | ||
| 803 | if ( mime.isValid() ) | 708 | if ( mime.isValid() ) | ||
| 804 | { | 709 | { | ||
| 805 | tmplabel = new QLabel( widget ); | 710 | tmplabel = new QLabel( widget ); | ||
| 806 | tmplabel->setPixmap( QIcon::fromTheme( mime.iconName() ).pixmap( FILEATTACH_ICONSIZE, FILEATTACH_ICONSIZE ) ); | 711 | tmplabel->setPixmap( QIcon::fromTheme( mime.iconName() ).pixmap( FILEATTACH_ICONSIZE, FILEATTACH_ICONSIZE ) ); | ||
| 807 | tmplabel->setFixedSize( FILEATTACH_ICONSIZE, FILEATTACH_ICONSIZE ); | 712 | tmplabel->setFixedSize( FILEATTACH_ICONSIZE, FILEATTACH_ICONSIZE ); | ||
| 808 | lay->addWidget( tmplabel, 0, 1, 3, 1, Qt::AlignTop ); | 713 | QVBoxLayout * tmpLayout = new QVBoxLayout( widget ); | ||
| 714 | tmpLayout->setAlignment( Qt::AlignTop ); | ||||
| 715 | mainLay->addLayout( tmpLayout ); | ||||
| 716 | tmpLayout->addWidget( tmplabel ); | ||||
| 809 | } | 717 | } | ||
| 810 | 718 | | |||
| 811 | lay->addItem( new QSpacerItem( 5, 5, QSizePolicy::Fixed, QSizePolicy::MinimumExpanding ), 4, 0 ); | | |||
| 812 | | ||||
| 813 | return widget; | 719 | return widget; | ||
| 814 | } | 720 | } | ||
| 815 | 721 | | |||
| 816 | void FileAttachmentAnnotationWidget::applyChanges() | 722 | void FileAttachmentAnnotationWidget::applyChanges() | ||
| 817 | { | 723 | { | ||
| 818 | AnnotationWidget::applyChanges(); | 724 | AnnotationWidget::applyChanges(); | ||
| 819 | m_attachAnn->setFileIconName( m_pixmapSelector->icon() ); | 725 | m_attachAnn->setFileIconName( m_pixmapSelector->icon() ); | ||
| 820 | } | 726 | } | ||
| Show All 22 Lines | |||||
| 843 | } | 749 | } | ||
| 844 | 750 | | |||
| 845 | CaretAnnotationWidget::CaretAnnotationWidget( Okular::Annotation * ann ) | 751 | CaretAnnotationWidget::CaretAnnotationWidget( Okular::Annotation * ann ) | ||
| 846 | : AnnotationWidget( ann ), m_pixmapSelector( nullptr ) | 752 | : AnnotationWidget( ann ), m_pixmapSelector( nullptr ) | ||
| 847 | { | 753 | { | ||
| 848 | m_caretAnn = static_cast< Okular::CaretAnnotation * >( ann ); | 754 | m_caretAnn = static_cast< Okular::CaretAnnotation * >( ann ); | ||
| 849 | } | 755 | } | ||
| 850 | 756 | | |||
| 851 | QWidget * CaretAnnotationWidget::createStyleWidget() | 757 | void CaretAnnotationWidget::createStyleWidget(QFormLayout * formlayout) | ||
| 852 | { | 758 | { | ||
| 853 | QWidget * widget = new QWidget(); | 759 | QWidget * widget = (QWidget*)formlayout->parent(); | ||
| 854 | QVBoxLayout * lay = new QVBoxLayout( widget ); | 760 | | ||
shubham: Why not qobject_cast? | |||||
| 855 | lay->setMargin( 0 ); | 761 | m_pixmapSelector = new PixmapPreviewSelector( widget ); | ||
| 856 | QGroupBox * gb = new QGroupBox( widget ); | 762 | formlayout->addRow( i18n( "Caret symbol:" ), m_pixmapSelector ); | ||
| 857 | lay->addWidget( gb ); | | |||
| 858 | gb->setTitle( i18n( "Caret Symbol" ) ); | | |||
| 859 | QHBoxLayout * gblay = new QHBoxLayout( gb ); | | |||
| 860 | m_pixmapSelector = new PixmapPreviewSelector( gb ); | | |||
| 861 | gblay->addWidget( m_pixmapSelector ); | | |||
| 862 | 763 | | |||
| 863 | m_pixmapSelector->addItem( i18nc( "Symbol for caret annotations", "None" ), QStringLiteral("caret-none") ); | 764 | m_pixmapSelector->addItem( i18nc( "Symbol for caret annotations", "None" ), QStringLiteral("caret-none") ); | ||
| 864 | m_pixmapSelector->addItem( i18nc( "Symbol for caret annotations", "P" ), QStringLiteral("caret-p") ); | 765 | m_pixmapSelector->addItem( i18nc( "Symbol for caret annotations", "P" ), QStringLiteral("caret-p") ); | ||
| 865 | m_pixmapSelector->setIcon( caretSymbolToIcon( m_caretAnn->caretSymbol() ) ); | 766 | m_pixmapSelector->setIcon( caretSymbolToIcon( m_caretAnn->caretSymbol() ) ); | ||
| 866 | 767 | | |||
| 867 | connect( m_pixmapSelector, &PixmapPreviewSelector::iconChanged, this, &AnnotationWidget::dataChanged ); | 768 | connect( m_pixmapSelector, &PixmapPreviewSelector::iconChanged, this, &AnnotationWidget::dataChanged ); | ||
| 868 | | ||||
| 869 | return widget; | | |||
| 870 | } | 769 | } | ||
aacid: return at the end of a function screams really bad at me, please fix :) | |||||
| 871 | 770 | | |||
| 872 | void CaretAnnotationWidget::applyChanges() | 771 | void CaretAnnotationWidget::applyChanges() | ||
| 873 | { | 772 | { | ||
| 874 | AnnotationWidget::applyChanges(); | 773 | AnnotationWidget::applyChanges(); | ||
| 875 | m_caretAnn->setCaretSymbol( caretSymbolFromIcon( m_pixmapSelector->icon() ) ); | 774 | m_caretAnn->setCaretSymbol( caretSymbolFromIcon( m_pixmapSelector->icon() ) ); | ||
| 876 | } | 775 | } | ||
| 877 | 776 | | |||
| 878 | 777 | | |||
| 879 | 778 | | |||
| 880 | #include "moc_annotationwidgets.cpp" | 779 | #include "moc_annotationwidgets.cpp" | ||
Is it correct to set this growth policy? I have not found any guideline on the HIG. Compared to the grid layout where label and widget take the same amount of horizontal space, now the widgets take way more space making it a little ugly for some annotation tools. Any idea?