ooo-build r11202 - in trunk: . scratch/scsolver scratch/scsolver/ext/translation/en-US scratch/scsolver/source/inc scratch/scsolver/source/ui

[kyoshida svn gnome org]

Author: kyoshida
Date: Sun Jan  6 19:11:34 2008
New Revision: 11202
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11202&view=rev

Log:
2008-01-06  Kohei Yoshida  <kyoshida novell com>

	* scratch/scsolver/ext/translation/en-US/scsolver.properties: 'Define
	Model' to 'Model'.
	
	* scratch/scsolver/source/inc/dialog.hxx: copyright years.
	
	* scratch/scsolver/source/inc/scsolver.hrc:
	* scratch/scsolver/source/ui/scsolver.src: added two new localized 
	strings & transferred Russian strings from 
	scratch/scsolver/ext/ru/scsolver.properties.
	
	* scratch/scsolver/source/ui/solvemodel.cxx: localized two previously-
	hardcoded strings.

	* scratch/scsolver/ChangeLog: renamed to Changelog-old to freeze it for
	good.  I'll be using the main ChangeLog file for all future scsolver 
	change logs.


Added:
   trunk/scratch/scsolver/ChangeLog-old
      - copied unchanged from r11199, /trunk/scratch/scsolver/ChangeLog
Removed:
   trunk/scratch/scsolver/ChangeLog
Modified:
   trunk/ChangeLog
   trunk/scratch/scsolver/ext/translation/en-US/scsolver.properties
   trunk/scratch/scsolver/source/inc/dialog.hxx
   trunk/scratch/scsolver/source/inc/scsolver.hrc
   trunk/scratch/scsolver/source/ui/scsolver.src
   trunk/scratch/scsolver/source/ui/solvemodel.cxx

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	(original)
+++ trunk/ChangeLog	Sun Jan  6 19:11:34 2008
@@ -1,3 +1,22 @@
+2008-01-06  Kohei Yoshida  <kyoshida novell com>
+
+	* scratch/scsolver/ext/translation/en-US/scsolver.properties: 'Define
+	Model' to 'Model'.
+	
+	* scratch/scsolver/source/inc/dialog.hxx: copyright years.
+	
+	* scratch/scsolver/source/inc/scsolver.hrc:
+	* scratch/scsolver/source/ui/scsolver.src: added two new localized 
+	strings & transferred Russian strings from 
+	scratch/scsolver/ext/ru/scsolver.properties.
+	
+	* scratch/scsolver/source/ui/solvemodel.cxx: localized two previously-
+	hardcoded strings.
+
+	* scratch/scsolver/ChangeLog: renamed to Changelog-old to freeze it for
+	good.  I'll be using the main ChangeLog file for all future scsolver 
+	change logs.
+
 2008-01-05  Rene Engelhard  <rene debian org>
 
 	* patches/src680/apply,

Modified: trunk/scratch/scsolver/ext/translation/en-US/scsolver.properties
==============================================================================
--- trunk/scratch/scsolver/ext/translation/en-US/scsolver.properties	(original)
+++ trunk/scratch/scsolver/ext/translation/en-US/scsolver.properties	Sun Jan  6 19:11:34 2008
@@ -20,7 +20,7 @@
 32.OptionDialog.btnCancel.Label=Cancel
 # SolverDialog strings
 34.SolverDialog.Title=Optimization Solver
-36.SolverDialog.flModel.Label=Define Model
+36.SolverDialog.flModel.Label=Model
 38.SolverDialog.ftTargetCell.Label=Target Cell
 40.SolverDialog.editTargetCell.Text=
 46.SolverDialog.ftDecVars.Label=By changing cells

Modified: trunk/scratch/scsolver/source/inc/dialog.hxx
==============================================================================
--- trunk/scratch/scsolver/source/inc/dialog.hxx	(original)
+++ trunk/scratch/scsolver/source/inc/dialog.hxx	Sun Jan  6 19:11:34 2008
@@ -6,7 +6,7 @@
  *
  *    GNU Lesser General Public License Version 2.1
  *    =============================================
- *    Copyright 2005 by Kohei Yoshida.
+ *    Copyright 2005-2008 by Kohei Yoshida.
  *    1039 Kingsway Dr., Apex, NC 27502, USA
  *
  *    This library is free software; you can redistribute it and/or

Modified: trunk/scratch/scsolver/source/inc/scsolver.hrc
==============================================================================
--- trunk/scratch/scsolver/source/inc/scsolver.hrc	(original)
+++ trunk/scratch/scsolver/source/inc/scsolver.hrc	Sun Jan  6 19:11:34 2008
@@ -37,5 +37,7 @@
 #define SCSOLVER_STR_OPTION_ASSUME_LINEAR         (SCSOLVER_RES_START+31)
 #define SCSOLVER_STR_OPTION_VAR_POSITIVE          (SCSOLVER_RES_START+32)
 #define SCSOLVER_STR_OPTION_VAR_INTEGER           (SCSOLVER_RES_START+33)
+#define SCSOLVER_STR_TARGET_NOT_SET               (SCSOLVER_RES_START+34)
+#define SCSOLVER_STR_DECISIONVAR_NOT_SET          (SCSOLVER_RES_START+35)
 
 #endif

Modified: trunk/scratch/scsolver/source/ui/scsolver.src
==============================================================================
Binary files. No diff available.

Modified: trunk/scratch/scsolver/source/ui/solvemodel.cxx
==============================================================================
--- trunk/scratch/scsolver/source/ui/solvemodel.cxx	(original)
+++ trunk/scratch/scsolver/source/ui/solvemodel.cxx	Sun Jan  6 19:11:34 2008
@@ -308,7 +308,8 @@
 		Goal eGoal = pMainDlg->getGoal();
 		if ( eGoal == GOAL_UNKNOWN )
 		{
-			pMainDlg->showMessage( ascii_i18n("Goal is not set") );
+			pMainDlg->showMessage(
+                pMainDlg->getResStr(SCSOLVER_STR_MSG_GOAL_NOT_SET) );
 			return;
 		}
 
@@ -510,7 +511,7 @@
 	{
 		rtl::OUString sTargetCellAddr = m_pSolverImpl->getMainDialog()->getTargetCellAddress();
 		if ( !sTargetCellAddr.getLength() )
-			throw RuntimeError( ascii_i18n("Target cell address empty") );
+			throw RuntimeError( getSolverImpl()->getResStr(SCSOLVER_STR_TARGET_NOT_SET) );
 
 		CellAddress aAddr = m_pSolverImpl->getCalcInterface()->getCellAddress(
 			sTargetCellAddr );
@@ -531,7 +532,8 @@
 	
 		rtl::OUString sAddr = m_pSolverImpl->getMainDialog()->getVarCellAddress();
 		if ( !sAddr.getLength() )
-			throw RuntimeError( ascii_i18n("Decision variable cells empty") );
+			throw RuntimeError( 
+                getSolverImpl()->getResStr(SCSOLVER_STR_DECISIONVAR_NOT_SET) );
 
 		CellRangeAddress aRangeAddr = m_pSolverImpl->getCalcInterface()->getCellRangeAddress(sAddr);