Mailinglist Archive: yast-commit (190 mails)

< Previous Next >
[yast-commit] r38167 - in /trunk/ncurses/src: NCDialog.cc pkg/NCPackageSelector.cc pkg/NCPkgPopupDeps.cc
  • From: kmachalkova@xxxxxxxxxxxxxxxx
  • Date: Tue, 29 May 2007 10:14:35 -0000
  • Message-id: <20070529101435.46BCD481E6@xxxxxxxxxxxxxxxx>
Author: kmachalkova
Date: Tue May 29 12:14:34 2007
New Revision: 38167

URL: http://svn.opensuse.org/viewcvs/yast?rev=38167&view=rev
Log:
Place all popup dialogs in pkg manager to the centre of 
the screen and calculate their size relatively to the 
screen size (if applicable) (#275610)


Modified:
    trunk/ncurses/src/NCDialog.cc
    trunk/ncurses/src/pkg/NCPackageSelector.cc
    trunk/ncurses/src/pkg/NCPkgPopupDeps.cc

Modified: trunk/ncurses/src/NCDialog.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCDialog.cc?rev=38167&r1=38166&r2=38167&view=diff
==============================================================================
--- trunk/ncurses/src/NCDialog.cc (original)
+++ trunk/ncurses/src/NCDialog.cc Tue May 29 12:14:34 2007
@@ -1195,7 +1195,7 @@
                 helpIntro =  _( "<p>Press <b>F1</b> or <b>ESC</b> to close this dialog.</p>" );
             }
                 
-            helpPopup = new NCPopupInfo( wpos(1,1),
+            helpPopup = new NCPopupInfo( wpos( NCurses::lines()/3, NCurses::cols()/3 ),
                                           // headline of the text mode help
                                          _( "Text Mode Navigation" ),
                                          YCPString( helpIntro +
@@ -1203,6 +1203,8 @@
                                                     helpText
                                                     ),
                                          "" );
+           helpPopup->setNiceSize( NCurses::cols()/3, NCurses::lines()/3 );
+            
         }
         if ( helpPopup )
         {

Modified: trunk/ncurses/src/pkg/NCPackageSelector.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPackageSelector.cc?rev=38167&r1=38166&r2=38167&view=diff
==============================================================================
--- trunk/ncurses/src/pkg/NCPackageSelector.cc (original)
+++ trunk/ncurses/src/pkg/NCPackageSelector.cc Tue May 29 12:14:34 2007
@@ -228,10 +228,10 @@
     searchPopup = new NCPkgPopupSearch( wpos( 1, 1 ), this );
        
     // the dependency popup
-    depsPopup = new NCPkgPopupDeps( wpos( 1, 1 ), this );
+    depsPopup = new NCPkgPopupDeps( wpos( 3, 8 ), this );
 
     // the disk space popup
-    diskspacePopup = new NCPkgPopupDiskspace( wpos( 1, 1 ), testMode );
+    diskspacePopup = new NCPkgPopupDiskspace( wpos( (NCurses::lines() - 15)/2, NCurses::cols()/6  ), testMode );
 
 }
 
@@ -1551,10 +1551,10 @@
        return false;
     }
 
-    NCPopupInfo info( wpos(10, 10),  YCPString( "" ),
+    NCPopupInfo info( wpos( (NCurses::lines()-5)/2, (NCurses::cols()-35)/2 ),  YCPString( "" ),
                      YCPString(_( "All package dependencies are OK." )),
                      NCPkgNames::OKLabel() );
-    info.setNiceSize( 30, 5 );
+    info.setNiceSize( 35, 5 );
     
     if ( event.selection->compare( NCPkgNames::ShowDeps() ) == YO_EQUAL )
     {
@@ -1955,7 +1955,7 @@
 
     if ( success )
     {
-       NCPopupInfo info( wpos( 1, 1 ),
+       NCPopupInfo info( wpos( (NCurses::lines()-8)/2, (NCurses::cols()-40)/2 ),
                          YCPString( "" ),
                          YCPString( _("Dependency resolver test case written to ") + "<br>" + testCaseDir ) );
        info.setNiceSize( 40, 8 );
@@ -2014,11 +2014,12 @@
                (void) unlink( filename->asString()->value_cstr() );
 
                //present error popup to the user
-               NCPopupInfo errorMsg ( wpos( 2, 2 ),
+               NCPopupInfo errorMsg ( wpos( (NCurses::lines()-5)/2, (NCurses::cols()-40)/2 ),
                                YCPString( NCPkgNames::ErrorLabel()),
                                YCPString( _("Error exporting list of packages and patterns to ") + filename->toString() ),
                                NCPkgNames::OKLabel(),
                                "");
+               errorMsg.setNiceSize(40,5);
                NCursesEvent input = errorMsg.showInfoPopup();
 
            }
@@ -2096,11 +2097,12 @@
            {
                NCWAR << "Error importing list of packages and patterns from" << filename->toString() << endl;
 
-               NCPopupInfo errorMsg ( wpos( 2, 2 ),
+               NCPopupInfo errorMsg ( wpos( (NCurses::lines()-5)/2, (NCurses::cols()-40)/2) ,
                                YCPString( NCPkgNames::ErrorLabel()),
                                YCPString( _("Error importing list of packages and patterns from ") + filename->toString() ),
                                NCPkgNames::OKLabel(),
                                "");
+               errorMsg.setNiceSize(40,5);
                NCursesEvent input = errorMsg.showInfoPopup();
 
            }
@@ -2157,7 +2159,7 @@
     }
     
     // open the popup with the help text
-    NCPopupInfo pkgHelp( wpos( 1, 1 ), headline, YCPString( text ) );
+    NCPopupInfo pkgHelp( wpos( (NCurses::lines()*8)/100, (NCurses::cols()*18)/100 ), headline, YCPString( text ) );
     pkgHelp.setNiceSize( (NCurses::cols()*65)/100, (NCurses::lines()*85)/100 );
     pkgHelp.showInfoPopup( );
 
@@ -2185,7 +2187,8 @@
     text += NCPkgNames::YouHelp3();
 
     // open the popup with the help text
-    NCPopupInfo youHelp( wpos( 1, 1 ), YCPString(NCPkgNames::YouHelp()), YCPString(text) );
+    NCPopupInfo youHelp( wpos( NCurses::lines()/3, NCurses::cols()/6 ), YCPString(NCPkgNames::YouHelp()), YCPString(text) );
+    youHelp.setNiceSize( (NCurses::cols()*2)/3, NCurses::lines()/3 );
     youHelp.showInfoPopup( );
 
     if ( packageList )
@@ -2208,7 +2211,7 @@
 
     if (changes) {
        // show a popup and ask the user
-       NCPopupInfo cancelMsg( wpos( 2, 2 ),
+       NCPopupInfo cancelMsg( wpos( (NCurses::lines()-8)/2, (NCurses::cols()-45)/2 ),
                           YCPString( NCPkgNames::NotifyLabel() ),
                           YCPString( NCPkgNames::CancelText() ),
                           NCPkgNames::YesLabel(),
@@ -2259,7 +2262,7 @@
     if ( !youMode )    // don't show automatic changes if YOU mode
     {
        // show the automatic changes list
-       NCPkgPopupTable autoChangePopup( wpos( 1, 1), this );
+       NCPkgPopupTable autoChangePopup( wpos( 3, 8), this );
        NCursesEvent input = autoChangePopup.showInfoPopup();
 
        if ( input == NCursesEvent::cancel )
@@ -2276,7 +2279,7 @@
        if ( message != "" )
        {
            // open the popup e.g. with the text "/usr needs 50 MB more disk space"
-           NCPopupInfo spaceMsg( wpos( 2, 2 ),
+           NCPopupInfo spaceMsg( wpos( (NCurses::lines()-10)/2, (NCurses::cols()-50)/2 ),
                                  YCPString( NCPkgNames::ErrorLabel() ),
                                  YCPString( NCPkgNames::DiskSpaceError() + "<br>" + message ),
                                  NCPkgNames::OKLabel(),
@@ -2383,11 +2386,12 @@
     bool ok = true;
     string pkgName = slbPtr->name();
 
-    NCPopupInfo info( wpos( 1, 1),
+    NCPopupInfo info( wpos( NCurses::lines()/10, (NCurses::cols()/10),
                      NCPkgNames::NotifyLabel(),
                      YCPString( "<i>" + pkgName + "</i><br><br>" + createDescrText( licenseText ) ),
                      NCPkgNames::AcceptLabel(),
                      NCPkgNames::CancelLabel() );
+    info.setNiceSize( (NCurses::cols() * 80)/100, (NCurses::lines()*80)/100);
     license_confirmed = info.showInfoPopup( ) != NCursesEvent::cancel;
 
 
@@ -2527,7 +2531,7 @@
     bool ok = false;
     bool cancel = false;
     
-    NCPopupInfo info( wpos(10, 10),  YCPString( "" ),
+    NCPopupInfo info( wpos( (NCurses::lines()-5)/2, (NCurses::cols()-30)/2 ),  YCPString( "" ),
                      YCPString(_( "System dependencies verify OK." )),
                      NCPkgNames::OKLabel() );
     info.setNiceSize( 30, 5 );
@@ -2540,7 +2544,7 @@
        //call the solver (with S_Verify it displays no popup)
        cancel = depsPopup->showDependencies( NCPkgPopupDeps::S_Verify, &ok );
         //display the popup with automatic changes
-       NCPkgPopupTable autoChangePopup( wpos( 1, 1), this );
+       NCPkgPopupTable autoChangePopup( wpos( 3, 8 ), this );
         NCursesEvent input = autoChangePopup.showInfoPopup();
 
         if ( input == NCursesEvent::cancel )

Modified: trunk/ncurses/src/pkg/NCPkgPopupDeps.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPkgPopupDeps.cc?rev=38167&r1=38166&r2=38167&view=diff
==============================================================================
--- trunk/ncurses/src/pkg/NCPkgPopupDeps.cc (original)
+++ trunk/ncurses/src/pkg/NCPkgPopupDeps.cc Tue May 29 12:14:34 2007
@@ -230,7 +230,7 @@
 
     NCDBG << "Solving..." << endl ;
 
-    NCPopupInfo info( wpos(10, 10),  YCPString( "" ),
+    NCPopupInfo info( wpos( (NCurses::lines()-4)/2, (NCurses::cols()-18)/2),  YCPString( "" ),
                      YCPString(NCPkgNames::Solving()),
                      NCPkgNames::OKLabel() );
     info.setNiceSize( 18, 4 );

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages