[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:47:33
Message-ID: 20100821154733.C7952AC876 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1166345 by pino:

add the possibility to pass details to PageView::displayMessage()

also, use that string when calculating the duration time of the message


 M  +6 -2      pageview.cpp  
 M  +4 -4      pageview.h  
 M  +1 -1      pageviewannotator.cpp  


--- trunk/KDE/kdegraphics/okular/ui/pageview.cpp #1166344:1166345
@@ -573,7 +573,7 @@
     }
 }
 
-void PageView::displayMessage( const QString & message,PageViewMessage::Icon \
icon,int duration ) +void PageView::displayMessage( const QString & message, const \
QString & details, PageViewMessage::Icon icon, int duration )  {
     if ( !Okular::Settings::showOSD() )
     {
@@ -589,9 +589,13 @@
 
     // display message (duration is length dependant)
     if (duration==-1)
+    {
         duration = 500 + 100 * message.length();
-    d->messageWindow->display( message, QString(), icon, duration );
+        if ( !details.isEmpty() )
+            duration += 500 + 100 * details.length();
 }
+    d->messageWindow->display( message, details, icon, duration );
+}
 
 void PageView::reparseConfig()
 {
--- trunk/KDE/kdegraphics/okular/ui/pageview.h #1166344:1166345
@@ -66,7 +66,7 @@
         bool canFitPageWidth() const;
         void fitPageWidth( int page );
         // keep in sync with pageviewutils
-        void displayMessage( const QString & message , PageViewMessage::Icon \
icon=PageViewMessage::Info, int duration=-1 ); +        void displayMessage( const \
QString & message, const QString & details = QString(), PageViewMessage::Icon \
icon=PageViewMessage::Info, int duration=-1 );  
         // inherited from DocumentObserver
         uint observerId() const { return PAGEVIEW_ID; }
@@ -99,17 +99,17 @@
     public slots:
         void errorMessage( const QString & message, int duration = -1 )
         {
-            displayMessage( message, PageViewMessage::Error, duration );
+            displayMessage( message, QString(), PageViewMessage::Error, duration );
         }
 
         void noticeMessage( const QString & message, int duration = -1 )
         {
-            displayMessage( message, PageViewMessage::Info, duration );
+            displayMessage( message, QString(), PageViewMessage::Info, duration );
         }
 
         void warningMessage( const QString & message, int duration = -1 )
         {
-            displayMessage( message, PageViewMessage::Warning, duration );
+            displayMessage( message, QString(), PageViewMessage::Warning, duration \
);  }
 
         void copyTextSelection() const;
--- trunk/KDE/kdegraphics/okular/ui/pageviewannotator.cpp #1166344:1166345
@@ -882,7 +882,7 @@
             {
                 QString tip = toolSubElement.text();
                 if ( !tip.isEmpty() )
-                    m_pageView->displayMessage( i18nc( "Annotation tool", \
tip.toUtf8() ), PageViewMessage::Annotation ); +                    \
m_pageView->displayMessage( i18nc( "Annotation tool", tip.toUtf8() ), QString(), \
PageViewMessage::Annotation );  }
         }
 


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