[Lprof-devel] lprof/src/parmsqt profileparms.cpp, 1.59, 1.60 profileparmsmon.cpp, 1.4, 1.5

[Hal E. <hv...@us...>]

Update of /cvsroot/lprof/lprof/src/parmsqt
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5815/src/parmsqt

Modified Files:
	profileparms.cpp profileparmsmon.cpp 
Log Message:
Add -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII to the default build settings to prevent ambiguous handling of character strings.  Fixed all code to compile with these settings.

Add Qt::WStyle_Title to all constructors for windows and dialogs that are not full screen dialogs to make sure all window managers display a title.

Index: profileparmsmon.cpp
===================================================================
RCS file: /cvsroot/lprof/lprof/src/parmsqt/profileparmsmon.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** profileparmsmon.cpp	19 Feb 2008 21:02:51 -0000	1.4
--- profileparmsmon.cpp	6 Mar 2008 21:18:59 -0000	1.5
***************
*** 45,49 ****
      // qDebug("get_home_dir");
      const char* qtdir= "QTDIR";
!     return (QString) getenv(qtdir);
  }
  
--- 45,49 ----
      // qDebug("get_home_dir");
      const char* qtdir= "QTDIR";
!     return QString::fromLocal8Bit(getenv(qtdir));
  }
  
***************
*** 114,130 ****
  
      source_or_dest_VC_groupBox -> setTitle (tr("Assumed display viewing conditions"));
!     deviceVCcomboBox -> insertItem (tr(VCqStringValues[sRGB]), 0);
!     deviceVCcomboBox -> insertItem (tr(VCqStringValues[sRGBannexD]), 1);
!     deviceVCcomboBox -> insertItem (tr(VCqStringValues[iso9241]), 2);
!     deviceVCcomboBox -> insertItem (tr(VCqStringValues[projDark]), 3);
!     deviceVCcomboBox -> insertItem (tr(VCqStringValues[projDim]), 4);
!     deviceVCcomboBox -> insertItem (tr(VCqStringValues[userdef]), 5);
  
!     PCSVCcomboBox -> insertItem (tr(VCqStringValues[iso3664p2_pcs]), 0);
!     PCSVCcomboBox  -> insertItem (tr(VCqStringValues[userdef]), 1);
  }
  
  ProfileParmsMon::ProfileParmsMon(QWidget *parent )
!     : QDialog(parent, "", 0, Qt::WStyle_SysMenu | Qt::WStyle_MinMax )
  {
      setupUi(this);
--- 114,130 ----
  
      source_or_dest_VC_groupBox -> setTitle (tr("Assumed display viewing conditions"));
!     deviceVCcomboBox -> insertItem (tr(VCqStringValues[sRGB].toLocal8Bit()), 0);
!     deviceVCcomboBox -> insertItem (tr(VCqStringValues[sRGBannexD].toLocal8Bit()), 1);
!     deviceVCcomboBox -> insertItem (tr(VCqStringValues[iso9241].toLocal8Bit()), 2);
!     deviceVCcomboBox -> insertItem (tr(VCqStringValues[projDark].toLocal8Bit()), 3);
!     deviceVCcomboBox -> insertItem (tr(VCqStringValues[projDim].toLocal8Bit()), 4);
!     deviceVCcomboBox -> insertItem (tr(VCqStringValues[userdef].toLocal8Bit()), 5);
  
!     PCSVCcomboBox -> insertItem (tr(VCqStringValues[iso3664p2_pcs].toLocal8Bit()), 0);
!     PCSVCcomboBox  -> insertItem (tr(VCqStringValues[userdef].toLocal8Bit()), 1);
  }
  
  ProfileParmsMon::ProfileParmsMon(QWidget *parent )
!     : QDialog(parent, "", 0, Qt::WStyle_SysMenu | Qt::WStyle_MinMax | Qt::WStyle_Title)
  {
      setupUi(this);
***************
*** 484,488 ****
  void ProfileParmsMon::slotHelpButton()
  {
!      QString path = get_global_help_path()->local8Bit() + "/profile-parms.html";
       // qDebug(path);
       getHelp()->openAssistant ();
--- 484,489 ----
  void ProfileParmsMon::slotHelpButton()
  {
!     QString global_help_path = get_global_help_path();
!     QString path = global_help_path + QString::fromLocal8Bit("/profile-parms.html");
       // qDebug(path);
       getHelp()->openAssistant ();

Index: profileparms.cpp
===================================================================
RCS file: /cvsroot/lprof/lprof/src/parmsqt/profileparms.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** profileparms.cpp	1 Mar 2008 23:47:14 -0000	1.59
--- profileparms.cpp	6 Mar 2008 21:18:59 -0000	1.60
***************
*** 48,52 ****
      // qDebug("get_home_dir");
      const char* qtdir= "QTDIR";
!     return (QString) getenv(qtdir);
  }
  
--- 48,52 ----
      // qDebug("get_home_dir");
      const char* qtdir= "QTDIR";
!     return  QString::fromLocal8Bit(getenv(qtdir));
  }
  
***************
*** 152,173 ****
      PCSVCcomboBox -> clear();
      source_or_dest_VC_groupBox -> setTitle (tr("Assumed viewing conditions for the captured medium"));
!     deviceVCcomboBox -> insertItem (tr(VCqStringValues[iso3664p2]), 0);
!     deviceVCcomboBox -> insertItem (tr(VCqStringValues[cie1161995]), 1);
!     deviceVCcomboBox -> insertItem (tr(VCqStringValues[iso3664p1]), 2);
!     deviceVCcomboBox -> insertItem (tr(VCqStringValues[brightOutdoors]), 3);
!     deviceVCcomboBox -> insertItem (tr(VCqStringValues[cutSheet]), 4);
!     deviceVCcomboBox -> insertItem (tr(VCqStringValues[userdef]), 5);
  
!     PCSVCcomboBox -> insertItem (tr(VCqStringValues[iso3664p2_pcs]), 0);
!     PCSVCcomboBox -> insertItem (tr(VCqStringValues[cie1161995]), 1);
!     PCSVCcomboBox -> insertItem (tr(VCqStringValues[iso3664p1]), 2);
!     PCSVCcomboBox -> insertItem (tr(VCqStringValues[sRGB]), 3);
!     PCSVCcomboBox -> insertItem (tr(VCqStringValues[sRGBannexD]), 4);
!     PCSVCcomboBox -> insertItem (tr(VCqStringValues[iso9241]), 5);
!     PCSVCcomboBox  -> insertItem (tr(VCqStringValues[userdef]), 6);
  }
  
  ProfileParms::ProfileParms(QWidget *parent )
!     : QDialog(parent, "", 0, Qt::WStyle_SysMenu | Qt::WStyle_MinMax | Qt::WStyle_Dialog)
  {
      setupUi(this);
--- 152,173 ----
      PCSVCcomboBox -> clear();
      source_or_dest_VC_groupBox -> setTitle (tr("Assumed viewing conditions for the captured medium"));
!     deviceVCcomboBox -> insertItem (tr(VCqStringValues[iso3664p2].toLocal8Bit()), 0);
!     deviceVCcomboBox -> insertItem (tr(VCqStringValues[cie1161995].toLocal8Bit()), 1);
!     deviceVCcomboBox -> insertItem (tr(VCqStringValues[iso3664p1].toLocal8Bit()), 2);
!     deviceVCcomboBox -> insertItem (tr(VCqStringValues[brightOutdoors].toLocal8Bit()), 3);
!     deviceVCcomboBox -> insertItem (tr(VCqStringValues[cutSheet].toLocal8Bit()), 4);
!     deviceVCcomboBox -> insertItem (tr(VCqStringValues[userdef].toLocal8Bit()), 5);
  
!     PCSVCcomboBox -> insertItem (tr(VCqStringValues[iso3664p2_pcs].toLocal8Bit()), 0);
!     PCSVCcomboBox -> insertItem (tr(VCqStringValues[cie1161995].toLocal8Bit()), 1);
!     PCSVCcomboBox -> insertItem (tr(VCqStringValues[iso3664p1].toLocal8Bit()), 2);
!     PCSVCcomboBox -> insertItem (tr(VCqStringValues[sRGB].toLocal8Bit()), 3);
!     PCSVCcomboBox -> insertItem (tr(VCqStringValues[sRGBannexD].toLocal8Bit()), 4);
!     PCSVCcomboBox -> insertItem (tr(VCqStringValues[iso9241].toLocal8Bit()), 5);
!     PCSVCcomboBox  -> insertItem (tr(VCqStringValues[userdef].toLocal8Bit()), 6);
  }
  
  ProfileParms::ProfileParms(QWidget *parent )
!     : QDialog(parent, "", 0, Qt::WStyle_SysMenu | Qt::WStyle_MinMax | Qt::WStyle_Dialog | Qt::WStyle_Title)
  {
      setupUi(this);
***************
*** 767,771 ****
  void ProfileParms::slotHelpButton()
  {
!      QString path = get_global_help_path()->local8Bit() + "/profile-parms.html";
       // qDebug(path);
       getHelp()->openAssistant ();
--- 767,771 ----
  void ProfileParms::slotHelpButton()
  {
!      QString path = get_global_help_path() + QString::fromLocal8Bit("/profile-parms.html");
       // qDebug(path);
       getHelp()->openAssistant ();