FCL/sf/os/osrndtools: comparison stif/ConsoleUI/src/Consolemenus.cpp

equal deleted inserted replaced

-:33016869e0dd
+:ccab7f1f8266
 -------------------------------------------------------------------------------
 */
 void CMenu::TimerUpdate()
 {
+iScrolledLine.Zero();
 RRefArray<TDesC> texts;
 User::LeaveIfError( ItemTexts( texts ) );
 TInt count = texts.Count();
 // If list is empty, do not scroll.
 }
 // If menu item have not been changed after last timer, then
 // start scrolling
 const TDesC& name = texts[ iFirst + iPosOnScreen ];
 if ( name.Length() > ( iSize.iWidth - KMenuOverhead ) )
 {
 TInt y = iConsole->WhereY();
 TInt x = iConsole->WhereX();
 TBuf<80> iTmp;
 iStart = iStart + iDirection;
 // "Right end"
-if ( iStart + iSize.iWidth > name.Length() + KMenuOverhead )
+if ( iStart + iSize.iWidth > name.Length() + KMenuOverhead + 2)
 {
 iStart--;
 iDirection = -1;
 }
 iTmp=_L(" *");
 LimitedAppend( iTmp, name.Mid ( iStart ) );
 iConsole->SetPos( 0, iPosOnScreen+1);
-iConsole->Printf ( iTmp.Left( iSize.iWidth -2 )  );
+Print(iTmp);
+iScrolledLine.Copy(texts[iFirst + iPosOnScreen].Left(iScrolledLine.MaxLength()));
 iConsole->SetPos(x,y);
 }
 texts.Close();
 }
 else
 {
 //removing "*" sign from the previous cursor position
 iConsole->SetPos(0, iPrevPosOnScreen + iMenuItemsListStartIndex);
-line.Append( _L("  ") );
+//line.Append( _L("  ") );
-iConsole->Printf(line);
+AppendBefore(iPrevPosOnScreen + iFirst, line);
+LimitedAppend(line, iScrolledLine);
+//iConsole->Printf(line);
+Print(line);
 iConsole->SetPos(0, iPosOnScreen + iMenuItemsListStartIndex);
 line.Zero();
+iScrolledLine.Zero();
 //writing "*" sign before the currently selected line
 line.Append( _L(" *") );
 iConsole->Printf(line);
 iConsole->SetPos(0, iMenuItemsListEndIndex);
 iPreventClearScreen = EFalse;
 }
 }
+/*
+-------------------------------------------------------------------------------
+Class: CMenu
+Method: SelectL
+Description: Common method to count all variables needed for printing
+page of the screen.
+Parameters: TInt aDelta       :in:      where to move current position
+Value > 0 stands for moving down the menu.
+Value < 0 stands for moving up the menu.
+Return Values:
+Errors/Exceptions: None
+Status: Draft
+-------------------------------------------------------------------------------
+*/
+void CMenu::MovePosition(TInt aDelta)
+{
+if(iItemCount > 0 && aDelta != 0)
+{
+// Valid screen size
+TInt screenSize = iScreenSize + 1;
+TInt realPosition = iFirst + iPosOnScreen;
+// Number of all pages and items in the last page
+TInt rest = iItemCount % screenSize;
+TInt pages = (iItemCount / screenSize) + ((rest == 0) ? (0) : (1));
+// Current page
+TInt currPage = realPosition / screenSize;
+// New page
+TInt newRealPosition = realPosition + aDelta;
+while(newRealPosition < 0)
+newRealPosition += iItemCount;
+newRealPosition %= iItemCount;
+TInt newPage = newRealPosition / screenSize;
+// Change position
+iFirst = newPage * screenSize;
+iLast = iFirst + screenSize - 1;
+if(iLast >= iItemCount)
+iLast = iItemCount - 1;
+iPrevPosOnScreen = iPosOnScreen;
+iPosOnScreen = newRealPosition % screenSize;
+if(newPage == pages - 1 && iPosOnScreen >= rest)
+iPosOnScreen = rest - 1;
+// Prevent refreshing
+iPreventClearScreen = (currPage == newPage);
+}
+else
+iPreventClearScreen = ETrue;
+}
 /*
 -------------------------------------------------------------------------------
 Class: CMenu
 // Exit
 case EKeyEscape:
 aContinue = EFalse;
 return this;
 // SelectL item
 case EKeyEnter:
 case EKeyRightArrow:
 return iItems[iPosOnScreen];
 case EKeyLeftArrow:
 return iParent;
 // Go down
 case EKeyDownArrow:
-{
+MovePosition(1);
-if ( iFirst + iPosOnScreen == iItemCount - 1 )
-{
-// If end of the list, go to beginning
-iPosOnScreen = 0;
-iFirst = 0;
-iLast = iScreenSize;
-if ( iLast > iItemCount - 1 )
-	{
-	iLast = iItemCount - 1;
-	}
-}
-else
-{
-if ( iPosOnScreen == iScreenSize )
-{
-iPosOnScreen = 0;
-iFirst += iScreenSize + 1;
-iLast += iScreenSize + 1;
-}
-else
-{
-// Going down "in-screen", no need to update items
-iPrevPosOnScreen = iPosOnScreen;
-iPreventClearScreen = EFalse;
-if (iItemCount > 0)
-{
-iPosOnScreen++;
-iPreventClearScreen = ETrue;
-}
-}
-}
 break;
-}
 // Go Up
 case EKeyUpArrow:
-{
+MovePosition(-1);
-// The second condition is needed for the cursor not to go to "next" page (if it does not exist)
-if ( iFirst + iPosOnScreen == 0 )
-{
-// If in the beginning of the list
-if (iItemCount == iScreenSize + 1 || iItemCount == iScreenSize)
-{
-iPosOnScreen = iItemCount - 1;
-}
-else
-{
-iFirst = (iItemCount / iScreenSize) * iScreenSize;
-iLast = iItemCount - 1;
-iPosOnScreen = iItemCount % iScreenSize - 1;
-if (iItemCount > iScreenSize)
-{
-iFirst++;
-iPosOnScreen--;
-}
-}
-}
-else if ( iPosOnScreen == 0 )
-{
-iPosOnScreen = iScreenSize;
-iLast -= iScreenSize + 1;
-iFirst -= iScreenSize + 1;
-}
-else
-{
-iPrevPosOnScreen = iPosOnScreen;
-iPosOnScreen--;
-iPreventClearScreen = ETrue;
-}
 break;
-}
 // Additional keys
 case EKeyHome:
 case '3':
-iPosOnScreen = 0;
+MovePosition(-iFirst - iPosOnScreen);
-iFirst = 0;
-iLast = iScreenSize;
-if ( iLast > iItemCount - 1 )
-{
-iLast = iItemCount - 1;
-}
 break;
 case EKeyEnd:
 case '9':
-iLast = iItemCount - 1;
+MovePosition(iItemCount - 1 - iFirst - iPosOnScreen);
-iFirst = iLast - iScreenSize;
-if ( iFirst < 0 )
-{
-iFirst = 0;
-}
-iPosOnScreen = iLast - iFirst;
 break;
 case EKeyPageUp:
 case '1':
+MovePosition((iFirst + iPosOnScreen - iScreenSize - 1 >= 0) ? (-iScreenSize - 1) : (-iFirst - iPosOnScreen));
-iFirst = iFirst - iScreenSize;
-iLast = iLast - iScreenSize;
-if ( iFirst < 0 )
-{
-iFirst = 0;
-iPosOnScreen = 0;
-iLast = iScreenSize;
-if ( iLast > iItemCount - 1 )
-{
-iLast = iItemCount - 1;
-}
-}
 break;
 case EKeyPageDown:
 case '7':
-iFirst = iFirst + iScreenSize;
+MovePosition((iFirst + iPosOnScreen + iScreenSize + 1 < iItemCount) ? (iScreenSize + 1) : (iItemCount - 1 - iFirst - iPosOnScreen));
-iLast = iLast + iScreenSize;
-// Going too far
-if ( iLast > iItemCount - 1 )
-{
-iLast = iItemCount - 1;
-iFirst = iLast - iScreenSize;
-if ( iFirst < 0 )
-{
-iFirst = 0;
-}
-}
-iPosOnScreen = iLast - iFirst;
 break;
 default:  // Bypass the keypress
 break;
 }
 -------------------------------------------------------------------------------
 */
 void CMenu::Print( const TDesC& aPrint )
 {
-iConsole->Printf ( aPrint.Left( iSize.iWidth - KMenuOverhead ) );
+iConsole->Write ( aPrint.Left( iSize.iWidth - KMenuOverhead ) );
-iConsole->Printf(_L("\n"));
+iConsole->Write(_L("\n"));
 }
 /*
 -------------------------------------------------------------------------------
 error.iText.Append( *iTestModuleNames[iPosOnScreen] );
 error.iText.Append( _L(" error "));
 error.iText.AppendNum( ret );
 iMain->Error( error );
 }
 return iParent;
 }
 else
 {
 return this;
 }
 switch ( aSelection )
 {
 case EKeyEnter:
 case EKeyRightArrow:
-	{
+{
+if(iPosOnScreen < iFileList.Count())
+{
+const TDesC& aSetName = iFileList.operator [](iPosOnScreen)->Des();
-const TDesC& aSetName = iFileList.operator [](iPosOnScreen)->Des();
+ret = iMain->UIStore().LoadTestSet( iFileList.operator [](iPosOnScreen)->Des() );
+if (ret == KErrNone)
-ret = iMain->UIStore().LoadTestSet( iFileList.operator [](iPosOnScreen)->Des() );
+{
-if (ret == KErrNone)
+((CTestSetMenu*)iParent)->SetCreated();
-	{
+((CTestSetMenu*)iParent)->SetTestSetFileName(iFileList.operator [](iPosOnScreen)->Des());
-	((CTestSetMenu*)iParent)->SetCreated();
+}
-	((CTestSetMenu*)iParent)->SetTestSetFileName(iFileList.operator [](iPosOnScreen)->Des());
+return iParent;
-	}
+}
-return iParent;
+else
+{
+return this;
+}
 }
 default:
 break;
 }

changeset 15	ccab7f1f8266
parent 0	a03f92240627
child 21	f5d4820de50d