From 96278686598100bfe2dec10dfb7dbf87ee0e7678 Mon Sep 17 00:00:00 2001
From: toma <toma@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Fri, 3 Aug 2007 21:11:16 +0000
Subject: [PATCH] Fix ebn issues.

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/extragear/utils/rsibreak@696109 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 src/rsiglobals.cpp     |  4 ++--
 src/rsiwidget.cpp      | 12 +++++-------
 src/setupmaximized.cpp | 15 +++++++++------
 src/slideshow.cpp      |  1 -
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/rsiglobals.cpp b/src/rsiglobals.cpp
index 975fd2b..e4e41af 100644
--- a/src/rsiglobals.cpp
+++ b/src/rsiglobals.cpp
@@ -79,7 +79,7 @@ QString RSIGlobals::formatSeconds( const int seconds )
     if ( hours > 0 && mins >0 )
         return(i18nc("Arguments: hours, minutes "
                     "both as you defined earlier",
-                    "%1 and %2").arg(hString, mString2) );
+                    "%1 and %2", hString, mString2) );
     else if ( hours > 0 && mins == 0 )
         return( hString );
 
@@ -88,7 +88,7 @@ QString RSIGlobals::formatSeconds( const int seconds )
         if (mins > 0 && secs > 0)
             return(i18nc("Arguments: minutes, seconds "
                         "both as you defined earlier",
-                        "%1 and %2").arg(mString1, sString2) );
+                        "%1 and %2", mString1, sString2) );
 
         else if ( mins == 0 && secs > 0 )
             return( sString1 );
diff --git a/src/rsiwidget.cpp b/src/rsiwidget.cpp
index 19914ac..b7e5718 100644
--- a/src/rsiwidget.cpp
+++ b/src/rsiwidget.cpp
@@ -45,7 +45,6 @@
 #include <QHideEvent>
 #include <QMouseEvent>
 #include <QCloseEvent>
-#include <QPixmap>
 #include <config.h>
 
 #include <kwindowsystem.h>
@@ -127,7 +126,7 @@ void RSIWidget::slotWelcome()
     if (KMessageBox::shouldBeShownContinue("dont_show_welcome_again_for_001"))
     {
       QString tempfile = takeScreenshotOfTrayIcon();
-      KMessageBox::information(0, i18n("<p>Welcome to RSIBreak<p><p>"
+      KMessageBox::information(0, i18n("<p>Welcome to RSIBreak</p><p>"
         "In your tray you can now see RSIBreak: ")
         + "<p><center><img source=\"" + tempfile + "\"></center></p><p>"
         + i18n("When you right-click on that you will see a menu, from which "
@@ -252,9 +251,9 @@ void RSIWidget::setCounters( int timeleft )
 
         if (minutes > 0 && seconds > 0)
         {
-            cdString = i18nc("minutes:seconds","%1:%2")
-                    .arg( QString::number( minutes ))
-                    .arg( QString::number( seconds).rightJustified(2,'0'));
+            cdString = i18nc("minutes:seconds","%1:%2",
+                  QString::number( minutes ), 
+                  QString::number( seconds).rightJustified(2,'0'));
         }
         else if ( minutes == 0 && seconds > 0 )
         {
@@ -262,8 +261,7 @@ void RSIWidget::setCounters( int timeleft )
         }
         else if ( minutes >0 && seconds == 0 )
         {
-            cdString = i18nc("minutes:seconds","%1:00")
-                    .arg( minutes );
+            cdString = i18nc("minutes:seconds","%1:00", minutes );
         }
 
         m_grayWidget->setLabel( cdString );
diff --git a/src/setupmaximized.cpp b/src/setupmaximized.cpp
index dad8685..bc8c15e 100644
--- a/src/setupmaximized.cpp
+++ b/src/setupmaximized.cpp
@@ -22,7 +22,6 @@
 
 // QT includes.
 #include <QPushButton>
-#include <QLineEdit>
 #include <QCheckBox>
 #include <QLabel>
 #include <QVBoxLayout>
@@ -34,6 +33,7 @@
 #include <KFontDialog>
 #include <KApplication>
 #include <KFileDialog>
+#include <KLineEdit>
 #include <KVBox>
 #include <kkeysequencewidget.h>
 
@@ -45,7 +45,7 @@ public:
     QGroupBox*        slideshowBox;
     QPushButton*      counterFontBut;
     QPushButton*      folderBut;
-    QLineEdit*        imageFolderEdit;
+    KLineEdit*        imageFolderEdit;
     QFont             counterFont;
     KColorButton*     counterColor;
     QCheckBox*        searchRecursiveCheck;
@@ -73,7 +73,8 @@ SetupMaximized::SetupMaximized(QWidget* parent )
 
    //-------------------- Counterbox
    QGroupBox *counterBox = new QGroupBox(boxes);
-   counterBox->setTitle(i18n("Counter"));
+   counterBox->setTitle(i18nc("This is the title of a box with settings ",
+        "for the counter used during breaks","Counter"));
 
    d->hideCounter = new QCheckBox(i18n("H&ide"), this);
    connect(d->hideCounter, SIGNAL(toggled(bool)), SLOT(slotHideCounter()));
@@ -83,7 +84,9 @@ SetupMaximized::SetupMaximized(QWidget* parent )
        "of the image, when images are shown.") );
 
    d->colorBox = new KHBox(this);
-   QLabel *counterColorlabel = new QLabel( i18n("&Color:")+' ', d->colorBox );
+   QLabel *counterColorlabel = new QLabel( i18nc("This is a label, behind "
+       "it is a a block filled with the choosed color", "&Color:")+' ', 
+       d->colorBox );
    counterColorlabel->setAlignment( Qt::AlignRight | Qt::AlignVCenter );
    d->counterColor = new KColorButton(d->colorBox);
    counterColorlabel->setBuddy(d->counterColor);
@@ -134,7 +137,7 @@ SetupMaximized::SetupMaximized(QWidget* parent )
    connect(d->slideshowBox, SIGNAL( toggled(bool)), SLOT(slotUseImages()));
 
    KHBox *imageFolderBox = new KHBox(this);
-   d->imageFolderEdit = new QLineEdit(imageFolderBox);
+   d->imageFolderEdit = new KLineEdit(imageFolderBox);
    d->imageFolderEdit->setWhatsThis( i18n("Select the folder from which you "
        "want to see images. These images are randomly shown during the breaks. "
        "It will be searched recursively if you want...") );
@@ -234,7 +237,7 @@ void SetupMaximized::slotFolderEdited(const QString& newPath)
         return;
     }
 
-    if (!newPath.startsWith("/")) {
+    if (!newPath.startsWith('/')) {
         d->imageFolderEdit->setText(QDir::homePath()+'/'+newPath);
     }
 
diff --git a/src/slideshow.cpp b/src/slideshow.cpp
index 069b6b9..35751be 100644
--- a/src/slideshow.cpp
+++ b/src/slideshow.cpp
@@ -40,7 +40,6 @@
 #include <QHideEvent>
 #include <QMouseEvent>
 #include <QCloseEvent>
-#include <QPixmap>
 #include <config.h>
 
 #include <kwindowsystem.h>
-- 
2.11.4.GIT