[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdegraphics/okular/ui
From:       Pino Toscano <pino () kde ! org>
Date:       2010-08-21 15:46:48
Message-ID: 20100821154648.22825AC876 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1166344 by pino:

port the users of PageViewMessage::display() to call the version with "details", and \
remove the old version


 M  +7 -6      pageview.cpp  
 M  +1 -3      pageviewutils.h  


--- trunk/KDE/kdegraphics/okular/ui/pageview.cpp #1166343:1166344
@@ -590,7 +590,7 @@
     // display message (duration is length dependant)
     if (duration==-1)
         duration = 500 + 100 * message.length();
-    d->messageWindow->display( message, icon, duration );
+    d->messageWindow->display( message, QString(), icon, duration );
 }
 
 void PageView::reparseConfig()
@@ -782,6 +782,7 @@
             i18np(" Loaded a one-page document.",
                  " Loaded a %1-page document.",
                  pageSet.count() ),
+            QString(),
             PageViewMessage::Info, 4000 );
 
     if ( d->aPageSizes )
@@ -2055,7 +2056,7 @@
                     QString fileName = KFileDialog::getSaveFileName( KUrl(), \
                "image/png image/jpeg", this, QString(),
                                                                      \
KFileDialog::ConfirmOverwrite );  if ( fileName.isEmpty() )
-                        d->messageWindow->display( i18n( "File not saved." ), \
PageViewMessage::Warning ); +                        d->messageWindow->display( i18n( \
"File not saved." ), QString(), PageViewMessage::Warning );  else
                     {
                         KMimeType::Ptr mime = KMimeType::findByUrl( fileName );
@@ -3299,7 +3300,7 @@
 void PageView::slotShowWelcome()
 {
     // show initial welcome text
-    d->messageWindow->display( i18n( "Welcome" ), PageViewMessage::Info, 2000 );
+    d->messageWindow->display( i18n( "Welcome" ), QString(), PageViewMessage::Info, \
2000 );  }
 
 void PageView::slotShowSizeAllCursor()
@@ -3377,7 +3378,7 @@
 {
     d->mouseMode = MouseZoom;
     // change the text in messageWindow (and show it if hidden)
-    d->messageWindow->display( i18n( "Select zooming area. Right-click to zoom out." \
), PageViewMessage::Info, -1 ); +    d->messageWindow->display( i18n( "Select zooming \
area. Right-click to zoom out." ), QString(), PageViewMessage::Info, -1 );  // force \
hiding of annotator toolbar  if ( d->annotator )
         d->annotator->setEnabled( false );
@@ -3389,7 +3390,7 @@
 {
     d->mouseMode = MouseSelect;
     // change the text in messageWindow (and show it if hidden)
-    d->messageWindow->display( i18n( "Draw a rectangle around the text/graphics to \
copy." ), PageViewMessage::Info, -1 ); +    d->messageWindow->display( i18n( "Draw a \
rectangle around the text/graphics to copy." ), QString(), PageViewMessage::Info, -1 \
);  // force hiding of annotator toolbar
     if ( d->annotator )
         d->annotator->setEnabled( false );
@@ -3401,7 +3402,7 @@
 {
     d->mouseMode = MouseTextSelect;
     // change the text in messageWindow (and show it if hidden)
-    d->messageWindow->display( i18n( "Select text" ), PageViewMessage::Info, -1 );
+    d->messageWindow->display( i18n( "Select text" ), QString(), \
PageViewMessage::Info, -1 );  // force hiding of annotator toolbar
     if ( d->annotator )
         d->annotator->setEnabled( false );
--- trunk/KDE/kdegraphics/okular/ui/pageviewutils.h #1166343:1166344
@@ -104,9 +104,7 @@
         PageViewMessage( QWidget * parent );
 
         enum Icon { None, Info, Warning, Error, Find, Annotation };
-        inline void display( const QString & message, Icon icon = Info, int \
                durationMs = 4000 )
-        { display( message, QString(), icon, durationMs ); }
-        void display( const QString & message, const QString & details /*= \
QString()*/, Icon icon = Info, int durationMs = 4000 ); +        void display( const \
QString & message, const QString & details = QString(), Icon icon = Info, int \
durationMs = 4000 );  
     protected:
         void paintEvent( QPaintEvent * e );


[prev in list] [next in list] [prev in thread] [next in thread]