KDE/kdegraphics/okular

SVN commit 795880 by pino:

Add the possibility to select the current screen as start of
the presentation mode, and make that the default (as one
would expect).
GUI:

(futhermore, use an explicit value as screen index)


 M  +5 -4      conf/dlgpresentation.cpp  
 M  +2 -2      conf/okular.kcfg  
 M  +14 -10    ui/presentationwidget.cpp  


--- trunk/KDE/kdegraphics/okular/conf/dlgpresentation.cpp
#795879:795880
 -25,6
+25,7 
     m_dlg->setupUi( this );
 
     QStringList choices;
+    choices.append( i18nc( "label:listbox The current
screen, for the presentation mode", "Current
Screen" ) );
     choices.append( i18nc( "label:listbox The default
screen for the presentation mode", "Default
Screen" ) );
     const int screenCount =
QApplication::desktop()->numScreens();
     for ( int i = 0; i < screenCount; ++i )
 -34,14
+35,14 
     m_dlg->screenCombo->addItems( choices );
 
     const int screen = Okular::Settings::slidesScreen();
-    if ( screen >= -1 && screen < screenCount
)
+    if ( screen >= -2 && screen < screenCount
)
     {
-        m_dlg->screenCombo->setCurrentIndex( screen +
1 );
+        m_dlg->screenCombo->setCurrentIndex( screen +
2 );
     }
     else
     {
         m_dlg->screenCombo->setCurrentIndex( 0 );
-        Okular::Settings::setSlidesScreen( -1 );
+        Okular::Settings::setSlidesScreen( -2 );
     }
 
     connect( m_dlg->screenCombo, SIGNAL( activated( int
) ), this, SLOT( screenComboChanged( int ) ) );
 -54,7
+55,7 
 
 void DlgPresentation::screenComboChanged( int which )
 {
-    Okular::Settings::setSlidesScreen( which - 1 );
+    Okular::Settings::setSlidesScreen( which - 2 );
 }
 
 #include "dlgpresentation.moc"
--- trunk/KDE/kdegraphics/okular/conf/okular.kcfg
#795879:795880
 -141,8
+141,8 
    <default>true</default>
   </entry>
   <entry key="SlidesScreen"
type="Int" >
-   <default>-1</default>
-   <min>-1</min>
+   <default>-2</default>
+   <min>-2</min>
    <max>20</max>
   </entry>
  </group>
--- trunk/KDE/kdegraphics/okular/ui/presentationwidget.cpp
#795879:795880
 -953,15
+953,23 
 {
     QDesktopWidget *desktop = QApplication::desktop();
     const int preferenceScreen =
Okular::Settings::slidesScreen();
-    int screen = -1;
-    if ( preferenceScreen >= -1 &&
preferenceScreen < desktop->numScreens() )
+    int screen = 0;
+    if ( preferenceScreen == -2 )
     {
+        screen = desktop->screenNumber( parentWidget()
);
+    }
+    else if ( preferenceScreen == -1 )
+    {
+        screen = desktop->primaryScreen();
+    }
+    else if ( preferenceScreen >= 0 &&
preferenceScreen < desktop->numScreens() )
+    {
         screen = preferenceScreen;
     }
     else
     {
-        screen = -1;
-        Okular::Settings::setSlidesScreen( -1 );
+        screen = desktop->screenNumber( parentWidget()
);
+        Okular::Settings::setSlidesScreen( -2 );
     }
     const QRect screenGeom = desktop->screenGeometry(
screen );
     // kDebug() << screen << "=>"
<< screenGeom;
 -1108,10
+1116,7 
 
     if ( m_screenSelect )
     {
-        int screen = m_screen;
-        if ( screen == -1 )
-            screen =
QApplication::desktop()->primaryScreen();
-        m_screenSelect->setCurrentItem( screen );
+        m_screenSelect->setCurrentItem( m_screen );
         connect(
m_screenSelect->selectableActionGroup(), SIGNAL(
triggered( QAction * ) ),
                  this, SLOT( chooseScreen( QAction * ) )
);
     }
 -1173,8
+1178,7 
 {
     // we can ignore if a screen was resized in the case
the screen is not
     // where we are on
-    if ( screen != m_screen 
-         || ( m_screen == -1 && screen ==
QApplication::desktop()->primaryScreen() ) )
+    if ( screen != m_screen )
         return;
 
     recalcGeometry();
_______________________________________________
kde-docbook mailing list
kde-docbookkde.org
htt
ps://mail.kde.org/mailman/listinfo/kde-docbook