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

List:       kde-commits
Subject:    [kde-workspace/previewsoc13] kcontrol/keyboard/preview: wraping up cleanup and added tests
From:       shivam makkar <amourphious1992 () gmail ! com>
Date:       2013-09-13 18:42:21
Message-ID: E1VKYJx-00065l-5V () scm ! kde ! org
[Download RAW message or body]

Git commit 34f4cd4c31ae3b1b431b12c84e03587266a3ab93 by shivam makkar.
Committed on 13/09/2013 at 18:42.
Pushed by makkar into branch 'previewsoc13'.

wraping up cleanup and added tests

M  +10   -1    kcontrol/keyboard/preview/keyboardpainter.cpp

http://commits.kde.org/kde-workspace/34f4cd4c31ae3b1b431b12c84e03587266a3ab93

diff --cc kcontrol/keyboard/preview/keyboardpainter.cpp
index 87beec8,42eee6c..e5e7e48
--- a/kcontrol/keyboard/preview/keyboardpainter.cpp
+++ b/kcontrol/keyboard/preview/keyboardpainter.cpp
@@@ -67,13 -67,15 +67,22 @@@ void KeyboardPainter::generateKeyboardL
      int level = kbframe->getLevel();
  
      if(level > 4){
++<<<<<<< HEAD
 +        levelBox->addItem( "Level 3, 4" );
 +        levelBox->addItem( "Level 5, 6" );
 +        if(level > 6)
 +            levelBox->addItem( "Level 7,8" );
++=======
+         levelBox->addItem( i18n("Level 3, 4") );
+         levelBox->addItem( i18n("Level 5, 6") );
+         if(level > 6) {
+             levelBox->addItem( i18n("Level 7, 8") );
+         }
++>>>>>>> fc995d16487f587ad00aa548badbab77af0493c7
      }
-     else
+     else {
          levelBox->setVisible(false);
+     }
  }
  
  void KeyboardPainter :: levelChanged(int l_id){
[prev in list] [next in list] [prev in thread] [next in thread]