diff --git a/ui/annotationwidgets.cpp b/ui/annotationwidgets.cpp --- a/ui/annotationwidgets.cpp +++ b/ui/annotationwidgets.cpp @@ -494,7 +494,7 @@ gridlay2->addWidget( m_spinSize, 0, 1 ); tmplabel2->setBuddy( m_spinSize ); - if ( m_lineType == 1 ) + if ( m_lineType == 1 ) //Polygon { m_useColor = new QCheckBox( i18n( "Inner color:" ), gb2 ); gridlay2->addWidget( m_useColor, 1, 0 ); @@ -502,12 +502,41 @@ gridlay2->addWidget( m_innerColor, 1, 1 ); } - if ( m_lineType == 0 ) + if ( m_lineType == 0 ) //Straight line { m_spinLL->setRange( -500, 500 ); m_spinLL->setValue( m_lineAnn->lineLeadingForwardPoint() ); m_spinLLE->setRange( 0, 500 ); m_spinLLE->setValue( m_lineAnn->lineLeadingBackwardPoint() ); + + //Line Term Styles + QLabel * tmplabel3 = new QLabel( i18n( "Line Start:" ), widget ); + QLabel * tmplabel4 = new QLabel( i18n( "Line End:" ), widget ); + gridlay2->addWidget( tmplabel3, 1, 0, Qt::AlignRight ); + gridlay2->addWidget( tmplabel4, 2, 0, Qt::AlignRight ); + m_startStyleCombo = new QComboBox( widget ); + m_endStyleCombo = new QComboBox( widget ); + tmplabel3->setBuddy( m_startStyleCombo ); + tmplabel4->setBuddy( m_endStyleCombo ); + gridlay2->addWidget( m_startStyleCombo, 1, 1, Qt::AlignLeft ); + gridlay2->addWidget( m_endStyleCombo, 2, 1, Qt::AlignLeft ); + tmplabel3->setToolTip( i18n("Only for PDF documents")); + tmplabel4->setToolTip( i18n("Only for PDF documents")); + m_startStyleCombo->setToolTip( i18n("Only for PDF documents")); + m_endStyleCombo->setToolTip( i18n("Only for PDF documents")); + + for ( const QString &i: { i18n( " Square" ), i18n( " Circle" ), i18n( " Diamond" ), i18n( " Open Arrow" ), i18n( " Closed Arrow" ), + i18n( " None" ), i18n( " Butt" ), i18n( " Right Open Arrow" ), i18n( " Right Closed Arrow" ), i18n( "Slash" ) }) + { + m_startStyleCombo->addItem(i); + m_endStyleCombo->addItem(i); + } + + m_startStyleCombo->setCurrentIndex( m_lineAnn->lineStartStyle() ); + m_endStyleCombo->setCurrentIndex( m_lineAnn->lineEndStyle() ); + connect( m_startStyleCombo, QOverload::of(&QComboBox::currentIndexChanged), this, &LineAnnotationWidget::dataChanged ); + connect( m_endStyleCombo, QOverload::of(&QComboBox::currentIndexChanged), this, &LineAnnotationWidget::dataChanged ); + } else if ( m_lineType == 1 ) { @@ -537,34 +566,6 @@ } connect( m_spinSize, QOverload::of(&QDoubleSpinBox::valueChanged), this, &LineAnnotationWidget::dataChanged ); - //Line Term Styles - QLabel * tmplabel3 = new QLabel( i18n( "Line Start:" ), widget ); - QLabel * tmplabel4 = new QLabel( i18n( "Line End:" ), widget ); - gridlay2->addWidget( tmplabel3, 1, 0, Qt::AlignRight ); - gridlay2->addWidget( tmplabel4, 2, 0, Qt::AlignRight ); - m_startStyleCombo = new QComboBox( widget ); - m_endStyleCombo = new QComboBox( widget ); - tmplabel3->setBuddy( m_startStyleCombo ); - tmplabel4->setBuddy( m_endStyleCombo ); - gridlay2->addWidget( m_startStyleCombo, 1, 1, Qt::AlignLeft ); - gridlay2->addWidget( m_endStyleCombo, 2, 1, Qt::AlignLeft ); - tmplabel3->setToolTip( i18n("Only for PDF documents") ); - tmplabel4->setToolTip( i18n("Only for PDF documents") ); - m_startStyleCombo->setToolTip( i18n("Only for PDF documents")); - m_endStyleCombo->setToolTip( i18n("Only for PDF documents")); - - for ( const QString &i: { i18n( " Square" ), i18n( " Circle" ), i18n( " Diamond" ), i18n( " Open Arrow" ), i18n( " Closed Arrow" ), - i18n( " None" ), i18n( " Butt" ), i18n( " Right Open Arrow" ), i18n( " Right Closed Arrow" ), i18n( "Slash" ) } ) - { - m_startStyleCombo->addItem(i); - m_endStyleCombo->addItem(i); - } - - m_startStyleCombo->setCurrentIndex( m_lineAnn->lineStartStyle() ); - m_endStyleCombo->setCurrentIndex( m_lineAnn->lineEndStyle() ); - connect( m_startStyleCombo, QOverload::of(&QComboBox::currentIndexChanged), this, &LineAnnotationWidget::dataChanged ); - connect( m_endStyleCombo, QOverload::of(&QComboBox::currentIndexChanged), this, &LineAnnotationWidget::dataChanged ); - return widget; }