← Back to branch summary

~ubuntu-branches/ubuntu/trusty/kdepimlibs/trusty

« back to all changes in this revision

Viewing changes to kpimidentities/signatureconfigurator.cpp

  • Committer: Package Import Robot
  • Author(s): Rohan Garg, Rohan Garg, Philip Muškovac
  • Date: 2013-11-23 17:36:44 UTC
  • mfrom: (1.1.102)
  • Revision ID: package-import@ubuntu.com-20131123173644-p5ow94192ezsny8g
Tags: 4:4.11.80-0ubuntu1
[ Rohan Garg ]
* New upstream beta release
  - Bump akonadi requirement to 1.10.45
  - Update install files
  - Update symbols

[ Philip Muškovac ]
* kdepimlibs-dev/-dbg breaks/replaces kdepim-runtime/-dbg (<< 4:4.11.80)

Show diffs side-by-side

added added

removed removed

Lines of Context:
kpimidentities/signatureconfigurator.cpp
87
87
  QVBoxLayout * page_vlay;
88
88
 
89
89
  vlay = new QVBoxLayout( q );
90
 
  vlay->setObjectName( "main layout" );
 
90
  vlay->setObjectName( QLatin1String("main layout") );
91
91
  vlay->setMargin( 0 );
92
92
 
93
93
  // "enable signatue" checkbox:
172
172
  KActionCollection *actionCollection = new KActionCollection( q );
173
173
  q->mTextEdit->createActions( actionCollection );
174
174
#ifndef QT_NO_TOOLBAR
175
 
  q->mEditToolBar->addAction( actionCollection->action( "format_text_bold" ) );
176
 
  q->mEditToolBar->addAction( actionCollection->action( "format_text_italic" ) );
177
 
  q->mEditToolBar->addAction( actionCollection->action( "format_text_underline" ) );
178
 
  q->mEditToolBar->addAction( actionCollection->action( "format_text_strikeout" ) );
179
 
  q->mEditToolBar->addAction( actionCollection->action( "format_text_foreground_color" ) );
180
 
  q->mEditToolBar->addAction( actionCollection->action( "format_text_background_color" ) );
181
 
  q->mEditToolBar->addAction( actionCollection->action( "format_font_family" ) );
182
 
  q->mEditToolBar->addAction( actionCollection->action( "format_font_size" ) );
183
 
  q->mEditToolBar->addAction( actionCollection->action( "format_reset" ) );
184
 
 
185
 
  q->mFormatToolBar->addAction( actionCollection->action( "format_list_style" ) );
186
 
  q->mFormatToolBar->addAction( actionCollection->action( "format_list_indent_more" ) );
187
 
  q->mFormatToolBar->addAction( actionCollection->action( "format_list_indent_less" ) );
188
 
  q->mFormatToolBar->addAction( actionCollection->action( "format_list_indent_less" ) );
189
 
  q->mFormatToolBar->addSeparator();
190
 
 
191
 
  q->mFormatToolBar->addAction( actionCollection->action( "format_align_left" ) );
192
 
  q->mFormatToolBar->addAction( actionCollection->action( "format_align_center" ) );
193
 
  q->mFormatToolBar->addAction( actionCollection->action( "format_align_right" ) );
194
 
  q->mFormatToolBar->addAction( actionCollection->action( "format_align_justify" ) );
195
 
  q->mFormatToolBar->addSeparator();
196
 
 
197
 
  q->mFormatToolBar->addAction( actionCollection->action( "insert_horizontal_rule" ) );
198
 
  q->mFormatToolBar->addAction( actionCollection->action( "manage_link" ) );
199
 
  q->mFormatToolBar->addAction( actionCollection->action( "format_painter" ) );
200
 
 
201
 
  q->mFormatToolBar->addSeparator();
202
 
  q->mFormatToolBar->addAction( actionCollection->action( "add_image" ) );
203
 
  q->mFormatToolBar->addSeparator();
204
 
  q->mFormatToolBar->addAction( actionCollection->action( "insert_html" ) );
205
 
  q->mFormatToolBar->addAction( actionCollection->action( "insert_table" ) );
 
175
  q->mEditToolBar->addAction( actionCollection->action( QLatin1String("format_text_bold") ) );
 
176
  q->mEditToolBar->addAction( actionCollection->action( QLatin1String("format_text_italic") ) );
 
177
  q->mEditToolBar->addAction( actionCollection->action( QLatin1String("format_text_underline") ) );
 
178
  q->mEditToolBar->addAction( actionCollection->action( QLatin1String("format_text_strikeout") ) );
 
179
  q->mEditToolBar->addAction( actionCollection->action( QLatin1String("format_text_foreground_color") ) );
 
180
  q->mEditToolBar->addAction( actionCollection->action( QLatin1String("format_text_background_color") ) );
 
181
  q->mEditToolBar->addAction( actionCollection->action( QLatin1String("format_font_family") ) );
 
182
  q->mEditToolBar->addAction( actionCollection->action( QLatin1String("format_font_size") ) );
 
183
  q->mEditToolBar->addAction( actionCollection->action( QLatin1String("format_reset") ) );
 
184
 
 
185
  q->mFormatToolBar->addAction( actionCollection->action( QLatin1String("format_list_style") ) );
 
186
  q->mFormatToolBar->addAction( actionCollection->action( QLatin1String("format_list_indent_more") ) );
 
187
  q->mFormatToolBar->addAction( actionCollection->action( QLatin1String("format_list_indent_less") ) );
 
188
  q->mFormatToolBar->addAction( actionCollection->action( QLatin1String("format_list_indent_less") ) );
 
189
  q->mFormatToolBar->addSeparator();
 
190
 
 
191
  q->mFormatToolBar->addAction( actionCollection->action( QLatin1String("format_align_left") ) );
 
192
  q->mFormatToolBar->addAction( actionCollection->action( QLatin1String("format_align_center") ) );
 
193
  q->mFormatToolBar->addAction( actionCollection->action( QLatin1String("format_align_right") ) );
 
194
  q->mFormatToolBar->addAction( actionCollection->action( QLatin1String("format_align_justify") ) );
 
195
  q->mFormatToolBar->addSeparator();
 
196
 
 
197
  q->mFormatToolBar->addAction( actionCollection->action( QLatin1String("insert_horizontal_rule") ) );
 
198
  q->mFormatToolBar->addAction( actionCollection->action( QLatin1String("manage_link") ) );
 
199
  q->mFormatToolBar->addAction( actionCollection->action( QLatin1String("format_painter") ) );
 
200
 
 
201
  q->mFormatToolBar->addSeparator();
 
202
  q->mFormatToolBar->addAction( actionCollection->action( QLatin1String("add_image") ) );
 
203
  q->mFormatToolBar->addSeparator();
 
204
  q->mFormatToolBar->addAction( actionCollection->action( QLatin1String("insert_html") ) );
 
205
  q->mFormatToolBar->addAction( actionCollection->action( QLatin1String("insert_table" )) );
206
206
#endif
207
207
 
208
208
  hlay = new QHBoxLayout(); // inherits spacing
431
431
    QString html = textDocument.toHtml();
432
432
 
433
433
    // Now remove each line from the text, the result is clean html.
434
 
    foreach ( const QString& line, html.split( '\n' ) ) {
435
 
      text.remove( line + '\n' );
 
434
    foreach ( const QString& line, html.split( QLatin1Char('\n') ) ) {
 
435
      text.remove( line + QLatin1Char('\n') );
436
436
    }
437
437
    return text;
438
438
  }
471
471
 
472
472
  void SignatureConfigurator::setImageLocation( const Identity &identity )
473
473
  {
474
 
    const QString dir = QString( "emailidentities/%1/" ).arg(
 
474
    const QString dir = QString::fromLatin1( "emailidentities/%1/" ).arg(
475
475
        QString::number( identity.uoid() ) );
476
476
    setImageLocation( KStandardDirs::locateLocal( "data", dir ) );
477
477
  }