[Bug 123772] Impossible to change some RDP default values (number of colors, keyboard layout)

[Andreas Kling]

------- You are receiving this mail because: -------
You are on the CC list for the bug, or are watching someone who is.
         
http://bugs.kde.org/show_bug.cgi?id=123772         




------- Additional Comments From kling impul se  2006-07-27 22:24 -------
SVN commit 567027 by kling:

Forward-port SVN commit 563911 by kling: 
 
Remember new default settings for RDP color depth and keyboard layout. 
   
CCBUG: 123772


 M  +4 -1      preferencesdialog.cpp  
 M  +1 -1      rdp/rdphostpref.h  
 M  +1 -0      rdp/rdpprefs.ui.h  


--- trunk/KDE/kdenetwork/krdc/preferencesdialog.cpp #567026:567027
 @ -82,6 +82,8  @
   m_rdpPrefs->setRdpHeight( m_rdpDefaults->height() );
   m_rdpPrefs->setShowPrefs( m_rdpDefaults->askOnConnect() );
   m_rdpPrefs->setUseKWallet( m_rdpDefaults->useKWallet() );
+  m_rdpPrefs->setColorDepth( m_rdpDefaults->colorDepth() );
+  m_rdpPrefs->setKbLayout( keymap2int( m_rdpDefaults->layout() ));
   m_rdpPrefs->setResolution();
 }
 
 @ -95,9 +97,10  @
 
   m_rdpDefaults->setWidth( m_rdpPrefs->rdpWidth() );
   m_rdpDefaults->setHeight( m_rdpPrefs->rdpHeight() );
-  m_rdpDefaults->setLayout( rdpKeymaps[ m_rdpPrefs->kbLayout() ] );
+  m_rdpDefaults->setLayout( int2keymap( m_rdpPrefs->kbLayout() ));
   m_rdpDefaults->setAskOnConnect( m_rdpPrefs->showPrefs() );
   m_rdpDefaults->setUseKWallet( m_rdpPrefs->useKWallet() );
+  m_rdpDefaults->setColorDepth( m_rdpPrefs->colorDepth() );
 
   HostPreferences *hp = HostPreferences::instance();
   hp->sync();
--- trunk/KDE/kdenetwork/krdc/rdp/rdphostpref.h #567026:567027
 @ -58,7 +58,7  @
 static const int rdpNumKeymaps = 34;
 static const int rdpDefaultKeymap = 8; // en-us
 
-inline int keymap2int(QString &keymap)
+inline int keymap2int(const QString &keymap)
 {
 	int layout;
 	for(layout = 0; layout < rdpNumKeymaps; layout++)
--- trunk/KDE/kdenetwork/krdc/rdp/rdpprefs.ui.h #567026:567027
 @ -138,6 +138,7  @
   {
     cmbResolution->setCurrentItem(5);
   }
+  resolutionChanged( cmbResolution->currentItem() );
 }