Differential D20760 Diff 56942 ui/annotationwidgets.cpp

Changeset View

Standalone View

View Options

ui/annotationwidgets.cpp

Context not available.
537 } 537​ }
538 connect( m_spinSize, SIGNAL(valueChanged(double)), this, SIGNAL(dataChanged()) ); 538​ connect( m_spinSize, SIGNAL(valueChanged(double)), this, SIGNAL(dataChanged()) );
539 539​
540​ //Line Term Styles
541​ QLabel * tmplabel3 = new QLabel( i18n( "Line End:" ), widget );
542​ gridlay2->addWidget( tmplabel3, 1, 0, Qt::AlignRight );
543​ m_termStyleCombo = new KComboBox( widget );
544​ tmplabel3->setBuddy( m_termStyleCombo );
545​ gridlay2->addWidget( m_termStyleCombo );
546​
547​ m_termStyleCombo->addItem( i18n( "□ Square" ) );
548​ m_termStyleCombo->addItem( i18n( "○ Circle" ) );
549​ m_termStyleCombo->addItem( i18n( "◇ Diamond" ) );
550​ m_termStyleCombo->addItem( i18n( "→ Open Arrow" ) );
551​ m_termStyleCombo->addItem( i18n( "⇾ Closed Arrow" ) );
552​ m_termStyleCombo->addItem( i18n( "None" ) );
553​ m_termStyleCombo->addItem( i18n( "⊣ Butt" ) );
554​ m_termStyleCombo->addItem( i18n( "⤚ Right Open Arrow" ) );
555​ m_termStyleCombo->addItem( i18n( "-⨞ Right Closed Arrow" ) );
556​ m_termStyleCombo->addItem( i18n( "-⧸ Slash" ) );
557​ m_termStyleCombo->setCurrentIndex( m_lineAnn->lineEndStyle() );
558​
pinoUnsubmitted
Done

I think this does not play well with translations: there is nothing that says what for the leading spaces are, so translators can easily not have them in the translations, resulting in symbol and first word attached together.
There is also the issue that some of the strings are no easy to get, for example "Butt" (yes, without context), or "-/ Slash".

My proposal is the following:

  • create a QIconEngine that draws a specific character/string as icon; this also makes sure all the symbols and texts are properly aligned
  • leave the strings as simple strings with no spaces nor other parts, adding contexts to them
pino: I think this does not play well with translations: there is nothing that says what for the…
559​ connect( m_termStyleCombo, SIGNAL(currentIndexChanged(int)), this, SIGNAL(dataChanged()) );
560​
540 return widget; 561​ return widget;
541} 562​}
542 563​
Context not available.
560 } 581​ }
561 } 582​ }
562 m_lineAnn->style().setWidth( m_spinSize->value() ); 583​ m_lineAnn->style().setWidth( m_spinSize->value() );
584​ m_lineAnn->setLineEndStyle( (Okular::LineAnnotation::TermStyle)m_termStyleCombo->currentIndex());
563} 585​}
564 586​
565 587​
Context not available.